validation: reset BLOCK_FAILED_CHILD to BLOCK_FAILED_VALID when loading from disk

stratospher · stratospher · commit 7aa7f27418e4 · 2025-02-07T14:05:02.000+05:30
- there maybe existing block indexes stored in disk with
  BLOCK_FAILED_CHILD
- since they don't exist anymore, clean up block index entries with
  BLOCK_FAILED_CHILD and reset it to BLOCK_FAILED_VALID.
diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp
@@ -462,7 +462,9 @@ bool BlockManager::LoadBlockIndex(const std::optional<uint256>& snapshot_blockha
             }
         }
         if (!(pindex->nStatus & BLOCK_FAILED_VALID) && pindex->pprev && (pindex->pprev->nStatus & BLOCK_FAILED_VALID)) {
-            pindex->nStatus |= BLOCK_FAILED_VALID;
+            // if BLOCK_FAILED_CHILD already exists in disk, clear it
+            // and reset it to BLOCK_FAILED_VALID which is used everywhere now
+            pindex->nStatus = (pindex->nStatus & ~BLOCK_FAILED_CHILD) | BLOCK_FAILED_VALID;
             m_dirty_blockindex.insert(pindex);
         }
         if (pindex->pprev) {

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,9 @@ bool BlockManager::LoadBlockIndex(const std::optional<uint256>& snapshot_blockha`
`462`	`462`	`}`
`463`	`463`	`}`
`464`	`464`	`if (!(pindex->nStatus & BLOCK_FAILED_VALID) && pindex->pprev && (pindex->pprev->nStatus & BLOCK_FAILED_VALID)) {`
`465`		`- pindex->nStatus \|= BLOCK_FAILED_VALID;`
	`465`	`+ // if BLOCK_FAILED_CHILD already exists in disk, clear it`
	`466`	`+ // and reset it to BLOCK_FAILED_VALID which is used everywhere now`
	`467`	`+ pindex->nStatus = (pindex->nStatus & ~BLOCK_FAILED_CHILD) \| BLOCK_FAILED_VALID;`
`466`	`468`	`m_dirty_blockindex.insert(pindex);`
`467`	`469`	`}`
`468`	`470`	`if (pindex->pprev) {`