refactor: trivial refactorings of llmq/

src/evo/deterministicmns.cpp

@@ -13,7 +13,6 @@
 #include <base58.h>
 #include <chainparams.h>
 #include <consensus/validation.h>
-#include <core_io.h>
 #include <script/standard.h>
 #include <ui_interface.h>
 #include <validation.h>

src/llmq/blockprocessor.cpp

@@ -25,6 +25,15 @@
 
 #include <map>
 
+static void PreComputeQuorumMembers(const CBlockIndex* pindex, bool reset_cache = false)
+{
+    for (const Consensus::LLMQParams& params : llmq::utils::GetEnabledQuorumParams(pindex->pprev)) {
+        if (llmq::utils::IsQuorumRotationEnabled(params, pindex) && (pindex->nHeight % params.dkgInterval == 0)) {
+            llmq::utils::GetAllQuorumMembers(params.type, pindex, reset_cache);
+        }
+    }
+}
+
 namespace llmq
 {
 
@@ -148,7 +157,7 @@ bool CQuorumBlockProcessor::ProcessBlock(const CBlock& block, const CBlockIndex*
         return true;
     }
 
-    llmq::utils::PreComputeQuorumMembers(pindex);
+    PreComputeQuorumMembers(pindex);
 
     std::multimap<Consensus::LLMQType, CFinalCommitment> qcs;
     if (!GetCommitmentsFromBlock(block, pindex, qcs, state)) {
@@ -304,7 +313,7 @@ bool CQuorumBlockProcessor::UndoBlock(const CBlock& block, const CBlockIndex* pi
 {
     AssertLockHeld(cs_main);
 
-    llmq::utils::PreComputeQuorumMembers(pindex, true);
+    PreComputeQuorumMembers(pindex, true);
 
     std::multimap<Consensus::LLMQType, CFinalCommitment> qcs;
     BlockValidationState dummy;

src/llmq/chainlocks.cpp

@@ -447,12 +447,8 @@ CChainLocksHandler::BlockTxs::mapped_type CChainLocksHandler::GetBlockTxs(const
     return ret;
 }
 
-bool CChainLocksHandler::IsTxSafeForMining(const CInstantSendManager& isman, const uint256& txid) const
+bool CChainLocksHandler::IsTxSafeForMining(const uint256& txid) const
 {
-    if (!isman.RejectConflictingBlocks() || !isman.IsInstantSendEnabled() || isman.IsLocked(txid)) {
-        return true;
-    }
-
     int64_t txAge = 0;
     {
         LOCK(cs);

src/llmq/chainlocks.h

@@ -29,7 +29,6 @@ class PeerManager;
 
 namespace llmq
 {
-class CInstantSendManager;
 class CSigningManager;
 class CSigSharesManager;
 
@@ -113,7 +112,7 @@ class CChainLocksHandler : public CRecoveredSigsListener
     bool HasConflictingChainLock(int nHeight, const uint256& blockHash) const LOCKS_EXCLUDED(cs);
     bool VerifyChainLock(const CChainLockSig& clsig) const;
 
-    bool IsTxSafeForMining(const CInstantSendManager& isman, const uint256& txid) const LOCKS_EXCLUDED(cs);
+    bool IsTxSafeForMining(const uint256& txid) const LOCKS_EXCLUDED(cs);
 
 private:
     // these require locks to be held already

src/llmq/utils.cpp

@@ -40,6 +40,15 @@ VersionBitsCache llmq_versionbitscache;
 namespace utils
 
 {
+//QuorumMembers per quorumIndex at heights H-Cycle, H-2Cycles, H-3Cycles
+struct PreviousQuorumQuarters {
+    std::vector<std::vector<CDeterministicMNCPtr>> quarterHMinusC;
+    std::vector<std::vector<CDeterministicMNCPtr>> quarterHMinus2C;
+    std::vector<std::vector<CDeterministicMNCPtr>> quarterHMinus3C;
+    explicit PreviousQuorumQuarters(size_t s) :
+        quarterHMinusC(s), quarterHMinus2C(s), quarterHMinus3C(s) {}
+};
+
 // Forward declarations
 static std::vector<CDeterministicMNCPtr> ComputeQuorumMembers(Consensus::LLMQType llmqType, const CBlockIndex* pQuorumBaseBlockIndex);
 static std::vector<std::vector<CDeterministicMNCPtr>> ComputeQuorumMembersByQuarterRotation(const Consensus::LLMQParams& llmqParams, const CBlockIndex* pCycleQuorumBaseBlockIndex);
@@ -54,15 +63,6 @@ static void BuildQuorumSnapshot(const Consensus::LLMQParams& llmqParams, const C
 
 static bool IsInstantSendLLMQTypeShared();
 
-void PreComputeQuorumMembers(const CBlockIndex* pindex, bool reset_cache)
-{
-    for (const Consensus::LLMQParams& params : GetEnabledQuorumParams(pindex->pprev)) {
-        if (IsQuorumRotationEnabled(params, pindex) && (pindex->nHeight % params.dkgInterval == 0)) {
-            GetAllQuorumMembers(params.type, pindex, reset_cache);
-        }
-    }
-}
-
 uint256 GetHashModifier(const Consensus::LLMQParams& llmqParams, const CBlockIndex* pCycleQuorumBaseBlockIndex)
 {
     ASSERT_IF_DEBUG(pCycleQuorumBaseBlockIndex->nHeight % llmqParams.dkgInterval == 0);

src/llmq/utils.h

@@ -42,22 +42,12 @@ enum class QvvecSyncMode {
     OnlyIfTypeMember = 1,
 };
 
-//QuorumMembers per quorumIndex at heights H-Cycle, H-2Cycles, H-3Cycles
-struct PreviousQuorumQuarters {
-    std::vector<std::vector<CDeterministicMNCPtr>> quarterHMinusC;
-    std::vector<std::vector<CDeterministicMNCPtr>> quarterHMinus2C;
-    std::vector<std::vector<CDeterministicMNCPtr>> quarterHMinus3C;
-    explicit PreviousQuorumQuarters(size_t s) :
-        quarterHMinusC(s), quarterHMinus2C(s), quarterHMinus3C(s) {}
-};
-
 namespace utils
 {
 
 // includes members which failed DKG
 std::vector<CDeterministicMNCPtr> GetAllQuorumMembers(Consensus::LLMQType llmqType, const CBlockIndex* pQuorumBaseBlockIndex, bool reset_cache = false);
 
-void PreComputeQuorumMembers(const CBlockIndex* pindex, bool reset_cache = false);
 uint256 GetHashModifier(const Consensus::LLMQParams& llmqParams, const CBlockIndex* pCycleQuorumBaseBlockIndex);
 uint256 BuildCommitmentHash(Consensus::LLMQType llmqType, const uint256& blockHash, const std::vector<bool>& validMembers, const CBLSPublicKey& pubKey, const uint256& vvecHash);
 uint256 BuildSignHash(Consensus::LLMQType llmqType, const uint256& quorumHash, const uint256& id, const uint256& msgHash);

src/miner.cpp

@@ -286,7 +286,11 @@ bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& packa
     for (CTxMemPool::txiter it : package) {
         if (!IsFinalTx(it->GetTx(), nHeight, nLockTimeCutoff))
             return false;
-        if (!m_clhandler.IsTxSafeForMining(m_isman, it->GetTx().GetHash())) {
+
+        const auto& txid = it->GetTx().GetHash();
+        if (!m_isman.RejectConflictingBlocks() || !m_isman.IsInstantSendEnabled() || m_isman.IsLocked(txid)) continue;
+
+        if (!m_clhandler.IsTxSafeForMining(txid)) {
             return false;
         }
     }

test/lint/lint-circular-dependencies.sh

@@ -53,7 +53,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "qt/bitcoingui -> qt/guiutil -> qt/bitcoingui"
     "qt/guiutil -> qt/optionsdialog -> qt/guiutil"
     "qt/guiutil -> qt/qvalidatedlineedit -> qt/guiutil"
-    "core_io -> evo/cbtx -> evo/deterministicmns -> core_io"
     "core_io -> evo/cbtx -> evo/simplifiedmns -> core_io"
     "evo/simplifiedmns -> llmq/blockprocessor -> net_processing -> evo/simplifiedmns"
     "llmq/dkgsession -> llmq/dkgsessionmgr -> llmq/dkgsessionhandler -> llmq/dkgsession"