Merge pull request #4496

5734d4d Only remove actualy failed blocks from setBlockIndexValid (Pieter Wuille)
10 years ago · 70d0325999
parent 7eb3d6152f 5734d4d1e6
commit 70d0325999
1 changed files with 2 additions and 1 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -2016,7 +2016,7 @@ static CBlockIndex* FindMostWorkChain() {
        CBlockIndex *pindexTest = pindexNew;
        bool fInvalidAncestor = false;
        while (pindexTest && !chainActive.Contains(pindexTest)) {
-            if (!pindexTest->IsValid(BLOCK_VALID_TRANSACTIONS) || !(pindexTest->nStatus & BLOCK_HAVE_DATA)) {
+            if (pindexTest->nStatus & BLOCK_FAILED_MASK) {
                // Candidate has an invalid ancestor, remove entire chain from the set.
                if (pindexBestInvalid == NULL || pindexNew->nChainWork > pindexBestInvalid->nChainWork)
                    pindexBestInvalid = pindexNew;
@ -2026,6 +2026,7 @@ static CBlockIndex* FindMostWorkChain() {
                    setBlockIndexValid.erase(pindexFailed);
                    pindexFailed = pindexFailed->pprev;
                }
+                setBlockIndexValid.erase(pindexTest);
                fInvalidAncestor = true;
                break;
            }