Browse Source

Merge pull request #960 from gavinandresen/issue913

Use last checkpoint instead of hard-coded 140,700. Fixes #913.
pull/1/head
Gregory Maxwell 11 years ago
parent
commit
ef14236539
  1. 3
      src/main.cpp

3
src/main.cpp

@ -1706,10 +1706,11 @@ bool CBlock::AcceptBlock() @@ -1706,10 +1706,11 @@ bool CBlock::AcceptBlock()
return error("AcceptBlock() : AddToBlockIndex failed");
// Relay inventory, but don't relay old inventory during initial block download
int nBlockEstimate = Checkpoints::GetTotalBlocksEstimate();
if (hashBestChain == hash)
CRITICAL_BLOCK(cs_vNodes)
BOOST_FOREACH(CNode* pnode, vNodes)
if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 140700))
if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate))
pnode->PushInventory(CInv(MSG_BLOCK, hash));
return true;

Loading…
Cancel
Save