Mercurial > hg > bitcoin

changeset 2849:7bd80c7f45c3 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use last checkpoint instead of hard-coded 140,700. Fixes #913.
author Gavin Andresen <gavinandresen@gmail.com>
date Tue, 20 Mar 2012 13:45:45 -0400
parents 2e5fc4ba0dfa
children fe0807cebb12
files src/main.cpp
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1508,10 +1508,11 @@
         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;