electrum

commit 8caab35d90087f413ec330c29ffa7a61d6c378a2
parent 9161e8c8f4f7300c9a61ba2991cfe63a696f1bbc
Author: SomberNight <somber.night@protonmail.com>
Date:   Wed, 19 Sep 2018 18:14:55 +0200

trezor: re-enable bridge transport

It was disabled in 680df7d6b60ffcf66f6c47eb73697da1a8613405 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.

Diffstat:
M
electrum/plugins/safe_t/transport.py
 | 
2
++
M
electrum/plugins/trezor/transport.py
 | 
20
++++++++++----------

2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/electrum/plugins/safe_t/transport.py b/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
diff --git a/electrum/plugins/trezor/transport.py b/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)