From a93329e98f4a0e6dadd7d1bcf7f51171fb16382f Mon Sep 17 00:00:00 2001 From: puneet2019 <59960662+puneet2019@users.noreply.github.com> Date: Thu, 27 Aug 2020 19:06:19 +0530 Subject: [PATCH] fix keys add interactive (#7049) * fixed interactive mode key add. key addition of interactive mode failed while being asked to generate new seed. * fixed interactive mode key addition key addition of interactive mode failed while being asked to generate new seed. * Update client/keys/add.go Co-authored-by: Alessio Treglia * Update add.go * Update client/keys/add.go Co-authored-by: Alessio Treglia Co-authored-by: SaReN Co-authored-by: Alessio Treglia Co-authored-by: Anil Kumar Kammari Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com> --- client/keys/add.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/client/keys/add.go b/client/keys/add.go index 16192cc53..7b25ebe3f 100644 --- a/client/keys/add.go +++ b/client/keys/add.go @@ -226,13 +226,8 @@ func RunAddCmd(cmd *cobra.Command, args []string, kb keyring.Keyring, inBuf *buf var mnemonic, bip39Passphrase string recover, _ := cmd.Flags().GetBool(flagRecover) - if interactive || recover { - bip39Message := "Enter your bip39 mnemonic" - if !recover { - bip39Message = "Enter your bip39 mnemonic, or hit enter to generate one." - } - - mnemonic, err = input.GetString(bip39Message, inBuf) + if recover { + mnemonic, err = input.GetString("Enter your bip39 mnemonic", inBuf) if err != nil { return err } @@ -240,6 +235,15 @@ func RunAddCmd(cmd *cobra.Command, args []string, kb keyring.Keyring, inBuf *buf if !bip39.IsMnemonicValid(mnemonic) { return errors.New("invalid mnemonic") } + } else if interactive { + mnemonic, err = input.GetString("Enter your bip39 mnemonic, or hit enter to generate one.", inBuf) + if err != nil { + return err + } + + if !bip39.IsMnemonicValid(mnemonic) && mnemonic != "" { + return errors.New("invalid mnemonic") + } } if len(mnemonic) == 0 {