Merge #7104: refactor: move ownerships of mnhfman, cpoolman inside CChainstateHelper where it belongs to

7da6d06 fmt: clang-format for active/context and other files (Konstantin Akimov)
46302be refactor: code move only; validation of protx transactions are moved from detemrinisticmns to specialtxman (Konstantin Akimov)
ce1c7de refactor: unwrap CEvoDB from unique_ptr when calling DashChainstateSetup (Konstantin Akimov)
e869209 chore: add TODO to drop circular dependency of mnhftx and validation.h (Konstantin Akimov)
9709588 refactor: move CCreditPool inside chain-state helper (Konstantin Akimov)
0bb7f53 refactor: drop atomic from evo/mnhftx (Konstantin Akimov)
24ee98e refactor: re-connect ehf manager to fix new circular dependencies (Konstantin Akimov)
0949a34 refactor: move initialization of ehf manager from init.cpp to chainhelper (Konstantin Akimov)
525c3dc refactor: drop left-over CActiveMasternodeManager from chain state and LLMQContext (Konstantin Akimov)

Pull request description:

  ## Issue being fixed or feature implemented
  LoadChainState is aware of EHF Manager and Credit Pool Manager that are constructed outside, but have no meaning without Chain State; and its ownership and life time is controlled by Chain State too.

  ## What was done?
   - EHF Manager (`CMNHFManager`), Credit Pool Manager (`CCreditPoolManager`
   - Removed `CMNHFManager::ConnectManagers`
   - validation of protx transaction is moved from evo/deterministicmns.h to evo/specialtxman.h to break new circular dependencies
   - removed atomic from `m_qman` in `CMNHFManager`

  TODO: this PR includes some extra refactorings with code move from deterministicmns.h, that's a preparation for move `dmnman` (`CDeterministicMNManager`) inside Chain State too. Though, there's too many usages of `NodeContext::dmnman` all over code base, and many of its usages are not aware about Chain State at the moment; it will requires significant refactoring all over code base and out-of-scope of this PR; will be done in the further PRs with some extra efforts. Also, LLMQContext depends on dmnman; chainhelper depends on llmq-context; dmnman can't be easily moved inside chainhelper without moving llmq-ctx inside, which is out-of-scope of this PR.

      $ grep -r node.dmnman src/ -I | wc -l
      80

  ## How Has This Been Tested?
  Run unit and functional tests, run lint-circular-dependencies.py

  ## Breaking Changes
  N/A

  ## Checklist:
  - [x] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone

ACKs for top commit:
  UdjinM6:
    utACK 7da6d06
  kwvg:
    utACK 7da6d06

Tree-SHA512: f54596840a88df6b4a3d31d9c44ce9b6d44bf67f64e1f2392cec0139f1d955d189ac7180a5067a86263526ec2138faedc99c2e73c292724dfa7d94a61a467f2b

Author: PastaPastaPasta

src/active/context.cpp

@@ -25,13 +25,13 @@
 
 ActiveContext::ActiveContext(CBLSWorker& bls_worker, ChainstateManager& chainman, CConnman& connman,
                              CDeterministicMNManager& dmnman, CGovernanceManager& govman, CMasternodeMetaMan& mn_metaman,
-                             CMNHFManager& mnhfman, CSporkManager& sporkman, const chainlock::Chainlocks& chainlocks,
-                             CTxMemPool& mempool, chainlock::ChainlockHandler& clhandler,
-                             llmq::CInstantSendManager& isman, llmq::CQuorumBlockProcessor& qblockman,
-                             llmq::CQuorumManager& qman, llmq::CQuorumSnapshotManager& qsnapman,
-                             llmq::CSigningManager& sigman, PeerManager& peerman, const CMasternodeSync& mn_sync,
-                             const CBLSSecretKey& operator_sk, const llmq::QvvecSyncModeMap& sync_map,
-                             const util::DbWrapperParams& db_params, bool quorums_recovery, bool quorums_watch) :
+                             CSporkManager& sporkman, const chainlock::Chainlocks& chainlocks, CTxMemPool& mempool,
+                             chainlock::ChainlockHandler& clhandler, llmq::CInstantSendManager& isman,
+                             llmq::CQuorumBlockProcessor& qblockman, llmq::CQuorumManager& qman,
+                             llmq::CQuorumSnapshotManager& qsnapman, llmq::CSigningManager& sigman,
+                             PeerManager& peerman, const CMasternodeSync& mn_sync, const CBLSSecretKey& operator_sk,
+                             const llmq::QvvecSyncModeMap& sync_map, const util::DbWrapperParams& db_params,
+                             bool quorums_recovery, bool quorums_watch) :
     m_isman{isman},
     m_qman{qman},
     nodeman{std::make_unique<CActiveMasternodeManager>(connman, dmnman, operator_sk)},
@@ -40,7 +40,7 @@ ActiveContext::ActiveContext(CBLSWorker& bls_worker, ChainstateManager& chainman
     shareman{std::make_unique<llmq::CSigSharesManager>(connman, chainman.ActiveChainstate(), sigman, peerman, *nodeman,
                                                        qman, sporkman)},
     gov_signer{std::make_unique<GovernanceSigner>(connman, dmnman, govman, *nodeman, chainman, mn_sync)},
-    ehf_sighandler{std::make_unique<llmq::CEHFSignalsHandler>(chainman, mnhfman, sigman, *shareman, qman)},
+    ehf_sighandler{std::make_unique<llmq::CEHFSignalsHandler>(chainman, sigman, *shareman, qman)},
     qman_handler{std::make_unique<llmq::QuorumParticipant>(bls_worker, connman, dmnman, qman, qsnapman, *nodeman, chainman,
                                                            mn_sync, sporkman, sync_map, quorums_recovery, quorums_watch)},
     cl_signer{std::make_unique<chainlock::ChainLockSigner>(chainman.ActiveChainstate(), chainlocks, clhandler, isman,

src/active/context.h

@@ -63,13 +63,13 @@ struct ActiveContext final : public CValidationInterface {
     ActiveContext& operator=(const ActiveContext&) = delete;
     explicit ActiveContext(CBLSWorker& bls_worker, ChainstateManager& chainman, CConnman& connman,
                            CDeterministicMNManager& dmnman, CGovernanceManager& govman, CMasternodeMetaMan& mn_metaman,
-                           CMNHFManager& mnhfman, CSporkManager& sporkman, const chainlock::Chainlocks& chainlocks,
-                           CTxMemPool& mempool, chainlock::ChainlockHandler& clhandler,
-                           llmq::CInstantSendManager& isman, llmq::CQuorumBlockProcessor& qblockman,
-                           llmq::CQuorumManager& qman, llmq::CQuorumSnapshotManager& qsnapman,
-                           llmq::CSigningManager& sigman, PeerManager& peerman, const CMasternodeSync& mn_sync,
-                           const CBLSSecretKey& operator_sk, const llmq::QvvecSyncModeMap& sync_map,
-                           const util::DbWrapperParams& db_params, bool quorums_recovery, bool quorums_watch);
+                           CSporkManager& sporkman, const chainlock::Chainlocks& chainlocks, CTxMemPool& mempool,
+                           chainlock::ChainlockHandler& clhandler, llmq::CInstantSendManager& isman,
+                           llmq::CQuorumBlockProcessor& qblockman, llmq::CQuorumManager& qman,
+                           llmq::CQuorumSnapshotManager& qsnapman, llmq::CSigningManager& sigman, PeerManager& peerman,
+                           const CMasternodeSync& mn_sync, const CBLSSecretKey& operator_sk,
+                           const llmq::QvvecSyncModeMap& sync_map, const util::DbWrapperParams& db_params,
+                           bool quorums_recovery, bool quorums_watch);
     ~ActiveContext();
 
     void Interrupt();

src/evo/chainhelper.cpp

@@ -7,22 +7,26 @@
 #include <chainparams.h>
 
 #include <chainlock/chainlock.h>
+#include <evo/creditpool.h>
+#include <evo/mnhftx.h>
 #include <evo/specialtxman.h>
 #include <instantsend/instantsend.h>
 #include <instantsend/lock.h>
 #include <masternode/payments.h>
 
-CChainstateHelper::CChainstateHelper(CCreditPoolManager& cpoolman, CDeterministicMNManager& dmnman,
-                                     CMNHFManager& mnhfman, CGovernanceManager& govman, llmq::CInstantSendManager& isman,
-                                     llmq::CQuorumBlockProcessor& qblockman, llmq::CQuorumSnapshotManager& qsnapman,
-                                     const ChainstateManager& chainman, const Consensus::Params& consensus_params,
-                                     const CMasternodeSync& mn_sync, const CSporkManager& sporkman,
-                                     const chainlock::Chainlocks& chainlocks, const llmq::CQuorumManager& qman) :
+CChainstateHelper::CChainstateHelper(CEvoDB& evodb, CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+                                     llmq::CInstantSendManager& isman, llmq::CQuorumBlockProcessor& qblockman,
+                                     llmq::CQuorumSnapshotManager& qsnapman, const ChainstateManager& chainman,
+                                     const Consensus::Params& consensus_params, const CMasternodeSync& mn_sync,
+                                     const CSporkManager& sporkman, const chainlock::Chainlocks& chainlocks,
+                                     const llmq::CQuorumManager& qman) :
     isman{isman},
     m_chainlocks{chainlocks},
+    ehf_manager{std::make_unique<CMNHFManager>(evodb, chainman, qman)},
+    credit_pool_manager{std::make_unique<CCreditPoolManager>(evodb, chainman)},
     mn_payments{std::make_unique<CMNPaymentsProcessor>(dmnman, govman, chainman, consensus_params, mn_sync, sporkman)},
-    special_tx{std::make_unique<CSpecialTxProcessor>(cpoolman, dmnman, mnhfman, qblockman, qsnapman, chainman,
-                                                     consensus_params, chainlocks, qman)}
+    special_tx{std::make_unique<CSpecialTxProcessor>(*credit_pool_manager, dmnman, *ehf_manager, qblockman, qsnapman,
+                                                     chainman, consensus_params, chainlocks, qman)}
 {}
 
 CChainstateHelper::~CChainstateHelper() = default;
@@ -61,3 +65,7 @@ bool CChainstateHelper::RemoveConflictingISLockByTx(const CTransaction& tx)
 
 bool CChainstateHelper::ShouldInstantSendRejectConflicts() const { return isman.RejectConflictingBlocks(); }
 
+std::unordered_map<uint8_t, int> CChainstateHelper::GetSignalsStage(const CBlockIndex* const pindexPrev)
+{
+    return ehf_manager->GetSignalsStage(pindexPrev);
+}

src/evo/chainhelper.h

@@ -7,9 +7,12 @@
 
 #include <memory>
 #include <optional>
+#include <unordered_map>
 
+class CBlockIndex;
 class CCreditPoolManager;
 class CDeterministicMNManager;
+class CEvoDB;
 class ChainstateManager;
 class CMNHFManager;
 class CMNPaymentsProcessor;
@@ -43,12 +46,12 @@ class CChainstateHelper
     CChainstateHelper() = delete;
     CChainstateHelper(const CChainstateHelper&) = delete;
     CChainstateHelper& operator=(const CChainstateHelper&) = delete;
-    explicit CChainstateHelper(CCreditPoolManager& cpoolman, CDeterministicMNManager& dmnman, CMNHFManager& mnhfman,
-                               CGovernanceManager& govman, llmq::CInstantSendManager& isman,
-                               llmq::CQuorumBlockProcessor& qblockman, llmq::CQuorumSnapshotManager& qsnapman,
-                               const ChainstateManager& chainman, const Consensus::Params& consensus_params,
-                               const CMasternodeSync& mn_sync, const CSporkManager& sporkman,
-                               const chainlock::Chainlocks& chainlocks, const llmq::CQuorumManager& qman);
+    explicit CChainstateHelper(CEvoDB& evodb, CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+                               llmq::CInstantSendManager& isman, llmq::CQuorumBlockProcessor& qblockman,
+                               llmq::CQuorumSnapshotManager& qsnapman, const ChainstateManager& chainman,
+                               const Consensus::Params& consensus_params, const CMasternodeSync& mn_sync,
+                               const CSporkManager& sporkman, const chainlock::Chainlocks& chainlocks,
+                               const llmq::CQuorumManager& qman);
     ~CChainstateHelper();
 
     /** Passthrough functions to chainlock::Chainlocks*/
@@ -62,7 +65,11 @@ class CChainstateHelper
     bool RemoveConflictingISLockByTx(const CTransaction& tx);
     bool ShouldInstantSendRejectConflicts() const;
 
+    std::unordered_map<uint8_t, int> GetSignalsStage(const CBlockIndex* const pindexPrev);
+
 public:
+    const std::unique_ptr<CMNHFManager> ehf_manager;
+    const std::unique_ptr<CCreditPoolManager> credit_pool_manager;
     const std::unique_ptr<CMNPaymentsProcessor> mn_payments;
     const std::unique_ptr<CSpecialTxProcessor> special_tx;
 };