git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
a1be161
)
do not raise exception on strange input scripts
author
ecdsa
<ecdsa@github>
Tue, 12 Mar 2013 23:55:08 +0000 (
00:55
+0100)
committer
ecdsa
<ecdsa@github>
Tue, 12 Mar 2013 23:55:08 +0000 (
00:55
+0100)
lib/deserialize.py
patch
|
blob
|
history
diff --git
a/lib/deserialize.py
b/lib/deserialize.py
index
5fe2ee6
..
744261c
100644
(file)
--- a/
lib/deserialize.py
+++ b/
lib/deserialize.py
@@
-356,7
+356,8
@@
def get_address_from_input_script(bytes):
pubkeys = [ dec2[1][1].encode('hex'), dec2[2][1].encode('hex'), dec2[3][1].encode('hex') ]
return pubkeys, signatures, hash_160_to_bc_address(hash_160(redeemScript), 5)
- raise BaseException("no match for scriptsig")
+ print_error("cannot find address in input script", bytes.encode('hex'))
+ return "(None)"