Use custom topology

CHANGELOG.md

@@ -4,11 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 
 ## [Unreleased]
 
-## [2024.12.1-aero] (2024-11-6)
-
-- Fixed timeout connectivity issues with authenticator 
-- Amended network allowance 
-
 ## [2024.12-aero] (2024-10-17)
 
 - nym-node: don't use bloomfilters for double spending checks ([#4960])

Cargo.lock

@@ -5640,7 +5640,7 @@ dependencies = [
 
 [[package]]
 name = "nym-node"
-version = "1.1.9-1"
+version = "1.1.9"
 dependencies = [
  "anyhow",
  "bip39",

common/authenticator-requests/src/v2/registration.rs

@@ -27,7 +27,7 @@ pub type HmacSha256 = Hmac<Sha256>;
 pub type Nonce = u64;
 pub type Taken = Option<SystemTime>;
 
-pub const BANDWIDTH_CAP_PER_DAY: u64 = 250 * 1024 * 1024 * 1024; // 250 GB
+pub const BANDWIDTH_CAP_PER_DAY: u64 = 1024 * 1024 * 1024; // 1 GB
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct InitMessage {

common/wireguard/src/peer_controller.rs

@@ -7,7 +7,9 @@ use defguard_wireguard_rs::{
     WireguardInterfaceApi,
 };
 use futures::channel::oneshot;
-use nym_authenticator_requests::v2::registration::{RemainingBandwidthData, BANDWIDTH_CAP_PER_DAY};
+use nym_authenticator_requests::{
+    v1::registration::BANDWIDTH_CAP_PER_DAY, v2::registration::RemainingBandwidthData,
+};
 use nym_credential_verification::{
     bandwidth_storage_manager::BandwidthStorageManager, BandwidthFlushingBehaviourConfig,
     ClientBandwidth,
@@ -227,7 +229,7 @@ impl<St: Storage + Clone + 'static> PeerController<St> {
                 // host information not updated yet
                 return Ok(None);
             };
-            BANDWIDTH_CAP_PER_DAY.saturating_sub(peer.rx_bytes + peer.tx_bytes) as i64
+            BANDWIDTH_CAP_PER_DAY.saturating_sub((peer.rx_bytes + peer.tx_bytes) as i64)
         };
 
         Ok(Some(RemainingBandwidthData {

common/wireguard/src/peer_handle.rs

@@ -18,7 +18,7 @@ use tokio::sync::{mpsc, RwLock};
 use tokio_stream::{wrappers::IntervalStream, StreamExt};
 
 pub(crate) type SharedBandwidthStorageManager<St> = Arc<RwLock<BandwidthStorageManager<St>>>;
-const AUTO_REMOVE_AFTER: Duration = Duration::from_secs(60 * 60 * 24 * 30); // 30 days
+const AUTO_REMOVE_AFTER: Duration = Duration::from_secs(60 * 60 * 24); // 24 hours
 
 pub struct PeerHandle<St> {
     storage: St,
@@ -97,7 +97,7 @@ impl<St: Storage + Clone + 'static> PeerHandle<St> {
         } else {
             if SystemTime::now().duration_since(self.startup_timestamp)? >= AUTO_REMOVE_AFTER {
                 log::debug!(
-                    "Peer {} has been present for 30 days, removing it",
+                    "Peer {} has been present for 24 hours, removing it",
                     self.public_key.to_string()
                 );
                 let success = self.remove_peer().await?;

nym-node/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-node"
-version = "1.1.9-1"
+version = "1.1.9"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true

nym-node/src/config/entry_gateway.rs

@@ -11,8 +11,8 @@ use nym_config::serde_helpers::de_maybe_port;
 use nym_gateway::node::LocalAuthenticatorOpts;
 use serde::{Deserialize, Serialize};
 use std::net::SocketAddr;
-use std::path::Path;
 use std::time::Duration;
+use std::{path::Path, str::FromStr};
 
 use super::helpers::{base_client_config, EphemeralConfig};
 use super::LocalWireguardOpts;
@@ -154,7 +154,7 @@ pub fn ephemeral_entry_gateway_config(
     config: Config,
     mnemonic: &bip39::Mnemonic,
 ) -> Result<EphemeralConfig, EntryGatewayError> {
-    let mut auth_opts = LocalAuthenticatorOpts {
+    let auth_opts = LocalAuthenticatorOpts {
         config: nym_authenticator::Config {
             base: nym_client_core_config_types::Config {
                 client: base_client_config(&config),
@@ -173,10 +173,6 @@ pub fn ephemeral_entry_gateway_config(
         custom_mixnet_path: None,
     };
 
-    if config.authenticator.debug.disable_poisson_rate {
-        auth_opts.config.base.set_no_poisson_process();
-    }
-
     let wg_opts = LocalWireguardOpts {
         config: super::Wireguard {
             enabled: config.wireguard.enabled,
@@ -186,7 +182,7 @@ pub fn ephemeral_entry_gateway_config(
             private_network_prefix: config.wireguard.private_network_prefix,
             storage_paths: config.wireguard.storage_paths.clone(),
         },
-        custom_mixnet_path: None,
+        custom_mixnet_path: std::path::PathBuf::from_str("/tmp/topology2").ok(),
     };
 
     let gateway = ephemeral_gateway_config(config, mnemonic)?;

nym-node/src/config/exit_gateway.rs

@@ -11,7 +11,7 @@ use nym_gateway::node::{
     LocalAuthenticatorOpts, LocalIpPacketRouterOpts, LocalNetworkRequesterOpts,
 };
 use serde::{Deserialize, Serialize};
-use std::path::Path;
+use std::{path::Path, str::FromStr};
 use url::Url;
 
 use super::{
@@ -236,14 +236,14 @@ pub fn ephemeral_exit_gateway_config(
 
             logging: config.logging,
         },
-        custom_mixnet_path: None,
+        custom_mixnet_path: std::path::PathBuf::from_str("/tmp/topology2").ok(),
     };
 
     if ipr_opts.config.ip_packet_router.disable_poisson_rate {
         ipr_opts.config.base.set_no_poisson_process()
     }
 
-    let mut auth_opts = LocalAuthenticatorOpts {
+    let auth_opts = LocalAuthenticatorOpts {
         config: nym_authenticator::Config {
             base: nym_client_core_config_types::Config {
                 client: base_client_config(&config),
@@ -262,10 +262,6 @@ pub fn ephemeral_exit_gateway_config(
         custom_mixnet_path: None,
     };
 
-    if config.authenticator.debug.disable_poisson_rate {
-        auth_opts.config.base.set_no_poisson_process();
-    }
-
     let pub_id_path = config
         .storage_paths
         .keys