From eeaca9fc1098367fc6b5fa57a5829ff8ac462003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Mon, 17 Feb 2025 16:05:27 +0100 Subject: [PATCH] Run cargo autoinherit (#5460) * cargo autoinherit * sort --- Cargo.toml | 19 +++++++++++++------ common/network-defaults/Cargo.toml | 2 +- common/nym_offline_compact_ecash/Cargo.toml | 2 +- documentation/autodoc/Cargo.toml | 2 +- nym-api/Cargo.toml | 2 +- .../vpn-api-lib-wasm/Cargo.toml | 6 +++--- nym-network-monitor/Cargo.toml | 2 +- .../nym-node-status-api/Cargo.toml | 2 +- nyx-chain-watcher/Cargo.toml | 2 +- sdk/ffi/cpp/Cargo.toml | 8 ++++---- sdk/ffi/go/Cargo.toml | 12 ++++++------ sdk/ffi/shared/Cargo.toml | 14 +++++++------- sdk/rust/nym-sdk/Cargo.toml | 8 ++++---- tools/echo-server/Cargo.toml | 8 ++++---- .../importer-contract/Cargo.toml | 2 +- 15 files changed, 49 insertions(+), 42 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d82482dc3b..5097b62821 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -187,18 +187,21 @@ readme = "README.md" [workspace.dependencies] addr = "0.15.6" +aead = "0.5.2" aes = "0.8.1" aes-gcm = "0.10.1" aes-gcm-siv = "0.11.1" -aead = "0.5.2" +ammonia = "4" anyhow = "1.0.95" arc-swap = "1.7.1" argon2 = "0.5.0" async-trait = "0.1.86" -axum-client-ip = "0.6.1" axum = "0.7.5" +axum-client-ip = "0.6.1" axum-extra = "0.9.4" +axum-test = "16.2.0" base64 = "0.22.1" +base85rs = "0.1.3" bincode = "1.3.3" bip39 = { version = "2.0.0", features = ["zeroize"] } bit-vec = "0.7.0" # can we unify those? @@ -239,8 +242,9 @@ doc-comment = "0.3" dotenvy = "0.15.6" ecdsa = "0.16" ed25519-dalek = "2.1" -etherparse = "0.13.0" +env_logger = "0.11.6" envy = "0.4" +etherparse = "0.13.0" eyre = "0.6.9" fastrand = "2.1.1" flate2 = "1.0.35" @@ -259,9 +263,9 @@ hmac = "0.12.1" http = "1" http-body-util = "0.1" httpcodec = "0.2.3" +human-repr = "1.1.0" humantime = "2.1.0" humantime-serde = "1.1.1" -human-repr = "1.1.0" hyper = "1.6.0" hyper-util = "0.1" indicatif = "0.17.11" @@ -276,7 +280,6 @@ ledger-transport = "0.10.0" ledger-transport-hid = "0.10.0" log = "0.4" maxminddb = "0.23.0" -rs_merkle = "1.4.2" mime = "0.3.17" moka = { version = "0.12", features = ["future"] } nix = "0.27.1" @@ -305,6 +308,7 @@ reqwest = { version = "0.12.4", default-features = false } rocket = "0.5.0" rocket_cors = "0.6.0" rocket_okapi = "0.8.0" +rs_merkle = "1.4.2" safer-ffi = "0.1.13" schemars = "0.8.21" semver = "1.0.25" @@ -331,6 +335,7 @@ tempfile = "3.15" thiserror = "2.0" time = "0.3.37" tokio = "1.43" +tokio-postgres = "0.7" tokio-stream = "0.1.17" tokio-test = "0.4.4" tokio-tun = "0.11.5" @@ -340,12 +345,14 @@ toml = "0.8.20" tower = "0.5.2" tower-http = "0.5.2" tracing = "0.1.41" +tracing-log = "0.2" tracing-opentelemetry = "0.19.0" tracing-subscriber = "0.3.19" tracing-tree = "0.2.2" -tracing-log = "0.2" ts-rs = "10.1.0" tungstenite = { version = "0.20.1", default-features = false } +uniffi = "0.29.0" +uniffi_build = "0.29.0" url = "2.5" utoipa = "5.2" utoipa-swagger-ui = "8.0" diff --git a/common/network-defaults/Cargo.toml b/common/network-defaults/Cargo.toml index 0446136e02..d8cbc36711 100644 --- a/common/network-defaults/Cargo.toml +++ b/common/network-defaults/Cargo.toml @@ -26,4 +26,4 @@ utoipa = [ "dep:utoipa" ] [build-dependencies] regex = { workspace = true } -cargo_metadata = { version = "0.18" } +cargo_metadata = { workspace = true } diff --git a/common/nym_offline_compact_ecash/Cargo.toml b/common/nym_offline_compact_ecash/Cargo.toml index 5b6e17f262..9b29d818fe 100644 --- a/common/nym_offline_compact_ecash/Cargo.toml +++ b/common/nym_offline_compact_ecash/Cargo.toml @@ -31,7 +31,7 @@ nym-pemstore = { path = "../pemstore" } nym-network-defaults = { path = "../network-defaults", default-features = false } [dev-dependencies] -criterion = { version = "0.5.1", features = ["html_reports"] } +criterion = { workspace = true, features = ["html_reports"] } [[bench]] diff --git a/documentation/autodoc/Cargo.toml b/documentation/autodoc/Cargo.toml index 21e8184a69..9fae8c5434 100644 --- a/documentation/autodoc/Cargo.toml +++ b/documentation/autodoc/Cargo.toml @@ -9,5 +9,5 @@ edition.workspace = true license.workspace = true [dependencies] -env_logger = "0.11.6" +env_logger = { workspace = true } log.workspace = true diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index 98f24e5106..8ea8d4e1e2 100644 --- a/nym-api/Cargo.toml +++ b/nym-api/Cargo.toml @@ -136,7 +136,7 @@ sqlx = { workspace = true, features = [ ] } [dev-dependencies] -axum-test = "16.2.0" +axum-test = { workspace = true } tempfile = { workspace = true } cw3 = { workspace = true } cw-utils = { workspace = true } diff --git a/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml b/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml index e8070a5eb8..8dc406eaf5 100644 --- a/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml +++ b/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml @@ -20,11 +20,11 @@ thiserror.workspace = true zeroize = { workspace = true } # wasm-specific deps -getrandom = { version = "0.2", features = ["js"] } +getrandom = { workspace = true, features = ["js"] } wasm-bindgen = { workspace = true } -js-sys = "0.3.76" +js-sys = { workspace = true } tsify = { workspace = true, features = ["js"] } -serde-wasm-bindgen = "0.6.5" +serde-wasm-bindgen = { workspace = true } # NYM: nym-bin-common = { path = "../../common/bin-common" } diff --git a/nym-network-monitor/Cargo.toml b/nym-network-monitor/Cargo.toml index a6def79278..a5862e0188 100644 --- a/nym-network-monitor/Cargo.toml +++ b/nym-network-monitor/Cargo.toml @@ -27,7 +27,7 @@ tokio = { workspace = true, features = ["macros", "time"] } tokio-util = { workspace = true } utoipa = { workspace = true, features = ["axum_extras"] } utoipa-swagger-ui = { workspace = true, features = ["axum"] } -tokio-postgres = "0.7" +tokio-postgres = { workspace = true } # internal nym-bin-common = { path = "../common/bin-common" } diff --git a/nym-node-status-api/nym-node-status-api/Cargo.toml b/nym-node-status-api/nym-node-status-api/Cargo.toml index 400ac4cdbc..7068e61f25 100644 --- a/nym-node-status-api/nym-node-status-api/Cargo.toml +++ b/nym-node-status-api/nym-node-status-api/Cargo.toml @@ -13,7 +13,7 @@ license.workspace = true rust-version.workspace = true [dependencies] -ammonia = "4" +ammonia = { workspace = true } anyhow = { workspace = true } axum = { workspace = true, features = ["tokio", "macros"] } chrono = { workspace = true } diff --git a/nyx-chain-watcher/Cargo.toml b/nyx-chain-watcher/Cargo.toml index 318ba446ec..285ca3c319 100644 --- a/nyx-chain-watcher/Cargo.toml +++ b/nyx-chain-watcher/Cargo.toml @@ -35,7 +35,7 @@ serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite", "time"] } thiserror = { workspace = true } -time = { version = "0.3.37" } +time = { workspace = true } tokio = { workspace = true, features = ["process", "rt-multi-thread"] } tokio-util = { workspace = true } tracing = { workspace = true } diff --git a/sdk/ffi/cpp/Cargo.toml b/sdk/ffi/cpp/Cargo.toml index d2b8bdd886..7b49a98540 100644 --- a/sdk/ffi/cpp/Cargo.toml +++ b/sdk/ffi/cpp/Cargo.toml @@ -10,14 +10,14 @@ crate-type = ["cdylib"] [dependencies] # Async runtime -tokio = { version = "1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } # Nym clients, addressing, packet format, common tools (logging), ffi shared nym-sdk = { path = "../../rust/nym-sdk/" } nym-bin-common = { path = "../../../common/bin-common" } nym-sphinx-anonymous-replies = { path = "../../../common/nymsphinx/anonymous-replies" } nym-ffi-shared = { path = "../shared" } -lazy_static = "1.5.0" +lazy_static = { workspace = true } # error handling -anyhow = "1.0.95" +anyhow = { workspace = true } # base58 en/decoding -bs58 = "0.5.0" +bs58 = { workspace = true } diff --git a/sdk/ffi/go/Cargo.toml b/sdk/ffi/go/Cargo.toml index 6ead3c3b0f..584ef8546e 100644 --- a/sdk/ffi/go/Cargo.toml +++ b/sdk/ffi/go/Cargo.toml @@ -10,22 +10,22 @@ name = "nym_go_ffi" [dependencies] # Bindgen -uniffi = { version = "0.29.0", features = ["cli"] } +uniffi = { workspace = true, features = ["cli"] } # Nym clients, addressing, packet format, common tools (logging), ffi shared nym-sdk = { path = "../../rust/nym-sdk/" } nym-bin-common = { path = "../../../common/bin-common" } nym-sphinx-anonymous-replies = { path = "../../../common/nymsphinx/anonymous-replies" } nym-ffi-shared = { path = "../shared" } # Async runtime -tokio = { version = "1", features = ["full"] } -lazy_static = "1.5.0" +tokio = { workspace = true, features = ["full"] } +lazy_static = { workspace = true } # error handling -anyhow = "1.0.95" +anyhow = { workspace = true } thiserror.workspace = true [build-dependencies] -uniffi = { version = "0.29.0", features = ["build"] } -uniffi_build = { version = "0.29.0", features = ["builtin-bindgen"] } +uniffi = { workspace = true, features = ["build"] } +uniffi_build = { workspace = true, features = ["builtin-bindgen"] } [[bin]] name = "uniffi-bindgen" diff --git a/sdk/ffi/shared/Cargo.toml b/sdk/ffi/shared/Cargo.toml index 7410fdb986..cdc3759053 100644 --- a/sdk/ffi/shared/Cargo.toml +++ b/sdk/ffi/shared/Cargo.toml @@ -6,20 +6,20 @@ license.workspace = true [dependencies] # Async runtime -tokio = { version = "1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } # Nym clients, addressing, packet format, common tools (logging) nym-sdk = { path = "../../rust/nym-sdk/" } nym-bin-common = { path = "../../../common/bin-common" } nym-sphinx-anonymous-replies = { path = "../../../common/nymsphinx/anonymous-replies" } # static var macro -lazy_static = "1.5.0" +lazy_static = { workspace = true } # error handling -anyhow = "1.0.95" +anyhow = { workspace = true } # base58 en/decoding -bs58 = "0.5.0" +bs58 = { workspace = true } # UDL test -uniffi = { version = "0.29.0", features = ["cli"] } +uniffi = { workspace = true, features = ["cli"] } [build-dependencies] -uniffi = { version = "0.29.0", features = ["build"] } -uniffi_build = { version = "0.29.0", features = ["builtin-bindgen"] } +uniffi = { workspace = true, features = ["build"] } +uniffi_build = { workspace = true, features = ["builtin-bindgen"] } diff --git a/sdk/rust/nym-sdk/Cargo.toml b/sdk/rust/nym-sdk/Cargo.toml index 0c79a0b7f2..7a50e11982 100644 --- a/sdk/rust/nym-sdk/Cargo.toml +++ b/sdk/rust/nym-sdk/Cargo.toml @@ -53,11 +53,11 @@ dashmap.workspace = true tokio.workspace = true tokio-stream.workspace = true tokio-util.workspace = true -uuid = { version = "1", features = ["v4", "serde"] } -bincode = "1.0" -serde = { version = "1", features = ["derive"] } +uuid = { workspace = true, features = ["v4", "serde"] } +bincode = { workspace = true } +serde = { workspace = true, features = ["derive"] } tracing.workspace = true -tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } +tracing-subscriber = { workspace = true, features = ["env-filter"] } dirs.workspace = true [dev-dependencies] diff --git a/tools/echo-server/Cargo.toml b/tools/echo-server/Cargo.toml index dbdf44c056..c6e98489ce 100644 --- a/tools/echo-server/Cargo.toml +++ b/tools/echo-server/Cargo.toml @@ -15,11 +15,11 @@ dashmap.workspace = true tokio = { workspace = true, features = ["full"] } tokio-stream.workspace = true tokio-util.workspace = true -uuid = { version = "1", features = ["v4", "serde"] } -bincode = "1.0" -serde = { version = "1", features = ["derive"] } +uuid = { workspace = true, features = ["v4", "serde"] } +bincode = { workspace = true } +serde = { workspace = true, features = ["derive"] } tracing.workspace = true -tracing-subscriber = "0.3" +tracing-subscriber = { workspace = true } bytecodec = { workspace = true } nym-sdk = { path = "../../sdk/rust/nym-sdk/" } bytes.workspace = true diff --git a/tools/internal/contract-state-importer/importer-contract/Cargo.toml b/tools/internal/contract-state-importer/importer-contract/Cargo.toml index 7952b197c2..cdb639b82b 100644 --- a/tools/internal/contract-state-importer/importer-contract/Cargo.toml +++ b/tools/internal/contract-state-importer/importer-contract/Cargo.toml @@ -14,7 +14,7 @@ readme.workspace = true crate-type = ["cdylib", "rlib"] [dependencies] -base85rs = "0.1.3" +base85rs = { workspace = true } cosmwasm-std = { workspace = true } cosmwasm-storage = { workspace = true } cosmwasm-schema = { workspace = true }