update 1.2.2 with protocol enforcement

copicogithub1 · Jul 30, 2018 · d51cd87 · d51cd87
1 parent e07d9a4
commit d51cd87
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)

diff --git a/contrib/.DS_Store b/contrib/.DS_Store
diff --git a/contrib/gitian-descriptors/.DS_Store b/contrib/gitian-descriptors/.DS_Store
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -55,11 +55,13 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
 	(50000, uint256("0x18979aa918bf457765ecc9d4bbf761a0bfa656f6cb12dd0007e5ceebac811edd"))
 	(80000, uint256("0x1bdefb98540a6a66da1ae7217e47d45d6de8a36a53869ddc9de869cb50321c26"))
 	(110000, uint256("0x64532ec3abe8553d7e33b99c2a4db39c95bd674d2cf69d42d7642ab417d1308c"))
-	(118800, uint256("0x43425e5ea2b977e11ddb9eb27b7ec2d923b5c616c7144b8d259f2cc3ee29732e"));
+	(118800, uint256("0x43425e5ea2b977e11ddb9eb27b7ec2d923b5c616c7144b8d259f2cc3ee29732e"))
+    (118811, uint256("0x3d63ebdb5463323fe2b3dc137fdcd8af92a671a3d7d770a2a5ec96c8608cd0f1"))
+	(118900, uint256("0xedd57aa988c4a82bfaadf86b898e248b03e39222411bcad37616863458900a1e"));
 
 static const Checkpoints::CCheckpointData data = {
     &mapCheckpoints,
-	1531176411, // * UNIX timestamp of last checkpoint block
+	1532896389, // * UNIX timestamp of last checkpoint block
     0,    // * total number of transactions between genesis and last checkpoint
                 //   (the tx=... number in the SetBestChain debug.log lines)
     2000        // * estimated number of transactions per day after checkpoint
@@ -105,7 +107,7 @@ class CMainParams : public CChainParams
         nLastPOWBlock = 2000;
         nMaturity = 50;
         nNewMaturity = 100;
-        nProtocol_switch = 121760;
+        nProtocol_switch = 122760;
         nModifierUpdateBlock = 1;
 
         const char* pszTimestamp = "Copico to launch one of it's innovative products on the blockchain";

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -16,7 +16,7 @@
 //! These need to be macros, as clientversion.cpp's and cazcoin*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 2
-#define CLIENT_VERSION_REVISION 1
+#define CLIENT_VERSION_REVISION 2
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build

diff --git a/src/main.cpp b/src/main.cpp
@@ -5320,7 +5320,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
 int ActiveProtocol()
 {
-    if (IsSporkActive(SPORK_14_NEW_PROTOCOL_ENFORCEMENT) || chainActive.Tip()->nHeight > 118820) {
+    if (IsSporkActive(SPORK_14_NEW_PROTOCOL_ENFORCEMENT) || chainActive.Tip()->nHeight > 0) {
             return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT;
     }
 

diff --git a/src/version.h b/src/version.h
@@ -12,7 +12,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70713;
+static const int PROTOCOL_VERSION = 70714;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -22,7 +22,7 @@ static const int GETHEADERS_VERSION = 70077;
 
 //! disconnect from peers older than this proto version
 static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70701;
-static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70713;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70714;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this