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.8 KiB
Go
167 lines
4.8 KiB
Go
package cli
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
ethcrypto "github.com/ethereum/go-ethereum/crypto"
|
|
"github.com/pkg/errors"
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/cosmos/cosmos-sdk/client"
|
|
"github.com/cosmos/cosmos-sdk/client/context"
|
|
"github.com/cosmos/cosmos-sdk/client/flags"
|
|
"github.com/cosmos/cosmos-sdk/codec"
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
"github.com/cosmos/cosmos-sdk/x/auth"
|
|
authclient "github.com/cosmos/cosmos-sdk/x/auth/client"
|
|
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
|
|
|
ethermintcodec "github.com/cosmos/ethermint/codec"
|
|
emint "github.com/cosmos/ethermint/types"
|
|
"github.com/cosmos/ethermint/x/evm/types"
|
|
)
|
|
|
|
// GetTxCmd defines the CLI commands regarding evm module transactions
|
|
func GetTxCmd(storeKey string, cdc *codec.Codec) *cobra.Command {
|
|
evmTxCmd := &cobra.Command{
|
|
Use: types.ModuleName,
|
|
Short: "EVM transaction subcommands",
|
|
DisableFlagParsing: true,
|
|
SuggestionsMinimumDistance: 2,
|
|
RunE: client.ValidateCmd,
|
|
}
|
|
|
|
evmTxCmd.AddCommand(flags.PostCommands(
|
|
GetCmdSendTx(cdc),
|
|
GetCmdGenCreateTx(cdc),
|
|
)...)
|
|
|
|
return evmTxCmd
|
|
}
|
|
|
|
// GetCmdSendTx generates an Ethermint transaction (excludes create operations)
|
|
func GetCmdSendTx(cdc *codec.Codec) *cobra.Command {
|
|
return &cobra.Command{
|
|
Use: "send [to_address] [amount (in photons)] [<data>]",
|
|
Short: "send transaction to address (call operations included)",
|
|
Args: cobra.RangeArgs(2, 3),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
cliCtx := context.NewCLIContext().WithCodec(cdc)
|
|
inBuf := bufio.NewReader(cmd.InOrStdin())
|
|
|
|
txBldr := auth.NewTxBuilderFromCLI(inBuf).WithTxEncoder(authclient.GetTxEncoder(cdc))
|
|
|
|
toAddr, err := cosmosAddressFromArg(args[0])
|
|
if err != nil {
|
|
return errors.Wrap(err, "must provide a valid Bech32 address for to_address")
|
|
}
|
|
|
|
// Ambiguously decode amount from any base
|
|
amount, err := strconv.ParseInt(args[1], 0, 64)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var data []byte
|
|
if len(args) > 2 {
|
|
payload := args[2]
|
|
if !strings.HasPrefix(payload, "0x") {
|
|
payload = "0x" + payload
|
|
}
|
|
|
|
data, err = hexutil.Decode(payload)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
from := cliCtx.GetFromAddress()
|
|
|
|
authclient.Codec = ethermintcodec.NewAppCodec(cdc)
|
|
_, seq, err := authtypes.NewAccountRetriever(authclient.Codec, cliCtx).GetAccountNumberSequence(from)
|
|
if err != nil {
|
|
return errors.Wrap(err, "Could not retrieve account sequence")
|
|
}
|
|
|
|
// TODO: Potentially allow overriding of gas price and gas limit
|
|
msg := types.NewMsgEthermint(seq, &toAddr, sdk.NewInt(amount), txBldr.Gas(),
|
|
sdk.NewInt(emint.DefaultGasPrice), data, from)
|
|
|
|
err = msg.ValidateBasic()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return authclient.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msg})
|
|
},
|
|
}
|
|
}
|
|
|
|
// GetCmdGenCreateTx generates an Ethermint transaction (excludes create operations)
|
|
func GetCmdGenCreateTx(cdc *codec.Codec) *cobra.Command {
|
|
return &cobra.Command{
|
|
Use: "create [contract bytecode] [<amount (in photons)>]",
|
|
Short: "create contract through the evm using compiled bytecode",
|
|
Args: cobra.RangeArgs(1, 2),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
cliCtx := context.NewCLIContext().WithCodec(cdc)
|
|
inBuf := bufio.NewReader(cmd.InOrStdin())
|
|
|
|
txBldr := auth.NewTxBuilderFromCLI(inBuf).WithTxEncoder(authclient.GetTxEncoder(cdc))
|
|
|
|
payload := args[0]
|
|
if !strings.HasPrefix(payload, "0x") {
|
|
payload = "0x" + payload
|
|
}
|
|
|
|
data, err := hexutil.Decode(payload)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var amount int64
|
|
if len(args) > 1 {
|
|
// Ambiguously decode amount from any base
|
|
amount, err = strconv.ParseInt(args[1], 0, 64)
|
|
if err != nil {
|
|
return errors.Wrap(err, "invalid amount")
|
|
}
|
|
}
|
|
|
|
from := cliCtx.GetFromAddress()
|
|
|
|
authclient.Codec = ethermintcodec.NewAppCodec(cdc)
|
|
_, seq, err := authtypes.NewAccountRetriever(authclient.Codec, cliCtx).GetAccountNumberSequence(from)
|
|
if err != nil {
|
|
return errors.Wrap(err, "Could not retrieve account sequence")
|
|
}
|
|
|
|
// TODO: Potentially allow overriding of gas price and gas limit
|
|
msg := types.NewMsgEthermint(seq, nil, sdk.NewInt(amount), txBldr.Gas(),
|
|
sdk.NewInt(emint.DefaultGasPrice), data, from)
|
|
|
|
err = msg.ValidateBasic()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if err = authclient.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msg}); err != nil {
|
|
return err
|
|
}
|
|
|
|
contractAddr := ethcrypto.CreateAddress(common.BytesToAddress(from.Bytes()), seq)
|
|
fmt.Printf(
|
|
"Contract will be deployed to: \nHex: %s\nCosmos Address: %s\n",
|
|
contractAddr.Hex(),
|
|
sdk.AccAddress(contractAddr.Bytes()),
|
|
)
|
|
return nil
|
|
},
|
|
}
|
|
}
|