Skip to content

Commit

Permalink
fix eth sign types issues
Browse files Browse the repository at this point in the history
  • Loading branch information
mn13 committed Aug 13, 2024
1 parent 7f9f30c commit f97994f
Show file tree
Hide file tree
Showing 7 changed files with 330 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Features

* (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 with. Fork patched runtime/moudule, replacing init() with explicit InitRuntimeModule() where uses ProvideInterfaceRegistryWithNoValidation except ProvideInterfaceRegistry.
* (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.

### Consensus Breaking Changes

Expand Down
31 changes: 28 additions & 3 deletions cmd/wardend/cmd/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (

// "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"
Expand All @@ -26,10 +25,14 @@ 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"
Expand Down Expand Up @@ -65,20 +68,42 @@ func initRootCmd(
basicManager,
AddGenesisSpaceCmd(app.DefaultNodeHome),
AddGenesisKeychainCmd(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)
Expand Down
274 changes: 274 additions & 0 deletions cmd/wardend/cmd/gen-accounts.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,274 @@
package cmd

import (
"bufio"
"encoding/json"
"fmt"
"time"

"github.com/spf13/cobra"

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/crypto/keyring"
"github.com/cosmos/cosmos-sdk/server"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/cosmos/cosmos-sdk/x/genutil"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"

evmoskr "github.com/evmos/evmos/v18/crypto/keyring"

sdktypes "github.com/cosmos/cosmos-sdk/types"
authvestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
vestingcli "github.com/evmos/evmos/v18/x/vesting/client/cli"
vestingtypes "github.com/evmos/evmos/v18/x/vesting/types"
)

const (
flagVestingStart = "vesting-start-time"
)

func AddGenesisAccountCmd(defaultNodeHome string) *cobra.Command {
cmd := &cobra.Command{
Use: "add-genesis-account ADDRESS_OR_KEY_NAME 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 {
clientCtx := client.GetClientContextFromCmd(cmd)

serverCtx := server.GetServerContextFromCmd(cmd)
config := serverCtx.Config

config.SetRoot(clientCtx.HomeDir)

var kr keyring.Keyring
addr, err := sdktypes.AccAddressFromBech32(args[0])
if err != nil {
inBuf := bufio.NewReader(cmd.InOrStdin())
keyringBackend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
if keyringBackend != "" && clientCtx.Keyring == nil {
var err error
kr, err = keyring.New(
sdktypes.KeyringServiceName(),
keyringBackend,
clientCtx.HomeDir,
inBuf,
clientCtx.Codec,
evmoskr.Option(),
)
if err != nil {
return err
}
} else {
kr = clientCtx.Keyring
}

fmt.Printf(" args[0] %v", args[0])
info, err := kr.Key(args[0])
if err != nil {
return fmt.Errorf("failed to get key info from Keyring: %w", err)
}

addr, err = info.GetAddress()
if err != nil {
return fmt.Errorf("failed to get address from Keyring: %w", err)
}
}

coins, err := sdktypes.ParseCoinsNormalized(args[1])
if err != nil {
return fmt.Errorf("failed to parse coins: %w", err)
}

vestingStart, err := cmd.Flags().GetInt64(flagVestingStart)
if err != nil {
return err
}

// create concrete account type based on input parameters
var genAccount authtypes.GenesisAccount

balances := banktypes.Balance{Address: addr.String(), Coins: coins.Sort()}
baseAccount := authtypes.NewBaseAccount(addr, nil, 0, 0)

clawback, _ := cmd.Flags().GetBool(vestingcli.FlagClawback)

// Create ClawbackvestingAccount or standard Evmos account
switch {
case clawback:
// ClawbackvestingAccount requires clawback, lockup, vesting, and funder
// flags
var (
lockupStart int64
lockupPeriods, vestingPeriods authvestingtypes.Periods
)

// Get funder addr which can perform clawback
funderStr, err := cmd.Flags().GetString(vestingcli.FlagFunder)
if err != nil {
return fmt.Errorf("must specify the clawback vesting account funder with the --funder flag")
}
funder, err := sdktypes.AccAddressFromBech32(funderStr)
if err != nil {
return err
}

// Read lockup and vesting schedules
lockupFile, _ := cmd.Flags().GetString(vestingcli.FlagLockup)
vestingFile, _ := cmd.Flags().GetString(vestingcli.FlagVesting)

if lockupFile == "" && vestingFile == "" {
return fmt.Errorf("must specify at least one of %s or %s", vestingcli.FlagLockup, vestingcli.FlagVesting)
}

if lockupFile != "" {
lockupStart, lockupPeriods, err = vestingcli.ReadScheduleFile(lockupFile)
if err != nil {
return err
}
}

if vestingFile != "" {
vestingStart, vestingPeriods, err = vestingcli.ReadScheduleFile(vestingFile)
if err != nil {
return err
}
}

// Align schedules in case lockup and vesting schedules have different
// start_time
commonStart, _ := vestingtypes.AlignSchedules(lockupStart, vestingStart, lockupPeriods, vestingPeriods)

// Get total lockup and vesting from schedules
vestingCoins := sdktypes.NewCoins()
for _, period := range vestingPeriods {
vestingCoins = vestingCoins.Add(period.Amount...)
}

lockupCoins := sdktypes.NewCoins()
for _, period := range lockupPeriods {
lockupCoins = lockupCoins.Add(period.Amount...)
}

// If lockup absent, default to an instant unlock schedule
if !vestingCoins.IsZero() && len(lockupPeriods) == 0 {
lockupPeriods = []authvestingtypes.Period{
{Length: 0, Amount: vestingCoins},
}
lockupCoins = vestingCoins
}

// If vesting absent, default to an instant vesting schedule
if !lockupCoins.IsZero() && len(vestingPeriods) == 0 {
vestingPeriods = []authvestingtypes.Period{
{Length: 0, Amount: lockupCoins},
}
vestingCoins = lockupCoins
}

// The vesting and lockup schedules must describe the same total amount.
// IsEqual can panic, so use (a == b) <=> (a <= b && b <= a).
if !vestingtypes.CoinEq(lockupCoins, vestingCoins) {
return fmt.Errorf("lockup (%s) and vesting (%s) amounts must be equal",
lockupCoins, vestingCoins,
)
}

// Check if account balance is aligned with vesting schedule
if !vestingCoins.Equal(coins) {
return fmt.Errorf("vestingCoins (%s) and coin balance (%s) amounts must be equal",
vestingCoins, coins,
)
}

genAccount = vestingtypes.NewClawbackVestingAccount(
baseAccount,
funder,
vestingCoins,
time.Unix(commonStart, 0),
lockupPeriods,
vestingPeriods,
)

default:
genAccount = baseAccount
}

if err := genAccount.Validate(); err != nil {
return fmt.Errorf("failed to validate new genesis account: %w", err)
}

genFile := config.GenesisFile()
appState, genDoc, err := genutiltypes.GenesisStateFromGenFile(genFile)
if err != nil {
return fmt.Errorf("failed to unmarshal genesis state: %w", err)
}

authGenState := authtypes.GetGenesisStateFromAppState(clientCtx.Codec, appState)

accs, err := authtypes.UnpackAccounts(authGenState.Accounts)
if err != nil {
return fmt.Errorf("failed to get accounts from any: %w", err)
}

if accs.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.
accs = append(accs, genAccount)
accs = authtypes.SanitizeGenesisAccounts(accs)

genAccs, err := authtypes.PackAccounts(accs)
if err != nil {
return fmt.Errorf("failed to convert accounts into any's: %w", err)
}
authGenState.Accounts = genAccs

authGenStateBz, err := clientCtx.Codec.MarshalJSON(&authGenState)
if err != nil {
return fmt.Errorf("failed to marshal auth genesis state: %w", err)
}

appState[authtypes.ModuleName] = authGenStateBz

bankGenState := banktypes.GetGenesisStateFromAppState(clientCtx.Codec, appState)
bankGenState.Balances = append(bankGenState.Balances, balances)
bankGenState.Balances = banktypes.SanitizeGenesisBalances(bankGenState.Balances)
bankGenState.Supply = bankGenState.Supply.Add(balances.Coins...)

bankGenStateBz, err := clientCtx.Codec.MarshalJSON(bankGenState)
if err != nil {
return fmt.Errorf("failed to marshal bank genesis state: %w", err)
}

appState[banktypes.ModuleName] = bankGenStateBz

appStateJSON, err := json.Marshal(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(flags.FlagHome, defaultNodeHome, "The application home directory")
cmd.Flags().String(flags.FlagKeyringBackend, flags.DefaultKeyringBackend, "Select keyring's backend (os|file|kwallet|pass|test)")
cmd.Flags().Int64(flagVestingStart, 0, "schedule start time (unix epoch) for vesting accounts")
cmd.Flags().Bool(vestingcli.FlagClawback, false, "create clawback account")
cmd.Flags().String(vestingcli.FlagFunder, "", "funder address for clawback")
cmd.Flags().String(vestingcli.FlagLockup, "", "path to file containing unlocking periods for a clawback vesting account")
cmd.Flags().String(vestingcli.FlagVesting, "", "path to file containing vesting periods for a clawback vesting account")
flags.AddQueryFlagsToCmd(cmd)

return cmd
}
4 changes: 3 additions & 1 deletion cmd/wardend/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"

evmoskr "github.com/evmos/evmos/v18/crypto/keyring"
"github.com/warden-protocol/wardenprotocol/warden/app"
)

Expand Down Expand Up @@ -80,7 +81,7 @@ func NewRootCmd() *cobra.Command {
txConfigOpts.EnabledSignModes = append(txConfigOpts.EnabledSignModes, signing.SignMode_SIGN_MODE_TEXTUAL)
txConfigOpts.TextualCoinMetadataQueryFn = txmodule.NewGRPCCoinMetadataQueryFn(clientCtx)
txConfigWithTextual, err := tx.NewTxConfigWithOptions(
codec.NewProtoCodec(clientCtx.InterfaceRegistry),
clientCtx.Codec,
txConfigOpts,
)
if err != nil {
Expand Down Expand Up @@ -154,6 +155,7 @@ func ProvideClientContext(
WithInput(os.Stdin).
WithAccountRetriever(types.AccountRetriever{}).
WithHomeDir(app.DefaultNodeHome).
WithKeyringOptions(evmoskr.Option()).
WithViper(app.Name) // env variable prefix

// Read the config again to overwrite the default values with the values from the config file
Expand Down
Loading

0 comments on commit f97994f

Please sign in to comment.