@@ -22,9 +22,10 @@ class CCoinJoinClientQueueManager;
2222class CConnman ;
2323class CDeterministicMN ;
2424class CDeterministicMNManager ;
25- class CNode ;
25+ class ChainstateManager ;
2626class CMasternodeMetaMan ;
2727class CMasternodeSync ;
28+ class CNode ;
2829class CoinJoinWalletManager ;
2930class CTxMemPool ;
3031
@@ -74,9 +75,9 @@ class CoinJoinWalletManager {
7475 using wallet_name_cjman_map = std::map<const std::string, std::unique_ptr<CCoinJoinClientManager>>;
7576
7677public:
77- CoinJoinWalletManager (CChainState& chainstate , CConnman& connman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool,
78+ CoinJoinWalletManager (ChainstateManager& chainman , CConnman& connman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman, const CTxMemPool& mempool,
7879 const CMasternodeSync& mn_sync, const std::unique_ptr<CCoinJoinClientQueueManager>& queueman, bool is_masternode)
79- : m_chainstate(chainstate ), m_connman(connman), m_dmnman(dmnman), m_mn_metaman(mn_metaman), m_mempool(mempool), m_mn_sync(mn_sync),
80+ : m_chainman(chainman ), m_connman(connman), m_dmnman(dmnman), m_mn_metaman(mn_metaman), m_mempool(mempool), m_mn_sync(mn_sync),
8081 m_queueman (queueman), m_is_masternode{is_masternode}
8182 {}
8283
@@ -112,11 +113,11 @@ class CoinJoinWalletManager {
112113 };
113114
114115private:
115- CChainState& m_chainstate ;
116+ ChainstateManager& m_chainman ;
116117 CConnman& m_connman;
117118 CDeterministicMNManager& m_dmnman;
118119 CMasternodeMetaMan& m_mn_metaman;
119- CTxMemPool& m_mempool;
120+ const CTxMemPool& m_mempool;
120121 const CMasternodeSync& m_mn_sync;
121122 const std::unique_ptr<CCoinJoinClientQueueManager>& m_queueman;
122123
@@ -202,7 +203,7 @@ class CCoinJoinClientSession : public CCoinJoinBaseSession
202203 bool GetMixingMasternodeInfo (CDeterministicMNCPtr& ret) const ;
203204
204205 // / Passively run mixing in the background according to the configuration in settings
205- bool DoAutomaticDenominating (CChainState& active_chainstate , CConnman& connman, CTxMemPool& mempool, bool fDryRun = false ) EXCLUSIVE_LOCKS_REQUIRED(!cs_coinjoin);
206+ bool DoAutomaticDenominating (ChainstateManager& chainman , CConnman& connman, const CTxMemPool& mempool, bool fDryRun = false ) EXCLUSIVE_LOCKS_REQUIRED(!cs_coinjoin);
206207
207208 // / As a client, submit part of a future mixing transaction to a Masternode to start the process
208209 bool SubmitDenominate (CConnman& connman);
@@ -310,7 +311,7 @@ class CCoinJoinClientManager
310311 bool GetMixingMasternodesInfo (std::vector<CDeterministicMNCPtr>& vecDmnsRet) const EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
311312
312313 // / Passively run mixing in the background according to the configuration in settings
313- bool DoAutomaticDenominating (CChainState& active_chainstate , CConnman& connman, CTxMemPool& mempool, bool fDryRun = false ) EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
314+ bool DoAutomaticDenominating (ChainstateManager& chainman , CConnman& connman, const CTxMemPool& mempool, bool fDryRun = false ) EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
314315
315316 bool TrySubmitDenominate (const CService& mnAddr, CConnman& connman) EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
316317 bool MarkAlreadyJoinedQueueAsTried (CCoinJoinQueue& dsq) const EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
@@ -326,7 +327,7 @@ class CCoinJoinClientManager
326327
327328 void UpdatedBlockTip (const CBlockIndex* pindex);
328329
329- void DoMaintenance (CChainState& active_chainstate , CConnman& connman, CTxMemPool& mempool) EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
330+ void DoMaintenance (ChainstateManager& chainman , CConnman& connman, const CTxMemPool& mempool) EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
330331
331332 void GetJsonInfo (UniValue& obj) const EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
332333};
0 commit comments