Merge branch 'feature/mnemonic' into develop

2 files changed, 15 insertions, 3 deletions

diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go
index c82e7dcd8..e1e803771 100644
--- a/ethereum/ethereum.go
+++ b/ethereum/ethereum.go
@@ -11,6 +11,7 @@ import (
 	"os"
 	"os/signal"
 	"runtime"
+	"strings"
 )
 
 const Debug = true
@@ -78,7 +79,17 @@ func main() {
 			}
 
 			if r == "y" {
-				utils.ImportPrivateKey(ImportKey)
+				mnemonic := strings.Split(ImportKey, " ")
+				if len(mnemonic) == 24 {
+					fmt.Println("Got mnemonic key, importing.")
+					key := ethutil.MnemonicDecode(mnemonic)
+					utils.ImportPrivateKey(key)
+				} else if len(mnemonic) == 1 {
+					fmt.Println("Got hex key, importing.")
+					utils.ImportPrivateKey(ImportKey)
+				} else {
+					fmt.Println("Did not recognise format, exiting.")
+				}
 				os.Exit(0)
 			}
 		} else {
diff --git a/utils/keys.go b/utils/keys.go
index 910c8c477..2f39c10b2 100644
--- a/utils/keys.go
+++ b/utils/keys.go
@@ -12,6 +12,7 @@ func CreateKeyPair(force bool) {
 		pub, prv := secp256k1.GenerateKeyPair()
 		pair := &ethutil.Key{PrivateKey: prv, PublicKey: pub}
 		ethutil.Config.Db.Put([]byte("KeyRing"), pair.RlpEncode())
+		mne := ethutil.MnemonicEncode(ethutil.Hex(prv))
 
 		fmt.Printf(`
 Generating new address and keypair.
@@ -22,8 +23,8 @@ addr: %x
 prvk: %x
 pubk: %x
 ++++++++++++++++++++++++++++++++++++++++++++
-
-`, pair.Address(), prv, pub)
+save these words so you can restore your account later: %s
+`, pair.Address(), prv, pub, mne)
 
 	}
 }