From d9ace8abe804a4134e5e77a0f9f82a52ea339762 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 23 Jul 2013 17:46:05 +0200
Subject: Don't use checkpoints and accept nonstd txn on -regtest

---
 src/checkpoints.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'src/checkpoints.cpp')

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)
-- 
cgit v1.2.3