Prevent setting EVM or TD Gov var below height

src/masternodes/govvariables/attributes.cpp

@@ -1972,21 +1972,24 @@ Res ATTRIBUTES::Validate(const CCustomCSView &view) const {
                 break;
 
             case AttributeTypes::Param:
-                if (attrV0->typeId == ParamIDs::Feature && attrV0->key == DFIPKeys::MintTokens) {
-                    if (view.GetLastHeight() < Params().GetConsensus().GrandCentralEpilogueHeight) {
-                        return Res::Err("Cannot be set before GrandCentralEpilogueHeight");
-                    }
-                } else if (attrV0->typeId == ParamIDs::Feature || attrV0->typeId == ParamIDs::Foundation ||
-                    attrV0->key == DFIPKeys::Members) {
+                if (attrV0->typeId == ParamIDs::Feature) {
                     if (view.GetLastHeight() < Params().GetConsensus().GrandCentralHeight) {
                         return Res::Err("Cannot be set before GrandCentralHeight");
                     }
-                } else if (attrV0->typeId == ParamIDs::Foundation || attrV0->key == DFIPKeys::Members) {
+                    if (attrV0->key == DFIPKeys::MintTokens) {
+                        if (view.GetLastHeight() < Params().GetConsensus().GrandCentralEpilogueHeight) {
+                            return Res::Err("Cannot be set before GrandCentralEpilogueHeight");
+                        }
+                    } else if (attrV0->key == DFIPKeys::EVMEnabled || attrV0->key == DFIPKeys::TransferDomain) {
+                        if (view.GetLastHeight() < Params().GetConsensus().NextNetworkUpgradeHeight) {
+                            return Res::Err("Cannot be set before NextNetworkUpgradeHeight");
+                        }
+                    }
+                } else if (attrV0->typeId == ParamIDs::Foundation) {
                     if (view.GetLastHeight() < Params().GetConsensus().GrandCentralHeight) {
                         return Res::Err("Cannot be set before GrandCentralHeight");
                     }
-                } else if (attrV0->typeId == ParamIDs::DFIP2206F || attrV0->key == DFIPKeys::StartBlock ||
-                           attrV0->typeId == ParamIDs::DFIP2206A) {
+                } else if (attrV0->typeId == ParamIDs::DFIP2206F || attrV0->typeId == ParamIDs::DFIP2206A) {
                     if (view.GetLastHeight() < Params().GetConsensus().FortCanningSpringHeight) {
                         return Res::Err("Cannot be set before FortCanningSpringHeight");
                     }

test/functional/feature_evm.py

@@ -251,6 +251,18 @@ def erc55_wallet_support(self):
 
     def evm_gov_vars(self):
         # Check setting vars before height
+        assert_raises_rpc_error(
+            -32600,
+            "Cannot be set before NextNetworkUpgradeHeight",
+            self.nodes[0].setgov,
+            {"ATTRIBUTES": {"v0/params/feature/evm": "true"}},
+        )
+        assert_raises_rpc_error(
+            -32600,
+            "Cannot be set before NextNetworkUpgradeHeight",
+            self.nodes[0].setgov,
+            {"ATTRIBUTES": {"v0/params/feature/transferdomain": "true"}},
+        )
         assert_raises_rpc_error(
             -32600,
             "called before NextNetworkUpgrade height",

test/functional/feature_evm_logs.py

@@ -11,6 +11,7 @@
 from test_framework.evm_key_pair import EvmKeyPair
 from web3._utils.events import get_event_data
 
+
 class EVMTestLogs(DefiTestFramework):
     def set_test_params(self):
         self.num_nodes = 1

test/functional/feature_evm_rollback.py

@@ -189,7 +189,6 @@ def test_rollback_transactions(self):
     def run_test(self):
         self.setup()
 
-
         self.nodes[0].transferdomain(
             [
                 {

test/functional/feature_evm_transaction_replacement.py

@@ -138,7 +138,8 @@ def should_prioritize_transaction_with_the_higher_gas_price(self):
             -32001,
             "lower fee as existing mempool entry",
             self.send_transaction,
-            gasPrices[0], count
+            gasPrices[0],
+            count,
         )
 
         self.nodes[0].generate(1)

test/functional/feature_evm_transferdomain.py

@@ -908,10 +908,12 @@ def invalid_transfer_evm_dvm_after_evm_tx(self):
         self.valid_transfer_dvm_evm()
 
         balance = self.nodes[0].eth_getBalance(self.eth_address)
-        assert_equal(balance, "0x56bc75e2d63100000") # 100 DFI
-        erc55_address = self.nodes[0].getnewaddress('', 'erc55')
+        assert_equal(balance, "0x56bc75e2d63100000")  # 100 DFI
+        erc55_address = self.nodes[0].getnewaddress("", "erc55")
 
-        tx1 = self.nodes[0].evmtx(self.eth_address, 0, 21, 21001, erc55_address, 50) # Spend half balance
+        tx1 = self.nodes[0].evmtx(
+            self.eth_address, 0, 21, 21001, erc55_address, 50
+        )  # Spend half balance
 
         # Transfer 100 DFI from EVM to DVM
         tx2 = transfer_domain(
@@ -947,7 +949,8 @@ def run_test(self):
 
         self.valid_transfer_to_evm_then_move_then_back_to_dvm()
 
-        self.invalid_transfer_evm_dvm_after_evm_tx() # TODO assert behaviour here. transferdomain shouldn't be kept in mempool since its nonce will never be valid
+        self.invalid_transfer_evm_dvm_after_evm_tx()  # TODO assert behaviour here. transferdomain shouldn't be kept in mempool since its nonce will never be valid
+
 
 if __name__ == "__main__":
     EVMTest().main()

test/functional/feature_evm_vmmap_rpc.py

@@ -395,7 +395,11 @@ def vmmap_transfer_domain(self):
         tx = self.nodes[0].transferdomain(
             [
                 {
-                    "src": {"address": self.ethAddress, "amount": "100@DFI", "domain": 3},
+                    "src": {
+                        "address": self.ethAddress,
+                        "amount": "100@DFI",
+                        "domain": 3,
+                    },
                     "dst": {
                         "address": self.address,
                         "amount": "100@DFI",