diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 62114ac07d77f..66c179b8af77a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -53,10 +53,9 @@ jobs: locked: true - run: scripts/license_check.sh - run: cargo xlint - # Temporarily disable hakari checking in CI until rust 1.62 is released in order to get things building in windows - # - run: | - # cargo hakari generate --diff # workspace-hack Cargo.toml is up-to-date - # cargo hakari manage-deps --dry-run # all workspace crates depend on workspace-hack + - run: | + cargo hakari generate --diff # workspace-hack Cargo.toml is up-to-date + cargo hakari manage-deps --dry-run # all workspace crates depend on workspace-hack test: needs: diff diff --git a/Cargo.lock b/Cargo.lock index cff7435d24e14..513379a02e09d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -497,25 +497,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "bindgen" -version = "0.60.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static 1.4.0", - "lazycell", - "peeking_take_while", - "proc-macro2 1.0.39", - "quote 1.0.18", - "regex", - "rustc-hash", - "shlex", -] - [[package]] name = "bit-set" version = "0.5.2" @@ -1107,8 +1088,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31432bc31ff8883bf6a693a79371862f73087822470c82d6a1ec778781ee3978" dependencies = [ "console-api", - "crossbeam-channel 0.5.4", - "crossbeam-utils 0.8.8", + "crossbeam-channel", + "crossbeam-utils", "futures", "hdrhistogram", "humantime", @@ -1170,7 +1151,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23" dependencies = [ - "crc-catalog 1.1.1", + "crc-catalog", ] [[package]] @@ -1179,12 +1160,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" -[[package]] -name = "crc-catalog" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" - [[package]] name = "crc32fast" version = "1.3.2" @@ -1237,21 +1212,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" dependencies = [ "cfg-if 1.0.0", - "crossbeam-channel 0.5.4", + "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", "crossbeam-queue", - "crossbeam-utils 0.8.8", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", + "crossbeam-utils", ] [[package]] @@ -1261,7 +1226,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.8", + "crossbeam-utils", ] [[package]] @@ -1272,7 +1237,7 @@ checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", - "crossbeam-utils 0.8.8", + "crossbeam-utils", ] [[package]] @@ -1283,7 +1248,7 @@ checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ "autocfg", "cfg-if 1.0.0", - "crossbeam-utils 0.8.8", + "crossbeam-utils", "lazy_static 1.4.0", "memoffset", "scopeguard", @@ -1296,18 +1261,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.8", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static 1.4.0", + "crossbeam-utils", ] [[package]] @@ -2293,7 +2247,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" dependencies = [ "gloo-timers", - "send_wrapper 0.4.0", + "send_wrapper", ] [[package]] @@ -2606,7 +2560,7 @@ checksum = "31672b7011be2c4f7456c4ddbcb40e7e9a4a9fad8efe49a6ebaf5f307d0109c0" dependencies = [ "base64", "byteorder", - "crossbeam-channel 0.5.4", + "crossbeam-channel", "flate2", "nom 7.1.1", "num-traits 0.2.15", @@ -2818,7 +2772,7 @@ version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" dependencies = [ - "crossbeam-utils 0.8.8", + "crossbeam-utils", "globset", "lazy_static 1.4.0", "log", @@ -3207,7 +3161,7 @@ version = "0.6.1+6.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" dependencies = [ - "bindgen 0.59.2", + "bindgen", "bzip2-sys", "cc", "glob", @@ -3234,7 +3188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc195aab5b803465bf614a5a4765741abce6c8d64e7d8ca57acd2923661fba9f" dependencies = [ "clap 3.1.18", - "crossbeam-channel 0.5.4", + "crossbeam-channel", "rayon", "termcolor", ] @@ -3333,12 +3287,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" version = "2.5.0" @@ -4658,7 +4606,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" dependencies = [ "async-trait", - "crossbeam-channel 0.5.4", + "crossbeam-channel", "futures-channel", "futures-executor", "futures-util", @@ -5504,9 +5452,9 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" dependencies = [ - "crossbeam-channel 0.5.4", + "crossbeam-channel", "crossbeam-deque", - "crossbeam-utils 0.8.8", + "crossbeam-utils", "num_cpus", ] @@ -5970,12 +5918,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" -[[package]] -name = "send_wrapper" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" - [[package]] name = "serde" version = "0.8.23" @@ -7856,7 +7798,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ - "crossbeam-channel 0.5.4", + "crossbeam-channel", "time 0.3.9", "tracing-subscriber 0.3.11", ] @@ -8764,7 +8706,7 @@ dependencies = [ "better_typeid_derive", "bimap", "bincode", - "bindgen 0.60.1", + "bindgen", "bit-set", "bit-vec", "bitflags", @@ -8808,28 +8750,30 @@ dependencies = [ "colored", "colored-diff", "combine", + "config 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=05fa85552c49f0775a47d72c37074c9ca1754900)", "config 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=3cf68183b22acfe014118ef2713d5094159f2f4d)", "config 0.11.0", + "consensus 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=05fa85552c49f0775a47d72c37074c9ca1754900)", "consensus 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=3cf68183b22acfe014118ef2713d5094159f2f4d)", "console-api", "console-subscriber", "constant_time_eq", "core2", "crc", - "crc-catalog 2.1.0", + "crc-catalog", "crc32fast", "criterion", "criterion-plot", "crossbeam", - "crossbeam-channel 0.4.4", - "crossbeam-channel 0.5.4", + "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", "crossbeam-queue", - "crossbeam-utils 0.7.2", - "crossbeam-utils 0.8.8", + "crossbeam-utils", "crossterm 0.21.0", "crossterm 0.22.1", + "crossterm 0.23.2", + "crypto 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=05fa85552c49f0775a47d72c37074c9ca1754900)", "crypto 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=3cf68183b22acfe014118ef2713d5094159f2f4d)", "crypto-common", "crypto-mac", @@ -8837,6 +8781,7 @@ dependencies = [ "csv-core", "curve25519-dalek", "curve25519-dalek-fiat", + "dag 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=05fa85552c49f0775a47d72c37074c9ca1754900)", "dag 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=3cf68183b22acfe014118ef2713d5094159f2f4d)", "darling 0.13.4", "darling 0.14.1", @@ -8876,9 +8821,11 @@ dependencies = [ "ed25519-dalek-fiat", "either", "endian-type", + "enum_dispatch", "env_logger", "ethnum", "event-listener", + "executor 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=05fa85552c49f0775a47d72c37074c9ca1754900)", "executor 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=3cf68183b22acfe014118ef2713d5094159f2f4d)", "eyre", "fail", @@ -8993,7 +8940,6 @@ dependencies = [ "matchers", "matches", "matchit", - "maybe-uninit", "memchr", "memoffset", "merlin", @@ -9043,13 +8989,16 @@ dependencies = [ "multihash-derive", "multimap", "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=94d7da89f6a52d7f60a9802b0a03147a9c89c3e4)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=af52637e73332eba7c8844e9bcdeb5b48854eabf)", "name-variant", "named-lock", "nested", + "network 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=05fa85552c49f0775a47d72c37074c9ca1754900)", "network 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=3cf68183b22acfe014118ef2713d5094159f2f4d)", "nexlint", "nexlint-lints", "nibble_vec", + "node 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=05fa85552c49f0775a47d72c37074c9ca1754900)", "node 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=3cf68183b22acfe014118ef2713d5094159f2f4d)", "nom 5.1.2", "nom 7.1.1", @@ -9114,6 +9063,7 @@ dependencies = [ "pretty", "pretty_assertions", "prettyplease", + "primary 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=05fa85552c49f0775a47d72c37074c9ca1754900)", "primary 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=3cf68183b22acfe014118ef2713d5094159f2f4d)", "proc-macro-crate", "proc-macro-error", @@ -9179,7 +9129,7 @@ dependencies = [ "semver 0.11.0", "semver 1.0.9", "semver-parser", - "send_wrapper 0.6.0", + "send_wrapper", "serde 0.8.23", "serde 1.0.137", "serde-hjson", @@ -9300,7 +9250,9 @@ dependencies = [ "twox-hash", "typed-arena", "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=94d7da89f6a52d7f60a9802b0a03147a9c89c3e4)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=af52637e73332eba7c8844e9bcdeb5b48854eabf)", "typenum", + "types 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=05fa85552c49f0775a47d72c37074c9ca1754900)", "types 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=3cf68183b22acfe014118ef2713d5094159f2f4d)", "ucd-trie", "uncased", @@ -9346,7 +9298,9 @@ dependencies = [ "webpki-roots 0.21.1", "webpki-roots 0.22.3", "which", + "worker 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=05fa85552c49f0775a47d72c37074c9ca1754900)", "worker 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=3cf68183b22acfe014118ef2713d5094159f2f4d)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=05fa85552c49f0775a47d72c37074c9ca1754900)", "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=3cf68183b22acfe014118ef2713d5094159f2f4d)", "yaml-rust", "zeroize", @@ -9392,7 +9346,7 @@ dependencies = [ "base64", "base64ct", "bincode", - "bindgen 0.59.2", + "bindgen", "bit-set", "bit-vec", "bitflags", @@ -9421,10 +9375,10 @@ dependencies = [ "crc32fast", "criterion", "criterion-plot", - "crossbeam-channel 0.5.4", + "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", - "crossbeam-utils 0.8.8", + "crossbeam-utils", "crypto-mac", "csv", "csv-core", @@ -9726,7 +9680,7 @@ dependencies = [ "base64", "base64ct", "bincode", - "bindgen 0.59.2", + "bindgen", "bit-set", "bit-vec", "bitflags", @@ -9755,10 +9709,10 @@ dependencies = [ "crc32fast", "criterion", "criterion-plot", - "crossbeam-channel 0.5.4", + "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", - "crossbeam-utils 0.8.8", + "crossbeam-utils", "crypto-mac", "csv", "csv-core", diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml index e64e6bc036b0a..5e1531819cbe8 100644 --- a/crates/workspace-hack/Cargo.toml +++ b/crates/workspace-hack/Cargo.toml @@ -14,7 +14,7 @@ publish = false # are managed by hakari. ### BEGIN HAKARI SECTION -[target.'cfg(not(windows))'.dependencies] +[dependencies] addr2line = { version = "0.17", default-features = false } adler = { version = "1", default-features = false } ahash = { version = "0.7", features = ["std"] } @@ -45,7 +45,7 @@ axum-core = { version = "0.2", default-features = false } backoff = { version = "0.4", features = ["futures", "futures-core", "pin-project-lite", "tokio", "tokio_1"] } backtrace = { version = "0.3", features = ["std"] } base64 = { version = "0.13", features = ["alloc", "std"] } -base64ct = { version = "1.5.1", default-features = false, features = ["alloc"] } +base64ct = { version = "1", default-features = false, features = ["alloc"] } bcs = { version = "0.1", default-features = false } beef = { version = "0.5", features = ["impl_serde", "serde"] } better_any = { version = "0.1", default-features = false } @@ -87,36 +87,39 @@ 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-3eed1dbf76d1f5fa = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } +config-3eed1dbf76d1f5fa = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false } +config-756126593a4c2d51 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", 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 = "3cf68183b22acfe014118ef2713d5094159f2f4d", features = ["benchmark", "rand"] } +consensus-3eed1dbf76d1f5fa = { package = "consensus", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", features = ["benchmark", "rand"] } +consensus-756126593a4c2d51 = { package = "consensus", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", features = ["rand"] } console-api = { version = "0.3", default-features = false, features = ["transport"] } console-subscriber = { version = "0.1", features = ["env-filter"] } constant_time_eq = { version = "0.1", default-features = false } core2 = { version = "0.4", default-features = false, features = ["alloc"] } crc = { version = "2", default-features = false } -crc-catalog = { version = "2", default-features = false } +crc-catalog = { version = "1", default-features = false } crc32fast = { version = "1", features = ["std"] } criterion = { version = "0.3", features = ["cargo_bench_support"] } criterion-plot = { version = "0.4", default-features = false } crossbeam = { version = "0.8", features = ["alloc", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", "crossbeam-queue", "std"] } -crossbeam-channel-9fbad63c4bcf4a8f = { package = "crossbeam-channel", version = "0.4", default-features = false } -crossbeam-channel-d8f496e17d97b5cb = { package = "crossbeam-channel", version = "0.5", features = ["crossbeam-utils", "std"] } +crossbeam-channel = { version = "0.5", features = ["crossbeam-utils", "std"] } crossbeam-deque = { version = "0.8", features = ["crossbeam-epoch", "crossbeam-utils", "std"] } crossbeam-epoch = { version = "0.9", default-features = false, features = ["alloc", "lazy_static", "std"] } crossbeam-queue = { version = "0.3", features = ["alloc", "std"] } -crossbeam-utils-ca01ad9e24f5d932 = { package = "crossbeam-utils", version = "0.7", features = ["lazy_static", "std"] } -crossbeam-utils-c38e5c1d305a1b54 = { package = "crossbeam-utils", version = "0.8", features = ["lazy_static", "std"] } +crossbeam-utils = { version = "0.8", features = ["lazy_static", "std"] } crossterm-647d43efb71741da = { package = "crossterm", version = "0.21" } crossterm-3c51e837cfc5589a = { package = "crossterm", version = "0.22" } -crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d" } +crossterm-2b5c6dc72f624058 = { package = "crossterm", version = "0.23" } +crypto-3eed1dbf76d1f5fa = { package = "crypto", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900" } +crypto-756126593a4c2d51 = { package = "crypto", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d" } crypto-common = { version = "0.1", default-features = false, features = ["std"] } crypto-mac = { version = "0.8", default-features = false, features = ["std"] } 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 = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } +dag-3eed1dbf76d1f5fa = { package = "dag", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false } +dag-756126593a4c2d51 = { package = "dag", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } dashmap = { version = "5", default-features = false } data-encoding = { version = "2", features = ["alloc", "std"] } datatest-stable = { version = "0.1", default-features = false } @@ -147,7 +150,8 @@ 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 = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } +executor-3eed1dbf76d1f5fa = { package = "executor", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false } +executor-756126593a4c2d51 = { package = "executor", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", 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 } @@ -251,7 +255,6 @@ match_opt = { version = "0.1", default-features = false } matchers = { version = "0.1", default-features = false } matches = { version = "0.1", default-features = false } matchit = { version = "0.5" } -maybe-uninit = { version = "2", default-features = false } memchr = { version = "2", features = ["std", "use_std"] } memoffset = { version = "0.6" } merlin = { version = "2", default-features = false } @@ -298,14 +301,17 @@ move-vm-types = { git = "https://github.com/move-language/move", rev = "ae62d5f1 multiaddr = { version = "0.14", features = ["url"] } multihash = { version = "0.16", default-features = false, features = ["alloc", "derive", "identity", "multihash-derive", "multihash-impl", "std"] } multimap = { version = "0.8", default-features = false } -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4", default-features = false } +mysten-network-9c745ecfd9cc7dc3 = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4", default-features = false } +mysten-network-8ce21ee9457846fc = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "af52637e73332eba7c8844e9bcdeb5b48854eabf", 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 = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } +network-3eed1dbf76d1f5fa = { package = "network", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false } +network-756126593a4c2d51 = { package = "network", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } nexlint = { git = "https://github.com/nextest-rs/nexlint.git", rev = "a10989ee09bedfc8690135e118243d19dd004fd0", default-features = false } nexlint-lints = { git = "https://github.com/nextest-rs/nexlint.git", rev = "a10989ee09bedfc8690135e118243d19dd004fd0", default-features = false } nibble_vec = { version = "0.1", default-features = false } -node = { git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false, features = ["benchmark"] } +node-3eed1dbf76d1f5fa = { package = "node", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false, features = ["benchmark"] } +node-756126593a4c2d51 = { package = "node", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } 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 } @@ -357,7 +363,8 @@ 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 = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false, features = ["benchmark"] } +primary-3eed1dbf76d1f5fa = { package = "primary", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false, features = ["benchmark"] } +primary-756126593a4c2d51 = { package = "primary", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } 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"] } @@ -406,7 +413,7 @@ scopeguard = { version = "1", features = ["use_std"] } sct-3b31131e45eafb45 = { package = "sct", version = "0.6", default-features = false } sct-ca01ad9e24f5d932 = { package = "sct", version = "0.7", default-features = false } semver-dff4ba8e3ae991db = { package = "semver", version = "1", features = ["serde", "std"] } -send_wrapper = { version = "0.6", 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"] } serde-hjson = { version = "0.9", default-features = false } @@ -509,9 +516,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 = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4", default-features = false } +typed-store-9c745ecfd9cc7dc3 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4", default-features = false } +typed-store-8ce21ee9457846fc = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "af52637e73332eba7c8844e9bcdeb5b48854eabf", default-features = false } typenum = { version = "1", default-features = false } -types = { git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d" } +types-3eed1dbf76d1f5fa = { package = "types", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900" } +types-756126593a4c2d51 = { package = "types", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d" } ucd-trie = { version = "0.1", features = ["std"] } uncased = { version = "0.9", default-features = false } unescape = { version = "0.1", default-features = false } @@ -544,13 +553,15 @@ 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 = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false, features = ["benchmark"] } -workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } +worker-3eed1dbf76d1f5fa = { package = "worker", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false, features = ["benchmark"] } +worker-756126593a4c2d51 = { package = "worker", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } +workspace-hack-3eed1dbf76d1f5fa = { package = "workspace-hack", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false } +workspace-hack-756126593a4c2d51 = { package = "workspace-hack", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", 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 } -[target.'cfg(not(windows))'.build-dependencies] +[build-dependencies] Inflector = { version = "0.11", default-features = false } addr2line = { version = "0.17", default-features = false } adler = { version = "1", default-features = false } @@ -589,14 +600,14 @@ axum-core = { version = "0.2", default-features = false } backoff = { version = "0.4", features = ["futures", "futures-core", "pin-project-lite", "tokio", "tokio_1"] } backtrace = { version = "0.3", features = ["std"] } base64 = { version = "0.13", features = ["alloc", "std"] } -base64ct = { version = "1.5.1", default-features = false, features = ["alloc"] } +base64ct = { version = "1", default-features = false, features = ["alloc"] } bcs = { version = "0.1", default-features = false } beef = { version = "0.5", features = ["impl_serde", "serde"] } better_any = { version = "0.1", default-features = false } better_typeid_derive = { version = "0.1", default-features = false } bimap = { version = "0.6", features = ["std"] } bincode = { version = "1", default-features = false } -bindgen = { version = "0.60", default-features = false, features = ["runtime"] } +bindgen = { version = "0.59", default-features = false, features = ["runtime"] } bit-set = { version = "0.5", features = ["std"] } bit-vec = { version = "0.6", default-features = false, features = ["std"] } bitflags = { version = "1" } @@ -640,36 +651,39 @@ 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-3eed1dbf76d1f5fa = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } +config-3eed1dbf76d1f5fa = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false } +config-756126593a4c2d51 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", 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 = "3cf68183b22acfe014118ef2713d5094159f2f4d", features = ["benchmark", "rand"] } +consensus-3eed1dbf76d1f5fa = { package = "consensus", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", features = ["benchmark", "rand"] } +consensus-756126593a4c2d51 = { package = "consensus", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", features = ["rand"] } console-api = { version = "0.3", default-features = false, features = ["transport"] } console-subscriber = { version = "0.1", features = ["env-filter"] } constant_time_eq = { version = "0.1", default-features = false } core2 = { version = "0.4", default-features = false, features = ["alloc"] } crc = { version = "2", default-features = false } -crc-catalog = { version = "2", default-features = false } +crc-catalog = { version = "1", default-features = false } crc32fast = { version = "1", features = ["std"] } criterion = { version = "0.3", features = ["cargo_bench_support"] } criterion-plot = { version = "0.4", default-features = false } crossbeam = { version = "0.8", features = ["alloc", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", "crossbeam-queue", "std"] } -crossbeam-channel-9fbad63c4bcf4a8f = { package = "crossbeam-channel", version = "0.4", default-features = false } -crossbeam-channel-d8f496e17d97b5cb = { package = "crossbeam-channel", version = "0.5", features = ["crossbeam-utils", "std"] } +crossbeam-channel = { version = "0.5", features = ["crossbeam-utils", "std"] } crossbeam-deque = { version = "0.8", features = ["crossbeam-epoch", "crossbeam-utils", "std"] } crossbeam-epoch = { version = "0.9", default-features = false, features = ["alloc", "lazy_static", "std"] } crossbeam-queue = { version = "0.3", features = ["alloc", "std"] } -crossbeam-utils-ca01ad9e24f5d932 = { package = "crossbeam-utils", version = "0.7", features = ["lazy_static", "std"] } -crossbeam-utils-c38e5c1d305a1b54 = { package = "crossbeam-utils", version = "0.8", features = ["lazy_static", "std"] } +crossbeam-utils = { version = "0.8", features = ["lazy_static", "std"] } crossterm-647d43efb71741da = { package = "crossterm", version = "0.21" } crossterm-3c51e837cfc5589a = { package = "crossterm", version = "0.22" } -crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d" } +crossterm-2b5c6dc72f624058 = { package = "crossterm", version = "0.23" } +crypto-3eed1dbf76d1f5fa = { package = "crypto", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900" } +crypto-756126593a4c2d51 = { package = "crypto", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d" } crypto-common = { version = "0.1", default-features = false, features = ["std"] } crypto-mac = { version = "0.8", default-features = false, features = ["std"] } 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 = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } +dag-3eed1dbf76d1f5fa = { package = "dag", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false } +dag-756126593a4c2d51 = { package = "dag", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", 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"] } @@ -708,10 +722,12 @@ ed25519-dalek = { version = "1", features = ["batch", "merlin", "rand", "serde", ed25519-dalek-fiat = { version = "0.1", default-features = false, features = ["fiat_u64_backend", "rand", "serde", "serde_bytes", "serde_crate", "std"] } either = { version = "1", features = ["use_std"] } endian-type = { version = "0.1", default-features = false } +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 = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } +executor-3eed1dbf76d1f5fa = { package = "executor", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false } +executor-756126593a4c2d51 = { package = "executor", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", 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 } @@ -825,7 +841,6 @@ match_opt = { version = "0.1", default-features = false } matchers = { version = "0.1", default-features = false } matches = { version = "0.1", default-features = false } matchit = { version = "0.5" } -maybe-uninit = { version = "2", default-features = false } memchr = { version = "2", features = ["std", "use_std"] } memoffset = { version = "0.6" } merlin = { version = "2", default-features = false } @@ -874,15 +889,18 @@ 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 = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4", default-features = false } +mysten-network-9c745ecfd9cc7dc3 = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4", default-features = false } +mysten-network-8ce21ee9457846fc = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "af52637e73332eba7c8844e9bcdeb5b48854eabf", default-features = false } name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4", 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 = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } +network-3eed1dbf76d1f5fa = { package = "network", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false } +network-756126593a4c2d51 = { package = "network", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } nexlint = { git = "https://github.com/nextest-rs/nexlint.git", rev = "a10989ee09bedfc8690135e118243d19dd004fd0", default-features = false } nexlint-lints = { git = "https://github.com/nextest-rs/nexlint.git", rev = "a10989ee09bedfc8690135e118243d19dd004fd0", default-features = false } nibble_vec = { version = "0.1", default-features = false } -node = { git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false, features = ["benchmark"] } +node-3eed1dbf76d1f5fa = { package = "node", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false, features = ["benchmark"] } +node-756126593a4c2d51 = { package = "node", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } 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 } @@ -946,7 +964,8 @@ 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 = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false, features = ["benchmark"] } +primary-3eed1dbf76d1f5fa = { package = "primary", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false, features = ["benchmark"] } +primary-756126593a4c2d51 = { package = "primary", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } 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 } @@ -1011,7 +1030,7 @@ sct-ca01ad9e24f5d932 = { package = "sct", version = "0.7", default-features = fa semver-a6292c17cd707f01 = { package = "semver", version = "0.11" } semver-dff4ba8e3ae991db = { package = "semver", version = "1", features = ["serde", "std"] } semver-parser = { version = "0.10", default-features = false } -send_wrapper = { version = "0.6", 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"] } serde-hjson = { version = "0.9", default-features = false } @@ -1131,9 +1150,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 = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4", default-features = false } +typed-store-9c745ecfd9cc7dc3 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4", default-features = false } +typed-store-8ce21ee9457846fc = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "af52637e73332eba7c8844e9bcdeb5b48854eabf", default-features = false } typenum = { version = "1", default-features = false } -types = { git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d" } +types-3eed1dbf76d1f5fa = { package = "types", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900" } +types-756126593a4c2d51 = { package = "types", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d" } ucd-trie = { version = "0.1", features = ["std"] } uncased = { version = "0.9", default-features = false } unescape = { version = "0.1", default-features = false } @@ -1178,8 +1199,10 @@ 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 = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false, features = ["benchmark"] } -workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } +worker-3eed1dbf76d1f5fa = { package = "worker", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false, features = ["benchmark"] } +worker-756126593a4c2d51 = { package = "worker", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", default-features = false } +workspace-hack-3eed1dbf76d1f5fa = { package = "workspace-hack", git = "https://github.com/MystenLabs/narwhal", rev = "05fa85552c49f0775a47d72c37074c9ca1754900", default-features = false } +workspace-hack-756126593a4c2d51 = { package = "workspace-hack", git = "https://github.com/MystenLabs/narwhal", rev = "3cf68183b22acfe014118ef2713d5094159f2f4d", 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 } diff --git a/rust-toolchain b/rust-toolchain index 4d5fde5bd1654..76d0536205683 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.60.0 +1.62.0