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>
176 lines
5.9 KiB
Go
176 lines
5.9 KiB
Go
package main
|
|
|
|
import (
|
|
"bufio"
|
|
"errors"
|
|
"fmt"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/spf13/viper"
|
|
|
|
"github.com/tendermint/go-amino"
|
|
"github.com/tendermint/tendermint/libs/cli"
|
|
|
|
"github.com/cosmos/cosmos-sdk/client/flags"
|
|
"github.com/cosmos/cosmos-sdk/crypto/keyring"
|
|
"github.com/cosmos/cosmos-sdk/server"
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
"github.com/cosmos/cosmos-sdk/x/auth"
|
|
authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
|
|
authvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting"
|
|
"github.com/cosmos/cosmos-sdk/x/bank"
|
|
"github.com/cosmos/cosmos-sdk/x/genutil"
|
|
|
|
"github.com/cosmos/ethermint/codec"
|
|
ethermint "github.com/cosmos/ethermint/types"
|
|
ethcrypto "github.com/ethereum/go-ethereum/crypto"
|
|
)
|
|
|
|
const (
|
|
flagClientHome = "home-client"
|
|
flagVestingStart = "vesting-start-time"
|
|
flagVestingEnd = "vesting-end-time"
|
|
flagVestingAmt = "vesting-amount"
|
|
)
|
|
|
|
// AddGenesisAccountCmd returns add-genesis-account cobra Command.
|
|
func AddGenesisAccountCmd(
|
|
ctx *server.Context, depCdc *amino.Codec, cdc *codec.Codec, defaultNodeHome, defaultClientHome string,
|
|
) *cobra.Command {
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "add-genesis-account [address_or_key_name] [coin][,[coin]]",
|
|
Short: "Add a genesis account to genesis.json",
|
|
Long: `Add a genesis account to genesis.json. The provided account must specify
|
|
the account address or key name and a list of initial coins. If a key name is given,
|
|
the address will be looked up in the local Keybase. The list of initial tokens must
|
|
contain valid denominations. Accounts may optionally be supplied with vesting parameters.
|
|
`,
|
|
Args: cobra.ExactArgs(2),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
config := ctx.Config
|
|
config.SetRoot(viper.GetString(cli.HomeFlag))
|
|
|
|
addr, err := sdk.AccAddressFromBech32(args[0])
|
|
inBuf := bufio.NewReader(cmd.InOrStdin())
|
|
if err != nil {
|
|
// attempt to lookup address from Keybase if no address was provided
|
|
kb, err := keyring.NewKeyring(
|
|
sdk.KeyringServiceName(),
|
|
viper.GetString(flags.FlagKeyringBackend),
|
|
viper.GetString(flagClientHome),
|
|
inBuf,
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
info, err := kb.Get(args[0])
|
|
if err != nil {
|
|
return fmt.Errorf("failed to get address from Keybase: %w", err)
|
|
}
|
|
|
|
addr = info.GetAddress()
|
|
}
|
|
|
|
coins, err := sdk.ParseCoins(args[1])
|
|
if err != nil {
|
|
return fmt.Errorf("failed to parse coins: %w", err)
|
|
}
|
|
|
|
vestingStart := viper.GetInt64(flagVestingStart)
|
|
vestingEnd := viper.GetInt64(flagVestingEnd)
|
|
vestingAmt, err := sdk.ParseCoins(viper.GetString(flagVestingAmt))
|
|
if err != nil {
|
|
return fmt.Errorf("failed to parse vesting amount: %w", err)
|
|
}
|
|
|
|
// create concrete account type based on input parameters
|
|
var genAccount authexported.GenesisAccount
|
|
|
|
balances := bank.Balance{Address: addr, Coins: coins.Sort()}
|
|
baseAccount := auth.NewBaseAccount(addr, nil, 0, 0)
|
|
if !vestingAmt.IsZero() {
|
|
baseVestingAccount := authvesting.NewBaseVestingAccount(baseAccount, vestingAmt.Sort(), vestingEnd)
|
|
|
|
if (balances.Coins.IsZero() && !baseVestingAccount.OriginalVesting.IsZero()) ||
|
|
baseVestingAccount.OriginalVesting.IsAnyGT(balances.Coins) {
|
|
return errors.New("vesting amount cannot be greater than total amount")
|
|
}
|
|
|
|
switch {
|
|
case vestingStart != 0 && vestingEnd != 0:
|
|
genAccount = authvesting.NewContinuousVestingAccountRaw(baseVestingAccount, vestingStart)
|
|
|
|
case vestingEnd != 0:
|
|
genAccount = authvesting.NewDelayedVestingAccountRaw(baseVestingAccount)
|
|
|
|
default:
|
|
return errors.New("invalid vesting parameters; must supply start and end time or end time")
|
|
}
|
|
} else {
|
|
genAccount = ethermint.EthAccount{
|
|
BaseAccount: baseAccount,
|
|
CodeHash: ethcrypto.Keccak256(nil),
|
|
}
|
|
}
|
|
|
|
if err := genAccount.Validate(); err != nil {
|
|
return fmt.Errorf("failed to validate new genesis account: %w", err)
|
|
}
|
|
|
|
genFile := config.GenesisFile()
|
|
appState, genDoc, err := genutil.GenesisStateFromGenFile(depCdc, genFile)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to unmarshal genesis state: %w", err)
|
|
}
|
|
|
|
authGenState := auth.GetGenesisStateFromAppState(cdc, appState)
|
|
|
|
if authGenState.Accounts.Contains(addr) {
|
|
return fmt.Errorf("cannot add account at existing address %s", addr)
|
|
}
|
|
|
|
// Add the new account to the set of genesis accounts and sanitize the
|
|
// accounts afterwards.
|
|
authGenState.Accounts = append(authGenState.Accounts, genAccount)
|
|
authGenState.Accounts = auth.SanitizeGenesisAccounts(authGenState.Accounts)
|
|
|
|
authGenStateBz, err := cdc.MarshalJSON(authGenState)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to marshal auth genesis state: %w", err)
|
|
}
|
|
|
|
appState[auth.ModuleName] = authGenStateBz
|
|
|
|
bankGenState := bank.GetGenesisStateFromAppState(depCdc, appState)
|
|
bankGenState.Balances = append(bankGenState.Balances, balances)
|
|
bankGenState.Balances = bank.SanitizeGenesisBalances(bankGenState.Balances)
|
|
|
|
bankGenStateBz, err := cdc.MarshalJSON(bankGenState)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to marshal bank genesis state: %w", err)
|
|
}
|
|
|
|
appState[bank.ModuleName] = bankGenStateBz
|
|
|
|
appStateJSON, err := cdc.MarshalJSON(appState)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to marshal application genesis state: %w", err)
|
|
}
|
|
|
|
genDoc.AppState = appStateJSON
|
|
return genutil.ExportGenesisFile(genDoc, genFile)
|
|
},
|
|
}
|
|
|
|
cmd.Flags().String(cli.HomeFlag, defaultNodeHome, "node's home directory")
|
|
cmd.Flags().String(flags.FlagKeyringBackend, flags.DefaultKeyringBackend, "Select keyring's backend (os|file|test)")
|
|
cmd.Flags().String(flagClientHome, defaultClientHome, "client's home directory")
|
|
cmd.Flags().String(flagVestingAmt, "", "amount of coins for vesting accounts")
|
|
cmd.Flags().Uint64(flagVestingStart, 0, "schedule start time (unix epoch) for vesting accounts")
|
|
cmd.Flags().Uint64(flagVestingEnd, 0, "schedule end time (unix epoch) for vesting accounts")
|
|
|
|
return cmd
|
|
}
|