chore: deprecation of trezord-go

Author: mroz22

README.md

@@ -45,8 +45,6 @@ Supported platforms are Linux and macOS (both Intel and Silicon).
   - Service running on *localhost:21325*
   - Connection between the trezor device (or running emulator) and the host
   - Used by applications needing to communicate with trezor device (for example Suite)
-- **Bridge proxy**
-  - Proxies requests to the bridge
 - **Bitcoin regtest**
   - Bitcoind with [blockbook](https://github.com/trezor/blockbook) running in regtest mode
   - Default credentials for bitcoin backend

docker/compose.yml

@@ -20,8 +20,8 @@ services:
     ports:
       - "9001:9001"
       - "9002:9002"
-      - "21326:21326"
-      - "127.0.0.1:21325:21326" # macos needs proxy to override the "origin" of the trezord request
+      # 21325 is the legacy bridge port. It will not work on macOS (see bridge-proxy before this commit).
+      - "21328:21328" # new bridge port
     environment:
       - DISPLAY=docker.for.mac.host.internal:0
       - REGTEST_RPC_URL=http://host.docker.internal:18021

src/binaries.py

@@ -41,9 +41,10 @@
 BRIDGES: List[str] = []
 
 IS_ARM = os.uname().machine.startswith(("aarch64", "arm"))
+IS_MAC = os.uname().sysname == "Darwin"
 ARM_IDENTIFIER = "-arm"
 
-DEFAULT_BRIDGE = "2.0.33" if not IS_ARM else f"2.0.33{ARM_IDENTIFIER}"
+DEFAULT_BRIDGE = NODE_BRIDGE_ID
 
 
 def register_new_firmware(model: Model, version: str, location: str) -> None:
@@ -151,12 +152,14 @@ def sort_firmwares(version: str) -> Tuple[int, ...]:
 
 def explore_bridges() -> None:
     # Send only suitable bridges for ARM/non-ARM
-    if IS_ARM:
-        BRIDGES.append(f"2.0.33{ARM_IDENTIFIER}")
-        BRIDGES.append(f"2.0.32{ARM_IDENTIFIER}")
-    else:
-        BRIDGES.append("2.0.33")
-        BRIDGES.append("2.0.32")
+    # Also legacy trezord-go doesn't work in docker correctly so skip it for this case too.
+    if not IS_MAC:
+        if IS_ARM:
+            BRIDGES.append(f"2.0.33{ARM_IDENTIFIER}")
+            BRIDGES.append(f"2.0.32{ARM_IDENTIFIER}")
+        else:
+            BRIDGES.append("2.0.33")
+            BRIDGES.append("2.0.32")
 
     if NODE_BRIDGE_BIN_JS.exists():
         BRIDGES.append(NODE_BRIDGE_ID)

src/bridge.py

@@ -10,9 +10,7 @@
 from psutil import Popen
 
 import binaries
-import bridge_proxy
 import helpers
-from bridge_proxy import PORT as BRIDGE_PROXY_PORT
 
 if TYPE_CHECKING:
     from typing_extensions import TypedDict
@@ -61,13 +59,12 @@ def is_port_in_use(port: int) -> bool:
         return s.connect_ex(("0.0.0.0", port)) == 0
 
 
-def check_bridge_and_proxy_status() -> None:
-    """Reporting the status of bridge and proxy, for debugging purposes"""
+def check_bridge_status() -> None:
+    """Reporting the status of bridge, for debugging purposes"""
     log(f"Is bridge running - {is_port_in_use(BRIDGE_PORT)}")
-    log(f"Is bridge proxy running - {is_port_in_use(BRIDGE_PROXY_PORT)}")
 
 
-def start(version: str, proxy: bool = False, output_to_logfile: bool = True) -> None:
+def start(version: str, output_to_logfile: bool = True) -> None:
     log("Starting")
     global BRIDGE
     global VERSION_RUNNING
@@ -87,7 +84,7 @@ def start(version: str, proxy: bool = False, output_to_logfile: bool = True) ->
     #   not to still think the bridge is running
     if BRIDGE is not None and not is_running():
         log("Bridge was probably killed by user manually, resetting local state")
-        stop(proxy=proxy)
+        stop()
 
     if BRIDGE is not None:
         log("WARNING: Bridge is already running, not spawning a new one", "red")
@@ -158,14 +155,11 @@ def get_command_list() -> list[str]:
 
     VERSION_RUNNING = version
 
-    if proxy:
-        bridge_proxy.start()
-
     time.sleep(0.5)
-    check_bridge_and_proxy_status()
+    check_bridge_status()
 
 
-def stop(proxy: bool = True) -> None:
+def stop() -> None:
     log("Stopping")
     global BRIDGE
     global VERSION_RUNNING
@@ -190,8 +184,5 @@ def stop(proxy: bool = True) -> None:
         BRIDGE = None
         VERSION_RUNNING = None
 
-    if proxy:
-        bridge_proxy.stop()
-
     time.sleep(0.5)
-    check_bridge_and_proxy_status()
+    check_bridge_status()

src/bridge_proxy.py

@@ -42,7 +42,6 @@ class BackgroundCheckResponse(TypedDict):
 IP = "0.0.0.0"
 PORT = 9001
 LOG_COLOR = "blue"
-BRIDGE_PROXY = False  # is being set in main.py (when not disabled, will be True)
 REGTEST_RPC = BTCJsonRPC(
     url=os.getenv("REGTEST_RPC_URL") or "http://0.0.0.0:18021",
     user="rpc",
@@ -148,17 +147,13 @@ def run_bridge_command(self) -> "ResponseType":
             version = self.request_dict.get("version", binaries.DEFAULT_BRIDGE)
             output_to_logfile = self.request_dict.get("output_to_logfile", True)
             bridge.start(
-                version, proxy=BRIDGE_PROXY, output_to_logfile=output_to_logfile
+                version, output_to_logfile=output_to_logfile
             )
             response_text = f"Bridge version {version} started"
-            if BRIDGE_PROXY:
-                response_text += " with bridge proxy"
             return {"response": response_text}
         elif self.command == "bridge-stop":
-            bridge.stop(proxy=BRIDGE_PROXY)
+            bridge.stop()
             response_text = "Stopping bridge"
-            if BRIDGE_PROXY:
-                response_text += " + stopping bridge proxy"
             return {"response": response_text}
         else:
             return {

src/bridge_proxy_server.py

@@ -200,8 +200,14 @@ const app = createApp({
                     this.emulators.versions[model].versions = options;
                     this.emulators.versions[model].selected = options[0];
                 }
-                this.bridges.selected = dataObject.bridges[0];
-                this.bridges.versions = dataObject.bridges;
+                const nodebridge = [];
+                const legacy = [];
+                dataObject.bridges.forEach((b) =>
+                    b.startsWith("2.") ? legacy.push(b) : nodebridge.push(b)
+                );
+                this.bridges.versions = nodebridge.concat(legacy);
+                this.bridges.selected = this.bridges.versions[0];
+
                 this.bridges.hasSuiteLocal = dataObject.bridges.includes(
                     "local-suite-node-bridge"
                 );

src/controller.py

@@ -30,7 +30,6 @@ def log(text: str, color: str = LOG_COLOR) -> None:
     parser = argparse.ArgumentParser()
     parser.add_argument("-v", "--verbosity", action="count", default=0)
     parser.add_argument("--work-dir")
-    parser.add_argument("--disable-bridge-proxy", action="store_true")
     args = parser.parse_args()
 
     effective_work_dir = args.work_dir
@@ -48,16 +47,7 @@ def log(text: str, color: str = LOG_COLOR) -> None:
 
     binaries.explore(args)
     dashboard.start()
-
-    if args.disable_bridge_proxy:
-        log(
-            "Bridge proxy disabled. "
-            "Communication with Bridge needs to be done directly."
-        )
-    else:
-        log("Will create bridge proxy when spawning a bridge.")
-        controller.BRIDGE_PROXY = True
-
+  
     if helpers.physical_trezor():
         log("Will support physical Trezor.")
     else: