tfix can_sign: detect if OldWallet is used - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 0b674eb35de78d81877276654cc877aab625df9e
DIR parent 6bb4a554e39db25799a8d113336acb8e3638047a
HTML Author: ThomasV <thomasv@gitorious>
Date: Mon, 2 Feb 2015 16:06:29 +0100
fix can_sign: detect if OldWallet is used
Diffstat:
M lib/wallet.py | 2 ++
1 file changed, 2 insertions(+), 0 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1048,9 +1048,11 @@ class Abstract_Wallet(object):
addr = bitcoin.public_key_to_bc_address(x_pubkey.decode('hex'))
return self.is_mine(addr)
elif x_pubkey[0:2] == 'ff':
+ if isinstance(self, OldWallet): return False
xpub, sequence = BIP32_Account.parse_xpubkey(x_pubkey)
return xpub in [ self.master_public_keys[k] for k in self.master_private_keys.keys() ]
elif x_pubkey[0:2] == 'fe':
+ if not isinstance(self, OldWallet): return False
xpub, sequence = OldAccount.parse_xpubkey(x_pubkey)
return xpub == self.get_master_public_key()
elif x_pubkey[0:2] == 'fd':