Align VPN with Monorepo develop (#3375)

Author: durch

nym-vpn-core/Cargo.lock

@@ -47,34 +47,35 @@ default-members = [
 ]
 
 # For local development
-#[patch."https://github.com/nymtech/nym"]
-#nym-authenticator-requests = { path = "../../nym/common/authenticator-requests" }
-#nym-api-requests = { path = "../../nym/nym-api/nym-api-requests" }
-#nym-bandwidth-controller = { path = "../../nym/common/bandwidth-controller" }
-#nym-bin-common = { path = "../../nym/common/bin-common" }
-#nym-client-core = { path = "../../nym/common/client-core" }
-#nym-compact-ecash = { path = "../../nym/common/nym_offline_compact_ecash" }
-#nym-config = { path = "../../nym/common/config" }
-#nym-contracts-common = { path = "../../nym/common/cosmwasm-smart-contracts/contracts-common" }
-#nym-credential-proxy-requests = { path = "../../nym/nym-credential-proxy/nym-credential-proxy-requests", default-features = false }
-#nym-credential-storage = { path = "../../nym/common/credential-storage" }
-#nym-credentials = { path = "../../nym/common/credentials" }
-#nym-credentials-interface = { path = "../../nym/common/credentials-interface" }
-#nym-crypto = { path = "../../nym/common/crypto" }
-#nym-ecash-time = { path = "../../nym/common/ecash-time" }
-#nym-http-api-client = { path = "../../nym/common/http-api-client" }
-#nym-ip-packet-requests = { path = "../../nym/common/ip-packet-requests" }
-#nym-network-defaults = { path = "../../nym/common/network-defaults" }
-#nym-node-requests = { path = "../../nym/nym-node/nym-node-requests" }
-#nym-pemstore = { path = "../../nym/common/pemstore" }
-#nym-service-provider-requests-common = { path = "../../nym/common/service-provider-requests-common" }
-#nym-sdk = { path = "../../nym/sdk/rust/nym-sdk" }
-#nym-statistics-common = { path = "../../nym/common/statistics" }
-#nym-task = { path = "../../nym/common/task" }
-#nym-topology = { path = "../../nym/common/topology" }
-#nym-validator-client = { path = "../../nym/common/client-libs/validator-client" }
-#nym-wireguard-types = { path = "../../nym/common/wireguard-types" }
-#nym-credential-utils = { path = "../../nym/common/credential-utils" }
+# [patch."https://github.com/nymtech/nym"]
+# nym-authenticator-requests = { path = "../../nym/common/authenticator-requests" }
+# nym-api-requests = { path = "../../nym/nym-api/nym-api-requests" }
+# nym-bandwidth-controller = { path = "../../nym/common/bandwidth-controller" }
+# nym-bin-common = { path = "../../nym/common/bin-common" }
+# nym-client-core = { path = "../../nym/common/client-core" }
+# nym-compact-ecash = { path = "../../nym/common/nym_offline_compact_ecash" }
+# nym-config = { path = "../../nym/common/config" }
+# nym-contracts-common = { path = "../../nym/common/cosmwasm-smart-contracts/contracts-common" }
+# nym-credential-proxy-requests = { path = "../../nym/nym-credential-proxy/nym-credential-proxy-requests", default-features = false }
+# nym-credential-storage = { path = "../../nym/common/credential-storage" }
+# nym-credentials = { path = "../../nym/common/credentials" }
+# nym-credentials-interface = { path = "../../nym/common/credentials-interface" }
+# nym-crypto = { path = "../../nym/common/crypto" }
+# nym-ecash-time = { path = "../../nym/common/ecash-time" }
+# nym-http-api-client = { path = "../../nym/common/http-api-client" }
+# nym-http-api-client-macro = { path = "../../nym/common/http-api-client-macro" }
+# nym-ip-packet-requests = { path = "../../nym/common/ip-packet-requests" }
+# nym-network-defaults = { path = "../../nym/common/network-defaults" }
+# nym-node-requests = { path = "../../nym/nym-node/nym-node-requests" }
+# nym-pemstore = { path = "../../nym/common/pemstore" }
+# nym-service-provider-requests-common = { path = "../../nym/common/service-provider-requests-common" }
+# nym-sdk = { path = "../../nym/sdk/rust/nym-sdk" }
+# nym-statistics-common = { path = "../../nym/common/statistics" }
+# nym-task = { path = "../../nym/common/task" }
+# nym-topology = { path = "../../nym/common/topology" }
+# nym-validator-client = { path = "../../nym/common/client-libs/validator-client" }
+# nym-wireguard-types = { path = "../../nym/common/wireguard-types" }
+# nym-credential-utils = { path = "../../nym/common/credential-utils" }
 
 [workspace.package]
 version = "1.17.0-beta"
@@ -191,7 +192,7 @@ wiremock = "0.6.4"
 wmi = "0.17.2"
 x25519-dalek = "2.0"
 zeroize = "1.8.1"
-sentry = { version = "0.42.0", default-features = false }
+sentry = { version = "0.42.0", default-features = false}
 
 nym-apple-network = { path = "crates/nym-apple-network" }
 nym-authenticator-client = { path = "crates/nym-authenticator-client" }
@@ -224,33 +225,34 @@ nym-platform-metadata = { path = "crates/nym-platform-metadata" }
 nym-vpn-lib-types-uniffi = { path = "crates/nym-vpn-lib-types-uniffi" }
 nym-vpnd-types-uniffi = { path = "crates/nym-vpnd-types-uniffi" }
 
-nym-authenticator-requests = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-api-requests = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-bandwidth-controller = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-bin-common = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-client-core = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-compact-ecash = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-config = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-contracts-common = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-credential-proxy-requests = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork", default-features = false }
-nym-credential-storage = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-credentials = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-credentials-interface = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-crypto = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-ecash-time = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-http-api-client = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-network-defaults = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-ip-packet-requests = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-node-requests = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-pemstore = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-service-provider-requests-common = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-sdk = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-statistics-common = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-task = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-topology = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-validator-client = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-wireguard-private-metadata-client = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-wireguard-private-metadata-shared = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-wireguard-types = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-sqlx-pool-guard = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
-nym-credential-utils = { git = "https://github.com/nymtech/nym", branch = "domain-fronting-integration-fork" }
+nym-authenticator-requests = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-api-requests = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-bandwidth-controller = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-bin-common = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-client-core = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-compact-ecash = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-config = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-contracts-common = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-credential-proxy-requests = { git = "https://github.com/nymtech/nym", branch = "develop", default-features = false }
+nym-credential-storage = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-credentials = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-credentials-interface = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-crypto = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-ecash-time = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-http-api-client = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-http-api-client-macro = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-network-defaults = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-ip-packet-requests = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-node-requests = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-pemstore = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-service-provider-requests-common = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-sdk = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-statistics-common = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-task = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-topology = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-validator-client = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-wireguard-private-metadata-client = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-wireguard-private-metadata-shared = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-wireguard-types = { git = "https://github.com/nymtech/nym", branch = "develop" }
+sqlx-pool-guard = { git = "https://github.com/nymtech/nym", branch = "develop" }
+nym-credential-utils = { git = "https://github.com/nymtech/nym", branch = "develop" }

nym-vpn-core/Cargo.toml

@@ -10,11 +10,10 @@ use bytes::Bytes;
 use nym_common::trace_err_chain;
 use nym_config::defaults::mixnet_vpn::{NYM_TUN_DEVICE_ADDRESS_V4, NYM_TUN_DEVICE_ADDRESS_V6};
 use nym_ip_packet_requests::{IpPair, codec::MultiIpPacketCodec};
-use nym_sdk::{
-    TaskClient,
-    mixnet::{InputMessage, MixnetClientSender, MixnetMessageSender, Recipient},
-};
-use nym_task::connections::TransmissionLane;
+use nym_sdk::mixnet::{InputMessage, MixnetClientSender, MixnetMessageSender, Recipient};
+#[allow(deprecated)]
+// We should not migrate this to use an SDK task management of any sort, VPN should handle this how they want, this is a leaky abstraction
+use nym_task::{TaskClient, connections::TransmissionLane};
 use pnet_packet::Packet;
 use tokio::task::JoinHandle;
 use tracing::{debug, trace};
@@ -132,6 +131,7 @@ impl IcmpConnectionBeacon {
         self.send_icmp_v6_ping(ICMP_IPR_TUN_EXTERNAL_PING_V6).await
     }
 
+    #[allow(deprecated)] // We should not migrate this to use an SDK task management of any sort, VPN should handle this how they want, this is a leaky abstraction
     pub async fn run(mut self, mut shutdown: TaskClient) -> Result<()> {
         debug!("Icmp connection beacon is running");
         let mut ping_interval = tokio::time::interval(ICMP_BEACON_PING_INTERVAL);
@@ -234,6 +234,7 @@ pub fn is_icmp_v6_beacon_reply(
     None
 }
 
+#[allow(deprecated)] // We should not migrate this to use an SDK task management of any sort, VPN should handle this how they want, this is a leaky abstraction
 pub fn start_icmp_connection_beacon(
     mixnet_client_sender: MixnetClientSender,
     our_ips: IpPair,

nym-vpn-core/crates/nym-connection-monitor/src/icmp_beacon.rs

@@ -4,6 +4,8 @@
 use futures::channel::mpsc;
 use nym_ip_packet_requests::IpPair;
 use nym_sdk::mixnet::{MixnetClientSender, Recipient};
+#[allow(deprecated)]
+// We should not migrate this to use an SDK task management of any sort, VPN should handle this how they want, this is a leaky abstraction
 use nym_task::TaskManager;
 use tracing::info;
 
@@ -57,6 +59,7 @@ impl ConnectionMonitorTask {
         self.icmp_beacon_identifier
     }
 
+    #[allow(deprecated)] // We should not migrate this to use an SDK task management of any sort, VPN should handle this how they want, this is a leaky abstraction
     pub fn start(
         self,
         mixnet_client_sender: MixnetClientSender,

nym-vpn-core/crates/nym-connection-monitor/src/lib.rs

@@ -4,11 +4,10 @@
 use std::time::Duration;
 
 use nym_common::trace_err_chain;
-use nym_sdk::{
-    TaskClient,
-    mixnet::{InputMessage, MixnetClientSender, MixnetMessageSender, Recipient},
-};
-use nym_task::connections::TransmissionLane;
+use nym_sdk::mixnet::{InputMessage, MixnetClientSender, MixnetMessageSender, Recipient};
+#[allow(deprecated)]
+// We should not migrate this to use an SDK task management of any sort, VPN should handle this how they want, this is a leaky abstraction
+use nym_task::{TaskClient, connections::TransmissionLane};
 use tokio::task::JoinHandle;
 use tracing::{debug, trace};
 
@@ -39,6 +38,7 @@ impl MixnetConnectionBeacon {
         Ok(request_id)
     }
 
+    #[allow(deprecated)] // We should not migrate this to use an SDK task management of any sort, VPN should handle this how they want, this is a leaky abstraction
     pub async fn run(self, mut shutdown: TaskClient) -> Result<()> {
         debug!("Mixnet connection beacon is running");
         let mut ping_interval = tokio::time::interval(MIXNET_SELF_PING_INTERVAL);
@@ -89,6 +89,7 @@ pub fn create_self_ping(our_address: Recipient) -> (InputMessage, u64) {
     )
 }
 
+#[allow(deprecated)] // We should not migrate this to use an SDK task management of any sort, VPN should handle this how they want, this is a leaky abstraction
 pub fn start_mixnet_connection_beacon(
     mixnet_client_sender: MixnetClientSender,
     our_address: Recipient,

nym-vpn-core/crates/nym-connection-monitor/src/mixnet_beacon.rs

@@ -8,7 +8,9 @@ use std::{
 
 use futures::{StreamExt, channel::mpsc};
 use nym_common::trace_err_chain;
-use nym_sdk::TaskClient;
+#[allow(deprecated)]
+// We should not migrate this to use an SDK task management of any sort, VPN should handle this how they want, this is a leaky abstraction
+use nym_task::TaskClient;
 use tokio::task::JoinHandle;
 
 use crate::error::Result;
@@ -160,6 +162,7 @@ impl ConnectionMonitor {
         }
     }
 
+    #[allow(deprecated)] // We should not migrate this to use an SDK task management of any sort, VPN should handle this how they want, this is a leaky abstraction
     async fn run(mut self, mut task_client: TaskClient) -> Result<()> {
         tracing::debug!("Connection monitor is running");
         let mut report_interval = tokio::time::interval(CONNECTION_MONITOR_REPORT_INTERVAL);
@@ -188,6 +191,7 @@ impl ConnectionMonitor {
     }
 }
 
+#[allow(deprecated)] // We should not migrate this to use an SDK task management of any sort, VPN should handle this how they want, this is a leaky abstraction
 fn report_connectivity(connectivity: &ConnectivityState, task_client: &mut TaskClient) {
     if connectivity.entry == ConnectivityStatus::Fail {
         tracing::error!("Entry gateway not routing our mixnet traffic");
@@ -291,6 +295,7 @@ impl nym_task::TaskStatusEvent for ConnectionMonitorStatus {
     }
 }
 
+#[allow(deprecated)] // We should not migrate this to use an SDK task management of any sort, VPN should handle this how they want, this is a leaky abstraction
 pub fn start_connection_monitor(
     connection_event_rx: futures::channel::mpsc::UnboundedReceiver<ConnectionStatusEvent>,
     shutdown_listener: TaskClient,

nym-vpn-core/crates/nym-connection-monitor/src/monitor.rs

@@ -95,10 +95,10 @@ pub enum Error {
     Offline,
 
     #[error("HTTP client error: {0}")]
-    HttpClient(#[from] HttpClientError),
+    HttpClient(#[from] Box<HttpClientError>),
 
     #[error("Nym API error: {source}")]
-    NymApi { source: NymAPIError },
+    NymApi { source: Box<NymAPIError> },
 
     #[error("operation cancelled")]
     Cancelled,

nym-vpn-core/crates/nym-gateway-directory/src/error.rs

@@ -162,9 +162,11 @@ impl GatewayClient {
         static_nym_api_ip_addresses: Option<&[SocketAddr]>,
     ) -> Result<Self> {
         // Use the new unified HTTP client with domain fronting for the main API client
-        let api_client = nym_http_api_client::ClientBuilder::from_network(network_details)?
+        let api_client = nym_http_api_client::ClientBuilder::from_network(network_details)
+            .map_err(Box::new)?
             .with_user_agent(user_agent.clone())
-            .build()?;
+            .build()
+            .map_err(Box::new)?;
 
         // Use domain fronting with resolver overrides for VPN API client
         let nym_vpn_api_client = if config.nym_vpn_api_url.is_some() {
@@ -221,23 +223,29 @@ impl GatewayClient {
         self.api_client
             .get_all_described_nodes()
             .await
-            .map_err(|e| Error::NymApi { source: e })
+            .map_err(|e| Error::NymApi {
+                source: Box::new(e),
+            })
     }
 
     async fn lookup_skimmed_gateways(&self) -> Result<SkimmedNodesWithMetadata> {
         debug!("Fetching skimmed entry assigned nodes from nym-api...");
         self.api_client
             .get_all_basic_entry_assigned_nodes_with_metadata()
             .await
-            .map_err(|e| Error::NymApi { source: e })
+            .map_err(|e| Error::NymApi {
+                source: Box::new(e),
+            })
     }
 
     async fn lookup_skimmed_nodes(&self) -> Result<SkimmedNodesWithMetadata> {
         debug!("Fetching skimmed entry assigned nodes from nym-api...");
         self.api_client
             .get_all_basic_nodes_with_metadata()
             .await
-            .map_err(|e| Error::NymApi { source: e })
+            .map_err(|e| Error::NymApi {
+                source: Box::new(e),
+            })
     }
 
     pub async fn lookup_gateway_ip_from_nym_api(&self, gateway_identity: &str) -> Result<IpAddr> {
@@ -246,7 +254,9 @@ impl GatewayClient {
             .api_client
             .get_all_described_nodes()
             .await
-            .map_err(|e| Error::NymApi { source: e })?
+            .map_err(|e| Error::NymApi {
+                source: Box::new(e),
+            })?
             .iter()
             .find_map(|node| {
                 if node

nym-vpn-core/crates/nym-gateway-directory/src/gateway_client.rs

@@ -56,6 +56,8 @@ nym-sdk.workspace = true
 nym-task.workspace = true
 nym-validator-client.workspace = true
 nym-credential-utils.workspace = true
+nym-http-api-client.workspace = true
+nym-http-api-client-macro = { workspace = true, features = ["debug-inventory"] }
 
 [build-dependencies]
 vergen-gitcl = { workspace = true, default-features = false, features = [

nym-vpn-core/crates/nym-gateway-probe/Cargo.toml

@@ -202,12 +202,13 @@ impl Probe {
         const MAX_RETRIES: usize = 50;
         for i in 0..MAX_RETRIES {
             let attempt = i + 1; // since humans usually don't count from 0 in this instance
-            debug!(
+            info!(
                 "attempt {attempt}/{MAX_RETRIES} for attempting to acquire {ticketbook_type} bandwidth"
             );
             let bw_client = disconnected_mixnet_client
                 .create_bandwidth_client(self.credentials_args.mnemonic.clone(), ticketbook_type)
                 .await?;
+            info!("Calling bandwidth controller acquire() for {ticketbook_type}");
             match bw_client.acquire().await {
                 Ok(_) => {
                     if i > 0 {