Skip to content

Commit 1e3de36

Browse files
PastaPastaPastaknst
authored andcommitted
Merge dashpay#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
1 parent 4ca3904 commit 1e3de36

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
@@ -219,8 +219,8 @@ class CMainParams : public CChainParams {
219219
consensus.vDeployments[Consensus::DEPLOYMENT_WITHDRAWALS].useEHF = true;
220220

221221
consensus.vDeployments[Consensus::DEPLOYMENT_V23].bit = 12;
222-
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nStartTime = 1751328000; // July 1, 2025
223-
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nTimeout = 1782864000; // July 1, 2026
222+
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE; // TODO
223+
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; // TODO
224224
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nWindowSize = 4032;
225225
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdStart = 3226; // 80% of 4032
226226
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdMin = 2420; // 60% of 4032
@@ -426,7 +426,7 @@ class CTestNetParams : public CChainParams {
426426
consensus.vDeployments[Consensus::DEPLOYMENT_WITHDRAWALS].useEHF = true;
427427

428428
consensus.vDeployments[Consensus::DEPLOYMENT_V23].bit = 12;
429-
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nStartTime = 1751328000; // July 1, 2025
429+
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE; // TODO
430430
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
431431
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nWindowSize = 100;
432432
consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdStart = 80; // 80% of 100

0 commit comments

Comments
 (0)