sami7777/triangles_v5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix getblocks: serve main chain to fork peers instead of banning them

Browse Source 
Fork nodes (DNS3/DNS2 stuck on block 570 chain) send locators that
don't match any main chain block. Instead of disconnecting/ banning
after 3 failed getblocks attempts, this change:

- Serves main chain blocks from genesis when locator has no match
- Resets nIncompatibleGetblocks counter after 10 (so we never ban)
- Fork nodes will receive, validate, and automatically reorg to the
  longer/higher-work main chain once they see it

This fixes the 'no common blocks' deadlock while preserving chain
integrity — only a genuinely longer chain can trigger the reorg.
This commit is contained in:
Krystie
2026-05-24 22:36:13 -07:00
parent e3aeff002c
commit db456af5b4
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+14 -8
View File
@@ -4372,19 +4372,25 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
// GetBlockIndex() fell through to genesis (no locator hash matched
// our main chain). If the peer's tip isn't our genesis,
// they're on a completely different fork.
//
// triangles fix: instead of banning or disconnecting, always respond
// with our main chain blocks so a fork node can learn the canonical
// chain and reorganize. The fork node's client will automatically
// reorg when it receives blocks that form a longer or higher-work chain.
if (!locator.IsNull() && pindex == pindexGenesisBlock &&
pindexGenesisBlock && locator.GetTipHash() != pindexGenesisBlock->GetBlockHash())
{
pfrom->nIncompatibleGetblocks++;
if (pfrom->nIncompatibleGetblocks >= 3)
{
printf("WARNING: peer %s sent %d getblocks with no common blocks — disconnecting (incompatible fork)\n",
pfrom->addr.ToString().c_str(), pfrom->nIncompatibleGetblocks);
pfrom->Misbehaving(100);
return true;
}
printf("WARNING: peer %s getblocks locator has no common blocks (%d/3 before ban)\n",
// triangles: after many failed attempts, reset — the peer may now be
// on the correct chain and we don't want to ban a node that's just
// learning about the main chain from us.
if (pfrom->nIncompatibleGetblocks > 10)
pfrom->nIncompatibleGetblocks = 0;
// triangles: NO return/ban here — fall through and serve main chain
// blocks so the forking peer can reorg to our chain.
printf("WARNING: peer %s getblocks locator has no common blocks — serving main chain from genesis (counter=%d, will reset after 10)\\n",
pfrom->addr.ToString().c_str(), pfrom->nIncompatibleGetblocks);
pindex = pindexGenesisBlock;
}
else if (pindex && pindex != pindexGenesisBlock)
{