diff -uNr a/src/checkpoints.cpp b/src/checkpoints.cpp --- a/src/checkpoints.cpp 2012-03-11 21:21:06.000000000 -0500 +++ b/src/checkpoints.cpp 1969-12-31 18:00:00.000000000 -0600 @@ -1,65 +0,0 @@ -// Copyright (c) 2009-2012 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying -// file license.txt or http://www.opensource.org/licenses/mit-license.php. - -#include // for 'map_list_of()' -#include - -#include "headers.h" -#include "checkpoints.h" - -namespace Checkpoints -{ - typedef std::map MapCheckpoints; - - // - // What makes a good checkpoint block? - // + Is surrounded by blocks with reasonable timestamps - // (no blocks before with a timestamp after, none after with - // timestamp before) - // + Contains no strange transactions - // - static MapCheckpoints mapCheckpoints = - boost::assign::map_list_of - ( 11111, uint256("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d")) - ( 33333, uint256("0x000000002dd5588a74784eaa7ab0507a18ad16a236e7b1ce69f00d7ddfb5d0a6")) - ( 68555, uint256("0x00000000001e1b4903550a0b96e9a9405c8a95f387162e4944e8d9fbe501cd6a")) - ( 70567, uint256("0x00000000006a49b14bcf27462068f1264c961f11fa2e0eddd2be0791e1d4124a")) - ( 74000, uint256("0x0000000000573993a3c9e41ce34471c079dcf5f52a0e824a81e7f953b8661a20")) - (105000, uint256("0x00000000000291ce28027faea320c8d2b054b2e0fe44a773f3eefb151d6bdc97")) - (118000, uint256("0x000000000000774a7f8a7a12dc906ddb9e17e75d684f15e00f8767f9e8f36553")) - (134444, uint256("0x00000000000005b12ffd4cd315cd34ffd4a594f430ac814c91184a0d42d2b0fe")) - (140700, uint256("0x000000000000033b512028abb90e1626d8b346fd0ed598ac0a3c371138dce2bd")) - (168000, uint256("0x000000000000099e61ea72015e79632f216fe6cb33d7899acb35b75c8303b763")) - ; - - bool CheckBlock(int nHeight, const uint256& hash) - { - if (fTestNet) return true; // Testnet has no checkpoints - - MapCheckpoints::const_iterator i = mapCheckpoints.find(nHeight); - if (i == mapCheckpoints.end()) return true; - return hash == i->second; - } - - int GetTotalBlocksEstimate() - { - if (fTestNet) return 0; - - return mapCheckpoints.rbegin()->first; - } - - CBlockIndex* GetLastCheckpoint(const std::map& mapBlockIndex) - { - if (fTestNet) return NULL; - - BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, mapCheckpoints) - { - const uint256& hash = i.second; - std::map::const_iterator t = mapBlockIndex.find(hash); - if (t != mapBlockIndex.end()) - return t->second; - } - return NULL; - } -} diff -uNr a/src/checkpoints.h b/src/checkpoints.h --- a/src/checkpoints.h 2012-03-11 21:21:06.000000000 -0500 +++ b/src/checkpoints.h 1969-12-31 18:00:00.000000000 -0600 @@ -1,29 +0,0 @@ -// Copyright (c) 2011 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying -// file license.txt or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_CHECKPOINT_H -#define BITCOIN_CHECKPOINT_H - -#include -#include "util.h" - -class uint256; -class CBlockIndex; - -// -// Block-chain checkpoints are compiled-in sanity checks. -// They are updated every release or three. -// -namespace Checkpoints -{ - // Returns true if block passes checkpoint checks - bool CheckBlock(int nHeight, const uint256& hash); - - // Return conservative estimate of total number of blocks, 0 if unknown - int GetTotalBlocksEstimate(); - - // Returns last CBlockIndex* in mapBlockIndex that is a checkpoint - CBlockIndex* GetLastCheckpoint(const std::map& mapBlockIndex); -} - -#endif diff -uNr a/src/main.cpp b/src/main.cpp --- a/src/main.cpp 2014-12-02 21:08:56.000000000 -0600 +++ b/src/main.cpp 2014-12-02 23:05:53.000000000 -0600 @@ -3,7 +3,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file license.txt or http://www.opensource.org/licenses/mit-license.php. #include "headers.h" -#include "checkpoints.h" #include "db.h" #include "net.h" #include "init.h" @@ -783,12 +782,12 @@ // Return maximum amount of blocks that other nodes claim to have int GetNumBlocksOfPeers() { - return std::max(cPeerBlockCounts.median(), Checkpoints::GetTotalBlocksEstimate()); + return cPeerBlockCounts.median(); } bool IsInitialBlockDownload() { - if (pindexBest == NULL || nBestHeight < Checkpoints::GetTotalBlocksEstimate()) + if (pindexBest == NULL) return true; static int64 nLastUpdate; static CBlockIndex* pindexLastBest; @@ -936,7 +935,7 @@ // Skip ECDSA signature verification when connecting blocks (fBlock=true) // before the last blockchain checkpoint. This is safe because block merkle hashes are // still computed and checked, and any change will be caught at the next checkpoint. - if (!(fBlock && (nBestHeight < Checkpoints::GetTotalBlocksEstimate()))) + if (!(fBlock)) // Verify signature if (!VerifySignature(txPrev, *this, i)) return DoS(100,error("ConnectInputs() : %s VerifySignature failed", GetHash().ToString().substr(0,10).c_str())); @@ -1397,10 +1396,6 @@ if (!tx.IsFinal(nHeight, GetBlockTime())) return DoS(10, error("AcceptBlock() : contains a non-final transaction")); - // Check that the block chain matches the known block chain up to a checkpoint - if (!Checkpoints::CheckBlock(nHeight, hash)) - return DoS(100, error("AcceptBlock() : rejected by checkpoint lockin at %d", nHeight)); - // Write block to history file if (!CheckDiskSpace(::GetSerializeSize(*this, SER_DISK))) return error("AcceptBlock() : out of disk space"); @@ -1434,30 +1429,6 @@ if (!pblock->CheckBlock()) return error("ProcessBlock() : CheckBlock FAILED"); - CBlockIndex* pcheckpoint = Checkpoints::GetLastCheckpoint(mapBlockIndex); - if (pcheckpoint && pblock->hashPrevBlock != hashBestChain) - { - // Extra checks to prevent "fill up memory by spamming with bogus blocks" - int64 deltaTime = pblock->GetBlockTime() - pcheckpoint->nTime; - if (deltaTime < 0) - { - if (pfrom) - pfrom->Misbehaving(100); - return error("ProcessBlock() : block with timestamp before last checkpoint"); - } - CBigNum bnNewBlock; - bnNewBlock.SetCompact(pblock->nBits); - CBigNum bnRequired; - bnRequired.SetCompact(ComputeMinWork(pcheckpoint->nBits, deltaTime)); - if (bnNewBlock > bnRequired) - { - if (pfrom) - pfrom->Misbehaving(100); - return error("ProcessBlock() : block with too little proof-of-work"); - } - } - - // If don't already have its previous block, shunt it off to holding area until we get it if (!mapBlockIndex.count(pblock->hashPrevBlock)) { diff -uNr a/src/makefile.unix b/src/makefile.unix --- a/src/makefile.unix 2014-12-02 21:08:35.000000000 -0600 +++ b/src/makefile.unix 2014-12-02 23:18:57.000000000 -0600 @@ -75,7 +75,6 @@ HEADERS = \ base58.h \ bignum.h \ - checkpoints.h \ crypter.h \ db.h \ headers.h \ @@ -96,7 +95,6 @@ wallet.h OBJS= \ - obj/checkpoints.o \ obj/crypter.o \ obj/db.o \ obj/init.o \