TrueCloudLab/frostfs-node
21
1
Fork 27
Code Issues 108 Pull requests 3 Projects Releases 1 Activity Actions

[#610] neofs-cli: replace --key flag with --wif

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-06-15 18:56:05 +03:00 committed by Alex Vanin
parent ad90b07ed5
commit c172fcc11f
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cmd/neofs-cli/modules/root.go
View file

@ -85,8 +85,8 @@ func init() {
rootCmd.PersistentFlags().StringP("binary-key", "", "", "path to the raw private key file") rootCmd.PersistentFlags().StringP("binary-key", "", "", "path to the raw private key file")
_ = viper.BindPFlag("binary-key", rootCmd.PersistentFlags().Lookup("binary-key")) _ = viper.BindPFlag("binary-key", rootCmd.PersistentFlags().Lookup("binary-key"))
rootCmd.PersistentFlags().StringP("key", "k", "", "private key in hex, WIF, NEP-2 or filepath") rootCmd.PersistentFlags().StringP("wif", "", "", "WIF or NEP-2")
_ = viper.BindPFlag("key", rootCmd.PersistentFlags().Lookup("key")) _ = viper.BindPFlag("wif", rootCmd.PersistentFlags().Lookup("wif"))
rootCmd.PersistentFlags().StringP("wallet", "w", "", "path to the wallet") rootCmd.PersistentFlags().StringP("wallet", "w", "", "path to the wallet")
_ = viper.BindPFlag("wallet", rootCmd.PersistentFlags().Lookup("wallet")) _ = viper.BindPFlag("wallet", rootCmd.PersistentFlags().Lookup("wallet"))
@ -161,12 +161,17 @@ func getKey() (*ecdsa.PrivateKey, error) {
return getKeyFromWallet(w, viper.GetString("address")) return getKeyFromWallet(w, viper.GetString("address"))
} }
privateKey := viper.GetString("key") wif := viper.GetString("wif")
if len(privateKey) == nep2Base58Length { if len(wif) == nep2Base58Length {
return getKeyFromNEP2(privateKey) return getKeyFromNEP2(wif)
} }
return nil, errInvalidKey priv, err := keys.NewPrivateKeyFromWIF(wif)
if err != nil {
return nil, fmt.Errorf("%w: %v", errInvalidKey, err)
}
return &priv.PrivateKey, nil
} }
func getKeyFromFile(keyPath string) (*ecdsa.PrivateKey, error) { func getKeyFromFile(keyPath string) (*ecdsa.PrivateKey, error) {