Browse Source

trezor: re-enable bridge transport

It was disabled in 680df7d6b6 due to #4421,
but that has since been fixed.
Also related is #4060; and now that that is closed, the bridge transport
is not proxied anyway.
master
SomberNight 7 years ago
parent
commit
8caab35d90
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
  1. 2
      electrum/plugins/safe_t/transport.py
  2. 20
      electrum/plugins/trezor/transport.py

2
electrum/plugins/safe_t/transport.py

@ -8,6 +8,8 @@ class SafeTTransport(PrintError):
"""Reimplemented safetlib.transport.all_transports so that we can
enable/disable specific transports.
"""
# NOTE: the bridge and UDP transports are disabled as they are using
# the same ports as trezor
try:
# only to detect safetlib version
from safetlib.transport import all_transports

20
electrum/plugins/trezor/transport.py

@ -14,11 +14,11 @@ class TrezorTransport(PrintError):
except ImportError:
# old trezorlib. compat for trezorlib < 0.9.2
transports = []
#try:
# from trezorlib.transport_bridge import BridgeTransport
# transports.append(BridgeTransport)
#except BaseException:
# pass
try:
from trezorlib.transport_bridge import BridgeTransport
transports.append(BridgeTransport)
except BaseException:
pass
try:
from trezorlib.transport_hid import HidTransport
transports.append(HidTransport)
@ -37,11 +37,11 @@ class TrezorTransport(PrintError):
else:
# new trezorlib.
transports = []
#try:
# from trezorlib.transport.bridge import BridgeTransport
# transports.append(BridgeTransport)
#except BaseException:
# pass
try:
from trezorlib.transport.bridge import BridgeTransport
transports.append(BridgeTransport)
except BaseException:
pass
try:
from trezorlib.transport.hid import HidTransport
transports.append(HidTransport)

Loading…
Cancel
Save