From ae54a1bad404813c7f7bd6a44f8abbf2c0d09aec Mon Sep 17 00:00:00 2001 From: Steven Roose Date: Tue, 9 Feb 2021 13:10:04 +0100 Subject: [PATCH] dynafed: Support changing mainnet dynafed activation This should obviously only be done by blocksigners. The flag used is not documented. --- src/chainparams.cpp | 5 +++-- test/functional/feature_dynafed.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 7ab1a9a91e..356e9bc306 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -882,9 +882,10 @@ class CLiquidV1Params : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 0; consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; - // Not active yet. + // Activated from block 1,000,000. consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].bit = 25; - consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nStartTime = 1000000; + // Allow blocksigners to delay activation. + consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nStartTime = gArgs.GetArg("-con_dyna_deploy_start", 1000000); consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; diff --git a/test/functional/feature_dynafed.py b/test/functional/feature_dynafed.py index 2ce325e380..df48956e77 100755 --- a/test/functional/feature_dynafed.py +++ b/test/functional/feature_dynafed.py @@ -66,6 +66,8 @@ def set_test_params(self): self.extra_args = [["-con_dyna_deploy_start=1000", "-enforce_pak=1", "-con_parent_chain_signblockscript=51", "-peginconfirmationdepth=1", "-parentscriptprefix=75", "-parent_bech32_hrp=ert"] for i in range(self.num_nodes)] # second node will not mine transactions self.extra_args[1].append("-blocksonly=1") + # Make sure nothing breaks if peers have a different activation. + self.extra_args[1][0] = "-con_dyna_deploy_start=937" def skip_test_if_missing_module(self): self.skip_if_no_wallet()