tpy3.4 compat: follow-up e13183ea7a4d43c861a973f4792980d637005074 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit cbf1b5d9d5670fc84fbe47d6d20eddda24ea20f5
DIR parent 530980ea37b9627b0ab26b63acc8866b799b23bc
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Sun, 29 Apr 2018 15:06:19 +0200
py3.4 compat: follow-up e13183ea7a4d43c861a973f4792980d637005074
Diffstat:
M lib/transaction.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
DIR diff --git a/lib/transaction.py b/lib/transaction.py
t@@ -574,7 +574,7 @@ def deserialize(raw):
-def multisig_script(public_keys, m):
+def multisig_script(public_keys: Sequence[str], m: int) -> str:
n = len(public_keys)
assert n <= 15
assert m <= n
t@@ -768,7 +768,7 @@ class Transaction:
witness = construct_witness([sig_list[0], pubkeys[0]])
elif txin['type'] in ['p2wsh', 'p2wsh-p2sh']:
witness_script = multisig_script(pubkeys, txin['num_sig'])
- witness = construct_witness([0, *sig_list, witness_script])
+ witness = construct_witness([0] + sig_list + [witness_script])
else:
raise Exception('wrong txin type:', txin['type'])
if self.is_txin_complete(txin) or estimate_size: