twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-02-04 19:04:49 +00:00
Code Issues Projects Releases Wiki Activity

add GetTotalBlocksEstimate() function, move magic number to constant

Browse Source
This commit is contained in:
Wladimir J. van der Laan 2011-06-18 19:05:39 +02:00
parent eeac8727bc
commit eade213197
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.cpp
View File

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

1
src/main.h
View File

@ -118,6 +118,7 @@ void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash
bool CheckWork(CBlock* pblock, CReserveKey& reservekey); bool CheckWork(CBlock* pblock, CReserveKey& reservekey);
void BitcoinMiner(); void BitcoinMiner();
bool CheckProofOfWork(uint256 hash, unsigned int nBits); bool CheckProofOfWork(uint256 hash, unsigned int nBits);
int GetTotalBlocksEstimate();
bool IsInitialBlockDownload(); bool IsInitialBlockDownload();
std::string GetWarnings(std::string strFor); std::string GetWarnings(std::string strFor);