refactor: remove governance & superblocks from libkernel and chainstate

src/Makefile.am

@@ -222,7 +222,6 @@ BITCOIN_CORE_H = \
   dsnotificationinterface.h \
   evo/assetlocktx.h \
   evo/cbtx.h \
-  evo/chainhelper.h \
   evo/creditpool.h \
   evo/deterministicmns.h \
   evo/dmn_types.h \
@@ -548,7 +547,6 @@ libbitcoin_node_a_SOURCES = \
   dsnotificationinterface.cpp \
   evo/assetlocktx.cpp \
   evo/cbtx.cpp \
-  evo/chainhelper.cpp \
   evo/creditpool.cpp \
   evo/deterministicmns.cpp \
   evo/dmnstate.cpp \
@@ -1282,7 +1280,6 @@ libdashkernel_la_SOURCES = \
   deploymentstatus.cpp \
   evo/assetlocktx.cpp \
   evo/cbtx.cpp \
-  evo/chainhelper.cpp \
   evo/creditpool.cpp \
   evo/deterministicmns.cpp \
   evo/dmnstate.cpp \
@@ -1297,19 +1294,10 @@ libdashkernel_la_SOURCES = \
   evo/specialtx_filter.cpp \
   evo/specialtxman.cpp \
   flatfile.cpp \
-  governance/common.cpp \
-  governance/object.cpp \
-  governance/superblock.cpp \
-  governance/vote.cpp \
-  governance/votedb.cpp \
   gsl/assert.cpp \
   hash.cpp \
-  index/addressindex.cpp \
   index/addressindex_util.cpp \
   index/base.cpp \
-  index/blockfilterindex.cpp \
-  index/coinstatsindex.cpp \
-  index/spentindex.cpp \
   index/txindex.cpp \
   init/common.cpp \
   instantsend/db.cpp \
@@ -1326,9 +1314,6 @@ libdashkernel_la_SOURCES = \
   llmq/blockprocessor.cpp \
   llmq/commitment.cpp \
   llmq/context.cpp \
-  llmq/debug.cpp \
-  llmq/dkgsession.cpp \
-  llmq/dkgsessionhandler.cpp \
   llmq/dkgsessionmgr.cpp \
   llmq/options.cpp \
   llmq/quorums.cpp \
@@ -1340,7 +1325,6 @@ libdashkernel_la_SOURCES = \
   logging.cpp \
   masternode/meta.cpp \
   masternode/payments.cpp \
-  masternode/sync.cpp \
   merkleblock.cpp \
   messagesigner.cpp \
   netaddress.cpp \

src/active/context.cpp

@@ -27,7 +27,7 @@
 #include <validationinterface.h>
 
 ActiveContext::ActiveContext(CBLSWorker& bls_worker, ChainstateManager& chainman, CConnman& connman,
-                             CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+                             CDeterministicMNManager& dmnman, CGovernanceManager& govman, CMNHFManager& mnhfman,
                              governance::SuperblockManager& superblocks, CSporkManager& sporkman,
                              const chainlock::Chainlocks& chainlocks, CTxMemPool& mempool,
                              chainlock::ChainlockHandler& clhandler, llmq::CInstantSendManager& isman,
@@ -43,7 +43,7 @@ ActiveContext::ActiveContext(CBLSWorker& bls_worker, ChainstateManager& chainman
     qdkgsman{std::make_unique<llmq::CDKGSessionManager>(dmnman, qsnapman, chainman, sporkman, db_params)},
     shareman{std::make_unique<llmq::CSigSharesManager>(connman, chainman, sigman, *nodeman, qman, sporkman)},
     gov_signer{std::make_unique<GovernanceSigner>(dmnman, govman, superblocks, *nodeman, chainman, mn_sync)},
-    ehf_sighandler{std::make_unique<llmq::CEHFSignalsHandler>(chainman, sigman, *shareman, qman)},
+    ehf_sighandler{std::make_unique<llmq::CEHFSignalsHandler>(chainman, mnhfman, sigman, *shareman, qman)},
     cl_signer{std::make_unique<chainlock::ChainLockSigner>(chainman, chainlocks, clhandler, isman,
                                                            qman, sigman, *shareman, mn_sync)},
     is_signer{std::make_unique<instantsend::InstantSendSigner>(chainman, chainlocks, isman, sigman,

src/active/context.h

@@ -59,7 +59,7 @@ struct ActiveContext final : public llmq::QuorumRole, public CValidationInterfac
     ActiveContext(const ActiveContext&) = delete;
     ActiveContext& operator=(const ActiveContext&) = delete;
     explicit ActiveContext(CBLSWorker& bls_worker, ChainstateManager& chainman, CConnman& connman,
-                           CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+                           CDeterministicMNManager& dmnman, CGovernanceManager& govman, CMNHFManager& mnhfman,
                            governance::SuperblockManager& superblocks, CSporkManager& sporkman,
                            const chainlock::Chainlocks& chainlocks, CTxMemPool& mempool,
                            chainlock::ChainlockHandler& clhandler, llmq::CInstantSendManager& isman,

src/bitcoin-chainstate.cpp

@@ -19,14 +19,13 @@
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <core_io.h>
-#include <evo/chainhelper.h>
 #include <evo/deterministicmns.h>
 #include <evo/evodb.h>
+#include <evo/specialtxman.h>
 #include <init/common.h>
-#include <instantsend/instantsend.h>
 #include <llmq/context.h>
+#include <llmq/options.h>
 #include <masternode/meta.h>
-#include <masternode/sync.h>
 #include <node/blockstorage.h>
 #include <node/caches.h>
 #include <node/chainstate.h>
@@ -98,27 +97,27 @@ int main(int argc, char* argv[])
     CMasternodeMetaMan metaman;
     CEvoDB evodb{util::DbWrapperParams{.path = gArgs.GetDataDirNet(), .memory = false, .wipe = false}};
     CDeterministicMNManager dmnman{evodb, metaman};
-    CMasternodeSync mn_sync{std::make_unique<NullNodeSyncNotifier>()};
     CSporkManager sporkman;
     chainlock::Chainlocks chainlocks(sporkman);
-    // TODO: remove isman from bitcoin-chainstate and make it nullable for node::ChainstateLoadOptions same as mempool
-    llmq::CInstantSendManager isman{sporkman, util::DbWrapperParams{.path = gArgs.GetDataDirNet(), .memory = false, .wipe = false}};
 
-    std::unique_ptr<LLMQContext> llmq_ctx;
-    std::unique_ptr<CChainstateHelper> chain_helper;
+    auto llmq_ctx = WITH_LOCK(::cs_main, return std::make_unique<LLMQContext>(dmnman, evodb, chainman,
+                                                                              util::DbWrapperParams{.path = gArgs.GetDataDirNet(), .memory = false, .wipe = false},
+                                                                              llmq::DEFAULT_BLSCHECK_THREADS, llmq::DEFAULT_WORKER_COUNT, llmq::DEFAULT_MAX_RECOVERED_SIGS_AGE));
+    auto special_tx = std::make_unique<CSpecialTxProcessor>(evodb, dmnman,
+                                                            *llmq_ctx->quorum_block_processor, *llmq_ctx->qsnapman,
+                                                            chainman, chainman.m_blockman, chainman.GetConsensus(),
+                                                            chainlocks, *llmq_ctx->qman);
 
     node::CacheSizes cache_sizes;
     cache_sizes.block_tree_db = 2 << 20;
     cache_sizes.coins_db = 2 << 22;
     cache_sizes.coins = (450 << 20) - (2 << 20) - (2 << 22);
     node::ChainstateLoadOptions options;
-    options.isman = &isman;
     options.chainlocks = &chainlocks;
-    options.mn_sync = &mn_sync;
     options.data_dir = gArgs.GetDataDirNet();
     options.check_interrupt = [] { return false; };
     options.coins_error_cb = [] {};
-    auto [status, error] = node::LoadChainstate(chainman, cache_sizes, options, evodb, dmnman, llmq_ctx, chain_helper);
+    auto [status, error] = node::LoadChainstate(chainman, cache_sizes, options, evodb, dmnman, *special_tx);
     if (status != node::ChainstateLoadStatus::SUCCESS) {
         std::cerr << "Failed to load Chain state from your datadir." << std::endl;
         goto epilogue;
@@ -280,6 +279,6 @@ int main(int argc, char* argv[])
     }
     GetMainSignals().UnregisterBackgroundSignalScheduler();
     // Tear down Dash kernel objects before kernel::~Context().
-    chain_helper.reset();
+    special_tx.reset();
     llmq_ctx.reset();
 }

src/evo/providertx_service.cpp

@@ -7,7 +7,6 @@
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
-#include <evo/chainhelper.h>
 #include <evo/deterministicmns.h>
 #include <evo/netinfo.h>
 #include <evo/providertx.h>
@@ -360,7 +359,7 @@ std::optional<ProviderTxError> Preflight(node::NodeContext& node, const CTransac
 {
     AssertLockNotHeld(::cs_main);
     auto& chainman{*Assert(node.chainman)};
-    auto& chain_helper{*Assert(node.chain_helper)};
+    auto& special_tx{*Assert(node.special_tx)};
     LOCK(::cs_main);
 
     const CBlockIndex* tip{chainman.ActiveChain().Tip()};
@@ -379,7 +378,7 @@ std::optional<ProviderTxError> Preflight(node::NodeContext& node, const CTransac
     }
 
     TxValidationState state;
-    if (!chain_helper.special_tx->CheckSpecialTx(tx, tip, GetSpecialTxRules(tip, chainman),
+    if (!special_tx.CheckSpecialTx(tx, tip, GetSpecialTxRules(tip, chainman),
                                                  chainman.ActiveChainstate().CoinsTip(), true, state)) {
         return Error(ProviderTxErrorCode::CONSENSUS_REJECTED, state.ToString(), state.GetRejectReason());
     }