From 6c009b9b0fb214402f3caf361ea4f888f0f9c9b4 Mon Sep 17 00:00:00 2001 From: mwtian <81660174+mwtian@users.noreply.github.com> Date: Fri, 5 Aug 2022 08:26:38 -0700 Subject: [PATCH] Bump `mysten-infra` version (#3777) --- Cargo.lock | 64 +++++++++++++++--------------- crates/sui-benchmark/Cargo.toml | 2 +- crates/sui-cluster-test/Cargo.toml | 2 +- crates/sui-core/Cargo.toml | 8 ++-- crates/sui-faucet/Cargo.toml | 2 +- crates/sui-gateway/Cargo.toml | 4 +- crates/sui-network/Cargo.toml | 2 +- crates/sui-node/Cargo.toml | 6 +-- crates/sui-storage/Cargo.toml | 6 +-- crates/sui-swarm/Cargo.toml | 4 +- crates/sui-tool/Cargo.toml | 8 ++-- crates/sui-types/Cargo.toml | 6 +-- crates/sui/Cargo.toml | 10 ++--- crates/workspace-hack/Cargo.toml | 16 ++++---- 14 files changed, 70 insertions(+), 70 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7fcde4f769b68..4aea308c40278 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4140,7 +4140,7 @@ dependencies = [ [[package]] name = "mysten-network" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f#a4c2cae59d823533061a5d8fe28771629819c43f" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=c6dc7a23a40b3517f138d122a76d3bc15f844f67#c6dc7a23a40b3517f138d122a76d3bc15f844f67" dependencies = [ "anyhow", "bincode", @@ -4161,7 +4161,7 @@ dependencies = [ [[package]] name = "mysten-network" version = "0.1.0" -source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=c6dc7a23a40b3517f138d122a76d3bc15f844f67#c6dc7a23a40b3517f138d122a76d3bc15f844f67" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa#d965a5a795dcdb4d1c7964acf556bc249fdc58aa" dependencies = [ "anyhow", "bincode", @@ -4182,7 +4182,7 @@ dependencies = [ [[package]] name = "name-variant" version = "1.0.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f#a4c2cae59d823533061a5d8fe28771629819c43f" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa#d965a5a795dcdb4d1c7964acf556bc249fdc58aa" dependencies = [ "proc-macro2 1.0.42", "quote 1.0.20", @@ -6702,12 +6702,12 @@ dependencies = [ "sui-sdk", "sui-swarm", "sui-types", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "tempfile", "test-utils", "tokio", "tracing", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "typed-store-macros", "unescape", "workspace-hack 0.1.0", @@ -6774,7 +6774,7 @@ dependencies = [ "sui-quorum-driver", "sui-sdk", "sui-types", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "tempfile", "test-utils", "tokio", @@ -6804,7 +6804,7 @@ dependencies = [ "sui-sdk", "sui-swarm", "sui-types", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "tempfile", "test-utils", "tokio", @@ -6865,7 +6865,7 @@ dependencies = [ "move-package", "move-vm-runtime", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "node", "once_cell", "parking_lot 0.12.1", @@ -6889,7 +6889,7 @@ dependencies = [ "sui-storage", "sui-types", "tap", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "tempfile", "test-fuzz", "test-utils", @@ -6897,7 +6897,7 @@ dependencies = [ "tokio-retry", "tokio-stream", "tracing", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "typed-store-macros", "types", "workspace-hack 0.1.0", @@ -6917,7 +6917,7 @@ dependencies = [ "sui-config", "sui-json-rpc-types", "sui-types", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "test-utils", "thiserror", "tokio", @@ -6974,7 +6974,7 @@ dependencies = [ "clap 3.1.18", "futures", "move-package", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "prometheus", "serde 1.0.141", "sui-config", @@ -6986,7 +6986,7 @@ dependencies = [ "sui-node", "sui-sdk", "sui-types", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "test-utils", "tokio", "tracing", @@ -7064,7 +7064,7 @@ name = "sui-network" version = "0.0.0" dependencies = [ "async-trait", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "sui-types", "tonic", "tonic-build 0.7.2 (git+https://github.com/hyperium/tonic.git?rev=de2e4ac077c076736dc451f3415ea7da1a61a560)", @@ -7082,7 +7082,7 @@ dependencies = [ "jemalloc-ctl", "jemallocator", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "parking_lot 0.12.1", "prometheus", "sui-config", @@ -7092,10 +7092,10 @@ dependencies = [ "sui-storage", "sui-telemetry", "sui-types", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "tokio", "tracing", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "workspace-hack 0.1.0", ] @@ -7196,12 +7196,12 @@ dependencies = [ "strum", "strum_macros", "sui-types", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "tempfile", "tokio", "tokio-stream", "tracing", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "typed-store-macros", "workspace-hack 0.1.0", ] @@ -7212,13 +7212,13 @@ version = "0.0.0" dependencies = [ "anyhow", "futures", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "rand 0.7.3", "sui-config", "sui-node", "sui-types", "tap", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "tempfile", "tokio", "tonic-health", @@ -7246,7 +7246,7 @@ dependencies = [ "colored", "executor", "futures", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "rocksdb", "serde 1.0.141", "serde_with 1.14.0", @@ -7256,12 +7256,12 @@ dependencies = [ "sui-core", "sui-storage", "sui-types", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "tempfile", "textwrap 0.15.0", "tokio", "tracing", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "typed-store-macros", "workspace-hack 0.1.0", ] @@ -7333,7 +7333,7 @@ dependencies = [ "thiserror", "tonic", "tracing", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "typed-store-macros", "workspace-hack 0.1.0", "zeroize", @@ -7454,7 +7454,7 @@ dependencies = [ [[package]] name = "telemetry-subscribers" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f#a4c2cae59d823533061a5d8fe28771629819c43f" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa#d965a5a795dcdb4d1c7964acf556bc249fdc58aa" dependencies = [ "crossterm 0.24.0", "once_cell", @@ -8239,7 +8239,7 @@ dependencies = [ [[package]] name = "typed-store" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f#a4c2cae59d823533061a5d8fe28771629819c43f" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa#d965a5a795dcdb4d1c7964acf556bc249fdc58aa" dependencies = [ "anyhow", "bincode", @@ -8257,7 +8257,7 @@ dependencies = [ [[package]] name = "typed-store-macros" version = "0.0.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f#a4c2cae59d823533061a5d8fe28771629819c43f" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa#d965a5a795dcdb4d1c7964acf556bc249fdc58aa" dependencies = [ "anyhow", "fdlimit", @@ -8268,7 +8268,7 @@ dependencies = [ "syn 1.0.98", "tempfile", "tokio", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", ] [[package]] @@ -9230,8 +9230,8 @@ dependencies = [ "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?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", "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?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "name-variant", "named-lock", "nested", @@ -9450,7 +9450,7 @@ dependencies = [ "target-lexicon", "target-spec", "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?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "tempfile", "tera", "termcolor", @@ -9511,7 +9511,7 @@ dependencies = [ "twox-hash", "typed-arena", "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?rev=a4c2cae59d823533061a5d8fe28771629819c43f)", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "typed-store-macros", "typenum", "types", diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml index cea5e3ad74fbd..4ec49032ca8b4 100644 --- a/crates/sui-benchmark/Cargo.toml +++ b/crates/sui-benchmark/Cargo.toml @@ -22,7 +22,7 @@ rocksdb = "0.18.0" serde_with = { version = "1.14.0", features = ["hex"] } tracing = "0.1.36" tracing-subscriber = { version = "0.3.15", features = ["time", "registry", "env-filter"] } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } clap = { version = "3.1.17", features = ["derive"] } prometheus = "0.13.1" multiaddr = "0.14.0" diff --git a/crates/sui-cluster-test/Cargo.toml b/crates/sui-cluster-test/Cargo.toml index 489e6b0522e72..90cde33f661da 100644 --- a/crates/sui-cluster-test/Cargo.toml +++ b/crates/sui-cluster-test/Cargo.toml @@ -15,7 +15,7 @@ tokio = { version = "1.20.1", features = ["full"] } tracing = { version = "0.1.36", features = ["log"] } clap = { version = "3.1.14", features = ["derive"] } reqwest = { version = "0.11.11", features = ["blocking", "json"] } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } async-trait = "0.1.57" anyhow = { version = "1.0.58", features = ["backtrace"] } bcs = "0.1.3" diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml index 7c1dbc9402335..749dbb08ef8ae 100644 --- a/crates/sui-core/Cargo.toml +++ b/crates/sui-core/Cargo.toml @@ -46,9 +46,9 @@ move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "79 move-core-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a", features = ["address20"] } move-vm-runtime = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" } -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f"} -typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f"} -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa"} +typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa"} +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "259a37b487570763575e6b28f8b8057b16b3e916", package = "config" } narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "259a37b487570763575e6b28f8b8057b16b3e916", package = "consensus" } @@ -66,7 +66,7 @@ move-package = { git = "https://github.com/move-language/move", rev = "790715285 serde-reflection = "0.3.6" serde_yaml = "0.8.26" pretty_assertions = "1.2.1" -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } test-fuzz = "3.0.2" test-utils = { path = "../test-utils" } diff --git a/crates/sui-faucet/Cargo.toml b/crates/sui-faucet/Cargo.toml index 57e67771a8238..7298888e4ed30 100644 --- a/crates/sui-faucet/Cargo.toml +++ b/crates/sui-faucet/Cargo.toml @@ -25,7 +25,7 @@ sui = { path = "../sui" } sui-json-rpc-types= { path = "../sui-json-rpc-types" } sui-types = { path = "../sui-types" } sui-config = { path = "../sui-config" } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } workspace-hack = { path = "../workspace-hack"} [dev-dependencies] diff --git a/crates/sui-gateway/Cargo.toml b/crates/sui-gateway/Cargo.toml index c5f4a88f82141..1d1a440b2dbf0 100644 --- a/crates/sui-gateway/Cargo.toml +++ b/crates/sui-gateway/Cargo.toml @@ -15,7 +15,7 @@ tokio = { version = "1.20.1", features = ["full"] } futures = "0.3.21" prometheus = "0.13.1" clap = { version = "3.1.17", features = ["derive"] } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } sui-core = { path = "../sui-core" } sui-config = { path = "../sui-config" } @@ -25,7 +25,7 @@ sui-json-rpc = { path = "../sui-json-rpc" } sui-json-rpc-types= { path = "../sui-json-rpc-types" } sui-node = { path = "../sui-node" } -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } move-package = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" } workspace-hack = { path = "../workspace-hack"} diff --git a/crates/sui-network/Cargo.toml b/crates/sui-network/Cargo.toml index d7e2e3ba1bc1e..f0a9922927206 100644 --- a/crates/sui-network/Cargo.toml +++ b/crates/sui-network/Cargo.toml @@ -12,7 +12,7 @@ tonic = "0.7" sui-types = { path = "../sui-types" } -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } workspace-hack = { path = "../workspace-hack"} [build-dependencies] diff --git a/crates/sui-node/Cargo.toml b/crates/sui-node/Cargo.toml index de774d3857c0e..10090af9aaf9e 100644 --- a/crates/sui-node/Cargo.toml +++ b/crates/sui-node/Cargo.toml @@ -16,7 +16,7 @@ tokio = { version = "1.20.1", features = ["full"] } tracing = "0.1.36" parking_lot = "0.12.1" futures = "0.3.21" -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f"} +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa"} sui-config = { path = "../sui-config" } sui-core = { path = "../sui-core" } @@ -26,8 +26,8 @@ sui-json-rpc = { path = "../sui-json-rpc" } sui-telemetry = { path = "../sui-telemetry" } sui-types = { path = "../sui-types" } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } workspace-hack = { path = "../workspace-hack"} [target.'cfg(not(target_env = "msvc"))'.dependencies] diff --git a/crates/sui-storage/Cargo.toml b/crates/sui-storage/Cargo.toml index 9b6e568a78c22..2cb6d34536855 100644 --- a/crates/sui-storage/Cargo.toml +++ b/crates/sui-storage/Cargo.toml @@ -25,8 +25,8 @@ anyhow = "1.0.58" tempfile = "3.3.0" sui-types = { path = "../sui-types" } -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f"} -typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f"} +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa"} +typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa"} move-core-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a", features = ["address20"] } workspace-hack = { path = "../workspace-hack"} @@ -36,7 +36,7 @@ bcs = "0.1.3" tempfile = "3.3.0" num_cpus = "1.13.1" pretty_assertions = "1.2.0" -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } [[bench]] name = "write_ahead_log" diff --git a/crates/sui-swarm/Cargo.toml b/crates/sui-swarm/Cargo.toml index a86ab246faeae..fdf67a3046cc2 100644 --- a/crates/sui-swarm/Cargo.toml +++ b/crates/sui-swarm/Cargo.toml @@ -20,8 +20,8 @@ sui-config = { path = "../sui-config" } sui-node = { path = "../sui-node" } sui-types = { path = "../sui-types" } -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } workspace-hack = { path = "../workspace-hack"} [dev-dependencies] -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } diff --git a/crates/sui-tool/Cargo.toml b/crates/sui-tool/Cargo.toml index 01906657a0c51..1f2daa5d96ab7 100644 --- a/crates/sui-tool/Cargo.toml +++ b/crates/sui-tool/Cargo.toml @@ -11,13 +11,13 @@ anyhow = { version = "1.0.58", features = ["backtrace"] } tokio = { version = "1.20.1", features = ["full"] } tracing = "0.1.36" clap = { version = "3.1.17", features = ["derive"] } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } textwrap = "0.15" futures = "0.3.21" rocksdb = "0.18.0" -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f"} -typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f"} +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa"} +typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa"} tempfile = "3.3.0" narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "259a37b487570763575e6b28f8b8057b16b3e916", package = "executor" } serde_with = { version = "1.14.0", features = ["hex"] } diff --git a/crates/sui-types/Cargo.toml b/crates/sui-types/Cargo.toml index 8da8ec02b9a95..3b220f2ead7e1 100644 --- a/crates/sui-types/Cargo.toml +++ b/crates/sui-types/Cargo.toml @@ -40,9 +40,9 @@ enum_dispatch = "^0.3" # This version is incompatible with ed25519-dalek rand_latest = { version = "0.8.5", package = "rand" } -name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } -typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f"} +name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } +typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa"} move-binary-format = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" } move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" } diff --git a/crates/sui/Cargo.toml b/crates/sui/Cargo.toml index 3917f147b82ab..a7d531dcb2c2f 100644 --- a/crates/sui/Cargo.toml +++ b/crates/sui/Cargo.toml @@ -19,7 +19,7 @@ serde_with = { version = "1.14.0", features = ["hex"] } tracing = "0.1.36" bcs = "0.1.3" clap = { version = "3.1.17", features = ["derive"] } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } sui-core = { path = "../sui-core" } sui-framework = { path = "../sui-framework" } @@ -36,8 +36,8 @@ colored = "2.0.0" unescape = "0.1.0" shell-words = "1.1.0" rocksdb = "0.18.0" -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f"} -typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f"} +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa"} +typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa"} tempfile = "3.3.0" narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "259a37b487570763575e6b28f8b8057b16b3e916", package = "executor" } @@ -58,8 +58,8 @@ jemalloc-ctl = "^0.5" [dev-dependencies] tempfile = "3.3.0" futures = "0.3.21" -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f"} -typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f"} +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa"} +typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa"} jsonrpsee = { version = "0.15.1", features = ["full"] } test-utils = { path = "../test-utils" } diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml index f2370f159230a..9b72a0b26599e 100644 --- a/crates/workspace-hack/Cargo.toml +++ b/crates/workspace-hack/Cargo.toml @@ -310,7 +310,7 @@ 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-68692745110bd6f4 = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", default-features = false } -mysten-network-3025a98e4ce7513c = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f", default-features = false } +mysten-network-c8f591f3edbf04f9 = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", default-features = false } mysten-network-a2655ef8805d82bb = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "c6dc7a23a40b3517f138d122a76d3bc15f844f67", default-features = false } named-lock = { version = "0.1", default-features = false } nested = { version = "0.1", default-features = false } @@ -485,7 +485,7 @@ 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-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-3025a98e4ce7513c = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } +telemetry-subscribers-c8f591f3edbf04f9 = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", 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 } @@ -539,7 +539,7 @@ tui = { version = "0.17", features = ["crossterm"] } twox-hash = { version = "1", default-features = false } typed-arena = { version = "2", features = ["std"] } typed-store-68692745110bd6f4 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", default-features = false } -typed-store-3025a98e4ce7513c = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f", default-features = false } +typed-store-c8f591f3edbf04f9 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", default-features = false } typenum = { version = "1", default-features = false } types = { git = "https://github.com/MystenLabs/narwhal", rev = "259a37b487570763575e6b28f8b8057b16b3e916" } ucd-trie = { version = "0.1", features = ["std"] } @@ -919,9 +919,9 @@ multihash = { version = "0.16", default-features = false, features = ["alloc", " 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-3025a98e4ce7513c = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f", default-features = false } +mysten-network-c8f591f3edbf04f9 = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", default-features = false } mysten-network-a2655ef8805d82bb = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "c6dc7a23a40b3517f138d122a76d3bc15f844f67", default-features = false } -name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f", default-features = false } +name-variant = { git = "https://github.com/MystenLabs/mysten-infra", 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 = "259a37b487570763575e6b28f8b8057b16b3e916", default-features = false } @@ -1139,7 +1139,7 @@ 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-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-3025a98e4ce7513c = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } +telemetry-subscribers-c8f591f3edbf04f9 = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", 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 } @@ -1200,8 +1200,8 @@ tui = { version = "0.17", features = ["crossterm"] } twox-hash = { version = "1", default-features = false } typed-arena = { version = "2", features = ["std"] } typed-store-68692745110bd6f4 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", default-features = false } -typed-store-3025a98e4ce7513c = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f", default-features = false } -typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "a4c2cae59d823533061a5d8fe28771629819c43f", default-features = false } +typed-store-c8f591f3edbf04f9 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", default-features = false } +typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", default-features = false } typenum = { version = "1", default-features = false } types = { git = "https://github.com/MystenLabs/narwhal", rev = "259a37b487570763575e6b28f8b8057b16b3e916" } ucd-trie = { version = "0.1", features = ["std"] }