tMerge pull request #1127 from kaykurokawa/master - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit 87709dfd16c270b721106f481c33c8c4583316ba DIR parent 156825fe57559286d7d24df2c7692dadfc0086a1 HTML Author: ThomasV <electrumdev@gmail.com> Date: Fri, 3 Apr 2015 08:32:17 +0200 Merge pull request #1127 from kaykurokawa/master get_pubkeys is called incorrectly in get_pubkey_from_xpub() Diffstat: M lib/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- DIR diff --git a/lib/account.py b/lib/account.py t@@ -306,7 +306,7 @@ class BIP32_Account(Account): def get_pubkey_from_xpub(self, xpub, for_change, n): xpubs = self.get_master_pubkeys() i = xpubs.index(xpub) - pubkeys = self.get_pubkeys(sequence, n) + pubkeys = self.get_pubkeys(for_change, n) return pubkeys[i] def derive_pubkeys(self, for_change, n):