Refactor: relocate evmd-specific configurations and add test counterparts

Moved evmd-specific app configurations under the evmd/ directory to improve modularity and maintain clearer separation between evmd and other components.

Introduced corresponding configuration files under testutil/ to support test applications, since relocating the original files required new equivalents for testing purposes.

Author: zsystm

ante/evm/fee_checker_test.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/cosmos/evm/ante/evm"
 	anteinterfaces "github.com/cosmos/evm/ante/interfaces"
-	"github.com/cosmos/evm/config"
 	"github.com/cosmos/evm/encoding"
+	"github.com/cosmos/evm/testutil/config"
 	testconstants "github.com/cosmos/evm/testutil/constants"
 	"github.com/cosmos/evm/types"
 	feemarkettypes "github.com/cosmos/evm/x/feemarket/types"

config/opendb.go

@@ -17,8 +17,8 @@ import (
 	dbm "github.com/cosmos/cosmos-db"
 	evmante "github.com/cosmos/evm/ante"
 	cosmosevmante "github.com/cosmos/evm/ante/evm"
-	evmconfig "github.com/cosmos/evm/config"
 	evmosencoding "github.com/cosmos/evm/encoding"
+	evmdconfig "github.com/cosmos/evm/evmd/cmd/evmd/config"
 	srvflags "github.com/cosmos/evm/server/flags"
 	cosmosevmtypes "github.com/cosmos/evm/types"
 	"github.com/cosmos/evm/x/erc20"
@@ -134,7 +134,7 @@ func init() {
 	// manually update the power reduction by replacing micro (u) -> atto (a) evmos
 	sdk.DefaultPowerReduction = cosmosevmtypes.AttoPowerReduction
 
-	defaultNodeHome = evmconfig.MustGetDefaultNodeHome()
+	defaultNodeHome = evmdconfig.MustGetDefaultNodeHome()
 }
 
 const appName = "evmd"
@@ -209,7 +209,7 @@ func NewExampleApp(
 	loadLatest bool,
 	appOpts servertypes.AppOptions,
 	evmChainID uint64,
-	evmAppOptions evmconfig.EVMOptionsFn,
+	evmAppOptions evmdconfig.EVMOptionsFn,
 	baseAppOptions ...func(*baseapp.BaseApp),
 ) *EVMD {
 	encodingConfig := evmosencoding.MakeConfig(evmChainID)
@@ -314,7 +314,7 @@ func NewExampleApp(
 	// add keepers
 	app.AccountKeeper = authkeeper.NewAccountKeeper(
 		appCodec, runtime.NewKVStoreService(keys[authtypes.StoreKey]),
-		authtypes.ProtoBaseAccount, evmconfig.GetMaccPerms(),
+		authtypes.ProtoBaseAccount, evmdconfig.GetMaccPerms(),
 		authcodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()),
 		sdk.GetConfig().GetBech32AccountAddrPrefix(),
 		authAddr,
@@ -324,7 +324,7 @@ func NewExampleApp(
 		appCodec,
 		runtime.NewKVStoreService(keys[banktypes.StoreKey]),
 		app.AccountKeeper,
-		evmconfig.BlockedAddresses(),
+		evmdconfig.BlockedAddresses(),
 		authAddr,
 		logger,
 	)
@@ -911,15 +911,15 @@ func (app *EVMD) TxConfig() client.TxConfig {
 func (app *EVMD) DefaultGenesis() map[string]json.RawMessage {
 	genesis := app.BasicModuleManager.DefaultGenesis(app.appCodec)
 
-	mintGenState := evmconfig.NewMintGenesisState()
+	mintGenState := NewMintGenesisState()
 	genesis[minttypes.ModuleName] = app.appCodec.MustMarshalJSON(mintGenState)
 
-	evmGenState := evmconfig.NewEVMGenesisState()
+	evmGenState := NewEVMGenesisState()
 	genesis[evmtypes.ModuleName] = app.appCodec.MustMarshalJSON(evmGenState)
 
 	// NOTE: for the example chain implementation we are also adding a default token pair,
 	// which is the base denomination of the chain (i.e. the WEVMOS contract)
-	erc20GenState := evmconfig.NewErc20GenesisState()
+	erc20GenState := NewErc20GenesisState()
 	genesis[erc20types.ModuleName] = app.appCodec.MustMarshalJSON(erc20GenState)
 
 	return genesis

evmd/app.go

@@ -14,9 +14,9 @@ import (
 
 	dbm "github.com/cosmos/cosmos-db"
 	cosmosevmcmd "github.com/cosmos/evm/client"
-	"github.com/cosmos/evm/config"
 	cosmosevmkeyring "github.com/cosmos/evm/crypto/keyring"
 	"github.com/cosmos/evm/evmd"
+	evmdconfig "github.com/cosmos/evm/evmd/cmd/evmd/config"
 	cosmosevmserver "github.com/cosmos/evm/server"
 	srvflags "github.com/cosmos/evm/server/flags"
 
@@ -63,7 +63,7 @@ func NewRootCmd() *cobra.Command {
 		nil,
 		true,
 		simtestutil.EmptyAppOptions{},
-		config.EVMChainID,
+		evmdconfig.EVMChainID,
 		noOpEvmAppOptions,
 	)
 
@@ -82,7 +82,7 @@ func NewRootCmd() *cobra.Command {
 		WithInput(os.Stdin).
 		WithAccountRetriever(authtypes.AccountRetriever{}).
 		WithBroadcastMode(flags.FlagBroadcastMode).
-		WithHomeDir(config.MustGetDefaultNodeHome()).
+		WithHomeDir(evmdconfig.MustGetDefaultNodeHome()).
 		WithViper(""). // In simapp, we don't use any prefix for env variables.
 		// Cosmos EVM specific setup
 		WithKeyringOptions(cosmosevmkeyring.Option()).
@@ -131,7 +131,7 @@ func NewRootCmd() *cobra.Command {
 				return err
 			}
 
-			customAppTemplate, customAppConfig := config.InitAppConfig(config.BaseDenom, config.EVMChainID)
+			customAppTemplate, customAppConfig := evmdconfig.InitAppConfig(evmdconfig.BaseDenom, evmdconfig.EVMChainID)
 			customTMConfig := initTendermintConfig()
 
 			return sdkserver.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, customTMConfig)
@@ -149,7 +149,7 @@ func NewRootCmd() *cobra.Command {
 	}
 
 	if initClientCtx.ChainID != "" {
-		if err := config.EvmAppOptions(config.EVMChainID); err != nil {
+		if err := evmdconfig.EvmAppOptions(evmdconfig.EVMChainID); err != nil {
 			panic(err)
 		}
 	}
@@ -173,7 +173,7 @@ func initRootCmd(rootCmd *cobra.Command, osApp *evmd.EVMD) {
 	cfg := sdk.GetConfig()
 	cfg.Seal()
 
-	defaultNodeHome := config.MustGetDefaultNodeHome()
+	defaultNodeHome := evmdconfig.MustGetDefaultNodeHome()
 	rootCmd.AddCommand(
 		genutilcli.InitCmd(osApp.BasicModuleManager, defaultNodeHome),
 		genutilcli.Commands(osApp.TxConfig(), osApp.BasicModuleManager, defaultNodeHome),
@@ -326,8 +326,8 @@ func newApp(
 	return evmd.NewExampleApp(
 		logger, db, traceStore, true,
 		appOpts,
-		config.EVMChainID,
-		config.EvmAppOptions,
+		evmdconfig.EVMChainID,
+		evmdconfig.EvmAppOptions,
 		baseappOptions...,
 	)
 }
@@ -368,13 +368,13 @@ func appExport(
 	}
 
 	if height != -1 {
-		exampleApp = evmd.NewExampleApp(logger, db, traceStore, false, appOpts, config.EVMChainID, config.EvmAppOptions, baseapp.SetChainID(chainID))
+		exampleApp = evmd.NewExampleApp(logger, db, traceStore, false, appOpts, evmdconfig.EVMChainID, evmdconfig.EvmAppOptions, baseapp.SetChainID(chainID))
 
 		if err := exampleApp.LoadHeight(height); err != nil {
 			return servertypes.ExportedApp{}, err
 		}
 	} else {
-		exampleApp = evmd.NewExampleApp(logger, db, traceStore, true, appOpts, config.EVMChainID, config.EvmAppOptions, baseapp.SetChainID(chainID))
+		exampleApp = evmd.NewExampleApp(logger, db, traceStore, true, appOpts, evmdconfig.EVMChainID, evmdconfig.EvmAppOptions, baseapp.SetChainID(chainID))
 	}
 
 	return exampleApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport)
@@ -389,7 +389,7 @@ func getChainIDFromOpts(appOpts servertypes.AppOptions) (chainID string, err err
 	if chainID == "" {
 		// If not available load from home
 		homeDir := cast.ToString(appOpts.Get(flags.FlagHome))
-		chainID, err = config.GetChainIDFromHome(homeDir)
+		chainID, err = evmdconfig.GetChainIDFromHome(homeDir)
 		if err != nil {
 			return "", err
 		}

evmd/cmd/evmd/cmd/root.go

@@ -3,7 +3,7 @@ package config
 import (
 	"github.com/ethereum/go-ethereum/core/vm"
 
-	"github.com/cosmos/evm/config/eips"
+	"github.com/cosmos/evm/evmd/eips"
 )
 
 // cosmosEVMActivators defines a map of opcode modifiers associated

config/activators.go renamed to evmd/cmd/evmd/config/activators.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	evmdconfig "github.com/cosmos/evm/config"
 	"github.com/cosmos/evm/evmd/cmd/evmd/cmd"
+	evmdconfig "github.com/cosmos/evm/evmd/cmd/evmd/config"
 
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 	sdk "github.com/cosmos/cosmos-sdk/types"

config/chain_id.go renamed to evmd/cmd/evmd/config/chain_id.go

@@ -1,4 +1,4 @@
-package eips
+package eips_test
 
 import (
 	"fmt"
@@ -13,8 +13,9 @@ import (
 	//nolint:revive,ST1001 // dot imports are fine for Ginkgo
 	. "github.com/onsi/gomega"
 
-	"github.com/cosmos/evm/config/eips"
-	"github.com/cosmos/evm/config/eips/testdata"
+	"github.com/cosmos/evm/evmd/eips"
+	"github.com/cosmos/evm/evmd/eips/testdata"
+	"github.com/cosmos/evm/evmd/tests/integration"
 	"github.com/cosmos/evm/testutil/integration/evm/factory"
 	"github.com/cosmos/evm/testutil/integration/evm/grpc"
 	"github.com/cosmos/evm/testutil/integration/evm/network"
@@ -33,7 +34,7 @@ import (
 //  3. Deploy and interact with contracts to compute the gas used AFTER enabling
 //     the EIP.
 
-func TestEIPs(t *testing.T, create network.CreateEvmApp, options ...network.ConfigOption) {
+func RunTests(t *testing.T, create network.CreateEvmApp, options ...network.ConfigOption) {
 	_ = Describe("EIP-0000 - ", Ordered, func() {
 		var (
 			in network.Network
@@ -130,6 +131,8 @@ func TestEIPs(t *testing.T, create network.CreateEvmApp, options ...network.Conf
 		})
 
 		It("should change CREATE opcode constant gas after enabling EIP", func() {
+			qRes, err := gh.GetEvmParams()
+			_ = qRes.Params
 			gasCostPre := params.CreateGas
 
 			deploymentTxArgs, err := tf.GenerateDeployContractArgs(senderAddr2, evmtypes.EvmTxArgs{}, deploymentData)
@@ -443,3 +446,7 @@ func TestEIPs(t *testing.T, create network.CreateEvmApp, options ...network.Conf
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "EIPs Suite")
 }
+
+func TestEIPs(t *testing.T) {
+	RunTests(t, integration.CreateEvmd)
+}

config/config.go renamed to evmd/cmd/evmd/config/config.go

@@ -0,0 +1,65 @@
+package evmd
+
+import (
+	"encoding/json"
+
+	"github.com/cosmos/evm/evmd/cmd/evmd/config"
+	testconstants "github.com/cosmos/evm/testutil/constants"
+	erc20types "github.com/cosmos/evm/x/erc20/types"
+	feemarkettypes "github.com/cosmos/evm/x/feemarket/types"
+	evmtypes "github.com/cosmos/evm/x/vm/types"
+
+	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
+)
+
+// GenesisState of the blockchain is represented here as a map of raw json
+// messages key'd by an identifier string.
+// The identifier is used to determine which module genesis information belongs
+// to so it may be appropriately routed during init chain.
+// Within this application default genesis information is retrieved from
+// the ModuleBasicManager which populates json from each BasicModule
+// object provided to it during init.
+type GenesisState map[string]json.RawMessage
+
+// NewEVMGenesisState returns the default genesis state for the EVM module.
+//
+// NOTE: for the example chain implementation we need to set the default EVM denomination
+// and enable ALL precompiles.
+func NewEVMGenesisState() *evmtypes.GenesisState {
+	evmGenState := evmtypes.DefaultGenesisState()
+	evmGenState.Params.ActiveStaticPrecompiles = evmtypes.AvailableStaticPrecompiles
+
+	return evmGenState
+}
+
+// NewErc20GenesisState returns the default genesis state for the ERC20 module.
+//
+// NOTE: for the example chain implementation we are also adding a default token pair,
+// which is the base denomination of the chain (i.e. the WEVMOS contract).
+func NewErc20GenesisState() *erc20types.GenesisState {
+	erc20GenState := erc20types.DefaultGenesisState()
+	erc20GenState.TokenPairs = testconstants.ExampleTokenPairs
+	erc20GenState.Params.NativePrecompiles = append(erc20GenState.Params.NativePrecompiles, testconstants.WEVMOSContractMainnet)
+
+	return erc20GenState
+}
+
+// NewMintGenesisState returns the default genesis state for the mint module.
+//
+// NOTE: for the example chain implementation we are also adding a default minter.
+func NewMintGenesisState() *minttypes.GenesisState {
+	mintGenState := minttypes.DefaultGenesisState()
+	mintGenState.Params.MintDenom = config.ExampleChainDenom
+
+	return mintGenState
+}
+
+// NewFeeMarketGenesisState returns the default genesis state for the feemarket module.
+//
+// NOTE: for the example chain implementation we are disabling the base fee.
+func NewFeeMarketGenesisState() *feemarkettypes.GenesisState {
+	feeMarketGenState := feemarkettypes.DefaultGenesisState()
+	feeMarketGenState.Params.NoBaseFee = true
+
+	return feeMarketGenState
+}

config/config_testing.go renamed to evmd/cmd/evmd/config/config_testing.go

@@ -11,7 +11,7 @@ import (
 	cmttypes "github.com/cometbft/cometbft/types"
 
 	dbm "github.com/cosmos/cosmos-db"
-	evmconfig "github.com/cosmos/evm/config"
+	"github.com/cosmos/evm/evmd/cmd/evmd/config"
 	feemarkettypes "github.com/cosmos/evm/x/feemarket/types"
 	ibctesting "github.com/cosmos/ibc-go/v10/testing"
 
@@ -43,23 +43,23 @@ func init() {
 
 	// Set the global SDK config for the tests
 	cfg := sdk.GetConfig()
-	evmconfig.SetBech32Prefixes(cfg)
-	evmconfig.SetBip44CoinType(cfg)
+	config.SetBech32Prefixes(cfg)
+	config.SetBip44CoinType(cfg)
 }
 
-func setup(withGenesis bool, invCheckPeriod uint, chainID string, evmChainID uint64) (*EVMD, evmconfig.GenesisState) {
+func setup(withGenesis bool, invCheckPeriod uint, chainID string, evmChainID uint64) (*EVMD, GenesisState) {
 	db := dbm.NewMemDB()
 
 	appOptions := make(simtestutil.AppOptionsMap, 0)
 	appOptions[flags.FlagHome] = defaultNodeHome
 	appOptions[server.FlagInvCheckPeriod] = invCheckPeriod
 
-	app := NewExampleApp(log.NewNopLogger(), db, nil, true, appOptions, evmChainID, evmconfig.EvmAppOptions, baseapp.SetChainID(chainID))
+	app := NewExampleApp(log.NewNopLogger(), db, nil, true, appOptions, evmChainID, config.EvmAppOptions, baseapp.SetChainID(chainID))
 	if withGenesis {
 		return app, app.DefaultGenesis()
 	}
 
-	return app, evmconfig.GenesisState{}
+	return app, GenesisState{}
 }
 
 // Setup initializes a new EVMD. A Nop logger is set in EVMD.
@@ -131,7 +131,7 @@ func SetupTestingApp(chainID string, evmChainID uint64) func() (ibctesting.Testi
 			db, nil, true,
 			simtestutil.NewAppOptionsWithFlagHome(defaultNodeHome),
 			evmChainID,
-			evmconfig.EvmAppOptions,
+			config.EvmAppOptions,
 			baseapp.SetChainID(chainID),
 		)
 		return app, app.DefaultGenesis()