refactor: remove global variables

ante/cosmos.go

@@ -16,7 +16,7 @@ func newCosmosAnteHandler(ctx sdk.Context, options HandlerOptions) sdk.AnteHandl
 	feemarketParams := options.FeeMarketKeeper.GetParams(ctx)
 	var txFeeChecker ante.TxFeeChecker
 	if options.DynamicFeeChecker {
-		txFeeChecker = evmante.NewDynamicFeeChecker(&feemarketParams)
+		txFeeChecker = evmante.NewDynamicFeeChecker(options.EvmKeeper, &feemarketParams)
 	}
 
 	return sdk.ChainAnteDecorators(
@@ -30,7 +30,7 @@ func newCosmosAnteHandler(ctx sdk.Context, options HandlerOptions) sdk.AnteHandl
 		ante.NewValidateBasicDecorator(),
 		ante.NewTxTimeoutHeightDecorator(),
 		ante.NewValidateMemoDecorator(options.AccountKeeper),
-		cosmosante.NewMinGasPriceDecorator(&feemarketParams),
+		cosmosante.NewMinGasPriceDecorator(&feemarketParams, options.EvmKeeper),
 		ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
 		ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, txFeeChecker),
 		// SetPubKeyDecorator must be called before all signature verification decorators

ante/cosmos/min_gas_price.go

@@ -5,8 +5,8 @@ import (
 	"math/big"
 	"slices"
 
+	anteinterfaces "github.com/cosmos/evm/ante/interfaces"
 	feemarkettypes "github.com/cosmos/evm/x/feemarket/types"
-	evmtypes "github.com/cosmos/evm/x/vm/types"
 
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/math"
@@ -22,12 +22,16 @@ import (
 // CONTRACT: Tx must implement FeeTx to use MinGasPriceDecorator
 type MinGasPriceDecorator struct {
 	feemarketParams *feemarkettypes.Params
+	evmKeeper       anteinterfaces.EVMKeeper
 }
 
 // NewMinGasPriceDecorator creates a new MinGasPriceDecorator instance used only for
 // Cosmos transactions.
-func NewMinGasPriceDecorator(feemarketParams *feemarkettypes.Params) MinGasPriceDecorator {
-	return MinGasPriceDecorator{feemarketParams}
+func NewMinGasPriceDecorator(feemarketParams *feemarkettypes.Params, evmKeeper anteinterfaces.EVMKeeper) MinGasPriceDecorator {
+	return MinGasPriceDecorator{
+		feemarketParams: feemarketParams,
+		evmKeeper:       evmKeeper,
+	}
 }
 
 func (mpd MinGasPriceDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
@@ -39,7 +43,7 @@ func (mpd MinGasPriceDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
 	minGasPrice := mpd.feemarketParams.MinGasPrice
 
 	feeCoins := feeTx.GetFee()
-	evmDenom := evmtypes.GetEVMCoinDenom()
+	evmDenom := mpd.evmKeeper.EvmCoinInfo().Denom
 
 	// only allow user to pass in aatom and stake native token as transaction fees
 	// allow use stake native tokens for fees is just for unit tests to pass

ante/evm/05_signature_verification.go

@@ -32,7 +32,7 @@ func NewEthSigVerificationDecorator(ek anteinterfaces.EVMKeeper) EthSigVerificat
 // Failure in RecheckTx will prevent tx to be included into block, especially when CheckTx succeed, in which case user
 // won't see the error message.
 func (esvd EthSigVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
-	ethCfg := evmtypes.GetEthChainConfig()
+	ethCfg := esvd.evmKeeper.EthChainConfig()
 	blockNum := big.NewInt(ctx.BlockHeight())
 	signer := ethtypes.MakeSigner(ethCfg, blockNum, uint64(ctx.BlockTime().Unix())) //#nosec G115 -- int overflow is not a concern here
 

ante/evm/10_gas_wanted.go

@@ -6,7 +6,6 @@ import (
 	anteinterfaces "github.com/cosmos/evm/ante/interfaces"
 	"github.com/cosmos/evm/ante/types"
 	feemarkettypes "github.com/cosmos/evm/x/feemarket/types"
-	evmtypes "github.com/cosmos/evm/x/vm/types"
 
 	errorsmod "cosmossdk.io/errors"
 
@@ -37,7 +36,7 @@ func NewGasWantedDecorator(
 }
 
 func (gwd GasWantedDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
-	ethCfg := evmtypes.GetEthChainConfig()
+	ethCfg := gwd.evmKeeper.EthChainConfig()
 
 	blockHeight := big.NewInt(ctx.BlockHeight())
 	isLondon := ethCfg.IsLondon(blockHeight)

ante/evm/fee_checker.go

@@ -2,9 +2,8 @@
 
 import (
 	"math"
 
-	"github.com/ethereum/go-ethereum/params"
-
+	anteinterfaces "github.com/cosmos/evm/ante/interfaces"
 	cosmosevmtypes "github.com/cosmos/evm/ante/types"
 	feemarkettypes "github.com/cosmos/evm/x/feemarket/types"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
@@ -15,6 +14,7 @@
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
 	authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
+	gethparams "github.com/ethereum/go-ethereum/params"
 )
 
 // NewDynamicFeeChecker returns a `TxFeeChecker` that applies a dynamic fee to
@@ -25,7 +25,7 @@
 // - when `ExtensionOptionDynamicFeeTx` is omitted, `tipFeeCap` defaults to `MaxInt64`.
 // - when london hardfork is not enabled, it falls back to SDK default behavior (validator min-gas-prices).
 // - Tx priority is set to `effectiveGasPrice / DefaultPriorityReduction`.
-func NewDynamicFeeChecker(feemarketParams *feemarkettypes.Params) authante.TxFeeChecker {
+func NewDynamicFeeChecker(evmKeeper anteinterfaces.EVMKeeper, feemarketParams *feemarkettypes.Params) authante.TxFeeChecker {
 	return func(ctx sdk.Context, tx sdk.Tx) (sdk.Coins, int64, error) {
 		feeTx, ok := tx.(sdk.FeeTx)
 		if !ok {
@@ -37,8 +37,12 @@
 			// genesis transactions: fallback to min-gas-price logic
 			return checkTxFeeWithValidatorMinGasPrices(ctx, feeTx)
 		}
-		denom := evmtypes.GetEVMCoinDenom()
-		ethCfg := evmtypes.GetEthChainConfig()
+		ethCfg := evmKeeper.EthChainConfig()
+		coinInfo := evmKeeper.EvmCoinInfo()
+		denom := coinInfo.Denom
+		if denom == "" {
+			denom = evmtypes.DefaultEVMDenom
+		}
 
 		return FeeChecker(ctx, feemarketParams, denom, ethCfg, feeTx)
 	}
@@ -49,7 +53,7 @@
 	ctx sdk.Context,
 	feemarketParams *feemarkettypes.Params,
 	denom string,
-	ethConfig *params.ChainConfig,
+	ethConfig *gethparams.ChainConfig,
 	feeTx sdk.FeeTx,
 ) (sdk.Coins, int64, error) {
 	if !evmtypes.IsLondon(ethConfig, ctx.BlockHeight()) {

ante/evm/fee_checker_test.go

@@ -34,25 +34,8 @@
 	//      without extension option
 	//      london hardfork enableness
 	chainID := uint64(testconstants.EighteenDecimalsChainID)
 	encodingConfig := encoding.MakeConfig(chainID) //nolint:staticcheck // this is used
 
-	configurator := evmtypes.NewEVMConfigurator()
-	configurator.ResetTestConfig()
-	// set global chain config
-	ethCfg := evmtypes.DefaultChainConfig(chainID)
-	if err := evmtypes.SetChainConfig(ethCfg); err != nil {
-		panic(err)
-	}
-	err := configurator.
-		WithExtendedEips(evmtypes.DefaultCosmosEVMActivators).
-		// NOTE: we're using the 18 decimals default for the example chain
-		WithEVMCoinInfo(testconstants.ChainsCoinInfo[chainID]).
-		Configure()
-	require.NoError(t, err)
-	if err != nil {
-		panic(err)
-	}
-
 	evmDenom := evmtypes.GetEVMCoinDenom()
 	minGasPrices := sdk.NewDecCoins(sdk.NewDecCoin(evmDenom, math.NewInt(10)))
 
@@ -251,14 +234,17 @@
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			cfg := evmtypes.GetEthChainConfig()
+			evmKeeper := NewExtendedEVMKeeper()
+			chainCfg := evmKeeper.ChainConfig()
+			ethCfg := chainCfg.EthereumConfig(nil)
 			if !tc.londonEnabled {
-				cfg.LondonBlock = big.NewInt(10000)
+				ethCfg.LondonBlock = big.NewInt(10000)
 			} else {
-				cfg.LondonBlock = big.NewInt(0)
+				ethCfg.LondonBlock = big.NewInt(0)
 			}
+
 			feemarketParams := tc.feemarketParamsFn()
-			fees, priority, err := evm.NewDynamicFeeChecker(&feemarketParams)(tc.ctx, tc.buildTx())
+			fees, priority, err := evm.NewDynamicFeeChecker(evmKeeper, &feemarketParams)(tc.ctx, tc.buildTx())
 			if tc.expSuccess {
 				require.Equal(t, tc.expFees, fees.String())
 				require.Equal(t, tc.expPriority, priority)

ante/evm/mono_decorator.go

@@ -76,7 +76,10 @@ func (md MonoDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, ne
 		}
 	}
 
-	evmDenom := evmtypes.GetEVMCoinDenom()
+	evmDenom := md.evmKeeper.EvmCoinInfo().Denom
+	if evmDenom == "" {
+		evmDenom = evmtypes.DefaultEVMDenom
+	}
 
 	// 1. setup ctx
 	ctx, err = SetupContextAndResetTransientGas(ctx, tx, md.evmKeeper)
@@ -112,7 +115,7 @@ func (md MonoDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, ne
 		Difficulty: big.NewInt(0),
 	}
 
-	chainConfig := evmtypes.GetEthChainConfig()
+	chainConfig := md.evmKeeper.EthChainConfig()
 
 	if err := txpool.ValidateTransaction(ethTx, &header, decUtils.Signer, &txpool.ValidationOptions{
 		Config:  chainConfig,

ante/evm/mono_decorator_test.go

@@ -121,7 +121,8 @@
 	msg := evmsdktypes.NewTx(args)
 	fromAddr := common.BytesToAddress(privKey.PubKey().Address().Bytes())
 	msg.From = fromAddr.Bytes()
-	ethSigner := ethtypes.LatestSignerForChainID(evmsdktypes.GetEthChainConfig().ChainID)
+	chainID := evmsdktypes.DefaultEVMChainID
+	ethSigner := ethtypes.LatestSignerForChainID(big.NewInt(int64(chainID)))
 	require.NoError(t, msg.Sign(ethSigner, utiltx.NewSigner(privKey)))
 	return msg
 }
@@ -196,23 +197,6 @@
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			configurator := evmsdktypes.NewEVMConfigurator()
-			configurator.ResetTestConfig()
-			chainConfig := evmsdktypes.DefaultChainConfig(evmsdktypes.DefaultEVMChainID)
-			err := evmsdktypes.SetChainConfig(chainConfig)
-			require.NoError(t, err)
-			coinInfo := evmsdktypes.EvmCoinInfo{
-				Denom:         evmsdktypes.DefaultEVMExtendedDenom,
-				ExtendedDenom: evmsdktypes.DefaultEVMExtendedDenom,
-				DisplayDenom:  evmsdktypes.DefaultEVMDisplayDenom,
-				Decimals:      18,
-			}
-			err = configurator.
-				WithExtendedEips(evmsdktypes.DefaultCosmosEVMActivators).
-				// NOTE: we're using the 18 decimals default for the example chain
-				WithEVMCoinInfo(coinInfo).
-				Configure()
-			require.NoError(t, err)
 			privKey, _ := ethsecp256k1.GenerateKey()
 			keeper, cosmosAddr := setupFundedKeeper(t, privKey)
 			accountKeeper := MockAccountKeeper{FundedAddr: cosmosAddr}
@@ -223,8 +207,9 @@
 			ctx := sdk.NewContext(nil, tmproto.Header{}, false, log.NewNopLogger())
 			ctx = ctx.WithBlockGasMeter(storetypes.NewGasMeter(1e19))
 
+			evmChainID := big.NewInt(int64(evmsdktypes.DefaultEVMChainID))
 			msgs := tc.buildMsgs(privKey)
-			tx, err := utiltx.PrepareEthTx(cfg.TxConfig, nil, toMsgSlice(msgs)...)
+			tx, err := utiltx.PrepareEthTx(cfg.TxConfig, nil, evmChainID, toMsgSlice(msgs)...)
 			require.NoError(t, err)
 
 			newCtx, err := monoDec.AnteHandle(ctx, tx, tc.simulate, func(ctx sdk.Context, _ sdk.Tx, _ bool) (sdk.Context, error) { return ctx, nil })

ante/evm/utils.go

@@ -5,7 +5,8 @@
 	"math/big"
 
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/params"
+	gethparams "github.com/ethereum/go-ethereum/params"
 
 	anteinterfaces "github.com/cosmos/evm/ante/interfaces"
 	feemarkettypes "github.com/cosmos/evm/x/feemarket/types"
@@ -33,6 +34,11 @@
 	TxFee              *big.Int
 }
 
+type chainConfigProvider interface {
+	EthChainConfig() *gethparams.ChainConfig
+	ChainConfig() *evmtypes.ChainConfig
+}
+
 // NewMonoDecoratorUtils returns a new DecoratorUtils instance.
 //
 // These utilities are extracted once at the beginning of the ante handle process,
@@ -47,8 +53,9 @@
 	evmParams *evmtypes.Params,
 	feemarketParams *feemarkettypes.Params,
 ) (*DecoratorUtils, error) {
-	ethCfg := evmtypes.GetEthChainConfig()
-	evmDenom := evmtypes.GetEVMCoinDenom()
+	ethCfg := ek.EthChainConfig()
+	evmDenom := ek.EvmCoinInfo().Denom
+
 	blockHeight := big.NewInt(ctx.BlockHeight())
 	rules := ethCfg.Rules(blockHeight, true, uint64(ctx.BlockTime().Unix())) //#nosec G115 -- int overflow is not a concern here
 	baseFee := evmtypes.GetBaseFee(ctx.BlockHeight(), ethCfg, feemarketParams)

ante/interfaces/evm.go

@@ -5,6 +5,7 @@ import (
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/ethereum/go-ethereum/core/vm"
+	gethparams "github.com/ethereum/go-ethereum/params"
 	"github.com/holiman/uint256"
 
 	feemarkettypes "github.com/cosmos/evm/x/feemarket/types"
@@ -26,6 +27,9 @@ type EVMKeeper interface {
 	ResetTransientGasUsed(ctx sdk.Context)
 	GetTxIndexTransient(ctx sdk.Context) uint64
 	GetParams(ctx sdk.Context) evmtypes.Params
+	ChainConfig() *evmtypes.ChainConfig
+	EthChainConfig() *gethparams.ChainConfig
+	EvmCoinInfo() evmtypes.EvmCoinInfo
 }
 
 // FeeMarketKeeper exposes the required feemarket keeper interface required for ante handlers

evmd/app.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"os"
 
-
 	"github.com/spf13/cast"
 
 	// Force-load the tracer engines to trigger registration due to Go-Ethereum v1.10.15 changes
@@ -803,6 +802,10 @@ func (app *EVMD) RegisterPendingTxListener(listener func(common.Hash)) {
 	app.pendingTxListeners = append(app.pendingTxListeners, listener)
 }
 
+func (app *EVMD) RuntimeConfig() *evmtypes.RuntimeConfig {
+	return app.EVMKeeper.RuntimeConfig()
+}
+
 func (app *EVMD) setPostHandler() {
 	postHandler, err := posthandler.NewPostHandler(
 		posthandler.HandlerOptions{},

evmd/mempool.go

@@ -2,6 +2,7 @@ package evmd
 
 import (
 	"fmt"
+
 	"github.com/cosmos/evm/server"
 
 	"cosmossdk.io/log"
@@ -11,12 +12,11 @@ import (
 	sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
 
 	evmmempool "github.com/cosmos/evm/mempool"
-	evmtypes "github.com/cosmos/evm/x/vm/types"
 )
 
 // configureEVMMempool sets up the EVM mempool and related handlers using viper configuration.
 func (app *EVMD) configureEVMMempool(appOpts servertypes.AppOptions, logger log.Logger) error {
-	if evmtypes.GetChainConfig() == nil {
+	if app.EVMKeeper.ChainConfig() == nil {
 		logger.Debug("evm chain config is not set, skipping mempool configuration")
 		return nil
 	}

evmd/tests/integration/x_vm_test.go

@@ -32,28 +32,6 @@ func BenchmarkGasEstimation(b *testing.B) {
 	// gh := grpc.NewIntegrationHandler(nw)
 	// tf := factory.New(nw, gh)
 
-	chainConfig := types.DefaultChainConfig(nw.GetEIP155ChainID().Uint64())
-	// get the denom and decimals set on chain initialization
-	// because we'll need to set them again when resetting the chain config
-	denom := types.GetEVMCoinDenom()
-	extendedDenom := types.GetEVMCoinExtendedDenom()
-	displayDenom := types.GetEVMCoinDisplayDenom()
-	decimals := types.GetEVMCoinDecimals()
-
-	configurator := types.NewEVMConfigurator()
-	configurator.ResetTestConfig()
-	err := types.SetChainConfig(chainConfig)
-	require.NoError(b, err)
-	err = configurator.
-		WithEVMCoinInfo(types.EvmCoinInfo{
-			Denom:         denom,
-			ExtendedDenom: extendedDenom,
-			DisplayDenom:  displayDenom,
-			Decimals:      decimals.Uint32(),
-		}).
-		Configure()
-	require.NoError(b, err)
-
 	// Use simple transaction args for consistent benchmarking
 	args := types.TransactionArgs{
 		To: &common.Address{},

evmd/testutil/abci.go

@@ -94,8 +94,9 @@ func DeliverEthTx(
 	msgs ...sdk.Msg,
 ) (abci.ExecTxResult, error) {
 	txConfig := exampleApp.GetTxConfig()
+	evmChainID := exampleApp.GetEVMKeeper().EvmChainID()
 
-	tx, err := tx.PrepareEthTx(txConfig, priv, msgs...)
+	tx, err := tx.PrepareEthTx(txConfig, priv, evmChainID, msgs...)
 	if err != nil {
 		return abci.ExecTxResult{}, err
 	}
@@ -121,8 +122,9 @@ func DeliverEthTxWithoutCheck(
 	msgs ...sdk.Msg,
 ) (abci.ExecTxResult, error) {
 	txConfig := exampleApp.GetTxConfig()
+	evmChainID := exampleApp.GetEVMKeeper().EvmChainID()
 
-	tx, err := tx.PrepareEthTx(txConfig, priv, msgs...)
+	tx, err := tx.PrepareEthTx(txConfig, priv, evmChainID, msgs...)
 	if err != nil {
 		return abci.ExecTxResult{}, err
 	}
@@ -170,8 +172,9 @@ func CheckEthTx(
 	msgs ...sdk.Msg,
 ) (abci.ResponseCheckTx, error) {
 	txConfig := exampleApp.GetTxConfig()
+	evmChainID := exampleApp.GetEVMKeeper().EvmChainID()
 
-	tx, err := tx.PrepareEthTx(txConfig, priv, msgs...)
+	tx, err := tx.PrepareEthTx(txConfig, priv, evmChainID, msgs...)
 	if err != nil {
 		return abci.ResponseCheckTx{}, err
 	}