Merge branch 'master' into feature/NODE-4864-deregister-payment-tracker-on-exception

Author: glitch003

rust/lit-core/Cargo.lock

@@ -56,17 +56,19 @@ tracing = { version = "0.1" }
 tracing-opentelemetry = { version = "0.25" }
 zeroize = { version = "1.8", features = ["derive"] }
 
-[workspace.dependencies.lit-rust-crypto]
-git = "https://github.com/LIT-Protocol/lit-rust-crypto"
-tag = "0.6.0"
-features = [
+lit-rust-crypto = { version = "0.6.0", features = [
     "arithmetic",
+    "bits",
+    "digest",
+    "ecdsa",
+    "ecdsa-core",
     "hash2curve",
+    "hex",
+    "rand_core",
     "serde",
+    "sha",
     "std",
-]
+    "zeroize",
+] }
 
-[workspace.dependencies.hd-keys-curves-wasm]
-git = "https://github.com/LIT-Protocol/hd-keys-curves-wasm.git"
-branch = "pallas"
-default-features = false
+hd-keys-curves-wasm = { version = "1.0.5", default-features = false }

rust/lit-core/Cargo.toml

@@ -13,7 +13,7 @@ use rocket::Error as RocketError;
 use rocket::async_main;
 use sd_notify::NotifyState;
 use tokio::runtime::Runtime;
-use tracing::warn;
+use tracing::{error, warn};
 
 use crate::Event;
 use crate::http::rocket::launcher::{Launcher, Shutdown};
@@ -161,7 +161,13 @@ fn spawn_launcher(
     let mut launcher_join_handles = launcher_join_handles.lock().unwrap();
 
     launcher_join_handles.push(thread::spawn(move || {
-        let _ = async_main(launcher.launch());
+        let res = async_main(launcher.launch());
+        if let Err(e) = res {
+            // A Rocket launch error (commonly port bind/listen failure) is a failure condition
+            // exit with log and nonzero exit code to distinguish from normal shutdown
+            error!(error = ?e, "rocket engine - launcher exited with error (fatal)");
+            panic!("rocket engine - launcher exited with error (fatal): {e:?}");
+        }
     }));
 
     Ok(())

rust/lit-core/lit-api-core/src/http/rocket/engine.rs

@@ -2,14 +2,16 @@ use std::collections::HashMap;
 use std::fmt;
 use std::result::Result as StdResult;
 
-use futures::future::{BoxFuture, join_all};
+use futures::future::BoxFuture;
+use futures::stream::{FuturesUnordered, StreamExt};
 use rocket::catcher::Handler;
 use rocket::fairing::Fairing;
 use rocket::http::Status;
 use rocket::http::uri::Origin;
 use rocket::response::{Redirect, Responder, status};
 use rocket::serde::json::Value;
 use rocket::{Build, Catcher, Error as RocketError, Ignite, Request, Rocket, Route, catcher};
+use tracing::{error, info};
 
 use tokio::sync::mpsc;
 use tokio::task_local;
@@ -35,6 +37,53 @@ task_local! {
     pub static CONFIG: ReloadableLitConfig;
 }
 
+#[derive(Debug, Clone)]
+struct RocketTarget {
+    address: String,
+    port: u16,
+    tls_enabled: bool,
+    role: &'static str,
+}
+
+#[derive(Debug, Clone)]
+struct RocketTargets(Vec<RocketTarget>);
+
+impl From<&[Rocket<Ignite>]> for RocketTargets {
+    fn from(ignited: &[Rocket<Ignite>]) -> Self {
+        Self(
+            ignited
+                .iter()
+                .enumerate()
+                .map(|(idx, r)| {
+                    let cfg = r.config();
+                    RocketTarget {
+                        address: cfg.address.to_string(),
+                        port: cfg.port,
+                        tls_enabled: cfg.tls.is_some(),
+                        role: if idx == 0 { "primary" } else { "aux" },
+                    }
+                })
+                .collect(),
+        )
+    }
+}
+
+impl RocketTargets {
+    fn log(&self) {
+        for (idx, t) in self.0.iter().enumerate() {
+            let proto = if t.tls_enabled { "https" } else { "http" };
+            info!(
+                rocket_index = idx,
+                proto,
+                role = t.role,
+                address = %t.address,
+                port = t.port,
+                "rocket launch starting"
+            );
+        }
+    }
+}
+
 pub struct Launcher {
     cfg: ReloadableLitConfig,
     rocket: Option<Rocket<Build>>,
@@ -154,15 +203,45 @@ impl Launcher {
 
     pub async fn launch(&mut self) -> StdResult<(), RocketError> {
         if self.ignited.is_empty() {
+            error!("rocket launcher - launch called before ignite (no ignited rockets)");
             panic!("ignite must be called prior to launch");
         }
 
-        let mut futures = Vec::new();
-        while !self.ignited.is_empty() {
-            futures.push(self.ignited.remove(0).launch());
+        // Extra diagnostics: log the configured bind targets and surface bind/listen failures
+        let targets = RocketTargets::from(self.ignited.as_slice());
+        targets.log();
+
+        // FuturesUnordered so we can fail fast on the first launch error (irrespective of other launches)
+        let mut futures: FuturesUnordered<_> = FuturesUnordered::new();
+        for (idx, rocket) in self.ignited.drain(..).enumerate() {
+            futures.push(async move { (idx, rocket.launch().await) });
         }
 
-        join_all(futures).await;
+        // Each `launch()` future will typically run indefinitely while the server is up.
+        // We await launch results as they complete and fail fast on the first error.
+        while let Some((idx, res)) = futures.next().await {
+            if let Err(e) = res {
+                let t = targets.0.get(idx).cloned().unwrap_or(RocketTarget {
+                    address: "<unknown>".to_string(),
+                    port: 0,
+                    tls_enabled: false,
+                    role: "unknown",
+                });
+                let proto = if t.tls_enabled { "https" } else { "http" };
+
+                error!(
+                    rocket_index = idx,
+                    proto,
+                    role = t.role,
+                    address = %t.address,
+                    port = t.port,
+                    error = ?e,
+                    "rocket launch failed (likely bind/listen failure for configured address/port)"
+                );
+
+                return Err(e);
+            }
+        }
 
         Ok(())
     }