Skip to content

Update validation.cpp #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Diving-Or-Dove-In wants to merge 2 commits into
base: 2.1.0
Choose a base branch
from
Open

Update validation.cpp #326

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c60cb94
Update validation.cpp
Diving-Or-Dove-In Nov 6, 2018
2fd76ad
Update validation.cpp
Diving-Or-Dove-In Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2990,16 +2990,17 @@ CBlockIndex* AddToBlockIndex(const CBlockHeader& block)

pindexNew->RaiseValidity(BLOCK_VALID_TREE);
if (pindexBestHeader == NULL || pindexBestHeader->nChainWork < pindexNew->nChainWork)
{
pindexBestHeader = pindexNew;

// Add to current best branch
if (pindexNew->pprev) {
pindexNew->pprev->pnext = pindexNew;
setDirtyBlockIndex.insert(pindexNew->pprev);
}
setDirtyBlockIndex.insert(pindexNew);

return pindexNew;
// Add to current best branch
if (pindexNew->pprev) {
pindexNew->pprev->pnext = pindexBestHeader;
setDirtyBlockIndex.insert(pindexNew->pprev);
}
setDirtyBlockIndex.insert(pindexBestHeader);
}
return pindexBestHeader;
}

/** Mark a block as having its data received and checked (up to BLOCK_VALID_TRANSACTIONS). */
Expand Down Expand Up @@ -3718,7 +3719,7 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev, GetAdjustedTime()))
return error("%s: Consensus::ContextualCheckBlockHeader: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));
}
if (pindex == NULL)
if (pindex == NULL && !state.IsInvalid();
pindex = AddToBlockIndex(block);

if (ppindex)
Expand Down