From 4aa8cb4647f1bf5ae96ed5737e4f424846133cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Wed, 26 Jun 2024 22:54:24 +0200 Subject: [PATCH] Move dalek and rand_chacha crates to workspace --- Cargo.toml | 2 ++ common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml | 2 +- common/crypto/Cargo.toml | 6 +++--- common/dkg/Cargo.toml | 2 +- common/nymcoconut/Cargo.toml | 2 +- common/nymsphinx/anonymous-replies/Cargo.toml | 2 +- common/types/Cargo.toml | 2 +- common/wireguard-types/Cargo.toml | 2 +- common/wireguard/Cargo.toml | 2 +- nym-api/Cargo.toml | 2 +- nym-node/nym-node-http-api/Cargo.toml | 2 +- nym-node/nym-node-requests/Cargo.toml | 2 +- 12 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 55cbfbe483..039937982f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -334,6 +334,8 @@ wasm-bindgen = "0.2.92" wasm-bindgen-futures = "0.4.39" wasmtimer = "0.2.0" web-sys = "0.3.69" +rand_chacha = "0.3" +x25519-dalek = "2.0.0" # Profile settings for individual crates diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml index e6bfda4b0a..31e422a49c 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml @@ -29,7 +29,7 @@ time = { workspace = true, features = ["parsing", "formatting"] } ts-rs = { workspace = true, optional = true } [dev-dependencies] -rand_chacha = "0.3" +rand_chacha = { workspace = true } time = { workspace = true, features = ["serde", "macros"] } [features] diff --git a/common/crypto/Cargo.toml b/common/crypto/Cargo.toml index 043809957b..4547d2e0f3 100644 --- a/common/crypto/Cargo.toml +++ b/common/crypto/Cargo.toml @@ -17,8 +17,8 @@ generic-array = { workspace = true, optional = true } hkdf = { workspace = true, optional = true } hmac = { workspace = true, optional = true } cipher = { workspace = true, optional = true } -x25519-dalek = { version = "2.0", optional = true, features = ["static_secrets"]} -ed25519-dalek = { version = "2.1", features = ["rand_core"], optional = true } +x25519-dalek = { workspace = true, features = ["static_secrets"], optional = true } +ed25519-dalek = { workspace = true, features = ["rand_core"], optional = true } rand = { workspace = true, optional = true } serde_bytes = { version = "0.11.6", optional = true } serde_crate = { version = "1.0", optional = true, default-features = false, features = ["derive"], package = "serde" } @@ -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.3" +rand_chacha = { workspace = true } [features] default = ["sphinx"] diff --git a/common/dkg/Cargo.toml b/common/dkg/Cargo.toml index 69145bf176..f506d38e86 100644 --- a/common/dkg/Cargo.toml +++ b/common/dkg/Cargo.toml @@ -19,7 +19,7 @@ bs58 = { workspace = true } lazy_static = { workspace = true } rand = { version = "0.8.5", default-features = false} -rand_chacha = "0.3" +rand_chacha = { workspace = true } rand_core = { workspace = true } sha2 = "0.9" serde = { workspace = true } diff --git a/common/nymcoconut/Cargo.toml b/common/nymcoconut/Cargo.toml index 3a40833b18..34557dd96d 100644 --- a/common/nymcoconut/Cargo.toml +++ b/common/nymcoconut/Cargo.toml @@ -33,7 +33,7 @@ default-features = false [dev-dependencies] criterion = { workspace = true, features = ["html_reports"] } doc-comment = { workspace = true } -rand_chacha = "0.3" +rand_chacha = { workspace = true } [[bench]] name = "benchmarks" diff --git a/common/nymsphinx/anonymous-replies/Cargo.toml b/common/nymsphinx/anonymous-replies/Cargo.toml index 9ece0e1085..5366b90e3e 100644 --- a/common/nymsphinx/anonymous-replies/Cargo.toml +++ b/common/nymsphinx/anonymous-replies/Cargo.toml @@ -24,4 +24,4 @@ nym-topology = { path = "../../topology" } version = "0.2.83" [dev-dependencies] -rand_chacha = "0.3" +rand_chacha = { workspace = true } diff --git a/common/types/Cargo.toml b/common/types/Cargo.toml index 182c24e397..3d1283ec0f 100644 --- a/common/types/Cargo.toml +++ b/common/types/Cargo.toml @@ -22,7 +22,7 @@ strum = { workspace = true, features = ["derive"] } thiserror = { workspace = true } ts-rs = { workspace = true } url = { workspace = true } -x25519-dalek = { version = "2.0.0", features = ["static_secrets"] } +x25519-dalek = { workspace = true, features = ["static_secrets"] } cosmwasm-std = { workspace = true } cosmrs = { workspace = true } diff --git a/common/wireguard-types/Cargo.toml b/common/wireguard-types/Cargo.toml index 7a87e53456..0cd841a384 100644 --- a/common/wireguard-types/Cargo.toml +++ b/common/wireguard-types/Cargo.toml @@ -31,7 +31,7 @@ sha2 = { version = "0.10.8", optional = true } utoipa = { workspace = true, optional = true } serde_json = { workspace = true, optional = true } -x25519-dalek = { version = "2.0.0", features = ["static_secrets"] } +x25519-dalek = { workspace = true, features = ["static_secrets"] } [dev-dependencies] rand = "0.8.5" diff --git a/common/wireguard/Cargo.toml b/common/wireguard/Cargo.toml index 36ec063651..0a5e615d4c 100644 --- a/common/wireguard/Cargo.toml +++ b/common/wireguard/Cargo.toml @@ -17,7 +17,7 @@ defguard_wireguard_rs = { workspace = true } # The latest version on crates.io at the time of writing this (6.0.0) has a # version mismatch with x25519-dalek/curve25519-dalek that is resolved in the # latest commit. So pick that for now. -x25519-dalek = "2.0.0" +x25519-dalek = { workspace = true } ip_network = { workspace = true } log.workspace = true nym-crypto = { path = "../crypto", features = ["asymmetric"] } diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index c4ab7d9445..33e5985dfd 100644 --- a/nym-api/Cargo.toml +++ b/nym-api/Cargo.toml @@ -116,6 +116,6 @@ sqlx = { workspace = true, features = [ tempfile = { workspace = true } cw3 = { workspace = true } cw-utils = { workspace = true } -rand_chacha = "0.3" +rand_chacha = { workspace = true } sha2 = "0.9" diff --git a/nym-node/nym-node-http-api/Cargo.toml b/nym-node/nym-node-http-api/Cargo.toml index f59e85fe83..a77b443447 100644 --- a/nym-node/nym-node-http-api/Cargo.toml +++ b/nym-node/nym-node-http-api/Cargo.toml @@ -45,4 +45,4 @@ serde_json.workspace = true hmac = { workspace = true } tower = { workspace = true } -x25519-dalek = { version = "2.0.0" } +x25519-dalek = { workspace = true } diff --git a/nym-node/nym-node-requests/Cargo.toml b/nym-node/nym-node-requests/Cargo.toml index 405700fbb4..da61331809 100644 --- a/nym-node/nym-node-requests/Cargo.toml +++ b/nym-node/nym-node-requests/Cargo.toml @@ -37,7 +37,7 @@ nym-bin-common = { path = "../../common/bin-common", features = ["bin_info_schem [dev-dependencies] tokio = { workspace = true, features = ["full"] } -rand_chacha = "0.3" +rand_chacha = { workspace = true } nym-crypto = { path = "../../common/crypto", features = ["rand"] }