From 784dcd40e04613682f720d66e0a02f65bb47a250 Mon Sep 17 00:00:00 2001
From: fraware <mateopetel@gmail.com>
Date: Wed, 23 Sep 2026 06:50:00 -0700
Subject: [PATCH] fix: resolve minimal build blockers

---
 runtime/sidecar-watcher/src/crypto.rs | 8 ++++----
 scripts/proto.mk                      | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/runtime/sidecar-watcher/src/crypto.rs b/runtime/sidecar-watcher/src/crypto.rs
index f55f4d600..bfb070a2f 100644
--- a/runtime/sidecar-watcher/src/crypto.rs
+++ b/runtime/sidecar-watcher/src/crypto.rs
@@ -128,10 +128,10 @@ impl AsyncSigningPipeline {
     pub async fn submit_request(
         &self,
         request: SigningRequest,
-    ) -> Result<(), mpsc::error::SendError<SigningRequest>> {
+    ) -> Result<(), Box<mpsc::error::SendError<SigningRequest>>> {
         self.metrics.total_requests.fetch_add(1, Ordering::Relaxed);
         self.metrics.queue_size.fetch_add(1, Ordering::Relaxed);
-        self.request_tx.send(request).await
+        self.request_tx.send(request).await.map_err(Box::new)
     }
 
     /// Get signing result
@@ -421,7 +421,7 @@ impl BatchVerifier {
         signature: Signature,
         public_key: VerifyingKey,
         request_id: String,
-    ) -> Result<(), mpsc::error::SendError<VerificationRequest>> {
+    ) -> Result<(), Box<mpsc::error::SendError<VerificationRequest>>> {
         let request = VerificationRequest {
             message,
             signature,
@@ -431,7 +431,7 @@ impl BatchVerifier {
         let _ = self.batch_timeout;
         let _ = self.batch_size;
 
-        self.tx.send(request).await
+        self.tx.send(request).await.map_err(Box::new)
     }
 
     /// Wait for verification results
diff --git a/scripts/proto.mk b/scripts/proto.mk
index b10bcb651..3895ce7ab 100644
--- a/scripts/proto.mk
+++ b/scripts/proto.mk
@@ -7,7 +7,9 @@ PROTO_V1_DIR := api/v1
 PROTO_FILES := $(wildcard $(PROTO_V1_DIR)/*.proto)
 GO_PROTO_OUT := core/sdk/go/generated
 TS_SDK_DIR := core/sdk/typescript
-TS_PROTO_PLUGIN := $(CURDIR)/$(TS_SDK_DIR)/node_modules/.bin/protoc-gen-ts_proto
+# npm workspaces may install ts-proto either under the SDK or hoist it to the
+# repository root. Prefer the SDK-local plugin and fall back to the root.
+TS_PROTO_PLUGIN := $(firstword $(wildcard $(CURDIR)/$(TS_SDK_DIR)/node_modules/.bin/protoc-gen-ts_proto $(CURDIR)/node_modules/.bin/protoc-gen-ts_proto))
 RUST_SDK_DIR := core/sdk/rust
 GOLDEN_DIR := tests/fixtures/golden
 API_DOCS := docs/api/api.md