Problem: extra_eips is not cleared on production network

CHANGELOG.md

@@ -7,6 +7,7 @@
 ### Bug Fixes
 
 - [#761](https://github.com/crypto-org-chain/cronos/pull/761) Fix non-deterministic evm execution result when there are concurrent grpc queries.
+- [#]() Add `v1.0.0` upgrade plan for dry-run and mainnet upgrade, which clears the `extra_eips` parameter.
 
 *Nov 4, 2022*
 

app/upgrades.go

@@ -12,11 +12,27 @@ import (
 )
 
 func (app *App) RegisterUpgradeHandlers(experimental bool) {
-	planName := "v0.9.0"
-	app.UpgradeKeeper.SetUpgradeHandler(planName, func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+	// `v0.9.0` is only used for testnet upgrade, skipped for dry-run and mainnet upgrade.
+	planNameTestnet := "v0.9.0"
+	app.UpgradeKeeper.SetUpgradeHandler(planNameTestnet, func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
 		return app.mm.RunMigrations(ctx, app.configurator, fromVM)
 	})
 
+	// dry-run and mainnet will use `v1.0.0` upgrade plan directly, which will clears the `extra_eips` parameters.
+	planNameMainnet := "v1.0.0"
+	app.UpgradeKeeper.SetUpgradeHandler(planNameMainnet, func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		m, err := app.mm.RunMigrations(ctx, app.configurator, fromVM)
+		if err != nil {
+			return m, err
+		}
+		// clear extra_eips from evm parameters
+		// Ref: https://github.com/crypto-org-chain/cronos/issues/755
+		params := app.EvmKeeper.GetParams(ctx)
+		params.ExtraEIPs = []int64{}
+		app.EvmKeeper.SetParams(ctx, params)
+		return m, nil
+	})
+
 	gravityPlanName := "v0.8.0-gravity-alpha3"
 	if experimental {
 		app.UpgradeKeeper.SetUpgradeHandler(gravityPlanName, func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
@@ -30,7 +46,7 @@ func (app *App) RegisterUpgradeHandlers(experimental bool) {
 	}
 
 	if !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
-		if upgradeInfo.Name == planName {
+		if upgradeInfo.Name == planNameTestnet || upgradeInfo.Name == planNameMainnet {
 			storeUpgrades := storetypes.StoreUpgrades{
 				Added: []string{ibcfeetypes.StoreKey},
 			}

integration_tests/configs/cosmovisor.jsonnet

@@ -7,6 +7,17 @@ config {
     },
     genesis+: {
       app_state+: {
+        evm+: {
+          params+: {
+            // emulate the environment on production network
+            extra_eips: [
+              '2929',
+              '2200',
+              '1884',
+              '1344',
+            ],
+          },
+        },
         feemarket+: {
           params+: {
             no_base_fee: false,

integration_tests/configs/upgrade-test-package.nix

@@ -12,5 +12,5 @@ let
 in
 pkgs.linkFarm "upgrade-test-package" [
   { name = "genesis"; path = released; }
-  { name = "v0.9.0"; path = current; }
+  { name = "v1.0.0"; path = current; }
 ]

integration_tests/cosmoscli.py

@@ -1363,3 +1363,17 @@ def pay_packet_fee(self, port_id, channel_id, packet_seq, **kwargs):
                 **(default_kwargs | kwargs),
             )
         )
+
+    def evm_params(self, **kwargs):
+        default_kwargs = {
+            "node": self.node_rpc,
+            "output": "json",
+        }
+        return json.loads(
+            self.raw(
+                "q",
+                "evm",
+                "params",
+                **(default_kwargs | kwargs),
+            )
+        )

integration_tests/test_upgrade.py

@@ -98,9 +98,19 @@ def test_cosmovisor_upgrade(custom_cronos: Cronos):
     old_height = w3.eth.block_number
     old_balance = w3.eth.get_balance(ADDRS["validator"], block_identifier=old_height)
     old_base_fee = w3.eth.get_block(old_height).baseFeePerGas
+    old_erc20_balance = contract.caller(block_identifier=old_height).balanceOf(
+        ADDRS["validator"]
+    )
     print("old values", old_height, old_balance, old_base_fee)
 
-    plan_name = "v0.9.0"
+    # estimateGas for an erc20 transfer tx
+    old_gas = (
+        contract.functions.transfer(ADDRS["community"], 100)
+        .buildTransaction({"from": ADDRS["validator"]})
+        .gas
+    )
+
+    plan_name = "v1.0.0"
     rsp = cli.gov_propose_v0_7(
         "community",
         "software-upgrade",
@@ -163,4 +173,16 @@ def test_cosmovisor_upgrade(custom_cronos: Cronos):
     assert old_base_fee == w3.eth.get_block(old_height).baseFeePerGas
 
     # check eth_call works on older blocks
-    contract.caller(block_identifier=target_height - 2).balanceOf(ADDRS["validator"])
+    assert old_erc20_balance == contract.caller(block_identifier=old_height).balanceOf(
+        ADDRS["validator"]
+    )
+
+    print("evm params", cli.evm_params())
+
+    # check the gas cost is lower after upgrade
+    assert (
+        old_gas - 3700
+        == contract.functions.transfer(ADDRS["community"], 100)
+        .buildTransaction({"from": ADDRS["validator"]})
+        .gas
+    )