git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
c51efc0
)
fix
author
ThomasV
<thomasv@gitorious>
Fri, 13 Sep 2013 20:13:17 +0000 (22:13 +0200)
committer
ThomasV
<thomasv@gitorious>
Fri, 13 Sep 2013 20:13:17 +0000 (22:13 +0200)
lib/wallet.py
patch
|
blob
|
history
diff --git
a/lib/wallet.py
b/lib/wallet.py
index
d1c6484
..
612fe07
100644
(file)
--- a/
lib/wallet.py
+++ b/
lib/wallet.py
@@
-619,7
+619,8
@@
class Wallet:
if redeem_script:
addr = hash_160_to_bc_address(hash_160(redeem_script.decode('hex')), 5)
else:
- addr = transaction.get_address_from_output_script(txin["raw_output_script"].decode('hex'))
+ import transaction
+ _, addr = transaction.get_address_from_output_script(txin["raw_output_script"].decode('hex'))
txin['address'] = addr
# add private keys that are in the wallet