tMerge pull request #231 from elmato/master - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit 64a8dd97d044fc3fb7998821fed4f17a7239b434 DIR parent 496f90298b7f6e606ed614fcb3bd8c9b6e6c38fb HTML Author: ThomasV <thomasv1@gmx.de> Date: Mon, 10 Jun 2013 02:30:36 -0700 Merge pull request #231 from elmato/master BIP32Sequence::get_pubkey not using mpk parameter Diffstat: M lib/bitcoin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- DIR diff --git a/lib/bitcoin.py b/lib/bitcoin.py t@@ -521,7 +521,7 @@ class BIP32Sequence: def get_pubkey(self, sequence, mpk = None): if not mpk: mpk = self.mpk - master_public_key, master_chain = self.mpk + master_public_key, master_chain = mpk K = master_public_key.decode('hex') chain = master_chain.decode('hex') for i in sequence: