4d609b2a22
* evm: move Keeper and Querier to /keeper package * keeper: update keeper_test.go * fix format * evm: use aliased types * bump SDK version to v0.38.1 * app: updates from new version * errors: switch sdk.Error -> error * errors: switch sdk.Error -> error. Continuation * more fixes * update app/ * update keys and client pkgs * build * fix tests * lint * minor changes * changelog * address @austinbell comments * Fix keyring usage in rpc API and CLI * fix keyring * break line * Misc cleanup (#188) * evm: move Begin and EndBlock to abci.go * evm: use expected keeper interfaces * app: use EthermintApp for integration and unit test setup * evm: remove count type; update codec * go mod verify * evm: rename msgs for consistency * evm: events * minor cleanup * lint * ante: update tests * changelog * nolint * evm: update statedb to create ethermint Account instead of BaseAccount * fix importer test * address @austinabell comments * update README * changelog * evm: update codec * fix event sender * store logs in keeper after transition (#210) * add some comments * begin log handler test * update TransitionCSDB to return ReturnData * use rlp for result data encode/decode * update tests * implement SetBlockLogs * implement GetBlockLogs * test log set/get * update keeper get/set logs to use hash as key * fix test * move logsKey to csdb * attempt to fix test * attempt to fix test * attempt to fix test * lint * lint * lint * save logs after handling msg * update k.Logs * cleanup * remove unused * fix issues * comment out handler test * address comments * lint * fix handler test * address comments * use amino * lint * address comments * merge * fix encoding bug * minor fix * rpc: error handling * rpc: simulate only returns gasConsumed * rpc: error ineffassign * go: bump version to 1.14 and SDK version to latest master * rpc: fix simulation return value * breaking changes from SDK * sdk: breaking changes; build * tests: fixes * minor fix * proto: ethermint types attempt * proto: define EthAccount proto type and extend sdk std.Codec * evm: fix panic on handler test * evm: minor state object changes * cleanup * tests: update test-importer * fix pubkey registration * lint * cleanup * more test checks for importer * minor change * codec fixes * rm init func * fix importer test build * fix marshaling for TxDecoder * use amino codec for evm * fix marshaling for SimulationResponse * use jsonpb for unmarshaling * fix method handler crashed * return err on VerifySig * switch stateObject balance to sdk.Int * fixes to codec and encoding * cleanup * set tmhash -> ethhash in state transition * add tmhash->ethereumhash to csdb.GetLogs * attempt to fix tests * update GetLogs to switch with Has * ante panic * diff changes * update SetLogs * evm/cli: use ethermint codec * use LengthPrefixed for encoding * add check for nil *big.Int * add balance to UpdateAccounts * fix previous balance * fix balance bug * prevent panic on make test-import Co-authored-by: austinabell <austinabell8@gmail.com> Co-authored-by: noot <36753753+noot@users.noreply.github.com> Co-authored-by: noot <elizabethjbinks@gmail.com>
167 lines
4.4 KiB
Go
167 lines
4.4 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/spf13/viper"
|
|
|
|
"github.com/cosmos/ethermint/app"
|
|
"github.com/cosmos/ethermint/codec"
|
|
emintcrypto "github.com/cosmos/ethermint/crypto"
|
|
"github.com/cosmos/ethermint/rpc"
|
|
|
|
"github.com/tendermint/go-amino"
|
|
tmamino "github.com/tendermint/tendermint/crypto/encoding/amino"
|
|
"github.com/tendermint/tendermint/libs/cli"
|
|
|
|
"github.com/cosmos/cosmos-sdk/client"
|
|
"github.com/cosmos/cosmos-sdk/client/flags"
|
|
clientkeys "github.com/cosmos/cosmos-sdk/client/keys"
|
|
clientrpc "github.com/cosmos/cosmos-sdk/client/rpc"
|
|
"github.com/cosmos/cosmos-sdk/crypto/keyring"
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
"github.com/cosmos/cosmos-sdk/version"
|
|
"github.com/cosmos/cosmos-sdk/x/auth"
|
|
authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
|
|
"github.com/cosmos/cosmos-sdk/x/bank"
|
|
bankcmd "github.com/cosmos/cosmos-sdk/x/bank/client/cli"
|
|
)
|
|
|
|
var (
|
|
cdc = codec.MakeCodec(app.ModuleBasics)
|
|
appCodec = codec.NewAppCodec(cdc)
|
|
)
|
|
|
|
func main() {
|
|
// Configure cobra to sort commands
|
|
cobra.EnableCommandSorting = false
|
|
|
|
tmamino.RegisterKeyType(emintcrypto.PubKeySecp256k1{}, emintcrypto.PubKeyAminoName)
|
|
tmamino.RegisterKeyType(emintcrypto.PrivKeySecp256k1{}, emintcrypto.PrivKeyAminoName)
|
|
|
|
keyring.CryptoCdc = cdc
|
|
clientkeys.KeysCdc = cdc
|
|
|
|
// Read in the configuration file for the sdk
|
|
config := sdk.GetConfig()
|
|
config.SetBech32PrefixForAccount(sdk.Bech32PrefixAccAddr, sdk.Bech32PrefixAccPub)
|
|
config.SetBech32PrefixForValidator(sdk.Bech32PrefixValAddr, sdk.Bech32PrefixValPub)
|
|
config.SetBech32PrefixForConsensusNode(sdk.Bech32PrefixConsAddr, sdk.Bech32PrefixConsPub)
|
|
config.Seal()
|
|
|
|
rootCmd := &cobra.Command{
|
|
Use: "emintcli",
|
|
Short: "Command line interface for interacting with emintd",
|
|
}
|
|
|
|
// Add --chain-id to persistent flags and mark it required
|
|
rootCmd.PersistentFlags().String(flags.FlagChainID, "", "Chain ID of tendermint node")
|
|
rootCmd.PersistentPreRunE = func(_ *cobra.Command, _ []string) error {
|
|
return initConfig(rootCmd)
|
|
}
|
|
|
|
// Construct Root Command
|
|
rootCmd.AddCommand(
|
|
clientrpc.StatusCommand(),
|
|
client.ConfigCmd(app.DefaultCLIHome),
|
|
queryCmd(cdc),
|
|
txCmd(cdc),
|
|
rpc.EmintServeCmd(cdc),
|
|
flags.LineBreak,
|
|
keyCommands(),
|
|
flags.LineBreak,
|
|
version.Cmd,
|
|
flags.NewCompletionCmd(rootCmd, true),
|
|
)
|
|
|
|
// Add flags and prefix all env exposed with EM
|
|
executor := cli.PrepareMainCmd(rootCmd, "EM", app.DefaultCLIHome)
|
|
|
|
err := executor.Execute()
|
|
if err != nil {
|
|
panic(fmt.Errorf("failed executing CLI command: %w", err))
|
|
}
|
|
}
|
|
|
|
func queryCmd(cdc *amino.Codec) *cobra.Command {
|
|
queryCmd := &cobra.Command{
|
|
Use: "query",
|
|
Aliases: []string{"q"},
|
|
Short: "Querying subcommands",
|
|
}
|
|
|
|
queryCmd.AddCommand(
|
|
authcmd.GetAccountCmd(cdc),
|
|
flags.LineBreak,
|
|
authcmd.QueryTxsByEventsCmd(cdc),
|
|
authcmd.QueryTxCmd(cdc),
|
|
flags.LineBreak,
|
|
)
|
|
|
|
// add modules' query commands
|
|
app.ModuleBasics.AddQueryCommands(queryCmd, cdc)
|
|
|
|
return queryCmd
|
|
}
|
|
|
|
func txCmd(cdc *amino.Codec) *cobra.Command {
|
|
txCmd := &cobra.Command{
|
|
Use: "tx",
|
|
Short: "Transactions subcommands",
|
|
}
|
|
|
|
txCmd.AddCommand(
|
|
bankcmd.SendTxCmd(cdc),
|
|
flags.LineBreak,
|
|
authcmd.GetSignCommand(cdc),
|
|
authcmd.GetMultiSignCommand(cdc),
|
|
flags.LineBreak,
|
|
authcmd.GetBroadcastCommand(cdc),
|
|
authcmd.GetEncodeCommand(cdc),
|
|
authcmd.GetDecodeCommand(cdc),
|
|
flags.LineBreak,
|
|
)
|
|
|
|
// add modules' tx commands
|
|
app.ModuleBasics.AddTxCommands(txCmd, cdc)
|
|
|
|
// remove auth and bank commands as they're mounted under the root tx command
|
|
var cmdsToRemove []*cobra.Command
|
|
|
|
for _, cmd := range txCmd.Commands() {
|
|
if cmd.Use == auth.ModuleName || cmd.Use == bank.ModuleName {
|
|
cmdsToRemove = append(cmdsToRemove, cmd)
|
|
}
|
|
}
|
|
|
|
txCmd.RemoveCommand(cmdsToRemove...)
|
|
|
|
return txCmd
|
|
}
|
|
|
|
func initConfig(cmd *cobra.Command) error {
|
|
home, err := cmd.PersistentFlags().GetString(cli.HomeFlag)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
cfgFile := path.Join(home, "config", "config.toml")
|
|
if _, err := os.Stat(cfgFile); err == nil {
|
|
viper.SetConfigFile(cfgFile)
|
|
|
|
if err := viper.ReadInConfig(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if err := viper.BindPFlag(flags.FlagChainID, cmd.PersistentFlags().Lookup(flags.FlagChainID)); err != nil {
|
|
return err
|
|
}
|
|
if err := viper.BindPFlag(cli.EncodingFlag, cmd.PersistentFlags().Lookup(cli.EncodingFlag)); err != nil {
|
|
return err
|
|
}
|
|
return viper.BindPFlag(cli.OutputFlag, cmd.PersistentFlags().Lookup(cli.OutputFlag))
|
|
}
|