AaronFiore/electrum
1
0
Fork 0
Code Activity

do not actually compute the nested p2wsh-p2sh script if just estimating size (#4412)

Browse Source
This commit is contained in:
Dev Random
2018-06-07 08:44:48 -07:00
committed by ghost43
parent 610b37890f
commit c6fce4b7cc
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/transaction.py
View File

@@ -825,7 +825,10 @@ class Transaction:
scriptSig = bitcoin.p2wpkh_nested_script(pubkey) scriptSig = bitcoin.p2wpkh_nested_script(pubkey)
return push_script(scriptSig) return push_script(scriptSig)
elif _type == 'p2wsh-p2sh': elif _type == 'p2wsh-p2sh':
witness_script = self.get_preimage_script(txin) if estimate_size:
witness_script = ''
else:
witness_script = self.get_preimage_script(txin)
scriptSig = bitcoin.p2wsh_nested_script(witness_script) scriptSig = bitcoin.p2wsh_nested_script(witness_script)
return push_script(scriptSig) return push_script(scriptSig)
elif _type == 'address': elif _type == 'address':