tMerge pull request #1095 from railgun74/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit b4ff652d898947528b0cc4111fbaa8e5bc1eb603
DIR parent 5b53d94f71dcf387feacaea569459a0a32c676f8
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Thu, 19 Mar 2015 17:58:21 +0100
Merge pull request #1095 from railgun74/master
Let wallet recovery use 64 character hex strings and legacy 24 word seeds.
Diffstat:
M lib/bitcoin.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
DIR diff --git a/lib/bitcoin.py b/lib/bitcoin.py
t@@ -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