Fix conflicts

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",

clients/native/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.68"
+version = "1.1.69"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"

clients/socks5/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.68"
+version = "1.1.69"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"

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))
         }
     }
 }

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

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

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"

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

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