Reset testnet (v4).

vertoe · Dec 5, 2014 · 4f95ea2 · 4f95ea2
1 parent 4fca7b4
commit 4f95ea2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/TODO.md b/TODO.md
@@ -20,6 +20,7 @@ DONE:
 - Adjusted difficulty and blockvalue (KGW, DGW based on blockheight)
 - Defined regression test genesis block
 - Updated wallet layout and branding
+- Reset testnet (v4) with new genesis and address version (start with x)
 
 
 MANDATORY:
@@ -32,10 +33,9 @@ MANDATORY:
 OPTIONAL:
 ---------
 
-- All the above for Testnet (including complete testnet reset)
+- Define BIP0032 addresses EXT_PUBLIC_KEY and EXT_SECRET_KEY for Darkcoin
 - Include Evan's public key for msg signing
 - Darksend, Instant Transactions, Atomic Transfers, etc. pp.
-- Define BIP0032 addresses EXT_PUBLIC_KEY and EXT_SECRET_KEY for Darkcoin
 - Include centralized checkpoint syncing (peercoin style)
 - Remove Bitcoin dead weight (SHA256, hardcoded keys, nodes)
 - Update strings

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -101,7 +101,7 @@ static CMainParams mainParams;
 
 
 //
-// Testnet (v3)
+// Testnet (v4)
 //
 class CTestNetParams : public CMainParams {
 public:
@@ -117,21 +117,21 @@ class CTestNetParams : public CMainParams {
         vAlertPubKey = ParseHex("040184710fa689ad5023690c80f3a49c8f13f8d45b8c857fbcbc8bc4a8e4d3eb4b10f4d4604fa08dce601aaf0f470216fe1b51850b4acf21b179c45070ac7b03a9");
         nDefaultPort = 19999;
         nRPCPort = 19998;
-        strDataDir = "testnet3";
+        strDataDir = "testnet4";
 
         // Modify the testnet genesis block so the timestamp is valid for a later start.
-        genesis.nTime = 1390666206;
-        genesis.nNonce = 3861367235;
+        genesis.nTime = 1413333337;
+        genesis.nNonce = 3229645;
 
         hashGenesisBlock = genesis.GetHash();
-        assert(hashGenesisBlock == uint256("0x00000bafbc94add76cb75e2ec92894837288a481e5c005f6563d91623bf8bc2c"));
+        assert(hashGenesisBlock == uint256("0x00000008dfc658b2a9f79910d42e0595464e19cc332d98c0762330142f51ff73"));
 
         vFixedSeeds.clear();
         vSeeds.clear();
         vSeeds.push_back(CDNSSeedData("darkcoin.io", "testnet-seed.darkcoin.io"));
         vSeeds.push_back(CDNSSeedData("darkcoin.qa", "testnet-seed.darkcoin.qa"));
 
-        base58Prefixes[PUBKEY_ADDRESS] = list_of(138); // Testnet addresses start with x
+        base58Prefixes[PUBKEY_ADDRESS] = list_of(138); // Testnet v4 addresses start with x
         base58Prefixes[SCRIPT_ADDRESS] = list_of(196);
         base58Prefixes[SECRET_KEY]     = list_of(239);
         base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x35)(0x87)(0xCF);

diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -56,25 +56,25 @@ namespace Checkpoints
     static const CCheckpointData data = {
         &mapCheckpoints,
         1403283082, // * UNIX timestamp of last checkpoint block
-        511516,    // * total number of transactions between genesis and last checkpoint
+        511516,     // * total number of transactions between genesis and last checkpoint
                     //   (the tx=... number in the SetBestChain debug.log lines)
-        7701.12     // * estimated number of transactions per day after checkpoint
+        7701        // * estimated number of transactions per day after checkpoint
     };
 
     static MapCheckpoints mapCheckpointsTestnet =
         boost::assign::map_list_of
-        (  44, uint256("0000067c31e243309c88be69339a92ee440abe94d3118248e09a4785e18e3528"))
+        ( 0, uint256("0x00000008dfc658b2a9f79910d42e0595464e19cc332d98c0762330142f51ff73"))
         ;
     static const CCheckpointData dataTestnet = {
         &mapCheckpointsTestnet,
-        1405697869,
-        3000,
-        30
+        0,
+        0,
+        0
     };
 
     static MapCheckpoints mapCheckpointsRegtest =
         boost::assign::map_list_of
-        ( 0, uint256("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206"))
+        ( 0, uint256("0x000008ca1832a4baf228eb1553c03d3a2c8e02399550dd6ea8d65cec3ef23d2e"))
         ;
     static const CCheckpointData dataRegtest = {
         &mapCheckpointsRegtest,

diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
@@ -1,4 +1,5 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
+// Copyright (c) 2014 vertoe & the Darkcoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -54,7 +55,7 @@ class ClientModel : public QObject
     double getVerificationProgress() const;
     QDateTime getLastBlockDate() const;
 
-    //! Return network (main, testnet3, regtest)
+    //! Return network (main, testnet4, regtest)
     QString getNetworkName() const;
     //! Return true if core is doing initial block download
     bool inInitialBlockDownload() const;

diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
+// Copyright (c) 2014 vertoe & the Darkcoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -440,7 +441,7 @@ Value getblockchaininfo(const Array& params, bool fHelp)
             "Returns an object containing various state info regarding block chain processing.\n"
             "\nResult:\n"
             "{\n"
-            "  \"chain\": \"xxxx\",        (string) current chain (main, testnet3, regtest)\n"
+            "  \"chain\": \"xxxx\",        (string) current chain (main, testnet4, regtest)\n"
             "  \"blocks\": xxxxxx,         (numeric) the current number of blocks processed in the server\n"
             "  \"bestblockhash\": \"...\", (string) the hash of the currently best block\n"
             "  \"difficulty\": xxxxxx,     (numeric) the current difficulty\n"