X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fcheckpoints.cpp;h=777f179bdd441a65eeafdaff38a34bd6ed0a098e;hb=HEAD;hp=f20b44b5ae6d1f55bdfe5f38631893324e2f30ed;hpb=95c77d2a7785acc35ba018ee8d2da5e07146f416;p=novacoin.git diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index f20b44b..777f179 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -2,18 +2,15 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include // for 'map_list_of()' -#include - #include "checkpoints.h" - -#include "txdb.h" #include "main.h" -#include "uint256.h" +#include "txdb-leveldb.h" + namespace Checkpoints { typedef std::map > MapCheckpoints; + typedef std::list ListBannedBlocks; // // What makes a good checkpoint block? @@ -23,24 +20,31 @@ namespace Checkpoints // + Contains no strange transactions // 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) ) - ( 68600, std::make_pair(uint256("0xb646b0562080ab9411f85d4b2a1ca8b197c67ae170c5e328406871b44233cb06"), 1389867276) ) - ( 92161, std::make_pair(uint256("0x000000000079090eb31e7fa55487e4e666466253e68b213f44b7977ea7a2eeec"), 1398919969) ) - ( 98661, std::make_pair(uint256("0x48328dfc0eaffc659723739c6202854d1624449340193bdea3e71ece4ccdd43f"), 1401469019) ) - ( 143990, std::make_pair(uint256("0x00000000001ff5c3940a9f73ad4a990f64955179bde0f743c76dbf0031429efc"), 1418953493) ) - ; + { + { 0, {hashGenesisBlock, 1360105017} }, + { 13560, {uint256("0xa1591a0fcbf11f282d671581edb9f0aadcd06fee69761081e0a3245914c13729"), 1364674052} }, + { 143990, {uint256("0x00000000001ff5c3940a9f73ad4a990f64955179bde0f743c76dbf0031429efc"), 1418953493} }, + { 149000, {uint256("0x7a24acfcadcf43054e7f7d9f273522c0dfc5791ba4006e0273e7521a8d36c525"), 1420872125} }, + { 160000, {uint256("0x000000000001cb1133043d38d077c0e93f66c8b2566779f10f182137d1e34a68"), 1425150237} }, + { 200000, {uint256("0x0000000000029f8bbf66e6ea6f3e5db55009404aae0fe395a53dd33142b2bff2"), 1441127233} }, + { 221047, {uint256("0xa28aef712e7aa0c285bfe29351ca21ed416689139e3063ef770fc826a8b9e9da"), 1449431646} }, + { 243100, {uint256("0x000000000006522d1ebc0734cb0e6b83f5d4da0c3cbc72bd91b82016f611c4f0"), 1458215793} }, + { 532000, {uint256("0x0000000000018b7eba5e189c41605780c8a855f74144fa837fa05fa4c67b6ba9"), 1569359486} }, + { 561108, {uint256("0x2f3cf523ae1022300b4f40073e506d15ef0d6e208f123aed5b93016f81a10e1e"), 1580943827} }, + { 712891, {uint256("0xaaafebcb23c1b8ab49f7517b7a34bcc420cc6f284d9ffc672c1f47b5af2b0088"), 1640557462} } + }; + + static ListBannedBlocks listBanned = + { + // Invalid block #221047 with future timestamp of 2016/02/23 09:24:17 UTC + uint256("0x46223e5432ceffe650d5729b4bb8479dcdf0ca1e534fa8e69382dc87b42ea94b") + }; // TestNet has no checkpoints static MapCheckpoints mapCheckpointsTestnet = - boost::assign::map_list_of - ( 0, std::make_pair(hashGenesisBlockTestNet, 1360105017) ) - ; + { + { 0, { hashGenesisBlockTestNet, 1360105017 } } + }; bool CheckHardened(int nHeight, const uint256& hash) { @@ -51,6 +55,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); @@ -58,7 +70,7 @@ namespace Checkpoints return checkpoints.rbegin()->first; } - int GetLastCheckpointTime() + unsigned int GetLastCheckpointTime() { MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints); @@ -69,10 +81,10 @@ namespace Checkpoints { MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints); - BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, checkpoints) + for(auto it = checkpoints.rbegin(); it != checkpoints.rend(); ++it) { - const uint256& hash = i.second.first; - std::map::const_iterator t = mapBlockIndex.find(hash); + const uint256& hash = it->second.first; + auto t = mapBlockIndex.find(hash); if (t != mapBlockIndex.end()) return t->second; } @@ -116,7 +128,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) { @@ -131,7 +143,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) { @@ -153,10 +165,6 @@ 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; } @@ -187,9 +195,6 @@ 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; @@ -199,8 +204,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; } @@ -233,7 +238,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 @@ -275,11 +280,6 @@ 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)) { @@ -289,9 +289,9 @@ namespace Checkpoints printf("ResetSyncCheckpoint: pending for sync-checkpoint %s\n", hashPendingCheckpoint.ToString().c_str()); } - BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, mapCheckpoints) + for(auto it = mapCheckpoints.rbegin(); it != mapCheckpoints.rend(); ++it) { - const uint256& hash = i.second.first; + const uint256& hash = it->second.first; if (mapBlockIndex.count(hash) && mapBlockIndex[hash]->IsInMainChain()) { if (!WriteSyncCheckpoint(hash)) @@ -356,8 +356,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; } @@ -380,11 +380,43 @@ const std::string CSyncCheckpoint::strMasterPubKey = "04a51b735f816de4ec3f891d5b std::string CSyncCheckpoint::strMasterPrivKey = ""; // ppcoin: verify signature of sync-checkpoint message +CSyncCheckpoint::CSyncCheckpoint() +{ + SetNull(); +} + +void CSyncCheckpoint::SetNull() +{ + CUnsignedSyncCheckpoint::SetNull(); + vchMsg.clear(); + vchSig.clear(); +} + +bool CSyncCheckpoint::IsNull() const +{ + return (hashCheckpoint == 0); +} + +uint256 CSyncCheckpoint::GetHash() const +{ + return SerializeHash(*this); +} + +bool CSyncCheckpoint::RelayTo(CNode *pnode) const +{ + // returns true if wasn't already sent + if (pnode->hashCheckpointKnown != hashCheckpoint) + { + pnode->hashCheckpointKnown = hashCheckpoint; + pnode->PushMessage("checkpoint", *this); + return true; + } + return false; +} + 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"); @@ -436,10 +468,6 @@ 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;