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>
81 lines
2.0 KiB
Go
81 lines
2.0 KiB
Go
package main
|
|
|
|
import (
|
|
"bufio"
|
|
"io"
|
|
|
|
"github.com/tendermint/tendermint/crypto"
|
|
|
|
"github.com/cosmos/cosmos-sdk/client/flags"
|
|
clientkeys "github.com/cosmos/cosmos-sdk/client/keys"
|
|
"github.com/cosmos/cosmos-sdk/crypto/keyring"
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
|
|
emintCrypto "github.com/cosmos/ethermint/crypto"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/spf13/viper"
|
|
)
|
|
|
|
const (
|
|
flagDryRun = "dry-run"
|
|
)
|
|
|
|
// keyCommands registers a sub-tree of commands to interact with
|
|
// local private key storage.
|
|
func keyCommands() *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "keys",
|
|
Short: "Add or view local private keys",
|
|
Long: `Keys allows you to manage your local keystore for tendermint.
|
|
|
|
These keys may be in any format supported by go-crypto and can be
|
|
used by light-clients, full nodes, or any other application that
|
|
needs to sign with a private key.`,
|
|
}
|
|
addCmd := clientkeys.AddKeyCommand()
|
|
addCmd.RunE = runAddCmd
|
|
cmd.AddCommand(
|
|
clientkeys.MnemonicKeyCommand(),
|
|
addCmd,
|
|
clientkeys.ExportKeyCommand(),
|
|
clientkeys.ImportKeyCommand(),
|
|
clientkeys.ListKeysCmd(),
|
|
clientkeys.ShowKeysCmd(),
|
|
flags.LineBreak,
|
|
clientkeys.DeleteKeyCommand(),
|
|
clientkeys.ParseKeyStringCommand(),
|
|
clientkeys.MigrateCommand(),
|
|
flags.LineBreak,
|
|
unsafeExportEthKeyCommand(),
|
|
)
|
|
return cmd
|
|
}
|
|
|
|
func getKeybase(transient bool, buf io.Reader) (keyring.Keybase, error) {
|
|
if transient {
|
|
return keyring.NewInMemory(keyring.WithKeygenFunc(ethermintKeygenFunc)), nil
|
|
}
|
|
|
|
return keyring.NewKeyring(
|
|
sdk.KeyringServiceName(),
|
|
viper.GetString(flags.FlagKeyringBackend),
|
|
viper.GetString(flags.FlagHome),
|
|
buf,
|
|
keyring.WithKeygenFunc(ethermintKeygenFunc))
|
|
}
|
|
|
|
func runAddCmd(cmd *cobra.Command, args []string) error {
|
|
inBuf := bufio.NewReader(cmd.InOrStdin())
|
|
kb, err := getKeybase(viper.GetBool(flagDryRun), inBuf)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return clientkeys.RunAddCmd(cmd, args, kb, inBuf)
|
|
}
|
|
|
|
func ethermintKeygenFunc(bz []byte, algo keyring.SigningAlgo) (crypto.PrivKey, error) {
|
|
return emintCrypto.PrivKeySecp256k1(bz), nil
|
|
}
|