git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
8cf97fd
)
minor fix: unneeded
author
ThomasV
<thomasv@gitorious>
Sat, 23 Feb 2013 16:23:12 +0000 (17:23 +0100)
committer
ThomasV
<thomasv@gitorious>
Sat, 23 Feb 2013 16:23:12 +0000 (17:23 +0100)
lib/deserialize.py
patch
|
blob
|
history
diff --git
a/lib/deserialize.py
b/lib/deserialize.py
index
3e551a5
..
12d6729
100644
(file)
--- a/
lib/deserialize.py
+++ b/
lib/deserialize.py
@@
-354,7
+354,6
@@
def get_address_from_input_script(bytes):
match2 = [ opcodes.OP_2, opcodes.OP_PUSHDATA4, opcodes.OP_PUSHDATA4, opcodes.OP_PUSHDATA4, opcodes.OP_3, opcodes.OP_CHECKMULTISIG ]
if match_decoded(dec2, match2):
pubkeys = [ dec2[1][1].encode('hex'), dec2[2][1].encode('hex'), dec2[3][1].encode('hex') ]
- s = multisig_script(pubkeys)
return pubkeys, signatures, hash_160_to_bc_address(hash_160(redeemScript), 5)
raise BaseException("no match for scriptsig")