bugfix: Mark all nearest BLOCK_FAILED_CHILD descendants (if any) as BLOCK_FAILED_VALID while removing the invalidity flag from all ancestors in ResetBlockFailureFlags

UdjinM6 · UdjinM6 · commit fe38ff98390a · 2021-01-23T16:20:35.000+03:00
Fixes `Assertion failed: ((pindex-&gt;nStatus &amp; BLOCK_FAILED_MASK) == 0), function CheckBlockIndex`
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -3413,6 +3413,16 @@ bool CChainState::ResetBlockFailureFlags(CBlockIndex *pindex) {
             pindex->nStatus &= ~BLOCK_FAILED_MASK;
             setDirtyBlockIndex.insert(pindex);
             m_failed_blocks.erase(pindex);
+            // Mark all nearest BLOCK_FAILED_CHILD descendants (if any) as BLOCK_FAILED_VALID
+            auto itp = mapPrevBlockIndex.equal_range(pindex->GetBlockHash());
+            for (auto jt = itp.first; jt != itp.second; ++jt) {
+                if (jt->second->nStatus & BLOCK_FAILED_CHILD) {
+                    jt->second->nStatus |= BLOCK_FAILED_VALID;
+                    m_failed_blocks.insert(jt->second);
+                    setDirtyBlockIndex.insert(jt->second);
+                    setBlockIndexCandidates.erase(jt->second);
+                }
+            }
         }
         pindex = pindex->pprev;
     }
