X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fcheckpoints.cpp;h=a9728ff77ad573abf7775e454f8f64f24006c82e;hp=fbeed5a7bdacc14d331e280005fddbf4c0e6b77f;hb=6bd80c2d737da9422283de5dd3033e318dcb96b7;hpb=ecf1815faa0e16811c13f01b608336212b0b9070 diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index fbeed5a..a9728ff 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -4,6 +4,7 @@ #include // for 'map_list_of()' #include +#include #include "checkpoints.h" @@ -14,6 +15,7 @@ namespace Checkpoints { typedef std::map > MapCheckpoints; + typedef std::list ListBannedBlocks; // // What makes a good checkpoint block? @@ -25,11 +27,19 @@ namespace Checkpoints static MapCheckpoints mapCheckpoints = boost::assign::map_list_of ( 0, std::make_pair(hashGenesisBlock, 1360105017) ) - ( 9690, std::make_pair(uint256("0x00000000026561450859c46868099e0df6068a538f038cb18988fd8d47dcdaf5"), 1362791423) ) ( 13560, std::make_pair(uint256("0xa1591a0fcbf11f282d671581edb9f0aadcd06fee69761081e0a3245914c13729"), 1364674052) ) - ( 37092, std::make_pair(uint256("0x0000000000a38c2f98556f46793b453e92d8fab2d31c0b93fd08bcf78e56099d"), 1376677203) ) - ( 44200, std::make_pair(uint256("0xc9bda7232a18b9c1f5ff974a9e5566b2d1879ceb8fc0e9e61fba9038a25b8447"), 1380145962) ) - ( 65000, std::make_pair(uint256("0xfb2b51a2fd65062c98a7a6053cde46aeaefebb95ba2f680e85a29ee25b1dcf05"), 1388526385) ) + ( 143990, std::make_pair(uint256("0x00000000001ff5c3940a9f73ad4a990f64955179bde0f743c76dbf0031429efc"), 1418953493) ) + ( 149000, std::make_pair(uint256("0x7a24acfcadcf43054e7f7d9f273522c0dfc5791ba4006e0273e7521a8d36c525"), 1420872125) ) + ( 160000, std::make_pair(uint256("0x000000000001cb1133043d38d077c0e93f66c8b2566779f10f182137d1e34a68"), 1425150237) ) + ( 200000, std::make_pair(uint256("0x0000000000029f8bbf66e6ea6f3e5db55009404aae0fe395a53dd33142b2bff2"), 1441127233) ) + ( 221047, std::make_pair(uint256("0xa28aef712e7aa0c285bfe29351ca21ed416689139e3063ef770fc826a8b9e9da"), 1449431646) ) + ( 243100, std::make_pair(uint256("0x000000000006522d1ebc0734cb0e6b83f5d4da0c3cbc72bd91b82016f611c4f0"), 1458215793) ) + ; + + static ListBannedBlocks listBanned = + boost::assign::list_of + // Invalid block #221047 with future timestamp of 2016/02/23 09:24:17 UTC + ( uint256("0x46223e5432ceffe650d5729b4bb8479dcdf0ca1e534fa8e69382dc87b42ea94b") ) ; // TestNet has no checkpoints @@ -47,6 +57,14 @@ namespace Checkpoints return hash == i->second.first; } + bool CheckBanned(const uint256 &nHash) + { + if (fTestNet) // Testnet has no banned blocks + return true; + ListBannedBlocks::const_iterator it = std::find(listBanned.begin(), listBanned.end(), nHash); + return it == listBanned.end(); + } + int GetTotalBlocksEstimate() { MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints); @@ -54,7 +72,7 @@ namespace Checkpoints return checkpoints.rbegin()->first; } - int GetLastCheckpointTime() + unsigned int GetLastCheckpointTime() { MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints); @@ -112,7 +130,7 @@ namespace Checkpoints // that current checkpoint should be a descendant block CBlockIndex* pindex = pindexSyncCheckpoint; while (pindex->nHeight > pindexCheckpointRecv->nHeight) - if (!(pindex = pindex->pprev)) + if ((pindex = pindex->pprev) == NULL) return error("ValidateSyncCheckpoint: pprev null - block index structure failure"); if (pindex->GetBlockHash() != hashCheckpoint) { @@ -127,7 +145,7 @@ namespace Checkpoints // to verify. CBlockIndex* pindex = pindexCheckpointRecv; while (pindex->nHeight > pindexSyncCheckpoint->nHeight) - if (!(pindex = pindex->pprev)) + if ((pindex = pindex->pprev) == NULL) return error("ValidateSyncCheckpoint: pprev2 null - block index structure failure"); if (pindex->GetBlockHash() != hashSyncCheckpoint) { @@ -149,6 +167,10 @@ namespace Checkpoints if (!txdb.TxnCommit()) return error("WriteSyncCheckpoint(): failed to commit to db sync checkpoint %s", hashCheckpoint.ToString().c_str()); +#ifndef USE_LEVELDB + txdb.Close(); +#endif + Checkpoints::hashSyncCheckpoint = hashCheckpoint; return true; } @@ -179,6 +201,9 @@ namespace Checkpoints } } +#ifndef USE_LEVELDB + txdb.Close(); +#endif if (!WriteSyncCheckpoint(hashPendingCheckpoint)) return error("AcceptPendingSyncCheckpoint(): failed to write sync checkpoint %s", hashPendingCheckpoint.ToString().c_str()); hashPendingCheckpoint = 0; @@ -188,8 +213,8 @@ namespace Checkpoints // relay the checkpoint if (!checkpointMessage.IsNull()) { - BOOST_FOREACH(CNode* pnode, vNodes) - checkpointMessage.RelayTo(pnode); + for (std::vector::iterator it = vNodes.begin(); it != vNodes.end(); ++it) + checkpointMessage.RelayTo(*it); } return true; } @@ -222,7 +247,7 @@ namespace Checkpoints // trace back to same height as sync-checkpoint const CBlockIndex* pindex = pindexPrev; while (pindex->nHeight > pindexSync->nHeight) - if (!(pindex = pindex->pprev)) + if ((pindex = pindex->pprev) == NULL) return error("CheckSync: pprev null - block index structure failure"); if (pindex->nHeight < pindexSync->nHeight || pindex->GetBlockHash() != hashSyncCheckpoint) return false; // only descendant of sync-checkpoint can pass check @@ -264,6 +289,11 @@ namespace Checkpoints { return error("ResetSyncCheckpoint: SetBestChain failed for hardened checkpoint %s", hash.ToString().c_str()); } + +#ifndef USE_LEVELDB + txdb.Close(); +#endif + } else if(!mapBlockIndex.count(hash)) { @@ -340,8 +370,8 @@ namespace Checkpoints // Relay checkpoint { LOCK(cs_vNodes); - BOOST_FOREACH(CNode* pnode, vNodes) - checkpoint.RelayTo(pnode); + for (std::vector::iterator it = vNodes.begin(); it != vNodes.end(); ++it) + checkpoint.RelayTo(*it); } return true; } @@ -366,9 +396,7 @@ std::string CSyncCheckpoint::strMasterPrivKey = ""; // ppcoin: verify signature of sync-checkpoint message bool CSyncCheckpoint::CheckSignature() { - CKey key; - if (!key.SetPubKey(ParseHex(CSyncCheckpoint::strMasterPubKey))) - return error("CSyncCheckpoint::CheckSignature() : SetPubKey failed"); + CPubKey key(ParseHex(CSyncCheckpoint::strMasterPubKey)); if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig)) return error("CSyncCheckpoint::CheckSignature() : verify signature failed"); @@ -378,7 +406,7 @@ bool CSyncCheckpoint::CheckSignature() return true; } -// ppcoin: process synchronized checkpoint +// process synchronized checkpoint bool CSyncCheckpoint::ProcessSyncCheckpoint(CNode* pfrom) { if (!CheckSignature()) @@ -420,6 +448,10 @@ bool CSyncCheckpoint::ProcessSyncCheckpoint(CNode* pfrom) } } +#ifndef USE_LEVELDB + txdb.Close(); +#endif + if (!Checkpoints::WriteSyncCheckpoint(hashCheckpoint)) return error("ProcessSyncCheckpoint(): failed to write sync checkpoint %s", hashCheckpoint.ToString().c_str()); Checkpoints::checkpointMessage = *this;