diff --git a/Cargo.lock b/Cargo.lock index 1868f7b6c1..64e92004c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5317,7 +5317,7 @@ dependencies = [ [[package]] name = "nym-api" -version = "1.20.1" +version = "1.1.72" dependencies = [ "anyhow", "async-trait", @@ -5561,7 +5561,7 @@ dependencies = [ [[package]] name = "nym-cli" -version = "1.1.68" +version = "1.1.69" dependencies = [ "anyhow", "base64 0.22.1", @@ -5644,7 +5644,7 @@ dependencies = [ [[package]] name = "nym-client" -version = "1.1.68" +version = "1.1.69" dependencies = [ "bs58", "clap", @@ -7051,7 +7051,7 @@ dependencies = [ [[package]] name = "nym-network-requester" -version = "1.1.69" +version = "1.1.70" dependencies = [ "addr", "anyhow", @@ -7101,7 +7101,7 @@ dependencies = [ [[package]] name = "nym-node" -version = "1.23.0" +version = "1.24.0" dependencies = [ "anyhow", "arc-swap", @@ -7645,7 +7645,7 @@ dependencies = [ [[package]] name = "nym-socks5-client" -version = "1.1.68" +version = "1.1.69" dependencies = [ "bs58", "clap", @@ -8465,7 +8465,7 @@ dependencies = [ [[package]] name = "nymvisor" -version = "1.20.1" +version = "0.1.34" dependencies = [ "anyhow", "bytes", diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index 07c8d66608..ec71c0df74 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-client" -version = "1.1.68" +version = "1.1.69" authors = ["Dave Hrycyszyn ", "Jędrzej Stuczyński "] description = "Implementation of the Nym Client" edition = "2021" diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml index c9ebf8fc44..5d892e50de 100644 --- a/clients/socks5/Cargo.toml +++ b/clients/socks5/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-socks5-client" -version = "1.1.68" +version = "1.1.69" authors = ["Dave Hrycyszyn "] description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address" edition = "2021" diff --git a/common/nymsphinx/framing/src/processing.rs b/common/nymsphinx/framing/src/processing.rs index e482ad1927..afaba392dd 100644 --- a/common/nymsphinx/framing/src/processing.rs +++ b/common/nymsphinx/framing/src/processing.rs @@ -14,7 +14,7 @@ use nym_sphinx_types::{ }; use std::fmt::Display; use thiserror::Error; -use tracing::{debug, trace}; +use tracing::{debug, info, trace}; #[derive(Debug)] pub enum MixProcessingResultData { @@ -364,28 +364,17 @@ fn split_into_ack_and_message( | PacketSize::ExtendedPacket32 | PacketSize::OutfoxRegularPacket => { trace!("received a normal packet!"); - cfg_if::cfg_if! { - if #[cfg(feature = "no-mix-acks")] { - let _ = packet_type; - let _ = key_rotation; - - // AIDEV-NOTE: When no-mix-acks is enabled, skip ack extraction entirely. - // The full payload (including ack portion) is returned as the message. - Ok((None, data)) - } else { - let (ack_data, message) = split_hop_data_into_ack_and_message(data, packet_type)?; - let (ack_first_hop, ack_packet) = - match SurbAck::try_recover_first_hop_packet(&ack_data, packet_type) { - Ok((first_hop, packet)) => (first_hop, packet), - Err(err) => { - tracing::info!("Failed to recover first hop from ack data: {err}"); - return Err(err.into()); - } - }; - let forward_ack = MixPacket::new(ack_first_hop, ack_packet, packet_type, key_rotation); - Ok((Some(forward_ack), message)) - } - } + let (ack_data, message) = split_hop_data_into_ack_and_message(data, packet_type)?; + let (ack_first_hop, ack_packet) = + match SurbAck::try_recover_first_hop_packet(&ack_data, packet_type) { + Ok((first_hop, packet)) => (first_hop, packet), + Err(err) => { + info!("Failed to recover first hop from ack data: {err}"); + return Err(err.into()); + } + }; + let forward_ack = MixPacket::new(ack_first_hop, ack_packet, packet_type, key_rotation); + Ok((Some(forward_ack), message)) } } } diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index 96715767c4..39e7bd1cc2 100644 --- a/nym-api/Cargo.toml +++ b/nym-api/Cargo.toml @@ -4,7 +4,7 @@ [package] name = "nym-api" license = "GPL-3.0" -version.workspace = true +version = "1.1.72" authors.workspace = true edition = "2021" rust-version.workspace = true diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml index 426f6f3137..0002bc60f4 100644 --- a/nym-node/Cargo.toml +++ b/nym-node/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "nym-node" -version = "1.23.0" +version = "1.24.0" authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index e27ea36863..60c4d192c4 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -4,7 +4,7 @@ [package] name = "nym-network-requester" license = "GPL-3.0" -version = "1.1.69" +version = "1.1.70" authors.workspace = true edition.workspace = true rust-version = "1.85" diff --git a/tools/nym-cli/Cargo.toml b/tools/nym-cli/Cargo.toml index 35772ab17b..fcd9893d86 100644 --- a/tools/nym-cli/Cargo.toml +++ b/tools/nym-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-cli" -version = "1.1.68" +version = "1.1.69" authors.workspace = true edition = "2021" license.workspace = true diff --git a/tools/nymvisor/Cargo.toml b/tools/nymvisor/Cargo.toml index b336604d4f..668e532b98 100644 --- a/tools/nymvisor/Cargo.toml +++ b/tools/nymvisor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nymvisor" -version.workspace = true +version = "0.1.34" authors.workspace = true repository.workspace = true homepage.workspace = true