Navigation Menu

Skip to content

Commit

Permalink
Updated TREZOR plugin to work with trezorlib>=0.8.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
admin-slush committed Dec 29, 2017
1 parent 0506985 commit a30d599
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
7 changes: 1 addition & 6 deletions plugins/trezor/plugin.py
Expand Up @@ -76,13 +76,8 @@ def __init__(self, parent, config, name):

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
Expand Down
10 changes: 5 additions & 5 deletions plugins/trezor/trezor.py
Expand Up @@ -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):
Expand All @@ -20,15 +20,15 @@ def __init__(self, *args):
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
Expand Down

0 comments on commit a30d599

Please sign in to comment.