AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #2509: reset pubkeys to None when x_pubkeys are unsorted

Browse Source
This commit is contained in:
ThomasV
2017-06-30 18:31:37 +02:00
parent a7679debd1
commit 7ea2cb41e8
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/wallet.py
View File

@@ -1730,9 +1730,13 @@ class Multisig_Wallet(Deterministic_Wallet, P2SH):
return ''.join(sorted(self.get_master_public_keys())) return ''.join(sorted(self.get_master_public_keys()))
def add_input_sig_info(self, txin, address): def add_input_sig_info(self, txin, address):
derivation = self.get_address_index(address) # x_pubkeys are not sorted here because it would be too slow
# extended pubkeys # they are sorted in transaction.get_sorted_pubkeys
txin['x_pubkeys'] = [k.get_xpubkey(*derivation) for k in self.get_keystores()] # pubkeys is set to None to signal that x_pubkeys are unsorted
if txin.get('x_pubkeys') is None:
derivation = self.get_address_index(address)
txin['x_pubkeys'] = [k.get_xpubkey(*derivation) for k in self.get_keystores()]
txin['pubkeys'] = None
# we need n place holders # we need n place holders
txin['signatures'] = [None] * self.n txin['signatures'] = [None] * self.n
txin['num_sig'] = self.m txin['num_sig'] = self.m