Skip to content

instantsend: Ignore IS while reindexing/loading blocks from file, bail out early when IS is off #3985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PastaPastaPasta merged 3 commits into from
Feb 20, 2021
Merged

instantsend: Ignore IS while reindexing/loading blocks from file, bail out early when IS is off #3985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de8192e
instantsend: Bail out early on disabled IS in more places
UdjinM6 Jan 26, 2021
852e671
instantsend: Disable InstantSend while reindexing and importing blocks
UdjinM6 Jan 26, 2021
a394e9a
Drop extra checks in GetInstantSendLockHashByTxid, GetInstantSendLock…
UdjinM6 Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/llmq/quorums_instantsend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down