From 2a407e42542d37f8ae302d7509caa750904e7365 Mon Sep 17 00:00:00 2001
From: "John C. Vernaleo" <jcv@decred.org>
Date: Wed, 10 Feb 2016 17:48:44 -0500
Subject: [PATCH] Allow wallet to accept hex or words as seed.

Also clarify error message.

OK jrick, ay-p
---
 walletsetup.go | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/walletsetup.go b/walletsetup.go
index 3e3c616cd..9a22b6cfb 100644
--- a/walletsetup.go
+++ b/walletsetup.go
@@ -373,15 +373,27 @@ func promptConsoleSeed(reader *bufio.Reader) ([]byte, error) {
 		}
 
 		seedStrTrimmed := strings.TrimSpace(seedStr)
+		wordCount := strings.Count(seedStrTrimmed, " ") + 1
 
-		seed, err := pgpwordlist.ToBytesChecksum(seedStrTrimmed)
-		if err != nil || len(seed) < hdkeychain.MinSeedBytes ||
-			len(seed) > hdkeychain.MaxSeedBytes {
+		var seed []byte
+		if wordCount == 1 {
+			if len(seedStrTrimmed)%2 != 0 {
+				seedStrTrimmed = "0" + seedStrTrimmed
+			}
+			seed, err = hex.DecodeString(seedStrTrimmed)
 			if err != nil {
 				fmt.Printf("Input error: %v\n", err.Error())
 			}
-
+		} else {
+			seed, err = pgpwordlist.ToBytesChecksum(seedStrTrimmed)
+			if err != nil {
+				fmt.Printf("Input error: %v\n", err.Error())
+			}
+		}
+		if err != nil || len(seed) < hdkeychain.MinSeedBytes ||
+			len(seed) > hdkeychain.MaxSeedBytes {
 			fmt.Printf("Invalid seed specified.  Must be a "+
+				"word seed (usually 33 words) using the PGP wordlist or "+
 				"hexadecimal value that is at least %d bits and "+
 				"at most %d bits\n", hdkeychain.MinSeedBytes*8,
 				hdkeychain.MaxSeedBytes*8)