|
|
@ -1144,7 +1144,7 @@ bool CheckProofOfWork(uint256 hash, unsigned int nBits) |
|
|
|
|
|
|
|
|
|
|
|
bool IsInitialBlockDownload() |
|
|
|
bool IsInitialBlockDownload() |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (pindexBest == NULL || (!fTestNet && nBestHeight < 74000)) |
|
|
|
if (pindexBest == NULL || (!fTestNet && nBestHeight < 105000)) |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
static int64 nLastUpdate; |
|
|
|
static int64 nLastUpdate; |
|
|
|
static CBlockIndex* pindexLastBest; |
|
|
|
static CBlockIndex* pindexLastBest; |
|
|
@ -1705,11 +1705,12 @@ bool CBlock::AcceptBlock() |
|
|
|
|
|
|
|
|
|
|
|
// Check that the block chain matches the known block chain up to a checkpoint
|
|
|
|
// Check that the block chain matches the known block chain up to a checkpoint
|
|
|
|
if (!fTestNet) |
|
|
|
if (!fTestNet) |
|
|
|
if ((nHeight == 11111 && hash != uint256("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d")) || |
|
|
|
if ((nHeight == 11111 && hash != uint256("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d")) || |
|
|
|
(nHeight == 33333 && hash != uint256("0x000000002dd5588a74784eaa7ab0507a18ad16a236e7b1ce69f00d7ddfb5d0a6")) || |
|
|
|
(nHeight == 33333 && hash != uint256("0x000000002dd5588a74784eaa7ab0507a18ad16a236e7b1ce69f00d7ddfb5d0a6")) || |
|
|
|
(nHeight == 68555 && hash != uint256("0x00000000001e1b4903550a0b96e9a9405c8a95f387162e4944e8d9fbe501cd6a")) || |
|
|
|
(nHeight == 68555 && hash != uint256("0x00000000001e1b4903550a0b96e9a9405c8a95f387162e4944e8d9fbe501cd6a")) || |
|
|
|
(nHeight == 70567 && hash != uint256("0x00000000006a49b14bcf27462068f1264c961f11fa2e0eddd2be0791e1d4124a")) || |
|
|
|
(nHeight == 70567 && hash != uint256("0x00000000006a49b14bcf27462068f1264c961f11fa2e0eddd2be0791e1d4124a")) || |
|
|
|
(nHeight == 74000 && hash != uint256("0x0000000000573993a3c9e41ce34471c079dcf5f52a0e824a81e7f953b8661a20"))) |
|
|
|
(nHeight == 74000 && hash != uint256("0x0000000000573993a3c9e41ce34471c079dcf5f52a0e824a81e7f953b8661a20")) || |
|
|
|
|
|
|
|
(nHeight == 105000 && hash != uint256("0x00000000000291ce28027faea320c8d2b054b2e0fe44a773f3eefb151d6bdc97"))) |
|
|
|
return error("AcceptBlock() : rejected by checkpoint lockin at %d", nHeight); |
|
|
|
return error("AcceptBlock() : rejected by checkpoint lockin at %d", nHeight); |
|
|
|
|
|
|
|
|
|
|
|
// Write block to history file
|
|
|
|
// Write block to history file
|
|
|
@ -1726,7 +1727,7 @@ bool CBlock::AcceptBlock() |
|
|
|
if (hashBestChain == hash) |
|
|
|
if (hashBestChain == hash) |
|
|
|
CRITICAL_BLOCK(cs_vNodes) |
|
|
|
CRITICAL_BLOCK(cs_vNodes) |
|
|
|
foreach(CNode* pnode, vNodes) |
|
|
|
foreach(CNode* pnode, vNodes) |
|
|
|
if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 55000)) |
|
|
|
if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 105000)) |
|
|
|
pnode->PushInventory(CInv(MSG_BLOCK, hash)); |
|
|
|
pnode->PushInventory(CInv(MSG_BLOCK, hash)); |
|
|
|
|
|
|
|
|
|
|
|
return true; |
|
|
|
return true; |
|
|
|