AaronFiore/electrum
1
0
Fork 0
Code Activity

Trezor: fixes for latest libtrezor

Browse Source 
We were relying on internals of libtrezor that they just
changed.  However their changes don't work on Mac either.
Work around both issues.  I think this...

Fixes #1637
This commit is contained in:
Neil Booth
2016-01-24 14:31:43 +09:00
parent f8ed7b058d
commit f4fa53e915
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/plugins.py
View File

@@ -227,7 +227,7 @@ class BasePlugin(PrintError):
def settings_dialog(self):
pass
Device = namedtuple("Device", "path id_ product_key")
Device = namedtuple("Device", "path interface_number id_ product_key")
DeviceInfo = namedtuple("DeviceInfo", "device description initialized")
class DeviceMgr(PrintError):
@@ -423,8 +423,8 @@ class DeviceMgr(PrintError):
for d in hid.enumerate(0, 0):
product_key = (d['vendor_id'], d['product_id'])
if product_key in self.recognised_hardware:
devices.append(Device(d['path'], d['serial_number'],
product_key))
devices.append(Device(d['path'], d['interface_number'],
d['serial_number'], product_key))
# Now find out what was disconnected
pairs = [(dev.path, dev.id_) for dev in devices]