AaronFiore/electrum
1
0
Fork 0
Code Activity

transaction.get_address_from_output_script now handles witness version > 0

Browse Source
This commit is contained in:
SomberNight
2018-03-18 06:18:48 +01:00
parent 85b36e027f
commit 22061b4555
3 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/transaction.py
View File

@@ -423,9 +423,11 @@ def get_address_from_output_script(_bytes):
return TYPE_ADDRESS, hash160_to_p2sh(decoded[1][1])
# segwit address
match = [ opcodes.OP_0, opcodes.OP_PUSHDATA4 ]
if match_decoded(decoded, match):
return TYPE_ADDRESS, hash_to_segwit_addr(decoded[1][1])
possible_witness_versions = [opcodes.OP_0] + list(range(opcodes.OP_1, opcodes.OP_16 + 1))
for witver, opcode in enumerate(possible_witness_versions):
match = [ opcode, opcodes.OP_PUSHDATA4 ]
if match_decoded(decoded, match):
return TYPE_ADDRESS, hash_to_segwit_addr(decoded[1][1], witver=witver)
return TYPE_SCRIPT, bh2u(_bytes)