From cb2813fa05a46a0c0725396945fc4fedfcea7720 Mon Sep 17 00:00:00 2001
From: Ivan Martinez <ivanthegreatdev@gmail.com>
Date: Mon, 8 Jun 2020 10:03:14 -0400
Subject: [PATCH] Force manual validator account creation (#6165)

* Force manual validator account creation

* Fix

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
---
 validator/keymanager/direct_keystore.go | 11 ++++-------
 validator/node/node.go                  |  6 ++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/validator/keymanager/direct_keystore.go b/validator/keymanager/direct_keystore.go
index 3d8b815068a9..034e5aa5c09c 100644
--- a/validator/keymanager/direct_keystore.go
+++ b/validator/keymanager/direct_keystore.go
@@ -2,6 +2,7 @@ package keymanager
 
 import (
 	"encoding/json"
+	"errors"
 	"os"
 	"strings"
 
@@ -53,13 +54,7 @@ func NewKeystore(input string) (KeyManager, string, error) {
 	if err != nil {
 		return nil, keystoreOptsHelp, err
 	}
-	if !exists {
-		// If an account does not exist, we create a new one and start the node.
-		opts.Path, opts.Passphrase, err = accounts.CreateValidatorAccount(opts.Path, opts.Passphrase)
-		if err != nil {
-			return nil, keystoreOptsHelp, err
-		}
-	} else {
+	if exists {
 		if opts.Passphrase == "" {
 			log.Info("Enter your validator account password:")
 			bytePassword, err := terminal.ReadPassword(int(os.Stdin.Fd()))
@@ -73,6 +68,8 @@ func NewKeystore(input string) (KeyManager, string, error) {
 		if err := accounts.VerifyAccountNotExists(opts.Path, opts.Passphrase); err == nil {
 			log.Info("No account found, creating new validator account...")
 		}
+	} else {
+		return nil, "", errors.New("no validator keys found, please use validator accounts create")
 	}
 
 	keyMap, err := accounts.DecryptKeysFromKeystore(opts.Path, params.BeaconConfig().ValidatorPrivkeyFileName, opts.Passphrase)
diff --git a/validator/node/node.go b/validator/node/node.go
index 45ace857ccee..e923c451d2ff 100644
--- a/validator/node/node.go
+++ b/validator/node/node.go
@@ -295,8 +295,10 @@ func selectKeyManager(ctx *cli.Context) (keymanager.KeyManager, error) {
 		return nil, fmt.Errorf("unknown keymanager %q", manager)
 	}
 	if err != nil {
-		// Print help for the keymanager
-		fmt.Println(help)
+		if help != "" {
+			// Print help for the keymanager
+			fmt.Println(help)
+		}
 		return nil, err
 	}
 	return km, nil