From d2196ad68193966eae58602a39b754655bdbc9cd Mon Sep 17 00:00:00 2001 From: undeath Date: Wed, 25 Oct 2017 17:36:14 +0200 Subject: [PATCH] fix maker crash when verifying transaction with p2sh output in non-sw mode --- jmclient/jmclient/maker.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jmclient/jmclient/maker.py b/jmclient/jmclient/maker.py index 38543d0..9ef1436 100644 --- a/jmclient/jmclient/maker.py +++ b/jmclient/jmclient/maker.py @@ -128,7 +128,9 @@ class Maker(object): utxos = offerinfo["utxos"] cjaddr = offerinfo["cjaddr"] + cjaddr_script = btc.address_to_script(cjaddr) changeaddr = offerinfo["changeaddr"] + changeaddr_script = btc.address_to_script(changeaddr) amount = offerinfo["amount"] cjfee = offerinfo["offer"]["cjfee"] txfee = offerinfo["offer"]["txfee"] @@ -146,13 +148,11 @@ class Maker(object): times_seen_cj_addr = 0 times_seen_change_addr = 0 for outs in txd['outs']: - #FIXME: the type of address should be detected from the script (p2pkh/p2sh) - addr = self.wallet.script_to_address(outs['script']) - if addr == cjaddr: + if outs['script'] == cjaddr_script: times_seen_cj_addr += 1 if outs['value'] != amount: return (False, 'Wrong cj_amount. I expect ' + str(amount)) - if addr == changeaddr: + if outs['script'] == changeaddr_script: times_seen_change_addr += 1 if outs['value'] != expected_change_value: return (False, 'wrong change, i expect ' + str(