GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4607 from nymtech/simon/sphinx_update

Browse Source 
Update crypto and rand crates
This commit is contained in:
Jędrzej Stuczyński
2024-06-05 10:34:42 +01:00
committed by GitHub
parent ae28a45915 2a1d37dd22
commit 102a8a0d8b
61 changed files with 647 additions and 998 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+90 -178
View File
@@ -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",
]
@@ -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",
]
@@ -1986,20 +1946,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"
@@ -2007,7 +1957,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
dependencies = [
"pkcs8",
"signature 2.2.0",
"serde",
"signature",
]
[[package]]
@@ -2025,16 +1976,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",
]
@@ -2826,33 +2777,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]]
@@ -3410,7 +3341,7 @@ dependencies = [
"elliptic-curve",
"once_cell",
"sha2 0.10.8",
"signature 2.2.0",
"signature",
]
[[package]]
@@ -3689,7 +3620,7 @@ dependencies = [
"nym-ordered-buffer",
"nym-service-providers-common",
"nym-socks5-requests",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde-wasm-bindgen 0.6.5",
"thiserror",
@@ -3979,9 +3910,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",
@@ -4047,7 +3976,7 @@ dependencies = [
"nym-crypto",
"nym-network-defaults",
"nym-validator-client",
"rand 0.7.3",
"rand 0.8.5",
"thiserror",
"url",
"zeroize",
@@ -4197,7 +4126,7 @@ dependencies = [
"nym-task",
"nym-topology",
"nym-validator-client",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde_json",
"tap",
@@ -4245,7 +4174,7 @@ dependencies = [
"nym-task",
"nym-topology",
"nym-validator-client",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde_json",
"sha2 0.10.8",
@@ -4325,7 +4254,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 0.6.5",
"serde_json",
@@ -4468,7 +4397,7 @@ dependencies = [
"nym-credentials-interface",
"nym-crypto",
"nym-validator-client",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"thiserror",
"time",
@@ -4489,25 +4418,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",
]
@@ -4629,7 +4558,7 @@ dependencies = [
"nym-wireguard",
"nym-wireguard-types",
"once_cell",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde_json",
"sqlx",
@@ -4662,7 +4591,7 @@ dependencies = [
"nym-sphinx",
"nym-task",
"nym-validator-client",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"si-scale",
"thiserror",
@@ -4691,7 +4620,7 @@ dependencies = [
"nym-crypto",
"nym-pemstore",
"nym-sphinx",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde_json",
"thiserror",
@@ -4919,7 +4848,7 @@ dependencies = [
"nym-topology",
"nym-types",
"nym-validator-client",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde_json",
"sysinfo 0.27.8",
@@ -5041,7 +4970,7 @@ dependencies = [
"nym-types",
"pretty_env_logger",
"publicsuffix",
"rand 0.7.3",
"rand 0.8.5",
"regex",
"reqwest 0.12.4",
"serde",
@@ -5103,7 +5032,7 @@ dependencies = [
"nym-task",
"nym-types",
"nym-wireguard-types",
"rand 0.7.3",
"rand 0.8.5",
"semver 1.0.23",
"serde",
"serde_json",
@@ -5127,7 +5056,7 @@ dependencies = [
"dashmap",
"fastrand 2.1.0",
"headers",
"hmac 0.12.1",
"hmac",
"hyper 1.3.1",
"ipnetwork 0.16.0",
"nym-crypto",
@@ -5137,7 +5066,7 @@ dependencies = [
"nym-task",
"nym-wireguard",
"nym-wireguard-types",
"rand 0.7.3",
"rand 0.8.5",
"serde_json",
"thiserror",
"time",
@@ -5147,7 +5076,7 @@ dependencies = [
"tracing",
"utoipa",
"utoipa-swagger-ui",
"x25519-dalek 2.0.1",
"x25519-dalek",
]
[[package]]
@@ -5164,7 +5093,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",
@@ -5185,7 +5114,7 @@ dependencies = [
"nym-sphinx-params",
"nym-task",
"nym-topology",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde_json",
"thiserror",
@@ -5200,7 +5129,7 @@ dependencies = [
"futures",
"js-sys",
"nym-node-tester-utils",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde-wasm-bindgen 0.6.5",
"thiserror",
@@ -5255,11 +5184,11 @@ dependencies = [
"chacha20",
"chacha20poly1305",
"criterion",
"curve25519-dalek 3.2.0",
"curve25519-dalek 4.1.2",
"fastrand 1.9.0",
"getrandom 0.2.15",
"log",
"rand 0.7.3",
"rand 0.8.5",
"rayon",
"sphinx-packet",
"thiserror",
@@ -5307,7 +5236,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",
@@ -5369,7 +5298,7 @@ dependencies = [
"nym-socks5-client-core",
"nym-sphinx",
"nym-topology",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde_json",
"tap",
@@ -5402,7 +5331,7 @@ dependencies = [
"nym-task",
"nym-validator-client",
"pin-project",
"rand 0.7.3",
"rand 0.8.5",
"reqwest 0.12.4",
"schemars",
"serde",
@@ -5428,7 +5357,7 @@ dependencies = [
"nym-credential-storage",
"nym-crypto",
"nym-socks5-client-core",
"rand 0.7.3",
"rand 0.8.5",
"safer-ffi",
"serde",
"tokio",
@@ -5482,7 +5411,7 @@ dependencies = [
"nym-sphinx-routing",
"nym-sphinx-types",
"nym-topology",
"rand 0.7.3",
"rand 0.8.5",
"rand_distr",
"thiserror",
"tokio",
@@ -5500,7 +5429,7 @@ dependencies = [
"nym-sphinx-routing",
"nym-sphinx-types",
"nym-topology",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"thiserror",
"zeroize",
@@ -5512,7 +5441,7 @@ version = "0.1.0"
dependencies = [
"nym-crypto",
"nym-sphinx-types",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"thiserror",
]
@@ -5528,8 +5457,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",
@@ -5543,7 +5472,7 @@ dependencies = [
"nym-sphinx-addressing",
"nym-sphinx-params",
"nym-sphinx-types",
"rand 0.7.3",
"rand 0.8.5",
"thiserror",
]
@@ -5560,7 +5489,7 @@ dependencies = [
"nym-sphinx-routing",
"nym-sphinx-types",
"nym-topology",
"rand 0.7.3",
"rand 0.8.5",
"thiserror",
]
@@ -5671,7 +5600,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",
@@ -5701,7 +5630,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",
@@ -5719,7 +5648,7 @@ dependencies = [
"thiserror",
"ts-rs",
"url",
"x25519-dalek 2.0.1",
"x25519-dalek",
]
[[package]]
@@ -5851,7 +5780,7 @@ dependencies = [
"nym-task",
"nym-wireguard-types",
"tokio",
"x25519-dalek 2.0.1",
"x25519-dalek",
]
[[package]]
@@ -5860,18 +5789,18 @@ version = "0.1.0"
dependencies = [
"base64 0.21.7",
"dashmap",
"hmac 0.12.1",
"hmac",
"log",
"nym-config",
"nym-crypto",
"nym-network-defaults",
"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]]
@@ -6195,7 +6124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
dependencies = [
"digest 0.10.7",
"hmac 0.12.1",
"hmac",
]
[[package]]
@@ -6754,12 +6683,12 @@ dependencies = [
[[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]]
@@ -7073,7 +7002,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",
]
@@ -7865,12 +7794,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"
@@ -7941,25 +7864,26 @@ dependencies = [
[[package]]
name = "sphinx-packet"
version = "0.1.0"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc43eda802856ee82a7555c7b75ceb9e07451741c7a2f5f23d036020e01189d4"
checksum = "dabeca95bf5fd0563d6be7ebcb1c6a9fcb135746a0ba9050c47dc68c8607e595"
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",
"curve25519-dalek 4.1.2",
"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",
]
@@ -8350,7 +8274,7 @@ checksum = "15ab8f0a25d0d2ad49ac615da054d6a76aa6603ff95f7d18bafdd34450a1a04b"
dependencies = [
"bytes",
"digest 0.10.7",
"ed25519 2.2.3",
"ed25519",
"ed25519-consensus",
"flex-error",
"futures",
@@ -8365,7 +8289,7 @@ dependencies = [
"serde_json",
"serde_repr",
"sha2 0.10.8",
"signature 2.2.0",
"signature",
"subtle 2.5.0",
"subtle-encoding",
"tendermint-proto",
@@ -9501,7 +9425,7 @@ dependencies = [
"nym-task",
"nym-topology",
"nym-validator-client",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde-wasm-bindgen 0.6.5",
"thiserror",
@@ -9957,18 +9881,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"
Cargo.toml
+5 -5
View File
@@ -172,7 +172,7 @@ bincode = "1.3.3"
bip39 = { version = "2.0.0", features = ["zeroize"] }
bitvec = "1.0.0"
blake3 = "1.3.1"
bs58 = "0.5.0"
bs58 = "0.5.1"
bytecodec = "0.4.15"
bytes = "1.5.0"
cargo_metadata = "0.18.1"
@@ -195,13 +195,13 @@ criterion = "0.4"
csv = "1.3.0"
ctr = "0.9.1"
cupid = "0.6.1"
curve25519-dalek = "3.2"
curve25519-dalek = "4.1"
dashmap = "5.5.3"
defguard_wireguard_rs = "0.4.2"
doc-comment = "0.3"
dotenvy = "0.15.6"
ecdsa = "0.16"
ed25519-dalek = "1.0"
ed25519-dalek = "2.1"
etherparse = "0.13.0"
eyre = "0.6.9"
flate2 = "1.0.28"
@@ -247,7 +247,7 @@ rand = "0.8.5"
rand-07 = "0.7.3"
rand_chacha_02 = "0.2"
rand_core = "0.6.3"
rand_distr = "0.3"
rand_distr = "0.4"
rand_pcg = "0.3.1"
rand_seeder = "0.2.3"
rayon = "1.5.1"
@@ -266,7 +266,7 @@ serde_repr = "0.1"
serde_with = "3.4.0"
serde_yaml = "0.9.25"
si-scale = "0.2.2"
sphinx-packet = "0.1.0"
sphinx-packet = "0.1.1"
sqlx = "0.6.3"
strum = "0.25"
subtle-encoding = "0.5"
clients/native/Cargo.toml
+1 -1
View File
@@ -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 }
clients/socks5/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ serde_json = { workspace = true }
tap = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] }
rand = "0.7.3"
rand = { workspace = true }
time = { workspace = true }
url = { workspace = true }
zeroize = { workspace = true }
common/bandwidth-controller/Cargo.toml
+1 -1
View File
@@ -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 }
common/client-core/Cargo.toml
+1 -1
View File
@@ -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"
common/client-libs/gateway-client/Cargo.toml
+1 -1
View File
@@ -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 = { workspace = true, features = ["macros"] }
si-scale = { workspace = true }
time.workspace = true
common/credentials/Cargo.toml
+1 -1
View File
@@ -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"
common/crypto/Cargo.toml
+5 -5
View File
@@ -17,10 +17,10 @@ generic-array = { workspace = true, optional = true }
hkdf = { workspace = true, optional = true }
hmac = { workspace = true, optional = true }
cipher = { workspace = true, optional = true }
x25519-dalek = { version = "1.1", optional = true }
ed25519-dalek = { workspace = true, optional = true }
rand = { version = "0.7.3", features = ["wasm-bindgen"], optional = true }
serde_bytes = { workspace = true, optional = true }
x25519-dalek = { version = "2.0", optional = true, features = ["static_secrets"]}
ed25519-dalek = { version = "2.1", features = ["rand_core"], optional = true }
rand = { workspace = true, 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 = { workspace = true, features = ["bech32-preview"] }
thiserror = { workspace = true }
@@ -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"]
common/crypto/src/asymmetric/encryption/mod.rs
+11 -4
View File
@@ -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 {
@@ -211,7 +211,7 @@ impl FromStr for PrivateKey {
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)
}
@@ -358,16 +358,23 @@ mod sphinx_key_conversion {
let private = &keys.private_key;
let public = &keys.public_key;
let private_bytes = private.to_bytes();
let dummy_remote = KeyPair::new(&mut rng);
let dh1 = private.diffie_hellman(&dummy_remote.public_key);
let public_bytes = public.to_bytes();
let sphinx_private: nym_sphinx_types::PrivateKey = private.into();
let recovered_private = PrivateKey::from(sphinx_private);
let dh2 = recovered_private.diffie_hellman(&dummy_remote.public_key);
let sphinx_public: nym_sphinx_types::PublicKey = public.into();
let recovered_public = PublicKey::from(sphinx_public);
assert_eq!(private_bytes, recovered_private.to_bytes());
assert_eq!(public_bytes, recovered_public.to_bytes());
// even though the byte representation of the private key changed, the resultant DH is the same
// which is what matters
assert_eq!(dh1, dh2);
}
}
common/crypto/src/asymmetric/identity/mod.rs
+21 -15
View File
@@ -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,7 +228,7 @@ 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())
}
}
@@ -238,7 +243,7 @@ impl FromStr for PrivateKey {
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)
}
@@ -248,11 +253,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 {
@@ -267,9 +272,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)
}
@@ -338,7 +342,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()?,
)))
}
}
common/crypto/src/shared_key.rs
+2 -2
View File
@@ -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.
common/node-tester-utils/Cargo.toml
+1 -1
View File
@@ -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 }
common/nymsphinx/Cargo.toml
+1 -1
View File
@@ -9,7 +9,7 @@ repository = { workspace = true }
[dependencies]
log = { workspace = true }
rand = { version = "0.7.3", features = ["wasm-bindgen"] }
rand = { workspace = true }
rand_distr = { workspace = true }
thiserror = { workspace = true }
common/nymsphinx/acknowledgements/Cargo.toml
+1 -1
View File
@@ -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 }
common/nymsphinx/addressing/Cargo.toml
+1 -1
View File
@@ -14,5 +14,5 @@ serde = { workspace = true } # implementing serialization/deserialization for so
thiserror = { workspace = true }
[dev-dependencies]
rand = "0.7"
rand = "0.8.5"
nym-crypto = { path = "../../crypto", features = ["rand"] }
common/nymsphinx/anonymous-replies/Cargo.toml
+2 -2
View File
@@ -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"
common/nymsphinx/chunking/Cargo.toml
+1 -1
View File
@@ -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" }
common/nymsphinx/cover/Cargo.toml
+1 -1
View File
@@ -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" }
common/nymsphinx/types/src/lib.rs
+1 -1
View File
@@ -15,7 +15,7 @@ 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},
common/socks5-client-core/Cargo.toml
+1 -1
View File
@@ -12,7 +12,7 @@ dirs = "4.0"
futures = { workspace = true }
log = { workspace = true }
pin-project = { workspace = true }
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
common/topology/Cargo.toml
+1 -1
View File
@@ -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"
common/wasm/client-core/Cargo.toml
+1 -1
View File
@@ -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 }
common/wireguard-types/Cargo.toml
+1 -1
View File
@@ -34,7 +34,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"]}
contracts/Cargo.lock
Generated
+285 -349
View File
File diff suppressed because it is too large Load Diff
contracts/coconut-test/Cargo.toml
+1 -1
View File
@@ -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"
contracts/mixnet-vesting-integration-tests/Cargo.toml
+1 -1
View File
@@ -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"
contracts/mixnet/Cargo.toml
+1 -1
View File
@@ -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]
contracts/name-service/Cargo.toml
+1 -1
View File
@@ -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]
contracts/service-provider-directory/Cargo.toml
+1 -1
View File
@@ -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]
gateway/Cargo.toml
+1 -1
View File
@@ -30,7 +30,7 @@ humantime-serde = { workspace = true }
ipnetwork = "0.16"
log = { workspace = true }
once_cell = { workspace = true }
rand = "0.7"
rand = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
sqlx = { workspace = true, features = [
gateway/gateway-requests/Cargo.toml
+1 -1
View File
@@ -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 }
gateway/gateway-requests/src/registration/handshake/shared_key.rs
+5 -3
View File
@@ -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,
) {
gateway/gateway-requests/src/types.rs
+1 -1
View File
@@ -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,
) {
mixnode/Cargo.toml
+1 -1
View File
@@ -28,7 +28,7 @@ futures = { workspace = true }
humantime-serde = { workspace = true }
lazy_static = { workspace = true }
log = { workspace = true }
rand = "0.7.3"
rand = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
sysinfo = "0.27.7"
nym-api/Cargo.toml
+1 -3
View File
@@ -29,8 +29,7 @@ humantime-serde = { workspace = true }
k256 = { workspace = true, features = ["ecdsa-core"] } # needed for the Verifier trait; pull whatever version is used by other dependencies
log = { workspace = true }
pin-project = { workspace = true }
rand = "0.8.5"
rand-07 = { package = "rand", version = "0.7.3" } # required for compatibility
rand = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
rocket = { workspace = true, features = ["json"] }
rocket_cors = { workspace = true }
@@ -120,6 +119,5 @@ tempfile = { workspace = true }
cw3 = { workspace = true }
cw-utils = { workspace = true }
rand_chacha = "0.3"
rand_chacha_02 = { package = "rand_chacha", version = "0.2" }
sha2 = "0.9"
nym-api/src/coconut/tests/fixtures.rs
+2 -12
View File
@@ -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()),
nym-api/src/coconut/tests/mod.rs
+3 -3
View File
@@ -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);
nym-api/src/network_monitor/chunker.rs
+1 -1
View File
@@ -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);
nym-api/src/network_monitor/mod.rs
+1 -1
View File
@@ -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));
nym-api/src/network_monitor/monitor/preparer.rs
+1 -1
View File
@@ -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};
nym-api/src/support/config/helpers.rs
+1 -2
View File
@@ -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")?;
nym-connect/desktop/Cargo.lock
Generated
+90 -219
View File
@@ -35,25 +35,12 @@ dependencies = [
[[package]]
name = "aes"
version = "0.7.5"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
dependencies = [
"cfg-if",
"cipher 0.3.0",
"cpufeatures",
"ctr 0.8.0",
"opaque-debug 0.3.0",
]
[[package]]
name = "aes"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
dependencies = [
"cfg-if",
"cipher 0.4.4",
"cipher",
"cpufeatures",
]
@@ -437,8 +424,8 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e141fb0f8be1c7b45887af94c88b182472b57c96b56773250ae00cd6a14a164"
dependencies = [
"bs58 0.5.0",
"hmac 0.12.1",
"bs58 0.5.1",
"hmac",
"k256",
"once_cell",
"pbkdf2",
@@ -500,7 +487,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",
]
@@ -616,9 +603,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
[[package]]
name = "bs58"
version = "0.5.0"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
dependencies = [
"sha2 0.10.8",
"tinyvec",
@@ -654,9 +641,9 @@ checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
[[package]]
name = "byteorder"
version = "1.4.3"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
@@ -775,7 +762,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
dependencies = [
"cfg-if",
"cipher 0.4.4",
"cipher",
"cpufeatures",
]
@@ -787,7 +774,7 @@ checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
dependencies = [
"aead",
"chacha20",
"cipher 0.4.4",
"cipher",
"poly1305",
"zeroize",
]
@@ -805,15 +792,6 @@ dependencies = [
"winapi",
]
[[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"
@@ -1055,7 +1033,7 @@ dependencies = [
"rand_core 0.6.4",
"serde",
"serde_json",
"signature 2.1.0",
"signature",
"subtle-encoding",
"tendermint",
"tendermint-rpc",
@@ -1248,16 +1226,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 = "cssparser"
version = "0.27.2"
@@ -1295,22 +1263,13 @@ dependencies = [
"syn 1.0.109",
]
[[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]]
@@ -1322,23 +1281,24 @@ dependencies = [
"byteorder",
"digest 0.9.0",
"rand_core 0.5.1",
"serde",
"subtle 2.5.0",
"zeroize",
]
[[package]]
name = "curve25519-dalek"
version = "4.1.1"
version = "4.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
dependencies = [
"cfg-if",
"cpufeatures",
"curve25519-dalek-derive",
"digest 0.10.7",
"fiat-crypto",
"platforms",
"rustc_version",
"serde",
"subtle 2.5.0",
"zeroize",
]
@@ -1714,20 +1674,10 @@ dependencies = [
"elliptic-curve",
"rfc6979",
"serdect",
"signature 2.1.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.2"
@@ -1735,7 +1685,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d"
dependencies = [
"pkcs8",
"signature 2.1.0",
"serde",
"signature",
]
[[package]]
@@ -1753,16 +1704,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",
]
@@ -2341,10 +2292,8 @@ 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]]
@@ -2614,25 +2563,6 @@ dependencies = [
"tracing",
]
[[package]]
name = "h2"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
dependencies = [
"atomic-waker",
"bytes",
"fnv",
"futures-core",
"futures-sink",
"http 1.1.0",
"indexmap 2.0.0",
"slab",
"tokio",
"tokio-util",
"tracing",
]
[[package]]
name = "handlebars"
version = "3.5.5"
@@ -2722,31 +2652,11 @@ checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
[[package]]
name = "hkdf"
version = "0.11.0"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b"
checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
dependencies = [
"digest 0.9.0",
"hmac 0.11.0",
]
[[package]]
name = "hkdf"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
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]]
@@ -2892,7 +2802,7 @@ dependencies = [
"futures-channel",
"futures-core",
"futures-util",
"h2 0.3.20",
"h2",
"http 0.2.9",
"http-body 0.4.5",
"httparse",
@@ -2915,7 +2825,6 @@ dependencies = [
"bytes",
"futures-channel",
"futures-util",
"h2 0.4.5",
"http 1.1.0",
"http-body 1.0.0",
"httparse",
@@ -2971,22 +2880,6 @@ dependencies = [
"tokio-native-tls",
]
[[package]]
name = "hyper-tls"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
dependencies = [
"bytes",
"http-body-util",
"hyper 1.2.0",
"hyper-util",
"native-tls",
"tokio",
"tokio-native-tls",
"tower-service",
]
[[package]]
name = "hyper-util"
version = "0.1.3"
@@ -3266,7 +3159,7 @@ dependencies = [
"elliptic-curve",
"once_cell",
"sha2 0.10.8",
"signature 2.1.0",
"signature",
]
[[package]]
@@ -3401,9 +3294,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.20"
version = "0.4.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
dependencies = [
"serde",
]
@@ -3745,7 +3638,7 @@ dependencies = [
name = "nym-api-requests"
version = "0.1.0"
dependencies = [
"bs58 0.5.0",
"bs58 0.5.1",
"cosmrs",
"cosmwasm-std",
"ecdsa",
@@ -3773,7 +3666,7 @@ dependencies = [
"nym-crypto",
"nym-network-defaults",
"nym-validator-client",
"rand 0.7.3",
"rand 0.8.5",
"thiserror",
"url",
"zeroize",
@@ -3801,7 +3694,7 @@ version = "1.1.15"
dependencies = [
"async-trait",
"base64 0.21.4",
"bs58 0.5.0",
"bs58 0.5.1",
"cfg-if",
"futures",
"gloo-timers",
@@ -3830,7 +3723,7 @@ dependencies = [
"nym-task",
"nym-topology",
"nym-validator-client",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde_json",
"sha2 0.10.8",
@@ -3904,7 +3797,7 @@ name = "nym-coconut"
version = "0.5.0"
dependencies = [
"bls12_381",
"bs58 0.5.0",
"bs58 0.5.1",
"digest 0.9.0",
"ff",
"getrandom 0.2.10",
@@ -3981,9 +3874,8 @@ dependencies = [
"nym-topology",
"nym-validator-client",
"pretty_env_logger",
"rand 0.7.3",
"rand 0.8.5",
"reqwest 0.12.4",
"reqwest 0.11.22",
"rust-embed",
"sentry",
"sentry-log",
@@ -4009,7 +3901,7 @@ dependencies = [
name = "nym-contracts-common"
version = "0.5.0"
dependencies = [
"bs58 0.5.0",
"bs58 0.5.1",
"cosmwasm-schema",
"cosmwasm-std",
"schemars",
@@ -4069,24 +3961,24 @@ dependencies = [
name = "nym-crypto"
version = "0.4.0"
dependencies = [
"aes 0.8.3",
"aes",
"blake3",
"bs58 0.5.0",
"cipher 0.4.4",
"ctr 0.9.2",
"bs58 0.5.1",
"cipher",
"ctr",
"digest 0.10.7",
"ed25519-dalek",
"generic-array 0.14.7",
"hkdf 0.12.3",
"hmac 0.12.1",
"hkdf",
"hmac",
"nym-pemstore",
"nym-sphinx-types",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde_bytes",
"subtle-encoding",
"thiserror",
"x25519-dalek 1.1.1",
"x25519-dalek",
"zeroize",
]
@@ -4096,7 +3988,7 @@ version = "0.1.0"
dependencies = [
"bitvec",
"bls12_381",
"bs58 0.5.0",
"bs58 0.5.1",
"ff",
"group",
"lazy_static",
@@ -4171,7 +4063,7 @@ dependencies = [
"nym-sphinx",
"nym-task",
"nym-validator-client",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"si-scale",
"thiserror",
@@ -4191,7 +4083,7 @@ dependencies = [
name = "nym-gateway-requests"
version = "0.1.0"
dependencies = [
"bs58 0.5.0",
"bs58 0.5.1",
"futures",
"generic-array 0.14.7",
"log",
@@ -4200,7 +4092,7 @@ dependencies = [
"nym-crypto",
"nym-pemstore",
"nym-sphinx",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde_json",
"thiserror",
@@ -4363,10 +4255,10 @@ dependencies = [
"blake3",
"chacha20",
"chacha20poly1305",
"curve25519-dalek 3.2.0",
"curve25519-dalek 4.1.2",
"getrandom 0.2.10",
"log",
"rand 0.7.3",
"rand 0.8.5",
"rayon",
"sphinx-packet",
"thiserror",
@@ -4427,7 +4319,7 @@ dependencies = [
"nym-task",
"nym-validator-client",
"pin-project",
"rand 0.7.3",
"rand 0.8.5",
"reqwest 0.12.4",
"schemars",
"serde",
@@ -4483,7 +4375,7 @@ dependencies = [
"nym-sphinx-routing",
"nym-sphinx-types",
"nym-topology",
"rand 0.7.3",
"rand 0.8.5",
"rand_distr",
"thiserror",
"tokio",
@@ -4500,7 +4392,7 @@ dependencies = [
"nym-sphinx-routing",
"nym-sphinx-types",
"nym-topology",
"rand 0.7.3",
"rand 0.8.5",
"thiserror",
"zeroize",
]
@@ -4519,14 +4411,14 @@ dependencies = [
name = "nym-sphinx-anonymous-replies"
version = "0.1.0"
dependencies = [
"bs58 0.5.0",
"bs58 0.5.1",
"nym-crypto",
"nym-sphinx-addressing",
"nym-sphinx-params",
"nym-sphinx-routing",
"nym-sphinx-types",
"nym-topology",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"thiserror",
"wasm-bindgen",
@@ -4540,7 +4432,7 @@ dependencies = [
"nym-sphinx-addressing",
"nym-sphinx-params",
"nym-sphinx-types",
"rand 0.7.3",
"rand 0.8.5",
"thiserror",
]
@@ -4557,7 +4449,7 @@ dependencies = [
"nym-sphinx-routing",
"nym-sphinx-types",
"nym-topology",
"rand 0.7.3",
"rand 0.8.5",
"thiserror",
]
@@ -4629,7 +4521,7 @@ name = "nym-topology"
version = "0.1.0"
dependencies = [
"async-trait",
"bs58 0.5.0",
"bs58 0.5.1",
"log",
"nym-api-requests",
"nym-bin-common",
@@ -4639,7 +4531,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",
@@ -4714,10 +4606,12 @@ dependencies = [
"base64 0.21.4",
"dashmap",
"log",
"nym-config",
"nym-crypto",
"nym-network-defaults",
"serde",
"thiserror",
"x25519-dalek 2.0.0",
"x25519-dalek",
]
[[package]]
@@ -4980,7 +4874,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
dependencies = [
"digest 0.10.7",
"hmac 0.12.1",
"hmac",
]
[[package]]
@@ -5517,12 +5411,12 @@ dependencies = [
[[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]]
@@ -5655,12 +5549,12 @@ dependencies = [
"encoding_rs",
"futures-core",
"futures-util",
"h2 0.3.20",
"h2",
"http 0.2.9",
"http-body 0.4.5",
"hyper 0.14.27",
"hyper-rustls 0.24.1",
"hyper-tls 0.5.0",
"hyper-tls",
"ipnet",
"js-sys",
"log",
@@ -5679,6 +5573,7 @@ dependencies = [
"tokio",
"tokio-native-tls",
"tokio-rustls 0.24.1",
"tokio-socks",
"tokio-util",
"tower-service",
"url",
@@ -5697,22 +5592,18 @@ checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
dependencies = [
"base64 0.22.1",
"bytes",
"encoding_rs",
"futures-core",
"futures-util",
"h2 0.4.5",
"http 1.1.0",
"http-body 1.0.0",
"http-body-util",
"hyper 1.2.0",
"hyper-rustls 0.26.0",
"hyper-tls 0.6.0",
"hyper-util",
"ipnet",
"js-sys",
"log",
"mime",
"native-tls",
"once_cell",
"percent-encoding",
"pin-project-lite",
@@ -5723,11 +5614,8 @@ dependencies = [
"serde_json",
"serde_urlencoded",
"sync_wrapper",
"system-configuration",
"tokio",
"tokio-native-tls",
"tokio-rustls 0.25.0",
"tokio-socks",
"tower-service",
"url",
"wasm-bindgen",
@@ -5743,7 +5631,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",
]
@@ -6513,12 +6401,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.1.0"
@@ -6606,25 +6488,26 @@ dependencies = [
[[package]]
name = "sphinx-packet"
version = "0.1.0"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc43eda802856ee82a7555c7b75ceb9e07451741c7a2f5f23d036020e01189d4"
checksum = "dabeca95bf5fd0563d6be7ebcb1c6a9fcb135746a0ba9050c47dc68c8607e595"
dependencies = [
"aes 0.7.5",
"aes",
"arrayref",
"blake2",
"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",
"curve25519-dalek 4.1.2",
"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",
]
@@ -7231,7 +7114,7 @@ checksum = "bc2294fa667c8b548ee27a9ba59115472d0a09c2ba255771092a7f1dcf03a789"
dependencies = [
"bytes",
"digest 0.10.7",
"ed25519 2.2.2",
"ed25519",
"ed25519-consensus",
"flex-error",
"futures",
@@ -7246,7 +7129,7 @@ dependencies = [
"serde_json",
"serde_repr",
"sha2 0.10.8",
"signature 2.1.0",
"signature",
"subtle 2.5.0",
"subtle-encoding",
"tendermint-proto",
@@ -8708,25 +8591,13 @@ dependencies = [
"pkg-config",
]
[[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.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
dependencies = [
"curve25519-dalek 4.1.1",
"curve25519-dalek 4.1.2",
"rand_core 0.6.4",
"serde",
"zeroize",
nym-connect/desktop/src-tauri/Cargo.toml
+12 -3
View File
@@ -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.30", features = ["local-offset"] }
nym-connect/desktop/src-tauri/src/config/mod.rs
+2 -2
View File
@@ -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 {
nym-connect/desktop/src-tauri/src/operations/directory/gateways.rs
+1 -1
View File
@@ -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,
nym-node/Cargo.toml
+1 -1
View File
@@ -22,7 +22,7 @@ colored = { workspace = true }
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
nym-node/nym-node-http-api/Cargo.toml
+1 -1
View File
@@ -23,7 +23,7 @@ utoipa-swagger-ui = { workspace = true, features = ["axum"] }
colored = { workspace = true }
ipnetwork = "0.16"
rand = "0.7.3"
rand = { workspace = true }
# Wireguard:
fastrand = "2"
nym-node/nym-node-requests/Cargo.toml
+1 -1
View File
@@ -37,7 +37,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"] }
nym-outfox/Cargo.toml
+1 -1
View File
@@ -19,7 +19,7 @@ chacha20poly1305 = { workspace = true }
getrandom = { workspace = true, features = ["js"] }
thiserror = { workspace = true }
sphinx-packet = { workspace = true }
rand = "0.7.3"
rand = { workspace = true }
log = { workspace = true }
[dev-dependencies]
nym-outfox/src/format.rs
+1 -1
View File
@@ -241,7 +241,7 @@ impl MixStageParameters {
});
}
let user_public_key = (&ED25519_BASEPOINT_TABLE * &user_secret_key).to_montgomery();
let user_public_key = (ED25519_BASEPOINT_TABLE * &user_secret_key).to_montgomery();
let shared_key = user_secret_key * mix_public_key;
// Copy rounting data into buffer
nym-outfox/tests/unittests.rs
+1 -1
View File
@@ -34,7 +34,7 @@ mod tests {
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 mix_public_key = (ED25519_BASEPOINT_TABLE * &mix_secret_scalar).to_montgomery();
let routing = [0; 32];
let destination = [0; 32];
nym-wallet/Cargo.lock
Generated
+67 -144
View File
@@ -35,25 +35,12 @@ dependencies = [
[[package]]
name = "aes"
version = "0.7.5"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
dependencies = [
"cfg-if",
"cipher 0.3.0",
"cpufeatures",
"ctr 0.8.0",
"opaque-debug 0.3.0",
]
[[package]]
name = "aes"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
dependencies = [
"cfg-if",
"cipher 0.4.4",
"cipher",
"cpufeatures",
]
@@ -64,9 +51,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237"
dependencies = [
"aead",
"aes 0.8.3",
"cipher 0.4.4",
"ctr 0.9.2",
"aes",
"cipher",
"ctr",
"ghash",
"subtle 2.5.0",
]
@@ -303,8 +290,8 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e141fb0f8be1c7b45887af94c88b182472b57c96b56773250ae00cd6a14a164"
dependencies = [
"bs58 0.5.0",
"hmac 0.12.1",
"bs58 0.5.1",
"hmac",
"k256",
"once_cell",
"pbkdf2",
@@ -366,7 +353,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",
]
@@ -453,9 +440,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
[[package]]
name = "bs58"
version = "0.5.0"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
dependencies = [
"sha2 0.10.8",
"tinyvec",
@@ -491,9 +478,9 @@ checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
[[package]]
name = "byteorder"
version = "1.4.3"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
@@ -607,15 +594,6 @@ dependencies = [
"keystream",
]
[[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"
@@ -853,7 +831,7 @@ dependencies = [
"rand_core 0.6.4",
"serde",
"serde_json",
"signature 2.1.0",
"signature",
"subtle-encoding",
"tendermint",
"thiserror",
@@ -872,7 +850,7 @@ dependencies = [
"rand_core 0.6.4",
"serde",
"serde_json",
"signature 2.1.0",
"signature",
"subtle-encoding",
"tendermint",
"tendermint-rpc",
@@ -1016,16 +994,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 = "cssparser"
version = "0.27.2"
@@ -1063,22 +1031,13 @@ dependencies = [
"syn 1.0.109",
]
[[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]]
@@ -1090,23 +1049,24 @@ dependencies = [
"byteorder",
"digest 0.9.0",
"rand_core 0.5.1",
"serde",
"subtle 2.5.0",
"zeroize",
]
[[package]]
name = "curve25519-dalek"
version = "4.1.1"
version = "4.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
dependencies = [
"cfg-if",
"cpufeatures",
"curve25519-dalek-derive",
"digest 0.10.7",
"fiat-crypto",
"platforms",
"rustc_version",
"serde",
"subtle 2.5.0",
"zeroize",
]
@@ -1466,20 +1426,10 @@ dependencies = [
"elliptic-curve",
"rfc6979",
"serdect",
"signature 2.1.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.2"
@@ -1487,7 +1437,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d"
dependencies = [
"pkcs8",
"signature 2.1.0",
"serde",
"signature",
]
[[package]]
@@ -1505,16 +1456,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",
]
@@ -1970,10 +1921,8 @@ 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]]
@@ -2299,22 +2248,11 @@ checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
[[package]]
name = "hkdf"
version = "0.11.0"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b"
checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
dependencies = [
"digest 0.9.0",
"hmac 0.11.0",
]
[[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]]
@@ -2781,7 +2719,7 @@ dependencies = [
"elliptic-curve",
"once_cell",
"sha2 0.10.8",
"signature 2.1.0",
"signature",
]
[[package]]
@@ -2859,9 +2797,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.20"
version = "0.4.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
dependencies = [
"serde",
]
@@ -3133,7 +3071,7 @@ dependencies = [
name = "nym-api-requests"
version = "0.1.0"
dependencies = [
"bs58 0.5.0",
"bs58 0.5.1",
"cosmrs 0.15.0 (git+https://github.com/jstuczyn/cosmos-rust?branch=nym-temp/all-validator-features)",
"cosmwasm-std",
"ecdsa",
@@ -3169,7 +3107,7 @@ name = "nym-coconut"
version = "0.5.0"
dependencies = [
"bls12_381",
"bs58 0.5.0",
"bs58 0.5.1",
"digest 0.9.0",
"ff",
"getrandom 0.2.10",
@@ -3223,7 +3161,7 @@ dependencies = [
name = "nym-contracts-common"
version = "0.5.0"
dependencies = [
"bs58 0.5.0",
"bs58 0.5.1",
"cosmwasm-schema",
"cosmwasm-std",
"schemars",
@@ -3245,16 +3183,16 @@ dependencies = [
name = "nym-crypto"
version = "0.4.0"
dependencies = [
"bs58 0.5.0",
"bs58 0.5.1",
"ed25519-dalek",
"nym-pemstore",
"nym-sphinx-types",
"rand 0.7.3",
"rand 0.8.5",
"serde",
"serde_bytes",
"subtle-encoding",
"thiserror",
"x25519-dalek 1.1.1",
"x25519-dalek",
"zeroize",
]
@@ -3264,7 +3202,7 @@ version = "0.1.0"
dependencies = [
"bitvec",
"bls12_381",
"bs58 0.5.0",
"bs58 0.5.1",
"ff",
"group",
"lazy_static",
@@ -3455,7 +3393,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",
@@ -3472,7 +3410,7 @@ dependencies = [
"thiserror",
"ts-rs",
"url",
"x25519-dalek 2.0.0",
"x25519-dalek",
]
[[package]]
@@ -3577,10 +3515,12 @@ dependencies = [
"base64 0.21.4",
"dashmap",
"log",
"nym-config",
"nym-crypto",
"nym-network-defaults",
"serde",
"thiserror",
"x25519-dalek 2.0.0",
"x25519-dalek",
]
[[package]]
@@ -3613,7 +3553,7 @@ dependencies = [
"nym-wallet-types",
"once_cell",
"pretty_env_logger",
"rand_chacha 0.2.2",
"rand_chacha 0.3.1",
"reqwest 0.12.4",
"serde",
"serde_json",
@@ -3853,7 +3793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
dependencies = [
"digest 0.10.7",
"hmac 0.12.1",
"hmac",
]
[[package]]
@@ -4345,12 +4285,12 @@ dependencies = [
[[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]]
@@ -4543,7 +4483,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",
]
@@ -5072,12 +5012,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.1.0"
@@ -5165,25 +5099,26 @@ dependencies = [
[[package]]
name = "sphinx-packet"
version = "0.1.0"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc43eda802856ee82a7555c7b75ceb9e07451741c7a2f5f23d036020e01189d4"
checksum = "dabeca95bf5fd0563d6be7ebcb1c6a9fcb135746a0ba9050c47dc68c8607e595"
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",
"ctr",
"curve25519-dalek 4.1.2",
"digest 0.10.7",
"hkdf",
"hmac 0.11.0",
"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",
]
@@ -5663,7 +5598,7 @@ checksum = "bc2294fa667c8b548ee27a9ba59115472d0a09c2ba255771092a7f1dcf03a789"
dependencies = [
"bytes",
"digest 0.10.7",
"ed25519 2.2.2",
"ed25519",
"ed25519-consensus",
"flex-error",
"futures",
@@ -5678,7 +5613,7 @@ dependencies = [
"serde_json",
"serde_repr",
"sha2 0.10.8",
"signature 2.1.0",
"signature",
"subtle 2.5.0",
"subtle-encoding",
"tendermint-proto",
@@ -6840,25 +6775,13 @@ dependencies = [
"pkg-config",
]
[[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.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
dependencies = [
"curve25519-dalek 4.1.1",
"curve25519-dalek 4.1.2",
"rand_core 0.6.4",
"serde",
"zeroize",
nym-wallet/src-tauri/Cargo.toml
+1 -1
View File
@@ -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"
nym-wallet/src-tauri/src/error.rs
-4
View File
@@ -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 },
}
sdk/lib/socks5-listener/Cargo.toml
+1 -1
View File
@@ -26,7 +26,7 @@ nym-socks5-client-core = { path = "../../../common/socks5-client-core", default-
serde = { workspace = true }
tokio = { workspace = true, features = ["sync", "time"] }
log = { workspace = true }
rand = "0.7.3"
rand = { workspace = true }
safer-ffi = { workspace = true }
sdk/rust/nym-sdk/Cargo.toml
+1 -1
View File
@@ -32,7 +32,7 @@ http = { workspace = true }
futures = { workspace = true }
log = { workspace = true }
rand = { version = "0.7.3" }
rand = { workspace = true }
tap = { workspace = true }
thiserror = { workspace = true }
url = { workspace = true }
service-providers/network-requester/Cargo.toml
+1 -1
View File
@@ -28,7 +28,7 @@ ipnetwork = "0.20.0"
log = { workspace = true }
pretty_env_logger = { workspace = true }
publicsuffix = { workspace = true }
rand = "0.7.3"
rand = { workspace = true }
regex = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
serde = { workspace = true, features = ["derive"] }
wasm/client/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ crate-type = ["cdylib", "rlib"]
anyhow = { 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_json = { workspace = true }
serde-wasm-bindgen = { workspace = true }
wasm/mix-fetch/Cargo.toml
+1 -1
View File
@@ -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"] }
wasm/node-tester/Cargo.toml
+1 -1
View File
@@ -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"] }