diff --git a/Cargo.toml b/Cargo.toml index ebe84c2705..ede4e57ca2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,3 +95,12 @@ default-members = [ ] exclude = ["explorer", "contracts", "clients/webassembly", "nym-wallet", "nym-connect"] + +[workspace.package] +authors = ["Nym Technologies SA"] +repository = "https://github.com/nymtech/nym" +homepage = "https://nymtech.net" +edition = "2021" + +[workspace.dependencies] +log = "0.4" diff --git a/clients/client-core/Cargo.toml b/clients/client-core/Cargo.toml index fee89c52df..dc6e12802f 100644 --- a/clients/client-core/Cargo.toml +++ b/clients/client-core/Cargo.toml @@ -13,7 +13,7 @@ dirs = "4.0" dashmap = "5.4.0" futures = "0.3" humantime-serde = "1.0" -log = "0.4" +log = { workspace = true } rand = { version = "0.7.3", features = ["wasm-bindgen"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.89" diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index 1e33012304..1385db71c2 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -23,7 +23,7 @@ url = "2.2" clap = { version = "4.0", features = ["cargo", "derive"] } dirs = "4.0" lazy_static = "1.4.0" -log = "0.4" # self explanatory +log = { workspace = true } # self explanatory pretty_env_logger = "0.4" # for formatting log messages rand = { version = "0.7.3", features = ["wasm-bindgen"] } # rng-related traits + some rng implementation to use serde = { version = "1.0.104", features = ["derive"] } # for config serialization/deserialization diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml index 7567dda43b..7298d4c4b1 100644 --- a/clients/socks5/Cargo.toml +++ b/clients/socks5/Cargo.toml @@ -15,7 +15,7 @@ clap = { version = "4.0", features = ["cargo", "derive"] } dirs = "4.0" futures = "0.3" lazy_static = "1.4.0" -log = "0.4" +log = { workspace = true } pin-project = "1.0" pretty_env_logger = "0.4" rand = { version = "0.7.3", features = ["wasm-bindgen"] } diff --git a/common/client-connections/Cargo.toml b/common/client-connections/Cargo.toml index 7438be79ba..a3d51b3b54 100644 --- a/common/client-connections/Cargo.toml +++ b/common/client-connections/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [dependencies] futures = "0.3" -log = "0.4.17" +log = { workspace = true } diff --git a/common/client-libs/gateway-client/Cargo.toml b/common/client-libs/gateway-client/Cargo.toml index b56ff0872e..7dffddd6ad 100644 --- a/common/client-libs/gateway-client/Cargo.toml +++ b/common/client-libs/gateway-client/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" # TODO: (for this and other crates), similarly to 'tokio', import only required "futures" modules rather than # the entire crate futures = "0.3" -log = "0.4" +log = { workspace = true } thiserror = "1.0" url = "2.2" rand = { version = "0.7.3", features = ["wasm-bindgen"] } diff --git a/common/client-libs/mixnet-client/Cargo.toml b/common/client-libs/mixnet-client/Cargo.toml index ad13e51e50..c64da7db48 100644 --- a/common/client-libs/mixnet-client/Cargo.toml +++ b/common/client-libs/mixnet-client/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] futures = "0.3" -log = "0.4.8" +log = { workspace = true } tokio = { version = "1.24.1", features = ["time", "net", "rt"] } tokio-util = { version = "0.7.4", features = ["codec"] } diff --git a/common/client-libs/validator-client/Cargo.toml b/common/client-libs/validator-client/Cargo.toml index 14c1faceec..8b64ae3621 100644 --- a/common/client-libs/validator-client/Cargo.toml +++ b/common/client-libs/validator-client/Cargo.toml @@ -22,7 +22,7 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" reqwest = { version = "0.11", features = ["json"] } thiserror = "1" -log = "0.4" +log = { workspace = true } url = { version = "2.2", features = ["serde"] } tokio = { version = "1.24.1", features = ["sync", "time"] } futures = "0.3" diff --git a/common/commands/Cargo.toml b/common/commands/Cargo.toml index 084f3956cd..e8d9180b06 100644 --- a/common/commands/Cargo.toml +++ b/common/commands/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nym-cli-commands" version = "1.0.0" -authors = ["Nym Technologies SA"] +authors.workspace = true edition = "2021" [dependencies] @@ -15,7 +15,7 @@ cw-utils = { version = "0.13.4" } handlebars = "3.0.1" humantime-serde = "1.0" k256 = { version = "0.10", features = ["ecdsa", "sha256"] } -log = "0.4" +log = { workspace = true } rand = {version = "0.6", features = ["std"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1" diff --git a/common/config/Cargo.toml b/common/config/Cargo.toml index c0db6fe9e4..167286538e 100644 --- a/common/config/Cargo.toml +++ b/common/config/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] cfg-if = "1.0.0" handlebars = "3.0.1" -log = "0.4" +log = { workspace = true } serde = { version = "1.0", features = ["derive"] } toml = "0.5.6" url = "2.2" diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml index 1f3e72af8a..1cc5118582 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml @@ -19,7 +19,7 @@ serde_json = "1.0.0" humantime-serde = "1.1.1" # TO CHECK WHETHER STILL NEEDED: -log = "0.4.14" +log = { workspace = true } time = { version = "0.3.6", features = ["parsing", "formatting"] } ts-rs = { version = "6.1.2", optional = true } diff --git a/common/credential-storage/Cargo.toml b/common/credential-storage/Cargo.toml index 06939652bf..0c10ef7535 100644 --- a/common/credential-storage/Cargo.toml +++ b/common/credential-storage/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] async-trait = { version = "0.1.51" } -log = "0.4" +log = { workspace = true } sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"]} thiserror = "1.0" tokio = { version = "1.24.1", features = [ "rt-multi-thread", "net", "signal", "fs" ] } diff --git a/common/inclusion-probability/Cargo.toml b/common/inclusion-probability/Cargo.toml index 73eedb75a0..d6cd2dae19 100644 --- a/common/inclusion-probability/Cargo.toml +++ b/common/inclusion-probability/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -log = "0.4.17" +log = { workspace = true } rand = "0.8.5" thiserror = "1.0.32" diff --git a/common/logging/Cargo.toml b/common/logging/Cargo.toml index c0e2159864..491caa6b74 100644 --- a/common/logging/Cargo.toml +++ b/common/logging/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -log = "0.4.0" +log = { workspace = true } pretty_env_logger = "0.4.0" diff --git a/common/mixnode-common/Cargo.toml b/common/mixnode-common/Cargo.toml index 6d2c561e29..04d225fac9 100644 --- a/common/mixnode-common/Cargo.toml +++ b/common/mixnode-common/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" bytes = "1.0" futures = "0.3" humantime-serde = "1.0" -log = "0.4" +log = { workspace = true } rand = "0.8" serde = { version = "1.0", features = ["derive"] } tokio = { version = "1.24.1", features = ["time", "macros", "rt", "net", "io-util"] } diff --git a/common/nymsphinx/chunking/Cargo.toml b/common/nymsphinx/chunking/Cargo.toml index 3d6bacab61..42b0bfdf7d 100644 --- a/common/nymsphinx/chunking/Cargo.toml +++ b/common/nymsphinx/chunking/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -log = "0.4.8" +log = { workspace = true } rand = { version = "0.7.3", features = ["wasm-bindgen"] } thiserror = "1.0.37" diff --git a/common/socks5/ordered-buffer/Cargo.toml b/common/socks5/ordered-buffer/Cargo.toml index 58dd09b263..d7207eaf9c 100644 --- a/common/socks5/ordered-buffer/Cargo.toml +++ b/common/socks5/ordered-buffer/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -log = "0.4" +log = { workspace = true } thiserror = "1.0.37" \ No newline at end of file diff --git a/common/socks5/proxy-helpers/Cargo.toml b/common/socks5/proxy-helpers/Cargo.toml index f31915c8e6..cfe89a0f12 100644 --- a/common/socks5/proxy-helpers/Cargo.toml +++ b/common/socks5/proxy-helpers/Cargo.toml @@ -13,7 +13,7 @@ tokio-util = { version = "0.7.4", features = [ "io" ] } # reason for getting thi # their `read_buf` [from the util crate] replacement rather than having to rethink/reimplement `AvailableReader` with the new AsyncRead trait definition. # In the long run, the dependency should probably get removed in favour of pure-tokio implementation, but for time being it's fine. futures = "0.3" -log = "0.4" +log = { workspace = true } # internal client-connections = { path = "../../client-connections" } diff --git a/common/statistics/Cargo.toml b/common/statistics/Cargo.toml index 483a4acd11..65004dbc40 100644 --- a/common/statistics/Cargo.toml +++ b/common/statistics/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] async-trait = { version = "0.1.51" } -log = "0.4" +log = { workspace = true } reqwest = { version = "0.11", features = ["json"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1" diff --git a/common/task/Cargo.toml b/common/task/Cargo.toml index 800f1c2362..ab822e9341 100644 --- a/common/task/Cargo.toml +++ b/common/task/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] futures = "0.3" -log = "0.4" +log = { workspace = true } thiserror = "1.0.37" tokio = { version = "1.24.1", features = ["macros", "sync"] } diff --git a/common/topology/Cargo.toml b/common/topology/Cargo.toml index 2996aeb639..42480168cc 100644 --- a/common/topology/Cargo.toml +++ b/common/topology/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] bs58 = "0.4" -log = "0.4" +log = { workspace = true } rand = { version = "0.7.3", features = ["wasm-bindgen"] } thiserror = "1.0.37" diff --git a/common/types/Cargo.toml b/common/types/Cargo.toml index 798303d9a8..04030da607 100644 --- a/common/types/Cargo.toml +++ b/common/types/Cargo.toml @@ -2,13 +2,13 @@ name = "nym-types" version = "1.0.0" description = "Nym common types" -authors = ["Nym Technologies SA"] +authors.workspace = true edition = "2021" rust-version = "1.58" [dependencies] eyre = "0.6.5" -log = "0.4" +log = { workspace = true } itertools = "0.10" reqwest = "0.11.9" schemars = "0.8" diff --git a/explorer-api/Cargo.toml b/explorer-api/Cargo.toml index eb4b6ac83f..279ee16910 100644 --- a/explorer-api/Cargo.toml +++ b/explorer-api/Cargo.toml @@ -11,7 +11,7 @@ clap = { version = "4.0", features = ["cargo", "derive"] } humantime-serde = "1.0" isocountry = "0.3.2" itertools = "0.10.3" -log = "0.4.0" +log = { workspace = true } okapi = { version = "0.7.0-rc.1", features = ["impl_json_schema"] } pretty_env_logger = "0.4.0" reqwest = "0.11.4" diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index bc76a5ff11..97a1617c63 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -27,7 +27,7 @@ dotenv = "0.15.0" futures = "0.3" humantime-serde = "1.0.1" lazy_static = "1.4.0" -log = "0.4" +log = { workspace = true } once_cell = "1.7.2" pretty_env_logger = "0.4" rand = "0.7" diff --git a/gateway/gateway-requests/Cargo.toml b/gateway/gateway-requests/Cargo.toml index 9501755306..68b20112fb 100644 --- a/gateway/gateway-requests/Cargo.toml +++ b/gateway/gateway-requests/Cargo.toml @@ -12,7 +12,7 @@ edition = "2021" [dependencies] bs58 = "0.4.0" futures = "0.3.15" -log = "0.4.14" +log = { workspace = true } nymsphinx = { path = "../../common/nymsphinx" } rand = { version = "0.7.3", features = ["wasm-bindgen"] } serde = { version = "1.0", features = ["derive"] } diff --git a/mixnode/Cargo.toml b/mixnode/Cargo.toml index da0b3ae901..b0841f5648 100644 --- a/mixnode/Cargo.toml +++ b/mixnode/Cargo.toml @@ -26,7 +26,7 @@ dotenv = "0.15.0" futures = "0.3.0" humantime-serde = "1.0" lazy_static = "1.4.0" -log = "0.4.0" +log = { workspace = true } pretty_env_logger = "0.4.0" rand = "0.7.3" rocket = { version = "0.5.0-rc.2", features = ["json"] } diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index 9f320ad30e..931f536539 100644 --- a/nym-api/Cargo.toml +++ b/nym-api/Cargo.toml @@ -26,7 +26,7 @@ dotenv = "0.15.0" futures = "0.3.24" humantime-serde = "1.0" lazy_static = "1.4.0" -log = "0.4.17" +log = { workspace = true } pin-project = "1.0" pretty_env_logger = "0.4.0" rand = "0.8.5" diff --git a/sdk/rust/nym-sdk/Cargo.toml b/sdk/rust/nym-sdk/Cargo.toml index 13abe47233..ac7ce86ad1 100644 --- a/sdk/rust/nym-sdk/Cargo.toml +++ b/sdk/rust/nym-sdk/Cargo.toml @@ -16,7 +16,7 @@ nymsphinx = { path = "../../../common/nymsphinx" } task = { path = "../../../common/task" } futures = "0.3" -log = "0.4" +log = { workspace = true } rand = { version = "0.7.3" } tap = "1.0.1" thiserror = "1.0.38" diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index 24e4d62d24..230867265c 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -16,7 +16,7 @@ clap = {version = "4.0", features = ["derive"]} dirs = "4.0" futures = "0.3.24" ipnetwork = "0.20.0" -log = "0.4.17" +log = { workspace = true } pretty_env_logger = "0.4.0" publicsuffix = "1.5" # Can't update this until bip updates to support newer idna version rand = "0.7.3" diff --git a/service-providers/network-statistics/Cargo.toml b/service-providers/network-statistics/Cargo.toml index f5a6f48d73..03f78286b3 100644 --- a/service-providers/network-statistics/Cargo.toml +++ b/service-providers/network-statistics/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] dirs = "4.0" -log = "0.4" +log = { workspace = true } pretty_env_logger = "0.4" rocket = { version = "0.5.0-rc.2", features = ["json"] } serde = { version = "1.0", features = ["derive"] } diff --git a/tools/nym-cli/Cargo.toml b/tools/nym-cli/Cargo.toml index 9c16634723..a1dfd62ea4 100644 --- a/tools/nym-cli/Cargo.toml +++ b/tools/nym-cli/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nym-cli" version = "1.1.6" -authors = ["Nym Technologies SA"] +authors.workspace = true edition = "2021" [dependencies] @@ -11,7 +11,7 @@ clap = { version = "4.0", features = ["derive"] } clap_complete = "4.0" clap_complete_fig = "4.0" dotenv = "0.15.0" -log = "0.4" +log = { workspace = true } pretty_env_logger = "0.4" serde = { version = "1", features = ["derive"] } serde_json = "1"