From 76300cef097ca8ea2e98dec8dfa8907ea002a86b Mon Sep 17 00:00:00 2001
From: Potuz <potuz@potuz.net>
Date: Wed, 14 Oct 2020 16:55:47 -0300
Subject: [PATCH] Recommend non-HD wallets (#7524)

* Recommend non-HD wallets

* Fix ordering

* set non-HD wallet as first option

* fix go fmt

* changed keymanager-types-Kind enum

Co-authored-by: Raul Jordan <raul@prysmaticlabs.com>
---
 validator/accounts/v2/wallet/wallet.go | 4 ++--
 validator/accounts/v2/wallet_create.go | 2 +-
 validator/keymanager/v2/types.go       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/validator/accounts/v2/wallet/wallet.go b/validator/accounts/v2/wallet/wallet.go
index 7c1e1607bf..7cd9014078 100644
--- a/validator/accounts/v2/wallet/wallet.go
+++ b/validator/accounts/v2/wallet/wallet.go
@@ -57,8 +57,8 @@ var (
 	)
 	// KeymanagerKindSelections as friendly text.
 	KeymanagerKindSelections = map[v2keymanager.Kind]string{
-		v2keymanager.Derived: "HD Wallet (Recommended)",
-		v2keymanager.Direct:  "Non-HD Wallet (Most Basic)",
+		v2keymanager.Direct:  "Non-HD Wallet (Recommended)",
+		v2keymanager.Derived: "HD Wallet (Least secure)",
 		v2keymanager.Remote:  "Remote Signing Wallet (Advanced)",
 	}
 	// ValidateExistingPass checks that an input cannot be empty.
diff --git a/validator/accounts/v2/wallet_create.go b/validator/accounts/v2/wallet_create.go
index 539e28e8b5..06bda4f9f7 100644
--- a/validator/accounts/v2/wallet_create.go
+++ b/validator/accounts/v2/wallet_create.go
@@ -192,8 +192,8 @@ func inputKeymanagerKind(cliCtx *cli.Context) (v2keymanager.Kind, error) {
 	promptSelect := promptui.Select{
 		Label: "Select a type of wallet",
 		Items: []string{
-			wallet.KeymanagerKindSelections[v2keymanager.Derived],
 			wallet.KeymanagerKindSelections[v2keymanager.Direct],
+			wallet.KeymanagerKindSelections[v2keymanager.Derived],
 			wallet.KeymanagerKindSelections[v2keymanager.Remote],
 		},
 	}
diff --git a/validator/keymanager/v2/types.go b/validator/keymanager/v2/types.go
index 077493f93b..a59d31876a 100644
--- a/validator/keymanager/v2/types.go
+++ b/validator/keymanager/v2/types.go
@@ -30,10 +30,10 @@ type Keystore struct {
 type Kind int
 
 const (
-	// Derived keymanager using a hierarchical-deterministic algorithm.
-	Derived Kind = iota
 	// Direct keymanager defines an on-disk, encrypted keystore-capable store.
-	Direct
+	Direct Kind = iota
+	// Derived keymanager using a hierarchical-deterministic algorithm.
+	Derived
 	// Remote keymanager capable of remote-signing data.
 	Remote
 )