Merge pull request #1 from CryptoNatriX/V1.2.0.0

V1.2.0.0
CryptoNatriX · Mar 3, 2016 · 0cab7dc · 0cab7dc
2 parents 95efe29 + 86c984e
commit 0cab7dc
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,12 @@
 cash
 ====
 
-Removingx86 references so it can compile on a Raspberry PI
+-Checkpoint update
+
+-Copyright update
+
+-Faster Start up
+
+-Version bump
+
+-Removingx86 references so it can compile on a Raspberry PI
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) 2009-2012 The Bitcoin developers
+// Copyright (c) 2016 CASH developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -26,7 +27,7 @@ namespace Checkpoints
         boost::assign::map_list_of
         ( 0, hashGenesisBlockOfficial )
         ( 19494, uint256("0x00000000169f68123cfafca03be2f319c59dd20cb8caae58a3e9652fb0ff2dcb"))
-
+        ( 1070001, uint256("0x0000002b97449970fabf35533b69c37ae1869575dd7b66d3f91fefc2980929dc"))
 
 ;
 
@@ -367,7 +368,7 @@ namespace Checkpoints
 
 // ppcoin: sync-checkpoint master key
 
-const std::string CSyncCheckpoint::strMasterPubKey = "040cc88c5a29ba77ac760df671efe18f6837d6561896100e0ccde490c1971860b2fe41312a3d966a72ab6936dc8e737cb855263b1aaf92e5c3e7146d4550c588c6";
+const std::string CSyncCheckpoint::strMasterPubKey = "0490aaa63e59889bdb51111503b1cbcfd521b148a5f614125b5c2fd190c3ed05efb5cbea4ff8b276ed65a6808fba2bb53f439db1ca79c935edd1df0981ba4b2553";
 
 std::string CSyncCheckpoint::strMasterPrivKey = "";
 

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -6,9 +6,9 @@
 //
 
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
-#define CLIENT_VERSION_MAJOR       0
-#define CLIENT_VERSION_MINOR       7
-#define CLIENT_VERSION_REVISION    2
+#define CLIENT_VERSION_MAJOR       1
+#define CLIENT_VERSION_MINOR       2
+#define CLIENT_VERSION_REVISION    0
 #define CLIENT_VERSION_BUILD       0
 
 // Converts the parameter X to a string after macro replacement on X has been performed.

diff --git a/src/db.cpp b/src/db.cpp
@@ -664,8 +664,8 @@ bool CTxDB::LoadBlockIndex()
     ReadBestInvalidTrust(bnBestInvalidTrust);
 
     // Verify blocks in the best chain
-    int nCheckLevel = GetArg("-checklevel", 1);
-    int nCheckDepth = GetArg( "-checkblocks", 2500);
+    int nCheckLevel = GetArg("-checklevel", 3);
+    int nCheckDepth = GetArg( "-checkblocks", 288);
     if (nCheckDepth == 0)
         nCheckDepth = 1000000000; // suffices until the year 19000
     if (nCheckDepth > nBestHeight)

diff --git a/src/init.cpp b/src/init.cpp
@@ -282,8 +282,8 @@ std::string HelpMessage()
         "  -keypool=<n>           " + _("Set key pool size to <n> (default: 100)") + "\n" +
         "  -rescan                " + _("Rescan the block chain for missing wallet transactions") + "\n" +
         "  -salvagewallet         " + _("Attempt to recover private keys from a corrupt wallet.dat") + "\n" +
-        "  -checkblocks=<n>       " + _("How many blocks to check at startup (default: 2500, 0 = all)") + "\n" +
-        "  -checklevel=<n>        " + _("How thorough the block verification is (0-6, default: 1)") + "\n" +
+        "  -checkblocks=<n>       " + _("How many blocks to check at startup (default: 288, 0 = all)") + "\n" +
+        "  -checklevel=<n>        " + _("How thorough the block verification is (0-6, default: 3)") + "\n" +
         "  -loadblock=<file>      " + _("Imports blocks from external blk000?.dat file") + "\n" +
 
         "\n" + _("Block creation options:") + "\n" +

diff --git a/src/kernel.cpp b/src/kernel.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) 2012-2013 The PPCoin developers
+// Copyright (c) 2016 CASH developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -21,6 +22,7 @@ static std::map<int, unsigned int> mapStakeModifierCheckpoints =
     boost::assign::map_list_of
     ( 0, 0x0e00670bu )
     ( 19494, 0x72f48962 )
+    ( 1070001, 0x6e3477eb )
     ;
 
 // Get the last stake modifier and its generation time from a given block

diff --git a/src/version.cpp b/src/version.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) 2012 The Bitcoin developers
+// Copyright (c) 2016 CASH developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #include <string>
@@ -8,10 +9,10 @@
 // Name of client reported in the 'version' message. Report the same name
 // for both bitcoind and bitcoin-qt, to make it harder for attackers to
 // target servers or GUI users specifically.
-const std::string CLIENT_NAME("Satoshi");
+const std::string CLIENT_NAME("Cash");
 
 // Client version number
-#define CLIENT_VERSION_SUFFIX   "-CASH"
+#define CLIENT_VERSION_SUFFIX   ""
 
 
 // The following part of the code determines the CLIENT_BUILD variable.
@@ -36,7 +37,7 @@ const std::string CLIENT_NAME("Satoshi");
 // git will put "#define GIT_ARCHIVE 1" on the next line inside archives. 
 #define GIT_ARCHIVE 1
 #ifdef GIT_ARCHIVE
-#    define GIT_COMMIT_ID "32a928e"
+#    define GIT_COMMIT_ID "787a971"
 #    define GIT_COMMIT_DATE "$Format:%cD"
 #endif
 

diff --git a/src/version.h b/src/version.h
@@ -1,4 +1,5 @@
 // Copyright (c) 2012 The Bitcoin developers
+// Copyright (c) 2016 CASH developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #ifndef BITCOIN_VERSION_H
@@ -45,8 +46,8 @@ static const int BIP0031_VERSION = 60000;
 static const int MEMPOOL_GD_VERSION = 60002;
 
 #define DISPLAY_VERSION_MAJOR       1
-#define DISPLAY_VERSION_MINOR       1
+#define DISPLAY_VERSION_MINOR       2
 #define DISPLAY_VERSION_REVISION    0
-#define DISPLAY_VERSION_BUILD       2
+#define DISPLAY_VERSION_BUILD       0
 
 #endif