|
|
|
@ -1182,7 +1182,7 @@ bool CheckProofOfWork(uint256 hash, unsigned int nBits)
|
|
|
|
|
|
|
|
|
|
bool IsInitialBlockDownload()
|
|
|
|
|
{
|
|
|
|
|
if (pindexBest == NULL || (!fTestNet && nBestHeight < 105000))
|
|
|
|
|
if (pindexBest == NULL || (!fTestNet && nBestHeight < 118000))
|
|
|
|
|
return true;
|
|
|
|
|
static int64 nLastUpdate;
|
|
|
|
|
static CBlockIndex* pindexLastBest;
|
|
|
|
@ -1748,7 +1748,8 @@ bool CBlock::AcceptBlock()
|
|
|
|
|
(nHeight == 68555 && hash != uint256("0x00000000001e1b4903550a0b96e9a9405c8a95f387162e4944e8d9fbe501cd6a")) ||
|
|
|
|
|
(nHeight == 70567 && hash != uint256("0x00000000006a49b14bcf27462068f1264c961f11fa2e0eddd2be0791e1d4124a")) ||
|
|
|
|
|
(nHeight == 74000 && hash != uint256("0x0000000000573993a3c9e41ce34471c079dcf5f52a0e824a81e7f953b8661a20")) ||
|
|
|
|
|
(nHeight == 105000 && hash != uint256("0x00000000000291ce28027faea320c8d2b054b2e0fe44a773f3eefb151d6bdc97")))
|
|
|
|
|
(nHeight == 105000 && hash != uint256("0x00000000000291ce28027faea320c8d2b054b2e0fe44a773f3eefb151d6bdc97")) ||
|
|
|
|
|
(nHeight == 118000 && hash != uint256("0x000000000000774a7f8a7a12dc906ddb9e17e75d684f15e00f8767f9e8f36553")))
|
|
|
|
|
return error("AcceptBlock() : rejected by checkpoint lockin at %d", nHeight);
|
|
|
|
|
|
|
|
|
|
// Write block to history file
|
|
|
|
@ -1765,7 +1766,7 @@ bool CBlock::AcceptBlock()
|
|
|
|
|
if (hashBestChain == hash)
|
|
|
|
|
CRITICAL_BLOCK(cs_vNodes)
|
|
|
|
|
foreach(CNode* pnode, vNodes)
|
|
|
|
|
if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 105000))
|
|
|
|
|
if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 118000))
|
|
|
|
|
pnode->PushInventory(CInv(MSG_BLOCK, hash));
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|