fix: enforce mn_rr to be activated after v20 so far as it has no meaning without CreditPool

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 = 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);
     }
 
     /**
@@ -1032,8 +1033,10 @@ static void MaybeUpdateHeights(const ArgsManager& args, Consensus::Params& conse
             consensus.V19Height = int{height};
         } else if (name == "v20") {
             consensus.V20Height = int{height};
+            consensus.MN_RRHeight = std::max(consensus.MN_RRHeight, int{height});
         } else if (name == "mn_rr") {
             consensus.MN_RRHeight = int{height};
+            consensus.MN_RRHeight = std::max(consensus.V20Height, int{height});
         } else {
             throw std::runtime_error(strprintf("Invalid name (%s) for -testactivationheight=name@height.", arg));
         }

test/functional/rpc_blockchain.py

@@ -186,7 +186,7 @@ def _test_getblockchaininfo(self):
             '-testactivationheight=brr@14',
             '-testactivationheight=v19@15',
             '-testactivationheight=v20@412', # no earlier than DIP0003
-            '-testactivationheight=mn_rr@16',
+            '-testactivationheight=mn_rr@413',
         ])
 
         res = self.nodes[0].getblockchaininfo()
@@ -213,7 +213,7 @@ def _test_getblockchaininfo(self):
             'realloc': { 'type': 'buried', 'active': True, 'height': 14},
             'v19': { 'type': 'buried', 'active': True, 'height': 15},
             'v20': { 'type': 'buried', 'active': False, 'height': 412},
-            'mn_rr': { 'type': 'buried', 'active': True, 'height': 16},
+            'mn_rr': { 'type': 'buried', 'active': False, 'height': 413},
             'withdrawals': {
                 'type': 'bip9',
                 'bip9': {