Merge 7be143a960 into merged_master (Bitcoin PR bitcoin/bitcoin#22824)

This commit is contained in:
Byron Hambly 2023-04-11 08:37:41 +00:00
commit cb71563589
2 changed files with 3 additions and 7 deletions

View file

@ -3267,10 +3267,7 @@ void CChainState::ReceivedBlockTransactions(const CBlock& block, CBlockIndex* pi
CBlockIndex *pindex = queue.front();
queue.pop_front();
pindex->nChainTx = (pindex->pprev ? pindex->pprev->nChainTx : 0) + pindex->nTx;
{
LOCK(cs_nBlockSequenceId);
pindex->nSequenceId = nBlockSequenceId++;
}
pindex->nSequenceId = nBlockSequenceId++;
if (m_chain.Tip() == nullptr || !setBlockIndexCandidates.value_comp()(pindex, m_chain.Tip())) {
setBlockIndexCandidates.insert(pindex);
}