Remove test* denoms and replace with default*

Author: vladjdk

config/config.go

@@ -72,12 +72,6 @@ const (
 	Bech32PrefixConsAddr = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixConsensus
 	// Bech32PrefixConsPub defines the Bech32 prefix of a consensus node public key.
 	Bech32PrefixConsPub = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixConsensus + sdk.PrefixPublic
-	// TestDisplayDenom defines the denomination displayed to users in client applications.
-	TestDisplayDenom = "atom"
-	// TestEvmDenom defines the non-18-decimal denomination
-	TestEvmDenom = "uatom"
-	// TestExtendedDenom defines to the default denomination used in the Cosmos EVM example chain.
-	TestExtendedDenom = "aatom"
 	// BaseDenomUnit defines the precision of the base denomination.
 	BaseDenomUnit = 18
 	// EVMChainID defines the EIP-155 replay-protection chain id for the current ethereum chain config.

evmd/cmd/evmd/cmd/root.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"errors"
 	"github.com/cosmos/evm/config"
+	"github.com/cosmos/evm/x/vm/types"
 	"io"
 	"os"
 
@@ -126,7 +127,7 @@ func NewRootCmd() *cobra.Command {
 				return err
 			}
 
-			customAppTemplate, customAppConfig := config.InitAppConfig(config.TestExtendedDenom, config.EVMChainID) // TODO:VLAD - Remove this
+			customAppTemplate, customAppConfig := config.InitAppConfig(types.DefaultEVMExtendedDenom, config.EVMChainID) // TODO:VLAD - Remove this
 			customTMConfig := initCometConfig()
 
 			return sdkserver.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, customTMConfig)

testutil/ibc/chain.go

@@ -19,7 +19,6 @@ import (
 	cmtversion "github.com/cometbft/cometbft/version"
 
 	"github.com/cosmos/evm"
-	"github.com/cosmos/evm/config"
 	"github.com/cosmos/evm/crypto/ethsecp256k1"
 	"github.com/cosmos/evm/testutil/tx"
 	"github.com/cosmos/evm/x/vm/types"
@@ -138,7 +137,7 @@ func NewTestChainWithValSet(tb testing.TB, isEVM bool, coord *Coordinator, chain
 			Address: acc.GetAddress().String(),
 			Coins: sdk.NewCoins(
 				sdk.NewCoin(sdk.DefaultBondDenom, amount),
-				sdk.NewCoin(config.TestExtendedDenom, amount),
+				sdk.NewCoin(types.DefaultEVMExtendedDenom, amount),
 			),
 		}
 
@@ -157,22 +156,22 @@ func NewTestChainWithValSet(tb testing.TB, isEVM bool, coord *Coordinator, chain
 		Description: "",
 		DenomUnits: []*banktypes.DenomUnit{
 			{
-				Denom:    config.TestExtendedDenom,
+				Denom:    types.DefaultEVMExtendedDenom,
 				Exponent: 0,
 				Aliases:  nil,
 			},
 			{
-				Denom:    config.TestDisplayDenom,
+				Denom:    types.DefaultEVMDisplayDenom,
 				Exponent: 6,
 				Aliases:  nil,
 			},
 		},
-		Base:    config.TestExtendedDenom,
-		Display: config.TestDisplayDenom,
-		Name:    config.TestEvmDenom,
-		Symbol:  config.TestEvmDenom,
-		URI:     config.TestEvmDenom,
-		URIHash: config.TestEvmDenom,
+		Base:    types.DefaultEVMExtendedDenom,
+		Display: types.DefaultEVMDisplayDenom,
+		Name:    types.DefaultEVMDenom,
+		Symbol:  types.DefaultEVMDenom,
+		URI:     types.DefaultEVMDenom,
+		URIHash: types.DefaultEVMDenom,
 	}}
 
 	app := SetupWithGenesisValSet(tb, valSet, genAccs, chainID, sdk.DefaultPowerReduction, metadata, genBals...)

testutil/ibc/helpers.go

@@ -1,6 +1,7 @@
 package ibctesting
 
 import (
+	"github.com/cosmos/evm/x/vm/types"
 	"math/big"
 	"math/rand"
 	"testing"
@@ -10,8 +11,6 @@ import (
 
 	abci "github.com/cometbft/cometbft/abci/types"
 
-	"github.com/cosmos/evm/config"
-
 	bam "github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
@@ -25,7 +24,7 @@ func FeeCoins() sdk.Coins {
 	// Note: evmChain requires for gas price higher than base fee (see fee_checker.go).
 	// Other Cosmos chains using simapp don’t rely on gas prices, so this works even if simapp isn’t aware of evmChain’s TestExtendedDenom.
 	sdkExp := new(big.Int).Exp(big.NewInt(10), big.NewInt(6), nil)
-	return sdk.Coins{sdk.NewInt64Coin(config.TestExtendedDenom, new(big.Int).Mul(big.NewInt(FeeAmt), sdkExp).Int64())}
+	return sdk.Coins{sdk.NewInt64Coin(types.DefaultEVMExtendedDenom, new(big.Int).Mul(big.NewInt(FeeAmt), sdkExp).Int64())}
 }
 
 // SignAndDeliver signs and delivers a transaction. No simulation occurs as the

testutil/ibc/testing_app.go

@@ -11,7 +11,6 @@ import (
 	cmttypes "github.com/cometbft/cometbft/types"
 
 	dbm "github.com/cosmos/cosmos-db"
-	"github.com/cosmos/evm/config"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
 	"github.com/cosmos/ibc-go/v10/modules/core/keeper"
 	ibctesting "github.com/cosmos/ibc-go/v10/testing"
@@ -125,7 +124,7 @@ func setupWithGenesisValSet(tb testing.TB, valSet *cmttypes.ValidatorSet, genAcc
 	genesisState[banktypes.ModuleName] = app.AppCodec().MustMarshalJSON(bankGenesis)
 
 	evmGenesis := evmtypes.DefaultGenesisState()
-	evmGenesis.Params.EvmDenom = config.TestExtendedDenom
+	evmGenesis.Params.EvmDenom = evmtypes.DefaultEVMExtendedDenom
 	evmGenesis.Params.ActiveStaticPrecompiles = evmtypes.AvailableStaticPrecompiles
 	genesisState[evmtypes.ModuleName] = app.AppCodec().MustMarshalJSON(evmGenesis)
 

x/vm/types/params.go

@@ -21,6 +21,8 @@ var (
 	DefaultEVMDenom = "uatom"
 	// DefaultEVMExtendedDenom is the default value for the evm extended denom
 	DefaultEVMExtendedDenom = "aatom"
+	// DefaultEVMDisplayDenom is the default value for the display denom in the bank metadata
+	DefaultEVMDisplayDenom = "atom"
 	// DefaultEVMChainID is the default value for the evm chain ID
 	DefaultEVMChainID uint64 = 262144
 	// DefaultEVMDecimals is the default value for the evm denom decimal precision