Merge pull request #83 from vertoe/devel-0.9

Clean testnet reset to v3. (branch v11)
dashpay · Dec 26, 2014 · 04ab85a · 04ab85a
2 parents 766e654 + b0f06bf
commit 04ab85a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -101,7 +101,7 @@ static CMainParams mainParams;
 
 
 //
-// Testnet (v4)
+// Testnet (v3)
 //
 class CTestNetParams : public CMainParams {
 public:
@@ -131,7 +131,7 @@ class CTestNetParams : public CMainParams {
         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(111); // Testnet v4 addresses
+        base58Prefixes[PUBKEY_ADDRESS] = list_of(111); // Testnet v3 addresses
         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
@@ -68,8 +68,8 @@ namespace Checkpoints
     static const CCheckpointData dataTestnet = {
         &mapCheckpointsTestnet,
         1405699509,
-        20,
-        300
+        201,
+        500
     };
 
     static MapCheckpoints mapCheckpointsRegtest =

diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
@@ -55,7 +55,7 @@ class ClientModel : public QObject
     double getVerificationProgress() const;
     QDateTime getLastBlockDate() const;
 
-    //! Return network (main, testnet4, regtest)
+    //! Return network (main, testnet3, 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
@@ -441,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, testnet4, regtest)\n"
+            "  \"chain\": \"xxxx\",        (string) current chain (main, testnet3, 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"