From 262280acbba9f0cbbe5e53986988c54c31a502fe Mon Sep 17 00:00:00 2001 From: huitseeker Date: Fri, 16 Sep 2022 03:09:53 +0000 Subject: [PATCH 1/2] chore(deps) Update the Narwhal pointer --- Cargo.lock | 48 ++++++++++++++++---------------- crates/sui-benchmark/Cargo.toml | 2 +- crates/sui-config/Cargo.toml | 4 +-- crates/sui-core/Cargo.toml | 10 +++---- crates/sui-tool/Cargo.toml | 2 +- crates/sui-types/Cargo.toml | 2 +- crates/sui/Cargo.toml | 2 +- crates/workspace-hack/Cargo.toml | 48 ++++++++++++++++---------------- 8 files changed, 59 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 26b574ec8f750..1100e176257c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1135,7 +1135,7 @@ dependencies = [ [[package]] name = "config" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1#42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" +source = "git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f#a9723c28dbe6515bfc7504e24078eed3f6199f6f" dependencies = [ "arc-swap", "crypto", @@ -1148,7 +1148,7 @@ dependencies = [ "serde_with 2.0.1", "thiserror", "tracing", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f)", ] [[package]] @@ -1170,7 +1170,7 @@ dependencies = [ [[package]] name = "consensus" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1#42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" +source = "git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f#a9723c28dbe6515bfc7504e24078eed3f6199f6f" dependencies = [ "arc-swap", "bincode", @@ -1192,7 +1192,7 @@ dependencies = [ "tracing", "typed-store", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f)", ] [[package]] @@ -1459,7 +1459,7 @@ dependencies = [ [[package]] name = "crypto" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1#42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" +source = "git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f#a9723c28dbe6515bfc7504e24078eed3f6199f6f" dependencies = [ "base64ct", "blake2", @@ -1483,7 +1483,7 @@ dependencies = [ "serde_with 2.0.1", "signature", "tokio", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f)", "zeroize", ] @@ -1596,7 +1596,7 @@ dependencies = [ [[package]] name = "dag" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1#42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" +source = "git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f#a9723c28dbe6515bfc7504e24078eed3f6199f6f" dependencies = [ "arc-swap", "dashmap", @@ -1607,7 +1607,7 @@ dependencies = [ "rayon", "serde 1.0.144", "thiserror", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f)", ] [[package]] @@ -2153,7 +2153,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "executor" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1#42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" +source = "git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f#a9723c28dbe6515bfc7504e24078eed3f6199f6f" dependencies = [ "async-trait", "backoff", @@ -2179,7 +2179,7 @@ dependencies = [ "tracing", "typed-store", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f)", ] [[package]] @@ -4559,7 +4559,7 @@ checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e" [[package]] name = "network" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1#42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" +source = "git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f#a9723c28dbe6515bfc7504e24078eed3f6199f6f" dependencies = [ "anemo", "anyhow", @@ -4581,7 +4581,7 @@ dependencies = [ "tonic", "tracing", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f)", ] [[package]] @@ -4640,7 +4640,7 @@ dependencies = [ [[package]] name = "node" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1#42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" +source = "git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f#a9723c28dbe6515bfc7504e24078eed3f6199f6f" dependencies = [ "anemo", "arc-swap", @@ -4677,7 +4677,7 @@ dependencies = [ "types", "url", "worker", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f)", ] [[package]] @@ -5424,7 +5424,7 @@ dependencies = [ [[package]] name = "primary" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1#42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" +source = "git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f#a9723c28dbe6515bfc7504e24078eed3f6199f6f" dependencies = [ "anemo", "anyhow", @@ -5461,7 +5461,7 @@ dependencies = [ "tracing", "typed-store", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f)", ] [[package]] @@ -7107,7 +7107,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "storage" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1#42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" +source = "git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f#a9723c28dbe6515bfc7504e24078eed3f6199f6f" dependencies = [ "dashmap", "fastcrypto", @@ -7119,7 +7119,7 @@ dependencies = [ "tracing", "typed-store", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f)", ] [[package]] @@ -8966,7 +8966,7 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "types" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1#42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" +source = "git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f#a9723c28dbe6515bfc7504e24078eed3f6199f6f" dependencies = [ "anemo", "anemo-build", @@ -9001,7 +9001,7 @@ dependencies = [ "tonic-build 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", "typed-store", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f)", ] [[package]] @@ -9508,7 +9508,7 @@ dependencies = [ [[package]] name = "worker" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1#42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" +source = "git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f#a9723c28dbe6515bfc7504e24078eed3f6199f6f" dependencies = [ "anemo", "async-trait", @@ -9535,7 +9535,7 @@ dependencies = [ "tracing", "typed-store", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f)", ] [[package]] @@ -10286,7 +10286,7 @@ dependencies = [ "windows_x86_64_msvc", "winreg", "worker", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f)", "x509-parser", "yaml-rust", "yansi", @@ -10299,7 +10299,7 @@ dependencies = [ [[package]] name = "workspace-hack" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1#42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" +source = "git+https://github.com/MystenLabs/narwhal?rev=a9723c28dbe6515bfc7504e24078eed3f6199f6f#a9723c28dbe6515bfc7504e24078eed3f6199f6f" dependencies = [ "addr2line", "adler", diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml index 97abbc8466e80..241107ab481ca 100644 --- a/crates/sui-benchmark/Cargo.toml +++ b/crates/sui-benchmark/Cargo.toml @@ -40,7 +40,7 @@ sui-node = { path = "../sui-node" } sui-json-rpc-types = { path = "../sui-json-rpc-types" } move-core-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e", features = ["address20"] } -narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", package = "node" } +narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", package = "node" } workspace-hack = { path = "../workspace-hack"} test-utils = { path = "../test-utils" } diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml index 98096b7372859..3c04eb774cbcd 100644 --- a/crates/sui-config/Cargo.toml +++ b/crates/sui-config/Cargo.toml @@ -25,8 +25,8 @@ move-binary-format = { git = "https://github.com/move-language/move", rev = "e1e move-package = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" } move-core-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e", features = ["address20"] } move-vm-runtime = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" } -narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", package = "config" } -narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", package = "crypto" } +narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", package = "config" } +narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", package = "crypto" } sui-framework = { path = "../sui-framework" } sui-adapter = { path = "../sui-adapter" } diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml index ba6164eb64c12..611c98f4318ce 100644 --- a/crates/sui-core/Cargo.toml +++ b/crates/sui-core/Cargo.toml @@ -50,11 +50,11 @@ typed-store = "0.1.0" typed-store-derive = "0.1.0" mysten-network = "0.1.0" -narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", package = "config" } -narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", package = "consensus" } -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", package = "executor" } -narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", package = "types" } -narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", package = "node", features = ["trace_transaction"] } +narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", package = "config" } +narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", package = "consensus" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", package = "executor" } +narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", package = "types" } +narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", package = "node", features = ["trace_transaction"] } fastcrypto = "0.1.2" workspace-hack = { path = "../workspace-hack"} diff --git a/crates/sui-tool/Cargo.toml b/crates/sui-tool/Cargo.toml index 942755e26d27e..a0d0e2216d40c 100644 --- a/crates/sui-tool/Cargo.toml +++ b/crates/sui-tool/Cargo.toml @@ -20,7 +20,7 @@ rocksdb = "0.19.0" typed-store = "0.1.0" typed-store-derive = "0.1.0" tempfile = "3.3.0" -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", package = "executor" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", package = "executor" } serde_with = { version = "1.14.0", features = ["hex"] } sui-storage = { path = "../sui-storage" } strum_macros = "^0.24" diff --git a/crates/sui-types/Cargo.toml b/crates/sui-types/Cargo.toml index 5a2ca1f7ae217..6b859e75273a1 100644 --- a/crates/sui-types/Cargo.toml +++ b/crates/sui-types/Cargo.toml @@ -50,7 +50,7 @@ move-disassembler = { git = "https://github.com/move-language/move", rev = "e1e6 move-ir-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" } move-vm-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" } -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", package = "executor" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", package = "executor" } fastcrypto = { version = "0.1.2", features = ["copy_key"] } diff --git a/crates/sui/Cargo.toml b/crates/sui/Cargo.toml index 0aeabd2b9c0b4..c47035583305f 100644 --- a/crates/sui/Cargo.toml +++ b/crates/sui/Cargo.toml @@ -43,7 +43,7 @@ typed-store = "0.1.0" typed-store-derive = "0.1.0" tempfile = "3.3.0" -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", package = "executor" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", package = "executor" } move-core-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e", features = ["address20"] } move-prover = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" } diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml index ad8076b5d1646..27da41983a4a3 100644 --- a/crates/workspace-hack/Cargo.toml +++ b/crates/workspace-hack/Cargo.toml @@ -97,9 +97,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-3d441de198b5c8cb = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false } +config-8cd34a015cac6e09 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", 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 = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", features = ["benchmark", "rand"] } +consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", 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 } @@ -118,7 +118,7 @@ crossterm-647d43efb71741da = { package = "crossterm", version = "0.21" } crossterm-3c51e837cfc5589a = { package = "crossterm", version = "0.22" } crossterm-2b5c6dc72f624058 = { package = "crossterm", version = "0.23" } crossterm-2ffb4c3fe830441c = { package = "crossterm", version = "0.25", features = ["bracketed-paste"] } -crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" } +crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f" } 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"] } @@ -127,7 +127,7 @@ csv-core = { version = "0.1" } curve25519-dalek = { version = "3", default-features = false, features = ["serde", "u64_backend"] } curve25519-dalek-fiat = { version = "0.1", default-features = false, features = ["alloc", "fiat-crypto", "fiat_u64_backend", "std"] } curve25519-dalek-ng = { version = "4", features = ["alloc", "serde", "std", "u64_backend"] } -dag = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false } +dag = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", default-features = false } dashmap = { version = "5", default-features = false } data-encoding = { version = "2", features = ["alloc", "std"] } datatest-stable = { version = "0.1", default-features = false } @@ -164,7 +164,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 = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false } +executor = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", default-features = false } eyre = { version = "0.6", features = ["auto-install", "track-caller"] } fail = { version = "0.4", default-features = false } fastcrypto = { version = "0.1", features = ["copy_key"] } @@ -322,11 +322,11 @@ mysten-network = { version = "0.1", default-features = false } mysten-util-mem = { git = "https://github.com/MystenLabs/mysten-infra", features = ["estimate-heapsize", "hashbrown", "parking_lot", "smallvec", "std"] } named-lock = { version = "0.1", default-features = false } nested = { version = "0.1", default-features = false } -network = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false } +network = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", 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 = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false, features = ["benchmark", "trace_transaction"] } +node = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", default-features = false, features = ["benchmark", "trace_transaction"] } 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 } @@ -381,7 +381,7 @@ predicates-core = { version = "1", default-features = false } predicates-tree = { version = "1", default-features = false } pretty = { version = "0.10", default-features = false } pretty_assertions = { version = "1", features = ["std"] } -primary = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false, features = ["benchmark"] } +primary = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", 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"] } @@ -490,7 +490,7 @@ sqlx-core = { version = "0.6", default-features = false, features = ["_rt-tokio" sqlx-rt = { version = "0.6", default-features = false, features = ["_rt-tokio", "_tls-rustls", "once_cell", "runtime-tokio-rustls", "tokio", "tokio-rustls"] } stable_deref_trait = { version = "1", features = ["alloc", "std"] } static_assertions = { version = "1", default-features = false } -storage = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false } +storage = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", default-features = false } stringprep = { version = "0.1", default-features = false } strip-ansi-escapes = { version = "0.1", default-features = false } strsim-93f6ce9d446188ac = { package = "strsim", version = "0.10", default-features = false } @@ -558,7 +558,7 @@ twox-hash = { version = "1", default-features = false } typed-arena = { version = "2", features = ["std"] } typed-store = { version = "0.1", default-features = false } typenum = { version = "1", default-features = false } -types = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" } +types = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f" } ucd-trie = { version = "0.1", default-features = false, features = ["std"] } uncased = { version = "0.9", default-features = false } unescape = { version = "0.1", default-features = false } @@ -592,8 +592,8 @@ web-sys = { version = "0.3", default-features = false, features = ["BinaryType", webpki = { version = "0.22", default-features = false, features = ["alloc", "std"] } webpki-roots = { version = "0.22", default-features = false } whoami = { version = "1" } -worker = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false, features = ["benchmark", "trace_transaction"] } -workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false } +worker = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", default-features = false, features = ["benchmark", "trace_transaction"] } +workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", default-features = false } x509-parser = { version = "0.14" } yaml-rust = { version = "0.4", default-features = false } yansi = { version = "0.5", default-features = false } @@ -705,9 +705,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-3d441de198b5c8cb = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false } +config-8cd34a015cac6e09 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", 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 = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", features = ["benchmark", "rand"] } +consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", 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 } @@ -726,7 +726,7 @@ crossterm-647d43efb71741da = { package = "crossterm", version = "0.21" } crossterm-3c51e837cfc5589a = { package = "crossterm", version = "0.22" } crossterm-2b5c6dc72f624058 = { package = "crossterm", version = "0.23" } crossterm-2ffb4c3fe830441c = { package = "crossterm", version = "0.25", features = ["bracketed-paste"] } -crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" } +crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f" } 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"] } @@ -735,7 +735,7 @@ csv-core = { version = "0.1" } curve25519-dalek = { version = "3", default-features = false, features = ["serde", "u64_backend"] } curve25519-dalek-fiat = { version = "0.1", default-features = false, features = ["alloc", "fiat-crypto", "fiat_u64_backend", "std"] } curve25519-dalek-ng = { version = "4", features = ["alloc", "serde", "std", "u64_backend"] } -dag = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false } +dag = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", 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"] } @@ -784,7 +784,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 = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false } +executor = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", default-features = false } eyre = { version = "0.6", features = ["auto-install", "track-caller"] } fail = { version = "0.4", default-features = false } fastcrypto = { version = "0.1", features = ["copy_key"] } @@ -959,11 +959,11 @@ mysten-util-mem-derive = { git = "https://github.com/MystenLabs/mysten-infra", d name-variant = { version = "0.1", 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 = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false } +network = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", 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 = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false, features = ["benchmark", "trace_transaction"] } +node = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", default-features = false, features = ["benchmark", "trace_transaction"] } 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 } @@ -1032,7 +1032,7 @@ predicates-tree = { version = "1", default-features = false } pretty = { version = "0.10", default-features = false } pretty_assertions = { version = "1", features = ["std"] } prettyplease = { version = "0.1", default-features = false } -primary = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false, features = ["benchmark"] } +primary = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", 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"] } @@ -1168,7 +1168,7 @@ sqlx-macros = { version = "0.6", default-features = false, features = ["_rt-toki sqlx-rt = { version = "0.6", default-features = false, features = ["_rt-tokio", "_tls-rustls", "once_cell", "runtime-tokio-rustls", "tokio", "tokio-rustls"] } stable_deref_trait = { version = "1", features = ["alloc", "std"] } static_assertions = { version = "1", default-features = false } -storage = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false } +storage = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", default-features = false } stringprep = { version = "0.1", default-features = false } strip-ansi-escapes = { version = "0.1", default-features = false } strsim-93f6ce9d446188ac = { package = "strsim", version = "0.10", default-features = false } @@ -1252,7 +1252,7 @@ typed-arena = { version = "2", features = ["std"] } typed-store = { version = "0.1", default-features = false } typed-store-derive = { version = "0.1", default-features = false } typenum = { version = "1", default-features = false } -types = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1" } +types = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f" } ucd-trie = { version = "0.1", default-features = false, features = ["std"] } uncased = { version = "0.9", default-features = false } unescape = { version = "0.1", default-features = false } @@ -1298,8 +1298,8 @@ webpki = { version = "0.22", default-features = false, features = ["alloc", "std webpki-roots = { version = "0.22", default-features = false } which = { version = "4", default-features = false } whoami = { version = "1" } -worker = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false, features = ["benchmark", "trace_transaction"] } -workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "42925c2d7eaf0d4a77e7069bff4d2c781ad5b3c1", default-features = false } +worker = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", default-features = false, features = ["benchmark", "trace_transaction"] } +workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "a9723c28dbe6515bfc7504e24078eed3f6199f6f", default-features = false } x509-parser = { version = "0.14" } yaml-rust = { version = "0.4", default-features = false } yansi = { version = "0.5", default-features = false } From 3ab2a481274068710f7193056e08b741f137b483 Mon Sep 17 00:00:00 2001 From: Mingwei Tian Date: Thu, 15 Sep 2022 20:08:21 -0700 Subject: [PATCH 2/2] fix snapshot --- .../snapshot_tests__network_config_snapshot_matches.snap | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap b/crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap index 7cf50bd84110e..183cc9121c98e 100644 --- a/crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap +++ b/crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap @@ -26,6 +26,7 @@ validator_configs: batch_size: 500000 max_batch_delay: 100ms block_synchronizer: + range_synchronize_timeout: 30000ms certificates_synchronize_timeout: 30000ms payload_synchronize_timeout: 30000ms payload_availability_timeout: 30000ms @@ -68,6 +69,7 @@ validator_configs: batch_size: 500000 max_batch_delay: 100ms block_synchronizer: + range_synchronize_timeout: 30000ms certificates_synchronize_timeout: 30000ms payload_synchronize_timeout: 30000ms payload_availability_timeout: 30000ms @@ -110,6 +112,7 @@ validator_configs: batch_size: 500000 max_batch_delay: 100ms block_synchronizer: + range_synchronize_timeout: 30000ms certificates_synchronize_timeout: 30000ms payload_synchronize_timeout: 30000ms payload_availability_timeout: 30000ms @@ -152,6 +155,7 @@ validator_configs: batch_size: 500000 max_batch_delay: 100ms block_synchronizer: + range_synchronize_timeout: 30000ms certificates_synchronize_timeout: 30000ms payload_synchronize_timeout: 30000ms payload_availability_timeout: 30000ms @@ -194,6 +198,7 @@ validator_configs: batch_size: 500000 max_batch_delay: 100ms block_synchronizer: + range_synchronize_timeout: 30000ms certificates_synchronize_timeout: 30000ms payload_synchronize_timeout: 30000ms payload_availability_timeout: 30000ms @@ -236,6 +241,7 @@ validator_configs: batch_size: 500000 max_batch_delay: 100ms block_synchronizer: + range_synchronize_timeout: 30000ms certificates_synchronize_timeout: 30000ms payload_synchronize_timeout: 30000ms payload_availability_timeout: 30000ms @@ -278,6 +284,7 @@ validator_configs: batch_size: 500000 max_batch_delay: 100ms block_synchronizer: + range_synchronize_timeout: 30000ms certificates_synchronize_timeout: 30000ms payload_synchronize_timeout: 30000ms payload_availability_timeout: 30000ms