RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

follow-up 1d6f000868

Browse Source 
I broke multisig..
This commit is contained in:
SomberNight 2018-04-27 21:44:29 +02:00
parent 68d8919416
commit ea55d886b7
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/transaction.py
View File

@ -361,9 +361,9 @@ def parse_scriptSig(d, _bytes):
match = [ opcodes.OP_0 ] + [ opcodes.OP_PUSHDATA4 ] * (len(decoded) - 1) match = [ opcodes.OP_0 ] + [ opcodes.OP_PUSHDATA4 ] * (len(decoded) - 1)
if match_decoded(decoded, match): if match_decoded(decoded, match):
x_sig = [bh2u(x[1]) for x in decoded[1:-1]] x_sig = [bh2u(x[1]) for x in decoded[1:-1]]
redeem_script = bh2u(decoded[-1][1]) redeem_script_unsanitized = decoded[-1][1] # for partial multisig txn, this has x_pubkeys
try: try:
m, n, x_pubkeys, pubkeys = parse_redeemScript_multisig(bfh(redeem_script)) m, n, x_pubkeys, pubkeys, redeem_script = parse_redeemScript_multisig(redeem_script_unsanitized)
except NotRecognizedRedeemScript: except NotRecognizedRedeemScript:
print_error("parse_scriptSig: cannot find address in input script (p2sh?)", print_error("parse_scriptSig: cannot find address in input script (p2sh?)",
bh2u(_bytes)) bh2u(_bytes))
@ -398,10 +398,11 @@ def parse_redeemScript_multisig(redeem_script: bytes):
raise NotRecognizedRedeemScript() raise NotRecognizedRedeemScript()
x_pubkeys = [bh2u(x[1]) for x in dec2[1:-2]] x_pubkeys = [bh2u(x[1]) for x in dec2[1:-2]]
pubkeys = [safe_parse_pubkey(x) for x in x_pubkeys] pubkeys = [safe_parse_pubkey(x) for x in x_pubkeys]
redeem_script2 = bfh(multisig_script(pubkeys, m)) redeem_script2 = bfh(multisig_script(x_pubkeys, m))
if redeem_script2 != redeem_script: if redeem_script2 != redeem_script:
raise NotRecognizedRedeemScript() raise NotRecognizedRedeemScript()
return m, n, x_pubkeys, pubkeys redeem_script_sanitized = multisig_script(pubkeys, m)
return m, n, x_pubkeys, pubkeys, redeem_script_sanitized
def get_address_from_output_script(_bytes, *, net=None): def get_address_from_output_script(_bytes, *, net=None):
@ -503,9 +504,9 @@ def parse_witness(vds, txin):
if txin['type'] == 'coinbase': if txin['type'] == 'coinbase':
pass pass
elif txin['type'] == 'p2wsh-p2sh' or n > 2: elif txin['type'] == 'p2wsh-p2sh' or n > 2:
witness_script = w[-1] witness_script_unsanitized = w[-1] # for partial multisig txn, this has x_pubkeys
try: try:
m, n, x_pubkeys, pubkeys = parse_redeemScript_multisig(bfh(witness_script)) m, n, x_pubkeys, pubkeys, witness_script = parse_redeemScript_multisig(bfh(witness_script_unsanitized))
except NotRecognizedRedeemScript: except NotRecognizedRedeemScript:
raise UnknownTxinType() raise UnknownTxinType()
txin['signatures'] = parse_sig(w[1:-1]) txin['signatures'] = parse_sig(w[1:-1])