diff --git a/src/chainparams.cpp b/src/chainparams.cpp --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -99,17 +99,6 @@ consensus.nPowTargetSpacing = 10 * 60; consensus.fPowAllowMinDifficultyBlocks = false; consensus.fPowNoRetargeting = false; - // 95% of 2016 - consensus.nRuleChangeActivationThreshold = 1916; - // nPowTargetTimespan / nPowTargetSpacing - consensus.nMinerConfirmationWindow = 2016; - consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28; - // January 1, 2008 - consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = - 1199145601; - // December 31, 2008 - consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = - 1230767999; // The best chain should have at least this much work. consensus.nMinimumChainWork = uint256S( @@ -276,17 +265,6 @@ consensus.nPowTargetSpacing = 10 * 60; consensus.fPowAllowMinDifficultyBlocks = true; consensus.fPowNoRetargeting = false; - // 75% for testchains - consensus.nRuleChangeActivationThreshold = 1512; - // nPowTargetTimespan / nPowTargetSpacing - consensus.nMinerConfirmationWindow = 2016; - consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28; - // January 1, 2008 - consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = - 1199145601; - // December 31, 2008 - consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = - 1230767999; // The best chain should have at least this much work. consensus.nMinimumChainWork = uint256S( @@ -407,14 +385,6 @@ consensus.nPowTargetSpacing = 10 * 60; consensus.fPowAllowMinDifficultyBlocks = true; consensus.fPowNoRetargeting = true; - // 75% for testchains - consensus.nRuleChangeActivationThreshold = 108; - // Faster than normal for regtest (144 instead of 2016) - consensus.nMinerConfirmationWindow = 144; - consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28; - consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 0; - consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = - 999999999999ULL; // The best chain should have at least this much work. consensus.nMinimumChainWork = uint256S("0x00"); diff --git a/src/consensus/params.h b/src/consensus/params.h --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -13,28 +13,6 @@ namespace Consensus { -enum DeploymentPos { - DEPLOYMENT_TESTDUMMY, - // NOTE: Also add new deployments to VersionBitsDeploymentInfo in - // versionbits.cpp - MAX_VERSION_BITS_DEPLOYMENTS -}; - -/** - * Struct for each individual consensus rule change using BIP9. - */ -struct BIP9Deployment { - /** Bit position to select the particular bit in nVersion. */ - int bit; - /** - * Start MedianTime for version bits miner confirmation. Can be a date in - * the past. - */ - int64_t nStartTime; - /** Timeout/expiry MedianTime for the deployment attempt. */ - int64_t nTimeout; -}; - /** * Parameters that influence chain consensus. */ @@ -60,15 +38,6 @@ int greatWallActivationTime; /** Unix time used for MTP activation of Nov 15 2019 12:00:00 UTC upgrade */ int gravitonActivationTime; - /** - * Minimum blocks including miner confirmation of the total of 2016 blocks - * in a retargeting period, (nPowTargetTimespan / nPowTargetSpacing) which - * is also used for BIP9 deployments. - * Examples: 1916 for 95%, 1512 for testchains. - */ - uint32_t nRuleChangeActivationThreshold; - uint32_t nMinerConfirmationWindow; - BIP9Deployment vDeployments[MAX_VERSION_BITS_DEPLOYMENTS]; /** Proof of work parameters */ uint256 powLimit; bool fPowAllowMinDifficultyBlocks;