Browse Source

py3.4 compat: follow-up e13183ea7a

3.2.x
SomberNight 7 years ago
parent
commit
cbf1b5d9d5
No known key found for this signature in database GPG Key ID: B33B5F232C6271E9
  1. 4
      lib/transaction.py

4
lib/transaction.py

@ -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) n = len(public_keys)
assert n <= 15 assert n <= 15
assert m <= n assert m <= n
@ -768,7 +768,7 @@ class Transaction:
witness = construct_witness([sig_list[0], pubkeys[0]]) witness = construct_witness([sig_list[0], pubkeys[0]])
elif txin['type'] in ['p2wsh', 'p2wsh-p2sh']: elif txin['type'] in ['p2wsh', 'p2wsh-p2sh']:
witness_script = multisig_script(pubkeys, txin['num_sig']) 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: else:
raise Exception('wrong txin type:', txin['type']) raise Exception('wrong txin type:', txin['type'])
if self.is_txin_complete(txin) or estimate_size: if self.is_txin_complete(txin) or estimate_size:

Loading…
Cancel
Save