refactor!: consolidate and clean up chain config

.github/workflows/codeql-analysis.yml

@@ -18,7 +18,7 @@ permissions: read-all
 jobs:
   analyze:
     name: Analyze
-    runs-on: depot-ubuntu-24.04-8
+    runs-on: depot-ubuntu-24.04-4
     permissions:
       actions: read
       contents: read

.github/workflows/system-test.yml

@@ -10,7 +10,7 @@ permissions: read-all
 
 jobs:
   cleanup-runs:
-    runs-on: ubuntu-latest
+    runs-on: depot-ubuntu-24.04-4
     steps:
       - uses: rokroskar/workflow-run-cleanup-action@master
         env:

CHANGELOG.md

@@ -26,6 +26,7 @@
 - [\#511](https://github.com/cosmos/evm/pull/511) Minor code cleanup for `AddPrecompileFn`.
 - [\#544](https://github.com/cosmos/evm/pull/544) Parse logs from the txResult.Data and avoid emitting EVM events to cosmos-sdk events.
 - [\#582](https://github.com/cosmos/evm/pull/582) Add block max-gas (from genesis.json) and new min-tip (from app.toml/flags) ingestion into mempool config
+- [\#436](https://github.com/cosmos/evm/pull/436) Refactor and consolidate chain config helpers and constants for test suites
 
 ### FEATURES
 

Makefile

@@ -145,9 +145,16 @@ test-race: ARGS=-race
 test-race: TEST_PACKAGES=$(PACKAGES_UNIT)
 test-race: run-tests
 
+# Chain configuration environment variables
+CHAIN_ENV_VARS = $(if $(CHAIN_ID),CHAIN_ID="$(CHAIN_ID)") \
+                 $(if $(EVM_CHAIN_ID),EVM_CHAIN_ID="$(EVM_CHAIN_ID)") \
+                 $(if $(DISPLAY_DENOM),DISPLAY_DENOM="$(DISPLAY_DENOM)") \
+                 $(if $(DECIMALS),DECIMALS="$(DECIMALS)") \
+				 $(if $(EXTENDED_DECIMALS),EXTENDED_DECIMALS="$(EXTENDED_DECIMALS)")
+
 test-evmd: ARGS=-timeout=15m
 test-evmd:
-	@cd evmd && go test -tags=test -mod=readonly $(ARGS) $(EXTRA_ARGS) $(PACKAGES_EVMD)
+	@cd evmd && $(CHAIN_ENV_VARS) go test -tags=test -mod=readonly $(ARGS) $(EXTRA_ARGS) $(PACKAGES_EVMD)
 
 test-unit-cover: ARGS=-timeout=15m -coverprofile=coverage.txt -covermode=atomic
 test-unit-cover: TEST_PACKAGES=$(PACKAGES_UNIT)
@@ -196,7 +203,7 @@ test-scripts:
 
 test-solidity:
 	@echo "Beginning solidity tests..."
-	./scripts/run-solidity-tests.sh
+	@$(CHAIN_ENV_VARS) ./scripts/run-solidity-tests.sh
 
 .PHONY: run-tests test test-all $(TEST_TARGETS)
 

ante/cosmos/authz_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/cosmos/evm/ante/cosmos"
 	"github.com/cosmos/evm/encoding"
 	"github.com/cosmos/evm/testutil"
-	"github.com/cosmos/evm/testutil/constants"
+	testconfig "github.com/cosmos/evm/testutil/config"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -21,17 +21,16 @@ import (
 )
 
 func TestAuthzLimiterDecorator(t *testing.T) {
-	evmConfigurator := evmtypes.NewEVMConfigurator().
-		WithEVMCoinInfo(constants.ExampleChainCoinInfo[constants.ExampleChainID])
-	err := evmConfigurator.Configure()
-	require.NoError(t, err)
+	chainConfig := testconfig.DefaultChainConfig
+	evmChainID := chainConfig.EvmConfig.ChainConfig.ChainId
+	evmCoinInfo := chainConfig.EvmConfig.CoinInfo
+	evmDenom := evmCoinInfo.GetDenom()
 
-	encodingCfg := encoding.MakeConfig(constants.ExampleChainID.EVMChainID)
+	encodingCfg := encoding.MakeConfig(evmChainID)
 	txCfg := encodingCfg.TxConfig
 	testPrivKeys, testAddresses, err := testutil.GeneratePrivKeyAddressPairs(5)
 	require.NoError(t, err)
 
-	evmDenom := evmtypes.GetEVMCoinDenom()
 	distantFuture := time.Date(9000, 1, 1, 0, 0, 0, 0, time.UTC)
 
 	validator := sdk.ValAddress(testAddresses[4])

ante/evm/fee_checker_test.go

@@ -11,8 +11,7 @@ import (
 	"github.com/cosmos/evm/ante/evm"
 	anteinterfaces "github.com/cosmos/evm/ante/interfaces"
 	"github.com/cosmos/evm/encoding"
-	"github.com/cosmos/evm/testutil/config"
-	testconstants "github.com/cosmos/evm/testutil/constants"
+	testconfig "github.com/cosmos/evm/testutil/config"
 	"github.com/cosmos/evm/types"
 	feemarkettypes "github.com/cosmos/evm/x/feemarket/types"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
@@ -57,9 +56,15 @@ func TestSDKTxFeeChecker(t *testing.T) {
 	//      with extension option
 	//      without extension option
 	//      london hardfork enableness
-	chainID := uint64(config.EighteenDecimalsChainID)
+	chainConfig := testconfig.DefaultChainConfig
+	chainID := chainConfig.EvmConfig.ChainConfig.EthereumConfig().ChainID
+	chainDenomAtto := chainConfig.EvmConfig.CoinInfo.GetDenom()
 	encodingConfig := encoding.MakeConfig(chainID)
-	err := config.EvmAppOptions(chainID)
+
+	// Configure EVM with test configuration
+	configurator := typesutil.NewEVMConfigurator()
+	configurator.ResetTestConfig()
+	err := configurator.WithEVMCoinInfo(chainConfig.EvmConfig).Configure()
 	require.NoError(t, err)
 
 	evmDenom := evmtypes.GetEVMCoinDenom()
@@ -110,7 +115,7 @@ func TestSDKTxFeeChecker(t *testing.T) {
 			func() sdk.FeeTx {
 				txBuilder := encodingConfig.TxConfig.NewTxBuilder()
 				txBuilder.SetGasLimit(1)
-				txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(testconstants.ExampleAttoDenom, math.NewInt(10))))
+				txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(chainDenomAtto, math.NewInt(10))))
 				return txBuilder.GetTx()
 			},
 			false,
@@ -155,7 +160,7 @@ func TestSDKTxFeeChecker(t *testing.T) {
 			func() sdk.FeeTx {
 				txBuilder := encodingConfig.TxConfig.NewTxBuilder()
 				txBuilder.SetGasLimit(1)
-				txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(testconstants.ExampleAttoDenom, math.NewInt(10))))
+				txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(chainDenomAtto, math.NewInt(10))))
 				return txBuilder.GetTx()
 			},
 			true,
@@ -172,7 +177,7 @@ func TestSDKTxFeeChecker(t *testing.T) {
 			func() sdk.FeeTx {
 				txBuilder := encodingConfig.TxConfig.NewTxBuilder()
 				txBuilder.SetGasLimit(1)
-				txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(testconstants.ExampleAttoDenom, math.NewInt(10).Mul(evmtypes.DefaultPriorityReduction).Add(math.NewInt(10)))))
+				txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(chainDenomAtto, math.NewInt(10).Mul(evmtypes.DefaultPriorityReduction).Add(math.NewInt(10)))))
 				return txBuilder.GetTx()
 			},
 			true,
@@ -189,7 +194,7 @@ func TestSDKTxFeeChecker(t *testing.T) {
 			func() sdk.FeeTx {
 				txBuilder := encodingConfig.TxConfig.NewTxBuilder().(authtx.ExtensionOptionsTxBuilder)
 				txBuilder.SetGasLimit(1)
-				txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(testconstants.ExampleAttoDenom, math.NewInt(10).Mul(evmtypes.DefaultPriorityReduction))))
+				txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(chainDenomAtto, math.NewInt(10).Mul(evmtypes.DefaultPriorityReduction))))
 
 				option, err := codectypes.NewAnyWithValue(&types.ExtensionOptionDynamicFeeTx{})
 				require.NoError(t, err)
@@ -210,7 +215,7 @@ func TestSDKTxFeeChecker(t *testing.T) {
 			func() sdk.FeeTx {
 				txBuilder := encodingConfig.TxConfig.NewTxBuilder().(authtx.ExtensionOptionsTxBuilder)
 				txBuilder.SetGasLimit(1)
-				txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(testconstants.ExampleAttoDenom, math.NewInt(10).Mul(evmtypes.DefaultPriorityReduction).Add(math.NewInt(10)))))
+				txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(chainDenomAtto, math.NewInt(10).Mul(evmtypes.DefaultPriorityReduction).Add(math.NewInt(10)))))
 
 				option, err := codectypes.NewAnyWithValue(&types.ExtensionOptionDynamicFeeTx{
 					MaxPriorityPrice: math.LegacyNewDec(5).MulInt(evmtypes.DefaultPriorityReduction),
@@ -233,7 +238,7 @@ func TestSDKTxFeeChecker(t *testing.T) {
 			func() sdk.FeeTx {
 				txBuilder := encodingConfig.TxConfig.NewTxBuilder().(authtx.ExtensionOptionsTxBuilder)
 				txBuilder.SetGasLimit(1)
-				txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(testconstants.ExampleAttoDenom, math.NewInt(10).Mul(evmtypes.DefaultPriorityReduction).Add(math.NewInt(10)))))
+				txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(chainDenomAtto, math.NewInt(10).Mul(evmtypes.DefaultPriorityReduction).Add(math.NewInt(10)))))
 
 				// set negative priority fee
 				option, err := codectypes.NewAnyWithValue(&types.ExtensionOptionDynamicFeeTx{

ante/evm/mono_decorator_test.go

@@ -19,7 +19,7 @@ import (
 	"github.com/cosmos/evm/ante/evm"
 	"github.com/cosmos/evm/crypto/ethsecp256k1"
 	"github.com/cosmos/evm/encoding"
-	"github.com/cosmos/evm/testutil/config"
+	testconfig "github.com/cosmos/evm/testutil/config"
 	utiltx "github.com/cosmos/evm/testutil/tx"
 	feemarkettypes "github.com/cosmos/evm/x/feemarket/types"
 	"github.com/cosmos/evm/x/vm/statedb"
@@ -119,7 +119,9 @@ func signMsgEthereumTx(t *testing.T, privKey *ethsecp256k1.PrivKey, args *evmsdk
 	msg := evmsdktypes.NewTx(args)
 	fromAddr := common.BytesToAddress(privKey.PubKey().Address().Bytes())
 	msg.From = fromAddr.Bytes()
-	ethSigner := ethtypes.LatestSignerForChainID(evmsdktypes.GetEthChainConfig().ChainID)
+	// Use the configured chain ID instead of the default one
+	chainID := new(big.Int).SetUint64(testconfig.DefaultChainConfig.EvmConfig.ChainConfig.ChainId)
+	ethSigner := ethtypes.LatestSignerForChainID(chainID)
 	require.NoError(t, msg.Sign(ethSigner, utiltx.NewSigner(privKey)))
 	return msg
 }
@@ -144,8 +146,9 @@ func toMsgSlice(msgs []*evmsdktypes.MsgEthereumTx) []sdk.Msg {
 }
 
 func TestMonoDecorator(t *testing.T) {
-	chainID := uint64(config.EighteenDecimalsChainID)
-	require.NoError(t, config.EvmAppOptions(chainID))
+	chainConfig := testconfig.DefaultChainConfig
+	chainID := chainConfig.EvmConfig.ChainConfig.ChainId
+
 	cfg := encoding.MakeConfig(chainID)
 
 	testCases := []struct {

ante/sigverify_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/cosmos/evm/ante"
 	"github.com/cosmos/evm/crypto/ethsecp256k1"
 	"github.com/cosmos/evm/encoding"
-	"github.com/cosmos/evm/server/config"
+	testconfig "github.com/cosmos/evm/testutil/config"
 
 	storetypes "cosmossdk.io/store/types"
 
@@ -27,7 +27,7 @@ func TestConsumeSignatureVerificationGas(t *testing.T) {
 	params := authtypes.DefaultParams()
 	msg := []byte{1, 2, 3, 4}
 
-	encodingConfig := encoding.MakeConfig(config.DefaultEVMChainID)
+	encodingConfig := encoding.MakeConfig(testconfig.DefaultChainConfig.ChainInfo.EVMChainID)
 	cdc := encodingConfig.Amino
 
 	p := authtypes.DefaultParams()

config/evm_app_options.go → config/app_options.go

@@ -1,8 +1,6 @@
 package config
 
 import (
-	"fmt"
-
 	"github.com/ethereum/go-ethereum/core/vm"
 
 	evmtypes "github.com/cosmos/evm/x/vm/types"
@@ -19,49 +17,46 @@ type EVMOptionsFn func(uint64) error
 
 var sealed = false
 
+// EvmAppOptionsWithConfig sets up EVM configuration with the provided coin info and activators.
 func EvmAppOptionsWithConfig(
 	chainID uint64,
-	chainsCoinInfo map[uint64]evmtypes.EvmCoinInfo,
-	cosmosEVMActivators map[int]func(*vm.JumpTable),
+	coinInfo evmtypes.EvmCoinInfo,
+	activators map[int]func(*vm.JumpTable),
 ) error {
 	if sealed {
 		return nil
 	}
 
-	if err := EvmAppOptionsWithConfigWithReset(chainID, chainsCoinInfo, cosmosEVMActivators, false); err != nil {
+	if err := EvmAppOptionsWithConfigWithReset(chainID, coinInfo, activators, false); err != nil {
 		return err
 	}
 
 	sealed = true
 	return nil
 }
 
+// EvmAppOptionsWithConfigWithReset sets up EVM configuration with an optional reset flag
+// to allow reconfiguration during testing.
 func EvmAppOptionsWithConfigWithReset(
 	chainID uint64,
-	chainsCoinInfo map[uint64]evmtypes.EvmCoinInfo,
-	cosmosEVMActivators map[int]func(*vm.JumpTable),
+	coinInfo evmtypes.EvmCoinInfo,
+	activators map[int]func(*vm.JumpTable),
 	withReset bool,
 ) error {
-	coinInfo, found := chainsCoinInfo[chainID]
-	if !found {
-		return fmt.Errorf("unknown chain id: %d", chainID)
-	}
-
 	// set the denom info for the chain
 	if err := setBaseDenom(coinInfo); err != nil {
 		return err
 	}
 
 	ethCfg := evmtypes.DefaultChainConfig(chainID)
-	configurator := evmtypes.NewEVMConfigurator()
+	configurator := evmtypes.NewEvmConfig()
 	if withReset {
 		// reset configuration to set the new one
 		configurator.ResetTestConfig()
 	}
 	err := configurator.
-		WithExtendedEips(cosmosEVMActivators).
+		WithExtendedEips(activators).
 		WithChainConfig(ethCfg).
-		// NOTE: we're using the 18 decimals default for the example chain
 		WithEVMCoinInfo(coinInfo).
 		Configure()
 	if err != nil {

ethereum/eip712/preprocess_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/cosmos/evm/encoding"
 	"github.com/cosmos/evm/ethereum/eip712"
-	"github.com/cosmos/evm/testutil/constants"
+	testconfig "github.com/cosmos/evm/testutil/config"
 	utiltx "github.com/cosmos/evm/testutil/tx"
 	"github.com/cosmos/evm/types"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
@@ -30,7 +30,7 @@ import (
 // Testing Constants
 var (
 	// chainID is used in EIP-712 tests.
-	chainID = uint64(constants.ExampleEIP155ChainID)
+	chainID = testconfig.DefaultChainConfig.ChainInfo.EVMChainID
 
 	ctx = client.Context{}.WithTxConfig(
 		encoding.MakeConfig(chainID).TxConfig,
@@ -39,7 +39,7 @@ var (
 	// feePayerAddress is the address of the fee payer used in EIP-712 tests.
 	feePayerAddress = fmt.Sprintf(
 		"%s17xpfvakm2amg962yls6f84z3kell8c5lserqta",
-		constants.ExampleBech32Prefix,
+		sdk.GetConfig().GetBech32AccountAddrPrefix(),
 	)
 )
 
@@ -54,10 +54,8 @@ type TestCaseStruct struct {
 }
 
 func TestLedgerPreprocessing(t *testing.T) {
-	// Update bech32 prefix
-	sdk.GetConfig().SetBech32PrefixForAccount(constants.ExampleBech32Prefix, "")
-	evmConfigurator := evmtypes.NewEVMConfigurator().
-		WithEVMCoinInfo(constants.ExampleChainCoinInfo[constants.ExampleChainID])
+	coinInfo := testconfig.DefaultChainConfig.EvmConfig
+	evmConfigurator := evmtypes.NewEvmConfig().WithEVMCoinInfo(coinInfo)
 	err := evmConfigurator.Configure()
 	require.NoError(t, err)
 

evmd/cmd/evmd/cmd/creator.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"errors"
+	"fmt"
 	"io"
 	"path/filepath"
 
@@ -10,7 +11,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/server"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
-	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	"github.com/cosmos/evm/evmd"
 	evmdconfig "github.com/cosmos/evm/evmd/cmd/evmd/config"
@@ -88,14 +88,20 @@ func (a appCreator) newApp(
 		baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(server.FlagIAVLCacheSize))),
 	}
 
+	// Load chain configuration from app options
+	chainConfig, err := evmdconfig.LoadChainConfig(appOpts)
+	if err != nil {
+		panic(fmt.Errorf("failed to load chain configuration: %w", err))
+	}
+
 	return evmd.NewExampleApp(
 		logger,
 		db,
 		traceStore,
 		true,
-		simtestutil.EmptyAppOptions{},
-		evmdconfig.EVMChainID,
-		evmdconfig.EvmAppOptions,
+		appOpts,
+		chainConfig.ChainInfo.EVMChainID,
+		evmdconfig.EvmAppOptionsFromConfig(chainConfig),
 		baseappOptions...,
 	)
 }
@@ -131,14 +137,20 @@ func (a appCreator) appExport(
 		loadLatest = true
 	}
 
+	// Load chain configuration from app options
+	chainConfig, err := evmdconfig.LoadChainConfig(appOpts)
+	if err != nil {
+		return servertypes.ExportedApp{}, fmt.Errorf("failed to load chain configuration: %w", err)
+	}
+
 	evmApp = evmd.NewExampleApp(
 		logger,
 		db,
 		traceStore,
 		loadLatest,
 		appOpts,
-		evmdconfig.EVMChainID,
-		evmdconfig.EvmAppOptions,
+		chainConfig.ChainInfo.EVMChainID,
+		evmdconfig.EvmAppOptionsFromConfig(chainConfig),
 	)
 
 	if height != -1 {