v2.0.1

Author: IttriumCore

configure.ac

@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_REVISION, 1)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)

src/chainparams.cpp

@@ -62,8 +62,8 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
  	(9999, uint256("0x87bc66f59d2357927e42d4846b807bc3e61084c3e06b63569545ed7698aef7f7"))
  	(19333, uint256("0xa0209e76d00be2a96c6f422c73ae34a341c9981b1b8064bcd39d5d7d5ce70dd0"))
  	(27033, uint256("0x89f578d968265cc425253199da3b6a01dbd99b706338d20ce78ae93299f3a605"))
-        69333, uint256("0x751aca0839a2a72ef1f400d17f2461f0eafb185508ef5639b4336d2d7f2cbc9e"))
-        (90369, uint256("0xa9e3259d93d0e5e96bd35f9718890d708a86452a507838cab6dc442c7717b4db"))
+  (69333, uint256("0x751aca0839a2a72ef1f400d17f2461f0eafb185508ef5639b4336d2d7f2cbc9e"))
+  (90369, uint256("0xa9e3259d93d0e5e96bd35f9718890d708a86452a507838cab6dc442c7717b4db"))
 	(99879, uint256("0x09f07b93863c421d8826ef7eafb1610237f2f817820ac2ab6ee2c1e1793de3d6"))
 	(100439, uint256("0xe733ee2c2139fc2acc545f4c8291c12aa1ef92809648b362384d4df705420222"));
 

src/clientversion.h

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

src/main.cpp

@@ -5519,7 +5519,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             !pSporkDB->SporkExists(SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2) &&
             !pSporkDB->SporkExists(SPORK_20_ZEROCOIN_MAINTENANCE_MODE) &&
             !pSporkDB->SporkExists(SPORK_17_NEW_PROTOCOL_ENFORCEMENT_3) &&
-            !pSporkDB->SporkExists(SPORK_18_NEW_PROTOCOL_DYNAMIC) &&
+            !pSporkDB->SporkExists(SPORK_18_NEW_PROTOCOL_ENFORCEMENT_4) &&
             !pSporkDB->SporkExists(SPORK_19_ENABLE_ZEROCOIN)) {
             LogPrintf("Required sporks not found, asking peer to send them\n");
             pfrom->PushMessage("getsporks");
@@ -6333,8 +6333,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
 int ActiveProtocol()
 {
-    if (IsSporkActive(SPORK_18_NEW_PROTOCOL_DYNAMIC))
-        return GetSporkValue(SPORK_18_NEW_PROTOCOL_DYNAMIC);
+    if (IsSporkActive(SPORK_18_NEW_PROTOCOL_ENFORCEMENT_4))
+        return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT18;
 
     if (IsSporkActive(SPORK_17_NEW_PROTOCOL_ENFORCEMENT_3))
         return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT17;

src/spork.cpp

@@ -133,7 +133,7 @@ int64_t GetSporkValue(int nSporkID)
         if (nSporkID == SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2) r = SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2_DEFAULT;
         if (nSporkID == SPORK_16_MN_WINNER_MINIMUM_AGE) r = SPORK_16_MN_WINNER_MINIMUM_AGE_DEFAULT;
         if (nSporkID == SPORK_17_NEW_PROTOCOL_ENFORCEMENT_3) r = SPORK_17_NEW_PROTOCOL_ENFORCEMENT_3_DEFAULT;
-        if (nSporkID == SPORK_18_NEW_PROTOCOL_DYNAMIC) r = SPORK_18_NEW_PROTOCOL_DYNAMIC_DEFAULT;
+        if (nSporkID == SPORK_18_NEW_PROTOCOL_ENFORCEMENT_4) r = SPORK_18_NEW_PROTOCOL_ENFORCEMENT_4_DEFAULT;
         if (nSporkID == SPORK_19_ENABLE_ZEROCOIN) r = SPORK_19_ENABLE_ZEROCOIN_DEFAULT;
         if (nSporkID == SPORK_20_ZEROCOIN_MAINTENANCE_MODE) r = SPORK_20_ZEROCOIN_MAINTENANCE_MODE_DEFAULT;
 
@@ -291,7 +291,7 @@ int CSporkManager::GetSporkIDByName(std::string strName)
     if (strName == "SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2") return SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2;
     if (strName == "SPORK_16_MN_WINNER_MINIMUM_AGE") return SPORK_16_MN_WINNER_MINIMUM_AGE;
     if (strName == "SPORK_17_NEW_PROTOCOL_ENFORCEMENT_3") return SPORK_17_NEW_PROTOCOL_ENFORCEMENT_3;
-    if (strName == "SPORK_18_NEW_PROTOCOL_DYNAMIC") return SPORK_18_NEW_PROTOCOL_DYNAMIC;
+    if (strName == "SPORK_18_NEW_PROTOCOL_ENFORCEMENT_4") return SPORK_18_NEW_PROTOCOL_ENFORCEMENT_4;
     if (strName == "SPORK_19_ENABLE_ZEROCOIN") return SPORK_19_ENABLE_ZEROCOIN;
     if (strName == "SPORK_20_ZEROCOIN_MAINTENANCE_MODE") return SPORK_20_ZEROCOIN_MAINTENANCE_MODE;
 
@@ -314,7 +314,7 @@ std::string CSporkManager::GetSporkNameByID(int id)
     if (id == SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2) return "SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2";
     if (id == SPORK_16_MN_WINNER_MINIMUM_AGE) return "SPORK_16_MN_WINNER_MINIMUM_AGE";
     if (id == SPORK_17_NEW_PROTOCOL_ENFORCEMENT_3) return "SPORK_17_NEW_PROTOCOL_ENFORCEMENT_3";
-    if (id == SPORK_18_NEW_PROTOCOL_DYNAMIC) return "SPORK_18_NEW_PROTOCOL_DYNAMIC";
+    if (id == SPORK_18_NEW_PROTOCOL_ENFORCEMENT_4) return "SPORK_18_NEW_PROTOCOL_ENFORCEMENT_4";
     if (id == SPORK_19_ENABLE_ZEROCOIN) return "SPORK_19_ENABLE_ZEROCOIN";
     if (id == SPORK_20_ZEROCOIN_MAINTENANCE_MODE) return "SPORK_20_ZEROCOIN_MAINTENANCE_MODE";
 

src/spork.h

@@ -42,7 +42,7 @@ using namespace boost;
 #define SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2 10014
 #define SPORK_16_MN_WINNER_MINIMUM_AGE 10015
 #define SPORK_17_NEW_PROTOCOL_ENFORCEMENT_3 10016
-#define SPORK_18_NEW_PROTOCOL_DYNAMIC 10017
+#define SPORK_18_NEW_PROTOCOL_ENFORCEMENT_4 10017
 #define SPORK_19_ENABLE_ZEROCOIN 10018
 #define SPORK_20_ZEROCOIN_MAINTENANCE_MODE 10019
 
@@ -62,9 +62,9 @@ using namespace boost;
                                                                    // misconfigured new nodes in the list. 
                                                                    // Set this to zero to emulate classic behaviour
 #define SPORK_17_NEW_PROTOCOL_ENFORCEMENT_3_DEFAULT 1529303404    //ON
-#define SPORK_18_NEW_PROTOCOL_DYNAMIC_DEFAULT 4070908800          //OFF
+#define SPORK_18_NEW_PROTOCOL_ENFORCEMENT_4_DEFAULT 4070908800          //OFF
                                                                    // Will be whatever value is provided during spork update.
-                                                                   // Example `spork SPORK_19_NEW_PROTOCOL_DYNAMIC 70910` will set active
+                                                                   // Example `spork SPORK_19_NEW_PROTOCOL_ENFORCEMENT_4 70910` will set active
                                                                    // protocol version to `70910`.
 #define SPORK_19_ENABLE_ZEROCOIN_DEFAULT 4070908800               //OFF
 #define SPORK_20_ZEROCOIN_MAINTENANCE_MODE_DEFAULT 4070908800     //OFF

src/version.h

@@ -22,7 +22,8 @@ static const int GETHEADERS_VERSION = 70077;
 //! disconnect from peers older than this proto version
 static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70900;
 static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT15 = 70811;
-static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT17 = 70910;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT17 = 70900;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT18 = 70910;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this