feat: activate mn_rr fork from block 1 on RegTest

Author: knst

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 = 900;
+        consensus.MN_RRHeight = 1;
         consensus.MinBIP9WarningHeight = 0;
         consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 1
         consensus.nPowTargetTimespan = 24 * 60 * 60; // Dash: 1 day

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("72c5b8760d9070ca3b6402094dcea76cd25806bc20d1bf3777a7be712e17bbd2") },
+            {  494, uint256S("0x06ec12cb5419daf83e04455a24ff8f27fef76cfdbd3e8723ca4946fab91a2f11") },
         }
     };
 

test/functional/rpc_masternode.py

@@ -32,17 +32,24 @@ def run_test(self):
             assert_equal(len(payments), 1)
             payments_block = payments[0]
             payments_block_payees = payments_block["masternodes"][0]["payees"]
+
+            num_payees = 0
             payments_payee = ""
             for i in range(0, len(payments_block_payees)):
+                if i == 0:
+                    assert_equal(payments_block_payees[i]['script'], '6a')
+                    continue
+
                 payments_payee += payments_block_payees[i]["address"]
                 if i < len(payments_block_payees) - 1:
                     payments_payee += ", "
+                num_payees += 1
             assert_equal(payments_block["height"], height)
             assert_equal(payments_block["blockhash"], blockhash)
             assert_equal(winners_payee, payments_payee)
-            if len(payments_block_payees) == 1:
+            if num_payees == 1:
                 checked_0_operator_reward = True
-            if len(payments_block_payees) > 1:
+            if num_payees > 1:
                 checked_non_0_operator_reward = True
 
         self.log.info("test various `payments` RPC options")
@@ -73,15 +80,15 @@ def run_test(self):
         while not checked_0_operator_reward or not checked_non_0_operator_reward:
             payments_masternode = self.nodes[0].masternode("payments")[0]["masternodes"][0]
             protx_info = self.nodes[0].protx("info", payments_masternode["proTxHash"])
-            if len(payments_masternode["payees"]) == 1:
-                assert_equal(protx_info["state"]["payoutAddress"], payments_masternode["payees"][0]["address"])
+            if len(payments_masternode["payees"]) == 2:
+                assert_equal(protx_info["state"]["payoutAddress"], payments_masternode["payees"][1]["address"])
                 checked_0_operator_reward = True
             else:
-                assert_equal(len(payments_masternode["payees"]), 2)
-                option1 = protx_info["state"]["payoutAddress"] == payments_masternode["payees"][0]["address"] and \
+                assert_equal(len(payments_masternode["payees"]), 3)
+                option1 = protx_info["state"]["payoutAddress"] == payments_masternode["payees"][1]["address"] and \
+                    protx_info["state"]["operatorPayoutAddress"] == payments_masternode["payees"][2]["address"]
+                option2 = protx_info["state"]["payoutAddress"] == payments_masternode["payees"][2]["address"] and \
                     protx_info["state"]["operatorPayoutAddress"] == payments_masternode["payees"][1]["address"]
-                option2 = protx_info["state"]["payoutAddress"] == payments_masternode["payees"][1]["address"] and \
-                    protx_info["state"]["operatorPayoutAddress"] == payments_masternode["payees"][0]["address"]
                 assert option1 or option2
                 checked_non_0_operator_reward = True
             self.generate(self.nodes[0], 1, sync_fun=self.no_op)