diff --git a/Cargo.lock b/Cargo.lock index ae6ac452fc672..930e2479b7f37 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -967,7 +967,7 @@ dependencies = [ "serde_bytes", "tokio", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=3b7daedf91fd8937dde26e905b8114cac459b866)", "types", ] @@ -1637,7 +1637,7 @@ dependencies = [ "crypto", "futures", "multiaddr", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=3b7daedf91fd8937dde26e905b8114cac459b866)", "primary", "rocksdb", "serde 1.0.137", @@ -1646,7 +1646,7 @@ dependencies = [ "tokio-util 0.7.1", "tonic", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=3b7daedf91fd8937dde26e905b8114cac459b866)", "types", "worker", ] @@ -3521,10 +3521,28 @@ dependencies = [ "tower", ] +[[package]] +name = "mysten-network" +version = "0.1.0" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=7c247967e5a5abd59ecaa75bc62b05bcdf4503fe#7c247967e5a5abd59ecaa75bc62b05bcdf4503fe" +dependencies = [ + "anyhow", + "bincode", + "bytes", + "futures", + "multiaddr", + "serde 1.0.137", + "tokio", + "tokio-stream", + "tonic", + "tonic-health", + "tower", +] + [[package]] name = "name-variant" version = "1.0.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=3b7daedf91fd8937dde26e905b8114cac459b866#3b7daedf91fd8937dde26e905b8114cac459b866" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=7c247967e5a5abd59ecaa75bc62b05bcdf4503fe#7c247967e5a5abd59ecaa75bc62b05bcdf4503fe" dependencies = [ "proc-macro2", "quote", @@ -3562,7 +3580,7 @@ dependencies = [ "crypto", "futures", "multiaddr", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=3b7daedf91fd8937dde26e905b8114cac459b866)", "rand 0.7.3", "thiserror", "tokio", @@ -3649,7 +3667,7 @@ dependencies = [ "tracing", "tracing-log", "tracing-subscriber 0.3.11", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=3b7daedf91fd8937dde26e905b8114cac459b866)", "types", "url", "worker", @@ -4247,7 +4265,7 @@ dependencies = [ "ed25519-dalek", "futures", "multiaddr", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=3b7daedf91fd8937dde26e905b8114cac459b866)", "network", "prost", "rand 0.7.3", @@ -4258,7 +4276,7 @@ dependencies = [ "tonic", "tower", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=3b7daedf91fd8937dde26e905b8114cac459b866)", "types", ] @@ -5399,7 +5417,7 @@ dependencies = [ "move-package", "move-unit-test", "multiaddr", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=7c247967e5a5abd59ecaa75bc62b05bcdf4503fe)", "node", "num_cpus", "once_cell", @@ -5518,7 +5536,7 @@ dependencies = [ "async-trait", "bincode", "bytes", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=7c247967e5a5abd59ecaa75bc62b05bcdf4503fe)", "prost", "serde 1.0.137", "sui-types", @@ -5619,7 +5637,7 @@ dependencies = [ "static_assertions", "thiserror", "tonic", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=7c247967e5a5abd59ecaa75bc62b05bcdf4503fe)", "zeroize", ] @@ -5658,7 +5676,7 @@ dependencies = [ "move-vm-runtime", "move-vm-types", "multiaddr", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=7c247967e5a5abd59ecaa75bc62b05bcdf4503fe)", "once_cell", "parking_lot 0.12.0", "pretty_assertions", @@ -5685,7 +5703,7 @@ dependencies = [ "tokio-util 0.7.1", "tracing", "tracing-test", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=7c247967e5a5abd59ecaa75bc62b05bcdf4503fe)", "types", ] @@ -5738,7 +5756,7 @@ dependencies = [ [[package]] name = "telemetry-subscribers" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=3b7daedf91fd8937dde26e905b8114cac459b866#3b7daedf91fd8937dde26e905b8114cac459b866" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=7c247967e5a5abd59ecaa75bc62b05bcdf4503fe#7c247967e5a5abd59ecaa75bc62b05bcdf4503fe" dependencies = [ "opentelemetry", "opentelemetry-jaeger", @@ -5880,7 +5898,7 @@ dependencies = [ "tokio", "tokio-util 0.7.1", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=7c247967e5a5abd59ecaa75bc62b05bcdf4503fe)", ] [[package]] @@ -6425,6 +6443,21 @@ dependencies = [ "tokio", ] +[[package]] +name = "typed-store" +version = "0.1.0" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=7c247967e5a5abd59ecaa75bc62b05bcdf4503fe#7c247967e5a5abd59ecaa75bc62b05bcdf4503fe" +dependencies = [ + "bincode", + "collectable", + "eyre", + "rocksdb", + "serde 1.0.137", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "typenum" version = "1.15.0" @@ -6451,7 +6484,7 @@ dependencies = [ "tokio", "tokio-util 0.7.1", "tonic", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=3b7daedf91fd8937dde26e905b8114cac459b866)", ] [[package]] @@ -6927,7 +6960,7 @@ dependencies = [ "ed25519-dalek", "futures", "multiaddr", - "mysten-network", + "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=3b7daedf91fd8937dde26e905b8114cac459b866)", "network", "primary", "serde 1.0.137", @@ -6937,7 +6970,7 @@ dependencies = [ "tonic", "tower", "tracing", - "typed-store", + "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=3b7daedf91fd8937dde26e905b8114cac459b866)", "types", ] diff --git a/crates/sui-network/Cargo.toml b/crates/sui-network/Cargo.toml index b1118c35a886d..79e3c33876386 100644 --- a/crates/sui-network/Cargo.toml +++ b/crates/sui-network/Cargo.toml @@ -17,7 +17,7 @@ bincode = "1.3.3" serde = "1.0.136" sui-types = { path = "../../sui_types" } -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "3b7daedf91fd8937dde26e905b8114cac459b866" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7c247967e5a5abd59ecaa75bc62b05bcdf4503fe" } [dev-dependencies] tonic-build = { git = "https://github.com/hyperium/tonic.git", rev = "de2e4ac077c076736dc451f3415ea7da1a61a560", default-features = false, features = [ "transport" ] } diff --git a/sui/Cargo.toml b/sui/Cargo.toml index 15c1d807d2a0e..978b692bc6edf 100644 --- a/sui/Cargo.toml +++ b/sui/Cargo.toml @@ -32,10 +32,10 @@ serde-value = "0.7.0" serde-name = "0.2.0" dirs = "4.0.0" clap = { version = "3.1.17", features = ["derive"] } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "3b7daedf91fd8937dde26e905b8114cac459b866" } +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7c247967e5a5abd59ecaa75bc62b05bcdf4503fe" } prometheus_exporter = "0.8.4" multiaddr = "0.14.0" -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "3b7daedf91fd8937dde26e905b8114cac459b866" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7c247967e5a5abd59ecaa75bc62b05bcdf4503fe" } bcs = "0.1.3" sui_core = { path = "../sui_core" } diff --git a/sui_core/Cargo.toml b/sui_core/Cargo.toml index d8cc83e78889e..345b302f3686b 100644 --- a/sui_core/Cargo.toml +++ b/sui_core/Cargo.toml @@ -32,7 +32,7 @@ bincode = "1.3.3" fdlimit = "0.2.1" schemars = "0.8.8" multiaddr = "0.14.0" -mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "3b7daedf91fd8937dde26e905b8114cac459b866" } +mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7c247967e5a5abd59ecaa75bc62b05bcdf4503fe" } prometheus_exporter = "0.8.4" once_cell = "1.10.0" @@ -48,7 +48,7 @@ move-package = { git = "https://github.com/move-language/move", rev = "8958b40e9 move-vm-runtime = { git = "https://github.com/move-language/move", rev = "8958b40e97a4f94a588e5365fdb90ec18f00d888" } move-vm-types = { git = "https://github.com/move-language/move", rev = "8958b40e97a4f94a588e5365fdb90ec18f00d888" } -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "3b7daedf91fd8937dde26e905b8114cac459b866"} +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7c247967e5a5abd59ecaa75bc62b05bcdf4503fe"} narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "23745f48103656eae4a4205d0b3edd53ad8894de", package = "executor" } narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "23745f48103656eae4a4205d0b3edd53ad8894de", package = "types" } diff --git a/sui_types/Cargo.toml b/sui_types/Cargo.toml index 4ad16c5939a6d..3df19dcc04fd4 100644 --- a/sui_types/Cargo.toml +++ b/sui_types/Cargo.toml @@ -34,8 +34,8 @@ digest = "0.10.3" schemars ="0.8.8" tonic = "0.7" -name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "3b7daedf91fd8937dde26e905b8114cac459b866" } -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "3b7daedf91fd8937dde26e905b8114cac459b866" } +name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7c247967e5a5abd59ecaa75bc62b05bcdf4503fe" } +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7c247967e5a5abd59ecaa75bc62b05bcdf4503fe" } move-binary-format = { git = "https://github.com/move-language/move", rev = "8958b40e97a4f94a588e5365fdb90ec18f00d888" } move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "8958b40e97a4f94a588e5365fdb90ec18f00d888" } diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml index 2a31486b7dc02..2a427354ee063 100644 --- a/test_utils/Cargo.toml +++ b/test_utils/Cargo.toml @@ -22,7 +22,7 @@ sui-adapter = { path = "../sui_programmability/adapter" } sui-framework = { path = "../sui_programmability/framework" } move-package = { git = "https://github.com/move-language/move", rev = "8958b40e97a4f94a588e5365fdb90ec18f00d888" } move-core-types = { git = "https://github.com/move-language/move", rev = "8958b40e97a4f94a588e5365fdb90ec18f00d888", features = ["address20"] } -typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev ="3b7daedf91fd8937dde26e905b8114cac459b866"} +typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev ="7c247967e5a5abd59ecaa75bc62b05bcdf4503fe"} narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "23745f48103656eae4a4205d0b3edd53ad8894de", package = "config" } sui-types = { path = "../sui_types" }