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

@@ -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.

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],
 		},
 	}

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
 )