R4R: Support Vesting Accounts in add-genesis-account
#3549
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,11 +16,11 @@ import ( | |
| "github.com/cosmos/cosmos-sdk/x/auth" | ||
| ) | ||
|
|
||
| // AddGenesisAccountCmd returns add-genesis-account cobra Command. | ||
| func AddGenesisAccountCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "add-genesis-account [address_or_key_name] [coin][,[coin]]", | ||
| Short: "Add genesis account to a genesis file", | ||
|
There was a problem hiding this comment. I'd second this new wording if were to support an extra optional flag/argument to provide the genesis.json; needless to say that it should default to There was a problem hiding this comment. A bit lost here, are you asking me to revert? There was a problem hiding this comment. I think what @alessio is saying is that there is no way for this command to specify what the particular file path to genesis is, so |
||
| Args: cobra.ExactArgs(2), | ||
| RunE: func(_ *cobra.Command, args []string) error { | ||
| config := ctx.Config | ||
|
|
@@ -32,22 +32,35 @@ func AddGenesisAccountCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command | |
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| info, err := kb.Get(args[0]) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| addr = info.GetAddress() | ||
| } | ||
|
|
||
| coins, err := sdk.ParseCoins(args[1]) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| vestingStart := viper.GetInt64(flagVestingStart) | ||
| vestingEnd := viper.GetInt64(flagVestingEnd) | ||
| vestingAmt, err := sdk.ParseCoins(viper.GetString(flagVestingAmt)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| coins.Sort() | ||
| vestingAmt.Sort() | ||
alexanderbez marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| genFile := config.GenesisFile() | ||
| if !common.FileExists(genFile) { | ||
| return fmt.Errorf("%s does not exist, run `gaiad init` first", genFile) | ||
| } | ||
|
|
||
| genDoc, err := LoadGenesisDoc(cdc, genFile) | ||
| if err != nil { | ||
| return err | ||
|
|
@@ -58,7 +71,7 @@ func AddGenesisAccountCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command | |
| return err | ||
| } | ||
|
|
||
| appState, err = addGenesisAccount(cdc, appState, addr, coins, vestingAmt, vestingStart, vestingEnd) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -74,10 +87,18 @@ func AddGenesisAccountCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command | |
|
|
||
| cmd.Flags().String(cli.HomeFlag, app.DefaultNodeHome, "node's home directory") | ||
| cmd.Flags().String(flagClientHome, app.DefaultCLIHome, "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 | ||
| } | ||
|
|
||
| func addGenesisAccount( | ||
| cdc *codec.Codec, appState app.GenesisState, addr sdk.AccAddress, | ||
| coins, vestingAmt sdk.Coins, vestingStart, vestingEnd int64, | ||
| ) (app.GenesisState, error) { | ||
|
|
||
| for _, stateAcc := range appState.Accounts { | ||
| if stateAcc.Address.Equals(addr) { | ||
| return appState, fmt.Errorf("the application state already contains account %v", addr) | ||
|
|
@@ -86,6 +107,38 @@ func addGenesisAccount(cdc *codec.Codec, appState app.GenesisState, addr sdk.Acc | |
|
|
||
| acc := auth.NewBaseAccountWithAddress(addr) | ||
| acc.Coins = coins | ||
|
|
||
| if !vestingAmt.IsZero() { | ||
| var vacc auth.VestingAccount | ||
|
|
||
| bvacc := &auth.BaseVestingAccount{ | ||
| BaseAccount: &acc, | ||
| OriginalVesting: vestingAmt, | ||
| EndTime: vestingEnd, | ||
| } | ||
|
|
||
| if bvacc.OriginalVesting.IsAllGT(acc.Coins) { | ||
alessio marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return appState, fmt.Errorf("vesting amount cannot be greater than total amount") | ||
| } | ||
| if vestingStart >= vestingEnd { | ||
| return appState, fmt.Errorf("vesting start time must before end time") | ||
| } | ||
|
|
||
| if vestingStart != 0 { | ||
| vacc = &auth.ContinuousVestingAccount{ | ||
| BaseVestingAccount: bvacc, | ||
| StartTime: vestingStart, | ||
| } | ||
| } else { | ||
| vacc = &auth.DelayedVestingAccount{ | ||
| BaseVestingAccount: bvacc, | ||
| } | ||
| } | ||
|
|
||
| appState.Accounts = append(appState.Accounts, app.NewGenesisAccountI(vacc)) | ||
| } else { | ||
| appState.Accounts = append(appState.Accounts, app.NewGenesisAccount(&acc)) | ||
| } | ||
|
|
||
| return appState, nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
++