neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix headers announcements edge case

Browse Source 
Previously we would assert that if every block in vBlockHashesToAnnounce is in
chainActive, then the blocks to be announced must connect.  However, there are
edge cases where this assumption could be violated (eg using invalidateblock /
reconsiderblock), so just check for this case and revert to inv-announcement
instead.

Github-Pull: #7919
Rebased-From: 3a99fb2cb14955f5e029d315041a093e957e6c3e
This commit is contained in:
Suhas Daftuar 2016-04-20 13:49:55 -04:00 committed by MarcoFalke
parent 06c73a1751
commit 43c14acf14
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.cpp
View File

@ -5770,7 +5770,21 @@ bool SendMessages(CNode* pto)
fRevertToInv = true; fRevertToInv = true;
break; break;
} }
assert(pBestIndex == NULL || pindex->pprev == pBestIndex); if (pBestIndex != NULL && pindex->pprev != pBestIndex) {
// This means that the list of blocks to announce don't
// connect to each other.
// This shouldn't really be possible to hit during
// regular operation (because reorgs should take us to
// a chain that has some block not on the prior chain,
// which should be caught by the prior check), but one
// way this could happen is by using invalidateblock /
// reconsiderblock repeatedly on the tip, causing it to
// be added multiple times to vBlockHashesToAnnounce.
// Robustly deal with this rare situation by reverting
// to an inv.
fRevertToInv = true;
break;
}
pBestIndex = pindex; pBestIndex = pindex;
if (fFoundStartingHeader) { if (fFoundStartingHeader) {
// add this to the headers message // add this to the headers message