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

fix log bug

Browse Source
This commit is contained in:
jackjack-jj 2013-04-16 00:20:00 +02:00
parent 08cd470e22
commit 924e32eaab
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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.1" pywversion="2.0.2"
never_update=False never_update=False
# #
@ -2189,6 +2189,7 @@ def read_wallet(json_db, db_env, walletfile, print_wallet, print_wallet_transact
if crypted and passphrase: if crypted and passphrase:
check = True check = True
ppcorrect=True
for k in json_db['keys']: for k in json_db['keys']:
if 'encrypted_privkey' in k: if 'encrypted_privkey' in k:
ckey = k['encrypted_privkey'].decode('hex') ckey = k['encrypted_privkey'].decode('hex')
@ -2203,6 +2204,7 @@ def read_wallet(json_db, db_env, walletfile, print_wallet, print_wallet_transact
pkey = EC_KEY(int('0x' + secret.encode('hex'), 16)) pkey = EC_KEY(int('0x' + secret.encode('hex'), 16))
if public_key != GetPubKey(pkey, compressed): if public_key != GetPubKey(pkey, compressed):
print "The wallet is crypted and the passphrase is incorrect" print "The wallet is crypted and the passphrase is incorrect"
ppcorrect=False
break break
sec = SecretToASecret(secret, compressed) sec = SecretToASecret(secret, compressed)
@ -2215,7 +2217,8 @@ def read_wallet(json_db, db_env, walletfile, print_wallet, print_wallet_transact
# del(k['secret']) # del(k['secret'])
# del(k['pubkey']) # del(k['pubkey'])
private_keys.append(sec) private_keys.append(sec)
print "The wallet is crypted and the passphrase is correct" if ppcorrect:
print "The wallet is crypted and the passphrase is correct"
for k in json_db['keys']: for k in json_db['keys']:
if k['compressed'] and 'secret' in k: if k['compressed'] and 'secret' in k: