tserialize: do not use x_pubkeys if we have enough signatures. - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 3f15a8f217ddfa6fd31a3a128003220b69f310cf
DIR parent 785b54f8f49e49051418d1ac95b9863fb781904a
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 21 Jun 2014 22:09:35 +0200
serialize: do not use x_pubkeys if we have enough signatures.
Diffstat:
M lib/transaction.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
DIR diff --git a/lib/transaction.py b/lib/transaction.py
t@@ -540,8 +540,12 @@ class Transaction:
sig_list.append(NO_SIGNATURE)
sig_list = ''.join( map( lambda x: push_script(x), sig_list))
- # extended pubkeys (with bip32 derivation)
- x_pubkeys = txin['x_pubkeys']
+ if len(signatures) < n_sig:
+ # extended pubkeys (with bip32 derivation)
+ x_pubkeys = txin['x_pubkeys']
+ else:
+ # if we have enough signatures, we use the actual pubkeys
+ x_pubkeys = txin['pubkeys']
if not p2sh:
script = sig_list