Browse Source

Only remove actualy failed blocks from setBlockIndexValid

0.10
Pieter Wuille 11 years ago
parent
commit
5734d4d1e6
  1. 3
      src/main.cpp

3
src/main.cpp

@ -2073,7 +2073,7 @@ static CBlockIndex* FindMostWorkChain() { @@ -2073,7 +2073,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;
@ -2083,6 +2083,7 @@ static CBlockIndex* FindMostWorkChain() { @@ -2083,6 +2083,7 @@ static CBlockIndex* FindMostWorkChain() {
setBlockIndexValid.erase(pindexFailed);
pindexFailed = pindexFailed->pprev;
}
setBlockIndexValid.erase(pindexTest);
fInvalidAncestor = true;
break;
}

Loading…
Cancel
Save