diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 9b343ab..598157b 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -35,16 +35,17 @@ namespace Checkpoints // + Contains no strange transactions static MapCheckpoints mapCheckpoints = boost::assign::map_list_of - ( 1, uint256("0x8fe2901fc0999bc86ea2668c58802ee87165438166d18154f1bd4f917bf25e0f")) - ( 7, uint256("0x4530df06d98fc77d04dab427630fc63b45f10d2b0ad3ad3a651883938986d629")) - ( 7777, uint256("0xae3094030b34a422c44b9832c84fe602d0d528449d6940374bd43b4472b4df5e")) + ( 1, uint256("0x0000086f3bfd2ca98fa3f912c41d1c4482ed1f5399c289f4cae4420c9c3a3fda")) + ( 7, uint256("0x00000ae8c47fc4e0498d1c569eeaa05a4c2214ef95cbef2c2906e2daf78c2c6b")) + ( 777, uint256("0x0000062829795a3ffc0ae5e0f7fe5327fb134c9844b3d3755a1619f378be2de4")) + /* ( 7777, uint256("0xae3094030b34a422c44b9832c84fe602d0d528449d6940374bd43b4472b4df5e")) (15420, uint256("0xfded6a374d071f59d738a3009fc4d8461609052c3e7e91aa89146550d179c1b0")) (16000, uint256("0x683517a8cae8530f39e636f010ecd1750665c3d91f57ba71d6556535972ab328")) (77777, uint256("0xf5c98062cb1ad75c792a1851a388447f0edd7cb2271b67ef1241a03c673b7735")) (77778, uint256("0xd13f93f9fdac82ea26ed8f90474ed2449c8c24be50a416e43c323a38573c30e5")) (100000, uint256("0xcc4f0b11e9e17f7a406ac4a71e6e192b9b43e32b300ddecba229c789392497eb")) (106000, uint256("0xbe27545eb8ea31c74878b54d500161873ed035afc2fa1f4e7cfa7e84a232b8f9")) - (112800, uint256("0x4dbecbf0368b99c80da8406693f370b754f78a7b6d139a878bc69fb961f86383")) + (112800, uint256("0x4dbecbf0368b99c80da8406693f370b754f78a7b6d139a878bc69fb961f86383"))*/ ; static const CCheckpointData data = { &mapCheckpoints, @@ -75,9 +76,7 @@ namespace Checkpoints bool CheckBlock(int nHeight, const uint256& hash) { - // TODO: - return true; - /*if (fTestNet) return true; // Testnet has no checkpoints + if (fTestNet) return true; // Testnet has no checkpoints if (!GetBoolArg("-checkpoints", true)) return true; @@ -85,7 +84,7 @@ namespace Checkpoints MapCheckpoints::const_iterator i = checkpoints.find(nHeight); if (i == checkpoints.end()) return true; - return hash == i->second;*/ + return hash == i->second; } // Guess how far we are in the verification process at the given block index @@ -121,22 +120,18 @@ namespace Checkpoints int GetTotalBlocksEstimate() { - return 0; - // TODO: - /*if (fTestNet) return 0; // Testnet has no checkpoints + if (fTestNet) return 0; // Testnet has no checkpoints if (!GetBoolArg("-checkpoints", true)) return 0; const MapCheckpoints& checkpoints = *Checkpoints().mapCheckpoints; - return checkpoints.rbegin()->first;*/ + return checkpoints.rbegin()->first; } CBlockIndex* GetLastCheckpoint(const std::map& mapBlockIndex) { - return NULL; - // TODO: - /*if (fTestNet) return NULL; // Testnet has no checkpoints + if (fTestNet) return NULL; // Testnet has no checkpoints if (!GetBoolArg("-checkpoints", true)) return NULL; @@ -149,6 +144,6 @@ namespace Checkpoints if (t != mapBlockIndex.end()) return t->second; } - return NULL;*/ + return NULL; } }