phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

validation: clarify final |= BLOCK_FAILED_VALID in InvalidateBlock

Browse source 
This has no functional affect, as the any CBlockIndex*s which
to_mark_failed is set to will already have been marked failed.

Also prevents a situation where block already marked as
BLOCK_FAILED_CHILD is again unconditionally marked as
BLOCK_FAILED_VALID in the final |= BLOCK_FAILED_VALID.
This commit is contained in:
Matt Corallo 2025-03-08 17:43:44 +05:30 • committed by stratospher
parent aac5488909
commit 3c3548a70e
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/test/blockchain_tests.cpp
View file

@ -147,6 +147,11 @@ BOOST_FIXTURE_TEST_CASE(invalidate_block, TestChain100Setup)
WITH_LOCK(::cs_main, assert(pindex->nStatus & BLOCK_FAILED_CHILD)); WITH_LOCK(::cs_main, assert(pindex->nStatus & BLOCK_FAILED_CHILD));
pindex = pindex->pprev; pindex = pindex->pprev;
} }
// don't mark already invalidated block (orig_tip is BLOCK_FAILED_CHILD) with BLOCK_FAILED_VALID again
m_node.chainman->ActiveChainstate().InvalidateBlock(state, orig_tip);
WITH_LOCK(::cs_main, assert(orig_tip->nStatus & BLOCK_FAILED_CHILD));
WITH_LOCK(::cs_main, assert((orig_tip->nStatus & BLOCK_FAILED_VALID) == 0));
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()

12
src/validation.cpp
View file

@ -3779,11 +3779,13 @@ bool Chainstate::InvalidateBlock(BlockValidationState& state, CBlockIndex* pinde
return false; return false;
} }
// Mark pindex (or the last disconnected block) as invalid, even when it never was in the main chain // Mark pindex as invalid if it never was in the main chain
to_mark_failed->nStatus |= BLOCK_FAILED_VALID; if (!pindex_was_in_chain && !(pindex->nStatus & BLOCK_FAILED_MASK)) {
m_blockman.m_dirty_blockindex.insert(to_mark_failed); pindex->nStatus |= BLOCK_FAILED_VALID;
setBlockIndexCandidates.erase(to_mark_failed); m_blockman.m_dirty_blockindex.insert(pindex);
m_chainman.m_failed_blocks.insert(to_mark_failed); setBlockIndexCandidates.erase(pindex);
m_chainman.m_failed_blocks.insert(pindex);
}
// If any new blocks somehow arrived while we were disconnecting // If any new blocks somehow arrived while we were disconnecting
// (above), then the pre-calculation of what should go into // (above), then the pre-calculation of what should go into