diff --git a/Cargo.lock b/Cargo.lock index 4f4f55ef0dd08..68a00cf70363e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -116,7 +116,7 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tower", "tracing", "webpki", @@ -3108,7 +3108,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", ] @@ -3721,7 +3721,7 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", "webpki-roots", ] @@ -3861,7 +3861,7 @@ dependencies = [ "soketto", "tokio", "tokio-stream", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", "tracing-futures", ] @@ -4886,7 +4886,7 @@ dependencies = [ [[package]] name = "msim" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=7d2bb66f4310f23b14ea6f1df2dab0a1d84af1f2#7d2bb66f4310f23b14ea6f1df2dab0a1d84af1f2" +source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=86ce6eaf4bf03288ba339b464ddb15d9a26bb001#86ce6eaf4bf03288ba339b464ddb15d9a26bb001" dependencies = [ "ahash", "async-task", @@ -4906,7 +4906,7 @@ dependencies = [ "real_tokio", "serde 1.0.147", "socket2", - "tokio-util 0.7.3", + "tokio-util 0.7.4 (git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=bb463863b8155543731bdf7850057c083cf1b427)", "toml", "tracing", "tracing-subscriber 0.3.15", @@ -4915,7 +4915,7 @@ dependencies = [ [[package]] name = "msim-macros" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=7d2bb66f4310f23b14ea6f1df2dab0a1d84af1f2#7d2bb66f4310f23b14ea6f1df2dab0a1d84af1f2" +source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=86ce6eaf4bf03288ba339b464ddb15d9a26bb001#86ce6eaf4bf03288ba339b464ddb15d9a26bb001" dependencies = [ "darling", "proc-macro2 1.0.47", @@ -5240,7 +5240,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tonic 0.8.2", "tracing", "typed-store", @@ -5273,7 +5273,7 @@ dependencies = [ "sui-metrics", "thiserror", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tonic 0.8.2", "tower", "tracing", @@ -5322,7 +5322,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", "tracing-log", "tracing-subscriber 0.3.15", @@ -5379,7 +5379,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tonic 0.8.2", "tower", "tracing", @@ -5402,7 +5402,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tonic 0.8.2", "tracing", "typed-store", @@ -5443,7 +5443,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tonic 0.8.2", "tower", "tracing", @@ -5489,7 +5489,7 @@ dependencies = [ "signature", "thiserror", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tonic 0.8.2", "tonic-build 0.8.2", "tracing", @@ -5533,7 +5533,7 @@ dependencies = [ "tempfile", "tokio", "tokio-stream", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tonic 0.8.2", "tower", "tracing", @@ -7105,8 +7105,8 @@ dependencies = [ [[package]] name = "real_tokio" -version = "1.21.2" -source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=53fa543dd930cc5177783ff2b865e8ef1eab64e4#53fa543dd930cc5177783ff2b865e8ef1eab64e4" +version = "1.22.0" +source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=bb463863b8155543731bdf7850057c083cf1b427#bb463863b8155543731bdf7850057c083cf1b427" dependencies = [ "autocfg", "bytes", @@ -7118,7 +7118,7 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "socket2", - "tokio-macros 1.8.0 (git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=53fa543dd930cc5177783ff2b865e8ef1eab64e4)", + "tokio-macros 1.8.0 (git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=bb463863b8155543731bdf7850057c083cf1b427)", "winapi", ] @@ -8434,7 +8434,7 @@ dependencies = [ "tempfile", "test-utils", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", "tracing-subscriber 0.3.15", "workspace-hack", @@ -9773,9 +9773,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.21.2" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" dependencies = [ "autocfg", "bytes", @@ -9816,7 +9816,7 @@ dependencies = [ [[package]] name = "tokio-macros" version = "1.8.0" -source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=53fa543dd930cc5177783ff2b865e8ef1eab64e4#53fa543dd930cc5177783ff2b865e8ef1eab64e4" +source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=bb463863b8155543731bdf7850057c083cf1b427#bb463863b8155543731bdf7850057c083cf1b427" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", @@ -9864,38 +9864,38 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-util" -version = "0.7.3" -source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=53fa543dd930cc5177783ff2b865e8ef1eab64e4#53fa543dd930cc5177783ff2b865e8ef1eab64e4" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", - "futures-util", - "hashbrown 0.12.3", "pin-project-lite", - "real_tokio", - "slab", + "tokio", "tracing", ] [[package]] name = "tokio-util" version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=bb463863b8155543731bdf7850057c083cf1b427#bb463863b8155543731bdf7850057c083cf1b427" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", + "futures-util", + "hashbrown 0.12.3", "pin-project-lite", - "tokio", + "real_tokio", + "slab", "tracing", ] @@ -9945,7 +9945,7 @@ dependencies = [ "prost-derive 0.10.1", "tokio", "tokio-stream", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tower", "tower-layer", "tower-service", @@ -9979,7 +9979,7 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-stream", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tower", "tower-layer", "tower-service", @@ -10070,7 +10070,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "tower-layer", "tower-service", "tracing", @@ -11655,7 +11655,7 @@ dependencies = [ "tokio-retry", "tokio-rustls", "tokio-stream", - "tokio-util 0.7.4", + "tokio-util 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "toml", "toml_edit", "tonic 0.7.2", diff --git a/Cargo.toml b/Cargo.toml index 23ae4ac915817..7a643f9480ccc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -96,6 +96,8 @@ opt-level = 1 # Dependencies that should be kept in sync through the whole workspace [workspace.dependencies] +tokio = "1.22.0" + # Move dependencies move-binary-format = { git = "https://github.com/move-language/move", rev = "0800fc79a98ca304bd449878f545cdcaff6f94bb" } move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "0800fc79a98ca304bd449878f545cdcaff6f94bb" } diff --git a/crates/component/Cargo.toml b/crates/component/Cargo.toml index a28182947e945..994d9fd73300f 100644 --- a/crates/component/Cargo.toml +++ b/crates/component/Cargo.toml @@ -12,5 +12,5 @@ publish = false [dependencies] async-trait = "0.1.56" eyre = "0.6.8" -tokio = { version = "1.21.2", features = ["sync", "macros", "rt", "rt-multi-thread"] } +tokio = { workspace = true, features = ["sync", "macros", "rt", "rt-multi-thread"] } workspace-hack.workspace = true \ No newline at end of file diff --git a/crates/mysten-network/Cargo.toml b/crates/mysten-network/Cargo.toml index 9f16292f116ea..4effcac7a9e4e 100644 --- a/crates/mysten-network/Cargo.toml +++ b/crates/mysten-network/Cargo.toml @@ -15,7 +15,7 @@ futures = "0.3.21" http = "0.2.8" multiaddr = "0.16.0" serde = { version = "1.0.140", features = ["derive"] } -tokio = { version = "1.21.2", features = ["sync", "rt", "macros"] } +tokio = { workspace = true, features = ["sync", "rt", "macros"] } tokio-stream = { version = "0.1.11", features = ["net"] } tonic = { version = "0.8.2", features = ["transport"] } tonic-health = "0.7.0" diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml index 3fd7130c3bc44..d2be5b2a69888 100644 --- a/crates/sui-benchmark/Cargo.toml +++ b/crates/sui-benchmark/Cargo.toml @@ -14,7 +14,7 @@ futures = "0.3.23" serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.88" tempfile = "3.3.0" -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } strum = "0.24.1" strum_macros = "0.24.3" num_cpus = "1.13.1" diff --git a/crates/sui-cluster-test/Cargo.toml b/crates/sui-cluster-test/Cargo.toml index 584b98c2be101..22ea863efb6e1 100644 --- a/crates/sui-cluster-test/Cargo.toml +++ b/crates/sui-cluster-test/Cargo.toml @@ -11,7 +11,7 @@ serde = { version = "1.0.144", features = ["derive"] } futures = "0.3.24" serde_json = "1.0.88" tempfile = "3.3.0" -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } jsonrpsee = { version = "0.15.1", features = ["full"] } tracing = { version = "0.1.36", features = ["log"] } clap = { version = "3.1.14", features = ["derive"] } diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml index 81814dbb5ff68..ef9fbc1cdac3d 100644 --- a/crates/sui-core/Cargo.toml +++ b/crates/sui-core/Cargo.toml @@ -16,7 +16,7 @@ bytes = "1.3.0" serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.88" serde_with = "2.0.1" -tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] } +tokio = { workspace = true, features = ["full", "tracing", "test-util"] } tokio-stream = { version = "0.1.8", features = ["sync", "net"] } parking_lot = "0.12.1" async-trait = "0.1.57" diff --git a/crates/sui-cost/Cargo.toml b/crates/sui-cost/Cargo.toml index 9e48309772ffa..dcf90b3b4aa73 100644 --- a/crates/sui-cost/Cargo.toml +++ b/crates/sui-cost/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" workspace-hack.workspace = true sui-types = {path = "../sui-types"} anyhow = { version = "1.0.64", features = ["backtrace"] } -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } serde = { version = "1.0.144", features = ["derive"] } strum = { version = "0.24", features = ["derive"] } strum_macros = "0.24" diff --git a/crates/sui-faucet/Cargo.toml b/crates/sui-faucet/Cargo.toml index b07f1cb184a48..af958904412dc 100644 --- a/crates/sui-faucet/Cargo.toml +++ b/crates/sui-faucet/Cargo.toml @@ -12,7 +12,7 @@ async-trait = "0.1.57" axum = "0.5.16" clap = { version = "3.2.17", features = ["derive"] } thiserror = "1.0.34" -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } tracing = "0.1.36" serde = { version = "1.0.144", features = ["derive"] } tower = { version = "0.4.12", features = ["util", "timeout", "load-shed", "limit"] } diff --git a/crates/sui-gateway/Cargo.toml b/crates/sui-gateway/Cargo.toml index e479387bf78c7..e710b3dbca43b 100644 --- a/crates/sui-gateway/Cargo.toml +++ b/crates/sui-gateway/Cargo.toml @@ -11,7 +11,7 @@ anyhow = { version = "1.0.64", features = ["backtrace"] } async-trait = "0.1.57" serde = { version = "1.0.144", features = ["derive"] } tracing = "0.1.36" -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } futures = "0.3.23" prometheus = "0.13.3" clap = { version = "3.2.17", features = ["derive"] } diff --git a/crates/sui-indexer/Cargo.toml b/crates/sui-indexer/Cargo.toml index 78fa7ce522133..294c964de862e 100644 --- a/crates/sui-indexer/Cargo.toml +++ b/crates/sui-indexer/Cargo.toml @@ -23,7 +23,7 @@ serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.83" thiserror = "1.0.34" tracing = "0.1.36" -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } narwhal-network = { path = "../../narwhal/network" } sui = { path = "../sui" } diff --git a/crates/sui-json-rpc/Cargo.toml b/crates/sui-json-rpc/Cargo.toml index d08dae5cab8d8..d920318118b27 100644 --- a/crates/sui-json-rpc/Cargo.toml +++ b/crates/sui-json-rpc/Cargo.toml @@ -20,7 +20,7 @@ tracing = "0.1.36" async-trait = "0.1.57" serde = { version = "1.0.144", features = ["derive"] } futures = "0.3.23" -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } signature = "1.6.0" tap = "1.0" diff --git a/crates/sui-macros/Cargo.toml b/crates/sui-macros/Cargo.toml index dead5e26fa91d..82b5b5479457f 100644 --- a/crates/sui-macros/Cargo.toml +++ b/crates/sui-macros/Cargo.toml @@ -16,4 +16,4 @@ syn = "1" workspace-hack.workspace = true [target.'cfg(msim)'.dependencies] -msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "7d2bb66f4310f23b14ea6f1df2dab0a1d84af1f2", package = "msim-macros" } +msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "86ce6eaf4bf03288ba339b464ddb15d9a26bb001", package = "msim-macros" } diff --git a/crates/sui-metrics/Cargo.toml b/crates/sui-metrics/Cargo.toml index 48765a5a5461a..0f300cc5dd2b7 100644 --- a/crates/sui-metrics/Cargo.toml +++ b/crates/sui-metrics/Cargo.toml @@ -12,5 +12,5 @@ tracing = "0.1" scopeguard = "1" prometheus = "0.13" once_cell = "1" -tokio = "1" +tokio = { workspace = true } tap = "1.0" diff --git a/crates/sui-network/Cargo.toml b/crates/sui-network/Cargo.toml index b66d5f3b3405c..ab470c01cceb6 100644 --- a/crates/sui-network/Cargo.toml +++ b/crates/sui-network/Cargo.toml @@ -17,7 +17,7 @@ sui-config = { path = "../sui-config" } mysten-network.workspace = true workspace-hack.workspace = true -tokio = { version = "1.17.0", features = ["full"] } +tokio = { workspace = true, features = ["full"] } tracing = "0.1.37" futures = "0.3.24" multiaddr = "0.16.0" @@ -31,4 +31,4 @@ tonic-build = { version = "0.8.2", features = [ "transport" ] } [dev-dependencies] telemetry-subscribers.workspace = true -tokio = { version = "1.17.0", features = ["test-util"] } +tokio = { workspace = true, features = ["test-util"] } diff --git a/crates/sui-node/Cargo.toml b/crates/sui-node/Cargo.toml index ecf3191ead5e3..afac732742521 100644 --- a/crates/sui-node/Cargo.toml +++ b/crates/sui-node/Cargo.toml @@ -14,7 +14,7 @@ anyhow = { version = "1.0.64", features = ["backtrace"] } clap = { version = "3.2.17", features = ["derive"] } multiaddr = "0.16.0" prometheus = "0.13.3" -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } tracing = "0.1.36" parking_lot = "0.12.1" futures = "0.3.23" diff --git a/crates/sui-open-rpc/Cargo.toml b/crates/sui-open-rpc/Cargo.toml index d4ac7b605a22c..eda1dff79b4d8 100644 --- a/crates/sui-open-rpc/Cargo.toml +++ b/crates/sui-open-rpc/Cargo.toml @@ -16,7 +16,7 @@ workspace-hack.workspace = true anyhow = { version = "1.0.64", features = ["backtrace"] } clap = { version = "3.2.17", features = ["derive"] } pretty_assertions = "1.2.0" -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } fastcrypto = { workspace = true } sui = { path = "../sui" } sui-core = { path = "../sui-core"} diff --git a/crates/sui-rosetta/Cargo.toml b/crates/sui-rosetta/Cargo.toml index 7e58e1ae94e05..1b0b3cef9b3b1 100644 --- a/crates/sui-rosetta/Cargo.toml +++ b/crates/sui-rosetta/Cargo.toml @@ -15,7 +15,7 @@ serde = "1.0.143" serde_json = { version = "1.0.88", features = ["preserve_order"] } tower = { version = "0.4.12", features = ["util", "timeout", "load-shed", "limit"] } tower-http = { version = "0.3.4", features = ["cors"] } -tokio = "1.20.1" +tokio = { workspace = true } once_cell = "1.16" serde_with = "2.0.1" signature = "1.6.0" diff --git a/crates/sui-sdk/Cargo.toml b/crates/sui-sdk/Cargo.toml index 12cbb7053a750..2ef29d5c7e68f 100644 --- a/crates/sui-sdk/Cargo.toml +++ b/crates/sui-sdk/Cargo.toml @@ -14,7 +14,7 @@ serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.88" futures-core = "0.3.21" futures = "0.3.23" -tokio = "1.20.1" +tokio = { workspace = true } rand = "0.8.5" bcs = "0.1.4" diff --git a/crates/sui-simulator/Cargo.toml b/crates/sui-simulator/Cargo.toml index c5ab1c0f8f321..affc40d075983 100644 --- a/crates/sui-simulator/Cargo.toml +++ b/crates/sui-simulator/Cargo.toml @@ -16,4 +16,4 @@ fastcrypto = { workspace = true, features = ["copy_key"] } telemetry-subscribers.workspace = true [target.'cfg(msim)'.dependencies] -msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "7d2bb66f4310f23b14ea6f1df2dab0a1d84af1f2", package = "msim" } +msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "86ce6eaf4bf03288ba339b464ddb15d9a26bb001", package = "msim" } diff --git a/crates/sui-storage/Cargo.toml b/crates/sui-storage/Cargo.toml index dea14274757c1..bf77ec9e1a1b1 100644 --- a/crates/sui-storage/Cargo.toml +++ b/crates/sui-storage/Cargo.toml @@ -15,7 +15,7 @@ futures = "0.3.23" flexstr = "^0.9" serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.88" -tokio = { version = "1.20.1", features = ["full", "tracing"] } +tokio = { workspace = true, features = ["full", "tracing"] } tokio-stream = "^0.1" rocksdb = "0.19.0" tracing = "0.1.36" diff --git a/crates/sui-swarm/Cargo.toml b/crates/sui-swarm/Cargo.toml index 6ea6446ac2697..56bb9a479989b 100644 --- a/crates/sui-swarm/Cargo.toml +++ b/crates/sui-swarm/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" anyhow = { version = "1.0.64", features = ["backtrace"] } rand = "0.8.5" tracing = "0.1.36" -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } futures = "0.3.23" tempfile = "3.3.0" tonic-health = "0.7.0" diff --git a/crates/sui-telemetry/Cargo.toml b/crates/sui-telemetry/Cargo.toml index 33bb6ed3961c7..1fd2f8e17c1e4 100644 --- a/crates/sui-telemetry/Cargo.toml +++ b/crates/sui-telemetry/Cargo.toml @@ -9,6 +9,6 @@ edition = "2021" [dependencies] serde = { version = "1.0.144", features = ["derive"] } reqwest = { version = "0.11.10", features = ["json"] } -tokio = { version = "1.17.0", features = ["full", "tracing"] } +tokio = { workspace = true, features = ["full", "tracing"] } tracing = "0.1.36" workspace-hack.workspace = true diff --git a/crates/sui-test-validator/Cargo.toml b/crates/sui-test-validator/Cargo.toml index b1ea75e345de7..31573f804726c 100644 --- a/crates/sui-test-validator/Cargo.toml +++ b/crates/sui-test-validator/Cargo.toml @@ -11,7 +11,7 @@ anyhow = { version = "1.0.64", features = ["backtrace"] } clap = { version = "3.2.17", features = ["derive"] } serde = "1.0.141" serde_json = "1.0.88" -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } axum = "0.5.16" tower = { version = "0.4.12", features = ["util", "timeout", "load-shed", "limit"] } tower-http = { version = "0.3.4", features = ["cors"] } diff --git a/crates/sui-tool/Cargo.toml b/crates/sui-tool/Cargo.toml index e9bbf7c66faf6..2fb4b2f3bc7ad 100644 --- a/crates/sui-tool/Cargo.toml +++ b/crates/sui-tool/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] anyhow = { version = "1.0.64", features = ["backtrace"] } -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } tracing = "0.1.36" clap = { version = "3.2.17", features = ["derive"] } diff --git a/crates/sui/Cargo.toml b/crates/sui/Cargo.toml index f06e929a0d922..3c05c90ab2fe4 100644 --- a/crates/sui/Cargo.toml +++ b/crates/sui/Cargo.toml @@ -13,7 +13,7 @@ serde_json = "1.0.88" serde_yaml = "0.8.26" signature = "1.6.0" camino = "1.1.1" -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } async-trait = "0.1.57" serde_with = { version = "2.0.1", features = ["hex"] } tracing = "0.1.36" diff --git a/crates/telemetry-subscribers/Cargo.toml b/crates/telemetry-subscribers/Cargo.toml index fc270534da207..c5210a32bc233 100644 --- a/crates/telemetry-subscribers/Cargo.toml +++ b/crates/telemetry-subscribers/Cargo.toml @@ -15,7 +15,7 @@ once_cell = "1.13.0" opentelemetry = { version = "0.18.0", features = ["rt-tokio"], optional = true } opentelemetry-jaeger = { version = "0.17.0", features = ["rt-tokio"], optional = true } prometheus = "0.13.3" -tokio = { version = "1.21.2", features = ["sync", "macros", "rt", "rt-multi-thread"] } +tokio = { workspace = true, features = ["sync", "macros", "rt", "rt-multi-thread"] } tracing = "0.1.37" tracing-appender = "0.2.2" tracing-bunyan-formatter = "0.3.3" diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml index 111756b594448..14a2309f41327 100644 --- a/crates/test-utils/Cargo.toml +++ b/crates/test-utils/Cargo.toml @@ -16,7 +16,7 @@ bcs = "0.1.4" jsonrpsee-http-client = "0.15.1" jsonrpsee = { version = "0.15.1", features = ["full"] } prometheus = "0.13.3" -tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] } +tokio = { workspace = true, features = ["full", "tracing", "test-util"] } serde_json = "1.0.88" rand = "0.8.5" sui = { path = "../sui" } diff --git a/crates/typed-store-derive/Cargo.toml b/crates/typed-store-derive/Cargo.toml index 3defb005e144f..0922603719fd7 100644 --- a/crates/typed-store-derive/Cargo.toml +++ b/crates/typed-store-derive/Cargo.toml @@ -22,4 +22,4 @@ eyre = "0.6.8" rocksdb = { version = "0.19.0", features = ["snappy", "lz4", "zstd", "zlib", "multi-threaded-cf"], default-features = false } tempfile = "3.3.0" typed-store = { path = "../typed-store" } -tokio = { version = "1.21.2", features = ["test-util"] } +tokio = { workspace = true, features = ["test-util"] } diff --git a/crates/typed-store/Cargo.toml b/crates/typed-store/Cargo.toml index 93b712be11855..d66a8c1ef8940 100644 --- a/crates/typed-store/Cargo.toml +++ b/crates/typed-store/Cargo.toml @@ -21,7 +21,7 @@ prometheus = "0.13.3" rocksdb = { version = "0.19.0", features = ["snappy", "lz4", "zstd", "zlib", "multi-threaded-cf"], default-features = false } serde = { version = "1.0.140", features = ["derive"] } thiserror = "1.0.37" -tokio = { version = "1.21.2", features = ["full", "test-util"] } +tokio = { workspace = true, features = ["full", "test-util"] } tracing = "0.1.37" workspace-hack.workspace = true diff --git a/narwhal/consensus/Cargo.toml b/narwhal/consensus/Cargo.toml index bbcab48e3d122..084f678e4e5e2 100644 --- a/narwhal/consensus/Cargo.toml +++ b/narwhal/consensus/Cargo.toml @@ -14,7 +14,7 @@ match_opt = "0.1.2" rand = { version = "0.8.5", optional = true } serde = { version = "1.0.144", features = ["derive"] } thiserror = "1.0.35" -tokio = { version = "1.20.1", features = ["sync"] } +tokio = { workspace = true, features = ["sync"] } tracing = "0.1.36" config = { path = "../config", package = "narwhal-config" } diff --git a/narwhal/crypto/Cargo.toml b/narwhal/crypto/Cargo.toml index 1cc0d8c6b5e0a..f6d9d96ff4b73 100644 --- a/narwhal/crypto/Cargo.toml +++ b/narwhal/crypto/Cargo.toml @@ -15,7 +15,7 @@ rand = { version = "0.8.5", features = ["std"] } serde = { version = "1.0.144", features = ["derive"] } serde_bytes = "0.11.7" serde_with = "2.0.1" -tokio = { version = "1.20.1", features = ["sync", "rt", "macros"] } +tokio = { workspace = true, features = ["sync", "rt", "macros"] } zeroize = "1.5.7" merlin = "3.0.0" once_cell = "1.16" diff --git a/narwhal/examples/Cargo.toml b/narwhal/examples/Cargo.toml index 5b9d7348ab61c..b3b7012396596 100644 --- a/narwhal/examples/Cargo.toml +++ b/narwhal/examples/Cargo.toml @@ -14,7 +14,7 @@ path = "src/demo_client.rs" base64 = "0.13.0" clap = "2.34" prost = "0.11.0" -tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tonic = "0.8.2" workspace-hack.workspace = true diff --git a/narwhal/executor/Cargo.toml b/narwhal/executor/Cargo.toml index a14ad608f5786..21af9409cf630 100644 --- a/narwhal/executor/Cargo.toml +++ b/narwhal/executor/Cargo.toml @@ -18,7 +18,7 @@ multiaddr = "0.16.0" primary = { path = "../primary", package = "narwhal-primary" } serde = { version = "1.0.144", features = ["derive"] } thiserror = "1.0.35" -tokio = { version = "1.20.1", features = ["sync"] } +tokio = { workspace = true, features = ["sync"] } tokio-util = { version = "0.7.4", features = ["codec"] } tonic = "0.8.2" tracing = "0.1.36" diff --git a/narwhal/network/Cargo.toml b/narwhal/network/Cargo.toml index cea84373711d6..9a8615e34fb3d 100644 --- a/narwhal/network/Cargo.toml +++ b/narwhal/network/Cargo.toml @@ -16,7 +16,7 @@ multiaddr = "0.16.0" prometheus = "0.13.3" rand = { version = "0.8.5", features = ["small_rng"] } thiserror = "1.0.35" -tokio = { version = "1.20.1", features = ["rt", "net", "sync", "macros", "time"] } +tokio = { workspace = true, features = ["rt", "net", "sync", "macros", "time"] } tokio-util = { version = "0.7.4", features = ["codec"] } tonic = { version = "0.8.2", features = ["tls"] } tracing = "0.1.36" diff --git a/narwhal/node/Cargo.toml b/narwhal/node/Cargo.toml index d20fa32593529..6b22da576e45f 100644 --- a/narwhal/node/Cargo.toml +++ b/narwhal/node/Cargo.toml @@ -18,7 +18,7 @@ futures = "0.3.24" multiaddr = "0.16.0" rand = "0.8.5" thiserror = "1.0.35" -tokio = { version = "1.20.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } tokio-stream = "0.1.10" tokio-util = { version = "0.7.4", features = ["codec"] } tracing = "0.1.36" diff --git a/narwhal/primary/Cargo.toml b/narwhal/primary/Cargo.toml index 8c41cea9fcb0c..76a39b7c5381b 100644 --- a/narwhal/primary/Cargo.toml +++ b/narwhal/primary/Cargo.toml @@ -29,7 +29,7 @@ rand = { version = "0.8.5", features = ["small_rng"] } roaring = "0.10.1" serde = { version = "1.0.144", features = ["derive"] } thiserror = "1.0.35" -tokio = { version = "1.20.1", features = ["sync", "rt", "macros", "time", "test-util"] } +tokio = { workspace = true, features = ["sync", "rt", "macros", "time", "test-util"] } tokio-util = { version = "0.7.4", features = ["codec"] } tonic = "0.8.2" tower = { version = "0.4.13", features = ["full"] } diff --git a/narwhal/storage/Cargo.toml b/narwhal/storage/Cargo.toml index a960dec3d0170..20caff1ed886f 100644 --- a/narwhal/storage/Cargo.toml +++ b/narwhal/storage/Cargo.toml @@ -13,7 +13,7 @@ dashmap = "5.4.0" fastcrypto.workspace = true futures = "0.3.24" thiserror = "1.0.35" -tokio = { version = "1.20.1", features = ["sync", "rt", "macros"] } +tokio = { workspace = true, features = ["sync", "rt", "macros"] } tokio-util = { version = "0.7.4", features = ["codec"] } tonic = { version = "0.8.2", features = ["tls"] } tracing = "0.1.36" diff --git a/narwhal/test-utils/Cargo.toml b/narwhal/test-utils/Cargo.toml index f6a23acdf024b..831c8b4006f5f 100644 --- a/narwhal/test-utils/Cargo.toml +++ b/narwhal/test-utils/Cargo.toml @@ -22,7 +22,7 @@ rand = "0.8.5" serde = { version = "1.0.144", features = ["derive"] } tempfile = "3.3.0" thiserror = "1.0.35" -tokio = { version = "1.20.1", features = ["sync", "rt", "macros"] } +tokio = { workspace = true, features = ["sync", "rt", "macros"] } tokio-util = { version = "0.7.4", features = ["codec"] } tonic = "0.8.2" tracing = "0.1.36" diff --git a/narwhal/types/Cargo.toml b/narwhal/types/Cargo.toml index c70182f2992e4..cf0f3db671bb7 100644 --- a/narwhal/types/Cargo.toml +++ b/narwhal/types/Cargo.toml @@ -26,7 +26,7 @@ serde = { version = "1.0.144", features = ["derive"] } serde_with = "2.0.1" signature = "1.6.1" thiserror = "1.0.35" -tokio = { version = "1.20.1", features = ["sync", "rt", "macros"] } +tokio = { workspace = true, features = ["sync", "rt", "macros"] } tokio-util = { version = "0.7.4", features = ["codec"] } tonic = { version = "0.8.2", features = ["tls"] } tracing = "0.1.36" diff --git a/narwhal/worker/Cargo.toml b/narwhal/worker/Cargo.toml index 8e94f469d7c64..b3b807899a93b 100644 --- a/narwhal/worker/Cargo.toml +++ b/narwhal/worker/Cargo.toml @@ -16,7 +16,7 @@ multiaddr = "0.16.0" rand = { version = "0.8.5", features = ["small_rng"] } serde = { version = "1.0.144", features = ["derive"] } tap = "1.0.1" -tokio = { version = "1.20.1", features = ["sync", "rt", "macros"] } +tokio = { workspace = true, features = ["sync", "rt", "macros"] } tokio-stream = "0.1.10" tokio-util = { version = "0.7.4", features = ["codec"] } tonic = "0.8.2" diff --git a/scripts/simtest/cargo-simtest b/scripts/simtest/cargo-simtest index c3f79f5d0dbcd..f03af814aed35 100755 --- a/scripts/simtest/cargo-simtest +++ b/scripts/simtest/cargo-simtest @@ -58,7 +58,7 @@ if [ -n "$LOCAL_MSIM_PATH" ]; then else cargo_patch_args+=( --config 'patch.crates-io.tokio.git = "https://github.com/MystenLabs/mysten-sim.git"' - --config 'patch.crates-io.tokio.rev = "7d2bb66f4310f23b14ea6f1df2dab0a1d84af1f2"' + --config 'patch.crates-io.tokio.rev = "86ce6eaf4bf03288ba339b464ddb15d9a26bb001"' ) fi