New Version and Spork Enforcement

Author: ZioFabry

src/main.cpp

@@ -5528,6 +5528,7 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
                 !pSporkDB->SporkExists(SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2) &&
                 !pSporkDB->SporkExists(SPORK_19_NEW_PROTOCOL_ENFORCEMENT_3) &&
                 !pSporkDB->SporkExists(SPORK_21_NEW_PROTOCOL_ENFORCEMENT_4) &&
+                !pSporkDB->SporkExists(SPORK_22_NEW_PROTOCOL_ENFORCEMENT_5) &&
                 !pSporkDB->SporkExists(SPORK_16_ZEROCOIN_MAINTENANCE_MODE);
 
         if (fMissingSporks || !fRequestedSporksIDB){
@@ -6412,6 +6413,10 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
 //       it was the one which was commented out
 int ActiveProtocol()
 {
+    // SPORK_22, used for 2.1.5.0
+    if (IsSporkActive(SPORK_22_NEW_PROTOCOL_ENFORCEMENT_5))
+            return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT_5;
+
     // SPORK_21, used for 2.1.4.0
     if (IsSporkActive(SPORK_21_NEW_PROTOCOL_ENFORCEMENT_4))
             return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT_4;

src/version.h

@@ -11,7 +11,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70106;
+static const int PROTOCOL_VERSION = 70107;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 210;
@@ -25,6 +25,7 @@ static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT   = 70103;
 static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT_2 = 70104;
 static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT_3 = 70105;
 static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT_4 = 70106;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT_5 = 70107;
 
 //! masternodes older than this proto version use old strMessage format for mnannounce
 static const int MIN_PEER_MNANNOUNCE = 70101;