diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp index 62abcbc007d..a8d5018fd33 100644 --- a/src/node/blockstorage.cpp +++ b/src/node/blockstorage.cpp @@ -487,10 +487,18 @@ bool BlockManager::LoadBlockIndex(const std::optional& snapshot_blockha pindex->m_chain_tx_count = pindex->nTx; } } + + if (pindex->nStatus & BLOCK_FAILED_CHILD) { + // BLOCK_FAILED_CHILD is deprecated, but may still exist on disk. Replace it with BLOCK_FAILED_VALID. + pindex->nStatus = (pindex->nStatus & ~BLOCK_FAILED_CHILD) | BLOCK_FAILED_VALID; + m_dirty_blockindex.insert(pindex); + } if (!(pindex->nStatus & BLOCK_FAILED_MASK) && pindex->pprev && (pindex->pprev->nStatus & BLOCK_FAILED_MASK)) { + // All descendants of invalid blocks are invalid too. pindex->nStatus |= BLOCK_FAILED_VALID; m_dirty_blockindex.insert(pindex); } + if (pindex->pprev) { pindex->BuildSkip(); }