Merge pull request #960 from gavinandresen/issue913

Use last checkpoint instead of hard-coded 140,700. Fixes #913.
13 years ago · ef14236539
parent 3f1bb1ac78 eae82d8ee5
commit ef14236539
1 changed files with 2 additions and 1 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -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;