AaronFiore/electrum
1
0
Fork 0
Code Activity

allow several hardware cosigners in the same wallet

Browse Source
This commit is contained in:
ThomasV
2016-08-22 12:50:24 +02:00
parent d16fb3ee48
commit 80675121ce
4 changed files with 77 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/trezor/plugin.py
View File

@@ -217,7 +217,6 @@ class TrezorCompatiblePlugin(HW_PluginBase):
devmgr = self.device_manager()
device_info = devmgr.select_device(handler, self)
device_id = device_info.device.id_
#devmgr.pair_wallet(keystore, device_info.device.id_)
if device_info.initialized:
task = lambda: self.init_xpub(derivation, device_id, handler)
else:
@@ -239,7 +238,9 @@ class TrezorCompatiblePlugin(HW_PluginBase):
if not client.atleast_version(1, 3):
wallet.handler.show_error(_("Your device firmware is too old"))
return
address_path = wallet.address_id(address)
change, index = wallet.get_address_index(address)
derivation = wallet.keystore.derivation
address_path = "%s/%d/%d"%(derivation, change, index)
address_n = client.expand_path(address_path)
client.get_address('Bitcoin', address_n, True)

30
plugins/trezor/qt_generic.py
View File

@@ -273,16 +273,16 @@ def qt_plugin_class(base_plugin_class):
@hook
def load_wallet(self, wallet, window):
keystore = wallet.get_keystore()
if type(keystore) != self.keystore_class:
return
window.tzb = StatusBarButton(QIcon(self.icon_file), self.device,
partial(self.settings_dialog, window))
window.statusBar().addPermanentWidget(window.tzb)
keystore.handler = self.create_handler(window)
keystore.thread = TaskThread(window, window.on_error)
# Trigger a pairing
keystore.thread.add(partial(self.get_client, keystore))
for keystore in wallet.get_keystores():
if type(keystore) != self.keystore_class:
continue
window.tzb = StatusBarButton(QIcon(self.icon_file), self.device,
partial(self.settings_dialog, window))
window.statusBar().addPermanentWidget(window.tzb)
keystore.handler = self.create_handler(window)
keystore.thread = TaskThread(window, window.on_error)
# Trigger a pairing
keystore.thread.add(partial(self.get_client, keystore))
def create_keystore(self, hw_type, derivation, wizard):
from electrum.keystore import hardware_keystore
@@ -310,11 +310,11 @@ def qt_plugin_class(base_plugin_class):
@hook
def receive_menu(self, menu, addrs, wallet):
keystore = wallet.get_keystore()
if type(keystore) == self.keystore_class and len(addrs) == 1:
def show_address():
keystore.thread.add(partial(self.show_address, wallet, addrs[0]))
menu.addAction(_("Show on %s") % self.device, show_address)
for keystore in wallet.get_keystores():
if type(keystore) == self.keystore_class and len(addrs) == 1:
def show_address():
keystore.thread.add(partial(self.show_address, wallet, addrs[0]))
menu.addAction(_("Show on %s") % self.device, show_address)
def settings_dialog(self, window):
device_id = self.choose_device(window)