refactor(ethereum): rename module to EVM (#528)

This commit renames the  `ethereum` package/module to `evm`

.gitignore

@@ -17,5 +17,5 @@
 
 /bin/
 /.vscode/
-/x/ethereum/client/cli/testdata/
+/x/evm/client/cli/testdata/
 /node_modules/

app/app.go

@@ -86,9 +86,9 @@ import (
 	"github.com/axelarnetwork/axelar-core/x/broadcast"
 	broadcastKeeper "github.com/axelarnetwork/axelar-core/x/broadcast/keeper"
 	broadcastTypes "github.com/axelarnetwork/axelar-core/x/broadcast/types"
-	"github.com/axelarnetwork/axelar-core/x/ethereum"
-	ethKeeper "github.com/axelarnetwork/axelar-core/x/ethereum/keeper"
-	ethTypes "github.com/axelarnetwork/axelar-core/x/ethereum/types"
+	"github.com/axelarnetwork/axelar-core/x/evm"
+	evmKeeper "github.com/axelarnetwork/axelar-core/x/evm/keeper"
+	evmTypes "github.com/axelarnetwork/axelar-core/x/evm/types"
 	"github.com/axelarnetwork/axelar-core/x/nexus"
 	nexusKeeper "github.com/axelarnetwork/axelar-core/x/nexus/keeper"
 	nexusTypes "github.com/axelarnetwork/axelar-core/x/nexus/types"
@@ -136,7 +136,7 @@ var (
 		tss.AppModuleBasic{},
 		vote.AppModuleBasic{},
 		bitcoin.AppModuleBasic{},
-		ethereum.AppModuleBasic{},
+		evm.AppModuleBasic{},
 		broadcast.AppModuleBasic{},
 		snapshot.AppModuleBasic{},
 		nexus.AppModuleBasic{},
@@ -226,7 +226,7 @@ func NewAxelarApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 		voteTypes.StoreKey,
 		broadcastTypes.StoreKey,
 		btcTypes.StoreKey,
-		ethTypes.StoreKey,
+		evmTypes.StoreKey,
 		snapTypes.StoreKey,
 		tssTypes.StoreKey,
 		nexusTypes.StoreKey,
@@ -307,8 +307,8 @@ func NewAxelarApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 	btcK := btcKeeper.NewKeeper(
 		appCodec, keys[btcTypes.StoreKey], app.getSubspace(btcTypes.ModuleName),
 	)
-	ethK := ethKeeper.NewKeeper(
-		appCodec, keys[ethTypes.StoreKey], app.getSubspace(ethTypes.ModuleName),
+	ethK := evmKeeper.NewKeeper(
+		appCodec, keys[evmTypes.StoreKey], app.getSubspace(evmTypes.ModuleName),
 	)
 
 	broadcastK := broadcastKeeper.NewKeeper(app.legacyAmino, keys[broadcastTypes.StoreKey], stakingK)
@@ -334,16 +334,16 @@ func NewAxelarApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 		app.legacyAmino, keys[voteTypes.StoreKey], snapK, broadcastK,
 	)
 
-	var rpcEth ethTypes.RPCClient
+	var rpcEth evmTypes.RPCClient
 	var err error
 	if axelarCfg.WithEthBridge {
-		rpcEth, err = ethTypes.NewRPCClient(axelarCfg.EthRPCAddr)
+		rpcEth, err = evmTypes.NewRPCClient(axelarCfg.EthRPCAddr)
 		if err != nil {
 			tmos.Exit(err.Error())
 		}
-		logger.With("module", fmt.Sprintf("x/%s", ethTypes.ModuleName)).Debug("Successfully connected to ethereum node")
+		logger.With("module", fmt.Sprintf("x/%s", evmTypes.ModuleName)).Debug("Successfully connected to ethereum node")
 	} else {
-		rpcEth = ethTypes.NewDummyRPC()
+		rpcEth = evmTypes.NewDummyRPC()
 	}
 
 	rpcBtc, err := btcRPC.NewRPCClient(axelarCfg.BtcConfig, logger)
@@ -379,7 +379,7 @@ func NewAxelarApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 		vote.NewAppModule(votingK),
 		broadcast.NewAppModule(broadcastK),
 		nexus.NewAppModule(nexusK),
-		ethereum.NewAppModule(ethK, votingK, tssK, nexusK, snapK, rpcEth),
+		evm.NewAppModule(ethK, votingK, tssK, nexusK, snapK, rpcEth),
 		bitcoin.NewAppModule(btcK, votingK, tssK, nexusK, snapK, rpcBtc),
 	)
 
@@ -409,7 +409,7 @@ func NewAxelarApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 		snapTypes.ModuleName,
 		tssTypes.ModuleName,
 		btcTypes.ModuleName,
-		ethTypes.ModuleName,
+		evmTypes.ModuleName,
 		nexusTypes.ModuleName,
 		broadcastTypes.ModuleName,
 		voteTypes.ModuleName,
@@ -470,7 +470,7 @@ func initParamsKeeper(appCodec codec.Marshaler, legacyAmino *codec.LegacyAmino,
 	paramsKeeper.Subspace(snapTypes.ModuleName)
 	paramsKeeper.Subspace(tssTypes.ModuleName)
 	paramsKeeper.Subspace(btcTypes.ModuleName)
-	paramsKeeper.Subspace(ethTypes.ModuleName)
+	paramsKeeper.Subspace(evmTypes.ModuleName)
 	paramsKeeper.Subspace(nexusTypes.ModuleName)
 
 	return paramsKeeper

app/config.go

@@ -3,13 +3,13 @@ package app
 import (
 	bitcoin "github.com/axelarnetwork/axelar-core/x/bitcoin/types"
 	broadcast "github.com/axelarnetwork/axelar-core/x/broadcast/types"
-	ethereum "github.com/axelarnetwork/axelar-core/x/ethereum/types"
+	evm "github.com/axelarnetwork/axelar-core/x/evm/types"
 	tss "github.com/axelarnetwork/axelar-core/x/tss/types"
 )
 
 // Config contains all necessary application configurations
 type Config struct {
-	ethereum.EthConfig     `mapstructure:"axelar_bridge_eth"`
+	evm.EthConfig          `mapstructure:"axelar_bridge_eth"`
 	bitcoin.BtcConfig      `mapstructure:"axelar_bridge_btc"`
 	tss.TssConfig          `mapstructure:",squash"`
 	broadcast.ClientConfig `mapstructure:",squash"`
@@ -18,7 +18,7 @@ type Config struct {
 // DefaultConfig returns a configurations populated with default values
 func DefaultConfig() Config {
 	return Config{
-		EthConfig:    ethereum.DefaultConfig(),
+		EthConfig:    evm.DefaultConfig(),
 		BtcConfig:    bitcoin.DefaultConfig(),
 		TssConfig:    tss.TssConfig{},
 		ClientConfig: broadcast.ClientConfig{},

cmd/axelard/cmd/gencontracts.go

@@ -12,7 +12,7 @@ import (
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	"github.com/spf13/cobra"
 
-	ethereumTypes "github.com/axelarnetwork/axelar-core/x/ethereum/types"
+	evmTypes "github.com/axelarnetwork/axelar-core/x/evm/types"
 )
 
 const (
@@ -21,13 +21,13 @@ const (
 	flagBurnable = "burnable"
 )
 
-// SetGenesisEthContractsCmd returns set-genesis-chain-params cobra Command.
-func SetGenesisEthContractsCmd(defaultNodeHome string) *cobra.Command {
+// SetGenesisEVMContractsCmd returns set-genesis-chain-params cobra Command.
+func SetGenesisEVMContractsCmd(defaultNodeHome string) *cobra.Command {
 	var gatewayFile, tokenFile, burnableFile string
 
 	cmd := &cobra.Command{
-		Use:   "set-genesis-ethereum-contracts",
-		Short: "Set the ethereum's contract parameters in genesis.json",
+		Use:   "set-genesis-evm-contracts",
+		Short: "Set the EVM's contract parameters in genesis.json",
 		Args:  cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
@@ -44,7 +44,7 @@ func SetGenesisEthContractsCmd(defaultNodeHome string) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("failed to unmarshal genesis state: %w", err)
 			}
-			genesisState := ethereumTypes.GetGenesisStateFromAppState(cdc, appState)
+			genesisState := evmTypes.GetGenesisStateFromAppState(cdc, appState)
 
 			if gatewayFile != "" {
 				gateway, err := getByteCodes(gatewayFile)
@@ -74,7 +74,7 @@ func SetGenesisEthContractsCmd(defaultNodeHome string) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("failed to marshal ethereum genesis state: %w", err)
 			}
-			appState[ethereumTypes.ModuleName] = genesisStateBz
+			appState[evmTypes.ModuleName] = genesisStateBz
 			appStateJSON, err := json.Marshal(appState)
 			if err != nil {
 				return fmt.Errorf("failed to marshal application genesis state: %w", err)

cmd/axelard/cmd/gennetwork.go

@@ -12,8 +12,8 @@ import (
 
 	btc "github.com/axelarnetwork/axelar-core/x/bitcoin/exported"
 	bitcoinTypes "github.com/axelarnetwork/axelar-core/x/bitcoin/types"
-	eth "github.com/axelarnetwork/axelar-core/x/ethereum/exported"
-	ethereumTypes "github.com/axelarnetwork/axelar-core/x/ethereum/types"
+	evm "github.com/axelarnetwork/axelar-core/x/evm/exported"
+	evmTypes "github.com/axelarnetwork/axelar-core/x/evm/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/server"
@@ -79,12 +79,12 @@ func SetGenesisChainParamsCmd(defaultNodeHome string) *cobra.Command {
 				if err != nil {
 					return fmt.Errorf("failed to marshal bitcoin genesis state: %w", err)
 				}
-			case strings.ToLower(eth.Ethereum.Name):
-				genesisState := ethereumTypes.GetGenesisStateFromAppState(cdc, appState)
-				moduleName = ethereumTypes.ModuleName
+			case strings.ToLower(evm.Ethereum.Name):
+				genesisState := evmTypes.GetGenesisStateFromAppState(cdc, appState)
+				moduleName = evmTypes.ModuleName
 
 				if networkStr != "" {
-					network, err := ethereumTypes.NetworkFromStr(networkStr)
+					network, err := evmTypes.NetworkFromStr(networkStr)
 					if err != nil {
 						return err
 					}

cmd/axelard/cmd/root.go

@@ -123,7 +123,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 		SetGenesisVoteCmd(app.DefaultNodeHome),
 		SetGenesisTSSCmd(app.DefaultNodeHome),
 		SetGenesisSnapshotCmd(app.DefaultNodeHome),
-		SetGenesisEthContractsCmd(app.DefaultNodeHome),
+		SetGenesisEVMContractsCmd(app.DefaultNodeHome),
 		SetGenesisChainParamsCmd(app.DefaultNodeHome),
 		AddGenesisEVMChainCmd(app.DefaultNodeHome),
 	)

cmd/axelard/cmd/vald/eth/eth.go

@@ -18,8 +18,8 @@ import (
 	types2 "github.com/axelarnetwork/axelar-core/cmd/axelard/cmd/vald/broadcast/types"
 	rpc2 "github.com/axelarnetwork/axelar-core/cmd/axelard/cmd/vald/eth/rpc"
 	btc "github.com/axelarnetwork/axelar-core/x/bitcoin/types"
-	"github.com/axelarnetwork/axelar-core/x/ethereum/types"
-	ethTypes "github.com/axelarnetwork/axelar-core/x/ethereum/types"
+	"github.com/axelarnetwork/axelar-core/x/evm/types"
+	evmTypes "github.com/axelarnetwork/axelar-core/x/evm/types"
 	vote "github.com/axelarnetwork/axelar-core/x/vote/exported"
 )
 
@@ -65,7 +65,7 @@ func (mgr Mgr) ProcessDepositConfirmation(attributes []sdk.Attribute) (err error
 		return true
 	})
 
-	msg := &ethTypes.VoteConfirmDepositRequest{
+	msg := &evmTypes.VoteConfirmDepositRequest{
 		Sender:      mgr.sender,
 		Poll:        poll,
 		TxID:        types.Hash(txID),
@@ -92,7 +92,7 @@ func (mgr Mgr) ProcessTokenConfirmation(attributes []sdk.Attribute) error {
 		return true
 	})
 
-	msg := &ethTypes.VoteConfirmTokenRequest{
+	msg := &evmTypes.VoteConfirmTokenRequest{
 		Sender:    mgr.sender,
 		Poll:      poll,
 		TxID:      types.Hash(txID),
@@ -114,30 +114,30 @@ func parseDepositConfirmationParams(cdc *codec.LegacyAmino, attributes []sdk.Att
 	var txIDFound, amountFound, burnAddrFound, tokenAddrFound, confHeightFound, pollFound bool
 	for _, attribute := range attributes {
 		switch attribute.Key {
-		case ethTypes.AttributeKeyTxID:
+		case evmTypes.AttributeKeyTxID:
 			txID = common.HexToHash(attribute.Value)
 			txIDFound = true
-		case ethTypes.AttributeKeyAmount:
+		case evmTypes.AttributeKeyAmount:
 			amount, err = sdk.ParseUint(attribute.Value)
 			if err != nil {
 				return [32]byte{}, sdk.Uint{}, [20]byte{}, [20]byte{}, 0, vote.PollMeta{},
 					sdkerrors.Wrap(err, "parsing transfer amount failed")
 			}
 			amountFound = true
-		case ethTypes.AttributeKeyBurnAddress:
+		case evmTypes.AttributeKeyBurnAddress:
 			burnAddr = common.HexToAddress(attribute.Value)
 			burnAddrFound = true
-		case ethTypes.AttributeKeyTokenAddress:
+		case evmTypes.AttributeKeyTokenAddress:
 			tokenAddr = common.HexToAddress(attribute.Value)
 			tokenAddrFound = true
-		case ethTypes.AttributeKeyConfHeight:
+		case evmTypes.AttributeKeyConfHeight:
 			confHeight, err = strconv.ParseUint(attribute.Value, 10, 64)
 			if err != nil {
 				return common.Hash{}, sdk.Uint{}, common.Address{}, common.Address{}, 0, vote.PollMeta{},
 					sdkerrors.Wrap(err, "parsing confirmation height failed")
 			}
 			confHeightFound = true
-		case ethTypes.AttributeKeyPoll:
+		case evmTypes.AttributeKeyPoll:
 			cdc.MustUnmarshalJSON([]byte(attribute.Value), &poll)
 			pollFound = true
 		default:
@@ -161,19 +161,19 @@ func parseTokenConfirmationParams(cdc *codec.LegacyAmino, attributes []sdk.Attri
 	var txIDFound, gatewayAddrFound, tokenAddrFound, symbolFound, confHeightFound, pollFound bool
 	for _, attribute := range attributes {
 		switch attribute.Key {
-		case ethTypes.AttributeKeyTxID:
+		case evmTypes.AttributeKeyTxID:
 			txID = common.HexToHash(attribute.Value)
 			txIDFound = true
-		case ethTypes.AttributeKeyGatewayAddress:
+		case evmTypes.AttributeKeyGatewayAddress:
 			gatewayAddr = common.HexToAddress(attribute.Value)
 			gatewayAddrFound = true
-		case ethTypes.AttributeKeyTokenAddress:
+		case evmTypes.AttributeKeyTokenAddress:
 			tokenAddr = common.HexToAddress(attribute.Value)
 			tokenAddrFound = true
-		case ethTypes.AttributeKeySymbol:
+		case evmTypes.AttributeKeySymbol:
 			symbol = attribute.Value
 			symbolFound = true
-		case ethTypes.AttributeKeyConfHeight:
+		case evmTypes.AttributeKeyConfHeight:
 			h, err := strconv.Atoi(attribute.Value)
 			if err != nil {
 				return common.Hash{}, common.Address{}, common.Address{}, "", 0, vote.PollMeta{},