git://git.novaco.in
/
electrum-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
f764f03
)
remove comment from log
author
ThomasV
<thomasv@gitorious>
Thu, 31 Jan 2013 09:53:42 +0000 (13:53 +0400)
committer
ThomasV
<thomasv@gitorious>
Thu, 31 Jan 2013 09:53:42 +0000 (13:53 +0400)
backends/bitcoind/deserialize.py
patch
|
blob
|
history
diff --git
a/backends/bitcoind/deserialize.py
b/backends/bitcoind/deserialize.py
index
c84a009
..
75cbc3e
100644
(file)
--- a/
backends/bitcoind/deserialize.py
+++ b/
backends/bitcoind/deserialize.py
@@
-367,8
+367,6
@@
def get_address_from_output_script(bytes):
match = [ opcodes.OP_HASH160, opcodes.OP_PUSHDATA4, opcodes.OP_EQUAL ]
if match_decoded(decoded, match):
addr = hash_160_to_bc_address(decoded[1][1],5)
- print "p2sh", addr
return addr
- #raise BaseException("address not found in script") see ce35795fb64c268a52324b884793b3165233b1e6d678ccaadf760628ec34d76b
return "None"