refactor!: clean up chain config

ante/cosmos/authz_test.go

@@ -21,9 +21,9 @@ import (
 )
 
 func TestAuthzLimiterDecorator(t *testing.T) {
-	evmConfigurator := evmtypes.NewEVMConfigurator().
+	evmConfigurator := evmtypes.NewEvmConfig().
 		WithEVMCoinInfo(constants.ExampleChainCoinInfo[constants.ExampleChainID])
-	err := evmConfigurator.Configure()
+	err := evmConfigurator.Apply()
 	require.NoError(t, err)
 
 	encodingCfg := encoding.MakeConfig(constants.ExampleChainID.EVMChainID)

config/evm_app_options.go

@@ -53,7 +53,7 @@ func EvmAppOptionsWithConfigWithReset(
 	}
 
 	ethCfg := evmtypes.DefaultChainConfig(chainID)
-	configurator := evmtypes.NewEVMConfigurator()
+	configurator := evmtypes.NewEvmConfig()
 	if withReset {
 		// reset configuration to set the new one
 		configurator.ResetTestConfig()
@@ -63,7 +63,7 @@ func EvmAppOptionsWithConfigWithReset(
 		WithChainConfig(ethCfg).
 		// NOTE: we're using the 18 decimals default for the example chain
 		WithEVMCoinInfo(coinInfo).
-		Configure()
+		Apply()
 	if err != nil {
 		return err
 	}
@@ -79,13 +79,13 @@ func setBaseDenom(ci evmtypes.EvmCoinInfo) (err error) {
 	// So when failing because the denom was already registered, we ignore it and set
 	// the corresponding denom to be base denom
 	defer func() {
-		err = sdk.SetBaseDenom(ci.Denom)
+		err = sdk.SetBaseDenom(ci.GetDenom())
 	}()
 	if err := sdk.RegisterDenom(ci.DisplayDenom, math.LegacyOneDec()); err != nil {
 		return err
 	}
 
 	// sdk.RegisterDenom will automatically overwrite the base denom when the
 	// new setBaseDenom() units are lower than the current base denom's units.
-	return sdk.RegisterDenom(ci.Denom, math.LegacyNewDecWithPrec(1, int64(ci.Decimals)))
+	return sdk.RegisterDenom(ci.GetDenom(), math.LegacyNewDecWithPrec(1, int64(ci.Decimals)))
 }

ethereum/eip712/preprocess_test.go

@@ -56,9 +56,9 @@ type TestCaseStruct struct {
 func TestLedgerPreprocessing(t *testing.T) {
 	// Update bech32 prefix
 	sdk.GetConfig().SetBech32PrefixForAccount(constants.ExampleBech32Prefix, "")
-	evmConfigurator := evmtypes.NewEVMConfigurator().
+	evmConfigurator := evmtypes.NewEvmConfig().
 		WithEVMCoinInfo(constants.ExampleChainCoinInfo[constants.ExampleChainID])
-	err := evmConfigurator.Configure()
+	err := evmConfigurator.Apply()
 	require.NoError(t, err)
 
 	testCases := []TestCaseStruct{

evmd/cmd/evmd/cmd/root.go

@@ -51,6 +51,7 @@ import (
 // NewRootCmd creates a new root command for evmd. It is called once in the
 // main function.
 func NewRootCmd() *cobra.Command {
+	setupSDKConfig()
 	// we "pre"-instantiate the application for getting the injected/configured encoding configuration
 	// and the CLI options for the modules
 	// add keyring to autocli opts
@@ -156,6 +157,12 @@ func NewRootCmd() *cobra.Command {
 	return rootCmd
 }
 
+func setupSDKConfig() {
+	config := sdk.GetConfig()
+	evmdconfig.SetBech32Prefixes(config)
+	config.Seal()
+}
+
 // initCometConfig helps to override default CometBFT Config values.
 // return cmtcfg.DefaultConfig if no custom configuration is required for the application.
 func initCometConfig() *cmtcfg.Config {

evmd/cmd/evmd/config/config.go

@@ -12,24 +12,21 @@ import (
 // chain id
 var ChainsCoinInfo = map[uint64]evmtypes.EvmCoinInfo{
 	EighteenDecimalsChainID: {
-		Denom:         ExampleChainDenom,
-		ExtendedDenom: ExampleChainDenom,
-		DisplayDenom:  ExampleDisplayDenom,
-		Decimals:      evmtypes.EighteenDecimals,
+		DisplayDenom:     ExampleDisplayDenom,
+		Decimals:         evmtypes.EighteenDecimals,
+		ExtendedDecimals: evmtypes.EighteenDecimals,
 	},
 	// SixDecimalsChainID provides a chain ID which is being set up with 6 decimals
 	SixDecimalsChainID: {
-		Denom:         "utest",
-		ExtendedDenom: "atest",
-		DisplayDenom:  "test",
-		Decimals:      evmtypes.SixDecimals,
+		DisplayDenom:     "test",
+		Decimals:         evmtypes.SixDecimals,
+		ExtendedDecimals: evmtypes.EighteenDecimals,
 	},
 	// EVMChainID provides a chain ID used for internal testing
 	EVMChainID: {
-		Denom:         "atest",
-		ExtendedDenom: "atest",
-		DisplayDenom:  "test",
-		Decimals:      evmtypes.EighteenDecimals,
+		DisplayDenom:     "test",
+		Decimals:         evmtypes.EighteenDecimals,
+		ExtendedDecimals: evmtypes.EighteenDecimals,
 	},
 }
 

evmd/cmd/evmd/main.go

@@ -8,21 +8,12 @@ import (
 	evmdconfig "github.com/cosmos/evm/evmd/cmd/evmd/config"
 
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 func main() {
-	setupSDKConfig()
-
 	rootCmd := cmd.NewRootCmd()
 	if err := svrcmd.Execute(rootCmd, "evmd", evmdconfig.MustGetDefaultNodeHome()); err != nil {
 		fmt.Fprintln(rootCmd.OutOrStderr(), err)
 		os.Exit(1)
 	}
 }
-
-func setupSDKConfig() {
-	config := sdk.GetConfig()
-	evmdconfig.SetBech32Prefixes(config)
-	config.Seal()
-}

evmd/eips/README.md

@@ -134,7 +134,7 @@ In this way, even though the custom activators defined $3$ new EIPs, we are goin
 The EVM configuration is the type used to modify the EVM configuration before starting a node. The type is defined as:
 
 ```go
-type EVMConfigurator struct {
+type EvmConfig struct {
 	extendedEIPs             map[int]func(*vm.JumpTable)
 	extendedDefaultExtraEIPs []int64
 	sealed                   bool
@@ -151,18 +151,18 @@ It is important to notice that the configurator will only allow to append new en
 **Cosmos EVM**. The reason behind this choice is to ensure the correct and safe execution of the virtual machine but still
 allowing partners to customize their implementation.
 
-The `EVMConfigurator` type should be constructed using the builder pattern inside the `init()` function of the file so
+The `EvmConfig` type should be constructed using the builder pattern inside the `init()` function of the file so
 that it is run during the creation of the application.
 
 An example of the usage of the configurator is reported below:
 
 ```go
-configurator := evmconfig.NewEVMConfigurator().
+configurator := evmconfig.NewEvmConfig().
     WithExtendedEips(customActivators).
     WithExtendedDefaultExtraEIPs(defaultEnabledEIPs...).
-    Configure()
+    Apply()
 
-err := configurator.Configure()
+err := configurator.Apply()
 ```
 
 Errors are raised when the configurator tries to append an item with the same name of one of the default one. Since

evmd/tests/integration/x_vm_test.go

@@ -35,22 +35,20 @@ func BenchmarkGasEstimation(b *testing.B) {
 	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()
+	extendedDecimals := types.GetEVMCoinExtendedDecimals()
 
-	configurator := types.NewEVMConfigurator()
+	configurator := types.NewEvmConfig()
 	configurator.ResetTestConfig()
 	err := configurator.
 		WithChainConfig(chainConfig).
 		WithEVMCoinInfo(types.EvmCoinInfo{
-			Denom:         denom,
-			ExtendedDenom: extendedDenom,
-			DisplayDenom:  displayDenom,
-			Decimals:      decimals,
+			DisplayDenom:     displayDenom,
+			Decimals:         decimals,
+			ExtendedDecimals: extendedDecimals,
 		}).
-		Configure()
+		Apply()
 	require.NoError(b, err)
 
 	// Use simple transaction args for consistent benchmarking

precompiles/common/balance_handler_test.go

@@ -30,9 +30,9 @@ func setupBalanceHandlerTest(t *testing.T) {
 	t.Helper()
 
 	sdk.GetConfig().SetBech32PrefixForAccount(testconstants.ExampleBech32Prefix, "")
-	configurator := evmtypes.NewEVMConfigurator()
+	configurator := evmtypes.NewEvmConfig()
 	configurator.ResetTestConfig()
-	require.NoError(t, configurator.WithEVMCoinInfo(testconstants.ExampleChainCoinInfo[testconstants.ExampleChainID]).Configure())
+	require.NoError(t, configurator.WithEVMCoinInfo(testconstants.ExampleChainCoinInfo[testconstants.ExampleChainID]).Apply())
 }
 
 func TestParseAddress(t *testing.T) {

tests/integration/ante/ante_test_suite.go

@@ -114,22 +114,20 @@
 	// get the denom and decimals set when initialized the chain
 	// to set them again
 	// when resetting the chain config
-	denom := evmtypes.GetEVMCoinDenom()
-	extendedDenom := evmtypes.GetEVMCoinExtendedDenom()
 	displayDenom := evmtypes.GetEVMCoinDisplayDenom()
 	decimals := evmtypes.GetEVMCoinDecimals()
+	extendedDecimals := evmtypes.GetEVMCoinExtendedDecimals()
 
-	configurator := evmtypes.NewEVMConfigurator()
+	configurator := evmtypes.NewEvmConfig()
 	configurator.ResetTestConfig()
 	err := configurator.
 		WithChainConfig(chainConfig).
 		WithEVMCoinInfo(evmtypes.EvmCoinInfo{
-			Denom:         denom,
-			ExtendedDenom: extendedDenom,
-			DisplayDenom:  displayDenom,
-			Decimals:      decimals,
+			DisplayDenom:     displayDenom,
+			Decimals:         decimals,
+			ExtendedDecimals: extendedDecimals,
 		}).
-		Configure()
+		Apply()
 	s.Require().NoError(err)
 }
 

tests/integration/ante/test_evm_unit_04_validate.go

@@ -244,9 +244,9 @@
 			s.Run(fmt.Sprintf("%s, %s", chainID.ChainID, tc.name), func() {
 				// Call the configurator to set the EVM coin required for the
 				// function to be tested.
-				configurator := evmtypes.NewEVMConfigurator()
+				configurator := evmtypes.NewEvmConfig()
 				configurator.ResetTestConfig()
-				s.Require().NoError(configurator.WithEVMCoinInfo(testconstants.ExampleChainCoinInfo[chainID]).Configure())
+				s.Require().NoError(configurator.WithEVMCoinInfo(testconstants.ExampleChainCoinInfo[chainID]).Apply())
 
 				// If decimals is not 18 decimals, we have to convert txFeeInfo to original
 				// decimals representation.

tests/integration/precompiles/werc20/test_integration.go

@@ -108,11 +108,11 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 			customGenesis[feemarkettypes.ModuleName] = feemarketGenesis
 
 			// Reset evm config here for the standard case
-			configurator := evmtypes.NewEVMConfigurator()
+			configurator := evmtypes.NewEvmConfig()
 			configurator.ResetTestConfig()
 			Expect(configurator.
 				WithEVMCoinInfo(testconstants.ExampleChainCoinInfo[chainId]).
-				Configure()).To(BeNil(), "expected no error setting the evm configurator")
+				Apply()).To(BeNil(), "expected no error setting the evm configurator")
 
 			opts := []network.ConfigOption{
 				network.WithChainID(chainId),

tests/integration/x/precisebank/test_burn_integration.go

@@ -498,10 +498,10 @@ func (s *KeeperIntegrationTestSuite) TestBurnCoinsRandomValueMultiDecimals() {
 }
 
 func FuzzBurnCoins(f *testing.F) {
-	configurator := evmtypes.NewEVMConfigurator()
+	configurator := evmtypes.NewEvmConfig()
 	configurator.ResetTestConfig()
 	configurator.WithEVMCoinInfo(testconstants.ExampleChainCoinInfo[testconstants.SixDecimalsChainID])
-	err := configurator.Configure()
+	err := configurator.Apply()
 	require.NoError(f, err)
 
 	f.Add(int64(0))

tests/integration/x/precisebank/test_mint_integration.go

@@ -415,10 +415,10 @@ func (s *KeeperIntegrationTestSuite) TestMintCoinsRandomValueMultiDecimals() {
 }
 
 func FuzzMintCoins(f *testing.F) {
-	configurator := evmtypes.NewEVMConfigurator()
+	configurator := evmtypes.NewEvmConfig()
 	configurator.ResetTestConfig()
 	configurator.WithEVMCoinInfo(testconstants.ExampleChainCoinInfo[testconstants.SixDecimalsChainID])
-	err := configurator.Configure()
+	err := configurator.Apply()
 	require.NoError(f, err)
 
 	f.Add(int64(0))

tests/integration/x/precisebank/test_send_integration.go

@@ -796,10 +796,10 @@ func (s *KeeperIntegrationTestSuite) TestSendCoinsRandomValueMultiDecimals() {
 }
 
 func FuzzSendCoins(f *testing.F) {
-	configurator := evmtypes.NewEVMConfigurator()
+	configurator := evmtypes.NewEvmConfig()
 	configurator.ResetTestConfig()
 	configurator.WithEVMCoinInfo(testconstants.ExampleChainCoinInfo[testconstants.SixDecimalsChainID])
-	err := configurator.Configure()
+	err := configurator.Apply()
 	require.NoError(f, err)
 
 	f.Add(uint64(100), uint64(0), uint64(2))

tests/integration/x/vm/keeper_test_suite.go

@@ -101,21 +101,19 @@
 	}
 	// get the denom and decimals set on chain initialization
 	// because we'll need to set them again when resetting the chain config
-	denom := evmtypes.GetEVMCoinDenom()
-	extendedDenom := evmtypes.GetEVMCoinExtendedDenom()
 	displayDenom := evmtypes.GetEVMCoinDisplayDenom()
 	decimals := evmtypes.GetEVMCoinDecimals()
+	extendedDecimals := evmtypes.GetEVMCoinExtendedDecimals()
 
-	configurator := evmtypes.NewEVMConfigurator()
+	configurator := evmtypes.NewEvmConfig()
 	configurator.ResetTestConfig()
 	err := configurator.
 		WithChainConfig(chainConfig).
 		WithEVMCoinInfo(evmtypes.EvmCoinInfo{
-			Denom:         denom,
-			ExtendedDenom: extendedDenom,
-			DisplayDenom:  displayDenom,
-			Decimals:      decimals,
+			DisplayDenom:     displayDenom,
+			Decimals:         decimals,
+			ExtendedDecimals: extendedDecimals,
 		}).
-		Configure()
+		Apply()
 	s.Require().NoError(err)
 }

tests/integration/x/vm/test_grpc_query.go

@@ -1602,12 +1602,12 @@ func (s *KeeperTestSuite) TestQueryBaseFee() {
 				chainConfig.CancunTime = &maxInt
 				chainConfig.PragueTime = &maxInt
 
-				configurator := types.NewEVMConfigurator()
+				configurator := types.NewEvmConfig()
 				configurator.ResetTestConfig()
 				err := configurator.
 					WithChainConfig(chainConfig).
 					WithEVMCoinInfo(testconstants.ExampleChainCoinInfo[testconstants.ExampleChainID]).
-					Configure()
+					Apply()
 				s.Require().NoError(err)
 			},
 			true,
@@ -1632,10 +1632,9 @@ func (s *KeeperTestSuite) TestQueryBaseFee() {
 
 	// Save initial configure to restore it between tests
 	coinInfo := types.EvmCoinInfo{
-		Denom:         types.GetEVMCoinDenom(),
-		ExtendedDenom: types.GetEVMCoinExtendedDenom(),
-		DisplayDenom:  types.GetEVMCoinDisplayDenom(),
-		Decimals:      types.GetEVMCoinDecimals(),
+		DisplayDenom:     types.GetEVMCoinDisplayDenom(),
+		Decimals:         types.GetEVMCoinDecimals(),
+		ExtendedDecimals: types.GetEVMCoinExtendedDecimals(),
 	}
 	chainConfig := types.DefaultChainConfig(s.Network.GetEIP155ChainID().Uint64())
 
@@ -1658,12 +1657,12 @@ func (s *KeeperTestSuite) TestQueryBaseFee() {
 				s.Require().Error(err)
 			}
 			s.Require().NoError(s.Network.NextBlock())
-			configurator := types.NewEVMConfigurator()
+			configurator := types.NewEvmConfig()
 			configurator.ResetTestConfig()
 			err = configurator.
 				WithChainConfig(chainConfig).
 				WithEVMCoinInfo(coinInfo).
-				Configure()
+				Apply()
 			s.Require().NoError(err)
 		})
 	}

testutil/config/config.go

@@ -12,16 +12,14 @@ import (
 // chain id
 var ChainsCoinInfo = map[uint64]evmtypes.EvmCoinInfo{
 	EighteenDecimalsChainID: {
-		Denom:         ExampleChainDenom,
-		ExtendedDenom: ExampleChainDenom,
-		DisplayDenom:  ExampleDisplayDenom,
-		Decimals:      evmtypes.EighteenDecimals,
+		DisplayDenom:     ExampleDisplayDenom,
+		Decimals:         evmtypes.EighteenDecimals,
+		ExtendedDecimals: evmtypes.EighteenDecimals,
 	},
 	EVMChainID: {
-		Denom:         ExampleChainDenom,
-		ExtendedDenom: ExampleChainDenom,
-		DisplayDenom:  ExampleDisplayDenom,
-		Decimals:      evmtypes.EighteenDecimals,
+		DisplayDenom:     ExampleDisplayDenom,
+		Decimals:         evmtypes.EighteenDecimals,
+		ExtendedDecimals: evmtypes.EighteenDecimals,
 	},
 }