Merge #6732: backport: merge bitcoin#23497 (Add src/node/ and src/wallet/ code to node:: and wallet:: namespaces)

ab9ba84 refactor: complete migration of code to `wallet::` namespace (Kittywhiskers Van Gogh)
1c2d529 refactor: add `src/wallet/*` code to `wallet::` namespace (Kittywhiskers Van Gogh)
81c6880 refactor: complete migration of code to `node::` namespace (Kittywhiskers Van Gogh)
ddbc294 refactor: add `src/node/*` to `node::` namespace (Kittywhiskers Van Gogh)
65cfaea refactor: add `src/node/context.*` to `node::` namespace (Kittywhiskers Van Gogh)
e89e8a7 refactor: move `CBlockFileInfo::ToString` method where class is declared (Kittywhiskers Van Gogh)
7991bbb refactor: disambiguate presence of `cs_main` in global namespace (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * [bitcoin#23497](bitcoin#23497) was merged upstream in v0.23. As of this writing, the backport backlog for v0.23 is at ~91% completion. This change, while conflict-prone, is long-overdue as we have been backporting pull requests from v0.24 onwards that assume these namespaces and so far we've simply "cut out" those portions to allow those backports to be completed.
    * This is not sustainable, especially with the work undertaken for `bitcoin-chainstate` (see [bitcoin#24304](bitcoin#24304) and onwards), that are invested in these separation of concerns.

  * Due to the increased usage of namespacing, to avoid potential `-Werror=thread-safety-analysis` issues (see below), the usage of `cs_main` needs to be disambiguated as being a part of the global namespace, to that effect, changes have been made to ensure that in Dash-specific code and anywhere else needed to quell compiler errors.

    <details>

    <summary>Build error:</summary>

    ```
    wallet/test/wallet_tests.cpp:162:31: error: calling function 'GetBlockPos' requires holding mutex 'cs_main' exclusively [-Werror,-Wthread-safety-analysis]
      162 |         file_number = oldTip->GetBlockPos().nFile;
          |                               ^
    wallet/test/wallet_tests.cpp:163:45: error: calling function 'PruneOneBlockFile' requires holding mutex 'cs_main' exclusively [-Werror,-Wthread-safety-analysis]
      163 |         Assert(m_node.chainman)->m_blockman.PruneOneBlockFile(file_number);
          |                                             ^
    wallet/test/wallet_tests.cpp:190:31: error: calling function 'GetBlockPos' requires holding mutex 'cs_main' exclusively [-Werror,-Wthread-safety-analysis]
      190 |         file_number = newTip->GetBlockPos().nFile;
          |                               ^
    wallet/test/wallet_tests.cpp:191:45: error: calling function 'PruneOneBlockFile' requires holding mutex 'cs_main' exclusively [-Werror,-Wthread-safety-analysis]
      191 |         Assert(m_node.chainman)->m_blockman.PruneOneBlockFile(file_number);
          |                                             ^
    wallet/test/wallet_tests.cpp:227:31: error: calling function 'GetBlockPos' requires holding mutex 'cs_main' exclusively [-Werror,-Wthread-safety-analysis]
      227 |         file_number = oldTip->GetBlockPos().nFile;
          |                               ^
    wallet/test/wallet_tests.cpp:228:45: error: calling function 'PruneOneBlockFile' requires holding mutex 'cs_main' exclusively [-Werror,-Wthread-safety-analysis]
      228 |         Assert(m_node.chainman)->m_blockman.PruneOneBlockFile(file_number);
          |                                             ^
    wallet/test/wallet_tests.cpp:386:34: error: calling function 'BlockIndex' requires holding mutex 'cs_main' exclusively [-Werror,-Wthread-safety-analysis]
      386 |         auto inserted = chainman.BlockIndex().emplace(std::piecewise_construct, std::make_tuple(GetRandHash()), std::make_tuple());
          |                                  ^`
    ```

    </details>

  * Some commits have been split out to ease in the review process, due to the nature of changes, except for `NodeContext` (`node/context.{cpp,h}`), they could not be done on a file-to-file basis as it would create substantial diffs that would then be reverted in the next commit, which would make review _harder_.
    * Correctness of this pull request can be evaluated by comparing against [bitcoin#23497](bitcoin#23497), the `25.x` branch upstream for changes affecting upstream code not present during the backport ([source](https://github.com/bitcoin/bitcoin/tree/25.x)) and compiler output for Dash-specific code.

  ## Checklist

  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)**
  - [x] I have added or updated relevant unit/integration/functional/e2e tests
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  PastaPastaPasta:
    utACK ab9ba84
  UdjinM6:
    utACK ab9ba84

Tree-SHA512: 8ff2bcfd76d5170c3af38e2c7b60d5daf467793e84bfef8254f325d6919f637451045157fde73a1d35d5d378bfea47625f72ec250815fd2603bca1339d89f31e

Author: PastaPastaPasta

src/bench/coin_selection.cpp

@@ -11,6 +11,17 @@
 
 #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)
 {
     static int nextLockTime = 0;

src/bench/load_external.cpp

@@ -40,7 +40,7 @@ static void LoadExternalBlockFile(benchmark::Bench& bench)
         // "wb+" is "binary, O_RDWR | O_CREAT | O_TRUNC".
         FILE* file{fsbridge::fopen(blkfile, "wb+")};
         // Make the test block file about 128 MB in length.
-        for (size_t i = 0; i < MAX_BLOCKFILE_SIZE / ss.size(); ++i) {
+        for (size_t i = 0; i < node::MAX_BLOCKFILE_SIZE / ss.size(); ++i) {
             if (fwrite(ss.data(), 1, ss.size(), file) != ss.size()) {
                 throw std::runtime_error("write to test file failed\n");
             }

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/bitcoind.cpp

@@ -31,6 +31,8 @@
 #include <cstdio>
 #include <functional>
 
+using node::NodeContext;
+
 const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
 UrlDecodeFn* const URL_DECODE = urlDecode;
 

src/chain.cpp

@@ -4,9 +4,15 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chain.h>
+#include <util/time.h>
 
 #include <tinyformat.h>
 
+std::string CBlockFileInfo::ToString() const
+{
+    return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, FormatISO8601Date(nTimeFirst), FormatISO8601Date(nTimeLast));
+}
+
 std::string CBlockIndex::ToString() const
 {
     return strprintf("CBlockIndex(pprev=%p, nHeight=%d, merkle=%s, hashBlock=%s)",

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)
 {
@@ -54,7 +61,7 @@ PeerMsgRet CCoinJoinClientQueueManager::ProcessDSQueue(const CNode& peer, CConnm
     vRecv >> dsq;
 
     {
-        LOCK(cs_main);
+        LOCK(::cs_main);
         peerman.EraseObjectRequest(peer.GetId(), CInv(MSG_DSQ, dsq.GetHash()));
     }
 

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/coinjoin.cpp

@@ -257,7 +257,7 @@ bool CCoinJoinBaseSession::IsValidInOuts(CChainState& active_chainstate, const l
         nFees -= txout.nValue;
     }
 
-    CCoinsViewMemPool viewMemPool(WITH_LOCK(cs_main, return &active_chainstate.CoinsTip()), mempool);
+    CCoinsViewMemPool viewMemPool(WITH_LOCK(::cs_main, return &active_chainstate.CoinsTip()), mempool);
 
     for (const auto& txin : vin) {
         LogPrint(BCLog::COINJOIN, "CCoinJoinBaseSession::%s -- txin=%s\n", __func__, txin.ToString());
@@ -299,7 +299,7 @@ bool CCoinJoinBaseSession::IsValidInOuts(CChainState& active_chainstate, const l
 // but CoinJoin still requires ATMP with fee sanity checks so we need to implement them separately
 bool ATMPIfSaneFee(ChainstateManager& chainman, const CTransactionRef& tx, bool test_accept)
 {
-    AssertLockHeld(cs_main);
+    AssertLockHeld(::cs_main);
 
     const MempoolAcceptResult result = chainman.ProcessTransaction(tx, /*test_accept=*/true);
     if (result.m_result_type != MempoolAcceptResult::ResultType::VALID) {
@@ -360,7 +360,7 @@ bool CoinJoin::IsCollateralValid(ChainstateManager& chainman, const llmq::CInsta
     LogPrint(BCLog::COINJOIN, "CoinJoin::IsCollateralValid -- %s", txCollateral.ToString()); /* Continued */
 
     {
-        LOCK(cs_main);
+        LOCK(::cs_main);
         if (!ATMPIfSaneFee(chainman, MakeTransactionRef(txCollateral), /*test_accept=*/true)) {
             LogPrint(BCLog::COINJOIN, "CoinJoin::IsCollateralValid -- didn't pass ATMPIfSaneFee()\n");
             return false;

src/coinjoin/coinjoin.h

@@ -404,6 +404,6 @@ class CDSTXManager
 };
 
 bool ATMPIfSaneFee(ChainstateManager& chainman, const CTransactionRef& tx, bool test_accept = false)
-    EXCLUSIVE_LOCKS_REQUIRED(cs_main);
+    EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
 #endif // BITCOIN_COINJOIN_COINJOIN_H