Merge pull request #1037 from cosmos/cwgoes/misc-fixes

Fix `gaiad init gen-tx`
This commit is contained in:
Rigel 2018-05-30 20:16:17 -04:00 committed by GitHub
commit 5773da1eeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions

View File

@ -65,7 +65,7 @@ func GaiaAppInit() server.AppInit {
fsAppGenState := pflag.NewFlagSet("", pflag.ContinueOnError) fsAppGenState := pflag.NewFlagSet("", pflag.ContinueOnError)
fsAppGenTx := pflag.NewFlagSet("", pflag.ContinueOnError) fsAppGenTx := pflag.NewFlagSet("", pflag.ContinueOnError)
fsAppGenTx.String(flagName, "", "validator moniker, if left blank, do not add validator") fsAppGenTx.String(flagName, "", "validator moniker, required")
fsAppGenTx.String(flagClientHome, DefaultCLIHome, fsAppGenTx.String(flagClientHome, DefaultCLIHome,
"home directory for the client, used for key generation") "home directory for the client, used for key generation")
fsAppGenTx.Bool(flagOWK, false, "overwrite the accounts created") fsAppGenTx.Bool(flagOWK, false, "overwrite the accounts created")
@ -91,7 +91,11 @@ func GaiaAppGenTx(cdc *wire.Codec, pk crypto.PubKey) (
clientRoot := viper.GetString(flagClientHome) clientRoot := viper.GetString(flagClientHome)
overwrite := viper.GetBool(flagOWK) overwrite := viper.GetBool(flagOWK)
name := viper.GetString(flagName) name := viper.GetString(flagName)
var addr sdk.Address if name == "" {
return nil, nil, tmtypes.GenesisValidator{}, errors.New("Must specify --name (validator moniker)")
}
var addr sdk.Address
var secret string var secret string
addr, secret, err = server.GenerateSaveCoinKey(clientRoot, name, "1234567890", overwrite) addr, secret, err = server.GenerateSaveCoinKey(clientRoot, name, "1234567890", overwrite)
if err != nil { if err != nil {