thandle imported keys as well with deseed and reseed - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit a5496a5477a65931e3232c0585ecfed6a3d5456a
DIR parent 5d43811a90c13b7943a7768cbc39f89351a81d2c
HTML Author: ThomasV <thomasv@gitorious>
Date: Thu, 17 May 2012 18:10:36 +0200
handle imported keys as well with deseed and reseed
Diffstat:
M electrum | 14 ++++++++++++--
M lib/wallet.py | 1 +
2 files changed, 13 insertions(+), 2 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -279,9 +279,10 @@ if __name__ == '__main__':
print "Warning: you are going to extract the seed from '%s'\nThe seed will be saved in '%s'"%(wallet.path,ns)
if raw_input("Are you sure you want to continue? (y/n) ") in ['y','Y','yes']:
f = open(ns,'w')
- f.write(wallet.seed)
+ f.write(repr({'seed':wallet.seed, 'imported_keys':wallet.imported_keys})+"\n")
f.close()
wallet.seed = ''
+ for k in wallet.imported_keys.keys(): wallet.imported_keys[k] = ''
wallet.save()
print "Done."
else:
t@@ -294,14 +295,23 @@ if __name__ == '__main__':
ns = wallet.path + '.seed'
try:
f = open(ns,'r')
- seed = f.read()
+ data = f.read()
f.close()
except:
print "seed file not found"
sys.exit()
+ try:
+ import ast
+ d = ast.literal_eval( data )
+ seed = d['seed']
+ imported_keys = d.get('imported_keys',{})
+ except:
+ print "error with seed file"
+ sys.exit(1)
mpk = wallet.master_public_key
wallet.seed = seed
+ wallet.imported_keys = imported_keys
wallet.use_encryption = False
wallet.init_mpk(seed)
if mpk == wallet.master_public_key:
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -382,6 +382,7 @@ class Wallet:
if address in self.imported_keys.keys():
b = self.pw_decode( self.imported_keys[address], password )
+ if not b: return None
b = ASecretToSecret( b )
secexp = int( b.encode('hex'), 16)
else: