Skip to content

fix: reuse best clsig to avoid potential race condition #6940

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
merged 2 commits into from
Nov 4, 2025
Merged

fix: reuse best clsig to avoid potential race condition #6940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98dc874
trivial: use `GetBestChainLockHeight()`
kwvg Nov 4, 2025
c0faae0
fix: reuse best clsig to avoid potential race condition
kwvg Nov 4, 2025
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
2 changes: 1 addition & 1 deletion src/evo/chainhelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ bool CChainstateHelper::HasChainLock(int nHeight, const uint256& blockHash) cons
return clhandler.HasChainLock(nHeight, blockHash);
}

int32_t CChainstateHelper::GetBestChainLockHeight() const { return clhandler.GetBestChainLock().getHeight(); }
int32_t CChainstateHelper::GetBestChainLockHeight() const { return clhandler.GetBestChainLockHeight(); }

/** Passthrough functions to CInstantSendManager */
std::optional<std::pair</*islock_hash=*/uint256, /*txid=*/uint256>> CChainstateHelper::ConflictingISLockIfAny(
Expand Down
2 changes: 1 addition & 1 deletion src/node/miner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ static bool CalcCbTxBestChainlock(const llmq::CChainLocksHandler& chainlock_hand

// Inserting our best CL
bestCLHeightDiff = pindexPrev->nHeight - best_clsig.getHeight();
bestCLSignature = chainlock_handler.GetBestChainLock().getSig();
bestCLSignature = best_clsig.getSig();

return true;
}
Expand Down
5 changes: 3 additions & 2 deletions src/rpc/rawtransaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,8 +667,9 @@ static RPCHelpMan getassetunlockstatuses()
}
else {
const auto pBlockIndexBestCL = [&]() -> const CBlockIndex* {
if (!llmq_ctx.clhandler->GetBestChainLock().IsNull()) {
return pTipBlockIndex->GetAncestor(llmq_ctx.clhandler->GetBestChainLock().getHeight());
const auto best_clsig = llmq_ctx.clhandler->GetBestChainLock();
if (!best_clsig.IsNull()) {
return pTipBlockIndex->GetAncestor(best_clsig.getHeight());
}
// If no CL info is available, try to use CbTx CL information
if (const auto cbtx_best_cl = GetNonNullCoinbaseChainlock(pTipBlockIndex)) {
Expand Down
Loading