diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py index 363d7a787..555635eb7 100644 --- a/plugins/trezor/plugin.py +++ b/plugins/trezor/plugin.py @@ -76,13 +76,8 @@ class TrezorCompatiblePlugin(HW_PluginBase): def _try_hid(self, device): self.print_error("Trying to connect over USB...") - if device.interface_number == 1: - pair = [None, device.path] - else: - pair = [device.path, None] - try: - return self.hid_transport(pair) + return self.hid_transport(device) except BaseException as e: # see fdb810ba622dc7dbe1259cbafb5b28e19d2ab114 # raise diff --git a/plugins/trezor/trezor.py b/plugins/trezor/trezor.py index 72f003cea..32b50de4b 100644 --- a/plugins/trezor/trezor.py +++ b/plugins/trezor/trezor.py @@ -6,9 +6,9 @@ class TrezorKeyStore(TrezorCompatibleKeyStore): device = 'TREZOR' class TrezorPlugin(TrezorCompatiblePlugin): - firmware_URL = 'https://www.mytrezor.com' + firmware_URL = 'https://wallet.trezor.io' libraries_URL = 'https://github.com/trezor/python-trezor' - minimum_firmware = (1, 3, 3) + minimum_firmware = (1, 5, 2) keystore_class = TrezorKeyStore def __init__(self, *args): @@ -20,15 +20,15 @@ class TrezorPlugin(TrezorCompatiblePlugin): self.client_class = client.TrezorClient self.ckd_public = trezorlib.ckd_public self.types = trezorlib.client.types - self.DEVICE_IDS = trezorlib.transport_hid.DEVICE_IDS + self.DEVICE_IDS = (trezorlib.transport_hid.DEV_TREZOR1, trezorlib.transport_hid.DEV_TREZOR2) self.libraries_available = True except ImportError: self.libraries_available = False TrezorCompatiblePlugin.__init__(self, *args) - def hid_transport(self, pair): + def hid_transport(self, device): from trezorlib.transport_hid import HidTransport - return HidTransport(pair) + return HidTransport.find_by_path(device.path) def bridge_transport(self, d): from trezorlib.transport_bridge import BridgeTransport