AaronFiore/electrum
1
0
Fork 0
Code Activity

plugins: do not assume that handler belongs to keystore

Browse Source
This commit is contained in:
ThomasV
2016-08-27 09:46:02 +02:00
parent 8b729d0f83
commit 33c7787941
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/trezor/plugin.py
View File

@@ -134,7 +134,8 @@ class TrezorCompatiblePlugin(HW_PluginBase):
# All client interaction should not be in the main GUI thread
assert self.main_thread != threading.current_thread()
devmgr = self.device_manager()
client = devmgr.client_for_keystore(self, keystore, force_pair)
handler = keystore.handler
client = devmgr.client_for_keystore(self, handler, keystore, force_pair)
# returns the client for a given keystore. can use xpub
if client:
client.used()
@@ -237,7 +238,7 @@ class TrezorCompatiblePlugin(HW_PluginBase):
def show_address(self, wallet, address):
client = self.get_client(wallet.keystore)
if not client.atleast_version(1, 3):
wallet.handler.show_error(_("Your device firmware is too old"))
keystore.handler.show_error(_("Your device firmware is too old"))
return
change, index = wallet.get_address_index(address)
derivation = wallet.keystore.derivation