feat: start v20 from the same block as DIP0003 on regtest

Author: knst

src/chainparams.cpp

@@ -795,7 +795,7 @@ class CRegTestParams : public CChainParams {
         consensus.DIP0024Height = 1; // Always have dip0024 quorums unless overridden
         consensus.DIP0024QuorumsHeight = 1; // Always have dip0024 quorums unless overridden
         consensus.V19Height = 1; // Always active unless overriden
-        consensus.V20Height = 900;
+        consensus.V20Height = consensus.DIP0003Height; // Active not earlier than dip0003. Functional tests (DashTestFramework) uses height 100 (same as coinbase maturity)
         consensus.MN_RRHeight = 900;
         consensus.MinBIP9WarningHeight = 0;
         consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 1

src/test/util/setup_common.cpp

@@ -399,7 +399,7 @@ TestChainSetup::TestChainSetup(int num_blocks, const std::vector<const char*>& e
             /*TestChainBRRBeforeActivationSetup=*/
             {  497, uint256S("0x0857a9b5db51835b1c828f019f4c664b5fe6c28ac44a6d868436930f832d31e5") },
             /*TestChainV19BeforeActivationSetup=*/
-            {  494, uint256S("0x44ee5c8a5e5cbd4437d63c54ddc1d40329be811b25c492fa901e11cdf408f905") },
+            {  494, uint256S("72c5b8760d9070ca3b6402094dcea76cd25806bc20d1bf3777a7be712e17bbd2") },
         }
     };
 

test/functional/feature_asset_locks.py

@@ -248,8 +248,7 @@ def run_test(self):
 
         self.set_sporks()
 
-        self.activate_v20(expected_activation_height=900)
-        self.log.info("Activated v20 at height:" + str(node.getblockcount()))
+        assert_equal(self.nodes[0].getblockchaininfo()['softforks']['v20']['active'], True)
 
         for _ in range(2):
             self.dynamically_add_masternode(evo=True)
@@ -515,10 +514,13 @@ def test_withdrawal_limits(self, node_wallet, node, pubkey):
         total = self.get_credit_pool_balance()
         coins = node_wallet.listunspent()
         while total <= 10_901 * COIN:
+            if len(coins) == 0:
+                coins = node_wallet.listunspent(query_options={'minimumAmount': 1})
             coin = coins.pop()
             to_lock = int(coin['amount'] * COIN) - tiny_amount
-            if to_lock > 99 * COIN:
+            if to_lock > 99 * COIN and total > 10_000 * COIN:
                 to_lock = 99 * COIN
+
             total += to_lock
             tx = self.create_assetlock(coin, to_lock, pubkey)
             self.send_tx_simple(tx)

test/functional/feature_dip4_coinbasemerkleroots.py

@@ -19,6 +19,7 @@
 
 DIP0008_HEIGHT = 432
 DIP0024_HEIGHT = 900
+V20_HEIGHT = 900
 
 # TODO: this helper used in many tests, find a new home for it
 class TestP2PConn(P2PInterface):
@@ -46,6 +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)
 
     def remove_masternode(self, idx):
         mn = self.mninfo[idx]

test/functional/feature_governance.py

@@ -17,8 +17,8 @@ class DashGovernanceTest (DashTestFramework):
     def set_test_params(self):
         self.set_dash_test_params(6, 5, [[
             "-budgetparams=10:10:10",
-            '-testactivationheight=v20@160',
         ]] * 6)
+        self.delay_v20(height=160)
 
     def check_superblockbudget(self, v20_active):
         v20_state = self.nodes[0].getblockchaininfo()["softforks"]["v20"]

test/functional/feature_llmq_chainlocks.py

@@ -20,6 +20,7 @@
 class LLMQChainLocksTest(DashTestFramework):
     def set_test_params(self):
         self.set_dash_test_params(5, 4)
+        self.delay_v20(height=200)
 
     def run_test(self):
         # Connect all nodes to node1 so that we always have the whole network connected
@@ -30,8 +31,8 @@ def run_test(self):
 
         self.test_coinbase_best_cl(self.nodes[0], expected_cl_in_cb=False)
 
-        self.activate_mn_rr(expected_activation_height=900)
-        self.log.info("Activated MN_RR at height:" + str(self.nodes[0].getblockcount()))
+        self.activate_v20(expected_activation_height=200)
+        self.log.info("Activated v20 at height:" + str(self.nodes[0].getblockcount()))
 
         # v20 is active for the next block, not for the tip
         self.test_coinbase_best_cl(self.nodes[0], expected_cl_in_cb=False)

test/functional/feature_llmq_rotation.py

@@ -53,6 +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)
 
     def run_test(self):
         llmq_type=103

test/functional/feature_llmq_simplepose.py

@@ -22,6 +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)
 
     def add_options(self, parser):
         parser.add_argument("--disable-spork23", dest="disable_spork23", default=False, action="store_true",

test/functional/feature_mnehf.py

@@ -121,9 +121,6 @@ def run_test(self):
         node = self.nodes[0]
 
         self.set_sporks()
-        self.log.info("Consensus rules assume there're no EHF signal before V20")
-        self.activate_v20()
-
         self.log.info("Mine a quorum...")
         self.mine_quorum()
         self.check_fork('defined')

test/functional/test_framework/test_framework.py

@@ -599,6 +599,7 @@ def add_dynamically_node(self, extra_args=None, *, rpchost=None, binary=None):
         self.nodes.append(t_node)
         return t_node
 
+    # TODO: move it to DashTestFramework where it belongs
     def dynamically_initialize_datadir(self, node_p2p_port, node_rpc_port):
         source_data_dir = get_datadir_path(self.options.tmpdir, 0)  # use node0 as a source
         new_data_dir = get_datadir_path(self.options.tmpdir, len(self.nodes))
@@ -633,6 +634,7 @@ def dynamically_initialize_datadir(self, node_p2p_port, node_rpc_port):
             f.write("natpmp=0\n")
             f.write("shrinkdebugfile=0\n")
             f.write("dip3params=2:2\n")
+            f.write(f"testactivationheight=v20@{self.v20_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)
 
@@ -1170,7 +1172,7 @@ 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"])
+            append_config(self.nodes[i].datadir, ["dip3params=2:2", f"testactivationheight=v20@{self.v20_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"])
@@ -1190,6 +1192,7 @@ def set_dash_test_params(self, num_nodes, masterodes_count, extra_args=None, evo
         self.num_nodes = num_nodes
         self.mninfo = []
         self.setup_clean_chain = True
+        self.v20_height = 100
         # additional args
         if extra_args is None:
             extra_args = [[]] * num_nodes
@@ -1207,6 +1210,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):
+        self.v20_height = height
+
     def activate_by_name(self, name, expected_activation_height=None, slow_mode=True):
         assert not softfork_active(self.nodes[0], name)
         self.log.info("Wait for " + name + " activation")