cargo lock

update dependency to new sphinx release
remove unused sphinx type re-export
2024-05-21 09:53:50 +02:00 · 2024-05-21 09:42:08 +02:00 · 2024-05-21 09:41:46 +02:00 · 2024-05-21 09:41:45 +02:00 · 2024-05-21 09:41:21 +02:00 · 2024-05-21 09:41:21 +02:00
76 changed files with 1544 additions and 1184 deletions
@@ -9,7 +9,11 @@ jobs:
    steps:
      - uses: actions/checkout@v3
      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git
+        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git python3 && sudo apt-get update --fix-missing
+      - name: Install pip3
+        run: sudo apt install -y python3-pip  
+      - name: Install Python3 modules
+        run: sudo pip3 install pandas tabulate
      - name: Install rsync
        run: sudo apt-get install rsync
      - uses: rlespinasse/github-slug-action@v3.x
@@ -13,7 +13,11 @@ jobs:
    steps:
      - uses: actions/checkout@v3
      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git
+        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git python3 && sudo apt-get update --fix-missing
+      - name: Install pip3
+        run: sudo apt install -y python3-pip  
+      - name: Install Python3 modules
+        run: sudo pip3 install pandas tabulate
      - name: Install rsync
        run: sudo apt-get install rsync
      - uses: rlespinasse/github-slug-action@v3.x
@@ -43,19 +43,6 @@ dependencies = [
 "generic-array 0.14.7",
 ]

-[[package]]
-name = "aes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
-dependencies = [
- "cfg-if",
- "cipher 0.3.0",
- "cpufeatures",
- "ctr 0.8.0",
- "opaque-debug 0.3.1",
-]
-
 [[package]]
 name = "aes"
 version = "0.8.4"
@@ -63,7 +50,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
 "cfg-if",
- "cipher 0.4.4",
+ "cipher",
 "cpufeatures",
 ]

@@ -74,9 +61,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
 dependencies = [
 "aead",
- "aes 0.8.4",
- "cipher 0.4.4",
- "ctr 0.9.2",
+ "aes",
+ "cipher",
+ "ctr",
 "ghash",
 "subtle 2.5.0",
 ]
@@ -87,7 +74,7 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom",
 "once_cell",
 "version_check",
 ]
@@ -537,7 +524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e141fb0f8be1c7b45887af94c88b182472b57c96b56773250ae00cd6a14a164"
 dependencies = [
 "bs58 0.5.1",
- "hmac 0.12.1",
+ "hmac",
 "k256",
 "once_cell",
 "pbkdf2",
@@ -599,7 +586,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
 dependencies = [
 "byte-tools",
- "crypto-mac 0.7.0",
+ "crypto-mac",
 "digest 0.8.1",
 "opaque-debug 0.2.3",
 ]
@@ -827,7 +814,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
 dependencies = [
 "cfg-if",
- "cipher 0.4.4",
+ "cipher",
 "cpufeatures",
 ]

@@ -839,7 +826,7 @@ checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
 dependencies = [
 "aead",
 "chacha20",
- "cipher 0.4.4",
+ "cipher",
 "poly1305",
 "zeroize",
 ]
@@ -886,15 +873,6 @@ dependencies = [
 "half",
 ]

-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array 0.14.7",
-]
-
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -1188,7 +1166,7 @@ dependencies = [
 "rand_core 0.6.4",
 "serde",
 "serde_json",
- "signature 2.2.0",
+ "signature",
 "subtle-encoding",
 "tendermint",
 "thiserror",
@@ -1207,7 +1185,7 @@ dependencies = [
 "rand_core 0.6.4",
 "serde",
 "serde_json",
- "signature 2.2.0",
+ "signature",
 "subtle-encoding",
 "tendermint",
 "tendermint-rpc",
@@ -1473,16 +1451,6 @@ dependencies = [
 "subtle 1.0.0",
 ]

-[[package]]
-name = "crypto-mac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e"
-dependencies = [
- "generic-array 0.14.7",
- "subtle 2.5.0",
-]
-
 [[package]]
 name = "csv"
 version = "1.3.0"
@@ -1504,22 +1472,13 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "ctr"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
-dependencies = [
- "cipher 0.3.0",
-]
-
 [[package]]
 name = "ctr"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
 dependencies = [
- "cipher 0.4.4",
+ "cipher",
 ]

 [[package]]
@@ -1571,7 +1530,6 @@ dependencies = [
 "byteorder",
 "digest 0.9.0",
 "rand_core 0.5.1",
- "serde",
 "subtle 2.5.0",
 "zeroize",
 ]
@@ -1585,9 +1543,11 @@ dependencies = [
 "cfg-if",
 "cpufeatures",
 "curve25519-dalek-derive",
+ "digest 0.10.7",
 "fiat-crypto",
 "platforms",
 "rustc_version 0.4.0",
+ "serde",
 "subtle 2.5.0",
 "zeroize",
 ]
@@ -1985,20 +1945,10 @@ dependencies = [
 "elliptic-curve",
 "rfc6979",
 "serdect",
- "signature 2.2.0",
+ "signature",
 "spki",
 ]

-[[package]]
-name = "ed25519"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
-dependencies = [
- "serde",
- "signature 1.6.4",
-]
-
 [[package]]
 name = "ed25519"
 version = "2.2.3"
@@ -2006,7 +1956,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
 "pkcs8",
- "signature 2.2.0",
+ "serde",
+ "signature",
 ]

 [[package]]
@@ -2024,16 +1975,16 @@ dependencies = [

 [[package]]
 name = "ed25519-dalek"
-version = "1.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
- "curve25519-dalek 3.2.0",
- "ed25519 1.5.3",
- "rand 0.7.3",
+ "curve25519-dalek 4.1.2",
+ "ed25519",
+ "rand_core 0.6.4",
 "serde",
- "serde_bytes",
- "sha2 0.9.9",
+ "sha2 0.10.8",
+ "subtle 2.5.0",
 "zeroize",
 ]

@@ -2524,19 +2475,6 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "js-sys",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -2546,7 +2484,7 @@ dependencies = [
 "cfg-if",
 "js-sys",
 "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
 "wasm-bindgen",
 ]

@@ -2812,33 +2750,13 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "hkdf"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b"
-dependencies = [
- "digest 0.9.0",
- "hmac 0.11.0",
-]
-
 [[package]]
 name = "hkdf"
 version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
- "hmac 0.12.1",
-]
-
-[[package]]
-name = "hmac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-dependencies = [
- "crypto-mac 0.11.0",
- "digest 0.9.0",
+ "hmac",
 ]

 [[package]]
@@ -3396,7 +3314,7 @@ dependencies = [
 "elliptic-curve",
 "once_cell",
 "sha2 0.10.8",
- "signature 2.2.0",
+ "signature",
 ]

 [[package]]
@@ -3659,7 +3577,7 @@ checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
 "libc",
 "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
 "windows-sys 0.48.0",
 ]

@@ -3675,7 +3593,7 @@ dependencies = [
 "nym-ordered-buffer",
 "nym-service-providers-common",
 "nym-socks5-requests",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "serde-wasm-bindgen",
 "thiserror",
@@ -3965,9 +3883,7 @@ dependencies = [
 "nym-vesting-contract-common",
 "okapi",
 "pin-project",
- "rand 0.7.3",
 "rand 0.8.5",
- "rand_chacha 0.2.2",
 "rand_chacha 0.3.1",
 "reqwest 0.12.4",
 "rocket",
@@ -4032,7 +3948,7 @@ dependencies = [
 "nym-crypto",
 "nym-network-defaults",
 "nym-validator-client",
- "rand 0.7.3",
+ "rand 0.8.5",
 "thiserror",
 "url",
 "zeroize",
@@ -4182,7 +4098,7 @@ dependencies = [
 "nym-task",
 "nym-topology",
 "nym-validator-client",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "serde_json",
 "tap",
@@ -4230,7 +4146,7 @@ dependencies = [
 "nym-task",
 "nym-topology",
 "nym-validator-client",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "serde_json",
 "sha2 0.10.8",
@@ -4310,7 +4226,7 @@ dependencies = [
 "nym-bin-common",
 "nym-node-tester-utils",
 "nym-node-tester-wasm",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "serde-wasm-bindgen",
 "serde_json",
@@ -4342,7 +4258,7 @@ dependencies = [
 "digest 0.9.0",
 "doc-comment",
 "ff",
- "getrandom 0.2.15",
+ "getrandom",
 "group",
 "itertools 0.10.5",
 "nym-dkg",
@@ -4453,7 +4369,7 @@ dependencies = [
 "nym-credentials-interface",
 "nym-crypto",
 "nym-validator-client",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "thiserror",
 "time",
@@ -4474,25 +4390,25 @@ dependencies = [
 name = "nym-crypto"
 version = "0.4.0"
 dependencies = [
- "aes 0.8.4",
+ "aes",
 "blake3",
 "bs58 0.5.1",
- "cipher 0.4.4",
- "ctr 0.9.2",
+ "cipher",
+ "ctr",
 "digest 0.10.7",
 "ed25519-dalek",
 "generic-array 0.14.7",
- "hkdf 0.12.4",
- "hmac 0.12.1",
+ "hkdf",
+ "hmac",
 "nym-pemstore",
 "nym-sphinx-types",
- "rand 0.7.3",
- "rand_chacha 0.2.2",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
 "serde",
 "serde_bytes",
 "subtle-encoding",
 "thiserror",
- "x25519-dalek 1.1.1",
+ "x25519-dalek",
 "zeroize",
 ]

@@ -4614,7 +4530,7 @@ dependencies = [
 "nym-wireguard",
 "nym-wireguard-types",
 "once_cell",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "serde_json",
 "sqlx",
@@ -4634,7 +4550,7 @@ name = "nym-gateway-client"
 version = "0.1.0"
 dependencies = [
 "futures",
- "getrandom 0.2.15",
+ "getrandom",
 "gloo-utils",
 "log",
 "nym-bandwidth-controller",
@@ -4647,7 +4563,7 @@ dependencies = [
 "nym-sphinx",
 "nym-task",
 "nym-validator-client",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "si-scale",
 "thiserror",
@@ -4676,7 +4592,7 @@ dependencies = [
 "nym-crypto",
 "nym-pemstore",
 "nym-sphinx",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "serde_json",
 "thiserror",
@@ -4902,7 +4818,7 @@ dependencies = [
 "nym-topology",
 "nym-types",
 "nym-validator-client",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "serde_json",
 "sysinfo 0.27.8",
@@ -5024,7 +4940,7 @@ dependencies = [
 "nym-types",
 "pretty_env_logger",
 "publicsuffix",
- "rand 0.7.3",
+ "rand 0.8.5",
 "regex",
 "reqwest 0.12.4",
 "serde",
@@ -5086,7 +5002,7 @@ dependencies = [
 "nym-task",
 "nym-types",
 "nym-wireguard-types",
- "rand 0.7.3",
+ "rand 0.8.5",
 "semver 1.0.23",
 "serde",
 "serde_json",
@@ -5109,7 +5025,7 @@ dependencies = [
 "dashmap",
 "fastrand 2.1.0",
 "headers",
- "hmac 0.12.1",
+ "hmac",
 "hyper 1.3.1",
 "ipnetwork 0.16.0",
 "nym-crypto",
@@ -5119,7 +5035,7 @@ dependencies = [
 "nym-task",
 "nym-wireguard",
 "nym-wireguard-types",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde_json",
 "thiserror",
 "time",
@@ -5129,7 +5045,7 @@ dependencies = [
 "tracing",
 "utoipa",
 "utoipa-swagger-ui",
- "x25519-dalek 2.0.1",
+ "x25519-dalek",
 ]

 [[package]]
@@ -5145,7 +5061,7 @@ dependencies = [
 "nym-exit-policy",
 "nym-http-api-client",
 "nym-wireguard-types",
- "rand_chacha 0.2.2",
+ "rand_chacha 0.3.1",
 "schemars",
 "serde",
 "serde_json",
@@ -5166,7 +5082,7 @@ dependencies = [
 "nym-sphinx-params",
 "nym-task",
 "nym-topology",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "serde_json",
 "thiserror",
@@ -5181,7 +5097,7 @@ dependencies = [
 "futures",
 "js-sys",
 "nym-node-tester-utils",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "serde-wasm-bindgen",
 "thiserror",
@@ -5236,14 +5152,14 @@ dependencies = [
 "chacha20",
 "chacha20poly1305",
 "criterion",
- "curve25519-dalek 3.2.0",
 "fastrand 1.9.0",
- "getrandom 0.2.15",
+ "getrandom",
 "log",
- "rand 0.7.3",
+ "rand 0.8.5",
 "rayon",
 "sphinx-packet",
 "thiserror",
+ "x25519-dalek",
 "zeroize",
 ]

@@ -5288,7 +5204,7 @@ dependencies = [
 "nym-validator-client",
 "parking_lot 0.12.2",
 "pretty_env_logger",
- "rand 0.7.3",
+ "rand 0.8.5",
 "reqwest 0.12.4",
 "tap",
 "thiserror",
@@ -5350,7 +5266,7 @@ dependencies = [
 "nym-socks5-client-core",
 "nym-sphinx",
 "nym-topology",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "serde_json",
 "tap",
@@ -5383,7 +5299,7 @@ dependencies = [
 "nym-task",
 "nym-validator-client",
 "pin-project",
- "rand 0.7.3",
+ "rand 0.8.5",
 "reqwest 0.12.4",
 "schemars",
 "serde",
@@ -5409,7 +5325,7 @@ dependencies = [
 "nym-credential-storage",
 "nym-crypto",
 "nym-socks5-client-core",
- "rand 0.7.3",
+ "rand 0.8.5",
 "safer-ffi",
 "serde",
 "tokio",
@@ -5463,7 +5379,7 @@ dependencies = [
 "nym-sphinx-routing",
 "nym-sphinx-types",
 "nym-topology",
- "rand 0.7.3",
+ "rand 0.8.5",
 "rand_distr",
 "thiserror",
 "tokio",
@@ -5481,7 +5397,7 @@ dependencies = [
 "nym-sphinx-routing",
 "nym-sphinx-types",
 "nym-topology",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "thiserror",
 "zeroize",
@@ -5493,7 +5409,7 @@ version = "0.1.0"
 dependencies = [
 "nym-crypto",
 "nym-sphinx-types",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "thiserror",
 ]
@@ -5509,8 +5425,8 @@ dependencies = [
 "nym-sphinx-routing",
 "nym-sphinx-types",
 "nym-topology",
- "rand 0.7.3",
- "rand_chacha 0.2.2",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
 "serde",
 "thiserror",
 "wasm-bindgen",
@@ -5524,7 +5440,7 @@ dependencies = [
 "nym-sphinx-addressing",
 "nym-sphinx-params",
 "nym-sphinx-types",
- "rand 0.7.3",
+ "rand 0.8.5",
 "thiserror",
 ]

@@ -5541,7 +5457,7 @@ dependencies = [
 "nym-sphinx-routing",
 "nym-sphinx-types",
 "nym-topology",
- "rand 0.7.3",
+ "rand 0.8.5",
 "thiserror",
 ]

@@ -5616,7 +5532,7 @@ dependencies = [
 "aes-gcm",
 "argon2",
 "generic-array 0.14.7",
- "getrandom 0.2.15",
+ "getrandom",
 "rand 0.8.5",
 "serde",
 "serde_json",
@@ -5652,7 +5568,7 @@ dependencies = [
 "nym-sphinx-addressing",
 "nym-sphinx-routing",
 "nym-sphinx-types",
- "rand 0.7.3",
+ "rand 0.8.5",
 "semver 0.11.0",
 "serde",
 "serde_json",
@@ -5682,7 +5598,7 @@ dependencies = [
 "cosmrs 0.15.0 (git+https://github.com/jstuczyn/cosmos-rust?branch=nym-temp/all-validator-features)",
 "cosmwasm-std",
 "eyre",
- "hmac 0.12.1",
+ "hmac",
 "itertools 0.11.0",
 "log",
 "nym-config",
@@ -5700,7 +5616,7 @@ dependencies = [
 "thiserror",
 "ts-rs",
 "url",
- "x25519-dalek 2.0.1",
+ "x25519-dalek",
 ]

 [[package]]
@@ -5832,7 +5748,7 @@ dependencies = [
 "nym-task",
 "nym-wireguard-types",
 "tokio",
- "x25519-dalek 2.0.1",
+ "x25519-dalek",
 ]

 [[package]]
@@ -5841,16 +5757,16 @@ version = "0.1.0"
 dependencies = [
 "base64 0.21.7",
 "dashmap",
- "hmac 0.12.1",
+ "hmac",
 "log",
 "nym-crypto",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "serde_json",
 "sha2 0.10.8",
 "thiserror",
 "utoipa",
- "x25519-dalek 2.0.1",
+ "x25519-dalek",
 ]

 [[package]]
@@ -6174,7 +6090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
 "digest 0.10.7",
- "hmac 0.12.1",
+ "hmac",
 ]

 [[package]]
@@ -6635,7 +6551,7 @@ dependencies = [
 "libc",
 "rand_chacha 0.1.1",
 "rand_core 0.4.2",
- "rand_hc 0.1.0",
+ "rand_hc",
 "rand_isaac",
 "rand_jitter",
 "rand_os",
@@ -6644,19 +6560,6 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -6678,16 +6581,6 @@ dependencies = [
 "rand_core 0.3.1",
 ]

-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rand_chacha"
 version = "0.3.1"
@@ -6718,9 +6611,6 @@ name = "rand_core"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]

 [[package]]
 name = "rand_core"
@@ -6728,17 +6618,17 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom",
 ]

 [[package]]
 name = "rand_distr"
-version = "0.3.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9532ada3929fb8b2e9dbe28d1e06c9b2cc65813f074fcb6bd5fbefeff9d56"
+checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
 dependencies = [
 "num-traits",
- "rand 0.7.3",
+ "rand 0.8.5",
 ]

 [[package]]
@@ -6750,15 +6640,6 @@ dependencies = [
 "rand_core 0.3.1",
 ]

-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rand_isaac"
 version = "0.1.1"
@@ -6892,7 +6773,7 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom",
 "libredox",
 "thiserror",
 ]
@@ -7052,7 +6933,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
- "hmac 0.12.1",
+ "hmac",
 "subtle 2.5.0",
 ]

@@ -7079,7 +6960,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
 "cc",
 "cfg-if",
- "getrandom 0.2.15",
+ "getrandom",
 "libc",
 "spin 0.9.8",
 "untrusted 0.9.0",
@@ -7833,12 +7714,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "signature"
-version = "1.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-
 [[package]]
 name = "signature"
 version = "2.2.0"
@@ -7909,26 +7784,27 @@ dependencies = [

 [[package]]
 name = "sphinx-packet"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc43eda802856ee82a7555c7b75ceb9e07451741c7a2f5f23d036020e01189d4"
+checksum = "cffb0df8390239119e76d4f60a6b06900351ee971d78868fc4cfef18301728ad"
 dependencies = [
- "aes 0.7.5",
+ "aes",
 "arrayref",
 "blake2 0.8.1",
- "bs58 0.4.0",
+ "bs58 0.5.1",
 "byteorder",
 "chacha",
- "curve25519-dalek 3.2.0",
- "digest 0.9.0",
- "hkdf 0.11.0",
- "hmac 0.11.0",
+ "ctr",
+ "digest 0.10.7",
+ "hkdf",
+ "hmac",
 "lioness",
 "log",
- "rand 0.7.3",
+ "rand 0.8.5",
 "rand_distr",
- "sha2 0.9.9",
+ "sha2 0.10.8",
 "subtle 2.5.0",
+ "x25519-dalek",
 ]

 [[package]]
@@ -8318,7 +8194,7 @@ checksum = "15ab8f0a25d0d2ad49ac615da054d6a76aa6603ff95f7d18bafdd34450a1a04b"
 dependencies = [
 "bytes",
 "digest 0.10.7",
- "ed25519 2.2.3",
+ "ed25519",
 "ed25519-consensus",
 "flex-error",
 "futures",
@@ -8333,7 +8209,7 @@ dependencies = [
 "serde_json",
 "serde_repr",
 "sha2 0.10.8",
- "signature 2.2.0",
+ "signature",
 "subtle 2.5.0",
 "subtle-encoding",
 "tendermint-proto",
@@ -8384,7 +8260,7 @@ dependencies = [
 "bytes",
 "flex-error",
 "futures",
- "getrandom 0.2.15",
+ "getrandom",
 "peg",
 "pin-project",
 "reqwest 0.11.27",
@@ -9288,7 +9164,7 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom",
 "wasm-bindgen",
 ]

@@ -9347,12 +9223,6 @@ dependencies = [
 "try-lock",
 ]

-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -9468,7 +9338,7 @@ dependencies = [
 "nym-task",
 "nym-topology",
 "nym-validator-client",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde",
 "serde-wasm-bindgen",
 "thiserror",
@@ -9516,7 +9386,7 @@ name = "wasm-utils"
 version = "0.1.0"
 dependencies = [
 "futures",
- "getrandom 0.2.15",
+ "getrandom",
 "gloo-net",
 "gloo-utils",
 "js-sys",
@@ -9924,18 +9794,6 @@ dependencies = [
 "tap",
 ]

-[[package]]
-name = "x25519-dalek"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f"
-dependencies = [
- "curve25519-dalek 3.2.0",
- "rand_core 0.5.1",
- "serde",
- "zeroize",
-]
-
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -25,7 +25,7 @@ bs58 = { workspace = true }
 clap = { workspace = true, features = ["cargo", "derive"] }
 dirs = "4.0"
 log = { workspace = true } # self explanatory
-rand = { version = "0.7.3", features = ["wasm-bindgen"] } # rng-related traits + some rng implementation to use
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] } # for config serialization/deserialization
 serde_json = { workspace = true }
 thiserror = { workspace = true }
@@ -16,7 +16,7 @@ serde_json = { workspace = true }
 tap = "1.0.1"
 thiserror = { workspace = true }
 tokio = { version = "1.24.1", features = ["rt-multi-thread", "net", "signal"] }
-rand = "0.7.3"
+rand = { workspace = true }
 time = { workspace = true }
 url = { workspace = true }
 zeroize = { workspace = true }
@@ -9,7 +9,7 @@ license.workspace = true
 [dependencies]
 bip39 = { workspace = true }
 log = { workspace = true }
-rand = "0.7.3"
+rand = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
 zeroize = { workspace = true }
@@ -17,7 +17,7 @@ clap = { workspace = true, optional = true }
 futures = { workspace = true }
 humantime-serde = { workspace = true }
 log = { workspace = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 sha2 = "0.10.6"
@@ -14,7 +14,7 @@ futures = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 tokio = { version = "1.24.1", features = ["macros"] }
 si-scale = "0.2.2"
 time.workspace = true
@@ -23,5 +23,5 @@ nym-api-requests = { path = "../../nym-api/nym-api-requests" }
 nym-validator-client = { path = "../client-libs/validator-client", default-features = false }

 [dev-dependencies]
-rand = "0.7.3"
+rand = "0.8.5"

@@ -17,9 +17,9 @@ generic-array = { workspace = true, optional = true }
 hkdf = { version = "0.12.3", optional = true }
 hmac = { version = "0.12.1", optional = true }
 cipher = { version = "0.4.3", optional = true }
-x25519-dalek = { version = "1.1", optional = true }
-ed25519-dalek = { version = "1.0", optional = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"], optional = true }
+x25519-dalek = { version = "2.0.0", optional = true }
+ed25519-dalek = { version = "2.1", features = ["rand_core"], optional = true }
+rand = { version = "0.8.5", optional = true }
 serde_bytes = { version = "0.11.6", optional = true }
 serde_crate = { version = "1.0", optional = true, default_features = false, features = ["derive"], package = "serde" }
 subtle-encoding = { version = "0.5", features =  ["bech32-preview"]}
@@ -31,7 +31,7 @@ nym-sphinx-types = { path = "../nymsphinx/types", version = "0.2.0", default-fea
 nym-pemstore = { path = "../../common/pemstore", version = "0.3.0" }

 [dev-dependencies]
-rand_chacha = "0.2"
+rand_chacha = "0.3"

 [features]
 default = ["sphinx"]
@@ -56,7 +56,7 @@ pub struct KeyPair {
 impl KeyPair {
    #[cfg(feature = "rand")]
    pub fn new<R: RngCore + CryptoRng>(rng: &mut R) -> Self {
-        let private_key = x25519_dalek::StaticSecret::new(rng);
+        let private_key = x25519_dalek::StaticSecret::random_from_rng(rng);
        let public_key = (&private_key).into();

        KeyPair {
@@ -203,7 +203,7 @@ impl<'a> From<&'a PrivateKey> for PublicKey {
 impl PrivateKey {
    #[cfg(feature = "rand")]
    pub fn new<R: RngCore + CryptoRng>(rng: &mut R) -> Self {
-        let x25519_secret = x25519_dalek::StaticSecret::new(rng);
+        let x25519_secret = x25519_dalek::StaticSecret::random_from_rng(rng);

        PrivateKey(x25519_secret)
    }
@@ -322,9 +322,7 @@ impl<'a> From<&'a PrivateKey> for nym_sphinx_types::PrivateKey {
 #[cfg(feature = "sphinx")]
 impl From<nym_sphinx_types::PrivateKey> for PrivateKey {
    fn from(private_key: nym_sphinx_types::PrivateKey) -> Self {
-        let private_key_bytes = private_key.to_bytes();
-        assert_eq!(private_key_bytes.len(), PRIVATE_KEY_SIZE);
-        Self::from_bytes(&private_key_bytes).unwrap()
+        Self(private_key)
    }
 }

@@ -366,7 +364,7 @@ mod sphinx_key_conversion {
    #[test]
    fn works_for_backward_conversion() {
        for _ in 0..NUM_ITERATIONS {
-            let (sphinx_private, sphinx_public) = nym_sphinx_types::crypto::keygen();
+            let (sphinx_private, sphinx_public) = nym_sphinx_types::test_utils::fixtures::keygen();

            let private_bytes = sphinx_private.to_bytes();
            let public_bytes = sphinx_public.as_bytes();
@@ -1,8 +1,8 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-pub use ed25519_dalek::ed25519::signature::Signature as SignatureTrait;
 pub use ed25519_dalek::SignatureError;
+use ed25519_dalek::{Signer, SigningKey};
 pub use ed25519_dalek::{Verifier, PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH, SIGNATURE_LENGTH};
 use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use std::fmt::{self, Display, Formatter};
@@ -30,6 +30,9 @@ pub enum Ed25519RecoveryError {
    #[error(transparent)]
    MalformedBytes(#[from] SignatureError),

+    #[error(transparent)]
+    BytesLengthError(#[from] std::array::TryFromSliceError),
+
    #[error("the base58 representation of the public key was malformed - {source}")]
    MalformedPublicKeyString {
        #[source]
@@ -64,11 +67,11 @@ pub struct KeyPair {
 impl KeyPair {
    #[cfg(feature = "rand")]
    pub fn new<R: RngCore + CryptoRng>(rng: &mut R) -> Self {
-        let ed25519_keypair = ed25519_dalek::Keypair::generate(rng);
+        let ed25519_signing_key = ed25519_dalek::SigningKey::generate(rng);

        KeyPair {
-            private_key: PrivateKey(ed25519_keypair.secret),
-            public_key: PublicKey(ed25519_keypair.public),
+            private_key: PrivateKey(ed25519_signing_key.to_bytes()),
+            public_key: PublicKey(ed25519_signing_key.verifying_key()),
        }
    }

@@ -109,7 +112,7 @@ impl PemStorableKeyPair for KeyPair {

 /// ed25519 EdDSA Public Key
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct PublicKey(ed25519_dalek::PublicKey);
+pub struct PublicKey(ed25519_dalek::VerifyingKey);

 impl Display for PublicKey {
    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
@@ -135,7 +138,9 @@ impl PublicKey {
    }

    pub fn from_bytes(b: &[u8]) -> Result<Self, Ed25519RecoveryError> {
-        Ok(PublicKey(ed25519_dalek::PublicKey::from_bytes(b)?))
+        Ok(PublicKey(ed25519_dalek::VerifyingKey::from_bytes(
+            b.try_into()?,
+        )?))
    }

    pub fn to_base58_string(self) -> String {
@@ -189,7 +194,7 @@ impl<'d> Deserialize<'d> for PublicKey {
    where
        D: Deserializer<'d>,
    {
-        Ok(PublicKey(ed25519_dalek::PublicKey::deserialize(
+        Ok(PublicKey(ed25519_dalek::VerifyingKey::deserialize(
            deserializer,
        )?))
    }
@@ -223,14 +228,14 @@ impl Display for PrivateKey {

 impl<'a> From<&'a PrivateKey> for PublicKey {
    fn from(pk: &'a PrivateKey) -> Self {
-        PublicKey((&pk.0).into())
+        PublicKey(SigningKey::from_bytes(&pk.0).verifying_key())
    }
 }

 impl PrivateKey {
    #[cfg(feature = "rand")]
    pub fn new<R: RngCore + CryptoRng>(rng: &mut R) -> Self {
-        let ed25519_secret = ed25519_dalek::SecretKey::generate(rng);
+        let ed25519_secret = ed25519_dalek::SigningKey::generate(rng).to_bytes();

        PrivateKey(ed25519_secret)
    }
@@ -240,11 +245,11 @@ impl PrivateKey {
    }

    pub fn to_bytes(&self) -> [u8; SECRET_KEY_LENGTH] {
-        self.0.to_bytes()
+        self.0
    }

    pub fn from_bytes(b: &[u8]) -> Result<Self, Ed25519RecoveryError> {
-        Ok(PrivateKey(ed25519_dalek::SecretKey::from_bytes(b)?))
+        Ok(PrivateKey(b.try_into()?))
    }

    pub fn to_base58_string(&self) -> String {
@@ -259,9 +264,8 @@ impl PrivateKey {
    }

    pub fn sign<M: AsRef<[u8]>>(&self, message: M) -> Signature {
-        let expanded_secret_key = ed25519_dalek::ExpandedSecretKey::from(&self.0);
-        let public_key: PublicKey = self.into();
-        let sig = expanded_secret_key.sign(message.as_ref(), &public_key.0);
+        let signing_key: SigningKey = self.0.into();
+        let sig = signing_key.sign(message.as_ref());
        Signature(sig)
    }

@@ -330,7 +334,9 @@ impl Signature {
    }

    pub fn from_bytes(bytes: &[u8]) -> Result<Self, Ed25519RecoveryError> {
-        Ok(Signature(ed25519_dalek::Signature::from_bytes(bytes)?))
+        Ok(Signature(ed25519_dalek::Signature::from_bytes(
+            bytes.try_into()?,
+        )))
    }
 }

@@ -3,11 +3,11 @@

 use crate::asymmetric::encryption;
 use crate::hkdf;
+#[cfg(feature = "rand")]
+use cipher::crypto_common::rand_core::{CryptoRng, RngCore};
 use cipher::{Key, KeyIvInit, StreamCipher};
 use digest::crypto_common::BlockSizeUser;
 use digest::Digest;
-#[cfg(feature = "rand")]
-use rand::{CryptoRng, RngCore};

 /// Generate an ephemeral encryption keypair and perform diffie-hellman to establish
 /// shared key with the remote.
@@ -242,7 +242,7 @@ impl SphinxPacketProcessor {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use nym_sphinx_types::crypto::keygen;
+    use nym_sphinx_types::test_utils::fixtures::keygen;

    fn fixture() -> SphinxPacketProcessor {
        let local_keys = keygen();
@@ -8,7 +8,7 @@ license.workspace = true

 [dependencies]
 futures = { workspace = true }
-rand = "0.7.3"
+rand = { workspace = true }

 serde = { workspace = true }
 serde_json = { workspace = true }
@@ -9,8 +9,8 @@ repository = { workspace = true }

 [dependencies]
 log = { workspace = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
-rand_distr = "0.3"
+rand = { workspace = true }
+rand_distr = "0.4"
 thiserror = { workspace = true }

 nym-sphinx-acknowledgements = { path = "acknowledgements" }
@@ -8,7 +8,7 @@ license = { workspace = true }
 repository = { workspace = true }

 [dependencies]
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 serde_crate = { version = "1.0", optional = true, default_features = false, features = ["derive"], package = "serde" }
 generic-array = { workspace = true, optional = true, features = ["serde"] }
 thiserror = { workspace = true }
@@ -14,5 +14,5 @@ serde = "1.0" # implementing serialization/deserialization for some types, like
 thiserror = { workspace = true }

 [dev-dependencies]
-rand = "0.7"
+rand = "0.8.5"
 nym-crypto = { path = "../../crypto", features = ["rand"] }
@@ -8,7 +8,7 @@ license = { workspace = true }
 repository = { workspace = true }

 [dependencies]
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 bs58 = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }
@@ -24,4 +24,4 @@ nym-topology = { path = "../../topology" }
 version = "0.2.83"

 [dev-dependencies]
-rand_chacha = "0.2"
+rand_chacha = "0.3"
@@ -570,7 +570,7 @@ mod tests {
            let mut address_bytes = [0; NODE_ADDRESS_LENGTH];
            rng.fill_bytes(&mut address_bytes);

-            let dummy_private = PrivateKey::new_with_rng(rng);
+            let dummy_private = PrivateKey::random_from_rng(rng);
            let pub_key = (&dummy_private).into();
            Node {
                address: NodeAddressBytes::from_bytes(address_bytes),
@@ -11,7 +11,7 @@ repository = { workspace = true }

 [dependencies]
 log = { workspace = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 thiserror = { workspace = true }

 nym-sphinx-addressing = { path = "../addressing" }
@@ -8,7 +8,7 @@ license = { workspace = true }
 repository = { workspace = true }

 [dependencies]
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 thiserror = { workspace = true }

 nym-crypto = { path = "../../crypto" }
@@ -130,28 +130,28 @@ impl Decoder for NymCodec {
 mod packet_encoding {
    use super::*;
    use nym_sphinx_types::{
-        crypto, Delay as SphinxDelay, Destination, DestinationAddressBytes, Node, NodeAddressBytes,
-        DESTINATION_ADDRESS_LENGTH, IDENTIFIER_LENGTH, NODE_ADDRESS_LENGTH,
+        test_utils, Delay as SphinxDelay, Destination, DestinationAddressBytes, Node,
+        NodeAddressBytes, DESTINATION_ADDRESS_LENGTH, IDENTIFIER_LENGTH, NODE_ADDRESS_LENGTH,
    };

    fn make_valid_outfox_packet(size: PacketSize) -> NymPacket {
-        let (_, node1_pk) = crypto::keygen();
+        let (_, node1_pk) = test_utils::fixtures::keygen();
        let node1 = Node::new(
            NodeAddressBytes::from_bytes([5u8; NODE_ADDRESS_LENGTH]),
            node1_pk,
        );
-        let (_, node2_pk) = crypto::keygen();
+        let (_, node2_pk) = test_utils::fixtures::keygen();
        let node2 = Node::new(
            NodeAddressBytes::from_bytes([4u8; NODE_ADDRESS_LENGTH]),
            node2_pk,
        );
-        let (_, node3_pk) = crypto::keygen();
+        let (_, node3_pk) = test_utils::fixtures::keygen();
        let node3 = Node::new(
            NodeAddressBytes::from_bytes([2u8; NODE_ADDRESS_LENGTH]),
            node3_pk,
        );

-        let (_, node4_pk) = crypto::keygen();
+        let (_, node4_pk) = test_utils::fixtures::keygen();
        let node4 = Node::new(
            NodeAddressBytes::from_bytes([2u8; NODE_ADDRESS_LENGTH]),
            node4_pk,
@@ -170,17 +170,17 @@ mod packet_encoding {
    }

    fn make_valid_sphinx_packet(size: PacketSize) -> NymPacket {
-        let (_, node1_pk) = crypto::keygen();
+        let (_, node1_pk) = test_utils::fixtures::keygen();
        let node1 = Node::new(
            NodeAddressBytes::from_bytes([5u8; NODE_ADDRESS_LENGTH]),
            node1_pk,
        );
-        let (_, node2_pk) = crypto::keygen();
+        let (_, node2_pk) = test_utils::fixtures::keygen();
        let node2 = Node::new(
            NodeAddressBytes::from_bytes([4u8; NODE_ADDRESS_LENGTH]),
            node2_pk,
        );
-        let (_, node3_pk) = crypto::keygen();
+        let (_, node3_pk) = test_utils::fixtures::keygen();
        let node3 = Node::new(
            NodeAddressBytes::from_bytes([2u8; NODE_ADDRESS_LENGTH]),
            node3_pk,
@@ -8,7 +8,7 @@ license = { workspace = true }
 repository = { workspace = true }

 [dependencies]
-sphinx-packet = { version = "0.1.0", optional = true }
+sphinx-packet = { version = "0.2.0", optional = true }
 nym-outfox = { path = "../../../nym-outfox", optional = true }
 thiserror = { workspace = true }

@@ -15,13 +15,13 @@ pub use sphinx_packet::{
        self, DESTINATION_ADDRESS_LENGTH, IDENTIFIER_LENGTH, MAX_PATH_LENGTH, NODE_ADDRESS_LENGTH,
        PAYLOAD_KEY_SIZE,
    },
-    crypto::{self, EphemeralSecret, PrivateKey, PublicKey, SharedSecret},
+    crypto::{self, PrivateKey, PublicKey},
    header::{self, delays, delays::Delay, ProcessedHeader, SphinxHeader, HEADER_SIZE},
    packet::builder::DEFAULT_PAYLOAD_SIZE,
    payload::{Payload, PAYLOAD_OVERHEAD_SIZE},
    route::{Destination, DestinationAddressBytes, Node, NodeAddressBytes, SURBIdentifier},
    surb::{SURBMaterial, SURB},
-    Error as SphinxError, ProcessedPacket,
+    test_utils, Error as SphinxError, ProcessedPacket,
 };
 #[cfg(feature = "sphinx")]
 use sphinx_packet::{SphinxPacket, SphinxPacketBuilder};
@@ -12,7 +12,7 @@ dirs = "4.0"
 futures = { workspace = true }
 log = { workspace = true }
 pin-project = "1.0"
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 reqwest = { workspace = true }
 schemars = { workspace = true, features = ["preserve_order"] }
 serde = { workspace = true, features = ["derive"] } # for config serialization/deserialization
@@ -14,7 +14,7 @@ documentation = { workspace = true }
 [dependencies]
 bs58 = { workspace = true }
 log = { workspace = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 thiserror = { workspace = true }
 async-trait = { workspace = true, optional = true }
 semver = "0.11"
@@ -11,7 +11,7 @@ repository = "https://github.com/nymtech/nym"
 [dependencies]
 async-trait = { workspace = true }
 js-sys = { workspace = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde-wasm-bindgen = { workspace = true }
 thiserror = { workspace = true }
@@ -32,7 +32,7 @@ serde_json = { workspace = true, optional = true }
 x25519-dalek = { version = "2.0.0", features = ["static_secrets"] }

 [dev-dependencies]
-rand = "0.7.3"
+rand = "0.8.5"
 nym-crypto = { path = "../crypto", features = ["rand"]}


@@ -32,7 +32,7 @@ cw-multi-test = { workspace = true }
 cw3-flex-multisig = { path = "../multisig/cw3-flex-multisig" }
 cw4-group = { path = "../multisig/cw4-group" }

-rand_chacha = "0.2"
+rand_chacha = "0.3"

 [[test]]
 name = "coconut-test"
@@ -25,7 +25,7 @@ nym-vesting-contract = { path = "../vesting" }
 nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "rand"] }

 # external dependencies
-rand_chacha = "0.2"
+rand_chacha = "0.3"

 [[test]]
 name = "mixnet-vesting-test"
@@ -44,7 +44,7 @@ time = { version = "0.3", features = ["macros"] }
 semver = { workspace = true, default-features = false }

 [dev-dependencies]
-rand_chacha = "0.2"
+rand_chacha = "0.3"
 nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "rand"] }

 [build-dependencies]
@@ -33,7 +33,7 @@ cw-multi-test = { workspace = true }
 nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "rand"] }
 nym-sphinx-addressing = { path = "../../common/nymsphinx/addressing" }
 rand = "0.8.5"
-rand_chacha = "0.2"
+rand_chacha = "0.3"
 rstest = "0.17.0"

 [features]
@@ -31,7 +31,7 @@ vergen = { version = "=7.4.3", default-features = false, features = ["build", "g
 anyhow = "1.0.40"
 cw-multi-test = { workspace = true }
 nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "rand"] }
-rand_chacha = "0.2"
+rand_chacha = "0.3"
 rstest = "0.17.0"

 [features]
@@ -27,13 +27,15 @@
 - [Maintenance](nodes/maintenance.md)
  - [Manual Node Upgrade](nodes/manual-upgrade.md)
  - [Automatic Node Upgrade: Nymvisor Setup and Usage](nodes/nymvisor-upgrade.md)
- [Performance Testing](testing/performance.md)
-  - [Node Setup](testing/node-setup.md)
- [Metrics Monitoring](testing/templates.md)
+- [Performance Monitoring & Testing](testing/performance.md)
+  <!--- [Node Setup](testing/node-setup.md)-->
+  - [Gateway Probe](testing/gateway-probe.md)
  - [Prometheus & Grafana](testing/prometheus-grafana.md)
    - [ExploreNYM scripts](testing/explorenym-scripts.md)
 <!--    - [Run in a Docker](testing/docker-monitor.md) -->

+
+
 # Troubleshooting

 - [VPS Setup](troubleshooting/vps-isp.md)
@@ -56,6 +58,7 @@

 - [Exit Gateway](legal/exit-gateway.md)
 - [Community Counsel](legal/community-counsel.md)
+    - [ISP List](legal/isp-list.md)
    - [Jurisdictions](legal/jurisdictions.md)
        - [Switzerland](legal/swiss.md)
        - [United States](legal/united-states.md)
@@ -0,0 +1,8 @@
+**ISP**,**Locations**,**Public IPv6**,**Crypto Payments**,**Comments**,**Last Updated**
+[Flokinet](https://flokinet.is),"Netherlands, Iceland, Romania,France","Yes, needs a ticket and custom setup","yes, including XMR","Very slow customer support","05/2024"
+[BitLaunch](https://bitlaunch.io),"Canada, USA, UK","No","Yes","Expensive. Digial Ocean through BitLanch has IPv6","05/2024"
+[Hostinger](https://hostinger.com),"France, Lithuania, India, USA, Brazil","Yes, out of the box","Yes","Crypto payments must be done per each server monthly or annually.","05/2024"
+[Linode](https://linode.com),"USA, Canada, Japan, India, Indonesia, Sweden, Netherlands, Germany, Brazil, France, UK, Australia, Italy","Yes out of the box","No, only through [BitLAunch](https://bitlaunch.io)","IPv6 sometimes need to be re-added in Networking tab, no reboot needed","05/2024"
+[Cherry Servers](https://www.cherryservers.com),"Lithuania, Netherlands, USA, Singapore","No","Yes","Issued IP doesn’t match the location offered by the provider.","05/2024"
+[Njalla](https://nja.la),"Sweden","Yes","Yes","Privacy vandguards! The biggest VPS 45 is 3 cores only, but it works better than many “larger” servers on the market.","05/2024"
+[HostSailor](https://hostsailor.com),"USA","Yes, based on ticket","Yes","The IPv6 setup needs custom research and is not documented","05/2024"
@@ -0,0 +1,25 @@
+# Where to host your `nym-node`?
+
+```admonish info
+The entire content of this page is under [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/).
+```
+
+Inspired by a valuable resource, done by Tor community - [*Good Bad ISPs*](https://community.torproject.org/relay/community-resources/good-bad-isps/), LunarDAO squad initiated a table customised for Nym Exit Gateways operators.
+
+This ISP list is fully managed by Nym operator community and it serves as a space to share their experience of running Exit Gateways on various Internet Service Providers (ISPs). The ISPs greatly differ in regards to services they offer as well as to their openess of hosting exit routing software.
+
+Please share any experiences running a node like policies, complains, legal issues and solutions, discrepancy between offers and reality (bandwidth, IP range, locations) or anything regarding pricing or customer support.
+
+If you came across any legal findings, please share them in our [list of jurisdictions](jurisdictions.md).
+
+While we trust that Nym node operators are honest, we would like to ask everyone to do your own research.
+
+```admonish caution title=""
+To edit or add information to the ISP list, make changes to the csv file located [here](https://github.com/nymtech/nym/blob/develop/documentation/operators/src/data/isp-sheet.csv) and submit your edits as a pull request according to [this guide](add-content.md).
+```
+
+```admonish note title=""
+As of now the list is quite short. When it grows, we can divide it according the localities of the listed ISPs.
+```
+
+<!--cmdrun python3 ../../../scripts/csv2md.py ../data/isp-sheet.csv -s 0 -->
@@ -10,9 +10,9 @@ A suboptimally configured VPS often results in a non-functional node. To follow

 You will need to rent a VPS to run your node on. One key reason for this is that your node **must be able to send TCP data using both IPv4 and IPv6** (as other nodes you talk to may use either protocol).

-Tor community created a very helpful table called [*Good Bad ISPs*](https://community.torproject.org/relay/community-resources/good-bad-isps/), use that one as a guideline for your choice of ISP for your VPS.
+Tor community created a very helpful table called [*Good Bad ISPs*](https://community.torproject.org/relay/community-resources/good-bad-isps/), you can use that one as a guideline for your choice of ISP for your VPS.

-Currently we run [performance testing](../testing/performance.md) events to find out the best optimization. Sphinx packet decryption is CPU-bound, so more fast cores the better throughput.
+**Update:** Nym community started an ISP table called [*Where to host your nym node?*](../legal/isp-list.md), check it out and add your findings!

 ### `nym-node`

@@ -0,0 +1,79 @@
+# Nym Gateway Probe
+
+Nym Node operators running Gateway functionality are already familiar with the monitoring tool [Harbourmaster.nymtech.net](https://harbourmaster.nymtech.net). Under the hood of Nym Harbourmaster runs iterations of `nym-gateway-probe` doing various checks and displaying the results on the interface. Operators don't have to rely on the probe ran by Nym and wait for the data to refresh. With `nym-gateway-probe` everyone can check any Gateway's networking status from their own computer at any time. In one command the client queries data from:
+
+- [`nym-api`](https://validator.nymtech.net/api/)
+- [`explorer-api`](https://explorer.nymtech.net/api/)
+- [`harbour-master`](https://harbourmaster.nymtech.net/)
+
+
+## Preparation
+
+We recommend to have install all [the prerequisites](../binaries/building-nym.md#prerequisites) needed to build `nym-node` from source including latest [Rust Toolchain](https://www.rust-lang.org/tools/install).
+
+## Installation
+
+`nym-gateway-probe` source code is in [`nym-vpn-client`](https://github.com/nymtech/nym-vpn-client) repository. The client needs to be build from source.
+
+1. Clone the repository:
+
+```sh
+git clone https://github.com/nymtech/nym-vpn-client.git
+```
+
+2. Build `nym-gateway-probe`:
+
+```sh
+cd nym-vpn-client
+
+cargo build --release -p nym-gateway-probe
+```
+
+## Running the client
+
+```sh
+./target/release/nym-gateway-probe --help
+```
+~~~admonish collapsible=true
+```
+Usage: nym-gateway-probe [OPTIONS]
+
+Options:
+  -c, --config-env-file <CONFIG_ENV_FILE>  Path pointing to an env file describing the network
+  -g, --gateway <GATEWAY>
+  -n, --no-log
+  -h, --help                               Print help
+  -V, --version                            Print version
+
+```
+~~~
+
+To run the client, simply add a flag `--gateway` with a targeted gateway identity key. 
+
+```sh
+./target/release/nym-gateway-probe --gateway <GATEWAY_IDENTITY_KEY>
+```
+
+For any `nym-node --mode exit-gateway` the aim is to have this outcome:
+```sh
+{
+  "gateway": "<GATEWAY_IDENTITY_KEY>",
+  "outcome": {
+    "as_entry": {
+      "can_connect": true,
+      "can_route": true
+    },
+    "as_exit": {
+      "can_connect": true,
+      "can_route_ip_v4": true,
+      "can_route_ip_external_v4": true,
+      "can_route_ip_v6": true,
+      "can_route_ip_external_v6": true
+    }
+  }
+}
+```
+
+If you don't provide a `--gateway` flag it will pick a random one to test.
+
+
@@ -1,10 +1,14 @@
 # Node Setup for Performance Testing Event

+```admonish info
+For the moment we paused Fast and Furious `perf` environment. Nym Mainnet environment will be used for future tests, please wait for further instructions. 
+```
+
 To join the [Performance testing event]({{performance_testing_webpage}}) node operators need to do proceed with the following tasks:

 1. **[Sign their node]({{performance_testing_webpage}}) into the testing environment**
 2. **[Configure their node](#node-configuration) for the test**
-3. (*Not mandatory*) [Setup metric monitoring system](templates.md) to observe node performance at any time
+3. (*Not mandatory*) [Setup metric monitoring system](performance.md#monitoring) to observe node performance at any time

 ## Node Configuration

@@ -1,8 +1,34 @@
-# Performance Testing
+# Performance Monitoring & Testing

-> To configure your node for a testing event, visit [node setup page](node-setup.md).
+Nym Mixnet has been running on mainnet for quite some time. There is still work to be done in order for the network to meet its full potential - mass adoption of privacy through fully distributed Mixnet.

-Nym Mixnet has been running on mainnet for quite some time. There is still work to be done in order for the network to meet its full potential - mass adoption of privacy through fully distributed Mixnet. 
+As developers we need to be constantly improving the software. Operators have as much important role, keep their nodes up to date, monitor their performance and share their feedback with the rest of the community and core developers.
+
+Therefore [monitoring](#monitoring) and [testing](#testing) are essential pieces of our common work. We call out all Nym operators to join the efforts! 
+
+## Monitoring
+
+There are multiple ways to monitor performance of nodes and the machines on which they run. For the purpose of maximal privacy and decentralisation of the data - preventing Nym Mixnet from any global adversary takeover - we created these pages as a source of mutual empowerment, a place where operators can share and learn new skills to **setup metrics monitors on their own infrastructure**.
+
+### Guides to Setup Own Metrics
+
+A list of different scripts, templates and guides for easier navigation:
+
+* [`nym-gateway-probe`](gateway-probe.md) - a useful tool used under the hood of [harbourmaster.nymtech.net](https://harbourmaster.nymtech.net)
+* [Prometheus and Grafana](prometheus-grafana.md) self-hosted setup
+* [Nym-node CPU cron service](https://gist.github.com/tommyv1987/97e939a7adf491333d686a8eaa68d4bd) - an easy bash script by Nym core developer [@tommy1987](https://gist.github.com/tommyv1987), designed to monitor a CPU usage of your node, running locally
+* Nym's script [`prom_targets.py`](https://github.com/nymtech/nym/blob/develop/scripts/prom_targets.py) - a useful python program to request data from API and can be run on its own or plugged to more sophisticated flows
+
+### Collecting Testing Metrics
+
+For the purpose of the performance testing Nym core developers plan to run instances of Prometheus and Grafana connected to Node explorer in the house. The network overall key insights we seek from these tests are primarily internal. We're focused on pinpointing bottlenecks, capacity loads, and monitoring cpu usage on the nodes' machines.
+
+
+## Testing 
+
+```admonish info
+For the moment we paused Fast and Furious `perf` environment. Nym Mainnet environment will be used for future tests, please wait for further instructions. 
+```

 Nym asks its decentralised community of operators to join a series of performance testing events in order to **increase the overall quality of the Mixnet**. The main takeaways of such event are:

@@ -21,7 +47,7 @@ Visit [Fast and Furious web page]({{performance_testing_webpage}}) and [Nym Harb

 * Nym runs a paralel network environment [validator.performance.nymte.ch]({{performance_validator}}) with a chain ID `perf`
 * Operators of Nym Nodes join by following easy steps on [performance testing web page]({{performance_testing_webpage}}), including simplified node authentication signature (while keep running their nodes on the mainnet)
-* Once signed in, operators will be asked to swap their binary for the modified version with metrics endpoint to be able to connect their own [monitoring system](templates.md)
+* Once signed in, operators will be asked to swap their binary for the modified version with metrics endpoint to be able to connect their own [monitoring system](#monitoring)
 * Core node data will be fed to a unique mixnet contract for the `perf` side chain
 * Nym starts a new API and start packet transition in high load through these nodes in both settings
 * Nym tracks packet flow using Prometheus and Grafana
@@ -31,4 +57,5 @@ Visit [Fast and Furious web page]({{performance_testing_webpage}}) and [Nym Harb
 ## More Information

 * What happens after the test or what operators get for participating is shared up to date on the [performance testing web page]({{performance_testing_webpage}})
-* Visit our guides to [setup metrics template](templates.md) and learn how to operate them in self-custodial way
+
+
@@ -16,6 +16,8 @@ Begin with the steps listed in [*Connectivity Test and Configuration*](../nodes/
 2. Checkout your VPS dashboard and make sure your IPv6-public enabled.
 3. If you are able to add IPv6 address `/64` range, do it.

+**Update:** Nym community started an ISP table called [*Where to host your nym node?*](../legal/isp-list.md), check it out and add your findings!
+
 ![](../images/ipv6_64.png)

 4. Search or ask your ISP for additional documentation related to IPv6 routing and ask them to provide you with `IPv6 IP address` and `IPv6 IP gateway address`
@@ -0,0 +1,59 @@
+#!/usr/bin/python3
+
+"""CLI to display .csv files as markdown"""
+
+import argparse
+import pandas as pd
+import sys
+import csv
+
+def create_table(args):
+    """Imports csv and creates a table"""
+    file = args.file
+    csv = pd.read_csv(file)
+    if args.sort != None:
+        csv = csv.sort_values(csv.columns[args.sort])
+    if args.table:
+        table = csv.to_markdown(tablefmt="grid", index=args.index)
+    else:
+        table = csv.to_markdown(index=args.index)
+    return table
+
+def display_file(args):
+    """Display csv file as a table"""
+    table = create_table(args)
+    print(table)
+
+def panic(msg):
+    """Error message print"""
+    print(f"error: {msg}", file=sys.stderr)
+    sys.exit(-1)
+
+def parser_main():
+    """Main function initializing ArgumentParser, storing arguments and executing commands."""
+    # Top level parser
+    parser = argparse.ArgumentParser(
+            prog='CSV2MD',
+            description='''Displays .csv files in markdown''',
+            epilog='''Code is power!'''
+        )
+
+    # Parser arguments
+    parser.add_argument("-V","--version", action="version", version='%(prog)s 1.1.0')
+    parser.add_argument("file", help="path/to/file.csv")
+    parser.add_argument("-t","--table", default=False, action="store_true", help="output with a tabulate option for terminal reading - does not render in mdbook")
+    parser.add_argument("-i","--index", default=False, action="store_true", help="output with an index column")
+    parser.add_argument("-s","--sort", type=int, help="supply with column index to sort your output accordingly (ascending way)")
+
+    parser.set_defaults(func=display_file)
+    args = parser.parse_args()
+
+    try:
+        args.func(args)
+    except AttributeError as e:
+        msg = f"{e}.\nPlease run with --help or read the error message in case your .csv file is corrupted."
+        panic(msg)
+
+
+if __name__ == '__main__':
+    parser_main()
@@ -30,7 +30,7 @@ humantime-serde = { workspace = true }
 ipnetwork = "0.16"
 log = { workspace = true }
 once_cell = "1.7.2"
-rand = "0.7"
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 sqlx = { workspace = true, features = [
@@ -15,7 +15,7 @@ bs58 = { workspace = true }
 futures = { workspace = true }
 generic-array = { workspace = true, features = ["serde"] }
 log = { workspace = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
@@ -82,8 +82,10 @@ impl SharedKeys {
                )
            }
        };
-        let mac =
-            compute_keyed_hmac::<GatewayIntegrityHmacAlgorithm>(self.mac_key(), &encrypted_data);
+        let mac = compute_keyed_hmac::<GatewayIntegrityHmacAlgorithm>(
+            self.mac_key().as_slice(),
+            &encrypted_data,
+        );

        mac.into_bytes().into_iter().chain(encrypted_data).collect()
    }
@@ -102,7 +104,7 @@ impl SharedKeys {
        let message_bytes = &enc_data[mac_size..];

        if !recompute_keyed_hmac_and_verify_tag::<GatewayIntegrityHmacAlgorithm>(
-            self.mac_key(),
+            self.mac_key().as_slice(),
            message_bytes,
            mac_tag,
        ) {
@@ -421,7 +421,7 @@ impl BinaryResponse {
        let message_bytes = &raw_req[mac_size..];

        if !recompute_keyed_hmac_and_verify_tag::<GatewayIntegrityHmacAlgorithm>(
-            shared_keys.mac_key(),
+            shared_keys.mac_key().as_slice(),
            message_bytes,
            mac_tag,
        ) {
@@ -28,7 +28,7 @@ futures = { workspace = true }
 humantime-serde = { workspace = true }
 lazy_static = "1.4"
 log = { workspace = true }
-rand = "0.7.3"
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 sysinfo = "0.27.7"
@@ -141,8 +141,8 @@ mod tests {
    use nym_sphinx_params::packet_sizes::PacketSize;
    use nym_sphinx_params::PacketType;
    use nym_sphinx_types::{
-        crypto, Delay as SphinxDelay, Destination, DestinationAddressBytes, Node, NodeAddressBytes,
-        DESTINATION_ADDRESS_LENGTH, IDENTIFIER_LENGTH, NODE_ADDRESS_LENGTH,
+        test_utils, Delay as SphinxDelay, Destination, DestinationAddressBytes, Node,
+        NodeAddressBytes, DESTINATION_ADDRESS_LENGTH, IDENTIFIER_LENGTH, NODE_ADDRESS_LENGTH,
    };

    #[derive(Default)]
@@ -166,17 +166,17 @@ mod tests {
    }

    fn make_valid_sphinx_packet(size: PacketSize) -> NymPacket {
-        let (_, node1_pk) = crypto::keygen();
+        let (_, node1_pk) = test_utils::fixtures::keygen();
        let node1 = Node::new(
            NodeAddressBytes::from_bytes([5u8; NODE_ADDRESS_LENGTH]),
            node1_pk,
        );
-        let (_, node2_pk) = crypto::keygen();
+        let (_, node2_pk) = test_utils::fixtures::keygen();
        let node2 = Node::new(
            NodeAddressBytes::from_bytes([4u8; NODE_ADDRESS_LENGTH]),
            node2_pk,
        );
-        let (_, node3_pk) = crypto::keygen();
+        let (_, node3_pk) = test_utils::fixtures::keygen();
        let node3 = Node::new(
            NodeAddressBytes::from_bytes([2u8; NODE_ADDRESS_LENGTH]),
            node3_pk,
@@ -197,23 +197,23 @@ mod tests {
    }

    fn make_valid_outfox_packet(size: PacketSize) -> NymPacket {
-        let (_, node1_pk) = crypto::keygen();
+        let (_, node1_pk) = test_utils::fixtures::keygen();
        let node1 = Node::new(
            NodeAddressBytes::from_bytes([5u8; NODE_ADDRESS_LENGTH]),
            node1_pk,
        );
-        let (_, node2_pk) = crypto::keygen();
+        let (_, node2_pk) = test_utils::fixtures::keygen();
        let node2 = Node::new(
            NodeAddressBytes::from_bytes([4u8; NODE_ADDRESS_LENGTH]),
            node2_pk,
        );
-        let (_, node3_pk) = crypto::keygen();
+        let (_, node3_pk) = test_utils::fixtures::keygen();
        let node3 = Node::new(
            NodeAddressBytes::from_bytes([2u8; NODE_ADDRESS_LENGTH]),
            node3_pk,
        );

-        let (_, node4_pk) = crypto::keygen();
+        let (_, node4_pk) = test_utils::fixtures::keygen();
        let node4 = Node::new(
            NodeAddressBytes::from_bytes([2u8; NODE_ADDRESS_LENGTH]),
            node4_pk,
@@ -29,8 +29,7 @@ humantime-serde = { workspace = true }
 k256 = { version = "*", features = ["ecdsa-core"] } # needed for the Verifier trait; pull whatever version is used by other dependencies
 log = { workspace = true }
 pin-project = "1.0"
-rand = "0.8.5"
-rand-07 = { package = "rand", version = "0.7.3" } # required for compatibility
+rand = { workspace = true }
 reqwest = { workspace = true, features = ["json"] }
 rocket = { version = "0.5.0", features = ["json"] }
 rocket_cors = { version = "0.6.0" }
@@ -125,6 +124,5 @@ tempfile = "3.3.0"
 cw3 = { workspace = true }
 cw-utils = { workspace = true }
 rand_chacha = "0.3"
-rand_chacha_02 = { package = "rand_chacha", version = "0.2" }
 sha2 = "0.9"

@@ -27,11 +27,6 @@ pub fn test_rng(seed: [u8; 32]) -> ChaCha20Rng {
    ChaCha20Rng::from_seed(seed)
 }

-pub fn test_rng_07(seed: [u8; 32]) -> rand_chacha_02::ChaCha20Rng {
-    use rand_chacha_02::rand_core::SeedableRng;
-    rand_chacha_02::ChaCha20Rng::from_seed(seed)
-}
-
 pub fn pseudorandom_account(rng: &mut ChaCha20Rng) -> AccountId {
    let mut dummy_account_key_hash = [0u8; 32];
    rng.fill_bytes(&mut dummy_account_key_hash);
@@ -42,13 +37,8 @@ pub fn dealer_fixture(mut rng: &mut ChaCha20Rng, id: NodeIndex) -> DealerDetails
    // we might possibly need that private key later on
    let keypair = DkgKeyPair::new(dkg::params(), &mut rng);

-    // lol, instantiate rng with an rng due to incompatibility, but even though it looks dodgy AF,
-    // it's 100% deterministic
-    let mut secondary_seed = [0u8; 32];
-    rng.fill_bytes(&mut secondary_seed);
-
    let addr = pseudorandom_account(rng);
-    let identity_keypair = identity::KeyPair::new(&mut test_rng_07(secondary_seed));
+    let identity_keypair = identity::KeyPair::new(&mut rng);
    let bte_public_key_with_proof = bs58::encode(&keypair.public_key().to_bytes()).into_string();

    let port = 8080 + id;
@@ -156,7 +146,7 @@ impl TestingDkgControllerBuilder {
            let mut secondary_seed = [0u8; 32];
            rng.fill_bytes(&mut secondary_seed);

-            let identity_keypair = identity::KeyPair::new(&mut test_rng_07(secondary_seed));
+            let identity_keypair = identity::KeyPair::new(&mut test_rng(secondary_seed));

            DealerDetails {
                address: Addr::unchecked(address.as_ref()),
@@ -49,8 +49,8 @@ use nym_validator_client::nyxd::Coin;
 use nym_validator_client::nyxd::{
    AccountId, Algorithm, Event, EventAttribute, ExecTxResult, Fee, Hash, TxResponse,
 };
-use rand_07::rngs::OsRng;
-use rand_07::RngCore;
+use rand::rngs::OsRng;
+use rand::RngCore;
 use rocket::http::Status;
 use rocket::local::asynchronous::Client;
 use std::collections::{BTreeMap, HashMap};
@@ -1336,7 +1336,7 @@ struct TestFixture {

 impl TestFixture {
    async fn new() -> Self {
-        let mut rng = crate::coconut::tests::fixtures::test_rng_07([69u8; 32]);
+        let mut rng = crate::coconut::tests::fixtures::test_rng([69u8; 32]);
        let params = Parameters::new(4).unwrap();
        let coconut_keypair = nym_coconut::ttp_keygen(&params, 1, 1).unwrap().remove(0);
        let identity = identity::KeyPair::new(&mut rng);
@@ -8,7 +8,7 @@ use nym_sphinx::{
    acknowledgements::AckKey, addressing::clients::Recipient, preparer::MessagePreparer,
 };
 use nym_topology::NymTopology;
-use rand_07::rngs::OsRng;
+use rand::rngs::OsRng;
 use std::time::Duration;

 const DEFAULT_AVERAGE_PACKET_DELAY: Duration = Duration::from_millis(200);
@@ -73,7 +73,7 @@ impl<'a> NetworkMonitorBuilder<'a> {
        // TODO: those keys change constant throughout the whole execution of the monitor.
        // and on top of that, they are used with ALL the gateways -> presumably this should change
        // in the future
-        let mut rng = rand_07::rngs::OsRng;
+        let mut rng = rand::rngs::OsRng;

        let identity_keypair = Arc::new(identity::KeyPair::new(&mut rng));
        let encryption_keypair = Arc::new(encryption::KeyPair::new(&mut rng));
@@ -14,7 +14,7 @@ use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::forwarding::packet::MixPacket;
 use nym_sphinx::params::{PacketSize, PacketType};
 use nym_topology::{gateway, mix};
-use rand_07::{rngs::ThreadRng, seq::SliceRandom, thread_rng, Rng};
+use rand::{rngs::ThreadRng, seq::SliceRandom, thread_rng, Rng};
 use std::collections::{HashMap, HashSet};

 use std::fmt::{self, Display, Formatter};
@@ -9,7 +9,6 @@ use crate::support::config::{
 use anyhow::{Context, Result};
 use nym_crypto::asymmetric::identity;
 use rand::rngs::OsRng;
-use rand_07::rngs::OsRng as OsRng07;
 use std::{fs, io};

 // TODO: once we upgrade ed25519 library, we could use the same rand library and use proper
@@ -20,7 +19,7 @@ fn init_identity_keys(config: &config::NymApiPaths) -> Result<()> {
        &config.public_identity_key_file,
    );

-    let mut rng = OsRng07;
+    let mut rng = OsRng;
    let keypair = identity::KeyPair::new(&mut rng);
    nym_pemstore::store_keypair(&keypair, &keypaths)
        .context("failed to store identity keys of the nym api")?;
@@ -30,15 +30,24 @@ itertools = "0.10.5"
 log = { version = "0.4", features = ["serde"] }
 pretty_env_logger = "0.4.0"
 rand = "0.8"
-rand-07 = { package = "rand", version = "0.7.3" }
-reqwest = { version = "0.12.4", features = ["json", "socks"] }
+reqwest = { version = "0.11.22", features = ["json", "socks"] }
 rust-embed = { version = "6.4.2", features = ["include-exclude"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_repr = "0.1"
 tap = "1.0.1"
 # 07.07.23: JS: I changed the version from ^1.2.2 to fix up indirect import of web-sys
-tauri = { version = "1.4.1", features = ["clipboard-write-text", "macos-private-api", "notification-all", "shell-open", "system-tray", "updater", "window-close", "window-minimize", "window-start-dragging"] }
+tauri = { version = "1.4.1", features = [
+    "clipboard-write-text",
+    "macos-private-api",
+    "notification-all",
+    "shell-open",
+    "system-tray",
+    "updater",
+    "window-close",
+    "window-minimize",
+    "window-start-dragging",
+] }
 #tendermint-rpc = "0.23.0"
 thiserror = "1.0"
 time = { version = "0.3.17", features = ["local-offset"] }
@@ -20,7 +20,7 @@ use nym_config::{
 };
 use nym_crypto::asymmetric::identity;
 use nym_socks5_client_core::config::Config as Socks5CoreConfig;
-use rand_07::rngs::OsRng;
+use rand::rngs::OsRng;
 use serde::{Deserialize, Serialize};
 use std::path::{Path, PathBuf};
 use std::{fs, io};
@@ -214,7 +214,7 @@ pub async fn init_socks5_config(provider_address: String, chosen_gateway_id: Str
    let gateway_setup = if !already_init {
        let selection_spec =
            GatewaySelectionSpecification::new(Some(chosen_gateway_id), None, false);
-        let mut rng = rand_07::thread_rng();
+        let mut rng = rand::thread_rng();
        let available_gateways =
            current_gateways(&mut rng, &config.core.base.client.nym_api_urls).await?;
        GatewaySetup::New {
@@ -87,7 +87,7 @@ async fn select_gateway_by_latency(gateways: Vec<GatewayBondAnnotated>) -> Resul
        .filter_map(|g| g.gateway_bond.try_into().ok())
        .collect();

-    let mut rng = rand_07::rngs::OsRng;
+    let mut rng = rand::rngs::OsRng;
    let selected_gateway = nym_client_core::init::helpers::choose_gateway_by_latency(
        &mut rng,
        &gateways_as_nodes,
@@ -22,7 +22,7 @@ colored = "2"
 clap = { workspace = true, features = ["cargo", "env"] }
 humantime-serde = { workspace = true }
 ipnetwork = "0.16.0"
-rand = "0.7.3"
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 thiserror.workspace = true
@@ -23,7 +23,7 @@ utoipa-swagger-ui = { workspace = true, features = ["axum"] }

 colored = "2"
 ipnetwork = "0.16"
-rand = "0.7.3"
+rand = { workspace = true }

 # Wireguard:
 fastrand = "2"
@@ -36,7 +36,7 @@ nym-bin-common = { path = "../../common/bin-common", features = ["bin_info_schem

 [dev-dependencies]
 tokio = { workspace = true, features = ["full"] }
-rand_chacha = "0.2"
+rand_chacha = "0.3"
 nym-crypto = { path = "../../common/crypto", features = ["rand"] }


@@ -14,12 +14,12 @@ rayon = "1.5.1"
 blake3 = "1.3"
 zeroize = "1.5"
 chacha20 = { version = "0.9.0", features = ["std"] }
-curve25519-dalek = "3.2"
+x25519-dalek = { version = "2.0.0", features = ["static_secrets"]}
 chacha20poly1305 = "0.10.1"
 getrandom = { workspace = true, features = ["js"] }
 thiserror = { workspace = true }
-sphinx-packet = "0.1.0"
-rand = "0.7.3"
+sphinx-packet = "0.2.0"
+rand = { workspace = true }
 log = "0.4"

 [dev-dependencies]
@@ -59,9 +59,7 @@ use chacha20poly1305::ChaCha20Poly1305;
 use chacha20poly1305::KeyInit;

 use chacha20poly1305::Tag;
-use curve25519_dalek::constants::ED25519_BASEPOINT_TABLE;
-use curve25519_dalek::montgomery::MontgomeryPoint;
-use curve25519_dalek::scalar::Scalar;
+use x25519_dalek::{PublicKey, SharedSecret, StaticSecret};

 use std::ops::Range;
 use std::u8;
@@ -222,10 +220,12 @@ impl MixStageParameters {
        user_secret_key: &[u8],
        node_pub_key: &[u8],
        destination: &[u8; 32],
-    ) -> Result<MontgomeryPoint, OutfoxError> {
+    ) -> Result<SharedSecret, OutfoxError> {
        let routing_data = destination;
-        let mix_public_key = MontgomeryPoint(node_pub_key.try_into()?);
-        let user_secret_key = Scalar::from_bytes_mod_order(user_secret_key.try_into()?);
+        let node_pub_key_bytes: [u8; 32] = node_pub_key.try_into()?;
+        let mix_public_key = PublicKey::from(node_pub_key_bytes);
+        let user_secret_key_bytes: [u8; 32] = user_secret_key.try_into()?;
+        let user_secret_key = StaticSecret::from(user_secret_key_bytes);

        if buffer.len() != self.incoming_packet_length() {
            return Err(OutfoxError::LenMismatch {
@@ -241,14 +241,14 @@ impl MixStageParameters {
            });
        }

-        let user_public_key = (&ED25519_BASEPOINT_TABLE * &user_secret_key).to_montgomery();
-        let shared_key = user_secret_key * mix_public_key;
+        let user_public_key = PublicKey::from(&user_secret_key);
+        let shared_key = user_secret_key.diffie_hellman(&mix_public_key);

        // Copy rounting data into buffer
        buffer[self.routing_data_range()].copy_from_slice(routing_data);

        // Perform the AEAD
-        let header_aead_key = ChaCha20Poly1305::new_from_slice(&shared_key.0[..])?;
+        let header_aead_key = ChaCha20Poly1305::new_from_slice(&shared_key.to_bytes())?;
        let nonce = [0u8; 12];

        let tag = header_aead_key
@@ -259,10 +259,10 @@ impl MixStageParameters {
        buffer[self.tag_range()].copy_from_slice(&tag[..]);

        // Copy own public key into buffer
-        buffer[self.pub_element_range()].copy_from_slice(&user_public_key.0[..]);
+        buffer[self.pub_element_range()].copy_from_slice(&user_public_key.to_bytes());

        // Do a round of LION on the payload
-        lion_transform_encrypt(&mut buffer[self.payload_range()], &shared_key.0)?;
+        lion_transform_encrypt(&mut buffer[self.payload_range()], &shared_key.to_bytes())?;

        Ok(shared_key)
    }
@@ -274,7 +274,8 @@ impl MixStageParameters {
    ) -> Result<Vec<u8>, OutfoxError> {
        // Check the length of the incoming buffer is correct.

-        let mix_secret_key = Scalar::from_bytes_mod_order(mix_secret_key.try_into()?);
+        let mix_secret_key_bytes: [u8; 32] = mix_secret_key.try_into()?;
+        let mix_secret_key = StaticSecret::from(mix_secret_key_bytes);

        if buffer.len() != self.incoming_packet_length() {
            return Err(OutfoxError::LenMismatch {
@@ -284,11 +285,12 @@ impl MixStageParameters {
        }

        // Derive the shared key for this packet
-        let user_public_key = MontgomeryPoint(buffer[self.pub_element_range()].try_into()?);
-        let shared_key = mix_secret_key * user_public_key;
+        let user_public_key_bytes: [u8; 32] = buffer[self.pub_element_range()].try_into()?;
+        let user_public_key = PublicKey::from(user_public_key_bytes);
+        let shared_key = mix_secret_key.diffie_hellman(&user_public_key);

        // Compute the AEAD and check the Tag, if wrong return Err
-        let header_aead_key = ChaCha20Poly1305::new_from_slice(&shared_key.0[..])?;
+        let header_aead_key = ChaCha20Poly1305::new_from_slice(&shared_key.to_bytes())?;
        let nonce = [0; 12];

        let tag_bytes = buffer[self.tag_range()].to_vec();
@@ -305,7 +307,7 @@ impl MixStageParameters {

        let routing_data = buffer[self.routing_data_range()].to_vec();
        // Do a round of LION on the payload
-        lion_transform_decrypt(&mut buffer[self.payload_range()], &shared_key.0)?;
+        lion_transform_decrypt(&mut buffer[self.payload_range()], &shared_key.to_bytes())?;

        Ok(routing_data)
    }
@@ -9,8 +9,6 @@ mod tests {
        repeat_with(|| fastrand::u8(..)).take(n).collect()
    }

-    use curve25519_dalek::constants::ED25519_BASEPOINT_TABLE;
-    use curve25519_dalek::scalar::Scalar;
    use nym_outfox::packet::OutfoxPacket;
    use sphinx_packet::constants::NODE_ADDRESS_LENGTH;
    use sphinx_packet::crypto::PublicKey;
@@ -21,6 +19,7 @@ mod tests {

    use nym_outfox::format::*;
    use nym_outfox::lion::*;
+    use x25519_dalek::StaticSecret;

    #[test]
    fn test_encode_decode() {
@@ -30,11 +29,10 @@ mod tests {
            payload_length_bytes: 1024, // 1kb
        };

-        let user_secret = randombytes(32);
-        let mix_secret = randombytes(32);
-        let mix_secret_scalar =
-            Scalar::from_bytes_mod_order(mix_secret.clone().try_into().unwrap());
-        let mix_public_key = (&ED25519_BASEPOINT_TABLE * &mix_secret_scalar).to_montgomery();
+        let user_secret: [u8; 32] = randombytes(32).try_into().unwrap();
+        let mix_secret: [u8; 32] = randombytes(32).try_into().unwrap();
+        let mix_secret_key = StaticSecret::from(mix_secret);
+        let mix_public_key = PublicKey::from(&mix_secret_key);

        let routing = [0; 32];
        let destination = [0; 32];
@@ -87,23 +85,23 @@ mod tests {

    #[test]
    fn test_packet_params_short() {
-        let (node1_pk, node1_pub) = sphinx_packet::crypto::keygen();
+        let (node1_pk, node1_pub) = sphinx_packet::test_utils::fixtures::keygen();
        let node1 = Node::new(
            NodeAddressBytes::from_bytes([0u8; NODE_ADDRESS_LENGTH]),
            node1_pub,
        );
-        let (node2_pk, node2_pub) = sphinx_packet::crypto::keygen();
+        let (node2_pk, node2_pub) = sphinx_packet::test_utils::fixtures::keygen();
        let node2 = Node::new(
            NodeAddressBytes::from_bytes([1u8; NODE_ADDRESS_LENGTH]),
            node2_pub,
        );
-        let (node3_pk, node3_pub) = sphinx_packet::crypto::keygen();
+        let (node3_pk, node3_pub) = sphinx_packet::test_utils::fixtures::keygen();
        let node3 = Node::new(
            NodeAddressBytes::from_bytes([2u8; NODE_ADDRESS_LENGTH]),
            node3_pub,
        );

-        let (gateway_pk, gateway_pub) = sphinx_packet::crypto::keygen();
+        let (gateway_pk, gateway_pub) = sphinx_packet::test_utils::fixtures::keygen();
        let gateway = Node::new(
            NodeAddressBytes::from_bytes([3u8; NODE_ADDRESS_LENGTH]),
            gateway_pub,
@@ -143,23 +141,23 @@ mod tests {

    #[test]
    fn test_packet_params_long() {
-        let (node1_pk, node1_pub) = sphinx_packet::crypto::keygen();
+        let (node1_pk, node1_pub) = sphinx_packet::test_utils::fixtures::keygen();
        let node1 = Node::new(
            NodeAddressBytes::from_bytes([0u8; NODE_ADDRESS_LENGTH]),
            node1_pub,
        );
-        let (node2_pk, node2_pub) = sphinx_packet::crypto::keygen();
+        let (node2_pk, node2_pub) = sphinx_packet::test_utils::fixtures::keygen();
        let node2 = Node::new(
            NodeAddressBytes::from_bytes([1u8; NODE_ADDRESS_LENGTH]),
            node2_pub,
        );
-        let (node3_pk, node3_pub) = sphinx_packet::crypto::keygen();
+        let (node3_pk, node3_pub) = sphinx_packet::test_utils::fixtures::keygen();
        let node3 = Node::new(
            NodeAddressBytes::from_bytes([2u8; NODE_ADDRESS_LENGTH]),
            node3_pub,
        );

-        let (gateway_pk, gateway_pub) = sphinx_packet::crypto::keygen();
+        let (gateway_pk, gateway_pub) = sphinx_packet::test_utils::fixtures::keygen();
        let gateway = Node::new(
            NodeAddressBytes::from_bytes([3u8; NODE_ADDRESS_LENGTH]),
            gateway_pub,
@@ -64,7 +64,7 @@ nym-store-cipher = { path = "../../common/store-cipher", features = ["json"] }

 [dev-dependencies]
 nym-crypto = { path = "../../common/crypto", features = ["rand"] }
-rand_chacha = "0.2"
+rand_chacha = "0.3"
 tempfile = "3.3.0"
 ts-rs = "7.0.0"

@@ -1,5 +1,4 @@
 use nym_contracts_common::signing::SigningAlgorithm;
-use nym_crypto::asymmetric::identity;
 use nym_crypto::asymmetric::identity::Ed25519RecoveryError;
 use nym_types::error::TypesError;
 use nym_validator_client::nym_api::error::NymAPIError;
@@ -150,9 +149,6 @@ pub enum BackendError {
    #[error(transparent)]
    Ed25519Recovery(#[from] Ed25519RecoveryError),

-    #[error("failed to verify ed25519 signature: {0}")]
-    Ed25519SignatureError(#[from] identity::SignatureError),
-
    #[error("This command ({name}) has been removed. Please try to use {alternative} instead.")]
    RemovedCommand { name: String, alternative: String },
 }
@@ -26,7 +26,7 @@ nym-socks5-client-core = { path = "../../../common/socks5-client-core", default-
 serde = { workspace = true }
 tokio = { workspace = true, features = ["sync", "time"] }
 log = "0.4.17"
-rand = "0.7.3"
+rand = { workspace = true }

 safer-ffi = { version = "0.1.4" }

@@ -32,7 +32,7 @@ http = "0.2.9"

 futures = { workspace = true }
 log = { workspace = true }
-rand = { version = "0.7.3" }
+rand = { workspace = true }
 tap = "1.0.1"
 thiserror = { workspace = true }
 url = { workspace = true }
@@ -28,7 +28,7 @@ ipnetwork = "0.20.0"
 log = { workspace = true }
 pretty_env_logger = "0.4.0"
 publicsuffix = "2.2.3"
-rand = "0.7.3"
+rand = { workspace = true }
 regex = "1.8.4"
 reqwest = { workspace = true, features = ["json"] }
 serde = { workspace = true, features = ["derive"] }
@@ -16,7 +16,7 @@ crate-type = ["cdylib", "rlib"]
 anyhow = "1.0"
 futures = { workspace = true }
 js-sys = { workspace = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = "1.0"
 serde-wasm-bindgen = { workspace = true }
@@ -17,7 +17,7 @@ crate-type = ["cdylib", "rlib"]
 async-trait = { workspace = true }
 futures = { workspace = true }
 js-sys = { workspace = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde-wasm-bindgen = { workspace = true }
 tokio = { workspace = true, features = ["sync"] }
@@ -16,7 +16,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 futures = { workspace = true }
 js-sys = { workspace = true }
-rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde-wasm-bindgen = { workspace = true }
 tokio = { workspace = true, features = ["sync"] }
Author	SHA1	Message	Date
Simon Wicky	a08e66a98a	cargo lock	2024-05-21 09:53:50 +02:00
Simon Wicky	d3b1780fea	update dependency to new sphinx release	2024-05-21 09:42:08 +02:00
Simon Wicky	cb11c22b5f	remove unused sphinx type re-export	2024-05-21 09:41:46 +02:00
Simon Wicky	470cc0010c	andrew's suggestion	2024-05-21 09:41:45 +02:00
Simon Wicky	71ad26455f	outfox update	2024-05-21 09:41:21 +02:00
Simon Wicky	210a2a2959	dalek and rand crate update	2024-05-21 09:41:21 +02:00
import this	0eb6eb855b	[DOCs/operators]: Create a Nym ISP sheet, write gateway-probe guide & clean FnF docs (#4590 ) * initialise nym versin of good-bad isps by tor community * syntax edit * finalise csv2md * initialise isp-list page * add last update info * add python3 plugis to ci/cd runnners * remove argparse installation * python3 syntax edit * pip install attempt * pip install attempt * change python version in cmdrun command * fix python modules installation * correct command python version * workflows python env update * add probe guide, clean FnF pages * fix typos	2024-05-20 12:27:18 +00:00