github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-10 16:08:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Resolve Accounts-v2 Feedback (#6953)

Browse Source 
* Radek feedback
* Merge refs/heads/master into final-accounts-feedback
* Apply suggestions from code review
* Merge refs/heads/master into final-accounts-feedback
* Merge refs/heads/master into final-accounts-feedback
This commit is contained in:
Raul Jordan
2020-08-10 13:14:10 -05:00
committed by GitHub
parent 335d31688f
commit a7f4293eb3
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
validator/accounts/v2/accounts_create.go
View File

@@ -3,6 +3,7 @@ package v2
import (
"context"
"fmt"
"strings"
"github.com/manifoldco/promptui"
"github.com/pkg/errors"
@@ -26,6 +27,9 @@ func CreateAccount(cliCtx *cli.Context) error {
}
skipMnemonicConfirm := cliCtx.Bool(flags.SkipMnemonicConfirmFlag.Name)
keymanager, err := wallet.InitializeKeymanager(ctx, skipMnemonicConfirm)
if err != nil && strings.Contains(err.Error(), "invalid checksum") {
return errors.New("wrong wallet password entered")
}
if err != nil {
return errors.Wrap(err, "could not initialize keymanager")
}

4
validator/accounts/v2/accounts_list.go
View File

@@ -4,6 +4,7 @@ import (
"context"
"fmt"
"path/filepath"
"strings"
"github.com/logrusorgru/aurora"
"github.com/pkg/errors"
@@ -27,6 +28,9 @@ func ListAccounts(cliCtx *cli.Context) error {
return errors.Wrap(err, "could not open wallet")
}
keymanager, err := wallet.InitializeKeymanager(ctx, true /* skip mnemonic confirm */)
if err != nil && strings.Contains(err.Error(), "invalid checksum") {
return errors.New("wrong wallet password entered")
}
if err != nil {
return errors.Wrap(err, "could not initialize keymanager")
}

6
validator/accounts/v2/wallet_create.go
View File

@@ -32,7 +32,7 @@ func CreateWallet(cliCtx *cli.Context) (*Wallet, error) {
if err = createDirectKeymanagerWallet(cliCtx, w); err != nil {
return nil, errors.Wrap(err, "could not initialize wallet with direct keymanager")
}
log.WithField("wallet-path", w.walletDir).Info(
log.WithField("--wallet-dir", w.walletDir).Info(
"Successfully created wallet with on-disk keymanager configuration. " +
"Make a new validator account with ./prysm.sh validator accounts-v2 create",
)
@@ -40,7 +40,7 @@ func CreateWallet(cliCtx *cli.Context) (*Wallet, error) {
if err = createDerivedKeymanagerWallet(cliCtx, w); err != nil {
return nil, errors.Wrap(err, "could not initialize wallet with derived keymanager")
}
log.WithField("wallet-path", w.walletDir).Info(
log.WithField("--wallet-dir", w.walletDir).Info(
"Successfully created HD wallet and saved configuration to disk. " +
"Make a new validator account with ./prysm.sh validator accounts-2 create",
)
@@ -48,7 +48,7 @@ func CreateWallet(cliCtx *cli.Context) (*Wallet, error) {
if err = createRemoteKeymanagerWallet(cliCtx, w); err != nil {
return nil, errors.Wrap(err, "could not initialize wallet with remote keymanager")
}
log.WithField("wallet-path", w.walletDir).Info(
log.WithField("--wallet-dir", w.walletDir).Info(
"Successfully created wallet with remote keymanager configuration",
)
default: