diff --git a/src/chainparams.cpp b/src/chainparams.cpp --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -121,9 +121,6 @@ // November 15, 2018 hard fork consensus.magneticAnomalyHeight = 556766; - // Wed, 15 May 2019 12:00:00 UTC hard fork - consensus.greatWallActivationTime = 1557921600; - // Nov 15, 2019 12:00:00 UTC protocol upgrade consensus.gravitonActivationTime = 1573819200; @@ -289,9 +286,6 @@ // November 15, 2018 hard fork consensus.magneticAnomalyHeight = 1267996; - // Wed, 15 May 2019 12:00:00 UTC hard fork - consensus.greatWallActivationTime = 1557921600; - // Nov 15, 2019 12:00:00 UTC protocol upgrade consensus.gravitonActivationTime = 1573819200; @@ -409,9 +403,6 @@ // November 15, 2018 hard fork is always on on regtest. consensus.magneticAnomalyHeight = 0; - // Wed, 15 May 2019 12:00:00 UTC hard fork - consensus.greatWallActivationTime = 1557921600; - // Nov 15, 2019 12:00:00 UTC protocol upgrade consensus.gravitonActivationTime = 1573819200; diff --git a/src/consensus/activation.h b/src/consensus/activation.h --- a/src/consensus/activation.h +++ b/src/consensus/activation.h @@ -22,9 +22,6 @@ bool IsMagneticAnomalyEnabled(const Config &config, const CBlockIndex *pindexPrev); -/** Check if May 15th, 2019 protocol upgrade has activated. */ -bool IsGreatWallEnabled(const Config &config, const CBlockIndex *pindexPrev); - /** Check if Nov 15th, 2019 protocol upgrade has activated. */ bool IsGravitonEnabled(const Config &config, const CBlockIndex *pindexPrev); diff --git a/src/consensus/activation.cpp b/src/consensus/activation.cpp --- a/src/consensus/activation.cpp +++ b/src/consensus/activation.cpp @@ -47,17 +47,6 @@ return IsMagneticAnomalyEnabled(config, pindexPrev->nHeight); } -bool IsGreatWallEnabled(const Config &config, const CBlockIndex *pindexPrev) { - if (pindexPrev == nullptr) { - return false; - } - - return pindexPrev->GetMedianTimePast() >= - gArgs.GetArg( - "-greatwallactivationtime", - config.GetChainParams().GetConsensus().greatWallActivationTime); -} - bool IsGravitonEnabled(const Config &config, const CBlockIndex *pindexPrev) { if (pindexPrev == nullptr) { return false; diff --git a/src/consensus/params.h b/src/consensus/params.h --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -36,8 +36,6 @@ int daaHeight; /** Block height at which the magnetic anomaly activation becomes active */ int magneticAnomalyHeight; - /** Unix time used for MTP activation of 15 May 2019 12:00:00 UTC upgrade */ - int greatWallActivationTime; /** Unix time used for MTP activation of Nov 15 2019 12:00:00 UTC upgrade */ int gravitonActivationTime; /** Proof of work parameters */ diff --git a/src/test/activation_tests.cpp b/src/test/activation_tests.cpp --- a/src/test/activation_tests.cpp +++ b/src/test/activation_tests.cpp @@ -23,30 +23,6 @@ assert(blocks.back().GetMedianTimePast() == mtp); } -BOOST_AUTO_TEST_CASE(isgreatwallenabled) { - DummyConfig config; - CBlockIndex prev; - - const auto activation = - config.GetChainParams().GetConsensus().greatWallActivationTime; - - BOOST_CHECK(!IsGreatWallEnabled(config, nullptr)); - - std::array blocks; - for (size_t i = 1; i < blocks.size(); ++i) { - blocks[i].pprev = &blocks[i - 1]; - } - - SetMTP(blocks, activation - 1); - BOOST_CHECK(!IsGreatWallEnabled(config, &blocks.back())); - - SetMTP(blocks, activation); - BOOST_CHECK(IsGreatWallEnabled(config, &blocks.back())); - - SetMTP(blocks, activation + 1); - BOOST_CHECK(IsGreatWallEnabled(config, &blocks.back())); -} - BOOST_AUTO_TEST_CASE(isgravitonenabled) { DummyConfig config; CBlockIndex prev; diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -389,11 +389,6 @@ return IsMagneticAnomalyEnabled(config, chainActive.Tip()); } -static bool IsGreatWallEnabledForCurrentBlock(const Config &config) { - AssertLockHeld(cs_main); - return IsGreatWallEnabled(config, chainActive.Tip()); -} - // Command-line argument "-replayprotectionactivationtime=" will // cause the node to switch to replay protected SigHash ForkID value when the // median timestamp of the previous 11 blocks is greater than or equal to diff --git a/test/lint/check-doc.py b/test/lint/check-doc.py --- a/test/lint/check-doc.py +++ b/test/lint/check-doc.py @@ -32,8 +32,6 @@ '-forcecompactdb', # TODO remove after the Nov 2019 upgrade '-gravitonactivationtime', - # TODO remove after the may 2019 fork - '-greatwallactivationtime', '-h', '-help', '-parkdeepreorg',