From e871bb78ad801db3fa446baadf20b3ccdef054cd Mon Sep 17 00:00:00 2001 From: miketout Date: Wed, 17 Oct 2018 16:57:27 -0700 Subject: [PATCH] Fix Komodo compatibility --- src/chainparams.cpp | 4 ++-- src/deprecation.cpp | 2 +- src/komodo_defs.h | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index fc2dc1054..2e4414a40 100644 --- a/src/chainparams.cpp +++ b/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"); diff --git a/src/deprecation.cpp b/src/deprecation.cpp index aaf7cf6df..40264b782 100644 --- a/src/deprecation.cpp +++ b/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) { diff --git a/src/komodo_defs.h b/src/komodo_defs.h index feb25b5c5..3929bdc4b 100644 --- a/src/komodo_defs.h +++ b/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