From 6f649880060c2d1da5d857de608021388eb5c67c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Garillot?= Date: Tue, 16 Aug 2022 17:11:21 -0400 Subject: [PATCH] chore(deps): Update the Narwhal pointer Updates the NW pointer to https://github.com/MystenLabs/narwhal/pull/804 --- Cargo.lock | 223 ++++++++++++++++++++++--------- crates/sui-benchmark/Cargo.toml | 2 +- crates/sui-config/Cargo.toml | 4 +- crates/sui-core/Cargo.toml | 12 +- crates/sui-framework/Cargo.toml | 2 +- crates/sui-tool/Cargo.toml | 2 +- crates/sui-types/Cargo.toml | 4 +- crates/sui/Cargo.toml | 2 +- crates/workspace-hack/Cargo.toml | 66 +++++---- 9 files changed, 210 insertions(+), 107 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a698e977e8f13..e3ee6fb6755c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1001,16 +1001,17 @@ dependencies = [ [[package]] name = "config" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2#24353f2f1c5df27a8f1b693d78285faf506e36a2" +source = "git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40#4deb0684df6935281bb781adbefcd76b8cec6c40" dependencies = [ "arc-swap", "crypto", "multiaddr", + "rand 0.7.3", "serde 1.0.143", "serde_json", "thiserror", "tracing", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40)", ] [[package]] @@ -1032,12 +1033,13 @@ dependencies = [ [[package]] name = "consensus" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2#24353f2f1c5df27a8f1b693d78285faf506e36a2" +source = "git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40#4deb0684df6935281bb781adbefcd76b8cec6c40" dependencies = [ "arc-swap", "bincode", "blake2", "bytes", + "cfg-if 1.0.0", "config 0.1.0", "crypto", "dag", @@ -1048,9 +1050,9 @@ dependencies = [ "thiserror", "tokio", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40)", ] [[package]] @@ -1296,6 +1298,22 @@ dependencies = [ "winapi", ] +[[package]] +name = "crossterm" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +dependencies = [ + "bitflags", + "crossterm_winapi 0.9.0", + "libc", + "mio 0.8.3", + "parking_lot 0.12.1", + "signal-hook", + "signal-hook-mio", + "winapi", +] + [[package]] name = "crossterm_winapi" version = "0.8.0" @@ -1317,7 +1335,7 @@ dependencies = [ [[package]] name = "crypto" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2#24353f2f1c5df27a8f1b693d78285faf506e36a2" +source = "git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40#4deb0684df6935281bb781adbefcd76b8cec6c40" dependencies = [ "base64ct", "blake2", @@ -1335,7 +1353,7 @@ dependencies = [ "serde_with 2.0.0", "signature", "tokio", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40)", "zeroize", ] @@ -1434,7 +1452,7 @@ dependencies = [ [[package]] name = "dag" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2#24353f2f1c5df27a8f1b693d78285faf506e36a2" +source = "git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40#4deb0684df6935281bb781adbefcd76b8cec6c40" dependencies = [ "arc-swap", "crypto", @@ -1445,7 +1463,7 @@ dependencies = [ "rayon", "serde 1.0.143", "thiserror", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40)", ] [[package]] @@ -1958,9 +1976,10 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "executor" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2#24353f2f1c5df27a8f1b693d78285faf506e36a2" +source = "git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40#4deb0684df6935281bb781adbefcd76b8cec6c40" dependencies = [ "async-trait", + "backoff", "bincode", "blake2", "bytes", @@ -1970,7 +1989,7 @@ dependencies = [ "futures", "match_opt", "multiaddr", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "primary", "prometheus", "serde 1.0.143", @@ -1979,10 +1998,9 @@ dependencies = [ "tokio-util", "tonic", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "types", - "worker", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40)", ] [[package]] @@ -4149,6 +4167,27 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +[[package]] +name = "mysten-network" +version = "0.1.0" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab#8d090689be14078f2ca41c356e7bbc0af21f73ab" +dependencies = [ + "bincode", + "bytes", + "eyre", + "futures", + "http", + "multiaddr", + "serde 1.0.143", + "tokio", + "tokio-stream", + "tonic", + "tonic-health", + "tower", + "tower-http", + "tracing", +] + [[package]] name = "mysten-network" version = "0.1.0" @@ -4221,7 +4260,7 @@ checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e" [[package]] name = "network" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2#24353f2f1c5df27a8f1b693d78285faf506e36a2" +source = "git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40#4deb0684df6935281bb781adbefcd76b8cec6c40" dependencies = [ "async-trait", "backoff", @@ -4230,7 +4269,7 @@ dependencies = [ "eyre", "futures", "multiaddr", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "prometheus", "rand 0.7.3", "serde 1.0.143", @@ -4240,7 +4279,7 @@ dependencies = [ "tonic", "tracing", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40)", ] [[package]] @@ -4299,7 +4338,7 @@ dependencies = [ [[package]] name = "node" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2#24353f2f1c5df27a8f1b693d78285faf506e36a2" +source = "git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40#4deb0684df6935281bb781adbefcd76b8cec6c40" dependencies = [ "arc-swap", "async-trait", @@ -4315,12 +4354,13 @@ dependencies = [ "eyre", "futures", "multiaddr", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "network", "primary", "prometheus", "rand 0.7.3", - "telemetry-subscribers", + "task-group", + "telemetry-subscribers 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "thiserror", "tokio", "tokio-stream", @@ -4328,11 +4368,11 @@ dependencies = [ "tracing", "tracing-log", "tracing-subscriber 0.3.15", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "types", "url", "worker", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40)", ] [[package]] @@ -5070,7 +5110,7 @@ dependencies = [ [[package]] name = "primary" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2#24353f2f1c5df27a8f1b693d78285faf506e36a2" +source = "git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40#4deb0684df6935281bb781adbefcd76b8cec6c40" dependencies = [ "async-recursion", "async-trait", @@ -5086,22 +5126,23 @@ dependencies = [ "futures", "itertools", "multiaddr", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "network", "once_cell", "prometheus", "prost", "rand 0.7.3", "serde 1.0.143", + "tap", "thiserror", "tokio", "tokio-util", "tonic", "tower", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40)", ] [[package]] @@ -6788,12 +6829,12 @@ dependencies = [ "sui-sdk", "sui-swarm", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "tempfile", "test-utils", "tokio", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "typed-store-macros", "unescape", "workspace-hack 0.1.0", @@ -6859,7 +6900,7 @@ dependencies = [ "sui-quorum-driver", "sui-sdk", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "tempfile", "test-utils", "tokio", @@ -6890,7 +6931,7 @@ dependencies = [ "sui-sdk", "sui-swarm", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "tempfile", "test-utils", "tokio", @@ -6954,7 +6995,7 @@ dependencies = [ "move-package", "move-vm-runtime", "multiaddr", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "node", "once_cell", "parking_lot 0.12.1", @@ -6978,7 +7019,7 @@ dependencies = [ "sui-storage", "sui-types", "tap", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "tempfile", "test-fuzz", "test-utils", @@ -6987,7 +7028,7 @@ dependencies = [ "tokio-retry", "tokio-stream", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "typed-store-macros", "types", "workspace-hack 0.1.0", @@ -7022,7 +7063,7 @@ dependencies = [ "sui-json-rpc-types", "sui-node", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "test-utils", "thiserror", "tokio", @@ -7081,7 +7122,7 @@ dependencies = [ "clap 3.1.18", "futures", "move-package", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "prometheus", "serde 1.0.143", "sui-config", @@ -7093,7 +7134,7 @@ dependencies = [ "sui-node", "sui-sdk", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "test-utils", "tokio", "tracing", @@ -7174,7 +7215,7 @@ name = "sui-network" version = "0.0.0" dependencies = [ "async-trait", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "sui-types", "tonic", "tonic-build 0.7.2 (git+https://github.com/hyperium/tonic.git?rev=de2e4ac077c076736dc451f3415ea7da1a61a560)", @@ -7192,7 +7233,7 @@ dependencies = [ "jemalloc-ctl", "jemallocator", "multiaddr", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "parking_lot 0.12.1", "prometheus", "sui-config", @@ -7203,10 +7244,10 @@ dependencies = [ "sui-storage", "sui-telemetry", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "tokio", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "workspace-hack 0.1.0", ] @@ -7311,12 +7352,12 @@ dependencies = [ "strum", "strum_macros", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "tempfile", "tokio", "tokio-stream", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "typed-store-macros", "workspace-hack 0.1.0", ] @@ -7327,13 +7368,13 @@ version = "0.0.0" dependencies = [ "anyhow", "futures", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "rand 0.7.3", "sui-config", "sui-node", "sui-types", "tap", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "tempfile", "tokio", "tonic-health", @@ -7382,7 +7423,7 @@ dependencies = [ "colored", "executor", "futures", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "rocksdb", "serde 1.0.143", "serde_with 1.14.0", @@ -7392,12 +7433,12 @@ dependencies = [ "sui-core", "sui-storage", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "tempfile", "textwrap 0.15.0", "tokio", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "typed-store-macros", "workspace-hack 0.1.0", ] @@ -7469,7 +7510,7 @@ dependencies = [ "thiserror", "tonic", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "workspace-hack 0.1.0", "zeroize", ] @@ -7568,6 +7609,33 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "task-group" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03dd7a047b726e1f087d542b9ca71380cb77e97372a850d9d5eec620dd5ee9cf" +dependencies = [ + "tokio", +] + +[[package]] +name = "telemetry-subscribers" +version = "0.1.0" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab#8d090689be14078f2ca41c356e7bbc0af21f73ab" +dependencies = [ + "crossterm 0.25.0", + "once_cell", + "opentelemetry", + "opentelemetry-jaeger", + "tokio", + "tracing", + "tracing-appender", + "tracing-bunyan-formatter", + "tracing-chrome", + "tracing-opentelemetry", + "tracing-subscriber 0.3.15", +] + [[package]] name = "telemetry-subscribers" version = "0.1.0" @@ -8326,6 +8394,24 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae" +[[package]] +name = "typed-store" +version = "0.1.0" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab#8d090689be14078f2ca41c356e7bbc0af21f73ab" +dependencies = [ + "bincode", + "collectable", + "eyre", + "fdlimit", + "pre", + "rocksdb", + "serde 1.0.143", + "tap", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "typed-store" version = "0.1.0" @@ -8358,7 +8444,7 @@ dependencies = [ "syn 1.0.99", "tempfile", "tokio", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", ] [[package]] @@ -8370,7 +8456,7 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "types" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2#24353f2f1c5df27a8f1b693d78285faf506e36a2" +source = "git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40#4deb0684df6935281bb781adbefcd76b8cec6c40" dependencies = [ "base64", "bincode", @@ -8396,8 +8482,8 @@ dependencies = [ "tokio-util", "tonic", "tonic-build 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "typed-store", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2)", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40)", ] [[package]] @@ -8937,7 +9023,7 @@ dependencies = [ [[package]] name = "worker" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2#24353f2f1c5df27a8f1b693d78285faf506e36a2" +source = "git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40#4deb0684df6935281bb781adbefcd76b8cec6c40" dependencies = [ "async-trait", "bincode", @@ -8947,7 +9033,7 @@ dependencies = [ "crypto", "futures", "multiaddr", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "network", "primary", "prometheus", @@ -8958,9 +9044,9 @@ dependencies = [ "tonic", "tower", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40)", ] [[package]] @@ -9084,6 +9170,7 @@ dependencies = [ "crossterm 0.22.1", "crossterm 0.23.2", "crossterm 0.24.0", + "crossterm 0.25.0", "crypto", "crypto-bigint", "crypto-common", @@ -9305,7 +9392,8 @@ dependencies = [ "multihash", "multihash-derive", "multimap", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "name-variant", "named-lock", "nested", @@ -9531,7 +9619,9 @@ dependencies = [ "tap", "target-lexicon", "target-spec", - "telemetry-subscribers", + "task-group", + "telemetry-subscribers 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "tempfile", "tera", "termcolor", @@ -9590,7 +9680,8 @@ dependencies = [ "tui", "twox-hash", "typed-arena", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=f4aa523d3029bd6a23bead5f04c182f2cfa04c5e)", "typed-store-macros", "typenum", "types", @@ -9639,7 +9730,7 @@ dependencies = [ "webpki-roots", "which", "worker", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40)", "yaml-rust", "zeroize", "zeroize_derive", @@ -9649,7 +9740,7 @@ dependencies = [ [[package]] name = "workspace-hack" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=24353f2f1c5df27a8f1b693d78285faf506e36a2#24353f2f1c5df27a8f1b693d78285faf506e36a2" +source = "git+https://github.com/MystenLabs/narwhal?rev=4deb0684df6935281bb781adbefcd76b8cec6c40#4deb0684df6935281bb781adbefcd76b8cec6c40" dependencies = [ "addr2line", "adler", @@ -9725,7 +9816,7 @@ dependencies = [ "crossbeam-epoch", "crossbeam-queue", "crossbeam-utils", - "crossterm 0.24.0", + "crossterm 0.25.0", "crypto-bigint", "crypto-common", "crypto-mac", @@ -9838,7 +9929,7 @@ dependencies = [ "multihash", "multihash-derive", "multimap", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "nom 7.1.1", "normalize-line-endings", "num-bigint", @@ -9966,7 +10057,9 @@ dependencies = [ "syn 1.0.99", "sync_wrapper", "synstructure", - "telemetry-subscribers", + "tap", + "task-group", + "telemetry-subscribers 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "tempfile", "termcolor", "terminal_size", @@ -10011,7 +10104,7 @@ dependencies = [ "tracing-test", "tracing-test-macro", "try-lock", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "typenum", "ucd-trie", "unicode-bidi", diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml index 5a7d1e104849c..95d07a9a82ea5 100644 --- a/crates/sui-benchmark/Cargo.toml +++ b/crates/sui-benchmark/Cargo.toml @@ -41,7 +41,7 @@ sui-node = { path = "../sui-node" } sui-json-rpc-types = { path = "../sui-json-rpc-types" } move-core-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a", features = ["address20"] } -narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "node" } +narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "node" } workspace-hack = { path = "../workspace-hack"} test-utils = { path = "../test-utils" } diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml index 07662e66976ae..d86a2dfab2e47 100644 --- a/crates/sui-config/Cargo.toml +++ b/crates/sui-config/Cargo.toml @@ -20,8 +20,8 @@ multiaddr = "0.14.0" once_cell = "1.11.0" tracing = "0.1.36" -narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "config" } -narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "crypto" } +narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "config" } +narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "crypto" } move-binary-format = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" } move-package = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" } diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml index 0c88b64b2a2c6..3207ae2565671 100644 --- a/crates/sui-core/Cargo.toml +++ b/crates/sui-core/Cargo.toml @@ -50,12 +50,12 @@ typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa5 typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e"} mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e" } -narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "config" } -narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "consensus" } -narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "crypto", features=["copy_key"]} -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "executor" } -narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "types" } -narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "node" } +narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "config" } +narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "consensus" } +narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "crypto", features=["copy_key"]} +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "executor" } +narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "types" } +narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "node" } workspace-hack = { path = "../workspace-hack"} thiserror = "1.0.32" diff --git a/crates/sui-framework/Cargo.toml b/crates/sui-framework/Cargo.toml index 7debabc040a2d..5721a6f1c6b07 100644 --- a/crates/sui-framework/Cargo.toml +++ b/crates/sui-framework/Cargo.toml @@ -27,7 +27,7 @@ move-stdlib = { git = "https://github.com/move-language/move", rev = "7907152852 move-unit-test = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" } move-vm-runtime = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" } move-vm-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" } -narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "crypto" } +narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "crypto" } workspace-hack = { path = "../workspace-hack"} [build-dependencies] diff --git a/crates/sui-tool/Cargo.toml b/crates/sui-tool/Cargo.toml index 5dd33b3988961..4857b21814287 100644 --- a/crates/sui-tool/Cargo.toml +++ b/crates/sui-tool/Cargo.toml @@ -19,7 +19,7 @@ rocksdb = "0.19.0" typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e"} typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e"} tempfile = "3.3.0" -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "executor" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "executor" } serde_with = { version = "1.14.0", features = ["hex"] } sui-storage = { path = "../sui-storage" } strum_macros = "^0.24" diff --git a/crates/sui-types/Cargo.toml b/crates/sui-types/Cargo.toml index 14a85984ac49c..fc8b1330693fb 100644 --- a/crates/sui-types/Cargo.toml +++ b/crates/sui-types/Cargo.toml @@ -50,8 +50,8 @@ move-disassembler = { git = "https://github.com/move-language/move", rev = "7907 move-ir-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" } move-vm-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" } -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "executor" } -narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "crypto" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "executor" } +narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "crypto" } workspace-hack = { path = "../workspace-hack"} diff --git a/crates/sui/Cargo.toml b/crates/sui/Cargo.toml index 6e34caac6d41f..34f6a00a77457 100644 --- a/crates/sui/Cargo.toml +++ b/crates/sui/Cargo.toml @@ -39,7 +39,7 @@ rocksdb = "0.19.0" typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e"} typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e"} tempfile = "3.3.0" -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", package = "executor" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", package = "executor" } move-core-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a", features = ["address20"] } move-prover = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" } diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml index 618e6a475df33..337fd54f13067 100644 --- a/crates/workspace-hack/Cargo.toml +++ b/crates/workspace-hack/Cargo.toml @@ -93,9 +93,9 @@ collectable = { version = "0.0.2", default-features = false } colored = { version = "2", default-features = false } colored-diff = { version = "0.2", default-features = false } combine = { version = "4", features = ["alloc", "bytes", "std"] } -config-d72a4ba35040a3fc = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false } +config-22311e4ee966f97c = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false } config-a6292c17cd707f01 = { package = "config", version = "0.11", features = ["hjson", "ini", "json", "rust-ini", "serde-hjson", "serde_json", "toml", "yaml", "yaml-rust"] } -consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", features = ["benchmark", "rand"] } +consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", features = ["benchmark", "rand"] } console = { version = "0.15", default-features = false } const-oid = { version = "0.9", default-features = false } constant_time_eq = { version = "0.1", default-features = false } @@ -114,7 +114,8 @@ crossterm-647d43efb71741da = { package = "crossterm", version = "0.21" } crossterm-3c51e837cfc5589a = { package = "crossterm", version = "0.22" } crossterm-2b5c6dc72f624058 = { package = "crossterm", version = "0.23" } crossterm-adf3d7031871b0af = { package = "crossterm", version = "0.24" } -crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", features = ["copy_key"] } +crossterm-2ffb4c3fe830441c = { package = "crossterm", version = "0.25", features = ["bracketed-paste"] } +crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", features = ["copy_key"] } crypto-bigint = { version = "0.4", default-features = false, features = ["generic-array", "rand_core", "zeroize"] } crypto-common = { version = "0.1", default-features = false, features = ["std"] } crypto-mac = { version = "0.8", default-features = false, features = ["std"] } @@ -122,7 +123,7 @@ csv = { version = "1", default-features = false } csv-core = { version = "0.1" } curve25519-dalek = { version = "3", default-features = false, features = ["alloc", "serde", "std", "u64_backend"] } curve25519-dalek-fiat = { version = "0.1", default-features = false, features = ["alloc", "fiat-crypto", "fiat_u64_backend", "std"] } -dag = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false } +dag = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false } dashmap = { version = "5", default-features = false } data-encoding = { version = "2", features = ["alloc", "std"] } datatest-stable = { version = "0.1", default-features = false } @@ -158,7 +159,7 @@ endian-type = { version = "0.1", default-features = false } env_logger = { version = "0.9", features = ["atty", "humantime", "regex", "termcolor"] } ethnum = { version = "1", default-features = false } event-listener = { version = "2", default-features = false } -executor = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false } +executor = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false } eyre = { version = "0.6", features = ["auto-install", "track-caller"] } fail = { version = "0.4", default-features = false } fastrand = { version = "1", default-features = false } @@ -310,14 +311,15 @@ move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "790 move-vm-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" } multiaddr = { version = "0.14", features = ["url"] } multihash = { version = "0.16", default-features = false, features = ["alloc", "derive", "identity", "multihash-derive", "multihash-impl", "std"] } -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", default-features = false } +mysten-network-e5e323c970b022be = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", default-features = false } +mysten-network-8a9e1eabbf95519 = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", default-features = false } named-lock = { version = "0.1", default-features = false } nested = { version = "0.1", default-features = false } -network = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false } +network = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false } nexlint = { git = "https://github.com/nextest-rs/nexlint.git", rev = "bff03c566c9e22b1f4e67f516d0fd592a5a88f20", default-features = false } nexlint-lints = { git = "https://github.com/nextest-rs/nexlint.git", rev = "bff03c566c9e22b1f4e67f516d0fd592a5a88f20", default-features = false } nibble_vec = { version = "0.1", default-features = false } -node = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false, features = ["benchmark"] } +node = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false, features = ["benchmark"] } nom-cdf1610d3e1514e9 = { package = "nom", version = "5", features = ["alloc", "lexical", "lexical-core", "std"] } nom-15128469a54ed75a = { package = "nom", version = "7", features = ["alloc", "std"] } normalize-line-endings = { version = "0.3", default-features = false } @@ -371,7 +373,7 @@ predicates-core = { version = "1", default-features = false } predicates-tree = { version = "1", default-features = false } pretty = { version = "0.10", default-features = false } pretty_assertions = { version = "1", features = ["std"] } -primary = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false, features = ["benchmark"] } +primary = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false, features = ["benchmark"] } proc-macro2-dff4ba8e3ae991db = { package = "proc-macro2", version = "1", features = ["proc-macro", "span-locations"] } prometheus = { version = "0.13", features = ["protobuf"] } proptest = { version = "1", features = ["bit-set", "break-dead-code", "fork", "lazy_static", "quick-error", "regex-syntax", "rusty-fork", "std", "tempfile", "timeout"] } @@ -487,7 +489,9 @@ tabular = { version = "0.2", features = ["ansi-cell", "strip-ansi-escapes", "uni tap = { version = "1", default-features = false } target-lexicon = { version = "0.12", features = ["std"] } target-spec = { version = "1", default-features = false, features = ["serde", "summaries"] } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } +task-group = { version = "0.2", default-features = false } +telemetry-subscribers-e5e323c970b022be = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } +telemetry-subscribers-8a9e1eabbf95519 = { package = "telemetry-subscribers", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } tempfile = { version = "3", default-features = false } tera = { version = "1", features = ["builtins", "chrono", "chrono-tz", "humansize", "percent-encoding", "rand", "slug", "urlencode"] } termcolor = { version = "1", default-features = false } @@ -538,9 +542,10 @@ try-lock = { version = "0.2", default-features = false } tui = { version = "0.17", features = ["crossterm"] } twox-hash = { version = "1", default-features = false } typed-arena = { version = "2", features = ["std"] } -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", default-features = false } +typed-store-e5e323c970b022be = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", default-features = false } +typed-store-8a9e1eabbf95519 = { package = "typed-store", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", default-features = false } typenum = { version = "1", default-features = false } -types = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2" } +types = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40" } ucd-trie = { version = "0.1", default-features = false, features = ["std"] } uncased = { version = "0.9", default-features = false } unescape = { version = "0.1", default-features = false } @@ -573,8 +578,8 @@ wasm-bindgen-futures = { version = "0.4", default-features = false } web-sys = { version = "0.3", default-features = false, features = ["BinaryType", "Blob", "CloseEvent", "Document", "Element", "ErrorEvent", "Event", "EventTarget", "FileReader", "History", "HtmlElement", "HtmlHeadElement", "Location", "MessageEvent", "Node", "ProgressEvent", "WebSocket", "Window"] } webpki = { version = "0.22", default-features = false, features = ["alloc", "std"] } webpki-roots = { version = "0.22", default-features = false } -worker = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false, features = ["benchmark"] } -workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false } +worker = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false, features = ["benchmark"] } +workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false } yaml-rust = { version = "0.4", default-features = false } zeroize = { version = "1", features = ["alloc", "zeroize_derive"] } zstd-sys = { version = "2", features = ["legacy", "zdict_builder"] } @@ -676,9 +681,9 @@ collectable = { version = "0.0.2", default-features = false } colored = { version = "2", default-features = false } colored-diff = { version = "0.2", default-features = false } combine = { version = "4", features = ["alloc", "bytes", "std"] } -config-d72a4ba35040a3fc = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false } +config-22311e4ee966f97c = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false } config-a6292c17cd707f01 = { package = "config", version = "0.11", features = ["hjson", "ini", "json", "rust-ini", "serde-hjson", "serde_json", "toml", "yaml", "yaml-rust"] } -consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", features = ["benchmark", "rand"] } +consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", features = ["benchmark", "rand"] } console = { version = "0.15", default-features = false } const-oid = { version = "0.9", default-features = false } constant_time_eq = { version = "0.1", default-features = false } @@ -697,7 +702,8 @@ crossterm-647d43efb71741da = { package = "crossterm", version = "0.21" } crossterm-3c51e837cfc5589a = { package = "crossterm", version = "0.22" } crossterm-2b5c6dc72f624058 = { package = "crossterm", version = "0.23" } crossterm-adf3d7031871b0af = { package = "crossterm", version = "0.24" } -crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", features = ["copy_key"] } +crossterm-2ffb4c3fe830441c = { package = "crossterm", version = "0.25", features = ["bracketed-paste"] } +crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", features = ["copy_key"] } crypto-bigint = { version = "0.4", default-features = false, features = ["generic-array", "rand_core", "zeroize"] } crypto-common = { version = "0.1", default-features = false, features = ["std"] } crypto-mac = { version = "0.8", default-features = false, features = ["std"] } @@ -705,7 +711,7 @@ csv = { version = "1", default-features = false } csv-core = { version = "0.1" } curve25519-dalek = { version = "3", default-features = false, features = ["alloc", "serde", "std", "u64_backend"] } curve25519-dalek-fiat = { version = "0.1", default-features = false, features = ["alloc", "fiat-crypto", "fiat_u64_backend", "std"] } -dag = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false } +dag = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false } darling-594e8ee84c453af0 = { package = "darling", version = "0.13", features = ["suggestions"] } darling-582f2526e08bb6a0 = { package = "darling", version = "0.14", features = ["suggestions"] } darling_core-594e8ee84c453af0 = { package = "darling_core", version = "0.13", default-features = false, features = ["strsim", "suggestions"] } @@ -752,7 +758,7 @@ enum_dispatch = { version = "0.3", default-features = false } env_logger = { version = "0.9", features = ["atty", "humantime", "regex", "termcolor"] } ethnum = { version = "1", default-features = false } event-listener = { version = "2", default-features = false } -executor = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false } +executor = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false } eyre = { version = "0.6", features = ["auto-install", "track-caller"] } fail = { version = "0.4", default-features = false } fastrand = { version = "1", default-features = false } @@ -918,15 +924,16 @@ multiaddr = { version = "0.14", features = ["url"] } multihash = { version = "0.16", default-features = false, features = ["alloc", "derive", "identity", "multihash-derive", "multihash-impl", "std"] } multihash-derive = { version = "0.8", default-features = false, features = ["std"] } multimap = { version = "0.8", default-features = false } -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", default-features = false } +mysten-network-e5e323c970b022be = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", default-features = false } +mysten-network-8a9e1eabbf95519 = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", default-features = false } name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", default-features = false } named-lock = { version = "0.1", default-features = false } nested = { version = "0.1", default-features = false } -network = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false } +network = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false } nexlint = { git = "https://github.com/nextest-rs/nexlint.git", rev = "bff03c566c9e22b1f4e67f516d0fd592a5a88f20", default-features = false } nexlint-lints = { git = "https://github.com/nextest-rs/nexlint.git", rev = "bff03c566c9e22b1f4e67f516d0fd592a5a88f20", default-features = false } nibble_vec = { version = "0.1", default-features = false } -node = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false, features = ["benchmark"] } +node = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false, features = ["benchmark"] } nom-cdf1610d3e1514e9 = { package = "nom", version = "5", features = ["alloc", "lexical", "lexical-core", "std"] } nom-15128469a54ed75a = { package = "nom", version = "7", features = ["alloc", "std"] } normalize-line-endings = { version = "0.3", default-features = false } @@ -994,7 +1001,7 @@ predicates-tree = { version = "1", default-features = false } pretty = { version = "0.10", default-features = false } pretty_assertions = { version = "1", features = ["std"] } prettyplease = { version = "0.1", default-features = false } -primary = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false, features = ["benchmark"] } +primary = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false, features = ["benchmark"] } proc-macro-crate-c65f7effa3be6d31 = { package = "proc-macro-crate", version = "0.1", default-features = false } proc-macro-crate-dff4ba8e3ae991db = { package = "proc-macro-crate", version = "1", default-features = false } proc-macro-error = { version = "1", features = ["syn", "syn-error"] } @@ -1144,7 +1151,9 @@ tabular = { version = "0.2", features = ["ansi-cell", "strip-ansi-escapes", "uni tap = { version = "1", default-features = false } target-lexicon = { version = "0.12", features = ["std"] } target-spec = { version = "1", default-features = false, features = ["serde", "summaries"] } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } +task-group = { version = "0.2", default-features = false } +telemetry-subscribers-e5e323c970b022be = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } +telemetry-subscribers-8a9e1eabbf95519 = { package = "telemetry-subscribers", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } tempfile = { version = "3", default-features = false } tera = { version = "1", features = ["builtins", "chrono", "chrono-tz", "humansize", "percent-encoding", "rand", "slug", "urlencode"] } termcolor = { version = "1", default-features = false } @@ -1203,10 +1212,11 @@ try-lock = { version = "0.2", default-features = false } tui = { version = "0.17", features = ["crossterm"] } twox-hash = { version = "1", default-features = false } typed-arena = { version = "2", features = ["std"] } -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", default-features = false } +typed-store-e5e323c970b022be = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", default-features = false } +typed-store-8a9e1eabbf95519 = { package = "typed-store", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", default-features = false } typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "f4aa523d3029bd6a23bead5f04c182f2cfa04c5e", default-features = false } typenum = { version = "1", default-features = false } -types = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2" } +types = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40" } ucd-trie = { version = "0.1", default-features = false, features = ["std"] } uncased = { version = "0.9", default-features = false } unescape = { version = "0.1", default-features = false } @@ -1251,8 +1261,8 @@ web-sys = { version = "0.3", default-features = false, features = ["BinaryType", webpki = { version = "0.22", default-features = false, features = ["alloc", "std"] } webpki-roots = { version = "0.22", default-features = false } which = { version = "4", default-features = false } -worker = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false, features = ["benchmark"] } -workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "24353f2f1c5df27a8f1b693d78285faf506e36a2", default-features = false } +worker = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false, features = ["benchmark"] } +workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "4deb0684df6935281bb781adbefcd76b8cec6c40", default-features = false } yaml-rust = { version = "0.4", default-features = false } zeroize = { version = "1", features = ["alloc", "zeroize_derive"] } zeroize_derive = { version = "1", default-features = false }