RanchiMall/pywallet-tools
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wallet recovery

Browse Source
This commit is contained in:
jackjack-jj 2013-07-17 19:39:04 +02:00
parent 0d200609b6
commit 682f4c1af2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pywallet.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
#-*- coding: utf-8 -*- #-*- coding: utf-8 -*-
pywversion="2.0.15" pywversion="2.0.16"
never_update=False never_update=False
# #
@ -2288,7 +2288,9 @@ def importprivkey(db, sec, label, reserve, keyishex, verbose=True, addrv=addrtyp
global crypter, passphrase, json_db global crypter, passphrase, json_db
crypted = 'salt' in json_db['mkey'] crypted = False
if 'mkey' in json_db.keys() and 'salt' in json_db['mkey']:
crypted = True
if crypted: if crypted:
if passphrase: if passphrase:
cry_master = json_db['mkey']['encrypted_key'].decode('hex') cry_master = json_db['mkey']['encrypted_key'].decode('hex')