From 8956704ddc61f8ab47bbabbf15b5555ad326e61f Mon Sep 17 00:00:00 2001 From: barrystyle Date: Fri, 8 Oct 2021 02:29:50 +0800 Subject: [PATCH 1/2] Remove odocrypt deployment definition from chainparams.cpp (again). This is not required if the deployment has been buried. Additionally it causes a segfault if digibyte was launched with a new data directory. --- src/chainparams.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 5b3e87ac45..a808fd79e5 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -104,14 +104,6 @@ class CMainParams : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008 consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].min_activation_height = 0; // No activation delay - // Deployment of Odo proof-of-work hardfork - consensus.vDeployments[Consensus::DEPLOYMENT_ODO].bit = 6; - consensus.vDeployments[Consensus::DEPLOYMENT_ODO].nStartTime = 1556668800; // 1 May, 2019 - consensus.vDeployments[Consensus::DEPLOYMENT_ODO].nTimeout = 1588291200; // 1 May, 2020 - - // Block 9112320 hash 906b712a7b1f54f10b0faf86111e832ddb7b8ce86ac71a4edd2c61e5ccfe9428 - consensus.vDeployments[Consensus::DEPLOYMENT_ODO].min_activation_height = 9112320; - // Deployment of Taproot (BIPs 340-342) consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2; consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 1630454400; // Sept 1st, 2021 From 193bc71ae41d2f514ff4d8bd65cf1b83361bc059 Mon Sep 17 00:00:00 2001 From: barrystyle Date: Fri, 8 Oct 2021 02:52:34 +0800 Subject: [PATCH 2/2] Ignore any 'unknown new rules' message if triggered by a bit within block algo version range --- src/validation.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/validation.cpp b/src/validation.cpp index 2528967ea0..a957987fe9 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2366,6 +2366,9 @@ void CChainState::UpdateTip(const CBlockIndex* pindexNew) for (int bit = 0; bit < VERSIONBITS_NUM_BITS; bit++) { WarningBitsConditionChecker checker(bit); ThresholdState state = checker.GetStateFor(pindex, m_params.GetConsensus(), warningcache[bit]); + // dont trigger 'unknown new rules' warning if the bit falls within + // the block algo version range (enum in primitives/block.h) + if (bit <= BLOCK_VERSION_ALGO) continue; if (state == ThresholdState::ACTIVE || state == ThresholdState::LOCKED_IN) { const bilingual_str warning = strprintf(_("Unknown new rules activated (versionbit %i)"), bit); if (state == ThresholdState::ACTIVE) {