Merge pull request #1095 from railgun74/master

Let wallet recovery use 64 character hex strings and legacy 24 word seeds.
2015-03-19 17:58:21 +01:00 · 2015-03-19 17:58:21 +01:00 · b4ff652d89
parent 5b53d94f71 41127db32d
commit b4ff652d89
1 changed files with 2 additions and 2 deletions
--- a/lib/bitcoin.py
+++ b/lib/bitcoin.py
@ -163,11 +163,11 @@ def is_old_seed(seed):

    try:
        seed.decode('hex')
-        is_hex = (len(seed) == 32)
+        is_hex = (len(seed) == 32 or len(seed) == 64)
    except Exception:
        is_hex = False

-    return is_hex or (uses_electrum_words and len(words) == 12)
+    return is_hex or (uses_electrum_words and (len(words) == 12 or len(words) == 24))


 # pywallet openssl private key implementation