highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-18 22:35:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'totalblocksestimate1' of https://github.com/laanwj/bitcoin

Browse Source
This commit is contained in:
Gavin Andresen
2011-06-24 11:17:22 -04:00
parent 77ba3ab99c eade213197
commit c774b16976
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.cpp
View File

@@ -32,6 +32,8 @@ map<COutPoint, CInPoint> mapNextTx;
map<uint256, CBlockIndex*> mapBlockIndex;
uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
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;
int nBestHeight = -1;
CBigNum bnBestChainWork = 0;
@@ -704,9 +706,22 @@ bool CheckProofOfWork(uint256 hash, unsigned int nBits)
return true;
}
// Return conservative estimate of total number of blocks, 0 if unknown
int GetTotalBlocksEstimate()
{
if(fTestNet)
{
return 0;
}
else
{
return nTotalBlocksEstimate;
}
}
bool IsInitialBlockDownload()
{
if (pindexBest == NULL || (!fTestNet && nBestHeight < 118000))
if (pindexBest == NULL || nBestHeight < (GetTotalBlocksEstimate()-nInitialBlockThreshold))
return true;
static int64 nLastUpdate;
static CBlockIndex* pindexLastBest;