diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-08-05 01:53:17 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-08-05 01:53:17 -0700 |
| commit | 15047f5af0d13844d0034626492379a421c211ca (patch) | |
| tree | 2abcc044e721ed957799bd8818d47d3465874c02 /src/checkpoints.cpp | |
| parent | 2af267c150579c5defc3431e6d0d1ee4d6e7af44 (diff) | |
| parent | 9bf2a4aba2c22dc451ce000f7ef081b3d3562b84 (diff) | |
Merge pull request #2851 from TheBlueMatt/master
Prepare for mempool testing in pull-tester and fix multi-block transaction resurrection
Diffstat (limited to 'src/checkpoints.cpp')
| -rw-r--r-- | src/checkpoints.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index ba29e2463e..0716cfca31 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -67,11 +67,24 @@ namespace Checkpoints 300 }; + static MapCheckpoints mapCheckpointsRegtest = + boost::assign::map_list_of + ( 0, uint256("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206")) + ; + static const CCheckpointData dataRegtest = { + &mapCheckpointsRegtest, + 0, + 0, + 0 + }; + const CCheckpointData &Checkpoints() { - if (TestNet()) + if (Params().NetworkID() == CChainParams::TESTNET) return dataTestnet; - else + else if (Params().NetworkID() == CChainParams::MAIN) return data; + else + return dataRegtest; } bool CheckBlock(int nHeight, const uint256& hash) |