update version for gateway, mixnode and api

.github/actions/nym-hash-releases/dist/index.js

@@ -23973,14 +23973,10 @@ function getBinInfo(path) {
         let mode = external_fs_.statSync(path).mode
         external_fs_.chmodSync(path, mode | 0o111)
 
-        const cmd = `${path} build-info --output=json`;
-        console.log(`🚚 Running ${cmd}... (for max of 3 seconds, then SIGTERM)`);
-        const raw = (0,external_child_process_namespaceObject.execSync)(cmd, { stdio: 'pipe', encoding: "utf8", timeout: 3000 });
+        const raw = (0,external_child_process_namespaceObject.execSync)(`${path} build-info --output=json`, { stdio: 'pipe', encoding: "utf8" });
         const parsed = JSON.parse(raw)
-        console.log(`    ✅ ok`);
         return parsed
     } catch (_) {
-        console.log(`    ❌ failed`);
         return undefined
     }
 }
@@ -23990,11 +23986,8 @@ async function run(assets, algorithm, filename, cache) {
         console.warn("cache is set to 'false', but we we no longer support it")
     }
 
-    const directory = external_path_.join(process.env.RUNNER_TEMP || '.tmp', process.env.GITHUB_RUN_ID || '');
-    console.log('Temporary directory: ', directory);
-
     try {
-        external_fs_.mkdirSync(directory, { recursive: true });
+        external_fs_.mkdirSync('.tmp');
     } catch(e) {
         // ignore
     }
@@ -24009,13 +24002,13 @@ async function run(assets, algorithm, filename, cache) {
             let sig = null;
 
             // cache in `${WORKING_DIR}/.tmp/`
-            const cacheFilename = external_path_.join(directory, `${asset.name}`);
+            const cacheFilename = external_path_.resolve(`.tmp/${asset.name}`);
             if(!external_fs_.existsSync(cacheFilename)) {
-                console.log(`⬇️ Downloading ${asset.browser_download_url}... to ${cacheFilename} [${numAwaiting} of ${assets.length}]`);
+                console.log(`Downloading ${asset.browser_download_url}... to ${cacheFilename}`);
                 buffer = Buffer.from(await fetch(asset.browser_download_url).then(res => res.arrayBuffer()));
                 external_fs_.writeFileSync(cacheFilename, buffer);
             } else {
-                console.log(`💾 Loading from ${cacheFilename}`);
+                console.log(`Loading from ${cacheFilename}`);
                 buffer = Buffer.from(external_fs_.readFileSync(cacheFilename));
 
                 // console.log('Reading signature from content');
@@ -24100,7 +24093,6 @@ async function run(assets, algorithm, filename, cache) {
             }
         }
     }
-    console.log(`Completed hashing ${assets.length} files`);
     return hashes;
 }
 
@@ -24130,8 +24122,8 @@ async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrId, algo
 
     let releases;
     if(cache) {
-        const cacheFilename = __nccwpck_require__.ab + "releases.json";
-        if(!external_fs_.existsSync(__nccwpck_require__.ab + "releases.json")) {
+        const cacheFilename = external_path_.resolve(`.tmp/releases.json`);
+        if(!external_fs_.existsSync(cacheFilename)) {
             releases = await octokit.paginate(
                 octokit.rest.repos.listReleases,
                 {
@@ -24141,10 +24133,10 @@ async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrId, algo
                 },
                 (response) => response.data
             );
-            external_fs_.writeFileSync(__nccwpck_require__.ab + "releases.json", JSON.stringify(releases, null, 2));
+            external_fs_.writeFileSync(cacheFilename, JSON.stringify(releases, null, 2));
         } else {
             console.log('Loading releases from cache...');
-            releases = JSON.parse(external_fs_.readFileSync(__nccwpck_require__.ab + "releases.json"));
+            releases = JSON.parse(external_fs_.readFileSync(cacheFilename));
         }
     } else {
         releases = await octokit.paginate(
@@ -24180,10 +24172,9 @@ async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrId, algo
 
     releasesToProcess.forEach(release => {
         const {tag_name, name} = release;
-        const matches = tag_name.match(/(\S+)-v([0-9]+\.[0-9]+(\.\S+)?)/);
+        const matches = tag_name.match(/(\S+)-v([0-9]+\.[0-9]+\.\S+)/);
 
         if(!matches || matches.length < 2) {
-            console.warn('Could not match version structure in tag name = ', tag_name);
             return;
         }
 

.github/actions/nym-hash-releases/src/create-hashes.mjs

@@ -11,14 +11,10 @@ function getBinInfo(path) {
         let mode = fs.statSync(path).mode
         fs.chmodSync(path, mode | 0o111)
 
-        const cmd = `${path} build-info --output=json`;
-        console.log(`🚚 Running ${cmd}... (for max of 3 seconds, then SIGTERM)`);
-        const raw = execSync(cmd, { stdio: 'pipe', encoding: "utf8", timeout: 3000 });
+        const raw = execSync(`${path} build-info --output=json`, { stdio: 'pipe', encoding: "utf8" });
         const parsed = JSON.parse(raw)
-        console.log(`    ✅ ok`);
         return parsed
     } catch (_) {
-        console.log(`    ❌ failed`);
         return undefined
     }
 }
@@ -28,11 +24,8 @@ async function run(assets, algorithm, filename, cache) {
         console.warn("cache is set to 'false', but we we no longer support it")
     }
 
-    const directory = path.join(process.env.RUNNER_TEMP || '.tmp', process.env.GITHUB_RUN_ID || '');
-    console.log('Temporary directory: ', directory);
-
     try {
-        fs.mkdirSync(directory, { recursive: true });
+        fs.mkdirSync('.tmp');
     } catch(e) {
         // ignore
     }
@@ -47,13 +40,13 @@ async function run(assets, algorithm, filename, cache) {
             let sig = null;
 
             // cache in `${WORKING_DIR}/.tmp/`
-            const cacheFilename = path.join(directory, `${asset.name}`);
+            const cacheFilename = path.resolve(`.tmp/${asset.name}`);
             if(!fs.existsSync(cacheFilename)) {
-                console.log(`⬇️ Downloading ${asset.browser_download_url}... to ${cacheFilename} [${numAwaiting} of ${assets.length}]`);
+                console.log(`Downloading ${asset.browser_download_url}... to ${cacheFilename}`);
                 buffer = Buffer.from(await fetch(asset.browser_download_url).then(res => res.arrayBuffer()));
                 fs.writeFileSync(cacheFilename, buffer);
             } else {
-                console.log(`💾 Loading from ${cacheFilename}`);
+                console.log(`Loading from ${cacheFilename}`);
                 buffer = Buffer.from(fs.readFileSync(cacheFilename));
 
                 // console.log('Reading signature from content');
@@ -138,7 +131,6 @@ async function run(assets, algorithm, filename, cache) {
             }
         }
     }
-    console.log(`Completed hashing ${assets.length} files`);
     return hashes;
 }
 
@@ -218,10 +210,9 @@ export async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrI
 
     releasesToProcess.forEach(release => {
         const {tag_name, name} = release;
-        const matches = tag_name.match(/(\S+)-v([0-9]+\.[0-9]+(\.\S+)?)/);
+        const matches = tag_name.match(/(\S+)-v([0-9]+\.[0-9]+\.\S+)/);
 
         if(!matches || matches.length < 2) {
-            console.warn('Could not match version structure in tag name = ', tag_name);
             return;
         }
 

.github/actions/nym-hash-releases/src/run-local.mjs

@@ -1,11 +1,6 @@
 import {createHashesFromReleaseTagOrNameOrId} from './create-hashes.mjs';
 
-const cache = true;
-
-await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'nym-binaries-v2024.1-marabou', cache, upload: false});
-await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'nym-vpn-desktop-v0.0.8', cache, upload: false, repo: 'nym-vpn-client'});
-
-// await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 119065724, cache: true, upload: false});
-// await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: '119065724', cache: true, upload: false});
-// await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'nym-connect-v1.1.19-snickers', cache: true, upload: false});
-// await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'Nym Connect v1.1.19-snickers', cache: true, upload: false});
+await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 119065724, cache: true, upload: false});
+await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: '119065724', cache: true, upload: false});
+await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'nym-connect-v1.1.19-snickers', cache: true, upload: false});
+await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'Nym Connect v1.1.19-snickers', cache: true, upload: false});

.github/workflows/release-calculate-hash.yml

@@ -8,8 +8,8 @@ on:
         required: true
         type: string
   workflow_dispatch:
-    inputs:
-      release_tag:
+    release_tag:
+      tag:
         description: 'Release tag'
         required: true
         type: string
@@ -24,7 +24,10 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
-      - uses: nymtech/nym/.github/actions/nym-hash-releases@develop
+      - name: Install packages
+        run: cd ./.github/actions/nym-hash-releases && npm i
+
+      - uses: ./.github/actions/nym-hash-releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

Cargo.lock

@@ -9947,10 +9947,7 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
 dependencies = [
  "futures-util",
  "log",
- "rustls 0.21.10",
- "rustls-native-certs",
  "tokio",
- "tokio-rustls 0.24.1",
  "tungstenite",
 ]
 

Cargo.toml

@@ -172,7 +172,7 @@ log = "0.4"
 once_cell = "1.7.2"
 parking_lot = "0.12.1"
 rand = "0.8.5"
-reqwest = { version = "0.11.22", default-features = false }
+reqwest = { version = "0.11.22", default_features = false }
 schemars = "0.8.1"
 serde = "1.0.152"
 serde_json = "1.0.91"

clients/native/examples/js-examples/websocket/package-lock.json

@@ -1667,9 +1667,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.15.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
+      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
       "dev": true,
       "funding": [
         {
@@ -1705,9 +1705,9 @@
       }
     },
     "node_modules/fs-monkey": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz",
-      "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
+      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
       "dev": true
     },
     "node_modules/fs.realpath": {
@@ -2430,12 +2430,12 @@
       }
     },
     "node_modules/memfs": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
-      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz",
+      "integrity": "sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==",
       "dev": true,
       "dependencies": {
-        "fs-monkey": "^1.0.4"
+        "fs-monkey": "1.0.3"
       },
       "engines": {
         "node": ">= 4.0.0"
@@ -4047,13 +4047,13 @@
       }
     },
     "node_modules/webpack-dev-middleware": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
-      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz",
+      "integrity": "sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==",
       "dev": true,
       "dependencies": {
         "colorette": "^2.0.10",
-        "memfs": "^3.4.3",
+        "memfs": "^3.4.1",
         "mime-types": "^2.1.31",
         "range-parser": "^1.2.1",
         "schema-utils": "^4.0.0"
@@ -5800,9 +5800,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.15.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
+      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
       "dev": true
     },
     "forwarded": {
@@ -5818,9 +5818,9 @@
       "dev": true
     },
     "fs-monkey": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz",
-      "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
+      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
       "dev": true
     },
     "fs.realpath": {
@@ -6346,12 +6346,12 @@
       "dev": true
     },
     "memfs": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
-      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz",
+      "integrity": "sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==",
       "dev": true,
       "requires": {
-        "fs-monkey": "^1.0.4"
+        "fs-monkey": "1.0.3"
       }
     },
     "merge-descriptors": {
@@ -7547,13 +7547,13 @@
       }
     },
     "webpack-dev-middleware": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
-      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz",
+      "integrity": "sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==",
       "dev": true,
       "requires": {
         "colorette": "^2.0.10",
-        "memfs": "^3.4.3",
+        "memfs": "^3.4.1",
         "mime-types": "^2.1.31",
         "range-parser": "^1.2.1",
         "schema-utils": "^4.0.0"

common/client-core/Cargo.toml

@@ -72,7 +72,6 @@ features = ["time"]
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite]
 version = "0.20.1"
-features = ["rustls-tls-native-roots"]
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx]
 workspace = true

common/client-core/src/client/key_manager/mod.rs

@@ -300,7 +300,7 @@ impl KeyManager {
 
     /// Gets an atomically reference counted pointer to [`SharedKey`].
     pub fn gateway_shared_key(&self) -> Option<Arc<SharedKeys>> {
-        self.gateway_shared_key.clone()
+        self.gateway_shared_key.as_ref().map(Arc::clone)
     }
 
     pub fn remove_gateway_key(self) -> KeyManagerBuilder {

common/client-libs/gateway-client/Cargo.toml

@@ -49,7 +49,6 @@ workspace = true
 # the choice of this particular tls feature was arbitrary;
 # if you reckon a different one would be more appropriate, feel free to change it
 # features = ["native-tls"]
-features = ["rustls-tls-native-roots"]
 
 # wasm-only dependencies
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen]

common/client-libs/gateway-client/src/packet_router.rs

@@ -69,10 +69,6 @@ impl PacketRouter {
         }
         Ok(())
     }
-
-    pub fn mark_as_success(&mut self) {
-        self.shutdown.mark_as_success();
-    }
 }
 
 impl GatewayPacketRouter for PacketRouter {

common/client-libs/gateway-client/src/socket_state.rs

@@ -44,7 +44,9 @@ pub(crate) fn ws_fd(_conn: &WsConn) -> Option<RawFd> {
     #[cfg(unix)]
     match _conn.get_ref() {
         MaybeTlsStream::Plain(stream) => Some(stream.as_raw_fd()),
-        &_ => None,
+        &_ => unreachable!(
+            "If tls features are enabled, the inner stream needs to be unpacked into raw fd"
+        ),
     }
     #[cfg(not(unix))]
     None
@@ -97,7 +99,7 @@ impl PartiallyDelegated {
 
     pub(crate) fn split_and_listen_for_mixnet_messages(
         conn: WsConn,
-        mut packet_router: PacketRouter,
+        packet_router: PacketRouter,
         shared_key: Arc<SharedKeys>,
         mut shutdown: TaskClient,
     ) -> Self {
@@ -140,7 +142,6 @@ impl PartiallyDelegated {
             if match ret_err {
                 Err(err) => stream_sender.send(Err(err)),
                 Ok(_) => {
-                    packet_router.mark_as_success();
                     shutdown.mark_as_success();
                     stream_sender.send(Ok(stream))
                 }

common/dkg/src/bte/proof_chunking.rs

@@ -837,7 +837,7 @@ mod tests {
         let share3 = chunks3.clone().try_into().unwrap();
 
         let shares = vec![share1, share2, share3];
-        let chunks = &[chunks1, chunks2, chunks3];
+        let chunks = vec![chunks1, chunks2, chunks3];
 
         for (i, pk_i) in pks.iter().enumerate() {
             let mut ciphertext_chunk_i = Vec::with_capacity(NUM_CHUNKS);

common/ip-packet-requests/src/codec.rs

@@ -34,13 +34,6 @@ impl MultiIpPacketCodec {
         }
     }
 
-    pub fn bundle_one_packet(packet: Bytes) -> Bytes {
-        let mut bundled_packets = BytesMut::new();
-        bundled_packets.extend_from_slice(&(packet.len() as u16).to_be_bytes());
-        bundled_packets.extend_from_slice(&packet);
-        bundled_packets.freeze()
-    }
-
     // Append a packet to the buffer and return the buffer if it's full
     pub fn append_packet(&mut self, packet: Bytes) -> Option<Bytes> {
         let mut bundled_packets = BytesMut::new();
@@ -54,7 +47,7 @@ impl MultiIpPacketCodec {
     }
 
     // Flush the current buffer and return it.
-    pub fn flush_current_buffer(&mut self) -> Bytes {
+    fn flush_current_buffer(&mut self) -> Bytes {
         let mut output_buffer = BytesMut::new();
         std::mem::swap(&mut output_buffer, &mut self.buffer);
         output_buffer.freeze()

common/ip-packet-requests/src/lib.rs

@@ -2,22 +2,14 @@ use serde::{Deserialize, Serialize};
 use std::fmt::{Display, Formatter};
 use std::net::{Ipv4Addr, Ipv6Addr};
 
-// The current version of the protocol.
-// The idea here is that we add new request response types at least one version before we start
-// using them.
-// Also, depending on the version in the client connect message the IPR could respond with a
-// matching older version.
-pub use v6::request;
-pub use v6::response;
-
 pub mod codec;
-pub mod v6;
+pub mod request;
+pub mod response;
 
 // version 3: initial version
 // version 4: IPv6 support
 // version 5: Add severity level to info response
-// version 6: Increase the available IPs
-pub const CURRENT_VERSION: u8 = 6;
+pub const CURRENT_VERSION: u8 = 5;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct IpPair {

common/ip-packet-requests/src/v6/mod.rs

@@ -1,2 +0,0 @@
-pub mod request;
-pub mod response;

common/network-defaults/src/lib.rs

@@ -79,13 +79,7 @@ impl NymNetworkDetails {
     pub fn new_from_env() -> Self {
         fn get_optional_env<K: AsRef<OsStr>>(env: K) -> Option<String> {
             match var(env) {
-                Ok(var) => {
-                    if var.is_empty() {
-                        None
-                    } else {
-                        Some(var)
-                    }
-                }
+                Ok(var) => Some(var),
                 Err(VarError::NotPresent) => None,
                 err => panic!("Unable to set: {:?}", err),
             }
@@ -119,15 +113,28 @@ impl NymNetworkDetails {
                 Some(var(var_names::NYM_API).expect("nym api not set")),
                 get_optional_env(var_names::NYXD_WEBSOCKET),
             ))
-            .with_mixnet_contract(get_optional_env(var_names::MIXNET_CONTRACT_ADDRESS))
-            .with_vesting_contract(get_optional_env(var_names::VESTING_CONTRACT_ADDRESS))
-            .with_coconut_bandwidth_contract(get_optional_env(
-                var_names::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
+            .with_mixnet_contract(Some(
+                var(var_names::MIXNET_CONTRACT_ADDRESS).expect("mixnet contract not set"),
+            ))
+            .with_vesting_contract(Some(
+                var(var_names::VESTING_CONTRACT_ADDRESS).expect("vesting contract not set"),
+            ))
+            .with_coconut_bandwidth_contract(Some(
+                var(var_names::COCONUT_BANDWIDTH_CONTRACT_ADDRESS)
+                    .expect("coconut bandwidth contract not set"),
+            ))
+            .with_group_contract(Some(
+                var(var_names::GROUP_CONTRACT_ADDRESS).expect("group contract not set"),
+            ))
+            .with_multisig_contract(Some(
+                var(var_names::MULTISIG_CONTRACT_ADDRESS).expect("multisig contract not set"),
+            ))
+            .with_coconut_dkg_contract(Some(
+                var(var_names::COCONUT_DKG_CONTRACT_ADDRESS).expect("coconut dkg contract not set"),
+            ))
+            .with_ephemera_contract(Some(
+                var(var_names::EPHEMERA_CONTRACT_ADDRESS).expect("ephemera contract not set"),
             ))
-            .with_group_contract(get_optional_env(var_names::GROUP_CONTRACT_ADDRESS))
-            .with_multisig_contract(get_optional_env(var_names::MULTISIG_CONTRACT_ADDRESS))
-            .with_coconut_dkg_contract(get_optional_env(var_names::COCONUT_DKG_CONTRACT_ADDRESS))
-            .with_ephemera_contract(get_optional_env(var_names::EPHEMERA_CONTRACT_ADDRESS))
             .with_service_provider_directory_contract(get_optional_env(
                 var_names::SERVICE_PROVIDER_DIRECTORY_CONTRACT_ADDRESS,
             ))

common/network-defaults/src/mainnet.rs

@@ -16,13 +16,11 @@ pub const MIXNET_CONTRACT_ADDRESS: &str =
     "n17srjznxl9dvzdkpwpw24gg668wc73val88a6m5ajg6ankwvz9wtst0cznr";
 pub const VESTING_CONTRACT_ADDRESS: &str =
     "n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw";
-
-pub const COCONUT_BANDWIDTH_CONTRACT_ADDRESS: &str = "";
-pub const GROUP_CONTRACT_ADDRESS: &str = "";
-pub const MULTISIG_CONTRACT_ADDRESS: &str = "";
-pub const COCONUT_DKG_CONTRACT_ADDRESS: &str = "";
-pub const EPHEMERA_CONTRACT_ADDRESS: &str = "";
-
+pub const COCONUT_BANDWIDTH_CONTRACT_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
+pub const GROUP_CONTRACT_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
+pub const MULTISIG_CONTRACT_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
+pub const COCONUT_DKG_CONTRACT_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
+pub const EPHEMERA_CONTRACT_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
 pub const REWARDING_VALIDATOR_ADDRESS: &str = "n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy";
 
 pub const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "https://mainnet-stats.nymte.ch:8090/";

docker/typescript_client/upload_contract/package-lock.json

@@ -18,7 +18,7 @@
       },
       "devDependencies": {
         "@tsconfig/recommended": "^1.0.1",
-        "prettier": "^2.8.7",
+        "prettier": "^2.2.1",
         "typescript": "^4.1.3"
       }
     },
@@ -570,9 +570,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.14.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
       "funding": [
         {
           "type": "individual",
@@ -875,18 +875,15 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
+      "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==",
       "dev": true,
       "bin": {
         "prettier": "bin-prettier.js"
       },
       "engines": {
         "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
     "node_modules/protobufjs": {
@@ -1667,9 +1664,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
+      "version": "1.14.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="
     },
     "fsevents": {
       "version": "2.3.2",
@@ -1888,9 +1885,9 @@
       "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
     },
     "prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
+      "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==",
       "dev": true
     },
     "protobufjs": {

envs/local.env

@@ -22,3 +22,5 @@ REWARDING_VALIDATOR_ADDRESS=n1tfzd4qz3a45u8p4mr5zmzv66457uwjgcl05jdq
 STATISTICS_SERVICE_DOMAIN_ADDRESS="http://0.0.0.0"
 NYXD="http://127.0.0.1:26657"
 NYM_API="http://127.0.0.1:8000"
+
+DKG_TIME_CONFIGURATION="600,300,300,60,60,1209600"

envs/mainnet.env

@@ -11,13 +11,18 @@ MIX_DENOM_DISPLAY=nym
 STAKE_DENOM=unyx
 STAKE_DENOM_DISPLAY=nyx
 DENOMS_EXPONENT=6
-
 MIXNET_CONTRACT_ADDRESS=n17srjznxl9dvzdkpwpw24gg668wc73val88a6m5ajg6ankwvz9wtst0cznr
 VESTING_CONTRACT_ADDRESS=n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw
-
+COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
+GROUP_CONTRACT_ADDRESS=n1rw8fw2mpcpzzq3jpa4e52ufawnmj5a4u68p35umvgskewuw0nlzsaa5w4m
+MULTISIG_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
+COCONUT_DKG_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
+EPHEMERA_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
 REWARDING_VALIDATOR_ADDRESS=n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy
 STATISTICS_SERVICE_DOMAIN_ADDRESS="https://mainnet-stats.nymte.ch:8090"
 NYXD="https://rpc.nymtech.net"
 NYM_API="https://validator.nymtech.net/api/"
 NYXD_WS="wss://rpc.nymtech.net/websocket"
 EXPLORER_API="https://explorer.nymtech.net/api/"
+
+DKG_TIME_CONFIGURATION="259200,300,300,60,60,1209600"

envs/qa.env

@@ -25,4 +25,5 @@ EXPLORER_API=https://qa-network-explorer.qa.nymte.ch/api
 NYXD="https://qa-validator.qa.nymte.ch"
 NYM_API="https://qa-nym-api.qa.nymte.ch/api"
 
+DKG_TIME_CONFIGURATION="600,300,300,60,60,1209600"
 EXIT_POLICY="https://nymtech.net/.wellknown/network-requester/exit-policy.txt"

explorer-api/src/mix_node/models.rs

@@ -112,12 +112,12 @@ pub(crate) struct NodeStats {
     )]
     previous_update_time: SystemTime,
 
-    packets_received_since_startup: f64,
-    packets_sent_since_startup: f64,
-    packets_explicitly_dropped_since_startup: f64,
-    packets_received_since_last_update: f64,
-    packets_sent_since_last_update: f64,
-    packets_explicitly_dropped_since_last_update: f64,
+    packets_received_since_startup: u64,
+    packets_sent_since_startup: u64,
+    packets_explicitly_dropped_since_startup: u64,
+    packets_received_since_last_update: u64,
+    packets_sent_since_last_update: u64,
+    packets_explicitly_dropped_since_last_update: u64,
 }
 
 #[derive(Clone, Serialize, Deserialize, JsonSchema)]

gateway/Cargo.toml

@@ -4,7 +4,7 @@
 [package]
 name = "nym-gateway"
 license = "GPL-3.0"
-version = "1.1.33"
+version = "1.1.34"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",

gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs

@@ -92,9 +92,6 @@ pub(crate) enum RequestHandlingError {
 
     #[error("the provided credential did not have a bandwidth attribute")]
     MissingBandwidthAttribute,
-
-    #[error("the DKG contract is unavailable")]
-    UnavailableDkgContract,
 }
 
 impl RequestHandlingError {
@@ -603,7 +600,7 @@ where
                         None => break,
                         Some(Ok(socket_msg)) => socket_msg,
                         Some(Err(err)) => {
-                            debug!("failed to obtain message from websocket stream! stopping connection handler: {err}");
+                            error!("failed to obtain message from websocket stream! stopping connection handler: {err}");
                             break;
                         }
                     };
@@ -614,7 +611,7 @@ where
 
                     if let Some(response) = self.handle_request(socket_msg).await {
                         if let Err(err) = self.inner.send_websocket_message(response).await {
-                            debug!(
+                            warn!(
                                 "Failed to send message over websocket: {err}. Assuming the connection is dead.",
                             );
                             break;
@@ -624,13 +621,13 @@ where
                 mix_messages = self.mix_receiver.next() => {
                     let mix_messages = match mix_messages {
                         None => {
-                            debug!("mix receiver was closed! Assuming the connection is dead.");
+                            warn!("mix receiver was closed! Assuming the connection is dead.");
                             break;
                         }
                         Some(mix_messages) => mix_messages,
                     };
                     if let Err(err) = self.inner.push_packets_to_client(&self.client.shared_keys, mix_messages).await {
-                        debug!("failed to send the unwrapped sphinx packets back to the client - {err}, assuming the connection is dead");
+                        warn!("failed to send the unwrapped sphinx packets back to the client - {err}, assuming the connection is dead");
                         break;
                     }
                 }

gateway/src/node/client_handling/websocket/connection_handler/coconut.rs

@@ -36,7 +36,6 @@ pub(crate) struct CoconutVerifier {
 impl CoconutVerifier {
     pub async fn new(
         nyxd_client: DirectSigningHttpRpcNyxdClient,
-        only_coconut_credentials: bool,
     ) -> Result<Self, RequestHandlingError> {
         let mix_denom_base = nyxd_client.current_chain_details().mix_denom.base.clone();
         let address = nyxd_client.address();
@@ -46,17 +45,9 @@ impl CoconutVerifier {
 
         // don't make it a hard failure in case we're running on mainnet (where DKG hasn't been deployed yet)
         if nyxd_client.dkg_contract_address().is_none() {
-            if !only_coconut_credentials {
-                warn!(
-                    "the DKG contract address is not available - \
-                no coconut credentials will be redeemable \
-                (if the DKG ceremony hasn't been run yet this warning is expected)"
-                );
-            } else {
-                // if we require coconut credentials, we MUST have DKG contract available
-                return Err(RequestHandlingError::UnavailableDkgContract);
-            }
-
+            error!(
+                "DKG contract address is not available - no coconut credentials will be redeemable"
+            );
             return Ok(CoconutVerifier {
                 address,
                 nyxd_client: RwLock::new(nyxd_client),
@@ -69,10 +60,6 @@ impl CoconutVerifier {
         let Ok(current_epoch) = nyxd_client.get_current_epoch().await else {
             // another case of somebody putting a placeholder address that doesn't exist
             error!("the specified DKG contract address is invalid - no coconut credentials will be redeemable");
-            if only_coconut_credentials {
-                // if we require coconut credentials, we MUST have DKG contract available
-                return Err(RequestHandlingError::UnavailableDkgContract);
-            }
             return Ok(CoconutVerifier {
                 address,
                 nyxd_client: RwLock::new(nyxd_client),

gateway/src/node/client_handling/websocket/connection_handler/fresh.rs

@@ -667,7 +667,7 @@ where
             let msg = match msg {
                 Ok(msg) => msg,
                 Err(err) => {
-                    debug!("failed to obtain message from websocket stream! stopping connection handler: {err}");
+                    error!("failed to obtain message from websocket stream! stopping connection handler: {err}");
                     break;
                 }
             };
@@ -723,7 +723,7 @@ where
                 Message::Binary(_) => {
                     // perhaps logging level should be reduced here, let's leave it for now and see what happens
                     // if client is working correctly, this should have never happened
-                    debug!("possibly received a sphinx packet without prior authentication. Request is going to be ignored");
+                    warn!("possibly received a sphinx packet without prior authentication. Request is going to be ignored");
                     if let Err(err) = self
                         .send_websocket_message(
                             ServerResponse::new_error(

gateway/src/node/mod.rs

@@ -447,7 +447,7 @@ impl<St> Gateway<St> {
 
         let coconut_verifier = {
             let nyxd_client = self.random_nyxd_client()?;
-            CoconutVerifier::new(nyxd_client, self.config.gateway.only_coconut_credentials).await
+            CoconutVerifier::new(nyxd_client).await
         }?;
 
         let mix_forwarding_channel =

mixnode/Cargo.toml

@@ -4,7 +4,7 @@
 [package]
 name = "nym-mixnode"
 license = "GPL-3.0"
-version = "1.1.35"
+version = "1.1.36"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",

nym-api/Cargo.toml

@@ -4,7 +4,7 @@
 [package]
 name = "nym-api"
 license = "GPL-3.0"
-version = "1.1.35"
+version = "1.1.36"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",

nym-api/tests/package-lock.json

@@ -2555,9 +2555,9 @@
       "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.15.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
+      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
       "funding": [
         {
           "type": "individual",
@@ -6845,9 +6845,9 @@
       "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="
     },
     "follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
+      "version": "1.15.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
+      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw=="
     },
     "form-data": {
       "version": "4.0.0",

nym-api/tests/yarn.lock

@@ -1568,9 +1568,9 @@ flatted@^3.1.0:
   integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==
 
 follow-redirects@^1.15.0:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
+  version "1.15.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
+  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
 
 form-data@4.0.0, form-data@^4.0.0:
   version "4.0.0"

nym-connect/desktop/Cargo.lock

@@ -2529,7 +2529,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "gloo-utils",
- "http 0.2.9",
+ "http",
  "js-sys",
  "pin-project",
  "serde",
@@ -2664,7 +2664,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.9",
+ "http",
  "indexmap 1.9.3",
  "slab",
  "tokio",
@@ -2833,17 +2833,6 @@ dependencies = [
  "itoa 1.0.9",
 ]
 
-[[package]]
-name = "http"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
-dependencies = [
- "bytes",
- "fnv",
- "itoa 1.0.9",
-]
-
 [[package]]
 name = "http-api-client"
 version = "0.1.0"
@@ -2865,30 +2854,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
  "bytes",
- "http 0.2.9",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
-dependencies = [
- "bytes",
- "http 1.1.0",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
-dependencies = [
- "bytes",
- "futures-core",
- "http 1.1.0",
- "http-body 1.0.0",
+ "http",
  "pin-project-lite",
 ]
 
@@ -2946,8 +2912,8 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2",
- "http 0.2.9",
- "http-body 0.4.5",
+ "http",
+ "http-body",
  "httparse",
  "httpdate",
  "itoa 1.0.9",
@@ -2959,25 +2925,6 @@ dependencies = [
  "want",
 ]
 
-[[package]]
-name = "hyper"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http 1.1.0",
- "http-body 1.0.0",
- "httparse",
- "httpdate",
- "itoa 1.0.9",
- "pin-project-lite",
- "smallvec",
- "tokio",
-]
-
 [[package]]
 name = "hyper-rustls"
 version = "0.24.1"
@@ -2985,8 +2932,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
 dependencies = [
  "futures-util",
- "http 0.2.9",
- "hyper 0.14.27",
+ "http",
+ "hyper",
  "rustls 0.21.7",
  "tokio",
  "tokio-rustls 0.24.1",
@@ -2999,28 +2946,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper 0.14.27",
+ "hyper",
  "native-tls",
  "tokio",
  "tokio-native-tls",
 ]
 
-[[package]]
-name = "hyper-util"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
-dependencies = [
- "bytes",
- "futures-util",
- "http 1.1.0",
- "http-body 1.0.0",
- "hyper 1.2.0",
- "pin-project-lite",
- "socket2 0.5.5",
- "tokio",
-]
-
 [[package]]
 name = "iana-time-zone"
 version = "0.1.57"
@@ -3823,10 +3754,7 @@ dependencies = [
  "dirs 4.0.0",
  "futures",
  "gloo-timers",
- "http-body-util",
  "humantime-serde",
- "hyper 1.2.0",
- "hyper-util",
  "log",
  "nym-bandwidth-controller",
  "nym-config",
@@ -3835,7 +3763,6 @@ dependencies = [
  "nym-explorer-client",
  "nym-gateway-client",
  "nym-gateway-requests",
- "nym-metrics",
  "nym-network-defaults",
  "nym-nonexhaustive-delayqueue",
  "nym-pemstore",
@@ -4177,16 +4104,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "nym-metrics"
-version = "0.1.0"
-dependencies = [
- "dashmap",
- "lazy_static",
- "log",
- "prometheus",
-]
-
 [[package]]
 name = "nym-mixnet-contract-common"
 version = "0.6.0"
@@ -5289,21 +5206,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "prometheus"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
-dependencies = [
- "cfg-if",
- "fnv",
- "lazy_static",
- "memchr",
- "parking_lot 0.12.1",
- "protobuf",
- "thiserror",
-]
-
 [[package]]
 name = "prost"
 version = "0.12.1"
@@ -5336,12 +5238,6 @@ dependencies = [
  "prost",
 ]
 
-[[package]]
-name = "protobuf"
-version = "2.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
-
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -5591,9 +5487,9 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.27",
+ "http",
+ "http-body",
+ "hyper",
  "hyper-rustls",
  "hyper-tls",
  "ipnet",
@@ -6413,9 +6309,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 
 [[package]]
 name = "socket2"
@@ -6891,7 +6787,7 @@ dependencies = [
  "glob",
  "gtk",
  "heck 0.4.1",
- "http 0.2.9",
+ "http",
  "ignore",
  "minisign-verify",
  "notify-rust",
@@ -6991,7 +6887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "108683199cb18f96d2d4134187bb789964143c845d2d154848dda209191fd769"
 dependencies = [
  "gtk",
- "http 0.2.9",
+ "http",
  "http-range",
  "rand 0.8.5",
  "raw-window-handle",
@@ -7377,7 +7273,6 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
 dependencies = [
  "futures-util",
  "log",
- "rustls 0.21.7",
  "tokio",
  "tungstenite",
 ]
@@ -7555,7 +7450,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http 0.2.9",
+ "http",
  "httparse",
  "log",
  "rand 0.8.5",
@@ -8368,7 +8263,7 @@ dependencies = [
  "glib",
  "gtk",
  "html5ever",
- "http 0.2.9",
+ "http",
  "kuchiki",
  "libc",
  "log",

nym-wallet/nym-wallet-recovery-cli/WALLET_RECOVERY.md

@@ -1,55 +0,0 @@
-# Wallet CLI Recovery Tool Guide
-
-This guide provides instructions on how to use the Wallet CLI recovery tool to recover your mnemonic phrase using your password, especially useful if you're unable to access your wallet in the usual way.
-
-## Step 1: Install the CLI Tool
-
-1. Change directory `cd /nym-wallet/nym-wallet-recovery-cli` from root Nym repository
-2. Have rust installed `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
-3. Once the installation is complete run `cargo build --release`
-4. The binary should live here: `nym/nym-wallet/nym-wallet-recovery-cli)`
-
-## Step 2: Prepare Your Command
-
-The tool requires specific command-line arguments to specify the password(s) and the file path to your wallet file. The basic structure of the command is as follows:
-
-```
-nym-recovery-cli --password <YOUR_PASSWORD> --file <PATH_TO_YOUR_WALLET_FILE> [OPTIONS]
-```
-
-- Replace `<YOUR_PASSWORD>` with your wallet password.
-- Replace `<PATH_TO_YOUR_WALLET_FILE>` with the path to your wallet file, where your encrypted mnemonic is stored.
-
-## Step 3: Running the Tool
-
-1. Open your terminal or command prompt.
-2. Navigate to the directory where the `nym-recovery-cli` tool is located.
-3. Execute the command prepared in Step 2.
-
-Example:
-
-```
-./nym-recovery-cli --password "mySecurePassword123" --file "/path/to/mywallet.json"
-```
-
-To try multiple passwords:
-
-```
-./nym-recovery-cli --password "myFirstPassword" --password "mySecondPassword" --file "/path/to/mywallet.json"
-```
-
-## Step 4: Understanding the Output
-
-The tool will attempt to decrypt the wallet file. If successful, it will print the decrypted content, including your mnemonic phrase.
-
-## Step 5: If You Encounter Issues
-
-- Verify the accuracy of the passwords and file path.
-- Ensure there are no typos in the command.
-- Make sure the wallet file's path is correctly specified.
-
-## Additional Options
-
-- `--raw`: Skips trying to parse the decrypted content, showing raw output instead.
-
-This guide should help you safely recover your mnemonic phrase. Remember to keep it secure once retrieved.

sdk/rust/nym-sdk/examples/libp2p_shared/queue.rs

@@ -76,7 +76,9 @@ impl MessageQueue {
     }
 
     pub(crate) fn pop(&mut self) -> Option<TransportMessage> {
-        let head = self.queue.first()?;
+        let Some(head) = self.queue.first() else {
+            return None;
+        };
 
         if head.nonce == self.next_expected_nonce {
             self.next_expected_nonce = self.next_expected_nonce.wrapping_add(1);

sdk/rust/nym-sdk/src/mixnet/native_client.rs

@@ -174,7 +174,6 @@ impl MixnetClient {
     }
 }
 
-#[derive(Clone)]
 pub struct MixnetClientSender {
     client_input: ClientInput,
     packet_type: Option<PacketType>,

service-providers/ip-packet-router/src/constants.rs

@@ -4,10 +4,10 @@ use std::time::Duration;
 // The interface used to route traffic
 pub const TUN_BASE_NAME: &str = "nymtun";
 pub const TUN_DEVICE_ADDRESS_V4: Ipv4Addr = Ipv4Addr::new(10, 0, 0, 1);
-pub const TUN_DEVICE_NETMASK_V4: Ipv4Addr = Ipv4Addr::new(255, 255, 0, 0);
+pub const TUN_DEVICE_NETMASK_V4: Ipv4Addr = Ipv4Addr::new(255, 255, 255, 0);
 pub const TUN_DEVICE_ADDRESS_V6: Ipv6Addr = Ipv6Addr::new(0x2001, 0xdb8, 0xa160, 0, 0, 0, 0, 0x1); // 2001:db8:a160::1
 
-pub const TUN_DEVICE_NETMASK_V6: &str = "112";
+pub const TUN_DEVICE_NETMASK_V6: &str = "120";
 
 // We routinely check if any clients needs to be disconnected at this interval
 pub(crate) const DISCONNECT_TIMER_INTERVAL: Duration = Duration::from_secs(10);

service-providers/ip-packet-router/src/util/generate_new_ip.rs

@@ -6,13 +6,12 @@ use crate::constants::{TUN_DEVICE_ADDRESS_V4, TUN_DEVICE_ADDRESS_V6};
 
 // Find an available IP address in self.connected_clients
 // TODO: make this nicer
-fn generate_random_ips_within_subnet<R: rand::Rng>(rng: &mut R) -> IpPair {
-    // Generate a random number in the range 2-65535
-    let last_bytes: u16 = rand::Rng::gen_range(rng, 2..=65534);
-    let before_last_byte = (last_bytes >> 8) as u8;
-    let last_byte = (last_bytes & 255) as u8;
-    let ipv4 = Ipv4Addr::new(10, 0, before_last_byte, last_byte);
-    let ipv6 = Ipv6Addr::new(0x2001, 0x0db8, 0xa160, 0, 0, 0, 0, last_bytes);
+fn generate_random_ips_within_subnet() -> IpPair {
+    let mut rng = rand::thread_rng();
+    // Generate a random number in the range 1-254
+    let last_octet = rand::Rng::gen_range(&mut rng, 1..=254);
+    let ipv4 = Ipv4Addr::new(10, 0, 0, last_octet);
+    let ipv6 = Ipv6Addr::new(0x2001, 0x0db8, 0xa160, 0, 0, 0, 0, last_octet as u16);
     IpPair::new(ipv4, ipv6)
 }
 
@@ -33,8 +32,7 @@ pub(crate) fn find_new_ips<T>(
     connected_clients_ipv4: &HashMap<Ipv4Addr, T>,
     connected_clients_ipv6: &HashMap<Ipv6Addr, T>,
 ) -> Option<IpPair> {
-    let mut rng = rand::thread_rng();
-    let mut new_ips = generate_random_ips_within_subnet(&mut rng);
+    let mut new_ips = generate_random_ips_within_subnet();
     let mut tries = 0;
     let tun_ips = IpPair::new(TUN_DEVICE_ADDRESS_V4, TUN_DEVICE_ADDRESS_V6);
 
@@ -44,7 +42,7 @@ pub(crate) fn find_new_ips<T>(
         tun_ips,
         new_ips,
     ) {
-        new_ips = generate_random_ips_within_subnet(&mut rng);
+        new_ips = generate_random_ips_within_subnet();
         tries += 1;
         if tries > 100 {
             return None;
@@ -52,23 +50,3 @@ pub(crate) fn find_new_ips<T>(
     }
     Some(new_ips)
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::collections::HashSet;
-
-    #[test]
-    fn verify_ip_generation() {
-        let mut map = HashSet::with_capacity(65533);
-        let mut rng = rand::rngs::mock::StepRng::new(0, 65540);
-        for _ in 2..65535 {
-            let pair = generate_random_ips_within_subnet(&mut rng);
-            println!("{:?}", pair);
-            assert!(!map.contains(&pair));
-            map.insert(pair);
-        }
-        let pair = generate_random_ips_within_subnet(&mut rng);
-        assert!(map.contains(&pair));
-    }
-}

testnet-faucet/yarn.lock

@@ -2277,9 +2277,9 @@ flatted@^3.1.0:
   integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
 
 follow-redirects@^1.14.0:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
+  version "1.15.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
+  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
 
 fs.realpath@^1.0.0:
   version "1.0.0"

wasm/mix-fetch/internal-dev/yarn.lock

@@ -932,9 +932,9 @@ find-up@^4.0.0:
     path-exists "^4.0.0"
 
 follow-redirects@^1.0.0:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
+  version "1.15.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
+  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
 
 forwarded@0.2.0:
   version "0.2.0"

yarn.lock

@@ -9918,9 +9918,9 @@ focus-lock@^0.8.0:
     tslib "^1.9.3"
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
+  version "1.15.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
+  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
 
 for-each@^0.3.3:
   version "0.3.3"