AaronFiore/electrum
1
0
Fork 0
Code Activity

serialize: do not use x_pubkeys if we have enough signatures.

Browse Source
This commit is contained in:
ThomasV
2014-06-21 22:09:35 +02:00
parent 785b54f8f4
commit 3f15a8f217
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/transaction.py
View File

@@ -540,8 +540,12 @@ class Transaction:
sig_list.append(NO_SIGNATURE) sig_list.append(NO_SIGNATURE)
sig_list = ''.join( map( lambda x: push_script(x), sig_list)) sig_list = ''.join( map( lambda x: push_script(x), sig_list))
# extended pubkeys (with bip32 derivation) if len(signatures) < n_sig:
x_pubkeys = txin['x_pubkeys'] # 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: if not p2sh:
script = sig_list script = sig_list