initial block download spans total blocks minus threshold

This commit is contained in:
Wladimir J. van der Laan 2011-06-19 00:15:28 +02:00
parent 6cab66354d
commit 0f9ee792d9
1 changed files with 2 additions and 1 deletions

View File

@ -26,6 +26,7 @@ map<uint256, CBlockIndex*> mapBlockIndex;
uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"); uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
CBigNum bnProofOfWorkLimit(~uint256(0) >> 32); CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
const int nTotalBlocksEstimate = 131000; // Conservative estimate of total nr of blocks on main chain const int nTotalBlocksEstimate = 131000; // Conservative estimate of total nr of blocks on main chain
const int nInitialBlockThreshold = 10000; // Regard blocks up until N-threshold as "initial download"
CBlockIndex* pindexGenesisBlock = NULL; CBlockIndex* pindexGenesisBlock = NULL;
int nBestHeight = -1; int nBestHeight = -1;
CBigNum bnBestChainWork = 0; CBigNum bnBestChainWork = 0;
@ -1172,7 +1173,7 @@ int GetTotalBlocksEstimate()
bool IsInitialBlockDownload() bool IsInitialBlockDownload()
{ {
if (pindexBest == NULL || nBestHeight < GetTotalBlocksEstimate()) if (pindexBest == NULL || nBestHeight < (GetTotalBlocksEstimate()-nInitialBlockThreshold))
return true; return true;
static int64 nLastUpdate; static int64 nLastUpdate;
static CBlockIndex* pindexLastBest; static CBlockIndex* pindexLastBest;