feat: add v2.0.0 upgrade handler and update e2e tests

- Add app/upgrades/v2_0_0/ with constants (UpgradeName, StoreUpgrades)
  and upgrade handler (noop with RunMigrations)
- Register v2.0.0 handler in app.go setupUpgradeHandlers()
- Wire store loader for v2.0.0 store key additions/deletions
- Update e2e upgrade tests: base version v1.1.2 → v1.2.0, upgrade target → v2.0.0

Author: puneet2019

app/app.go

@@ -150,6 +150,7 @@ import (
 
 	ethante "github.com/evmos/evmos/v12/app/ante/evm"
 	"github.com/evmos/evmos/v12/app/upgrades"
+	v2_0_0 "github.com/evmos/evmos/v12/app/upgrades/v2_0_0"
 	"github.com/evmos/evmos/v12/encoding"
 	servercfg "github.com/evmos/evmos/v12/server/config"
 	srvflags "github.com/evmos/evmos/v12/server/flags"
@@ -1559,16 +1560,18 @@ func (app *Evmos) setupUpgradeHandlers() {
 		return app.mm.RunMigrations(ctx, app.configurator, fromVM)
 	})
 
+	app.UpgradeKeeper.SetUpgradeHandler(
+		v2_0_0.UpgradeName,
+		v2_0_0.CreateUpgradeHandler(app.mm, app.configurator),
+	)
+
 	// testnet only upgrade Handlers
 	app.UpgradeKeeper.SetUpgradeHandler(
 		"testnet-gov-param-fix",
 		upgrades.TestnetGovParamFix(&app.GovKeeper, app.EvmKeeper, app.mm, app.configurator),
 	)
 
-	var storeUpgrades *storetypes.StoreUpgrades
-
-	if storeUpgrades != nil {
-		// configure store loader that checks if version == upgradeHeight and applies store upgrades
-		app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, storeUpgrades))
+	if upgradeInfo.Name == v2_0_0.UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+		app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, v2_0_0.StoreUpgrades))
 	}
 }

app/upgrades/v2_0_0/constants.go

@@ -0,0 +1,12 @@
+package v2_0_0
+
+import (
+	storetypes "cosmossdk.io/store/types"
+)
+
+const UpgradeName = "v2.0.0"
+
+var StoreUpgrades = &storetypes.StoreUpgrades{
+	Added:   []string{},
+	Deleted: []string{},
+}

app/upgrades/v2_0_0/upgrades.go

@@ -0,0 +1,17 @@
+package v2_0_0
+
+import (
+	"context"
+
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+)
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx context.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		return mm.RunMigrations(ctx, configurator, fromVM)
+	}
+}

e2e/kind/tests/test_upgrade_comprehensive.sh

@@ -9,7 +9,7 @@
 # then runs all verify functions.
 #
 # Usage:
-#   OLD_VERSION=v1.1.2 bash tests/test_upgrade_comprehensive.sh
+#   OLD_VERSION=v1.2.0 bash tests/test_upgrade_comprehensive.sh
 #   UPGRADE_MODE=hardfork OLD_VERSION=main bash tests/test_upgrade_comprehensive.sh
 #   TX_ROUNDS=5 bash tests/test_upgrade_comprehensive.sh  # 5 rounds of all txs
 #
@@ -20,8 +20,8 @@
 source "$(dirname "$0")/../framework/framework.sh"
 fw_init
 
-OLD_VERSION="${OLD_VERSION:-v1.1.2}"
-UPGRADE_NAME="${UPGRADE_NAME:-v1.2.0}"
+OLD_VERSION="${OLD_VERSION:-v1.2.0}"
+UPGRADE_NAME="${UPGRADE_NAME:-v2.0.0}"
 UPGRADE_MODE="${UPGRADE_MODE:-governance}"
 TX_ROUNDS="${TX_ROUNDS:-3}"
 RELEASE_TAG="${RELEASE_TAG:-}"

e2e/kind/tests/test_upgrade_governance.sh

@@ -7,13 +7,13 @@
 # release tag (e.g., v1.1.2) — not main or the current version.
 #
 # Usage:
-#   OLD_VERSION=v1.1.2 bash tests/test_upgrade_governance.sh
+#   OLD_VERSION=v1.2.0 bash tests/test_upgrade_governance.sh
 
 source "$(dirname "$0")/../framework/framework.sh"
 fw_init
 
-OLD_VERSION="${OLD_VERSION:-v1.1.2}"
-UPGRADE_NAME="${UPGRADE_NAME:-v1.2.0}"
+OLD_VERSION="${OLD_VERSION:-v1.2.0}"
+UPGRADE_NAME="${UPGRADE_NAME:-v2.0.0}"
 FEES="200000000000000amoca"
 
 # ── Setup: deploy old version ────────────────────────────────────────────────

e2e/kind/tests/test_upgrade_hardfork.sh

@@ -3,14 +3,14 @@
 # and validates that state is preserved and the chain continues.
 #
 # Usage:
-#   OLD_VERSION=v1.1.2 bash tests/test_upgrade_hardfork.sh
+#   OLD_VERSION=v1.2.0 bash tests/test_upgrade_hardfork.sh
 #   OLD_VERSION=main   bash tests/test_upgrade_hardfork.sh
 
 source "$(dirname "$0")/../framework/framework.sh"
 fw_init
 
-OLD_VERSION="${OLD_VERSION:-v1.1.2}"
-UPGRADE_NAME="${UPGRADE_NAME:-v1.2.0}"
+OLD_VERSION="${OLD_VERSION:-v1.2.0}"
+UPGRADE_NAME="${UPGRADE_NAME:-v2.0.0}"
 FEES="200000000000000amoca"
 
 # ── Setup: deploy old version ────────────────────────────────────────────────