R4R: gen-tx: Support User Given Key Passwords #1856
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 |
|---|---|---|
|
|
@@ -3,19 +3,25 @@ package app | |
| import ( | ||
| "encoding/json" | ||
| "errors" | ||
| "fmt" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/client" | ||
| "github.com/cosmos/cosmos-sdk/server" | ||
| "github.com/cosmos/cosmos-sdk/server/config" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| "github.com/cosmos/cosmos-sdk/wire" | ||
| "github.com/cosmos/cosmos-sdk/x/auth" | ||
| "github.com/cosmos/cosmos-sdk/x/stake" | ||
|
|
||
| "github.com/spf13/pflag" | ||
|
|
||
| "github.com/tendermint/tendermint/crypto" | ||
| tmtypes "github.com/tendermint/tendermint/types" | ||
| ) | ||
|
|
||
| // DefaultKeyPass contains the default key password for genesis transactions | ||
| const DefaultKeyPass = "12345678" | ||
|
|
||
| var ( | ||
| // bonded tokens given to genesis validators/accounts | ||
| freeFermionVal = int64(100) | ||
|
|
@@ -81,30 +87,49 @@ type GaiaGenTx struct { | |
| PubKey string `json:"pub_key"` | ||
| } | ||
|
|
||
| // GaiaAppGenTx generates a Gaia genesis transaction. | ||
| func GaiaAppGenTx( | ||
| cdc *wire.Codec, pk crypto.PubKey, genTxConfig config.GenTx, | ||
| ) (appGenTx, cliPrint json.RawMessage, validator tmtypes.GenesisValidator, err error) { | ||
| if genTxConfig.Name == "" { | ||
| return nil, nil, tmtypes.GenesisValidator{}, errors.New("Must specify --name (validator moniker)") | ||
| } | ||
|
|
||
| buf := client.BufferStdin() | ||
| prompt := fmt.Sprintf("Password for account '%s' (default %s):", genTxConfig.Name, DefaultKeyPass) | ||
|
|
||
| keyPass, err := client.GetPassword(prompt, buf) | ||
| if err != nil && keyPass != "" { | ||
| // An error was returned that either failed to read the password from | ||
| // STDIN or the given password is not empty but failed to meet minimum | ||
| // length requirements. | ||
| return appGenTx, cliPrint, validator, err | ||
| } | ||
|
|
||
| if keyPass == "" { | ||
| keyPass = DefaultKeyPass | ||
| } | ||
|
There was a problem hiding this comment. what's the thinking here around providing the default password here if nothing is provided? Which situations will this come up in? I was thinking we'd just fail if somebody doesn't provide a pass? There was a problem hiding this comment. I'm lazy and don't want to enter anything (keeping inline with the current UX)? If we think absolutely requiring a user-provided password is a better UX experience, then I can remove it @rigelrozanski . There was a problem hiding this comment. I think a better solution would be to have a key type with no password. Using a default password only burns computation time. This will be easier to do if we figure out a good way to refactor the keybase. There was a problem hiding this comment. Mhmmm, I'll need to think on that for a bit. What shall we do for now? Just not supply a default? There was a problem hiding this comment. I don't really have a preference rn. I would like just having no passwords as an option later. (I'll try to spend some time today writing a way to do the keybase refactor) |
||
|
|
||
| addr, secret, err := server.GenerateSaveCoinKey( | ||
| genTxConfig.CliRoot, | ||
| genTxConfig.Name, | ||
| keyPass, | ||
| genTxConfig.Overwrite, | ||
| ) | ||
| if err != nil { | ||
| return appGenTx, cliPrint, validator, err | ||
| } | ||
|
|
||
| mm := map[string]string{"secret": secret} | ||
| bz, err := cdc.MarshalJSON(mm) | ||
| if err != nil { | ||
| return appGenTx, cliPrint, validator, err | ||
| } | ||
|
|
||
| cliPrint = json.RawMessage(bz) | ||
| appGenTx, _, validator, err = GaiaAppGenTxNF(cdc, pk, addr, genTxConfig.Name) | ||
|
|
||
| return appGenTx, cliPrint, validator, err | ||
| } | ||
|
|
||
| // Generate a gaia genesis transaction without flags | ||
|
|
||
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
Oops, something went wrong.
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.
typically we try to keep comments as non-verbose as possible, which often means they are not sentences - I think this makes sense - here just a general comment