feat: enforce mn_rr activation after v20 on regtest

UdjinM6 · knst · commit ef5cde597843 · 2025-05-15T14:27:17.000+07:00
Also group Dash-specific args at the end of the list in affected tests while at it.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -796,7 +796,7 @@ class CRegTestParams : public CChainParams {
         consensus.DIP0024QuorumsHeight = 1; // Always have dip0024 quorums unless overridden
         consensus.V19Height = 1; // Always active unless overriden
         consensus.V20Height = consensus.DIP0003Height; // Active not earlier than dip0003. Functional tests (DashTestFramework) uses height 100 (same as coinbase maturity)
-        consensus.MN_RRHeight = 1;
+        consensus.MN_RRHeight = consensus.V20Height; // MN_RR does not really have effect before v20 activation
         consensus.MinBIP9WarningHeight = 0;
         consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 1
         consensus.nPowTargetTimespan = 24 * 60 * 60; // Dash: 1 day
@@ -922,6 +922,7 @@ class CRegTestParams : public CChainParams {
         UpdateLLMQTestParametersFromArgs(args, Consensus::LLMQType::LLMQ_TEST_PLATFORM);
         UpdateLLMQInstantSendDIP0024FromArgs(args);
         assert(consensus.V20Height >= consensus.DIP0003Height);
+        assert(consensus.MN_RRHeight >= consensus.V20Height);
     }
 
     /**
diff --git a/test/functional/feature_asset_locks.py b/test/functional/feature_asset_locks.py
@@ -54,8 +54,8 @@ def set_test_params(self):
         self.set_dash_test_params(2, 0, [[
                 "-whitelist=127.0.0.1",
                 "-llmqtestinstantsenddip0024=llmq_test_instantsend",
-                "-testactivationheight=mn_rr@620",
         ]] * 2, evo_count=2)
+        self.mn_rr_height = 620
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
diff --git a/test/functional/feature_assumevalid.py b/test/functional/feature_assumevalid.py
@@ -62,7 +62,12 @@ class AssumeValidTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 3
-        self.extra_args = ["-dip3params=9000:9000", '-testactivationheight=v20@9000', "-checkblockindex=0"]
+        self.extra_args = [
+            "-dip3params=9000:9000",
+            '-testactivationheight=v20@9000',
+            '-testactivationheight=mn_rr@9000',
+            "-checkblockindex=0",
+        ]
         self.rpc_timeout = 120
 
     def setup_network(self):
diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py
@@ -90,11 +90,12 @@ def set_test_params(self):
         # which causes RPC to hang, so we need to increase RPC timeouts
         self.rpc_timeout = 180
         self.extra_args = [[
-            '-dip3params=2000:2000', # Must set '-dip3params=2000:2000' to create pre-dip3 blocks only
             '-acceptnonstdtxn=1',  # This is a consensus block test, we don't care about tx policy
             '-testactivationheight=bip34@2',
+            '-dip3params=2000:2000', # Must set '-dip3params=2000:2000' to create pre-dip3 blocks only
             '-testactivationheight=dip0001@2000',
             '-testactivationheight=v20@2000',
+            '-testactivationheight=mn_rr@2000',
         ]]
 
     def setup_nodes(self):
diff --git a/test/functional/feature_cltv.py b/test/functional/feature_cltv.py
@@ -88,10 +88,11 @@ def set_test_params(self):
         self.extra_args = [[
             f'-testactivationheight=cltv@{CLTV_HEIGHT}',
             '-whitelist=noban@127.0.0.1',
-            '-dip3params=9000:9000',
-            '-testactivationheight=v20@9000', # disabled for this test
             '-par=1',  # Use only one script thread to get the exact reject reason for testing
             '-acceptnonstdtxn=1',  # cltv_invalidate is nonstandard
+            '-dip3params=9000:9000',
+            '-testactivationheight=v20@9000', # disabled for this test
+            '-testactivationheight=mn_rr@9000', # disabled for this test
         ]]
         self.setup_clean_chain = True
         self.rpc_timeout = 480
diff --git a/test/functional/feature_csv_activation.py b/test/functional/feature_csv_activation.py
@@ -99,10 +99,11 @@ def set_test_params(self):
         self.extra_args = [[
             '-peertimeout=999999',  # bump because mocktime might cause a disconnect otherwise
             '-whitelist=noban@127.0.0.1',
-            '-dip3params=2000:2000',
-            '-testactivationheight=v20@2000',
             f'-testactivationheight=csv@{CSV_ACTIVATION_HEIGHT}',
             '-par=1',  # Use only one script thread to get the exact reject reason for testing
+            '-dip3params=2000:2000',
+            '-testactivationheight=v20@2000',
+            '-testactivationheight=mn_rr@2000',
         ]]
         self.supports_cli = False
 
diff --git a/test/functional/feature_dersig.py b/test/functional/feature_dersig.py
@@ -50,10 +50,11 @@ def set_test_params(self):
         self.num_nodes = 1
         self.extra_args = [[
             f'-testactivationheight=dersig@{DERSIG_HEIGHT}',
-            '-testactivationheight=v20@9000', # due to changes in CbTx
             '-whitelist=noban@127.0.0.1',
-            '-dip3params=9000:9000',
             '-par=1',  # Use only one script thread to get the exact log msg for testing
+            '-dip3params=9000:9000',
+            '-testactivationheight=v20@9000', # due to changes in CbTx
+            '-testactivationheight=mn_rr@9000', # due to changes in CbTx
         ]]
         self.setup_clean_chain = True
         self.rpc_timeout = 240
diff --git a/test/functional/feature_dip4_coinbasemerkleroots.py b/test/functional/feature_dip4_coinbasemerkleroots.py
@@ -47,7 +47,7 @@ class LLMQCoinbaseCommitmentsTest(DashTestFramework):
     def set_test_params(self):
         self.extra_args = [[ f'-testactivationheight=dip0008@{DIP0008_HEIGHT}', f'-testactivationheight=dip0024@{DIP0024_HEIGHT}', "-vbparams=testdummy:999999999999:999999999999" ]] * 4
         self.set_dash_test_params(4, 3, extra_args = self.extra_args)
-        self.delay_v20(height=V20_HEIGHT)
+        self.delay_v20_and_mn_rr(height=V20_HEIGHT)
 
     def remove_masternode(self, idx):
         mn = self.mninfo[idx]
diff --git a/test/functional/feature_governance.py b/test/functional/feature_governance.py
@@ -18,7 +18,7 @@ def set_test_params(self):
         self.set_dash_test_params(6, 5, [[
             "-budgetparams=10:10:10",
         ]] * 6)
-        self.delay_v20(height=160)
+        self.delay_v20_and_mn_rr(height=160)
 
     def check_superblockbudget(self, v20_active):
         v20_state = self.nodes[0].getblockchaininfo()["softforks"]["v20"]
diff --git a/test/functional/feature_index_prune.py b/test/functional/feature_index_prune.py
@@ -11,7 +11,11 @@
 )
 from test_framework.governance import EXPECTED_STDERR_NO_GOV_PRUNE
 
-DEPLOYMENT_ARGS = ["-testactivationheight=v20@3000", "-dip3params=3000:3000"]
+DEPLOYMENT_ARGS = [
+    "-dip3params=3000:3000",
+    "-testactivationheight=v20@3000",
+    "-testactivationheight=mn_rr@3000",
+]
 
 class FeatureIndexPruneTest(BitcoinTestFramework):
     def set_test_params(self):
diff --git a/test/functional/feature_llmq_chainlocks.py b/test/functional/feature_llmq_chainlocks.py
@@ -20,7 +20,7 @@
 class LLMQChainLocksTest(DashTestFramework):
     def set_test_params(self):
         self.set_dash_test_params(5, 4)
-        self.delay_v20(height=200)
+        self.delay_v20_and_mn_rr(height=200)
 
     def run_test(self):
         # Connect all nodes to node1 so that we always have the whole network connected
diff --git a/test/functional/feature_llmq_evo.py b/test/functional/feature_llmq_evo.py
@@ -45,8 +45,9 @@ def getmnlistdiff(self, baseBlockHash, blockHash):
 
 class LLMQEvoNodesTest(DashTestFramework):
     def set_test_params(self):
-        self.set_dash_test_params(5, 4, [["-testactivationheight=mn_rr@400"]] * 5, evo_count=5)
+        self.set_dash_test_params(5, 4, evo_count=5)
         self.set_dash_llmq_test_params(4, 4)
+        self.mn_rr_height = 400
 
     def run_test(self):
         # Connect all nodes to node1 so that we always have the whole network connected
diff --git a/test/functional/feature_llmq_is_cl_conflicts.py b/test/functional/feature_llmq_is_cl_conflicts.py
@@ -49,8 +49,9 @@ def on_getdata(self, message):
 
 class LLMQ_IS_CL_Conflicts(DashTestFramework):
     def set_test_params(self):
-        self.set_dash_test_params(5, 4, [["-testactivationheight=mn_rr@2000"]] * 5)
+        self.set_dash_test_params(5, 4)
         self.set_dash_llmq_test_params(4, 4)
+        self.delay_v20_and_mn_rr(2000)
         self.supports_cli = False
 
     def run_test(self):
diff --git a/test/functional/feature_llmq_rotation.py b/test/functional/feature_llmq_rotation.py
@@ -53,7 +53,7 @@ class LLMQQuorumRotationTest(DashTestFramework):
     def set_test_params(self):
         self.set_dash_test_params(9, 8)
         self.set_dash_llmq_test_params(4, 4)
-        self.delay_v20(height=900)
+        self.delay_v20_and_mn_rr(height=900)
 
     def run_test(self):
         llmq_type=103
diff --git a/test/functional/feature_llmq_simplepose.py b/test/functional/feature_llmq_simplepose.py
@@ -22,7 +22,7 @@ def set_test_params(self):
         self.extra_args = [[ '-testactivationheight=dip0024@9999' ]] * 6
         self.set_dash_test_params(6, 5)
         self.set_dash_llmq_test_params(5, 3)
-        self.delay_v20(height=9999)
+        self.delay_v20_and_mn_rr(height=9999)
 
     def add_options(self, parser):
         parser.add_argument("--disable-spork23", dest="disable_spork23", default=False, action="store_true",
diff --git a/test/functional/feature_pruning.py b/test/functional/feature_pruning.py
@@ -38,6 +38,7 @@
     "-testactivationheight=dip0001@2000",
     "-testactivationheight=dip0008@2000",
     "-testactivationheight=v20@2000",
+    "-testactivationheight=mn_rr@2000",
 ]
 
 def mine_large_blocks(node, n):
diff --git a/test/functional/p2p_ibd_stalling.py b/test/functional/p2p_ibd_stalling.py
@@ -48,7 +48,11 @@ def on_getheaders(self, message):
 class P2PIBDStallingTest(BitcoinTestFramework):
     def set_test_params(self):
         self.disable_mocktime = True
-        self.extra_args = [["-dip3params=2000:2000", "-testactivationheight=v20@2000"]]
+        self.extra_args = [[
+            "-dip3params=2000:2000",
+            "-testactivationheight=v20@2000",
+            "-testactivationheight=mn_rr@2000",
+        ]]
         self.setup_clean_chain = True
         self.num_nodes = 1
 
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
@@ -635,6 +635,7 @@ def dynamically_initialize_datadir(self, node_p2p_port, node_rpc_port):
             f.write("shrinkdebugfile=0\n")
             f.write("dip3params=2:2\n")
             f.write(f"testactivationheight=v20@{self.v20_height}\n")
+            f.write(f"testactivationheight=mn_rr@{self.mn_rr_height}\n")
             os.makedirs(os.path.join(new_data_dir, 'stderr'), exist_ok=True)
             os.makedirs(os.path.join(new_data_dir, 'stdout'), exist_ok=True)
 
@@ -1172,7 +1173,11 @@ def add_nodes(self, num_nodes: int, extra_args=None, *, rpchost=None, binary=Non
         old_num_nodes = len(self.nodes)
         super().add_nodes(num_nodes, extra_args, rpchost=rpchost, binary=binary, binary_cli=binary_cli, versions=versions)
         for i in range(old_num_nodes, old_num_nodes + num_nodes):
-            append_config(self.nodes[i].datadir, ["dip3params=2:2", f"testactivationheight=v20@{self.v20_height}"])
+            append_config(self.nodes[i].datadir, [
+                "dip3params=2:2",
+                f"testactivationheight=v20@{self.v20_height}",
+                f"testactivationheight=mn_rr@{self.mn_rr_height}",
+            ])
         if old_num_nodes == 0:
             # controller node is the only node that has an extra option allowing it to submit sporks
             append_config(self.nodes[0].datadir, ["sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"])
@@ -1193,6 +1198,7 @@ def set_dash_test_params(self, num_nodes, masterodes_count, extra_args=None, evo
         self.mninfo = []
         self.setup_clean_chain = True
         self.v20_height = 100
+        self.mn_rr_height = 100
         # additional args
         if extra_args is None:
             extra_args = [[]] * num_nodes
@@ -1210,8 +1216,9 @@ def set_dash_test_params(self, num_nodes, masterodes_count, extra_args=None, evo
         self.quorum_data_request_expiration_timeout = 360
 
 
-    def delay_v20(self, height=None):
+    def delay_v20_and_mn_rr(self, height=None):
         self.v20_height = height
+        self.mn_rr_height = height
 
     def activate_by_name(self, name, expected_activation_height=None, slow_mode=True):
         assert not softfork_active(self.nodes[0], name)
