aboutsummaryrefslogtreecommitdiff
path: root/src/checkpoints.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-05-06 11:33:51 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-05-06 11:38:39 +0200
commit00820f921d8fcaa031e561ee641c50e77a909670 (patch)
tree2c7ebfed408c68a504ccda70e552bcb9600b6ae2 /src/checkpoints.h
parent40f5e8dc2ab17b34b24ee6e0391e18ae7065cff9 (diff)
parenta8cdaf5c962ff9018e2d8411f532eec7355f0623 (diff)
Merge pull request #6055
a8cdaf5 checkpoints: move the checkpoints enable boolean into main (Cory Fields) 11982d3 checkpoints: Decouple checkpoints from Params (Cory Fields) 6996823 checkpoints: make checkpoints a member of CChainParams (Cory Fields) 9f13a10 checkpoints: store mapCheckpoints in CCheckpointData rather than a pointer (Cory Fields)
Diffstat (limited to 'src/checkpoints.h')
-rw-r--r--src/checkpoints.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/checkpoints.h b/src/checkpoints.h
index b0e5076788..a720f096c0 100644
--- a/src/checkpoints.h
+++ b/src/checkpoints.h
@@ -20,24 +20,22 @@ namespace Checkpoints
typedef std::map<int, uint256> MapCheckpoints;
struct CCheckpointData {
- const MapCheckpoints *mapCheckpoints;
+ MapCheckpoints mapCheckpoints;
int64_t nTimeLastCheckpoint;
int64_t nTransactionsLastCheckpoint;
double fTransactionsPerDay;
};
//! Returns true if block passes checkpoint checks
-bool CheckBlock(int nHeight, const uint256& hash);
+bool CheckBlock(const CCheckpointData& data, int nHeight, const uint256& hash);
//! Return conservative estimate of total number of blocks, 0 if unknown
-int GetTotalBlocksEstimate();
+int GetTotalBlocksEstimate(const CCheckpointData& data);
//! Returns last CBlockIndex* in mapBlockIndex that is a checkpoint
-CBlockIndex* GetLastCheckpoint();
+CBlockIndex* GetLastCheckpoint(const CCheckpointData& data);
-double GuessVerificationProgress(CBlockIndex* pindex, bool fSigchecks = true);
-
-extern bool fEnabled;
+double GuessVerificationProgress(const CCheckpointData& data, CBlockIndex* pindex, bool fSigchecks = true);
} //namespace Checkpoints