From ceaccb0c07c3095b467367f9ef8a465f8588d12d Mon Sep 17 00:00:00 2001 From: miketout Date: Mon, 15 Oct 2018 08:34:21 -0700 Subject: [PATCH] Sync Overwinter and Sapling defaults --- src/chainparams.cpp | 4 ++-- src/komodo_utils.h | 2 +- src/wallet-utility.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index d3fd7f66f..fc2dc1054 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -116,7 +116,7 @@ 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 - 120; + consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 227520; consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170007; consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = 227520; @@ -262,7 +262,7 @@ void *chainparams_commandline(void *ptr) if (strcmp(ASSETCHAINS_SYMBOL,"VRSC") == 0) { mainParams.consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = 227520; - mainParams.consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 227520 - 120; + mainParams.consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 227520; mainParams.consensus.fCoinbaseMustBeProtected = true; checkpointData = //(Checkpoints::CCheckpointData) { diff --git a/src/komodo_utils.h b/src/komodo_utils.h index f3496b132..6d145ea4f 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1784,7 +1784,7 @@ void komodo_args(char *argv0) } else { - ASSETCHAINS_OVERWINTER = GetArg("-ac_overwinter", (ASSETCHAINS_SAPLING - 120) > 1 ? (ASSETCHAINS_SAPLING - 120) : 1); + ASSETCHAINS_OVERWINTER = GetArg("-ac_overwinter", ASSETCHAINS_SAPLING); } if ( strlen(ASSETCHAINS_OVERRIDE_PUBKEY.c_str()) == 66 && ASSETCHAINS_COMMISSION > 0 && ASSETCHAINS_COMMISSION <= 100000000 ) diff --git a/src/wallet-utility.cpp b/src/wallet-utility.cpp index c10459b0f..8f3fe03ab 100644 --- a/src/wallet-utility.cpp +++ b/src/wallet-utility.cpp @@ -21,7 +21,7 @@ uint32_t ASSETCHAINS_VERUSHASH = 1; uint32_t ASSETCHAINS_ALGO = 0; int32_t ASSETCHAINS_LWMAPOS = 0; int32_t VERUS_BLOCK_POSUNITS = 1000; -int32_t ASSETCHAINS_OVERWINTER = 227520 - 120; +int32_t ASSETCHAINS_OVERWINTER = 227520; int32_t ASSETCHAINS_SAPLING = 227520; boost::optional cheatCatcher; std::string VERUS_CHEATCATCHER = "";