Feature/evm module

CHANGELOG.md

@@ -59,6 +59,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * (x/act) Add support for sdk.Coins fields in autogenerated CLI commands for new actions
 * (x/warden) Add the ability for the user to specify the maximum keychain fee size to be deducted
 * (x/warden) Return error if analyzer's address is not bench32
+* (evm) Resolve dependencies issues. For go-ethereum use [evmos fork](https://github.com/evmos/go-ethereum/releases/tag/v1.10.26-evmos-rc2) patched with [c1b68f1d05a7ee8eee1bde3c4054f49f5d3e3b9f](https://github.com/ethereum/go-ethereum/pull/24911) from original repository to support slinky.
+* (evm) To adopt ethsecp256k1 use fork of evmos's cosmos-sdk. Fork patched runtime/module adding into ProvideApp two arguments to customize registering interface registry and legacy amino codec.
+* (evm) Introduce award denomination to adjust units with Ethereum
+* (evm) Using ethsecp256k1 signature for all transactions. Users should reimport their seeds to get new addresses.
 
 ### Bug Fixes
 * (x/gmp) Remove the GMP default params from genesis

cmd/faucet-v2/main.go

@@ -19,14 +19,14 @@ import (
 
 type Config struct {
 	CliName        string `env:"CLI_NAME, default=wardend"`
-	ChainID        string `env:"CHAIN_ID, default=warden"`
+	ChainID        string `env:"CHAIN_ID, default=warden_1337-1"`
 	KeyringBackend string `env:"KEYRING_BACKEND, default=test"`
 	Node           string `env:"NODE, default=http://localhost:26657"`
-	SendDenom      string `env:"DENOM, default=10000000uward"`
+	SendDenom      string `env:"DENOM, default=10000000000000000000award"`
 	AccountName    string `env:"ACCOUNT_NAME, default=shulgin"`
 	Mnemonic       string `env:"MNEMONIC"`
-	HDPath         string `env:"HD_PATH, default=m/44'/118'/0'/0/0"`
-	Fees           string `env:"FEES, default=1uward"`
+	HDPath         string `env:"HD_PATH, default=m/44'/60'/0'/0/0"`
+	Fees           string `env:"FEES, default=1award"`
 	OtherFlags     string `env:"OTHER_FLAGS"`
 
 	Cooldown      time.Duration `env:"COOLDOWN, default=12h"`

cmd/wardend/cmd/commands.go

@@ -12,9 +12,9 @@ import (
 	confixcmd "cosmossdk.io/tools/confix/cmd"
 	dbm "github.com/cosmos/cosmos-db"
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/debug"
+
+	// "github.com/cosmos/cosmos-sdk/client/debug"
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	"github.com/cosmos/cosmos-sdk/client/keys"
 	"github.com/cosmos/cosmos-sdk/client/pruning"
 	"github.com/cosmos/cosmos-sdk/client/rpc"
 	"github.com/cosmos/cosmos-sdk/client/snapshot"
@@ -25,10 +25,16 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
 	"github.com/cosmos/cosmos-sdk/x/crisis"
+	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
+	evmosclient "github.com/evmos/evmos/v18/client"
+	"github.com/evmos/evmos/v18/client/debug"
+	evmosserver "github.com/evmos/evmos/v18/server"
 	"github.com/warden-protocol/wardenprotocol/warden/app"
 )
 
@@ -47,7 +53,12 @@ func initRootCmd(
 		snapshot.Cmd(newApp),
 	)
 
-	server.AddCommands(rootCmd, app.DefaultNodeHome, newApp, appExport, addModuleInitFlags)
+	evmosserver.AddCommands(
+		rootCmd,
+		evmosserver.NewDefaultStartOptions(newApp, app.DefaultNodeHome),
+		appExport,
+		addModuleInitFlags,
+	)
 
 	// add keybase, auxiliary RPC, query, genesis, and tx child commands
 	rootCmd.AddCommand(
@@ -58,20 +69,42 @@ func initRootCmd(
 			AddGenesisSpaceCmd(app.DefaultNodeHome),
 			AddGenesisKeychainCmd(app.DefaultNodeHome),
 			AddGenesisSlinkyMarketsCmd(app.DefaultNodeHome),
+			AddGenesisAccountCmd(app.DefaultNodeHome),
 		),
 		queryCommand(),
 		txCommand(),
-		keys.Commands(),
+		evmosclient.KeyCommands(app.DefaultNodeHome),
 	)
 }
 
 func addModuleInitFlags(startCmd *cobra.Command) {
 	crisis.AddModuleInitFlags(startCmd)
 }
 
+// Analog of sdk's CommandsWithCustomMigrationMap without AddGenesisAccountCmd, that should be embeded separately
+func CommandsWithCustomMigrationMap(txConfig client.TxConfig, moduleBasics module.BasicManager, defaultNodeHome string, migrationMap genutiltypes.MigrationMap) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:                        "genesis",
+		Short:                      "Application's genesis-related subcommands",
+		DisableFlagParsing:         false,
+		SuggestionsMinimumDistance: 2,
+		RunE:                       client.ValidateCmd,
+	}
+	gentxModule := moduleBasics[genutiltypes.ModuleName].(genutil.AppModuleBasic)
+
+	cmd.AddCommand(
+		genutilcli.GenTxCmd(moduleBasics, txConfig, banktypes.GenesisBalancesIterator{}, defaultNodeHome, txConfig.SigningContext().ValidatorAddressCodec()),
+		genutilcli.MigrateGenesisCmd(migrationMap),
+		genutilcli.CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, defaultNodeHome, gentxModule.GenTxValidator, txConfig.SigningContext().ValidatorAddressCodec()),
+		genutilcli.ValidateGenesisCmd(moduleBasics),
+	)
+
+	return cmd
+}
+
 // genesisCommand builds genesis-related `wardend genesis` command. Users may provide application specific commands as a parameter
 func genesisCommand(txConfig client.TxConfig, basicManager module.BasicManager, cmds ...*cobra.Command) *cobra.Command {
-	cmd := genutilcli.Commands(txConfig, basicManager, app.DefaultNodeHome)
+	cmd := CommandsWithCustomMigrationMap(txConfig, basicManager, app.DefaultNodeHome, genutilcli.MigrationMap)
 
 	for _, subCmd := range cmds {
 		cmd.AddCommand(subCmd)

cmd/wardend/cmd/config.go

@@ -6,6 +6,7 @@ import (
 	cmtcfg "github.com/cometbft/cometbft/config"
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
 
+	evmservercfg "github.com/evmos/evmos/v18/server/config"
 	oracleconfig "github.com/skip-mev/slinky/oracle/config"
 )
 
@@ -28,7 +29,11 @@ func initAppConfig() (string, interface{}) {
 	type CustomAppConfig struct {
 		serverconfig.Config `mapstructure:",squash"`
 
-		Oracle oracleconfig.AppConfig `mapstructure:"oracle"`
+		Oracle  oracleconfig.AppConfig     `mapstructure:"oracle"`
+		EVM     evmservercfg.EVMConfig     `mapstructure:"evm"`
+		JSONRPC evmservercfg.JSONRPCConfig `mapstructure:"json-rpc"`
+		TLS     evmservercfg.TLSConfig     `mapstructure:"tls"`
+		Rosetta evmservercfg.RosettaConfig `mapstructure:"rosetta"`
 	}
 
 	// Optionally allow the chain developer to overwrite the SDK's default
@@ -56,12 +61,40 @@ func initAppConfig() (string, interface{}) {
 		MetricsEnabled: false,
 	}
 
+	evmConfig := evmservercfg.DefaultEVMConfig()
+	jsonRpcConfig := evmservercfg.JSONRPCConfig{
+		Enable:                   true,
+		API:                      evmservercfg.GetDefaultAPINamespaces(),
+		Address:                  evmservercfg.DefaultJSONRPCAddress,
+		WsAddress:                evmservercfg.DefaultJSONRPCWsAddress,
+		GasCap:                   evmservercfg.DefaultGasCap,
+		AllowInsecureUnlock:      evmservercfg.DefaultJSONRPCAllowInsecureUnlock,
+		EVMTimeout:               evmservercfg.DefaultEVMTimeout,
+		TxFeeCap:                 evmservercfg.DefaultTxFeeCap,
+		FilterCap:                evmservercfg.DefaultFilterCap,
+		FeeHistoryCap:            evmservercfg.DefaultFeeHistoryCap,
+		BlockRangeCap:            evmservercfg.DefaultBlockRangeCap,
+		LogsCap:                  evmservercfg.DefaultLogsCap,
+		HTTPTimeout:              evmservercfg.DefaultHTTPTimeout,
+		HTTPIdleTimeout:          evmservercfg.DefaultHTTPIdleTimeout,
+		AllowUnprotectedTxs:      evmservercfg.DefaultAllowUnprotectedTxs,
+		MaxOpenConnections:       evmservercfg.DefaultMaxOpenConnections,
+		EnableIndexer:            false,
+		MetricsAddress:           evmservercfg.DefaultJSONRPCMetricsAddress,
+		FixRevertGasRefundHeight: evmservercfg.DefaultFixRevertGasRefundHeight,
+	}
+	tlsConfig := evmservercfg.DefaultTLSConfig()
+
 	customAppConfig := CustomAppConfig{
-		Config: *srvCfg,
-		Oracle: oracleConfig,
+		Config:  *srvCfg,
+		Oracle:  oracleConfig,
+		EVM:     *evmConfig,
+		JSONRPC: jsonRpcConfig,
+		TLS:     *tlsConfig,
+		Rosetta: *evmservercfg.DefaultRosettaConfig(),
 	}
 
-	customAppTemplate := serverconfig.DefaultConfigTemplate + oracleconfig.DefaultConfigTemplate
+	customAppTemplate := serverconfig.DefaultConfigTemplate + oracleconfig.DefaultConfigTemplate + evmservercfg.DefaultConfigTemplate
 	// Edit the default template file
 	//
 	// customAppTemplate := serverconfig.DefaultConfigTemplate + `