scaffolded x/evmigration module, added wiring, fixed proto definitions, evmigration store key added to upgrade, Cosmos EVM upgrade to 0.6.0

Author: akobrin1

.markdownlint.json

@@ -0,0 +1,4 @@
+{
+  "MD013": false,
+  "MD060": false
+}

CLAUDE.md

@@ -95,7 +95,7 @@ Generated files land in `x/*/types/` as `*.pb.go`, `*_pb.gw.go`, `*.pulsar.go`.
 
 Custom ante handler in `ante/delayed_claim_fee_decorator.go` - a fee decorator specific to claim transactions. Dual-route EVM ante handler in `app/evm/ante.go` routes Ethereum extension txs to the EVM path and all others to the Cosmos path.
 
-### EVM Stack (Cosmos EVM v0.5.1)
+### EVM Stack (Cosmos EVM v0.6.0)
 
 Four EVM modules wired in `app/evm.go`:
 

Makefile.devnet

@@ -1,5 +1,6 @@
 .PHONY: devnet-build devnet-tests-build devnet-up devnet-reset devnet-up-detach devnet-down devnet-stop devnet-clean devnet-deploy-tar devnet-upgrade devnet-new devnet-start
 .PHONY: devnet-build-default _check-devnet-default-cfg _devnet-select-default-genesis devnet-upgrade-binaries devnet-upgrade-binaries-default devnet-update-scripts
+.PHONY: devnet-evmigration-sync-bin devnet-evmigration-prepare devnet-evmigration-migrate devnet-evmigration-migrate-validator devnet-evmigration-cleanup
 
 ##### Devnet Makefile ########################################
 #
@@ -40,16 +41,19 @@ DEFAULT_VALIDATORS_JSON := config/validators.json
 # Default genesis and claims files for devnet docker
 DEFAULT_GENESIS_FILE := devnet/default-config/devnet-genesis.json
 DEFAULT_GENESIS_EVM_FILE := devnet/default-config/devnet-genesis-evm.json
-DEFAULT_CLAIMS_FILE := claims.csv # relative to devnet
+DEFAULT_CLAIMS_FILE := devnet/default-config/claims.csv
 ORIG_GENESIS_FILE := devnet/default-config/devnet-genesis-orig.json
 EVM_CUTOVER_VERSION ?= v1.12.0
 
 devnet-tests-build:
 	@mkdir -p "${DEVNET_BIN_DIR_ABS}"
 	@echo "Building devnet test binaries..."
-	@cd devnet && \
-		$(GO) test -c -o "${DEVNET_BIN_DIR_ABS}/tests_validator" ./tests/validator && \
-		$(GO) test -c -o "${DEVNET_BIN_DIR_ABS}/tests_hermes" ./tests/hermes
+	@echo "  -> building tests_validator (${DEVNET_BIN_DIR_ABS}/tests_validator)"
+	@cd devnet && $(GO) test -c -o "${DEVNET_BIN_DIR_ABS}/tests_validator" ./tests/validator
+	@echo "  -> building tests_hermes (${DEVNET_BIN_DIR_ABS}/tests_hermes)"
+	@cd devnet && $(GO) test -c -o "${DEVNET_BIN_DIR_ABS}/tests_hermes" ./tests/hermes
+	@echo "  -> building tests_evmigration (${DEVNET_BIN_DIR_ABS}/tests_evmigration)"
+	@cd devnet && $(GO) build -o "${DEVNET_BIN_DIR_ABS}/tests_evmigration" ./tests/evmigration
 	@echo "Devnet test binaries built successfully"
 
 devnet-build:
@@ -114,7 +118,7 @@ devnet-build-default: _check-devnet-default-cfg
 		EXTERNAL_GENESIS_FILE="$$(realpath "$$GENESIS_FILE")" \
 		EXTERNAL_CLAIMS_FILE="$$(realpath $(DEFAULT_CLAIMS_FILE))"
 
-.PHONY: devnet-build-172 _check-devnet-172-cfg devnet-build-191 _check-devnet-191-cfg
+.PHONY: devnet-build-172 _check-devnet-172-cfg devnet-build-191 _check-devnet-191-cfg devnet-build-1110 _check-devnet-1110-cfg
 devnet-build-172:
 	@$(MAKE) devnet-build \
 		DEVNET_BUILD_LUMERA=0 \
@@ -137,6 +141,17 @@ _check-devnet-191-cfg:
 	@[ -f "$$(realpath $(DEFAULT_GENESIS_FILE))" ] || (echo "Missing DEFAULT_GENESIS_FILE: $$(realpath $(DEFAULT_GENESIS_FILE))"; exit 1)
 	@[ -f "$$(realpath $(DEFAULT_CLAIMS_FILE))" ] || (echo "Missing DEFAULT_CLAIMS_FILE: $$(realpath $(DEFAULT_CLAIMS_FILE))"; exit 1)
 
+devnet-build-1110:
+	@$(MAKE) devnet-build \
+		DEVNET_BUILD_LUMERA=0 \
+		DEVNET_BIN_DIR=devnet/bin-v1.11.0 \
+		EXTERNAL_GENESIS_FILE="$$(realpath $(DEFAULT_GENESIS_FILE))" \
+		EXTERNAL_CLAIMS_FILE="$$(realpath $(DEFAULT_CLAIMS_FILE))"
+
+_check-devnet-1110-cfg:
+	@[ -f "$$(realpath $(DEFAULT_GENESIS_FILE))" ] || (echo "Missing DEFAULT_GENESIS_FILE: $$(realpath $(DEFAULT_GENESIS_FILE))"; exit 1)
+	@[ -f "$$(realpath $(DEFAULT_CLAIMS_FILE))" ] || (echo "Missing DEFAULT_CLAIMS_FILE: $$(realpath $(DEFAULT_CLAIMS_FILE))"; exit 1)
+
 _check-devnet-default-cfg:
 	@[ -f "$$(realpath $(DEFAULT_GENESIS_FILE))" ] || (echo "Missing DEFAULT_GENESIS_FILE: $$(realpath $(DEFAULT_GENESIS_FILE))"; exit 1)
 	@[ -f "$$(realpath $(DEFAULT_GENESIS_EVM_FILE))" ] || (echo "Missing DEFAULT_GENESIS_EVM_FILE: $$(realpath $(DEFAULT_GENESIS_EVM_FILE))"; exit 1)
@@ -340,7 +355,8 @@ devnet-update-scripts:
 		echo "No containers were updated. Ensure the devnet is running."; \
 	fi
 
-.PHONY: devnet-new-172 devnet-new-191 devnet-upgrade-180 devnet-upgrade-191 devnet-upgrade-1100 devnet-upgrade-1101
+.PHONY: devnet-new-172 devnet-new-191 devnet-new-1110 devnet-upgrade-180 devnet-upgrade-191 
+.PHONY: devnet-upgrade-1100 devnet-upgrade-1101 devnet-upgrade-1110 devnet-upgrade-1120
 
 devnet-upgrade-180:
 	@cd devnet/scripts && ./upgrade.sh v1.8.0 auto-height ../bin-v1.8.0
@@ -352,7 +368,13 @@ devnet-upgrade-1100:
 	@cd devnet/scripts && ./upgrade.sh v1.10.0 auto-height ../bin-v1.10.0
 
 devnet-upgrade-1101:
-	@cd devnet/scripts && ./upgrade.sh v1.10.1 auto-height ../bin
+	@cd devnet/scripts && ./upgrade.sh v1.10.1 auto-height ../bin-v1.10.1
+
+devnet-upgrade-1110:
+	@cd devnet/scripts && ./upgrade.sh v1.11.0 auto-height ../bin-v1.11.0
+
+devnet-upgrade-1120:
+	@cd devnet/scripts && ./upgrade.sh v1.12.0 auto-height ../bin
 
 devnet-new-172:
 	$(MAKE) devnet-down
@@ -368,6 +390,13 @@ devnet-new-191:
 	sleep 10
 	$(MAKE) devnet-up
 
+devnet-new-1110:
+	$(MAKE) devnet-down
+	$(MAKE) devnet-clean
+	$(MAKE) devnet-build-1110
+	sleep 10
+	$(MAKE) devnet-up
+
 devnet-deploy-tar:
 	# Ensure required files exist from previous build
 	@if [ ! -f "devnet/docker-compose.yml" ] || [ ! -f "devnet/bin/lumerad" ] || [ ! -f "devnet/bin/libwasmvm.x86_64.so" ]; then \
@@ -401,3 +430,91 @@ devnet-deploy-tar:
 		rm devnet/external_genesis.json; \
 	fi
 	@echo "Created devnet-deploy.tar.gz with the required files."
+
+##### EVM Migration test targets #############################
+#
+# Run the evmigration test tool inside each devnet validator container
+# via docker compose exec.
+#
+# Inside containers:
+#   binary   = /shared/release/tests_evmigration
+#   lumerad  = /shared/release/lumerad  (symlinked to PATH or used via -bin)
+#   home     = /root/.lumera
+#   RPC      = tcp://localhost:26657    (each container exposes its own node)
+#   accounts = /shared/evmigration-accounts-<validator_service>.json
+#              (unique per validator to avoid cross-validator key/account reuse)
+#   names    = evm_test_<validator_tag>_<idx> / evm_testex_<validator_tag>_<idx>
+#              (validator tag is auto-derived by tests_evmigration from local validator/funder key name)
+
+EVMIGRATION_CHAIN_ID ?= lumera-devnet-1
+EVMIGRATION_NUM_ACCOUNTS ?= 5
+EVMIGRATION_NUM_EXTRA ?= 5
+EVMIGRATION_ACCOUNTS_PREFIX ?= /shared/evmigration-accounts
+
+# Container-internal paths (the /shared volume is mounted from $(DEVNET_DIR)/shared).
+_EVMIGRATION_BIN_CONTAINER  := /shared/release/tests_evmigration
+_EVMIGRATION_LUMERAD_CONTAINER := /shared/release/lumerad
+_EVMIGRATION_ACCOUNTS_CONTAINER_PREFIX := $(EVMIGRATION_ACCOUNTS_PREFIX)
+_EVMIGRATION_BIN_HOST := $(DEVNET_BIN_DIR_ABS)/tests_evmigration
+_EVMIGRATION_BIN_SHARED_HOST := $(SHARED_RELEASE_DIR)/tests_evmigration
+
+# Discover running validator services from the compose file.
+_EVMIGRATION_SERVICES = $(shell docker compose -f $(COMPOSE_FILE) ps --services 2>/dev/null | grep '^supernova_validator_' | sort)
+
+# Common flags passed to the binary inside the container.
+_evmigration_common_container = \
+	-bin="$(_EVMIGRATION_LUMERAD_CONTAINER)" \
+	-chain-id="$(EVMIGRATION_CHAIN_ID)" \
+	-home="/root/.lumera" \
+	-rpc="tcp://localhost:26657"
+
+define _run_evmigration_in_containers
+	@if [ ! -f "$(COMPOSE_FILE)" ]; then \
+		echo "docker-compose.yml not found; run 'make devnet-build' first"; \
+		exit 1; \
+	fi; \
+	services="$(_EVMIGRATION_SERVICES)"; \
+	if [ -z "$$services" ]; then \
+		echo "No running supernova_validator_* services found; is the devnet up?"; \
+		exit 1; \
+	fi; \
+	for svc in $$services; do \
+		accounts_path="$(_EVMIGRATION_ACCOUNTS_CONTAINER_PREFIX)-$${svc}.json"; \
+		echo "=== $(1) on $${svc} ==="; \
+		echo "    accounts file: $${accounts_path}"; \
+		docker compose -f $(COMPOSE_FILE) exec -T "$${svc}" \
+			"$(_EVMIGRATION_BIN_CONTAINER)" \
+			$(_evmigration_common_container) \
+			-accounts="$${accounts_path}" \
+			-mode="$(1)" \
+			$(2) || exit 1; \
+	done
+endef
+
+devnet-evmigration-sync-bin:
+	@src="$(_EVMIGRATION_BIN_HOST)"; \
+	dst="$(_EVMIGRATION_BIN_SHARED_HOST)"; \
+	if [ ! -f "$$src" ]; then \
+		echo "Missing $$src; run 'make devnet-tests-build' first"; \
+		exit 1; \
+	fi; \
+	mkdir -p "$$(dirname "$$dst")"; \
+	if [ -f "$$dst" ] && cmp -s "$$src" "$$dst"; then \
+		echo "tests_evmigration binary is up to date in shared/release"; \
+	else \
+		cp -f "$$src" "$$dst"; \
+		chmod +x "$$dst"; \
+		echo "synced tests_evmigration to $$dst"; \
+	fi
+
+devnet-evmigration-prepare: devnet-evmigration-sync-bin
+	$(call _run_evmigration_in_containers,prepare,-num-accounts=$(EVMIGRATION_NUM_ACCOUNTS) -num-extra=$(EVMIGRATION_NUM_EXTRA))
+
+devnet-evmigration-migrate: devnet-evmigration-sync-bin
+	$(call _run_evmigration_in_containers,migrate)
+
+devnet-evmigration-migrate-validator: devnet-evmigration-sync-bin
+	$(call _run_evmigration_in_containers,migrate-validator)
+
+devnet-evmigration-cleanup: devnet-evmigration-sync-bin
+	$(call _run_evmigration_in_containers,cleanup)

ante/evmigration_fee_decorator.go

@@ -0,0 +1,39 @@
+package ante
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	evmigrationtypes "github.com/LumeraProtocol/lumera/x/evmigration/types"
+)
+
+// EVMigrationFeeDecorator must be placed BEFORE MinGasPriceDecorator
+// in the AnteHandler chain. If every message inside the tx is a migration
+// message (MsgClaimLegacyAccount or MsgMigrateValidator) we clear
+// min-gas-prices, allowing zero-fee txs. This solves the chicken-and-egg
+// problem where the new address has zero balance before migration.
+type EVMigrationFeeDecorator struct{}
+
+var _ sdk.AnteDecorator = EVMigrationFeeDecorator{}
+
+func (d EVMigrationFeeDecorator) AnteHandle(
+	ctx sdk.Context,
+	tx sdk.Tx,
+	simulate bool,
+	next sdk.AnteHandler,
+) (sdk.Context, error) {
+	for _, msg := range tx.GetMsgs() {
+		switch msg.(type) {
+		case *evmigrationtypes.MsgClaimLegacyAccount,
+			*evmigrationtypes.MsgMigrateValidator:
+			continue
+		default:
+			// Non-migration message in tx — run normal fee checks.
+			return next(ctx, tx, simulate)
+		}
+	}
+
+	// All messages are migration messages — waive the fee.
+	ctx = ctx.WithMinGasPrices(nil)
+
+	return next(ctx, tx, simulate)
+}

app/app.go

@@ -75,7 +75,6 @@ import (
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
-	evmibctransferkeeper "github.com/cosmos/evm/x/ibc/transfer/keeper"
 	ibcpacketforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10/packetforward/keeper"
 	icacontrollerkeeper "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/keeper"
 	icahostkeeper "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/keeper"
@@ -102,6 +101,7 @@ import (
 	actionmodulekeeper "github.com/LumeraProtocol/lumera/x/action/v1/keeper"
 	auditmodulekeeper "github.com/LumeraProtocol/lumera/x/audit/v1/keeper"
 	claimmodulekeeper "github.com/LumeraProtocol/lumera/x/claim/keeper"
+	evmigrationmodulekeeper "github.com/LumeraProtocol/lumera/x/evmigration/keeper"
 	lumeraidmodulekeeper "github.com/LumeraProtocol/lumera/x/lumeraid/keeper"
 	sntypes "github.com/LumeraProtocol/lumera/x/supernode/v1/types"
 	erc20keeper "github.com/cosmos/evm/x/erc20/keeper"
@@ -143,11 +143,15 @@ type App struct {
 	pendingTxListeners []evmante.PendingTxListener
 	evmMempool         *evmmempool.ExperimentalEVMMempool
 	// evmTxBroadcaster is used to asynchronously broadcast promoted EVM transactions from the mempool to the network without blocking CheckTx execution.
-	evmTxBroadcaster   *evmTxBroadcastDispatcher
+	evmTxBroadcaster *evmTxBroadcastDispatcher
 	// if true, the app will log additional information about mempool transaction broadcasts, which can be noisy but is useful for debugging mempool behavior.
 	evmBroadcastDebug  bool
 	evmBroadcastLogger log.Logger
 
+	// jsonrpcRateLimitProxy is the optional rate-limiting reverse proxy for JSON-RPC.
+	jsonrpcRateLimitProxy       *http.Server
+	jsonrpcRateLimitCleanupStop chan struct{}
+
 	// keepers
 	// only keepers required by the app are exposed
 	// the list of all modules is available in the app_config
@@ -172,7 +176,6 @@ type App struct {
 	ICAControllerKeeper icacontrollerkeeper.Keeper
 	ICAHostKeeper       icahostkeeper.Keeper
 	TransferKeeper      ibctransferkeeper.Keeper
-	EVMTransferKeeper   evmibctransferkeeper.Keeper
 
 	// IBC middleware keepers
 	PacketForwardKeeper *ibcpacketforwardkeeper.Keeper
@@ -191,6 +194,8 @@ type App struct {
 	PreciseBankKeeper precisebankkeeper.Keeper
 	EVMKeeper         *evmkeeper.Keeper
 	Erc20Keeper       erc20keeper.Keeper
+	EvmigrationKeeper    evmigrationmodulekeeper.Keeper
+	erc20PolicyWrapper   *erc20PolicyKeeperWrapper
 	// this line is used by starport scaffolding # stargate/app/keeperDeclaration
 
 	// simulation manager
@@ -297,6 +302,8 @@ func New(
 		&app.SupernodeKeeper,
 		&app.AuditKeeper,
 		&app.ActionKeeper,
+		&app.EvmigrationKeeper,
+
 		// this line is used by starport scaffolding # stargate/app/keeperDefinition
 	); err != nil {
 		panic(err)
@@ -320,14 +327,25 @@ func New(
 
 	// register EVM modules first — the ante handler (set during IBC/wasm registration)
 	// depends on EVM keepers (FeeMarketKeeper, EVMKeeper).
-	if err := app.registerEVMModules(); err != nil {
+	if err := app.registerEVMModules(appOpts); err != nil {
 		panic(err)
 	}
 
+	// Create the ERC20 registration policy wrapper (governance-controlled IBC voucher
+	// ERC20 auto-registration). Must be created before registerIBCModules, which wires
+	// the wrapper into the IBC transfer middleware stacks.
+	app.registerERC20Policy()
+
 	// register legacy modules (IBC, wasm)
 	if err := app.registerIBCModules(appOpts, wasmOpts...); err != nil {
 		panic(err)
 	}
+	// Inject IBC store keys into the EVM keeper's KV store map so the snapshot
+	// multi-store used by StateDB includes "ibc" and "transfer" stores.
+	// registerEVMModules captured kvStoreKeys() before IBC stores were registered;
+	// adding them here fixes Bug #6 (ICS20 precompile panic).
+	app.syncEVMStoreKeys()
+
 	// Enable Cosmos EVM static precompiles once IBC keepers are available.
 	app.configureEVMStaticPrecompiles()
 
@@ -349,6 +367,9 @@ func New(
 		panic(err)
 	}
 
+	// Start optional JSON-RPC rate-limiting reverse proxy.
+	app.startJSONRPCRateLimitProxy(appOpts, logger)
+
 	// **** SETUP UPGRADES (upgrade handlers and store loaders) ****
 	// This needs to be done after keepers are initialized but before loading state.
 	app.setupUpgrades()
@@ -372,6 +393,10 @@ func New(
 			panic(err)
 		}
 
+		// Pre-populate the ERC20 registration policy with default allowlist
+		// base denoms (uatom, uosmo, uusdc) on first genesis.
+		app.initERC20PolicyDefaults(ctx)
+
 		return app.App.InitChainer(ctx, req)
 	})
 
@@ -405,7 +430,7 @@ func (app *App) setupUpgrades() {
 		SupernodeKeeper:       app.SupernodeKeeper,
 		ParamsKeeper:          &app.ParamsKeeper,
 		ConsensusParamsKeeper: &app.ConsensusParamsKeeper,
-		AuditKeeper:     &app.AuditKeeper,
+		AuditKeeper:           &app.AuditKeeper,
 	}
 
 	allUpgrades := upgrades.AllUpgrades(params)
@@ -570,7 +595,7 @@ func (app *App) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIConfig
 	if err := server.RegisterSwaggerAPI(apiSvr.ClientCtx, apiSvr.Router, apiConfig.Swagger); err != nil {
 		panic(err)
 	}
-	apiSvr.Router.HandleFunc(appopenrpc.HTTPPath, appopenrpc.ServeHTTP).Methods(http.MethodGet, http.MethodHead)
+	apiSvr.Router.HandleFunc(appopenrpc.HTTPPath, appopenrpc.ServeHTTP).Methods(http.MethodGet, http.MethodHead, http.MethodOptions)
 
 	// register app's OpenAPI routes.
 	docs.RegisterOpenAPIService(Name, apiSvr.Router)