diff --git a/src/llmq/quorums_instantsend.cpp b/src/llmq/quorums_instantsend.cpp index c84e00603025..6d5cd3cd4fad 100644 --- a/src/llmq/quorums_instantsend.cpp +++ b/src/llmq/quorums_instantsend.cpp @@ -1146,6 +1146,10 @@ void CInstantSendManager::UpdatedBlockTip(const CBlockIndex* pindexNew) void CInstantSendManager::HandleFullyConfirmedBlock(const CBlockIndex* pindex) { + if (!IsInstantSendEnabled()) { + return; + } + LOCK(cs); auto& consensusParams = Params().GetConsensus(); @@ -1510,12 +1514,12 @@ void CInstantSendManager::WorkThreadMain() bool IsInstantSendEnabled() { - return sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED); + return !fReindex && !fImporting && sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED); } bool RejectConflictingBlocks() { - return sporkManager.IsSporkActive(SPORK_3_INSTANTSEND_BLOCK_FILTERING); + return !fReindex && !fImporting && sporkManager.IsSporkActive(SPORK_3_INSTANTSEND_BLOCK_FILTERING); } } // namespace llmq diff --git a/src/validation.cpp b/src/validation.cpp index 7e6c797fe633..89be636df084 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2386,7 +2386,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl REJECT_INVALID, "conflict-tx-lock"); } } - } else { + } else if (!fReindex && !fImporting) { LogPrintf("ConnectBlock(DASH): spork is off, skipping transaction locking checks\n"); }