[Cleanup] Deprecate SPORK 18

random-zebra · random-zebra · commit 179662c6449c · 2021-07-25T20:31:40.000+02:00
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -1230,7 +1230,6 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
         bool fMissingSporks = !pSporkDB->SporkExists(SPORK_14_NEW_PROTOCOL_ENFORCEMENT) ||
                               !pSporkDB->SporkExists(SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2) ||
                               !pSporkDB->SporkExists(SPORK_16_ZEROCOIN_MAINTENANCE_MODE) ||
-                              !pSporkDB->SporkExists(SPORK_18_ZEROCOIN_PUBLICSPEND_V4) ||
                               !pSporkDB->SporkExists(SPORK_19_COLDSTAKING_MAINTENANCE) ||
                               !pSporkDB->SporkExists(SPORK_20_SAPLING_MAINTENANCE);
 
diff --git a/src/spork.cpp b/src/spork.cpp
@@ -24,7 +24,6 @@ std::vector<CSporkDef> sporkDefs = {
     MAKE_SPORK_DEF(SPORK_14_NEW_PROTOCOL_ENFORCEMENT,       4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2,     4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_16_ZEROCOIN_MAINTENANCE_MODE,      4070908800ULL), // OFF
-    MAKE_SPORK_DEF(SPORK_18_ZEROCOIN_PUBLICSPEND_V4,        4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_19_COLDSTAKING_MAINTENANCE,        4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_20_SAPLING_MAINTENANCE,            4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_21_LEGACY_MNS_MAX_HEIGHT,          4070908800ULL), // OFF
diff --git a/src/sporkid.h b/src/sporkid.h
@@ -22,7 +22,7 @@ enum SporkId : int32_t {
     SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2         = 10014,
     SPORK_16_ZEROCOIN_MAINTENANCE_MODE          = 10015,
     SPORK_17_COLDSTAKING_ENFORCEMENT            = 10017,       // Deprecated in 4.3.99
-    SPORK_18_ZEROCOIN_PUBLICSPEND_V4            = 10018,
+    SPORK_18_ZEROCOIN_PUBLICSPEND_V4            = 10018,       // Deprecated in 5.2.99
     SPORK_19_COLDSTAKING_MAINTENANCE            = 10019,
     SPORK_20_SAPLING_MAINTENANCE                = 10020,
     SPORK_21_LEGACY_MNS_MAX_HEIGHT              = 10021,
