X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fcheckpoints.cpp;h=a9728ff77ad573abf7775e454f8f64f24006c82e;hp=241eb73baa96155cd7e12780275460951e12c854;hb=6bd80c2d737da9422283de5dd3033e318dcb96b7;hpb=01176e07decafb1f1850c736abfbe95fc81ae083 diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 241eb73..a9728ff 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -4,31 +4,18 @@ #include // for 'map_list_of()' #include +#include #include "checkpoints.h" -#include "db.h" +#include "txdb.h" #include "main.h" #include "uint256.h" namespace Checkpoints { - struct Checkpoint - { - uint256 hashCheckPoint; - unsigned int nTime; - }; - - typedef std::map MapCheckpoints; - - Checkpoint initCheckpoint(uint256 hashCheckPoint, unsigned int nTime) - { - Checkpoint item; - item.hashCheckPoint = hashCheckPoint; - item.nTime = nTime; - - return item; - } + typedef std::map > MapCheckpoints; + typedef std::list ListBannedBlocks; // // What makes a good checkpoint block? @@ -39,16 +26,26 @@ namespace Checkpoints // static MapCheckpoints mapCheckpoints = boost::assign::map_list_of - ( 0, initCheckpoint(hashGenesisBlock, 1360105017) ) - ( 9690, initCheckpoint(uint256("0x00000000026561450859c46868099e0df6068a538f038cb18988fd8d47dcdaf5"), 1362791423) ) - ( 13560, initCheckpoint(uint256("0xa1591a0fcbf11f282d671581edb9f0aadcd06fee69761081e0a3245914c13729"), 1364674052) ) - ( 37092, initCheckpoint(uint256("0x0000000000a38c2f98556f46793b453e92d8fab2d31c0b93fd08bcf78e56099d"), 1376677203) ) + ( 0, std::make_pair(hashGenesisBlock, 1360105017) ) + ( 13560, std::make_pair(uint256("0xa1591a0fcbf11f282d671581edb9f0aadcd06fee69761081e0a3245914c13729"), 1364674052) ) + ( 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 static MapCheckpoints mapCheckpointsTestnet = boost::assign::map_list_of - ( 0, initCheckpoint(hashGenesisBlockTestNet, 1360105017) ) + ( 0, std::make_pair(hashGenesisBlockTestNet, 1360105017) ) ; bool CheckHardened(int nHeight, const uint256& hash) @@ -57,7 +54,15 @@ namespace Checkpoints MapCheckpoints::const_iterator i = checkpoints.find(nHeight); if (i == checkpoints.end()) return true; - return hash == i->second.hashCheckPoint; + 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() @@ -67,11 +72,11 @@ namespace Checkpoints return checkpoints.rbegin()->first; } - int GetLastCheckpointTime() + unsigned int GetLastCheckpointTime() { MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints); - return checkpoints.rbegin()->second.nTime; + return checkpoints.rbegin()->second.second; } CBlockIndex* GetLastCheckpoint(const std::map& mapBlockIndex) @@ -80,7 +85,7 @@ namespace Checkpoints BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, checkpoints) { - const uint256& hash = i.second.hashCheckPoint; + const uint256& hash = i.second.first; std::map::const_iterator t = mapBlockIndex.find(hash); if (t != mapBlockIndex.end()) return t->second; @@ -125,8 +130,8 @@ namespace Checkpoints // that current checkpoint should be a descendant block CBlockIndex* pindex = pindexSyncCheckpoint; while (pindex->nHeight > pindexCheckpointRecv->nHeight) - if (!(pindex = pindex->pprev)) - return error("ValidateSyncCheckpoint: pprev1 null - block index structure failure"); + if ((pindex = pindex->pprev) == NULL) + return error("ValidateSyncCheckpoint: pprev null - block index structure failure"); if (pindex->GetBlockHash() != hashCheckpoint) { hashInvalidCheckpoint = hashCheckpoint; @@ -140,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) { @@ -161,7 +166,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; @@ -192,8 +200,10 @@ namespace Checkpoints return error("AcceptPendingSyncCheckpoint: SetBestChain failed for sync checkpoint %s", hashPendingCheckpoint.ToString().c_str()); } } - txdb.Close(); +#ifndef USE_LEVELDB + txdb.Close(); +#endif if (!WriteSyncCheckpoint(hashPendingCheckpoint)) return error("AcceptPendingSyncCheckpoint(): failed to write sync checkpoint %s", hashPendingCheckpoint.ToString().c_str()); hashPendingCheckpoint = 0; @@ -203,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; } @@ -214,14 +224,10 @@ namespace Checkpoints // Automatically select a suitable sync-checkpoint uint256 AutoSelectSyncCheckpoint() { - // Proof-of-work blocks are immediately checkpointed - // to defend against 51% attack which rejects other miners block - - // Select the last proof-of-work block - const CBlockIndex *pindex = GetLastBlockIndex(pindexBest, false); - // Search forward for a block within max span and maturity window - while (pindex->pnext && (pindex->GetBlockTime() + CHECKPOINT_MAX_SPAN <= pindexBest->GetBlockTime() || pindex->nHeight + std::min(6, nCoinbaseMaturity - 20) <= pindexBest->nHeight)) - pindex = pindex->pnext; + const CBlockIndex *pindex = pindexBest; + // Search backward for a block within max span and maturity window + while (pindex->pprev && (pindex->GetBlockTime() + CHECKPOINT_MAX_SPAN > pindexBest->GetBlockTime() || pindex->nHeight + 8 > pindexBest->nHeight)) + pindex = pindex->pprev; return pindex->GetBlockHash(); } @@ -241,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 @@ -270,7 +276,7 @@ namespace Checkpoints bool ResetSyncCheckpoint() { LOCK(cs_hashSyncCheckpoint); - const uint256& hash = mapCheckpoints.rbegin()->second.hashCheckPoint; + const uint256& hash = mapCheckpoints.rbegin()->second.first; if (mapBlockIndex.count(hash) && !mapBlockIndex[hash]->IsInMainChain()) { // checkpoint block accepted but not yet in main chain @@ -283,7 +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)) { @@ -295,7 +305,7 @@ namespace Checkpoints BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, mapCheckpoints) { - const uint256& hash = i.second.hashCheckPoint; + const uint256& hash = i.second.first; if (mapBlockIndex.count(hash) && mapBlockIndex[hash]->IsInMainChain()) { if (!WriteSyncCheckpoint(hash)) @@ -360,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; } @@ -376,16 +386,6 @@ namespace Checkpoints return (nBestHeight >= pindexSync->nHeight + nCoinbaseMaturity || pindexSync->GetBlockTime() + nStakeMinAge < GetAdjustedTime()); } - - // Is the sync-checkpoint too old? - bool IsSyncCheckpointTooOld(unsigned int nSeconds) - { - LOCK(cs_hashSyncCheckpoint); - // sync-checkpoint should always be accepted block - assert(mapBlockIndex.count(hashSyncCheckpoint)); - const CBlockIndex* pindexSync = mapBlockIndex[hashSyncCheckpoint]; - return (pindexSync->GetBlockTime() + nSeconds < GetAdjustedTime()); - } } // ppcoin: sync-checkpoint master key @@ -396,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"); @@ -408,7 +406,7 @@ bool CSyncCheckpoint::CheckSignature() return true; } -// ppcoin: process synchronized checkpoint +// process synchronized checkpoint bool CSyncCheckpoint::ProcessSyncCheckpoint(CNode* pfrom) { if (!CheckSignature()) @@ -449,7 +447,10 @@ bool CSyncCheckpoint::ProcessSyncCheckpoint(CNode* pfrom) return error("ProcessSyncCheckpoint: SetBestChain failed for sync checkpoint %s", hashCheckpoint.ToString().c_str()); } } + +#ifndef USE_LEVELDB txdb.Close(); +#endif if (!Checkpoints::WriteSyncCheckpoint(hashCheckpoint)) return error("ProcessSyncCheckpoint(): failed to write sync checkpoint %s", hashCheckpoint.ToString().c_str());