refactor: use interfaces::WalletLoader in Dash-specific wallet init

Author: kwvg

src/coinjoin/interfaces.cpp

@@ -82,6 +82,11 @@ class CoinJoinLoaderImpl : public interfaces::CoinJoin::Loader
         return *Assert(Assert(m_node.cj_ctx)->walletman);
     }
 
+    interfaces::WalletLoader& wallet_loader()
+    {
+        return *Assert(m_node.wallet_loader);
+    }
+
 public:
     explicit CoinJoinLoaderImpl(NodeContext& node) :
         m_node(node)
@@ -93,12 +98,12 @@ class CoinJoinLoaderImpl : public interfaces::CoinJoin::Loader
     void AddWallet(const std::shared_ptr<CWallet>& wallet) override
     {
         walletman().Add(wallet);
-        g_wallet_init_interface.InitCoinJoinSettings(*this);
+        g_wallet_init_interface.InitCoinJoinSettings(*this, wallet_loader());
     }
     void RemoveWallet(const std::string& name) override
     {
         walletman().Remove(name);
-        g_wallet_init_interface.InitCoinJoinSettings(*this);
+        g_wallet_init_interface.InitCoinJoinSettings(*this, wallet_loader());
     }
     void FlushWallet(const std::string& name) override
     {

src/dummywallet.cpp

@@ -14,6 +14,7 @@ class Chain;
 class Handler;
 class Wallet;
 class WalletClient;
+class WalletLoader;
 namespace CoinJoin {
 class Loader;
 } // namespcae CoinJoin
@@ -28,8 +29,8 @@ class DummyWalletInit : public WalletInitInterface {
     void Construct(NodeContext& node) const override {LogPrintf("No wallet support compiled in!\n");}
 
     // Dash Specific WalletInitInterface InitCoinJoinSettings
-    void AutoLockMasternodeCollaterals() const override {}
-    void InitCoinJoinSettings(interfaces::CoinJoin::Loader& coinjoin_loader) const override {}
+    void AutoLockMasternodeCollaterals(interfaces::WalletLoader& wallet_loader) const override {}
+    void InitCoinJoinSettings(interfaces::CoinJoin::Loader& coinjoin_loader, interfaces::WalletLoader& wallet_loader) const override {}
     bool InitAutoBackup() const override {return true;}
 };
 

src/init.cpp

@@ -2202,6 +2202,11 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     chainman.m_load_block = std::thread(&util::TraceThread, "loadblk", [=, &args, &chainman, &node] {
         ThreadImport(chainman, *node.dmnman, *g_ds_notification_interface, vImportFiles, node.mn_activeman.get(), args);
     });
+#ifdef ENABLE_WALLET
+    if (!args.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
+        g_wallet_init_interface.AutoLockMasternodeCollaterals(*node.wallet_loader);
+    }
+#endif // ENABLE_WALLET
 
     // Wait for genesis block to be processed
     {

src/interfaces/wallet.h

@@ -86,6 +86,9 @@ class Wallet
     //! Abort a rescan.
     virtual void abortRescan() = 0;
 
+    //! Lock masternode collaterals
+    virtual void autoLockMasternodeCollaterals() = 0;
+
     //! Back up wallet.
     virtual bool backupWallet(const std::string& filename) = 0;
 

src/node/blockstorage.cpp

@@ -926,7 +926,5 @@ void ThreadImport(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
         mn_activeman->Init(chainman.ActiveTip());
     }
 
-    g_wallet_init_interface.AutoLockMasternodeCollaterals();
-
     chainman.ActiveChainstate().LoadMempool(args);
 }

src/qt/test/addressbooktests.cpp

@@ -63,8 +63,6 @@ void EditAddressAndSubmit(
 void TestAddAddressesToSendBook(interfaces::Node& node)
 {
     TestChain100Setup test;
-    auto wallet_loader = interfaces::MakeWalletLoader(*test.m_node.chain, *Assert(test.m_node.args), *Assert(test.m_node.coinjoin_loader));
-    test.m_node.wallet_loader = wallet_loader.get();
     node.setContext(&test.m_node);
     const std::shared_ptr<CWallet> wallet = std::make_shared<CWallet>(node.context()->chain.get(), node.context()->coinjoin_loader.get(), "", CreateMockWalletDatabase());
     wallet->SetupLegacyScriptPubKeyMan();

src/qt/test/wallettests.cpp

@@ -108,8 +108,6 @@ void TestGUI(interfaces::Node& node)
     for (int i = 0; i < 5; ++i) {
         test.CreateAndProcessBlock({}, GetScriptForRawPubKey(test.coinbaseKey.GetPubKey()));
     }
-    auto wallet_loader = interfaces::MakeWalletLoader(*test.m_node.chain, *Assert(test.m_node.args), *Assert(test.m_node.coinjoin_loader));
-    test.m_node.wallet_loader = wallet_loader.get();
     node.setContext(&test.m_node);
     const std::shared_ptr<CWallet> wallet = std::make_shared<CWallet>(node.context()->chain.get(), node.context()->coinjoin_loader.get(), "", CreateMockWalletDatabase());
     AddWallet(wallet);

src/test/util/setup_common.cpp

@@ -63,6 +63,7 @@
 
 #ifdef ENABLE_WALLET
 #include <interfaces/coinjoin.h>
+#include <interfaces/wallet.h>
 #endif // ENABLE_WALLET
 
 #include <stdexcept>
@@ -315,8 +316,16 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
     m_node.cj_ctx = std::make_unique<CJContext>(*m_node.chainman, *m_node.connman, *m_node.dmnman, *m_node.mn_metaman, *m_node.mempool,
                                                 /*mn_activeman=*/nullptr, *m_node.mn_sync, *m_node.llmq_ctx->isman, m_node.peerman,
                                                 /*relay_txes=*/true);
+
 #ifdef ENABLE_WALLET
+    // WalletInit::Construct()-like logic needed for wallet tests that run on
+    // TestingSetup and its children (e.g. TestChain100Setup) instead of
+    // WalletTestingSetup
     m_node.coinjoin_loader = interfaces::MakeCoinJoinLoader(m_node);
+
+    auto wallet_loader = interfaces::MakeWalletLoader(*m_node.chain, *m_node.args, *m_node.coinjoin_loader);
+    m_node.wallet_loader = wallet_loader.get();
+    m_node.chain_clients.emplace_back(std::move(wallet_loader));
 #endif // ENABLE_WALLET
 
     BlockValidationState state;
@@ -328,6 +337,11 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
 TestingSetup::~TestingSetup()
 {
 #ifdef ENABLE_WALLET
+    for (auto& client : m_node.chain_clients) {
+        client.reset();
+    }
+    m_node.wallet_loader = nullptr;
+
     m_node.coinjoin_loader.reset();
 #endif // ENABLE_WALLET
     m_node.cj_ctx.reset();

src/wallet/init.cpp

@@ -47,8 +47,8 @@ class WalletInit : public WalletInitInterface
     void Construct(NodeContext& node) const override;
 
     // Dash Specific Wallet Init
-    void AutoLockMasternodeCollaterals() const override;
-    void InitCoinJoinSettings(interfaces::CoinJoin::Loader& coinjoin_loader) const override;
+    void AutoLockMasternodeCollaterals(interfaces::WalletLoader& wallet_loader) const override;
+    void InitCoinJoinSettings(interfaces::CoinJoin::Loader& coinjoin_loader, interfaces::WalletLoader& wallet_loader) const override;
     bool InitAutoBackup() const override;
 };
 
@@ -196,30 +196,30 @@ void WalletInit::Construct(NodeContext& node) const
 }
 
 
-void WalletInit::AutoLockMasternodeCollaterals() const
+void WalletInit::AutoLockMasternodeCollaterals(interfaces::WalletLoader& wallet_loader) const
 {
     // we can't do this before DIP3 is fully initialized
-    for (const auto& pwallet : GetWallets()) {
-        pwallet->AutoLockMasternodeCollaterals();
+    for (const auto& wallet : wallet_loader.getWallets()) {
+        wallet->autoLockMasternodeCollaterals();
     }
 }
 
-void WalletInit::InitCoinJoinSettings(interfaces::CoinJoin::Loader& coinjoin_loader) const
+void WalletInit::InitCoinJoinSettings(interfaces::CoinJoin::Loader& coinjoin_loader, interfaces::WalletLoader& wallet_loader) const
 {
-    CCoinJoinClientOptions::SetEnabled(!GetWallets().empty() ? gArgs.GetBoolArg("-enablecoinjoin", true) : false);
+    const auto& wallets{wallet_loader.getWallets()};
+    CCoinJoinClientOptions::SetEnabled(!wallets.empty() ? gArgs.GetBoolArg("-enablecoinjoin", true) : false);
     if (!CCoinJoinClientOptions::IsEnabled()) {
         return;
     }
     bool fAutoStart = gArgs.GetBoolArg("-coinjoinautostart", DEFAULT_COINJOIN_AUTOSTART);
-    for (auto& pwallet : GetWallets()) {
-        auto manager = coinjoin_loader.GetClient(pwallet->GetName());
-        assert(manager != nullptr);
-        if (pwallet->IsLocked()) {
+    for (auto& wallet : wallets) {
+        auto manager = Assert(coinjoin_loader.GetClient(wallet->getWalletName()));
+        if (wallet->isLocked(/*fForMixing=*/false)) {
             manager->stopMixing();
-            LogPrintf("CoinJoin: Mixing stopped for locked wallet \"%s\"\n", pwallet->GetName());
+            LogPrintf("CoinJoin: Mixing stopped for locked wallet \"%s\"\n", wallet->getWalletName());
         } else if (fAutoStart) {
             manager->startMixing();
-            LogPrintf("CoinJoin: Automatic mixing started for wallet \"%s\"\n", pwallet->GetName());
+            LogPrintf("CoinJoin: Automatic mixing started for wallet \"%s\"\n", wallet->getWalletName());
         }
     }
     LogPrintf("CoinJoin: autostart=%d, multisession=%d," /* Continued */

src/wallet/interfaces.cpp

@@ -147,6 +147,7 @@ class WalletImpl : public Wallet
         return m_wallet->ChangeWalletPassphrase(old_wallet_passphrase, new_wallet_passphrase);
     }
     void abortRescan() override { m_wallet->AbortRescan(); }
+    void autoLockMasternodeCollaterals() override { m_wallet->AutoLockMasternodeCollaterals(); }
     bool backupWallet(const std::string& filename) override { return m_wallet->BackupWallet(filename); }
     bool autoBackupWallet(const fs::path& wallet_path, bilingual_str& error_string, std::vector<bilingual_str>& warnings) override
     {