From 258562796102d064b8908ef4f5af6e6e9c6ff394 Mon Sep 17 00:00:00 2001 From: pedro-at-decenomy Date: Fri, 14 Jan 2022 15:00:05 +0000 Subject: [PATCH] reverts UPGRADE_TIMESPAN_V3 --- src/chainparams.cpp | 3 --- src/consensus/params.h | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 4a99366b99..1c1bc32471 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -229,7 +229,6 @@ class CMainParams : public CChainParams consensus.nStakeMinDepthV2 = 600; consensus.nTargetTimespan = 40; consensus.nTargetTimespanV2 = 30; - consensus.nTargetTimespanV3 = 30 * 60; consensus.nTargetSpacing = 1 * 150; consensus.nTargetSpacingV2 = 1 * 60; consensus.nTimeSlotLength = 15; @@ -283,7 +282,6 @@ class CMainParams : public CChainParams consensus.vUpgrades[Consensus::UPGRADE_STAKE_MIN_DEPTH_V2].nActivationHeight = 525001; consensus.vUpgrades[Consensus::UPGRADE_MASTERNODE_RANK_V2].nActivationHeight = 523001; consensus.vUpgrades[Consensus::UPGRADE_COINBASE_MATURITY_V2].nActivationHeight = 525001; - consensus.vUpgrades[Consensus::UPGRADE_TIMESPAN_V3].nActivationHeight = 800001; consensus.vUpgrades[Consensus::UPGRADE_POS].hashActivationBlock = uint256S("d5d5436381a5aceff75bae332b4a35f3c24b52194a56518fecf0ad25b03c2a80"); consensus.vUpgrades[Consensus::UPGRADE_POS_V2].hashActivationBlock = uint256S("11374e214fdc781a3ea206ead6cf23291ec3abfda245d58b0e555bc8d9711854"); @@ -295,7 +293,6 @@ class CMainParams : public CChainParams consensus.vUpgrades[Consensus::UPGRADE_STAKE_MIN_DEPTH_V2].hashActivationBlock = uint256S("8686d0f1739d6dfc6eafcefb4c9ad1b56fc256a852d5087593631ccb0866b8f4"); consensus.vUpgrades[Consensus::UPGRADE_MASTERNODE_RANK_V2].hashActivationBlock = uint256S("982267b09fbedbfad523c97f2c73a483dd070b11c00042a1fdb5586e3ab8848d"); consensus.vUpgrades[Consensus::UPGRADE_COINBASE_MATURITY_V2].hashActivationBlock = uint256S("8686d0f1739d6dfc6eafcefb4c9ad1b56fc256a852d5087593631ccb0866b8f4"); - consensus.vUpgrades[Consensus::UPGRADE_TIMESPAN_V3].hashActivationBlock = uint256S("0x0"); /** * The message start string is designed to be unlikely to occur in normal data. diff --git a/src/consensus/params.h b/src/consensus/params.h index 53baf11fe3..39ed10d618 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -39,7 +39,6 @@ enum UpgradeIndex : uint32_t { UPGRADE_STAKE_MIN_DEPTH_V2, UPGRADE_MASTERNODE_RANK_V2, UPGRADE_COINBASE_MATURITY_V2, - UPGRADE_TIMESPAN_V3, // NOTE: Also add new upgrades to NetworkUpgradeInfo in upgrades.cpp UPGRADE_TESTDUMMY, MAX_NETWORK_UPGRADES, @@ -110,7 +109,6 @@ struct Params { int nStakeMinDepthV2; int64_t nTargetTimespan; int64_t nTargetTimespanV2; - int64_t nTargetTimespanV3; int64_t nTargetSpacing; int64_t nTargetSpacingV2; int nTimeSlotLength; @@ -135,7 +133,7 @@ struct Params { // Map with network updates NetworkUpgrade vUpgrades[MAX_NETWORK_UPGRADES]; - int64_t TargetTimespan(const int nHeight) const { return TargetSpacing(nHeight) * (IsTimeProtocolV2(nHeight) ? (NetworkUpgradeActive(nHeight, UPGRADE_TIMESPAN_V3) ? nTargetTimespanV3 : nTargetTimespanV2) : nTargetTimespan); } + int64_t TargetTimespan(const int nHeight) const { return TargetSpacing(nHeight) * (IsTimeProtocolV2(nHeight) ? nTargetTimespanV2 : nTargetTimespan); } int64_t TargetSpacing(const int nHeight) const { return NetworkUpgradeActive(nHeight, UPGRADE_NEW_TARGET_SPACING) ? nTargetSpacingV2 : nTargetSpacing; } int CoinbaseMaturity(const int nHeight) const { return NetworkUpgradeActive(nHeight, UPGRADE_COINBASE_MATURITY_V2) ? nCoinbaseMaturityV2 : nCoinbaseMaturity; } uint256 ProofOfStakeLimit(const int nHeight) const { return IsTimeProtocolV2(nHeight) ? posLimitV2 : posLimitV1; }