aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main.cpp17
-rw-r--r--src/main.h1
2 files changed, 17 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 731402194d..54902e82eb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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;
diff --git a/src/main.h b/src/main.h
index 3b35387c98..aa74ac5ab3 100644
--- a/src/main.h
+++ b/src/main.h
@@ -98,6 +98,7 @@ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int&
void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash1);
bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey);
bool CheckProofOfWork(uint256 hash, unsigned int nBits);
+int GetTotalBlocksEstimate();
bool IsInitialBlockDownload();
std::string GetWarnings(std::string strFor);