Skip to content

Commit 9310ebc

Browse files
Merge #6753: fix: avoid accidental v23 activation on mainnet/testnet
e4172cd fix: avoid accidental v23 activation on mainnet/testnet (UdjinM6) Pull request description: ## Issue being fixed or feature implemented `v23` hf is in semi-ready state but it can be activated if `develop` is deployed on mainnet/testnet on too many nodes because we are past `nStartTime` already. ## What was done? Disable v23 for now, set proper start/timeout time in some future PR when we are ready. ## How Has This Been Tested? Run `getblockchaininfo` rpc , confirm `v23` in no longer listed in `softforks`. ## Breaking Changes n/a ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: kwvg: utACK e4172cd knst: utACK e4172cd Tree-SHA512: ada332ddd475309cd0a8acb6071a01538e870f3538c260f7314b86e427771c62ca8d54749c1114444fafc480837b98d37eb3a4a82f21033ced48b9a70bbcadcc
2 parents 9349b3b + e4172cd commit 9310ebc

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/chainparams.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ class CMainParams : public CChainParams {
210210
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].min_activation_height = 0; // No activation delay
211211

212212
consensus.vDeployments[Consensus::DEPLOYMENT_V23].bit = 12;
213-
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nStartTime = 1751328000; // July 1, 2025
214-
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nTimeout = 1782864000; // July 1, 2026
213+
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE; // TODO
214+
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; // TODO
215215
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nWindowSize = 4032;
216216
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdStart = 3226; // 80% of 4032
217217
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdMin = 2420; // 60% of 4032
@@ -408,7 +408,7 @@ class CTestNetParams : public CChainParams {
408408
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].min_activation_height = 0; // No activation delay
409409

410410
consensus.vDeployments[Consensus::DEPLOYMENT_V23].bit = 12;
411-
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nStartTime = 1751328000; // July 1, 2025
411+
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE; // TODO
412412
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
413413
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nWindowSize = 100;
414414
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdStart = 80; // 80% of 100

0 commit comments

Comments
 (0)