dynafed: Support changing mainnet dynafed activation

This should obviously only be done by blocksigners. The flag used is not documented.
ElementsProject · Mar 2, 2021 · ae54a1b · ae54a1b
1 parent 0f9b1a2
commit ae54a1b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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()