diff --git a/Cargo.lock b/Cargo.lock index 555d3e03bb0..18b1a5af7ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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" diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index 7d6d41b5967..1f5a3652b2c 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -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 } diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml index 460ed116ef7..e729c1ae02c 100644 --- a/clients/socks5/Cargo.toml +++ b/clients/socks5/Cargo.toml @@ -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 } diff --git a/common/bandwidth-controller/Cargo.toml b/common/bandwidth-controller/Cargo.toml index 284ccbfc77a..b1228496392 100644 --- a/common/bandwidth-controller/Cargo.toml +++ b/common/bandwidth-controller/Cargo.toml @@ -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 } diff --git a/common/client-core/Cargo.toml b/common/client-core/Cargo.toml index 49a631e641f..d6d1037b1b1 100644 --- a/common/client-core/Cargo.toml +++ b/common/client-core/Cargo.toml @@ -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" diff --git a/common/client-libs/gateway-client/Cargo.toml b/common/client-libs/gateway-client/Cargo.toml index b69b8bcea26..782439770bc 100644 --- a/common/client-libs/gateway-client/Cargo.toml +++ b/common/client-libs/gateway-client/Cargo.toml @@ -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 diff --git a/common/credentials/Cargo.toml b/common/credentials/Cargo.toml index 053e0f80fcd..7d87b835850 100644 --- a/common/credentials/Cargo.toml +++ b/common/credentials/Cargo.toml @@ -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" diff --git a/common/crypto/Cargo.toml b/common/crypto/Cargo.toml index 061dea61836..aec1fc869c8 100644 --- a/common/crypto/Cargo.toml +++ b/common/crypto/Cargo.toml @@ -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"] diff --git a/common/crypto/src/asymmetric/encryption/mod.rs b/common/crypto/src/asymmetric/encryption/mod.rs index 5e095beeab7..60f8109e95a 100644 --- a/common/crypto/src/asymmetric/encryption/mod.rs +++ b/common/crypto/src/asymmetric/encryption/mod.rs @@ -56,7 +56,7 @@ pub struct KeyPair { impl KeyPair { #[cfg(feature = "rand")] pub fn new(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(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 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(); diff --git a/common/crypto/src/asymmetric/identity/mod.rs b/common/crypto/src/asymmetric/identity/mod.rs index a48fb78a823..eb7d5861d21 100644 --- a/common/crypto/src/asymmetric/identity/mod.rs +++ b/common/crypto/src/asymmetric/identity/mod.rs @@ -1,8 +1,8 @@ // Copyright 2021-2023 - Nym Technologies SA // 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(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 { - 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(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 { - 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>(&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 { - Ok(Signature(ed25519_dalek::Signature::from_bytes(bytes)?)) + Ok(Signature(ed25519_dalek::Signature::from_bytes( + bytes.try_into()?, + ))) } } diff --git a/common/crypto/src/shared_key.rs b/common/crypto/src/shared_key.rs index 35ccf2432e9..bcc707489be 100644 --- a/common/crypto/src/shared_key.rs +++ b/common/crypto/src/shared_key.rs @@ -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. diff --git a/common/mixnode-common/src/packet_processor/processor.rs b/common/mixnode-common/src/packet_processor/processor.rs index 03a8f378800..b577fe58ef5 100644 --- a/common/mixnode-common/src/packet_processor/processor.rs +++ b/common/mixnode-common/src/packet_processor/processor.rs @@ -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(); diff --git a/common/node-tester-utils/Cargo.toml b/common/node-tester-utils/Cargo.toml index 647453edfd8..cdb2ddb9944 100644 --- a/common/node-tester-utils/Cargo.toml +++ b/common/node-tester-utils/Cargo.toml @@ -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 } diff --git a/common/nymsphinx/Cargo.toml b/common/nymsphinx/Cargo.toml index 955051b2671..7a7688ac3eb 100644 --- a/common/nymsphinx/Cargo.toml +++ b/common/nymsphinx/Cargo.toml @@ -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" } diff --git a/common/nymsphinx/acknowledgements/Cargo.toml b/common/nymsphinx/acknowledgements/Cargo.toml index da9977d1f38..3d997c436f5 100644 --- a/common/nymsphinx/acknowledgements/Cargo.toml +++ b/common/nymsphinx/acknowledgements/Cargo.toml @@ -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 } diff --git a/common/nymsphinx/addressing/Cargo.toml b/common/nymsphinx/addressing/Cargo.toml index c73e692e62e..d1b58ebee5e 100644 --- a/common/nymsphinx/addressing/Cargo.toml +++ b/common/nymsphinx/addressing/Cargo.toml @@ -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"] } \ No newline at end of file diff --git a/common/nymsphinx/anonymous-replies/Cargo.toml b/common/nymsphinx/anonymous-replies/Cargo.toml index 9c057f31f5c..9ece0e10859 100644 --- a/common/nymsphinx/anonymous-replies/Cargo.toml +++ b/common/nymsphinx/anonymous-replies/Cargo.toml @@ -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" diff --git a/common/nymsphinx/anonymous-replies/src/requests.rs b/common/nymsphinx/anonymous-replies/src/requests.rs index 9dd4c84dc04..b175026b180 100644 --- a/common/nymsphinx/anonymous-replies/src/requests.rs +++ b/common/nymsphinx/anonymous-replies/src/requests.rs @@ -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), diff --git a/common/nymsphinx/chunking/Cargo.toml b/common/nymsphinx/chunking/Cargo.toml index 542c8d28e27..dc608a97186 100644 --- a/common/nymsphinx/chunking/Cargo.toml +++ b/common/nymsphinx/chunking/Cargo.toml @@ -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" } diff --git a/common/nymsphinx/cover/Cargo.toml b/common/nymsphinx/cover/Cargo.toml index d3da16d2dbe..59710923d17 100644 --- a/common/nymsphinx/cover/Cargo.toml +++ b/common/nymsphinx/cover/Cargo.toml @@ -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" } diff --git a/common/nymsphinx/framing/src/codec.rs b/common/nymsphinx/framing/src/codec.rs index 2abc29f91e1..65c2b39e46a 100644 --- a/common/nymsphinx/framing/src/codec.rs +++ b/common/nymsphinx/framing/src/codec.rs @@ -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, diff --git a/common/nymsphinx/types/Cargo.toml b/common/nymsphinx/types/Cargo.toml index 47ad47c2d28..dcc402f5b8a 100644 --- a/common/nymsphinx/types/Cargo.toml +++ b/common/nymsphinx/types/Cargo.toml @@ -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 } diff --git a/common/nymsphinx/types/src/lib.rs b/common/nymsphinx/types/src/lib.rs index d75060e9b0a..7ba0e06d82c 100644 --- a/common/nymsphinx/types/src/lib.rs +++ b/common/nymsphinx/types/src/lib.rs @@ -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}; diff --git a/common/socks5-client-core/Cargo.toml b/common/socks5-client-core/Cargo.toml index 52fc4d6d0b0..49124fe02ac 100644 --- a/common/socks5-client-core/Cargo.toml +++ b/common/socks5-client-core/Cargo.toml @@ -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 diff --git a/common/topology/Cargo.toml b/common/topology/Cargo.toml index f8ec3958871..471a8621a4e 100644 --- a/common/topology/Cargo.toml +++ b/common/topology/Cargo.toml @@ -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" diff --git a/common/wasm/client-core/Cargo.toml b/common/wasm/client-core/Cargo.toml index 5e6a7018835..5a8cdc75bcd 100644 --- a/common/wasm/client-core/Cargo.toml +++ b/common/wasm/client-core/Cargo.toml @@ -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 } diff --git a/common/wireguard-types/Cargo.toml b/common/wireguard-types/Cargo.toml index 07d440ad6ba..d869184cc07 100644 --- a/common/wireguard-types/Cargo.toml +++ b/common/wireguard-types/Cargo.toml @@ -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"]} diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock index 026e514e9c4..46a5db49bf8 100644 --- a/contracts/Cargo.lock +++ b/contracts/Cargo.lock @@ -4,33 +4,40 @@ version = 3 [[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", "cpufeatures", - "ctr", - "opaque-debug 0.3.0", ] [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.10", + "getrandom", "once_cell", "version_check", ] +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arrayref" @@ -40,9 +47,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "base16ct" @@ -64,9 +71,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -87,7 +94,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", ] @@ -131,12 +138,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "bumpalo" -version = "3.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" - [[package]] name = "byte-tools" version = "0.3.1" @@ -145,23 +146,24 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[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" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -182,11 +184,12 @@ dependencies = [ [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array 0.14.7", + "crypto-common", + "inout", ] [[package]] @@ -210,7 +213,7 @@ dependencies = [ "nym-coconut-dkg-common", "nym-group-contract-common", "nym-multisig-contract-common", - "rand_chacha 0.2.2", + "rand_chacha", "schemars", "serde", "subtle-encoding", @@ -219,9 +222,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.2" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "cosmwasm-crypto" @@ -231,7 +234,7 @@ checksum = "c533b66e502ecab30fec23d03eb54ab1d3ce120645a00493459f8510b7a9736f" dependencies = [ "digest 0.10.7", "ed25519-zebra", - "k256 0.13.2", + "k256 0.13.3", "rand_core 0.6.4", "thiserror", ] @@ -275,7 +278,7 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e98e19fae6c3f468412f731274b0f9434602722009d6a77432d39c7c4bb09202" dependencies = [ - "base64 0.21.0", + "base64 0.21.7", "bnum", "cosmwasm-crypto", "cosmwasm-derive", @@ -285,7 +288,7 @@ dependencies = [ "schemars", "serde", "serde-json-wasm", - "sha2 0.10.6", + "sha2 0.10.8", "thiserror", ] @@ -301,9 +304,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -352,21 +355,11 @@ dependencies = [ "subtle 1.0.0", ] -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array 0.14.7", - "subtle 2.4.1", -] - [[package]] name = "ctr" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ "cipher", ] @@ -384,6 +377,34 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "platforms", + "rustc_version", + "subtle 2.4.1", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.59", +] + [[package]] name = "cw-controllers" version = "1.1.0" @@ -474,14 +495,13 @@ dependencies = [ [[package]] name = "cw20-base" -version = "1.0.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcd279230b08ed8afd8be5828221622bd5b9ce25d0b01d58bad626c6ce0169c" +checksum = "17ad79e86ea3707229bf78df94e08732e8f713207b4a77b2699755596725e7d9" dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus", - "cw-utils", "cw2", "cw20", "schemars", @@ -584,9 +604,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "zeroize", @@ -594,9 +614,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -644,9 +664,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" @@ -666,9 +686,9 @@ version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der 0.7.8", + "der 0.7.9", "digest 0.10.7", - "elliptic-curve 0.13.7", + "elliptic-curve 0.13.8", "rfc6979 0.4.0", "signature 2.2.0", "spki 0.7.3", @@ -676,24 +696,26 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.3" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "signature 1.6.4", + "pkcs8 0.10.2", + "signature 2.2.0", ] [[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", + "curve25519-dalek 4.1.2", "ed25519", - "rand 0.7.3", + "rand_core 0.6.4", "serde", - "sha2 0.9.9", + "sha2 0.10.8", + "subtle 2.4.1", "zeroize", ] @@ -703,7 +725,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" dependencies = [ - "curve25519-dalek", + "curve25519-dalek 3.2.0", "hashbrown", "hex", "rand_core 0.6.4", @@ -714,9 +736,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "elliptic-curve" @@ -740,9 +762,9 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.7" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9775b22bc152ad86a0cf23f0f348b884b26add12bf741e7ffc4d4ab2ab4d205" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct 0.2.0", "crypto-bigint 0.5.5", @@ -768,13 +790,13 @@ dependencies = [ [[package]] name = "enum-iterator-derive" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f93763ef7b0ae1c43c4d8eccc9d5848d84ad1a1d8ce61c421d1ac85a19d05" +checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.59", ] [[package]] @@ -797,11 +819,17 @@ dependencies = [ "subtle 2.4.1", ] +[[package]] +name = "fiat-crypto" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" + [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -814,9 +842,9 @@ checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -829,9 +857,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -839,15 +867,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -856,44 +884,44 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.59", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -929,26 +957,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", - "js-sys", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1015,22 +1030,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[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 = "hmac" -version = "0.11.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "crypto-mac 0.11.1", - "digest 0.9.0", + "hmac", ] [[package]] @@ -1060,14 +1064,23 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array 0.14.7", +] + [[package]] name = "itertools" version = "0.10.5" @@ -1079,28 +1092,19 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "685a7d121ee3f65ae4fddd72b25a04bb36b6af81bc0828f7d5434c0fe60fa3a2" dependencies = [ "libc", ] -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - [[package]] name = "k256" version = "0.11.6" @@ -1110,20 +1114,20 @@ dependencies = [ "cfg-if", "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.6", + "sha2 0.10.8", ] [[package]] name = "k256" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa 0.16.9", - "elliptic-curve 0.13.7", + "elliptic-curve 0.13.8", "once_cell", - "sha2 0.10.6", + "sha2 0.10.8", "signature 2.2.0", ] @@ -1135,9 +1139,9 @@ checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libgit2-sys" @@ -1153,15 +1157,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" dependencies = [ "cc", "libc", @@ -1183,18 +1187,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "mixnet-vesting-integration-tests" @@ -1209,14 +1210,20 @@ dependencies = [ "nym-mixnet-contract-common", "nym-vesting-contract", "nym-vesting-contract-common", - "rand_chacha 0.2.2", + "rand_chacha", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -1300,7 +1307,7 @@ dependencies = [ "ed25519-dalek", "nym-pemstore", "nym-sphinx-types", - "rand 0.7.3", + "rand", "subtle-encoding", "thiserror", "x25519-dalek", @@ -1333,7 +1340,7 @@ dependencies = [ "nym-crypto", "nym-mixnet-contract-common", "nym-vesting-contract-common", - "rand_chacha 0.2.2", + "rand_chacha", "semver", "serde", "thiserror", @@ -1392,8 +1399,8 @@ dependencies = [ "nym-crypto", "nym-name-service-common", "nym-sphinx-addressing", - "rand 0.8.5", - "rand_chacha 0.2.2", + "rand", + "rand_chacha", "rstest", "semver", "serde", @@ -1438,7 +1445,7 @@ dependencies = [ "nym-contracts-common", "nym-crypto", "nym-service-provider-directory-common", - "rand_chacha 0.2.2", + "rand_chacha", "rstest", "semver", "serde", @@ -1481,7 +1488,7 @@ dependencies = [ name = "nym-vesting-contract" version = "1.4.1" dependencies = [ - "base64 0.21.0", + "base64 0.21.7", "cosmwasm-crypto", "cosmwasm-derive", "cosmwasm-schema", @@ -1492,7 +1499,7 @@ dependencies = [ "nym-contracts-common", "nym-mixnet-contract-common", "nym-vesting-contract-common", - "rand_chacha 0.3.1", + "rand_chacha", "semver", "serde", "serde_json", @@ -1527,9 +1534,9 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "pem" @@ -1544,15 +1551,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1576,15 +1583,21 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.8", + "der 0.7.9", "spki 0.7.3", ] [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "platforms" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "powerfmt" @@ -1624,9 +1637,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -1656,26 +1669,13 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] -[[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", -] - [[package]] name = "rand" version = "0.8.5" @@ -1683,20 +1683,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", + "rand_chacha", "rand_core 0.6.4", ] -[[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" @@ -1712,9 +1702,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" @@ -1722,42 +1709,47 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "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", ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "regex" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ - "rand_core 0.5.1", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "regex" -version = "1.8.1" +name = "regex-automata" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ + "aho-corasick", + "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rfc6979" @@ -1766,7 +1758,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ "crypto-bigint 0.4.9", - "hmac 0.12.1", + "hmac", "zeroize", ] @@ -1776,7 +1768,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.4.1", ] @@ -1817,15 +1809,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "schemars" @@ -1872,7 +1864,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct 0.2.0", - "der 0.7.8", + "der 0.7.9", "generic-array 0.14.7", "pkcs8 0.10.2", "subtle 2.4.1", @@ -1881,15 +1873,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] @@ -1905,13 +1897,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.59", ] [[package]] @@ -1927,9 +1919,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -1938,13 +1930,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.59", ] [[package]] @@ -1957,14 +1949,14 @@ dependencies = [ "cfg-if", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", ] [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -1993,35 +1985,36 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[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", "arrayref", "blake2", - "bs58 0.4.0", + "bs58 0.5.1", "byteorder", "chacha", - "curve25519-dalek", - "digest 0.9.0", + "ctr", + "digest 0.10.7", "hkdf", - "hmac 0.11.0", + "hmac", "lioness", "log", - "rand 0.7.3", + "rand", "rand_distr", - "sha2 0.9.9", + "sha2 0.10.8", "subtle 2.4.1", + "x25519-dalek", ] [[package]] @@ -2041,7 +2034,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der 0.7.8", + "der 0.7.9", ] [[package]] @@ -2078,9 +2071,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.49" +version = "2.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496" +checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" dependencies = [ "proc-macro2", "quote", @@ -2104,17 +2097,18 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.59", ] [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -2129,10 +2123,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -2153,36 +2148,36 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.12" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d502c968c6a838ead8e69b2ee18ec708802f99db92a0d156705ec9ef801993b" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "url" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -2218,88 +2213,29 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - [[package]] name = "x25519-dalek" -version = "1.1.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ - "curve25519-dalek", - "rand_core 0.5.1", + "curve25519-dalek 4.1.2", + "rand_core 0.6.4", + "serde", "zeroize", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -2312,5 +2248,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.59", ] diff --git a/contracts/coconut-test/Cargo.toml b/contracts/coconut-test/Cargo.toml index 22475dda1f8..8b174175df4 100644 --- a/contracts/coconut-test/Cargo.toml +++ b/contracts/coconut-test/Cargo.toml @@ -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" diff --git a/contracts/mixnet-vesting-integration-tests/Cargo.toml b/contracts/mixnet-vesting-integration-tests/Cargo.toml index 24d2ddd1ab9..a60f4337587 100644 --- a/contracts/mixnet-vesting-integration-tests/Cargo.toml +++ b/contracts/mixnet-vesting-integration-tests/Cargo.toml @@ -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" diff --git a/contracts/mixnet/Cargo.toml b/contracts/mixnet/Cargo.toml index 9f2ba071249..2b854def9f1 100644 --- a/contracts/mixnet/Cargo.toml +++ b/contracts/mixnet/Cargo.toml @@ -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] diff --git a/contracts/name-service/Cargo.toml b/contracts/name-service/Cargo.toml index c1bf2106377..e3ec82c685d 100644 --- a/contracts/name-service/Cargo.toml +++ b/contracts/name-service/Cargo.toml @@ -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] diff --git a/contracts/service-provider-directory/Cargo.toml b/contracts/service-provider-directory/Cargo.toml index e4a75c50f0d..570b50e8aae 100644 --- a/contracts/service-provider-directory/Cargo.toml +++ b/contracts/service-provider-directory/Cargo.toml @@ -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] diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index 76b425b1907..e6672dd1d54 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -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 = [ diff --git a/gateway/gateway-requests/Cargo.toml b/gateway/gateway-requests/Cargo.toml index 770ce79cd40..9802a6c590b 100644 --- a/gateway/gateway-requests/Cargo.toml +++ b/gateway/gateway-requests/Cargo.toml @@ -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 } diff --git a/gateway/gateway-requests/src/registration/handshake/shared_key.rs b/gateway/gateway-requests/src/registration/handshake/shared_key.rs index 4d4dce6e7fe..64975fe4cd2 100644 --- a/gateway/gateway-requests/src/registration/handshake/shared_key.rs +++ b/gateway/gateway-requests/src/registration/handshake/shared_key.rs @@ -82,8 +82,10 @@ impl SharedKeys { ) } }; - let mac = - compute_keyed_hmac::(self.mac_key(), &encrypted_data); + let mac = compute_keyed_hmac::( + 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::( - self.mac_key(), + self.mac_key().as_slice(), message_bytes, mac_tag, ) { diff --git a/gateway/gateway-requests/src/types.rs b/gateway/gateway-requests/src/types.rs index 1da37fd0abf..6c564d4ae80 100644 --- a/gateway/gateway-requests/src/types.rs +++ b/gateway/gateway-requests/src/types.rs @@ -421,7 +421,7 @@ impl BinaryResponse { let message_bytes = &raw_req[mac_size..]; if !recompute_keyed_hmac_and_verify_tag::( - shared_keys.mac_key(), + shared_keys.mac_key().as_slice(), message_bytes, mac_tag, ) { diff --git a/mixnode/Cargo.toml b/mixnode/Cargo.toml index b64bb9bfc76..e0ae3bec5ce 100644 --- a/mixnode/Cargo.toml +++ b/mixnode/Cargo.toml @@ -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" diff --git a/mixnode/src/node/packet_delayforwarder.rs b/mixnode/src/node/packet_delayforwarder.rs index 2aa85d714c2..58212c8c700 100644 --- a/mixnode/src/node/packet_delayforwarder.rs +++ b/mixnode/src/node/packet_delayforwarder.rs @@ -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, diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index 4ab459165cc..f9fa59e3cc9 100644 --- a/nym-api/Cargo.toml +++ b/nym-api/Cargo.toml @@ -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" diff --git a/nym-api/src/coconut/tests/fixtures.rs b/nym-api/src/coconut/tests/fixtures.rs index 36e416df195..38e964f3950 100644 --- a/nym-api/src/coconut/tests/fixtures.rs +++ b/nym-api/src/coconut/tests/fixtures.rs @@ -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()), diff --git a/nym-api/src/coconut/tests/mod.rs b/nym-api/src/coconut/tests/mod.rs index 02c430d4c23..bd29db0412d 100644 --- a/nym-api/src/coconut/tests/mod.rs +++ b/nym-api/src/coconut/tests/mod.rs @@ -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(¶ms, 1, 1).unwrap().remove(0); let identity = identity::KeyPair::new(&mut rng); diff --git a/nym-api/src/network_monitor/chunker.rs b/nym-api/src/network_monitor/chunker.rs index ec915778668..a45a5515025 100644 --- a/nym-api/src/network_monitor/chunker.rs +++ b/nym-api/src/network_monitor/chunker.rs @@ -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); diff --git a/nym-api/src/network_monitor/mod.rs b/nym-api/src/network_monitor/mod.rs index 29298be4363..cc308a627fd 100644 --- a/nym-api/src/network_monitor/mod.rs +++ b/nym-api/src/network_monitor/mod.rs @@ -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)); diff --git a/nym-api/src/network_monitor/monitor/preparer.rs b/nym-api/src/network_monitor/monitor/preparer.rs index 4e9cfda0fd3..73a11b4d60c 100644 --- a/nym-api/src/network_monitor/monitor/preparer.rs +++ b/nym-api/src/network_monitor/monitor/preparer.rs @@ -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}; diff --git a/nym-api/src/support/config/helpers.rs b/nym-api/src/support/config/helpers.rs index a124a8e4ddc..9f965e7815d 100644 --- a/nym-api/src/support/config/helpers.rs +++ b/nym-api/src/support/config/helpers.rs @@ -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")?; diff --git a/nym-connect/desktop/Cargo.lock b/nym-connect/desktop/Cargo.lock index eee9ddb886c..640640bea74 100644 --- a/nym-connect/desktop/Cargo.lock +++ b/nym-connect/desktop/Cargo.lock @@ -35,25 +35,12 @@ dependencies = [ [[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.0", -] - -[[package]] -name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", - "cipher 0.4.4", + "cipher", "cpufeatures", ] @@ -410,6 +397,12 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -431,15 +424,15 @@ 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", "rand_core 0.6.4", "ripemd", "sha2 0.10.8", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -494,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", ] @@ -571,7 +564,7 @@ dependencies = [ "group", "pairing", "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -610,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", @@ -648,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" @@ -697,12 +690,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.82" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" -dependencies = [ - "libc", -] +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] name = "cesu8" @@ -763,7 +753,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher 0.4.4", + "cipher", "cpufeatures", ] @@ -775,7 +765,7 @@ checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", "chacha20", - "cipher 0.4.4", + "cipher", "poly1305", "zeroize", ] @@ -793,15 +783,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" @@ -1043,7 +1024,7 @@ dependencies = [ "rand_core 0.6.4", "serde", "serde_json", - "signature 2.1.0", + "signature", "subtle-encoding", "tendermint", "tendermint-rpc", @@ -1211,7 +1192,7 @@ checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -1236,16 +1217,6 @@ dependencies = [ "subtle 1.0.0", ] -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array 0.14.7", - "subtle 2.4.1", -] - [[package]] name = "cssparser" version = "0.27.2" @@ -1283,22 +1254,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]] @@ -1310,8 +1272,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "serde", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -1324,10 +1285,12 @@ dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", + "digest 0.10.7", "fiat-crypto", "platforms", "rustc_version", - "subtle 2.4.1", + "serde", + "subtle 2.5.0", "zeroize", ] @@ -1587,7 +1550,7 @@ dependencies = [ "block-buffer 0.10.4", "const-oid", "crypto-common", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -1702,20 +1665,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" @@ -1723,7 +1676,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" dependencies = [ "pkcs8", - "signature 2.1.0", + "serde", + "signature", ] [[package]] @@ -1741,16 +1695,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.1", + "ed25519", + "rand_core 0.6.4", "serde", - "serde_bytes", - "sha2 0.9.9", + "sha2 0.10.8", + "subtle 2.5.0", "zeroize", ] @@ -1791,7 +1745,7 @@ dependencies = [ "rand_core 0.6.4", "sec1", "serdect", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -1942,7 +1896,7 @@ checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "bitvec", "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -2329,10 +2283,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]] @@ -2525,7 +2477,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -2691,31 +2643,11 @@ checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" [[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.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" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "crypto-mac 0.11.1", - "digest 0.9.0", + "hmac", ] [[package]] @@ -2892,6 +2824,7 @@ dependencies = [ "pin-project-lite", "smallvec", "tokio", + "want", ] [[package]] @@ -2908,6 +2841,23 @@ dependencies = [ "tokio-rustls 0.24.1", ] +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.2.0", + "hyper-util", + "rustls 0.22.4", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -2928,6 +2878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" dependencies = [ "bytes", + "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.0", @@ -2935,6 +2886,9 @@ dependencies = [ "pin-project-lite", "socket2 0.5.5", "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -3196,7 +3150,7 @@ dependencies = [ "elliptic-curve", "once_cell", "sha2 0.10.8", - "signature 2.1.0", + "signature", ] [[package]] @@ -3331,9 +3285,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", ] @@ -3669,7 +3623,7 @@ dependencies = [ name = "nym-api-requests" version = "0.1.0" dependencies = [ - "bs58 0.5.0", + "bs58 0.5.1", "cosmrs", "cosmwasm-std", "ecdsa", @@ -3697,7 +3651,7 @@ dependencies = [ "nym-crypto", "nym-network-defaults", "nym-validator-client", - "rand 0.7.3", + "rand 0.8.5", "thiserror", "url", "zeroize", @@ -3725,7 +3679,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", @@ -3754,7 +3708,7 @@ dependencies = [ "nym-task", "nym-topology", "nym-validator-client", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_json", "sha2 0.10.8", @@ -3828,7 +3782,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", @@ -3905,9 +3859,8 @@ dependencies = [ "nym-topology", "nym-validator-client", "pretty_env_logger", - "rand 0.7.3", "rand 0.8.5", - "reqwest", + "reqwest 0.11.22", "rust-embed", "sentry", "sentry-log", @@ -3933,7 +3886,7 @@ dependencies = [ name = "nym-contracts-common" version = "0.5.0" dependencies = [ - "bs58 0.5.0", + "bs58 0.5.1", "cosmwasm-schema", "cosmwasm-std", "schemars", @@ -3993,24 +3946,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", ] @@ -4020,7 +3973,7 @@ version = "0.1.0" dependencies = [ "bitvec", "bls12_381", - "bs58 0.5.0", + "bs58 0.5.1", "ff", "group", "lazy_static", @@ -4071,7 +4024,7 @@ version = "0.1.0" dependencies = [ "log", "nym-explorer-api-requests", - "reqwest", + "reqwest 0.12.4", "serde", "thiserror", "url", @@ -4095,7 +4048,7 @@ dependencies = [ "nym-sphinx", "nym-task", "nym-validator-client", - "rand 0.7.3", + "rand 0.8.5", "serde", "si-scale", "thiserror", @@ -4115,7 +4068,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", @@ -4124,7 +4077,7 @@ dependencies = [ "nym-crypto", "nym-pemstore", "nym-sphinx", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_json", "thiserror", @@ -4150,7 +4103,7 @@ name = "nym-http-api-client" version = "0.1.0" dependencies = [ "async-trait", - "reqwest", + "reqwest 0.12.4", "serde", "serde_json", "thiserror", @@ -4285,13 +4238,13 @@ dependencies = [ "blake3", "chacha20", "chacha20poly1305", - "curve25519-dalek 3.2.0", "getrandom 0.2.10", "log", - "rand 0.7.3", + "rand 0.8.5", "rayon", "sphinx-packet", "thiserror", + "x25519-dalek", "zeroize", ] @@ -4349,8 +4302,8 @@ dependencies = [ "nym-task", "nym-validator-client", "pin-project", - "rand 0.7.3", - "reqwest", + "rand 0.8.5", + "reqwest 0.12.4", "schemars", "serde", "tap", @@ -4405,7 +4358,7 @@ dependencies = [ "nym-sphinx-routing", "nym-sphinx-types", "nym-topology", - "rand 0.7.3", + "rand 0.8.5", "rand_distr", "thiserror", "tokio", @@ -4422,7 +4375,7 @@ dependencies = [ "nym-sphinx-routing", "nym-sphinx-types", "nym-topology", - "rand 0.7.3", + "rand 0.8.5", "thiserror", "zeroize", ] @@ -4441,14 +4394,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", @@ -4462,7 +4415,7 @@ dependencies = [ "nym-sphinx-addressing", "nym-sphinx-params", "nym-sphinx-types", - "rand 0.7.3", + "rand 0.8.5", "thiserror", ] @@ -4479,7 +4432,7 @@ dependencies = [ "nym-sphinx-routing", "nym-sphinx-types", "nym-topology", - "rand 0.7.3", + "rand 0.8.5", "thiserror", ] @@ -4551,7 +4504,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", @@ -4561,7 +4514,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", @@ -4605,7 +4558,7 @@ dependencies = [ "nym-service-provider-directory-common", "nym-vesting-contract-common", "prost", - "reqwest", + "reqwest 0.12.4", "serde", "serde_json", "sha2 0.9.9", @@ -4639,7 +4592,7 @@ dependencies = [ "nym-crypto", "serde", "thiserror", - "x25519-dalek 2.0.0", + "x25519-dalek", ] [[package]] @@ -4880,7 +4833,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets", + "windows-targets 0.48.1", ] [[package]] @@ -4902,7 +4855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", - "hmac 0.12.1", + "hmac", ] [[package]] @@ -5439,12 +5392,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]] @@ -5581,7 +5534,7 @@ dependencies = [ "http 0.2.9", "http-body 0.4.5", "hyper 0.14.27", - "hyper-rustls", + "hyper-rustls 0.24.1", "hyper-tls", "ipnet", "js-sys", @@ -5593,7 +5546,7 @@ dependencies = [ "pin-project-lite", "rustls 0.21.7", "rustls-native-certs", - "rustls-pemfile", + "rustls-pemfile 1.0.3", "serde", "serde_json", "serde_urlencoded", @@ -5609,18 +5562,58 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.4", "winreg 0.50.0", ] +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-rustls 0.26.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.22.4", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.26.1", + "winreg 0.52.0", +] + [[package]] name = "rfc6979" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "hmac 0.12.1", - "subtle 2.4.1", + "hmac", + "subtle 2.5.0", ] [[package]] @@ -5657,11 +5650,26 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + [[package]] name = "ripemd" version = "0.1.3" @@ -5755,7 +5763,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] @@ -5767,11 +5775,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", - "rustls-webpki", + "ring 0.16.20", + "rustls-webpki 0.101.6", "sct", ] +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.4", + "subtle 2.5.0", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -5779,7 +5801,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.3", "schannel", "security-framework", ] @@ -5793,14 +5815,41 @@ dependencies = [ "base64 0.21.4", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + [[package]] name = "rustls-webpki" version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", ] [[package]] @@ -5882,8 +5931,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -5897,7 +5946,7 @@ dependencies = [ "generic-array 0.14.7", "pkcs8", "serdect", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -5979,7 +6028,7 @@ checksum = "01b0ad16faa5d12372f914ed40d00bda21a6d1bdcc99264c5e5e1c9495cf3654" dependencies = [ "httpdate", "native-tls", - "reqwest", + "reqwest 0.11.22", "sentry-anyhow", "sentry-backtrace", "sentry-contexts", @@ -6333,12 +6382,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" @@ -6426,26 +6469,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", - "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", - "subtle 2.4.1", + "sha2 0.10.8", + "subtle 2.5.0", + "x25519-dalek", ] [[package]] @@ -6528,7 +6572,7 @@ dependencies = [ "paste", "percent-encoding", "rustls 0.20.8", - "rustls-pemfile", + "rustls-pemfile 1.0.3", "sha2 0.10.8", "smallvec", "sqlformat", @@ -6651,9 +6695,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "subtle-encoding" @@ -6692,6 +6736,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "system-configuration" version = "0.5.1" @@ -6852,7 +6902,7 @@ dependencies = [ "rand 0.8.5", "raw-window-handle", "regex", - "reqwest", + "reqwest 0.11.22", "rfd", "semver 1.0.23", "serde", @@ -7045,7 +7095,7 @@ checksum = "bc2294fa667c8b548ee27a9ba59115472d0a09c2ba255771092a7f1dcf03a789" dependencies = [ "bytes", "digest 0.10.7", - "ed25519 2.2.2", + "ed25519", "ed25519-consensus", "flex-error", "futures", @@ -7060,8 +7110,8 @@ dependencies = [ "serde_json", "serde_repr", "sha2 0.10.8", - "signature 2.1.0", - "subtle 2.4.1", + "signature", + "subtle 2.5.0", "subtle-encoding", "tendermint-proto", "time", @@ -7113,12 +7163,12 @@ dependencies = [ "getrandom 0.2.10", "peg", "pin-project", - "reqwest", + "reqwest 0.11.22", "semver 1.0.23", "serde", "serde_bytes", "serde_json", - "subtle 2.4.1", + "subtle 2.5.0", "subtle-encoding", "tendermint", "tendermint-config", @@ -7295,6 +7345,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.4", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-socks" version = "0.5.1" @@ -7392,6 +7453,28 @@ dependencies = [ "winnow", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -7405,6 +7488,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -7590,7 +7674,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -7599,6 +7683,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "ureq" version = "2.7.1" @@ -7943,8 +8033,8 @@ version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -7962,7 +8052,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki", + "rustls-webpki 0.101.6", ] [[package]] @@ -7971,6 +8061,15 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webview2-com" version = "0.19.1" @@ -8073,7 +8172,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets", + "windows-targets 0.48.1", ] [[package]] @@ -8123,7 +8222,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] @@ -8141,6 +8249,22 @@ dependencies = [ "windows_x86_64_msvc 0.48.0", ] +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + [[package]] name = "windows-tokens" version = "0.39.0" @@ -8159,6 +8283,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + [[package]] name = "windows_aarch64_msvc" version = "0.37.0" @@ -8183,6 +8313,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + [[package]] name = "windows_i686_gnu" version = "0.37.0" @@ -8207,6 +8343,18 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + [[package]] name = "windows_i686_msvc" version = "0.37.0" @@ -8231,6 +8379,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + [[package]] name = "windows_x86_64_gnu" version = "0.37.0" @@ -8255,6 +8409,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -8267,6 +8427,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + [[package]] name = "windows_x86_64_msvc" version = "0.37.0" @@ -8291,6 +8457,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + [[package]] name = "winnow" version = "0.5.10" @@ -8320,6 +8492,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wry" version = "0.24.3" @@ -8390,21 +8572,9 @@ dependencies = [ [[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" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek 4.1.1", "rand_core 0.6.4", diff --git a/nym-connect/desktop/src-tauri/Cargo.toml b/nym-connect/desktop/src-tauri/Cargo.toml index 49240be6c2b..653c98841c7 100644 --- a/nym-connect/desktop/src-tauri/Cargo.toml +++ b/nym-connect/desktop/src-tauri/Cargo.toml @@ -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"] } diff --git a/nym-connect/desktop/src-tauri/src/config/mod.rs b/nym-connect/desktop/src-tauri/src/config/mod.rs index 79b70f814b3..adc00b48cd6 100644 --- a/nym-connect/desktop/src-tauri/src/config/mod.rs +++ b/nym-connect/desktop/src-tauri/src/config/mod.rs @@ -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 { diff --git a/nym-connect/desktop/src-tauri/src/operations/directory/gateways.rs b/nym-connect/desktop/src-tauri/src/operations/directory/gateways.rs index fca43e8fff0..b868054b664 100644 --- a/nym-connect/desktop/src-tauri/src/operations/directory/gateways.rs +++ b/nym-connect/desktop/src-tauri/src/operations/directory/gateways.rs @@ -87,7 +87,7 @@ async fn select_gateway_by_latency(gateways: Vec) -> 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, diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml index 5aec9401890..10fe8f4ecc7 100644 --- a/nym-node/Cargo.toml +++ b/nym-node/Cargo.toml @@ -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 diff --git a/nym-node/nym-node-http-api/Cargo.toml b/nym-node/nym-node-http-api/Cargo.toml index ab152362245..c2092d66be9 100644 --- a/nym-node/nym-node-http-api/Cargo.toml +++ b/nym-node/nym-node-http-api/Cargo.toml @@ -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" diff --git a/nym-node/nym-node-requests/Cargo.toml b/nym-node/nym-node-requests/Cargo.toml index 1708e122930..100f048efdf 100644 --- a/nym-node/nym-node-requests/Cargo.toml +++ b/nym-node/nym-node-requests/Cargo.toml @@ -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"] } diff --git a/nym-outfox/Cargo.toml b/nym-outfox/Cargo.toml index aad048d9b84..3939dfd20cc 100644 --- a/nym-outfox/Cargo.toml +++ b/nym-outfox/Cargo.toml @@ -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] diff --git a/nym-outfox/src/format.rs b/nym-outfox/src/format.rs index 4a9261bd3fd..ef4db26711d 100644 --- a/nym-outfox/src/format.rs +++ b/nym-outfox/src/format.rs @@ -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 { + ) -> Result { 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, 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) } diff --git a/nym-outfox/tests/unittests.rs b/nym-outfox/tests/unittests.rs index d89f6f85fe4..fcb6d8d850b 100644 --- a/nym-outfox/tests/unittests.rs +++ b/nym-outfox/tests/unittests.rs @@ -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, diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock index f32a613705d..230358af91e 100644 --- a/nym-wallet/Cargo.lock +++ b/nym-wallet/Cargo.lock @@ -35,25 +35,12 @@ dependencies = [ [[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.0", -] - -[[package]] -name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", - "cipher 0.4.4", + "cipher", "cpufeatures", ] @@ -64,11 +51,11 @@ 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.4.1", + "subtle 2.5.0", ] [[package]] @@ -213,6 +200,12 @@ dependencies = [ "system-deps 6.1.1", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "attohttpc" version = "0.22.0" @@ -220,7 +213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7" dependencies = [ "flate2", - "http", + "http 0.2.9", "log", "native-tls", "serde", @@ -279,6 +272,12 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -291,15 +290,15 @@ 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", "rand_core 0.6.4", "ripemd", "sha2 0.10.8", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -354,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", ] @@ -402,7 +401,7 @@ dependencies = [ "group", "pairing", "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -441,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", @@ -479,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" @@ -586,15 +585,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" @@ -832,7 +822,7 @@ dependencies = [ "rand_core 0.6.4", "serde", "serde_json", - "signature 2.1.0", + "signature", "subtle-encoding", "tendermint", "thiserror", @@ -851,7 +841,7 @@ dependencies = [ "rand_core 0.6.4", "serde", "serde_json", - "signature 2.1.0", + "signature", "subtle-encoding", "tendermint", "tendermint-rpc", @@ -970,7 +960,7 @@ checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -995,16 +985,6 @@ dependencies = [ "subtle 1.0.0", ] -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array 0.14.7", - "subtle 2.4.1", -] - [[package]] name = "cssparser" version = "0.27.2" @@ -1042,22 +1022,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]] @@ -1069,8 +1040,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "serde", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -1083,10 +1053,12 @@ dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", + "digest 0.10.7", "fiat-crypto", "platforms", "rustc_version", - "subtle 2.4.1", + "serde", + "subtle 2.5.0", "zeroize", ] @@ -1330,7 +1302,7 @@ dependencies = [ "block-buffer 0.10.4", "const-oid", "crypto-common", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -1445,20 +1417,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" @@ -1466,7 +1428,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" dependencies = [ "pkcs8", - "signature 2.1.0", + "serde", + "signature", ] [[package]] @@ -1484,16 +1447,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.1", + "ed25519", + "rand_core 0.6.4", "serde", - "serde_bytes", - "sha2 0.9.9", + "sha2 0.10.8", + "subtle 2.5.0", "zeroize", ] @@ -1534,7 +1497,7 @@ dependencies = [ "rand_core 0.6.4", "sec1", "serdect", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -1636,7 +1599,7 @@ checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "bitvec", "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -1949,10 +1912,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]] @@ -2109,7 +2070,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -2178,7 +2139,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", "indexmap 1.9.3", "slab", "tokio", @@ -2186,6 +2147,25 @@ 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" @@ -2259,22 +2239,11 @@ checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" [[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 = "hmac" -version = "0.11.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "crypto-mac 0.11.1", - "digest 0.9.0", + "hmac", ] [[package]] @@ -2311,6 +2280,17 @@ dependencies = [ "itoa 1.0.9", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.9", +] + [[package]] name = "http-body" version = "0.4.5" @@ -2318,7 +2298,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -2375,9 +2378,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.20", + "http 0.2.9", + "http-body 0.4.5", "httparse", "httpdate", "itoa 1.0.9", @@ -2389,6 +2392,26 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "itoa 1.0.9", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -2396,24 +2419,64 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", - "rustls", + "http 0.2.9", + "hyper 0.14.27", + "rustls 0.21.9", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.3.1", + "hyper-util", + "rustls 0.22.4", + "rustls-pki-types", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", + "tower-service", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", - "hyper", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.3.1", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2647,7 +2710,7 @@ dependencies = [ "elliptic-curve", "once_cell", "sha2 0.10.8", - "signature 2.1.0", + "signature", ] [[package]] @@ -2725,9 +2788,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", ] @@ -2993,7 +3056,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", @@ -3029,7 +3092,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", @@ -3083,7 +3146,7 @@ dependencies = [ name = "nym-contracts-common" version = "0.5.0" dependencies = [ - "bs58 0.5.0", + "bs58 0.5.1", "cosmwasm-schema", "cosmwasm-std", "schemars", @@ -3105,16 +3168,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", ] @@ -3124,7 +3187,7 @@ version = "0.1.0" dependencies = [ "bitvec", "bls12_381", - "bs58 0.5.0", + "bs58 0.5.1", "ff", "group", "lazy_static", @@ -3174,7 +3237,7 @@ name = "nym-http-api-client" version = "0.1.0" dependencies = [ "async-trait", - "reqwest", + "reqwest 0.12.4", "serde", "serde_json", "thiserror", @@ -3313,7 +3376,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", @@ -3321,7 +3384,7 @@ dependencies = [ "nym-mixnet-contract-common", "nym-validator-client", "nym-vesting-contract-common", - "reqwest", + "reqwest 0.12.4", "schemars", "serde", "serde_json", @@ -3330,7 +3393,7 @@ dependencies = [ "thiserror", "ts-rs", "url", - "x25519-dalek 2.0.0", + "x25519-dalek", ] [[package]] @@ -3370,7 +3433,7 @@ dependencies = [ "nym-service-provider-directory-common", "nym-vesting-contract-common", "prost", - "reqwest", + "reqwest 0.12.4", "serde", "serde_json", "sha2 0.9.9", @@ -3438,7 +3501,7 @@ dependencies = [ "nym-crypto", "serde", "thiserror", - "x25519-dalek 2.0.0", + "x25519-dalek", ] [[package]] @@ -3471,8 +3534,8 @@ dependencies = [ "nym-wallet-types", "once_cell", "pretty_env_logger", - "rand_chacha 0.2.2", - "reqwest", + "rand_chacha 0.3.1", + "reqwest 0.12.4", "serde", "serde_json", "serde_repr", @@ -3689,7 +3752,7 @@ checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -3711,7 +3774,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", - "hmac 0.12.1", + "hmac", ] [[package]] @@ -4203,12 +4266,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]] @@ -4319,12 +4382,54 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", + "h2 0.3.20", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-rustls 0.24.2", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.9", + "rustls-native-certs", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-rustls 0.24.1", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.3.1", + "hyper-rustls 0.26.0", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -4333,23 +4438,24 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-native-certs", - "rustls-pemfile", + "rustls 0.22.4", + "rustls-pemfile 2.1.2", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.25.0", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", "webpki-roots", - "winreg", + "winreg 0.52.0", ] [[package]] @@ -4358,8 +4464,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "hmac 0.12.1", - "subtle 2.4.1", + "hmac", + "subtle 2.5.0", ] [[package]] @@ -4445,10 +4551,24 @@ checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.4", + "subtle 2.5.0", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -4456,7 +4576,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] @@ -4470,6 +4590,22 @@ dependencies = [ "base64 0.21.4", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -4480,6 +4616,17 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustls-webpki" +version = "0.102.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -4574,7 +4721,7 @@ dependencies = [ "generic-array 0.14.7", "pkcs8", "serdect", - "subtle 2.4.1", + "subtle 2.5.0", "zeroize", ] @@ -4846,12 +4993,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" @@ -4939,26 +5080,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", + "ctr", + "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", - "subtle 2.4.1", + "sha2 0.10.8", + "subtle 2.5.0", + "x25519-dalek", ] [[package]] @@ -5076,9 +5218,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "subtle-encoding" @@ -5117,6 +5259,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "system-configuration" version = "0.5.1" @@ -5252,7 +5400,7 @@ dependencies = [ "glob", "gtk", "heck 0.4.1", - "http", + "http 0.2.9", "ignore", "minisign-verify", "objc", @@ -5349,7 +5497,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c507d954d08ac8705d235bc70ec6975b9054fb95ff7823af72dbb04186596f3b" dependencies = [ "gtk", - "http", + "http 0.2.9", "http-range", "rand 0.8.5", "raw-window-handle", @@ -5431,7 +5579,7 @@ checksum = "bc2294fa667c8b548ee27a9ba59115472d0a09c2ba255771092a7f1dcf03a789" dependencies = [ "bytes", "digest 0.10.7", - "ed25519 2.2.2", + "ed25519", "ed25519-consensus", "flex-error", "futures", @@ -5446,8 +5594,8 @@ dependencies = [ "serde_json", "serde_repr", "sha2 0.10.8", - "signature 2.1.0", - "subtle 2.4.1", + "signature", + "subtle 2.5.0", "subtle-encoding", "tendermint-proto", "time", @@ -5499,12 +5647,12 @@ dependencies = [ "getrandom 0.2.10", "peg", "pin-project", - "reqwest", + "reqwest 0.11.22", "semver 1.0.22", "serde", "serde_bytes", "serde_json", - "subtle 2.4.1", + "subtle 2.5.0", "subtle-encoding", "tendermint", "tendermint-config", @@ -5666,7 +5814,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.9", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.4", + "rustls-pki-types", "tokio", ] @@ -5727,6 +5886,28 @@ dependencies = [ "winnow", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -5740,6 +5921,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5879,7 +6061,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", - "subtle 2.4.1", + "subtle 2.5.0", ] [[package]] @@ -6139,9 +6321,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "webview2-com" @@ -6482,6 +6667,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "winres" version = "0.1.12" @@ -6508,7 +6703,7 @@ dependencies = [ "glib", "gtk", "html5ever", - "http", + "http 0.2.9", "kuchiki", "libc", "log", @@ -6561,21 +6756,9 @@ dependencies = [ [[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" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek 4.1.1", "rand_core 0.6.4", diff --git a/nym-wallet/src-tauri/Cargo.toml b/nym-wallet/src-tauri/Cargo.toml index 93cc7eeb4dc..54b9533bfca 100644 --- a/nym-wallet/src-tauri/Cargo.toml +++ b/nym-wallet/src-tauri/Cargo.toml @@ -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" diff --git a/nym-wallet/src-tauri/src/error.rs b/nym-wallet/src-tauri/src/error.rs index 7f542d257c8..1ed617dc4bf 100644 --- a/nym-wallet/src-tauri/src/error.rs +++ b/nym-wallet/src-tauri/src/error.rs @@ -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 }, } diff --git a/sdk/lib/socks5-listener/Cargo.toml b/sdk/lib/socks5-listener/Cargo.toml index 425154a5cb6..7ce9bcdf3be 100644 --- a/sdk/lib/socks5-listener/Cargo.toml +++ b/sdk/lib/socks5-listener/Cargo.toml @@ -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" } diff --git a/sdk/rust/nym-sdk/Cargo.toml b/sdk/rust/nym-sdk/Cargo.toml index 13b987e9aaa..064f8f01436 100644 --- a/sdk/rust/nym-sdk/Cargo.toml +++ b/sdk/rust/nym-sdk/Cargo.toml @@ -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 } diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index 7c446926525..925f5d75737 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -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"] } diff --git a/wasm/client/Cargo.toml b/wasm/client/Cargo.toml index 2232c88877a..eea8ccb0b61 100644 --- a/wasm/client/Cargo.toml +++ b/wasm/client/Cargo.toml @@ -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 } diff --git a/wasm/mix-fetch/Cargo.toml b/wasm/mix-fetch/Cargo.toml index 373b6d423f3..fd187f04e1e 100644 --- a/wasm/mix-fetch/Cargo.toml +++ b/wasm/mix-fetch/Cargo.toml @@ -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"] } diff --git a/wasm/node-tester/Cargo.toml b/wasm/node-tester/Cargo.toml index fd295cd0e39..b2330c04ae1 100644 --- a/wasm/node-tester/Cargo.toml +++ b/wasm/node-tester/Cargo.toml @@ -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"] }