electrum

commit c6fce4b7ccb6bcd697889aed4ef90157b9f46a2a
parent 610b37890f13191e96b347570334779b2e062462
Author: Dev Random <devrandom@users.noreply.github.com>
Date:   Thu,  7 Jun 2018 08:44:48 -0700

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


Diffstat:
M
lib/transaction.py
 | 
5
++++-

1 file changed, 4 insertions(+), 1 deletion(-)
diff --git 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':