electrum

Electrum Bitcoin wallet
git clone https://git.parazyd.org/electrum
Log | Files | Refs | Submodules

commit cad3798f84476366b548670b530293fde918a037
parent 7ea2cb41e88ba2ef9f1bacc2059b637b9702e192
Author: ThomasV <thomasv@electrum.org>
Date:   Fri, 30 Jun 2017 18:52:02 +0200

follow-up previous commit

Diffstat:
Mlib/wallet.py | 7+++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/wallet.py b/lib/wallet.py @@ -1733,10 +1733,9 @@ class Multisig_Wallet(Deterministic_Wallet, P2SH): # x_pubkeys are not sorted here because it would be too slow # they are sorted in transaction.get_sorted_pubkeys # 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 + 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 txin['signatures'] = [None] * self.n txin['num_sig'] = self.m