diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h index e1bc9bbbf3..ffa9e90c79 100644 --- a/src/interfaces/chain.h +++ b/src/interfaces/chain.h @@ -283,6 +283,12 @@ public: //! Shut down client. virtual void stop() = 0; + + //! Set mock time. + virtual void setMockTime(int64_t time) = 0; + + //! Return interfaces for accessing wallets (if any). + virtual std::vector> getWallets() = 0; }; //! Return implementation of Chain interface. diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp index f282571296..be71b3b7b8 100644 --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -253,8 +253,9 @@ public: std::vector> getWallets() override { std::vector> wallets; - for (const std::shared_ptr& wallet : GetWallets()) { - wallets.emplace_back(MakeWallet(wallet)); + for (auto& client : m_context.chain_clients) { + auto client_wallets = client->getWallets(); + std::move(client_wallets.begin(), client_wallets.end(), std::back_inserter(wallets)); } return wallets; } diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp index abc64cdc9f..1292603a2b 100644 --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -534,6 +534,15 @@ public: void start(CScheduler& scheduler) override { return StartWallets(scheduler); } void flush() override { return FlushWallets(); } void stop() override { return StopWallets(); } + void setMockTime(int64_t time) override { return SetMockTime(time); } + std::vector> getWallets() override + { + std::vector> wallets; + for (const auto& wallet : GetWallets()) { + wallets.emplace_back(MakeWallet(wallet)); + } + return wallets; + } ~WalletClientImpl() override { UnloadWallets(); } Chain& m_chain; diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h index ccec840983..e1755359ca 100644 --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -27,12 +26,13 @@ class CCoinControl; class CFeeRate; class CKey; class CWallet; -enum isminetype : unsigned int; enum class FeeReason; -typedef uint8_t isminefilter; - enum class OutputType; +enum class TransactionError; +enum isminetype : unsigned int; struct CRecipient; +struct PartiallySignedTransaction; +typedef uint8_t isminefilter; namespace interfaces { diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 4393ebde7a..28f89f8178 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include // for GetBoolArg #include diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 7db48269a9..d42883c8ea 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -394,7 +395,13 @@ static UniValue setmocktime(const JSONRPCRequest& request) LOCK(cs_main); RPCTypeCheck(request.params, {UniValue::VNUM}); - SetMockTime(request.params[0].get_int64()); + int64_t time = request.params[0].get_int64(); + SetMockTime(time); + if (g_rpc_node) { + for (const auto& chain_client : g_rpc_node->chain_clients) { + chain_client->setMockTime(time); + } + } return NullUniValue; }