From 4853877c21466819231461507d1d61f23ca9bb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Garillot?= Date: Mon, 8 Aug 2022 16:17:47 -0400 Subject: [PATCH] chore(deps): Update the Narwhal devnet pointer Manifest: [#686](https://github.com/MystenLabs/narwhal/pull/686) [#692](https://github.com/MystenLabs/narwhal/pull/692) [#691](https://github.com/MystenLabs/narwhal/pull/691) [#711](https://github.com/MystenLabs/narwhal/pull/711) [#687](https://github.com/MystenLabs/narwhal/pull/687) [#715](https://github.com/MystenLabs/narwhal/pull/715) [#716](https://github.com/MystenLabs/narwhal/pull/716) --- Cargo.lock | 266 +++++++++++++++++++------ crates/sui-benchmark/Cargo.toml | 2 +- crates/sui-config/Cargo.toml | 4 +- crates/sui-core/Cargo.toml | 13 +- crates/sui-core/src/authority.rs | 13 +- crates/sui-core/src/checkpoints/mod.rs | 4 +- crates/sui-tool/Cargo.toml | 2 +- crates/sui-types/Cargo.toml | 4 +- crates/sui-types/src/error.rs | 4 - crates/workspace-hack/Cargo.toml | 69 ++++--- 10 files changed, 261 insertions(+), 120 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cfa67b8d84d86..a80661a10da4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -974,7 +974,7 @@ dependencies = [ [[package]] name = "config" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08#e2231eb858d985a6ddedfcc64cc422893090be08" +source = "git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095#fd070584b57304a8c7b94ee7af656a9375fc2095" dependencies = [ "arc-swap", "crypto", @@ -983,7 +983,7 @@ dependencies = [ "serde_json", "thiserror", "tracing", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095)", ] [[package]] @@ -1005,7 +1005,7 @@ dependencies = [ [[package]] name = "consensus" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08#e2231eb858d985a6ddedfcc64cc422893090be08" +source = "git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095#fd070584b57304a8c7b94ee7af656a9375fc2095" dependencies = [ "arc-swap", "bincode", @@ -1023,9 +1023,9 @@ dependencies = [ "thiserror", "tokio", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095)", ] [[package]] @@ -1292,7 +1292,7 @@ dependencies = [ [[package]] name = "crypto" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08#e2231eb858d985a6ddedfcc64cc422893090be08" +source = "git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095#fd070584b57304a8c7b94ee7af656a9375fc2095" dependencies = [ "anyhow", "base64ct", @@ -1312,7 +1312,7 @@ dependencies = [ "serde_with 2.0.0", "signature", "tokio", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095)", "zeroize", ] @@ -1411,7 +1411,7 @@ dependencies = [ [[package]] name = "dag" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08#e2231eb858d985a6ddedfcc64cc422893090be08" +source = "git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095#fd070584b57304a8c7b94ee7af656a9375fc2095" dependencies = [ "arc-swap", "crypto", @@ -1422,7 +1422,7 @@ dependencies = [ "rayon", "serde 1.0.141", "thiserror", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095)", ] [[package]] @@ -1932,7 +1932,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "executor" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08#e2231eb858d985a6ddedfcc64cc422893090be08" +source = "git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095#fd070584b57304a8c7b94ee7af656a9375fc2095" dependencies = [ "async-trait", "bincode", @@ -1942,9 +1942,11 @@ dependencies = [ "consensus", "crypto", "futures", + "match_opt", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "primary", + "prometheus", "rocksdb", "serde 1.0.141", "thiserror", @@ -1952,10 +1954,10 @@ dependencies = [ "tokio-util", "tonic", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "types", "worker", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095)", ] [[package]] @@ -3019,7 +3021,7 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.40", "quote 1.0.20", "syn 1.0.98", @@ -4096,7 +4098,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro2 1.0.40", "quote 1.0.20", @@ -4152,6 +4154,27 @@ dependencies = [ "tracing", ] +[[package]] +name = "mysten-network" +version = "0.1.0" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa#d965a5a795dcdb4d1c7964acf556bc249fdc58aa" +dependencies = [ + "anyhow", + "bincode", + "bytes", + "futures", + "http", + "multiaddr", + "serde 1.0.141", + "tokio", + "tokio-stream", + "tonic", + "tonic-health", + "tower", + "tower-http", + "tracing", +] + [[package]] name = "name-variant" version = "1.0.0" @@ -4203,7 +4226,7 @@ checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e" [[package]] name = "network" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08#e2231eb858d985a6ddedfcc64cc422893090be08" +source = "git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095#fd070584b57304a8c7b94ee7af656a9375fc2095" dependencies = [ "anyhow", "async-trait", @@ -4212,7 +4235,7 @@ dependencies = [ "crypto", "futures", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "prometheus", "rand 0.7.3", "serde 1.0.141", @@ -4222,7 +4245,7 @@ dependencies = [ "tonic", "tracing", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095)", ] [[package]] @@ -4281,7 +4304,7 @@ dependencies = [ [[package]] name = "node" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08#e2231eb858d985a6ddedfcc64cc422893090be08" +source = "git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095#fd070584b57304a8c7b94ee7af656a9375fc2095" dependencies = [ "anyhow", "arc-swap", @@ -4300,7 +4323,7 @@ dependencies = [ "primary", "prometheus", "rand 0.7.3", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "thiserror", "tokio", "tokio-stream", @@ -4308,11 +4331,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=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "types", "url", "worker", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095)", ] [[package]] @@ -4461,7 +4484,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.40", "quote 1.0.20", "syn 1.0.98", @@ -4957,6 +4980,33 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +[[package]] +name = "pre" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87e7dc12cd3c36e90697e072bd70d886def4580fb268292022f89014dc9ea4b" +dependencies = [ + "cfg-if 0.1.10", + "pre-proc-macro", + "rustc_version 0.2.3", +] + +[[package]] +name = "pre-proc-macro" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a40339af35253b6b41a9e74f4c747e0948a9cb9cc9ea01d117d8440524560de3" +dependencies = [ + "cfg-if 0.1.10", + "lazy_static 1.4.0", + "proc-macro-crate 0.1.5", + "proc-macro-error", + "proc-macro2 1.0.40", + "quote 1.0.20", + "rustc_version 0.2.3", + "syn 1.0.98", +] + [[package]] name = "predicates" version = "2.1.1" @@ -5022,7 +5072,7 @@ dependencies = [ [[package]] name = "primary" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08#e2231eb858d985a6ddedfcc64cc422893090be08" +source = "git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095#fd070584b57304a8c7b94ee7af656a9375fc2095" dependencies = [ "async-recursion", "async-trait", @@ -5039,7 +5089,7 @@ dependencies = [ "futures", "itertools", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "network", "once_cell", "prometheus", @@ -5052,9 +5102,18 @@ dependencies = [ "tonic", "tower", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095)", +] + +[[package]] +name = "proc-macro-crate" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml", ] [[package]] @@ -5622,6 +5681,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + [[package]] name = "rustc_version" version = "0.3.3" @@ -5886,13 +5954,22 @@ dependencies = [ "libc", ] +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser 0.7.0", +] + [[package]] name = "semver" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "semver-parser", + "semver-parser 0.10.2", ] [[package]] @@ -5904,6 +5981,12 @@ dependencies = [ "serde 1.0.141", ] +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + [[package]] name = "semver-parser" version = "0.10.2" @@ -6603,12 +6686,12 @@ dependencies = [ "sui-sdk", "sui-swarm", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "tempfile", "test-utils", "tokio", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "unescape", "workspace-hack 0.1.0", ] @@ -6672,7 +6755,7 @@ dependencies = [ "sui-quorum-driver", "sui-sdk", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "tempfile", "test-utils", "tokio", @@ -6702,7 +6785,7 @@ dependencies = [ "sui-sdk", "sui-swarm", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "tempfile", "test-utils", "tokio", @@ -6787,15 +6870,16 @@ dependencies = [ "sui-storage", "sui-types", "tap", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "tempfile", "test-fuzz", "test-utils", + "thiserror", "tokio", "tokio-retry", "tokio-stream", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "types", "workspace-hack 0.1.0", ] @@ -6814,7 +6898,7 @@ dependencies = [ "sui-config", "sui-json-rpc-types", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "test-utils", "thiserror", "tokio", @@ -6883,7 +6967,7 @@ dependencies = [ "sui-node", "sui-sdk", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "test-utils", "tokio", "tracing", @@ -6989,7 +7073,7 @@ dependencies = [ "sui-storage", "sui-telemetry", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "tokio", "tracing", "workspace-hack 0.1.0", @@ -7090,12 +7174,12 @@ dependencies = [ "strum", "strum_macros", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "tempfile", "tokio", "tokio-stream", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "workspace-hack 0.1.0", ] @@ -7111,7 +7195,7 @@ dependencies = [ "sui-node", "sui-types", "tap", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "tempfile", "tokio", "tonic-health", @@ -7147,12 +7231,12 @@ dependencies = [ "sui-core", "sui-storage", "sui-types", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "tempfile", "textwrap 0.15.0", "tokio", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "workspace-hack 0.1.0", ] @@ -7222,7 +7306,7 @@ dependencies = [ "thiserror", "tonic", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "workspace-hack 0.1.0", "zeroize", ] @@ -7339,6 +7423,24 @@ dependencies = [ "tracing-subscriber 0.3.15", ] +[[package]] +name = "telemetry-subscribers" +version = "0.1.0" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa#d965a5a795dcdb4d1c7964acf556bc249fdc58aa" +dependencies = [ + "crossterm 0.24.0", + "once_cell", + "opentelemetry", + "opentelemetry-jaeger", + "tokio", + "tracing", + "tracing-appender", + "tracing-bunyan-formatter", + "tracing-chrome", + "tracing-opentelemetry", + "tracing-subscriber 0.3.15", +] + [[package]] name = "tempfile" version = "3.3.0" @@ -7510,18 +7612,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" dependencies = [ "proc-macro2 1.0.40", "quote 1.0.20", @@ -8106,6 +8208,24 @@ dependencies = [ "tracing", ] +[[package]] +name = "typed-store" +version = "0.1.0" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa#d965a5a795dcdb4d1c7964acf556bc249fdc58aa" +dependencies = [ + "anyhow", + "bincode", + "collectable", + "eyre", + "fdlimit", + "pre", + "rocksdb", + "serde 1.0.141", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "typenum" version = "1.15.0" @@ -8115,7 +8235,7 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "types" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08#e2231eb858d985a6ddedfcc64cc422893090be08" +source = "git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095#fd070584b57304a8c7b94ee7af656a9375fc2095" dependencies = [ "base64", "bincode", @@ -8142,8 +8262,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=e2231eb858d985a6ddedfcc64cc422893090be08)", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095)", ] [[package]] @@ -8702,7 +8822,7 @@ dependencies = [ [[package]] name = "worker" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08#e2231eb858d985a6ddedfcc64cc422893090be08" +source = "git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095#fd070584b57304a8c7b94ee7af656a9375fc2095" dependencies = [ "anyhow", "async-trait", @@ -8714,7 +8834,7 @@ dependencies = [ "ed25519-dalek", "futures", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "network", "primary", "prometheus", @@ -8725,9 +8845,9 @@ dependencies = [ "tonic", "tower", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095)", ] [[package]] @@ -9070,6 +9190,7 @@ dependencies = [ "multimap", "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=c6dc7a23a40b3517f138d122a76d3bc15f844f67)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "name-variant", "named-lock", "nested", @@ -9137,6 +9258,8 @@ dependencies = [ "plotters-backend", "plotters-svg", "ppv-lite86", + "pre", + "pre-proc-macro", "predicates", "predicates-core", "predicates-tree", @@ -9144,7 +9267,8 @@ dependencies = [ "pretty_assertions", "prettyplease", "primary", - "proc-macro-crate", + "proc-macro-crate 0.1.5", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro-error-attr", "proc-macro2 0.4.30", @@ -9191,6 +9315,7 @@ dependencies = [ "rust-ini", "rustc-demangle", "rustc-hash", + "rustc_version 0.2.3", "rustc_version 0.3.3", "rustc_version 0.4.0", "rustls 0.19.1", @@ -9212,8 +9337,10 @@ dependencies = [ "secp256k1", "secp256k1-sys", "semver 0.11.0", + "semver 0.9.0", "semver 1.0.9", - "semver-parser", + "semver-parser 0.10.2", + "semver-parser 0.7.0", "send_wrapper", "serde 0.8.23", "serde 1.0.141", @@ -9280,7 +9407,8 @@ dependencies = [ "tap", "target-lexicon", "target-spec", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", + "telemetry-subscribers 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "tempfile", "tera", "termcolor", @@ -9340,7 +9468,8 @@ dependencies = [ "tui", "twox-hash", "typed-arena", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "typenum", "types", "ucd-trie", @@ -9390,7 +9519,7 @@ dependencies = [ "webpki-roots 0.22.3", "which", "worker", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095)", "yaml-rust", "zeroize", "zeroize_derive", @@ -9400,7 +9529,7 @@ dependencies = [ [[package]] name = "workspace-hack" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=e2231eb858d985a6ddedfcc64cc422893090be08#e2231eb858d985a6ddedfcc64cc422893090be08" +source = "git+https://github.com/MystenLabs/narwhal?rev=fd070584b57304a8c7b94ee7af656a9375fc2095#fd070584b57304a8c7b94ee7af656a9375fc2095" dependencies = [ "addr2line", "adler", @@ -9457,6 +9586,7 @@ dependencies = [ "cast 0.3.0", "cc", "cexpr", + "cfg-if 0.1.10", "cfg-if 1.0.0", "clang-sys", "clap 2.34.0", @@ -9589,8 +9719,8 @@ dependencies = [ "multihash", "multihash-derive", "multimap", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=c6dc7a23a40b3517f138d122a76d3bc15f844f67)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "nom 7.1.1", "normalize-line-endings", "num-bigint", @@ -9625,12 +9755,15 @@ dependencies = [ "plotters-backend", "plotters-svg", "ppv-lite86", + "pre", + "pre-proc-macro", "predicates", "predicates-core", "predicates-tree", "pretty_assertions", "prettyplease", - "proc-macro-crate", + "proc-macro-crate 0.1.5", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro-error-attr", "proc-macro2 0.4.30", @@ -9666,6 +9799,7 @@ dependencies = [ "rocksdb", "rustc-demangle", "rustc-hash", + "rustc_version 0.2.3", "rustc_version 0.3.3", "rustls 0.20.6", "rustls-pemfile", @@ -9679,7 +9813,9 @@ dependencies = [ "secp256k1", "secp256k1-sys", "semver 0.11.0", - "semver-parser", + "semver 0.9.0", + "semver-parser 0.10.2", + "semver-parser 0.7.0", "serde 1.0.141", "serde-reflection", "serde_bytes", @@ -9712,7 +9848,7 @@ dependencies = [ "syn 1.0.98", "sync_wrapper", "synstructure", - "telemetry-subscribers", + "telemetry-subscribers 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "tempfile", "termcolor", "terminal_size", @@ -9757,7 +9893,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=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "typenum", "ucd-trie", "unicode-bidi", diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml index 568ba86fa599b..2e3d79f0a5d67 100644 --- a/crates/sui-benchmark/Cargo.toml +++ b/crates/sui-benchmark/Cargo.toml @@ -37,7 +37,7 @@ sui-types = { path = "../sui-types" } sui-sdk = { path = "../sui-sdk" } move-core-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a", features = ["address20"] } -narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", package = "node" } +narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", package = "node" } sui-quorum-driver = { path = "../sui-quorum-driver" } sui-node = { path = "../sui-node" } workspace-hack = { path = "../workspace-hack"} diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml index 36d0180ded375..60ef15ca8e38d 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 = "e2231eb858d985a6ddedfcc64cc422893090be08", package = "config" } -narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", package = "crypto" } +narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", package = "config" } +narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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" } move-core-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a", features = ["address20"] } diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml index 8c16e60c6446d..94a806fd18499 100644 --- a/crates/sui-core/Cargo.toml +++ b/crates/sui-core/Cargo.toml @@ -49,13 +49,14 @@ move-vm-runtime = { git = "https://github.com/move-language/move", rev = "790715 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c"} mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } -narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", package = "config" } -narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", package = "consensus" } -narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", package = "crypto", features=["copy_key"]} -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", package = "executor" } -narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", package = "types" } -narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", package = "node" } +narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", package = "config" } +narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", package = "consensus" } +narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", package = "crypto", features=["copy_key"]} +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", package = "executor" } +narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", package = "types" } +narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", package = "node" } workspace-hack = { path = "../workspace-hack"} +thiserror = "1.0.32" [dev-dependencies] clap = { version = "3.1.17", features = ["derive"] } diff --git a/crates/sui-core/src/authority.rs b/crates/sui-core/src/authority.rs index c642fdc9f877b..5478804a6ab3c 100644 --- a/crates/sui-core/src/authority.rs +++ b/crates/sui-core/src/authority.rs @@ -1518,7 +1518,7 @@ impl ExecutionState for AuthorityState { _consensus_output: &narwhal_consensus::ConsensusOutput, consensus_index: ExecutionIndices, transaction: Self::Transaction, - ) -> Result<(Self::Outcome, Option), Self::Error> { + ) -> Result { self.metrics.total_consensus_txns.inc(); match transaction { ConsensusTransaction::UserTransaction(certificate) => { @@ -1541,7 +1541,7 @@ impl ExecutionState for AuthorityState { // TODO: This return time is not ideal. // TODO [2533]: edit once integrating Narwhal reconfiguration - Ok((Vec::default(), None)) + Ok(Vec::default()) } ConsensusTransaction::Checkpoint(fragment) => { let seq = consensus_index; @@ -1570,7 +1570,7 @@ impl ExecutionState for AuthorityState { // TODO: This return time is not ideal. The authority submitting the checkpoint fragment // is not expecting any reply. // TODO [2533]: edit once integrating Narwhal reconfiguration - Ok((Vec::default(), None)) + Ok(Vec::default()) } } } @@ -1599,11 +1599,4 @@ impl ExecutionStateError for FragmentInternalError { Self::Retry(..) => true, } } - - fn to_string(&self) -> String { - match self { - Self::Error(sui_error) => format!("Failed to process checkpoint fragment {sui_error}"), - Self::Retry(fragment) => format!("Failed to sequence checkpoint fragment {fragment:?}"), - } - } } diff --git a/crates/sui-core/src/checkpoints/mod.rs b/crates/sui-core/src/checkpoints/mod.rs index e5fb186b6e92f..d63016b828cf5 100644 --- a/crates/sui-core/src/checkpoints/mod.rs +++ b/crates/sui-core/src/checkpoints/mod.rs @@ -79,9 +79,11 @@ pub trait ConsensusSender: Send + Sync + 'static { fn send_to_consensus(&self, fragment: CheckpointFragment) -> Result<(), SuiError>; } -#[derive(Debug)] +#[derive(Debug, thiserror::Error)] pub enum FragmentInternalError { + #[error("Error processing fragment{0}")] Error(SuiError), + #[error("Error processing fragment, retrying")] Retry(Box), } diff --git a/crates/sui-tool/Cargo.toml b/crates/sui-tool/Cargo.toml index f46f633def490..1ee1f176e549a 100644 --- a/crates/sui-tool/Cargo.toml +++ b/crates/sui-tool/Cargo.toml @@ -18,7 +18,7 @@ futures = "0.3.21" rocksdb = "0.18.0" typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c"} tempfile = "3.3.0" -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", package = "executor" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", package = "executor" } serde_with = { version = "1.14.0", features = ["hex"] } sui-storage = { path = "../sui-storage" } serde = { version = "1.0.141", features = ["derive"] } diff --git a/crates/sui-types/Cargo.toml b/crates/sui-types/Cargo.toml index 64784b176a9a0..98cf38557529b 100644 --- a/crates/sui-types/Cargo.toml +++ b/crates/sui-types/Cargo.toml @@ -49,8 +49,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 = "e2231eb858d985a6ddedfcc64cc422893090be08", package = "executor" } -narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", package = "crypto" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", package = "executor" } +narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", package = "crypto" } workspace-hack = { path = "../workspace-hack"} [dev-dependencies] diff --git a/crates/sui-types/src/error.rs b/crates/sui-types/src/error.rs index 1729e2031e892..2f9efa0512625 100644 --- a/crates/sui-types/src/error.rs +++ b/crates/sui-types/src/error.rs @@ -457,10 +457,6 @@ impl ExecutionStateError for SuiError { | Self::GenericAuthorityError { .. } ) } - - fn to_string(&self) -> String { - ToString::to_string(&self) - } } type BoxError = Box; diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml index a2c38a889b47d..733c1ad9c682a 100644 --- a/crates/workspace-hack/Cargo.toml +++ b/crates/workspace-hack/Cargo.toml @@ -91,9 +91,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-e01da1b25acb9a3f = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false } +config-ab42a9184fa36ab7 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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 = "e2231eb858d985a6ddedfcc64cc422893090be08", features = ["benchmark", "rand"] } +consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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 } @@ -112,7 +112,7 @@ 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 = "e2231eb858d985a6ddedfcc64cc422893090be08", features = ["copy_key"] } +crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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"] } @@ -120,7 +120,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 = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false } +dag = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", default-features = false } dashmap = { version = "5", default-features = false } data-encoding = { version = "2", features = ["alloc", "std"] } datatest-stable = { version = "0.1", default-features = false } @@ -155,7 +155,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 = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false } +executor = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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 } @@ -308,13 +308,14 @@ multiaddr = { version = "0.14", features = ["url"] } multihash = { version = "0.16", default-features = false, features = ["alloc", "derive", "identity", "multihash-derive", "multihash-impl", "std"] } mysten-network-68692745110bd6f4 = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", default-features = false } mysten-network-a2655ef8805d82bb = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "c6dc7a23a40b3517f138d122a76d3bc15f844f67", default-features = false } +mysten-network-2187a2855c8ab378 = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", 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 = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false } +network = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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 = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false, features = ["benchmark"] } +node = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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 } @@ -362,12 +363,13 @@ plotters = { version = "0.3", default-features = false, features = ["area_series plotters-backend = { version = "0.3", default-features = false } plotters-svg = { version = "0.3", default-features = false } ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] } +pre = { version = "0.2", features = ["alloc", "core", "std"] } predicates = { version = "2", features = ["diff", "difflib", "float-cmp", "normalize-line-endings", "regex"] } 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 = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false, features = ["benchmark"] } +primary = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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"] } @@ -474,7 +476,8 @@ 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 = "123c9e40b529315e1c1d91a54fb717111c3e349c", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } +telemetry-subscribers-68692745110bd6f4 = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } +telemetry-subscribers-2187a2855c8ab378 = { package = "telemetry-subscribers", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", 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 } @@ -526,9 +529,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 = "123c9e40b529315e1c1d91a54fb717111c3e349c", default-features = false } +typed-store-68692745110bd6f4 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", default-features = false } +typed-store-2187a2855c8ab378 = { package = "typed-store", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", default-features = false } typenum = { version = "1", default-features = false } -types = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08" } +types = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095" } ucd-trie = { version = "0.1", default-features = false, features = ["std"] } uncased = { version = "0.9", default-features = false } unescape = { version = "0.1", default-features = false } @@ -563,8 +567,8 @@ webpki-647d43efb71741da = { package = "webpki", version = "0.21", features = ["s webpki-3c51e837cfc5589a = { package = "webpki", version = "0.22", default-features = false, features = ["alloc", "std"] } webpki-roots-647d43efb71741da = { package = "webpki-roots", version = "0.21", default-features = false } webpki-roots-3c51e837cfc5589a = { package = "webpki-roots", version = "0.22", default-features = false } -worker = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false, features = ["benchmark"] } -workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false } +worker = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", default-features = false, features = ["benchmark"] } +workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", default-features = false } yaml-rust = { version = "0.4", default-features = false } zeroize = { version = "1", features = ["alloc", "zeroize_derive"] } zstd-sys = { version = "1", default-features = false } @@ -663,9 +667,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-e01da1b25acb9a3f = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false } +config-ab42a9184fa36ab7 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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 = "e2231eb858d985a6ddedfcc64cc422893090be08", features = ["benchmark", "rand"] } +consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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 } @@ -684,7 +688,7 @@ 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 = "e2231eb858d985a6ddedfcc64cc422893090be08", features = ["copy_key"] } +crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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"] } @@ -692,7 +696,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 = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false } +dag = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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"] } @@ -739,7 +743,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 = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false } +executor = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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 } @@ -906,14 +910,15 @@ multihash-derive = { version = "0.8", default-features = false, features = ["std multimap = { version = "0.8", default-features = false } mysten-network-68692745110bd6f4 = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", default-features = false } mysten-network-a2655ef8805d82bb = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "c6dc7a23a40b3517f138d122a76d3bc15f844f67", default-features = false } +mysten-network-2187a2855c8ab378 = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", default-features = false } name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", 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 = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false } +network = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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 = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false, features = ["benchmark"] } +node = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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 } @@ -973,14 +978,17 @@ plotters = { version = "0.3", default-features = false, features = ["area_series plotters-backend = { version = "0.3", default-features = false } plotters-svg = { version = "0.3", default-features = false } ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] } +pre = { version = "0.2", features = ["alloc", "core", "std"] } +pre-proc-macro = { version = "0.2", default-features = false } predicates = { version = "2", features = ["diff", "difflib", "float-cmp", "normalize-line-endings", "regex"] } 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"] } prettyplease = { version = "0.1", default-features = false } -primary = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false, features = ["benchmark"] } -proc-macro-crate = { version = "1", default-features = false } +primary = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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"] } proc-macro-error-attr = { version = "1", default-features = false } proc-macro2-9fbad63c4bcf4a8f = { package = "proc-macro2", version = "0.4", features = ["proc-macro"] } @@ -1027,6 +1035,7 @@ rocksdb = { version = "0.18", features = ["bzip2", "lz4", "multi-threaded-cf", " rust-ini = { version = "0.13", default-features = false } rustc-demangle = { version = "0.1", default-features = false } rustc-hash = { version = "1", features = ["std"] } +rustc_version-6f8ce4dd05d13bba = { package = "rustc_version", version = "0.2", default-features = false } rustc_version-468e82937335b1c9 = { package = "rustc_version", version = "0.3", default-features = false } rustc_version-9fbad63c4bcf4a8f = { package = "rustc_version", version = "0.4", default-features = false } rustls-cdcf2f9584511fe6 = { package = "rustls", version = "0.19", features = ["dangerous_configuration", "log", "logging"] } @@ -1048,8 +1057,10 @@ sec1 = { version = "0.3", features = ["alloc", "base16ct", "der", "generic-array secp256k1 = { version = "0.24", features = ["alloc", "bitcoin_hashes", "global-context", "rand", "rand-std", "recovery", "std"] } secp256k1-sys = { version = "0.6", default-features = false, features = ["alloc", "recovery", "std"] } semver-a6292c17cd707f01 = { package = "semver", version = "0.11" } +semver-274715c4dabd11b0 = { package = "semver", version = "0.9" } semver-dff4ba8e3ae991db = { package = "semver", version = "1", features = ["serde", "std"] } -semver-parser = { version = "0.10", default-features = false } +semver-parser-93f6ce9d446188ac = { package = "semver-parser", version = "0.10", default-features = false } +semver-parser-ca01ad9e24f5d932 = { package = "semver-parser", version = "0.7", default-features = false } send_wrapper = { version = "0.4", default-features = false } serde-c38e5c1d305a1b54 = { package = "serde", version = "0.8", features = ["std"] } serde-dff4ba8e3ae991db = { package = "serde", version = "1", features = ["alloc", "derive", "rc", "serde_derive", "std"] } @@ -1116,7 +1127,8 @@ 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 = "123c9e40b529315e1c1d91a54fb717111c3e349c", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } +telemetry-subscribers-68692745110bd6f4 = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } +telemetry-subscribers-2187a2855c8ab378 = { package = "telemetry-subscribers", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", 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 } @@ -1176,9 +1188,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 = "123c9e40b529315e1c1d91a54fb717111c3e349c", default-features = false } +typed-store-68692745110bd6f4 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", default-features = false } +typed-store-2187a2855c8ab378 = { package = "typed-store", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", default-features = false } typenum = { version = "1", default-features = false } -types = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08" } +types = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095" } ucd-trie = { version = "0.1", default-features = false, features = ["std"] } uncased = { version = "0.9", default-features = false } unescape = { version = "0.1", default-features = false } @@ -1225,8 +1238,8 @@ webpki-3c51e837cfc5589a = { package = "webpki", version = "0.22", default-featur webpki-roots-647d43efb71741da = { package = "webpki-roots", version = "0.21", default-features = false } webpki-roots-3c51e837cfc5589a = { package = "webpki-roots", version = "0.22", default-features = false } which = { version = "4", default-features = false } -worker = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false, features = ["benchmark"] } -workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "e2231eb858d985a6ddedfcc64cc422893090be08", default-features = false } +worker = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", default-features = false, features = ["benchmark"] } +workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "fd070584b57304a8c7b94ee7af656a9375fc2095", 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 }