refactor: move CheckSpecialTx into CSpecialTxProcessor

kwvg · kwvg · commit 191b3de9b482 · 2024-04-09T20:45:32.000Z
diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp
@@ -72,10 +72,10 @@ static bool CheckSpecialTxInner(CDeterministicMNManager& dmnman, const CTransact
     return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-tx-type-check");
 }
 
-bool CheckSpecialTx(CDeterministicMNManager& dmnman, const CTransaction& tx, const CBlockIndex* pindexPrev, const CCoinsViewCache& view, bool check_sigs, TxValidationState& state)
+bool CSpecialTxProcessor::CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, const CCoinsViewCache& view, bool check_sigs, TxValidationState& state)
 {
     AssertLockHeld(cs_main);
-    return CheckSpecialTxInner(dmnman, tx, pindexPrev, view, std::nullopt, check_sigs, state);
+    return CheckSpecialTxInner(m_dmnman, tx, pindexPrev, view, std::nullopt, check_sigs, state);
 }
 
 [[nodiscard]] bool CSpecialTxProcessor::ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, TxValidationState& state)
diff --git a/src/evo/specialtxman.h b/src/evo/specialtxman.h
@@ -29,9 +29,6 @@ class CChainLocksHandler;
 
 extern RecursiveMutex cs_main;
 
-bool CheckSpecialTx(CDeterministicMNManager& dmnman, const CTransaction& tx, const CBlockIndex* pindexPrev,
-                    const CCoinsViewCache& view, bool check_sigs, TxValidationState& state) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
-
 class CSpecialTxProcessor
 {
 private:
@@ -51,6 +48,8 @@ class CSpecialTxProcessor
                                  const Consensus::Params& consensus_params, const llmq::CChainLocksHandler& clhandler) :
         m_cpoolman(cpoolman), m_dmnman{dmnman}, m_mnhfman{mnhfman}, m_qblockman{qblockman}, m_consensus_params{consensus_params}, m_clhandler{clhandler} {}
 
+    bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, const CCoinsViewCache& view, bool check_sigs, TxValidationState& state)
+        EXCLUSIVE_LOCKS_REQUIRED(cs_main);
     bool ProcessSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex, const CCoinsViewCache& view, bool fJustCheck,
                                   bool fCheckCbTxMerkleRoots, BlockValidationState& state, std::optional<MNListUpdates>& updatesRet)
         EXCLUSIVE_LOCKS_REQUIRED(cs_main);
diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
@@ -8,6 +8,7 @@
 #include <consensus/validation.h>
 #include <core_io.h>
 #include <deploymentstatus.h>
+#include <evo/chainhelper.h>
 #include <evo/deterministicmns.h>
 #include <evo/dmn_types.h>
 #include <evo/providertx.h>
@@ -324,13 +325,13 @@ static void SignSpecialTxPayloadByHash(const CMutableTransaction& tx, SpecialTxP
     payload.sig = key.Sign(hash);
 }
 
-static std::string SignAndSendSpecialTx(const JSONRPCRequest& request, CDeterministicMNManager& dmnman, const ChainstateManager& chainman, const CMutableTransaction& tx, bool fSubmit = true)
+static std::string SignAndSendSpecialTx(const JSONRPCRequest& request, CChainstateHelper& chain_helper, const ChainstateManager& chainman, const CMutableTransaction& tx, bool fSubmit = true)
 {
     {
     LOCK(cs_main);
 
     TxValidationState state;
-    if (!CheckSpecialTx(dmnman, CTransaction(tx), chainman.ActiveChain().Tip(), chainman.ActiveChainstate().CoinsTip(), true, state)) {
+    if (!chain_helper.special_tx->CheckSpecialTx(CTransaction(tx), chainman.ActiveChain().Tip(), chainman.ActiveChainstate().CoinsTip(), true, state)) {
         throw std::runtime_error(state.ToString());
     }
     } // cs_main
@@ -579,7 +580,7 @@ static void protx_register_prepare_evo_help(const JSONRPCRequest& request)
 }
 
 static UniValue protx_register_common_wrapper(const JSONRPCRequest& request,
-                                              CDeterministicMNManager& dmnman,
+                                              CChainstateHelper& chain_helper,
                                               const ChainstateManager& chainman,
                                               const bool specific_legacy_bls_scheme,
                                               const bool isExternalRegister,
@@ -739,7 +740,7 @@ static UniValue protx_register_common_wrapper(const JSONRPCRequest& request,
         ptx.collateralOutpoint.n = collateralIndex;
 
         SetTxPayload(tx, ptx);
-        return SignAndSendSpecialTx(request, dmnman, chainman, tx, fSubmit);
+        return SignAndSendSpecialTx(request, chain_helper, chainman, tx, fSubmit);
     } else {
         // referencing external collateral
 
@@ -787,7 +788,7 @@ static UniValue protx_register_common_wrapper(const JSONRPCRequest& request,
                 }
                 SignSpecialTxPayloadByString(tx, ptx, key);
                 SetTxPayload(tx, ptx);
-                return SignAndSendSpecialTx(request, dmnman, chainman, tx, fSubmit);
+                return SignAndSendSpecialTx(request, chain_helper, chainman, tx, fSubmit);
             }
         } catch (...) {
             if (unlockOnError) {
@@ -798,7 +799,7 @@ static UniValue protx_register_common_wrapper(const JSONRPCRequest& request,
     }
 }
 
-static UniValue protx_register_evo(const JSONRPCRequest& request, CDeterministicMNManager& dmnman, const ChainstateManager& chainman)
+static UniValue protx_register_evo(const JSONRPCRequest& request, CChainstateHelper& chain_helper, const ChainstateManager& chainman)
 {
     bool isExternalRegister = request.strMethod == "protxregister_evo";
     bool isFundRegister = request.strMethod == "protxregister_fund_evo";
@@ -811,26 +812,26 @@ static UniValue protx_register_evo(const JSONRPCRequest& request, CDeterministic
         isFundRegister = request.strMethod == "protxregister_fund_hpmn";
         isPrepareRegister = request.strMethod == "protxregister_prepare_hpmn";
     }
-    return protx_register_common_wrapper(request, dmnman, chainman, false, isExternalRegister, isFundRegister, isPrepareRegister, MnType::Evo);
+    return protx_register_common_wrapper(request, chain_helper, chainman, false, isExternalRegister, isFundRegister, isPrepareRegister, MnType::Evo);
 }
 
-static UniValue protx_register(const JSONRPCRequest& request, CDeterministicMNManager& dmnman, const ChainstateManager& chainman)
+static UniValue protx_register(const JSONRPCRequest& request, CChainstateHelper& chain_helper, const ChainstateManager& chainman)
 {
     bool isExternalRegister = request.strMethod == "protxregister";
     bool isFundRegister = request.strMethod == "protxregister_fund";
     bool isPrepareRegister = request.strMethod == "protxregister_prepare";
-    return protx_register_common_wrapper(request, dmnman, chainman, false, isExternalRegister, isFundRegister, isPrepareRegister, MnType::Regular);
+    return protx_register_common_wrapper(request, chain_helper, chainman, false, isExternalRegister, isFundRegister, isPrepareRegister, MnType::Regular);
 }
 
-static UniValue protx_register_legacy(const JSONRPCRequest& request, CDeterministicMNManager& dmnman, const ChainstateManager& chainman)
+static UniValue protx_register_legacy(const JSONRPCRequest& request, CChainstateHelper& chain_helper, const ChainstateManager& chainman)
 {
     bool isExternalRegister = request.strMethod == "protxregister_legacy";
     bool isFundRegister = request.strMethod == "protxregister_fund_legacy";
     bool isPrepareRegister = request.strMethod == "protxregister_prepare_legacy";
-    return protx_register_common_wrapper(request, dmnman, chainman, true, isExternalRegister, isFundRegister, isPrepareRegister, MnType::Regular);
+    return protx_register_common_wrapper(request, chain_helper, chainman, true, isExternalRegister, isFundRegister, isPrepareRegister, MnType::Regular);
 }
 
-static UniValue protx_register_submit(const JSONRPCRequest& request, CDeterministicMNManager& dmnman, const ChainstateManager& chainman)
+static UniValue protx_register_submit(const JSONRPCRequest& request, CChainstateHelper& chain_helper, const ChainstateManager& chainman)
 {
     protx_register_submit_help(request);
 
@@ -863,7 +864,7 @@ static UniValue protx_register_submit(const JSONRPCRequest& request, CDeterminis
     }
 
     SetTxPayload(tx, ptx);
-    return SignAndSendSpecialTx(request, dmnman, chainman, tx);
+    return SignAndSendSpecialTx(request, chain_helper, chainman, tx);
 }
 
 static void protx_update_service_help(const JSONRPCRequest& request)
@@ -914,7 +915,7 @@ static void protx_update_service_evo_help(const JSONRPCRequest& request)
     }.Check(request);
 }
 
-static UniValue protx_update_service_common_wrapper(const JSONRPCRequest& request, CDeterministicMNManager& dmnman, const ChainstateManager& chainman, const MnType mnType)
+static UniValue protx_update_service_common_wrapper(const JSONRPCRequest& request, CChainstateHelper& chain_helper, CDeterministicMNManager& dmnman, const ChainstateManager& chainman, const MnType mnType)
 {
     if (request.strMethod.find("_hpmn") != std::string::npos) {
         if (!IsDeprecatedRPCEnabled("hpmn")) {
@@ -1026,7 +1027,7 @@ static UniValue protx_update_service_common_wrapper(const JSONRPCRequest& reques
     SignSpecialTxPayloadByHash(tx, ptx, keyOperator);
     SetTxPayload(tx, ptx);
 
-    return SignAndSendSpecialTx(request, dmnman, chainman, tx);
+    return SignAndSendSpecialTx(request, chain_helper, chainman, tx);
 }
 
 static void protx_update_registrar_help(const JSONRPCRequest& request, bool legacy)
@@ -1056,7 +1057,7 @@ static void protx_update_registrar_help(const JSONRPCRequest& request, bool lega
     }.Check(request);
 }
 
-static UniValue protx_update_registrar_wrapper(const JSONRPCRequest& request, CDeterministicMNManager& dmnman, const ChainstateManager& chainman, const bool specific_legacy_bls_scheme)
+static UniValue protx_update_registrar_wrapper(const JSONRPCRequest& request, CChainstateHelper& chain_helper, CDeterministicMNManager& dmnman, const ChainstateManager& chainman, const bool specific_legacy_bls_scheme)
 {
     protx_update_registrar_help(request, specific_legacy_bls_scheme);
 
@@ -1131,17 +1132,17 @@ static UniValue protx_update_registrar_wrapper(const JSONRPCRequest& request, CD
     SignSpecialTxPayloadByHash(tx, ptx, keyOwner);
     SetTxPayload(tx, ptx);
 
-    return SignAndSendSpecialTx(request, dmnman, chainman, tx);
+    return SignAndSendSpecialTx(request, chain_helper, chainman, tx);
 }
 
-static UniValue protx_update_registrar(const JSONRPCRequest& request, CDeterministicMNManager& dmnman, const ChainstateManager& chainman)
+static UniValue protx_update_registrar(const JSONRPCRequest& request, CChainstateHelper& chain_helper, CDeterministicMNManager& dmnman, const ChainstateManager& chainman)
 {
-    return protx_update_registrar_wrapper(request, dmnman, chainman, false);
+    return protx_update_registrar_wrapper(request, chain_helper, dmnman, chainman, false);
 }
 
-static UniValue protx_update_registrar_legacy(const JSONRPCRequest& request, CDeterministicMNManager& dmnman, const ChainstateManager& chainman)
+static UniValue protx_update_registrar_legacy(const JSONRPCRequest& request, CChainstateHelper& chain_helper, CDeterministicMNManager& dmnman, const ChainstateManager& chainman)
 {
-    return protx_update_registrar_wrapper(request, dmnman, chainman, true);
+    return protx_update_registrar_wrapper(request, chain_helper, dmnman, chainman, true);
 }
 
 static void protx_revoke_help(const JSONRPCRequest& request)
@@ -1167,7 +1168,7 @@ static void protx_revoke_help(const JSONRPCRequest& request)
     }.Check(request);
 }
 
-static UniValue protx_revoke(const JSONRPCRequest& request, CDeterministicMNManager& dmnman, const ChainstateManager& chainman)
+static UniValue protx_revoke(const JSONRPCRequest& request, CChainstateHelper& chain_helper, CDeterministicMNManager& dmnman, const ChainstateManager& chainman)
 {
     protx_revoke_help(request);
 
@@ -1227,7 +1228,7 @@ static UniValue protx_revoke(const JSONRPCRequest& request, CDeterministicMNMana
     SignSpecialTxPayloadByHash(tx, ptx, keyOperator);
     SetTxPayload(tx, ptx);
 
-    return SignAndSendSpecialTx(request, dmnman, chainman, tx);
+    return SignAndSendSpecialTx(request, chain_helper, chainman, tx);
 }
 
 #endif//ENABLE_WALLET
@@ -1676,24 +1677,27 @@ static UniValue protx(const JSONRPCRequest& request)
     CMasternodeMetaMan& mn_metaman = *node.mn_metaman;
 
 #ifdef ENABLE_WALLET
+    CHECK_NONFATAL(node.chain_helper);
+    CChainstateHelper& chain_helper = *node.chain_helper;
+
     if (command == "protxregister" || command == "protxregister_fund" || command == "protxregister_prepare") {
-        return protx_register(new_request, dmnman, chainman);
+        return protx_register(new_request, chain_helper, chainman);
     } else if (command == "protxregister_evo" || command == "protxregister_fund_evo" || command == "protxregister_prepare_evo" || command == "protxregister_hpmn" || command == "protxregister_fund_hpmn" || command == "protxregister_prepare_hpmn") {
-        return protx_register_evo(new_request, dmnman, chainman);
+        return protx_register_evo(new_request, chain_helper, chainman);
     } else if (command == "protxregister_legacy" || command == "protxregister_fund_legacy" || command == "protxregister_prepare_legacy") {
-        return protx_register_legacy(new_request, dmnman, chainman);
+        return protx_register_legacy(new_request, chain_helper, chainman);
     } else if (command == "protxregister_submit") {
-        return protx_register_submit(new_request, dmnman, chainman);
+        return protx_register_submit(new_request, chain_helper, chainman);
     } else if (command == "protxupdate_service") {
-        return protx_update_service_common_wrapper(new_request, dmnman, chainman, MnType::Regular);
+        return protx_update_service_common_wrapper(new_request, chain_helper, dmnman, chainman, MnType::Regular);
     } else if (command == "protxupdate_service_evo" || command == "protxupdate_service_hpmn") {
-        return protx_update_service_common_wrapper(new_request, dmnman, chainman, MnType::Evo);
+        return protx_update_service_common_wrapper(new_request, chain_helper, dmnman, chainman, MnType::Evo);
     } else if (command == "protxupdate_registrar") {
-        return protx_update_registrar(new_request, dmnman, chainman);
+        return protx_update_registrar(new_request, chain_helper, dmnman, chainman);
     } else if (command == "protxupdate_registrar_legacy") {
-        return protx_update_registrar_legacy(new_request, dmnman, chainman);
+        return protx_update_registrar_legacy(new_request, chain_helper, dmnman, chainman);
     } else if (command == "protxrevoke") {
-        return protx_revoke(new_request, dmnman, chainman);
+        return protx_revoke(new_request, chain_helper, dmnman, chainman);
     } else
 #endif
     if (command == "protxlist") {
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -529,7 +529,12 @@ namespace {
 class MemPoolAccept
 {
 public:
-    explicit MemPoolAccept(CTxMemPool& mempool, CChainState& active_chainstate) : m_pool(mempool), m_view(&m_dummy), m_viewmempool(&active_chainstate.CoinsTip(), m_pool), m_active_chainstate(active_chainstate),
+    explicit MemPoolAccept(CTxMemPool& mempool, CChainState& active_chainstate) :
+        m_pool(mempool),
+        m_view(&m_dummy),
+        m_viewmempool(&active_chainstate.CoinsTip(), m_pool),
+        m_active_chainstate(active_chainstate),
+        m_chain_helper(active_chainstate.ChainHelper()),
         m_limit_ancestors(gArgs.GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT)),
         m_limit_ancestor_size(gArgs.GetArg("-limitancestorsize", DEFAULT_ANCESTOR_SIZE_LIMIT)*1000),
         m_limit_descendants(gArgs.GetArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT)),
@@ -621,6 +626,7 @@ class MemPoolAccept
     CCoinsViewMemPool m_viewmempool;
     CCoinsView m_dummy;
     CChainState& m_active_chainstate;
+    CChainstateHelper& m_chain_helper;
 
     // The package limits in effect at the time of invocation.
     const size_t m_limit_ancestors;
@@ -830,7 +836,7 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
     // DoS scoring a node for non-critical errors, e.g. duplicate keys because a TX is received that was already
     // mined
     // NOTE: we use UTXO here and do NOT allow mempool txes as masternode collaterals
-    if (!CheckSpecialTx(*::deterministicMNManager, tx, m_active_chainstate.m_chain.Tip(), m_active_chainstate.CoinsTip(), true, state))
+    if (!m_chain_helper.special_tx->CheckSpecialTx(tx, m_active_chainstate.m_chain.Tip(), m_active_chainstate.CoinsTip(), true, state))
         return false;
 
     if (m_pool.existsProviderTxConflict(tx)) {
diff --git a/src/validation.h b/src/validation.h
@@ -718,6 +718,12 @@ class CChainState
      */
     std::set<CBlockIndex*, CBlockIndexWorkComparator> setBlockIndexCandidates;
 
+    CChainstateHelper& ChainHelper()
+    {
+        assert(m_chain_helper);
+        return *m_chain_helper;
+    }
+
     //! @returns A reference to the in-memory cache of the UTXO set.
     CCoinsViewCache& CoinsTip() EXCLUSIVE_LOCKS_REQUIRED(cs_main)
     {

Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,10 @@ static bool CheckSpecialTxInner(CDeterministicMNManager& dmnman, const CTransact`
`72`	`72`	`return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-tx-type-check");`
`73`	`73`	`}`
`74`	`74`
`75`		`-bool CheckSpecialTx(CDeterministicMNManager& dmnman, const CTransaction& tx, const CBlockIndex* pindexPrev, const CCoinsViewCache& view, bool check_sigs, TxValidationState& state)`
	`75`	`+bool CSpecialTxProcessor::CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, const CCoinsViewCache& view, bool check_sigs, TxValidationState& state)`
`76`	`76`	`{`
`77`	`77`	`AssertLockHeld(cs_main);`
`78`		`- return CheckSpecialTxInner(dmnman, tx, pindexPrev, view, std::nullopt, check_sigs, state);`
	`78`	`+ return CheckSpecialTxInner(m_dmnman, tx, pindexPrev, view, std::nullopt, check_sigs, state);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`[[nodiscard]] bool CSpecialTxProcessor::ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, TxValidationState& state)`