AaronFiore/electrum
1
0
Fork 0
Code Activity

save wallet label in keystore, to facilitate pairing

Browse Source
This commit is contained in:
ThomasV
2016-08-26 11:45:12 +02:00
parent cae635c3e4
commit 86e23d9989
6 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/trezor/plugin.py
View File

@@ -134,10 +134,7 @@ 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()
derivation = keystore.get_derivation()
xpub = keystore.xpub
handler = keystore.handler
client = devmgr.client_for_xpub(self, xpub, derivation, handler, force_pair)
client = devmgr.client_for_keystore(self, keystore, force_pair)
# returns the client for a given keystore. can use xpub
if client:
client.used()

2
plugins/trezor/qt_generic.py
View File

@@ -219,7 +219,7 @@ def qt_plugin_class(base_plugin_class):
forgotten their PIN or it is in bootloader mode.'''
device_id = self.device_manager().xpub_id(keystore.xpub)
if not device_id:
info = self.device_manager().select_device(keystore.handler, self)
info = self.device_manager().select_device(keystore.handler, self, keystore)
device_id = info.device.id_
return device_id