refactor: drop dependency of InstantSend on CMasternodeSync

Author: knst

src/instantsend/instantsend.cpp

@@ -6,7 +6,6 @@
 
 #include <chainparams.h>
 #include <consensus/validation.h>
-#include <masternode/sync.h>
 #include <node/blockstorage.h>
 #include <spork.h>
 #include <stats/client.h>
@@ -15,11 +14,9 @@ using node::fImporting;
 using node::fReindex;
 
 namespace llmq {
-CInstantSendManager::CInstantSendManager(CSporkManager& sporkman, const CMasternodeSync& mn_sync,
-                                         const util::DbWrapperParams& db_params) :
+CInstantSendManager::CInstantSendManager(CSporkManager& sporkman, const util::DbWrapperParams& db_params) :
     db{db_params},
-    spork_manager{sporkman},
-    m_mn_sync{mn_sync}
+    spork_manager{sporkman}
 {
 }
 
@@ -471,9 +468,6 @@ bool CInstantSendManager::IsInstantSendEnabled() const
 
 bool CInstantSendManager::RejectConflictingBlocks() const
 {
-    if (!m_mn_sync.IsBlockchainSynced()) {
-        return false;
-    }
     if (!spork_manager.IsSporkActive(SPORK_3_INSTANTSEND_BLOCK_FILTERING)) {
         LogPrint(BCLog::INSTANTSEND, "%s: spork3 is off, skipping transaction locking checks\n", __func__);
         return false;

src/instantsend/instantsend.h

@@ -20,7 +20,6 @@
 
 class CBlockIndex;
 class CDataStream;
-class CMasternodeSync;
 class CSporkManager;
 namespace Consensus {
 struct LLMQParams;
@@ -54,7 +53,6 @@ class CInstantSendManager
 private:
     instantsend::CInstantSendDb db;
     CSporkManager& spork_manager;
-    const CMasternodeSync& m_mn_sync;
 
     mutable Mutex cs_pendingLocks;
     // Incoming and not verified yet
@@ -90,8 +88,7 @@ class CInstantSendManager
     CInstantSendManager() = delete;
     CInstantSendManager(const CInstantSendManager&) = delete;
     CInstantSendManager& operator=(const CInstantSendManager&) = delete;
-    explicit CInstantSendManager(CSporkManager& sporkman, const CMasternodeSync& mn_sync,
-                                 const util::DbWrapperParams& db_params);
+    explicit CInstantSendManager(CSporkManager& sporkman, const util::DbWrapperParams& db_params);
     ~CInstantSendManager();
 
     void AddNonLockedTx(const CTransactionRef& tx, const CBlockIndex* pindexMined)

src/llmq/context.cpp

@@ -13,17 +13,16 @@
 #include <validation.h>
 
 LLMQContext::LLMQContext(CDeterministicMNManager& dmnman, CEvoDB& evo_db, CSporkManager& sporkman,
-                         ChainstateManager& chainman, const CMasternodeSync& mn_sync,
-                         const util::DbWrapperParams& db_params, int8_t bls_threads, int16_t worker_count,
-                         int64_t max_recsigs_age) :
+                         ChainstateManager& chainman, const util::DbWrapperParams& db_params, int8_t bls_threads,
+                         int16_t worker_count, int64_t max_recsigs_age) :
     bls_worker{std::make_shared<CBLSWorker>()},
     qsnapman{std::make_unique<llmq::CQuorumSnapshotManager>(evo_db)},
     quorum_block_processor{std::make_unique<llmq::CQuorumBlockProcessor>(chainman.ActiveChainstate(), dmnman, evo_db,
                                                                          *qsnapman, bls_threads)},
     qman{std::make_unique<llmq::CQuorumManager>(*bls_worker, dmnman, evo_db, *quorum_block_processor, *qsnapman,
                                                 chainman, db_params)},
     sigman{std::make_unique<llmq::CSigningManager>(*qman, db_params, max_recsigs_age)},
-    isman{std::make_unique<llmq::CInstantSendManager>(sporkman, mn_sync, db_params)}
+    isman{std::make_unique<llmq::CInstantSendManager>(sporkman, db_params)}
 {
     // Have to start it early to let VerifyDB check ChainLock signatures in coinbase
     bls_worker->Start(worker_count);

src/llmq/context.h

@@ -13,7 +13,6 @@ class CBLSWorker;
 class ChainstateManager;
 class CDeterministicMNManager;
 class CEvoDB;
-class CMasternodeSync;
 class CSporkManager;
 class PeerManager;
 
@@ -34,9 +33,8 @@ struct LLMQContext {
     LLMQContext(const LLMQContext&) = delete;
     LLMQContext& operator=(const LLMQContext&) = delete;
     explicit LLMQContext(CDeterministicMNManager& dmnman, CEvoDB& evo_db, CSporkManager& sporkman,
-                         ChainstateManager& chainman, const CMasternodeSync& mn_sync,
-                         const util::DbWrapperParams& db_params, int8_t bls_threads, int16_t worker_count,
-                         int64_t max_recsigs_age);
+                         ChainstateManager& chainman, const util::DbWrapperParams& db_params, int8_t bls_threads,
+                         int16_t worker_count, int64_t max_recsigs_age);
     ~LLMQContext();
 
     /** Guaranteed if LLMQContext is initialized then all members are valid too

src/node/chainstate.cpp

@@ -230,7 +230,7 @@ void DashChainstateSetup(ChainstateManager& chainman,
     dmnman = std::make_unique<CDeterministicMNManager>(evodb, mn_metaman);
 
     llmq_ctx.reset();
-    llmq_ctx = std::make_unique<LLMQContext>(*dmnman, evodb, sporkman, chainman, mn_sync,
+    llmq_ctx = std::make_unique<LLMQContext>(*dmnman, evodb, sporkman, chainman,
                                              util::DbWrapperParams{.path = data_dir, .memory = llmq_dbs_in_memory, .wipe = llmq_dbs_wipe},
                                              bls_threads, worker_count, max_recsigs_age);
     mempool->ConnectManagers(dmnman.get(), llmq_ctx->isman.get());