Fix Komodo compatibility

src/chainparams.cpp

@@ -116,9 +116,9 @@ public:
         consensus.vUpgrades[Consensus::UPGRADE_TESTDUMMY].nActivationHeight =
             Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
         consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nProtocolVersion = 170005;
-        consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 227520;
+        consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
         consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170007;
-        consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = 227520;
+        consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000281b32ff3198a1");

src/deprecation.cpp

@@ -20,7 +20,7 @@ void EnforceNodeDeprecation(int nHeight, bool forceLogging, bool fThread) {
     std::string networkID = Params().NetworkIDString();
     std::string msg;
 
-    if (networkID != "main" || ASSETCHAINS_SYMBOL[0] != 0 ) return;
+    if (networkID != "main" || strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 ) return;
 
     int blocksToDeprecation = DEPRECATION_HEIGHT - nHeight;
     if (blocksToDeprecation <= 0) {

src/komodo_defs.h

@@ -10,7 +10,5 @@
 #define IGUANA_MAXSCRIPTSIZE 10001
 #define KOMODO_MAXMEMPOOLTIME 3600 // affects consensus
 #define CRYPTO777_PUBSECPSTR "020e46e79a2a8d12b9b5d12c7a91adb4e454edfae43c0a0cb805427d2ac7613fd9"
-#define VRSC_SAPLING_UPGRADE 227520 // height that the inadvertent KMD merge/coinbase output changes to VRSC are removed
-                                  // approximately October 28th
 
 #endif