feat: remove code forbidding register Evo nodes before v19 activation

It's activated long time ago and this check has no meaning anymore

Author: knst

src/evo/deterministicmns.cpp

@@ -180,6 +180,7 @@ CDeterministicMNCPtr CDeterministicMNList::GetMNPayee(gsl::not_null<const CBlock
         return nullptr;
     }
 
+    // The flag is-v19-activate is used for optimization; we don't need to go over all masternodes every pre-v19 block
     const bool isv19Active{DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_V19)};
     const bool isMNRewardReallocation{DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_MN_RR)};
     // EvoNodes are rewarded 4 blocks in a row until MNRewardReallocation (Platform release)
@@ -737,7 +738,6 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, gsl::no
 
     newList.DecreaseScores();
 
-    const bool isV19Active{DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_V19)};
     const bool isMNRewardReallocation{DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_MN_RR)};
 
     // we skip the coinbase
@@ -756,10 +756,6 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, gsl::no
             }
             auto& proTx = *opt_proTx;
 
-            if (proTx.nType == MnType::Evo && !isV19Active) {
-                return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-protx-payload");
-            }
-
             auto dmn = std::make_shared<CDeterministicMN>(newList.GetTotalRegisteredCount(), proTx.nType);
             dmn->proTxHash = tx.GetHash();
 
@@ -819,10 +815,6 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, gsl::no
                 return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-protx-payload");
             }
 
-            if (opt_proTx->nType == MnType::Evo && !DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_V19)) {
-                return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-protx-payload");
-            }
-
             if (newList.HasUniqueProperty(opt_proTx->addr) && newList.GetUniquePropertyMN(opt_proTx->addr)->proTxHash != opt_proTx->proTxHash) {
                 return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-protx-dup-addr");
             }

src/rpc/evo.cpp

@@ -643,11 +643,6 @@ static UniValue protx_register_common_wrapper(const JSONRPCRequest& request,
         EnsureWalletIsUnlocked(*pwallet);
     }
 
-    const bool isV19active{DeploymentActiveAfter(WITH_LOCK(cs_main, return chainman.ActiveChain().Tip();), Params().GetConsensus(), Consensus::DEPLOYMENT_V19)};
-    if (isEvoRequested && !isV19active) {
-        throw JSONRPCError(RPC_INVALID_REQUEST, "EvoNodes aren't allowed yet");
-    }
-
     size_t paramIdx = 0;
 
     CMutableTransaction tx;
@@ -965,11 +960,6 @@ static UniValue protx_update_service_common_wrapper(const JSONRPCRequest& reques
 
     EnsureWalletIsUnlocked(*wallet);
 
-    const bool isV19active{DeploymentActiveAfter(WITH_LOCK(cs_main, return chainman.ActiveChain().Tip();), Params().GetConsensus(), Consensus::DEPLOYMENT_V19)};
-    if (isEvoRequested && !isV19active) {
-        throw JSONRPCError(RPC_INVALID_REQUEST, "EvoNodes aren't allowed yet");
-    }
-
     CProUpServTx ptx;
     ptx.nType = mnType;
     ptx.proTxHash = ParseHashV(request.params[0], "proTxHash");
@@ -1055,6 +1045,8 @@ static UniValue protx_update_service_common_wrapper(const JSONRPCRequest& reques
 
     FundSpecialTx(*wallet, tx, ptx, feeSource);
 
+    const bool isV19active = DeploymentActiveAfter(WITH_LOCK(cs_main, return chainman.ActiveChain().Tip();),
+                                                   Params().GetConsensus(), Consensus::DEPLOYMENT_V19);
     SignSpecialTxPayloadByHash(tx, ptx, keyOperator, !isV19active);
     SetTxPayload(tx, ptx);
 

test/functional/feature_llmq_evo.py

@@ -9,15 +9,14 @@
 Checks EvoNodes
 
 '''
-from _decimal import Decimal
 from io import BytesIO
 
 from test_framework.p2p import P2PInterface
 from test_framework.messages import CBlock, CBlockHeader, CCbTx, CMerkleBlock, from_hex, hash256, msg_getmnlistd, \
     QuorumId, ser_uint256
 from test_framework.test_framework import DashTestFramework
 from test_framework.util import (
-    assert_equal, assert_greater_than_or_equal, p2p_port
+    assert_equal, assert_greater_than_or_equal,
 )
 
 
@@ -65,9 +64,6 @@ def run_test(self):
         b_0 = self.nodes[0].getbestblockhash()
         self.test_getmnlistdiff(null_hash, b_0, {}, [], expectedUpdated)
 
-        self.log.info("Test that EvoNodes registration is rejected before v19")
-        self.test_evo_is_rejected_before_v19()
-
         self.test_masternode_count(expected_mns_count=4, expected_evo_count=0)
 
         self.activate_v19(expected_activation_height=900)
@@ -193,37 +189,6 @@ def test_evo_protx_are_in_mnlist(self, evo_protx_list):
                     assert_equal(mn_list.get(mn)['type'], "Evo")
             assert_equal(found, True)
 
-    def test_evo_is_rejected_before_v19(self):
-        bls = self.nodes[0].bls('generate')
-        collateral_address = self.nodes[0].getnewaddress()
-        funds_address = self.nodes[0].getnewaddress()
-        owner_address = self.nodes[0].getnewaddress()
-        voting_address = self.nodes[0].getnewaddress()
-        reward_address = self.nodes[0].getnewaddress()
-
-        collateral_amount = 4000
-        outputs = {collateral_address: collateral_amount, funds_address: 1}
-        collateral_txid = self.nodes[0].sendmany("", outputs)
-        self.generate(self.nodes[0], 8)
-
-        rawtx = self.nodes[0].getrawtransaction(collateral_txid, 1)
-        collateral_vout = 0
-        for txout in rawtx['vout']:
-            if txout['value'] == Decimal(collateral_amount):
-                collateral_vout = txout['n']
-                break
-        assert collateral_vout is not None
-
-        ipAndPort = '127.0.0.1:%d' % p2p_port(len(self.nodes))
-        operatorReward = len(self.nodes)
-
-        try:
-            self.nodes[0].protx('register_evo', collateral_txid, collateral_vout, ipAndPort, owner_address, bls['public'], voting_address, operatorReward, reward_address, funds_address, True)
-            # this should never succeed
-            assert False
-        except:
-            self.log.info("protx_evo rejected")
-
     def test_masternode_count(self, expected_mns_count, expected_evo_count):
         mn_count = self.nodes[0].masternode('count')
         assert_equal(mn_count['total'], expected_mns_count + expected_evo_count)