refactor: complete migration of code to wallet:: namespace

Continuation of prior commit, should compile successfully.

Author: kwvg

src/bench/coin_selection.cpp

@@ -12,6 +12,15 @@
 #include <set>
 
 using node::NodeContext;
+using wallet::CHANGE_LOWER;
+using wallet::CoinEligibilityFilter;
+using wallet::CoinSelectionParams;
+using wallet::COutput;
+using wallet::CreateDummyWalletDatabase;
+using wallet::CWallet;
+using wallet::CWalletTx;
+using wallet::OutputGroup;
+using wallet::TxStateInactive;
 
 static void addCoin(const CAmount& nValue, const CWallet& wallet, std::vector<std::unique_ptr<CWalletTx>>& wtxs)
 {

src/bench/wallet_balance.cpp

@@ -14,6 +14,11 @@
 
 #include <optional>
 
+using wallet::CreateMockWalletDatabase;
+using wallet::CWallet;
+using wallet::DBErrors;
+using wallet::WALLET_FLAG_DESCRIPTORS;
+
 static void WalletBalance(benchmark::Bench& bench, const bool set_dirty, const bool add_mine, const uint32_t epoch_iters)
 {
     const auto test_setup = MakeNoLogFileContext<const TestingSetup>();

src/bitcoin-wallet.cpp

@@ -112,7 +112,7 @@ MAIN_FUNCTION
     }
 
     ECC_Start();
-    if (!WalletTool::ExecuteWalletToolFunc(args, command->command)) {
+    if (!wallet::WalletTool::ExecuteWalletToolFunc(args, command->command)) {
         return EXIT_FAILURE;
     }
     ECC_Stop();

src/coinjoin/client.cpp

@@ -33,6 +33,13 @@
 #include <memory>
 #include <univalue.h>
 
+using wallet::CCoinControl;
+using wallet::CompactTallyItem;
+using wallet::COutput;
+using wallet::CoinType;
+using wallet::CWallet;
+using wallet::ReserveDestination;
+
 PeerMsgRet CCoinJoinClientQueueManager::ProcessMessage(const CNode& peer, CConnman& connman, PeerManager& peerman,
                                                        std::string_view msg_type, CDataStream& vRecv)
 {

src/coinjoin/client.h

@@ -96,7 +96,7 @@ class CoinJoinWalletManager {
         }
     }
 
-    void Add(const std::shared_ptr<CWallet>& wallet);
+    void Add(const std::shared_ptr<wallet::CWallet>& wallet);
     void DoMaintenance(CConnman& connman);
 
     void Remove(const std::string& name);
@@ -138,7 +138,7 @@ class CoinJoinWalletManager {
 class CCoinJoinClientSession : public CCoinJoinBaseSession
 {
 private:
-    const std::shared_ptr<CWallet> m_wallet;
+    const std::shared_ptr<wallet::CWallet> m_wallet;
     CCoinJoinClientManager& m_clientman;
     CDeterministicMNManager& m_dmnman;
     CMasternodeMetaMan& m_mn_metaman;
@@ -162,12 +162,12 @@ class CCoinJoinClientSession : public CCoinJoinBaseSession
 
     /// Create denominations
     bool CreateDenominated(CAmount nBalanceToDenominate);
-    bool CreateDenominated(CAmount nBalanceToDenominate, const CompactTallyItem& tallyItem, bool fCreateMixingCollaterals)
+    bool CreateDenominated(CAmount nBalanceToDenominate, const wallet::CompactTallyItem& tallyItem, bool fCreateMixingCollaterals)
         EXCLUSIVE_LOCKS_REQUIRED(m_wallet->cs_wallet);
 
     /// Split up large inputs or make fee sized inputs
     bool MakeCollateralAmounts();
-    bool MakeCollateralAmounts(const CompactTallyItem& tallyItem, bool fTryDenominated)
+    bool MakeCollateralAmounts(const wallet::CompactTallyItem& tallyItem, bool fTryDenominated)
         EXCLUSIVE_LOCKS_REQUIRED(m_wallet->cs_wallet);
 
     bool CreateCollateralTransaction(CMutableTransaction& txCollateral, std::string& strReason)
@@ -200,7 +200,7 @@ class CCoinJoinClientSession : public CCoinJoinBaseSession
     void SetNull() override EXCLUSIVE_LOCKS_REQUIRED(cs_coinjoin);
 
 public:
-    explicit CCoinJoinClientSession(const std::shared_ptr<CWallet>& wallet, CCoinJoinClientManager& clientman,
+    explicit CCoinJoinClientSession(const std::shared_ptr<wallet::CWallet>& wallet, CCoinJoinClientManager& clientman,
                                     CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
                                     const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
                                     const std::unique_ptr<CCoinJoinClientQueueManager>& queueman, bool is_masternode);
@@ -263,7 +263,7 @@ class CCoinJoinClientQueueManager : public CCoinJoinBaseManager
 class CCoinJoinClientManager
 {
 private:
-    const std::shared_ptr<CWallet> m_wallet;
+    const std::shared_ptr<wallet::CWallet> m_wallet;
     CDeterministicMNManager& m_dmnman;
     CMasternodeMetaMan& m_mn_metaman;
     const CMasternodeSync& m_mn_sync;
@@ -302,7 +302,7 @@ class CCoinJoinClientManager
     CCoinJoinClientManager(CCoinJoinClientManager const&) = delete;
     CCoinJoinClientManager& operator=(CCoinJoinClientManager const&) = delete;
 
-    explicit CCoinJoinClientManager(const std::shared_ptr<CWallet>& wallet, CDeterministicMNManager& dmnman,
+    explicit CCoinJoinClientManager(const std::shared_ptr<wallet::CWallet>& wallet, CDeterministicMNManager& dmnman,
                                     CMasternodeMetaMan& mn_metaman, const CMasternodeSync& mn_sync,
                                     const llmq::CInstantSendManager& isman,
                                     const std::unique_ptr<CCoinJoinClientQueueManager>& queueman, bool is_masternode) :

src/coinjoin/interfaces.cpp

@@ -18,6 +18,7 @@
 #include <string>
 
 using node::NodeContext;
+using wallet::CWallet;
 
 namespace coinjoin {
 namespace {

src/coinjoin/util.cpp

@@ -14,6 +14,13 @@
 
 #include <numeric>
 
+using wallet::CompactTallyItem;
+using wallet::CRecipient;
+using wallet::CWallet;
+using wallet::FEATURE_COMPRPUBKEY;
+using wallet::GetDiscardRate;
+using wallet::WalletBatch;
+
 inline unsigned int GetSizeOfCompactSizeDiff(uint64_t nSizePrev, uint64_t nSizeNew)
 {
     assert(nSizePrev <= nSizeNew);

src/coinjoin/util.h

@@ -13,11 +13,11 @@ struct bilingual_str;
 class CKeyHolder
 {
 private:
-    ReserveDestination reserveDestination;
+    wallet::ReserveDestination reserveDestination;
     CTxDestination dest;
 
 public:
-    explicit CKeyHolder(CWallet* pwalletIn);
+    explicit CKeyHolder(wallet::CWallet* pwalletIn);
     CKeyHolder(CKeyHolder&&) = delete;
     CKeyHolder& operator=(CKeyHolder&&) = delete;
     void KeepKey();
@@ -33,7 +33,7 @@ class CKeyHolderStorage
     std::vector<std::unique_ptr<CKeyHolder> > storage GUARDED_BY(cs_storage);
 
 public:
-    CScript AddKey(CWallet* pwalletIn) EXCLUSIVE_LOCKS_REQUIRED(!cs_storage);
+    CScript AddKey(wallet::CWallet* pwalletIn) EXCLUSIVE_LOCKS_REQUIRED(!cs_storage);
     void KeepAll() EXCLUSIVE_LOCKS_REQUIRED(!cs_storage);
     void ReturnAll() EXCLUSIVE_LOCKS_REQUIRED(!cs_storage);
 };
@@ -47,14 +47,14 @@ class CTransactionBuilderOutput
     /// Used for amount updates
     CTransactionBuilder* pTxBuilder{nullptr};
     /// Reserve key where the amount of this output will end up
-    ReserveDestination dest;
+    wallet::ReserveDestination dest;
     /// Amount this output will receive
     CAmount nAmount{0};
     /// ScriptPubKey of this output
     CScript script;
 
 public:
-    CTransactionBuilderOutput(CTransactionBuilder* pTxBuilderIn, CWallet& wallet, CAmount nAmountIn);
+    CTransactionBuilderOutput(CTransactionBuilder* pTxBuilderIn, wallet::CWallet& wallet, CAmount nAmountIn);
     CTransactionBuilderOutput(CTransactionBuilderOutput&&) = delete;
     CTransactionBuilderOutput& operator=(CTransactionBuilderOutput&&) = delete;
     /// Get the scriptPubKey of this output
@@ -77,15 +77,15 @@ class CTransactionBuilderOutput
 class CTransactionBuilder
 {
     /// Wallet the transaction will be build for
-    CWallet& m_wallet;
+    wallet::CWallet& m_wallet;
     /// See CTransactionBuilder() for initialization
-    CCoinControl coinControl;
+    wallet::CCoinControl coinControl;
     /// Dummy since we anyway use tallyItem's destination as change destination in coincontrol.
     /// Its a member just to make sure ReturnKey can be called in destructor just in case it gets generated/kept
     /// somewhere in CWallet code.
-    ReserveDestination dummyReserveDestination;
+    wallet::ReserveDestination dummyReserveDestination;
     /// Contains all utxos available to generate this transactions. They are all from the same address.
-    CompactTallyItem tallyItem;
+    wallet::CompactTallyItem tallyItem;
     /// Contains the number of bytes required for a transaction with only the inputs of tallyItems, no outputs
     int nBytesBase{0};
     /// Contains the number of bytes required to add one output
@@ -100,7 +100,7 @@ class CTransactionBuilder
     friend class CTransactionBuilderOutput;
 
 public:
-    CTransactionBuilder(CWallet& wallet, const CompactTallyItem& tallyItemIn);
+    CTransactionBuilder(wallet::CWallet& wallet, const wallet::CompactTallyItem& tallyItemIn);
     ~CTransactionBuilder();
     /// Check it would be possible to add a single output with the amount nAmount. Returns true if its possible and false if not.
     bool CouldAddOutput(CAmount nAmountOutput) const EXCLUSIVE_LOCKS_REQUIRED(!cs_outputs);

src/context.h

@@ -13,15 +13,17 @@ class ChainstateManager;
 class CTxMemPool;
 class CBlockPolicyEstimator;
 struct LLMQContext;
-struct WalletContext;
 namespace node {
 struct NodeContext;
 } // namespace node
+namespace wallet {
+struct WalletContext;
+} // namespace wallet
 
 using CoreContext = std::variant<std::monostate,
                                  std::reference_wrapper<ArgsManager>,
                                  std::reference_wrapper<node::NodeContext>,
-                                 std::reference_wrapper<WalletContext>,
+                                 std::reference_wrapper<wallet::WalletContext>,
                                  std::reference_wrapper<CTxMemPool>,
                                  std::reference_wrapper<ChainstateManager>,
                                  std::reference_wrapper<CBlockPolicyEstimator>,

src/dummywallet.cpp

@@ -7,8 +7,6 @@
 #include <walletinitinterface.h>
 
 class ArgsManager;
-class CWallet;
-
 namespace interfaces {
 class Chain;
 class Handler;
@@ -22,6 +20,9 @@ class Loader;
 namespace node {
 class NodeContext;
 } // namespace node
+namespace wallet {
+class CWallet;
+} // namespace wallet
 
 class DummyWalletInit : public WalletInitInterface {
 public:
@@ -90,7 +91,7 @@ std::unique_ptr<CoinJoin::Loader> MakeCoinJoinLoader(node::NodeContext& node)
     throw std::logic_error("Wallet function called in non-wallet build.");
 }
 
-std::unique_ptr<Wallet> MakeWallet(const std::shared_ptr<CWallet>& wallet)
+std::unique_ptr<Wallet> MakeWallet(const std::shared_ptr<wallet::CWallet>& wallet)
 {
     throw std::logic_error("Wallet function called in non-wallet build.");
 }