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

2018-06-07 08:44:48 -07:00 · 2018-06-07 08:44:48 -07:00 · c6fce4b7cc
commit c6fce4b7cc
parent 610b37890f
1 changed files with 4 additions and 1 deletions
--- a/lib/transaction.py
+++ b/lib/transaction.py
@ -825,7 +825,10 @@ class Transaction:
            scriptSig = bitcoin.p2wpkh_nested_script(pubkey)
            return push_script(scriptSig)
        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)
            return push_script(scriptSig)
        elif _type == 'address':