From 8ab5133bca9b2ea6ae8e70d6b5072d2d90928e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Garillot?= <4142+huitseeker@users.noreply.github.com> Date: Fri, 5 Aug 2022 19:11:46 -0400 Subject: [PATCH] chore(deps): bump the mysten infra pointer (#692) --- Cargo.lock | 171 +++++++++++++++++++++++++++----------- consensus/Cargo.toml | 2 +- executor/Cargo.toml | 4 +- network/Cargo.toml | 2 +- node/Cargo.toml | 4 +- primary/Cargo.toml | 6 +- test_utils/Cargo.toml | 4 +- types/Cargo.toml | 2 +- worker/Cargo.toml | 4 +- workspace-hack/Cargo.toml | 26 ++++-- 10 files changed, 154 insertions(+), 71 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 101904ab7..0ac12a326 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -144,7 +144,7 @@ dependencies = [ "num-traits", "paste", "rayon", - "rustc_version", + "rustc_version 0.3.3", "zeroize", ] @@ -374,7 +374,7 @@ checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" dependencies = [ "addr2line", "cc", - "cfg-if", + "cfg-if 1.0.0", "libc", "miniz_oxide", "object", @@ -610,6 +610,12 @@ dependencies = [ "nom", ] +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + [[package]] name = "cfg-if" version = "1.0.0" @@ -785,7 +791,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -839,7 +845,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -853,7 +859,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-utils", ] @@ -863,7 +869,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] @@ -875,7 +881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 1.0.0", "crossbeam-utils", "lazy_static", "memoffset", @@ -888,7 +894,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-utils", ] @@ -898,7 +904,7 @@ version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "lazy_static", ] @@ -1117,7 +1123,7 @@ version = "5.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "hashbrown", "lock_api", "parking_lot_core 0.9.3", @@ -1368,7 +1374,7 @@ dependencies = [ "futures", "indexmap", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "primary", "rand 0.8.5", "rocksdb", @@ -1588,7 +1594,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -1599,7 +1605,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "wasi 0.11.0+wasi-snapshot-preview1", ] @@ -1879,7 +1885,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -1939,7 +1945,7 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c8a5a96d92d849c4499d99461da81c9cdc1467418a8ed2aaeb407e8d85940ed" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "ecdsa", "elliptic-curve", "sha2 0.10.2", @@ -1976,7 +1982,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "winapi", ] @@ -2028,7 +2034,7 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -2142,7 +2148,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2be9a9090bc1cac2930688fa9478092a64c6a92ddc6ae0692d46b37d9cab709" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "downcast", "fragile", "lazy_static", @@ -2157,7 +2163,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86d702a0530a0141cf4ed147cf5ec7be6f2c187d4e37fcbefc39cf34116bfe8f" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "proc-macro2 1.0.40", "quote 1.0.20", "syn 1.0.98", @@ -2198,7 +2204,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro2 1.0.40", "quote 1.0.20", @@ -2215,7 +2221,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "mysten-network" version = "0.1.0" -source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=123c9e40b529315e1c1d91a54fb717111c3e349c#123c9e40b529315e1c1d91a54fb717111c3e349c" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=20ef52a00135114eb361e28673cfaa9bf4560f6f#20ef52a00135114eb361e28673cfaa9bf4560f6f" dependencies = [ "anyhow", "bincode", @@ -2236,7 +2242,7 @@ dependencies = [ [[package]] name = "mysten-network" version = "0.1.0" -source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=20ef52a00135114eb361e28673cfaa9bf4560f6f#20ef52a00135114eb361e28673cfaa9bf4560f6f" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa#d965a5a795dcdb4d1c7964acf556bc249fdc58aa" dependencies = [ "anyhow", "bincode", @@ -2266,7 +2272,7 @@ dependencies = [ "crypto", "futures", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "prometheus", "rand 0.8.5", "serde", @@ -2287,7 +2293,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 1.0.0", "libc", ] @@ -2301,7 +2307,7 @@ dependencies = [ "axum", "bincode", "bytes", - "cfg-if", + "cfg-if 1.0.0", "clap 2.34.0", "config", "consensus", @@ -2541,7 +2547,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "instant", "libc", "redox_syscall", @@ -2555,7 +2561,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", @@ -2683,7 +2689,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bba88ee898c63351101af3e60c66c5398c517681ce533eef8caff10ecf11ec1" dependencies = [ "backtrace", - "cfg-if", + "cfg-if 1.0.0", "criterion", "findshlibs", "inferno", @@ -2704,6 +2710,33 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +[[package]] +name = "pre" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87e7dc12cd3c36e90697e072bd70d886def4580fb268292022f89014dc9ea4b" +dependencies = [ + "cfg-if 0.1.10", + "pre-proc-macro", + "rustc_version 0.2.3", +] + +[[package]] +name = "pre-proc-macro" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a40339af35253b6b41a9e74f4c747e0948a9cb9cc9ea01d117d8440524560de3" +dependencies = [ + "cfg-if 0.1.10", + "lazy_static", + "proc-macro-crate 0.1.5", + "proc-macro-error", + "proc-macro2 1.0.40", + "quote 1.0.20", + "rustc_version 0.2.3", + "syn 1.0.98", +] + [[package]] name = "predicates" version = "2.1.1" @@ -2780,7 +2813,7 @@ dependencies = [ "itertools", "mockall", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "network", "node", "once_cell", @@ -2804,6 +2837,15 @@ dependencies = [ "workspace-hack", ] +[[package]] +name = "proc-macro-crate" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml", +] + [[package]] name = "proc-macro-crate" version = "1.1.3" @@ -2862,7 +2904,7 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cface98dfa6d645ea4c789839f176e4b072265d085bfcc48eaa8d137f58d3c39" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "fnv", "lazy_static", "memchr", @@ -2919,7 +2961,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" dependencies = [ "bytes", - "cfg-if", + "cfg-if 1.0.0", "cmake", "heck 0.4.0", "itertools", @@ -3218,13 +3260,22 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + [[package]] name = "rustc_version" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" dependencies = [ - "semver", + "semver 0.11.0", ] [[package]] @@ -3331,15 +3382,30 @@ dependencies = [ "cc", ] +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser 0.7.0", +] + [[package]] name = "semver" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "semver-parser", + "semver-parser 0.10.2", ] +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + [[package]] name = "semver-parser" version = "0.10.2" @@ -3478,7 +3544,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.9.0", "opaque-debug", @@ -3490,7 +3556,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.10.3", ] @@ -3739,7 +3805,7 @@ dependencies = [ [[package]] name = "telemetry-subscribers" version = "0.1.0" -source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=123c9e40b529315e1c1d91a54fb717111c3e349c#123c9e40b529315e1c1d91a54fb717111c3e349c" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa#d965a5a795dcdb4d1c7964acf556bc249fdc58aa" dependencies = [ "crossterm", "once_cell", @@ -3760,7 +3826,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "fastrand", "libc", "redox_syscall", @@ -3811,7 +3877,7 @@ dependencies = [ "indexmap", "itertools", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "node", "primary", "prometheus", @@ -4147,7 +4213,7 @@ version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -4310,12 +4376,14 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "typed-store" version = "0.1.0" -source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=123c9e40b529315e1c1d91a54fb717111c3e349c#123c9e40b529315e1c1d91a54fb717111c3e349c" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa#d965a5a795dcdb4d1c7964acf556bc249fdc58aa" dependencies = [ + "anyhow", "bincode", "collectable", "eyre", "fdlimit", + "pre", "rocksdb", "serde", "thiserror", @@ -4518,7 +4586,7 @@ version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] @@ -4686,7 +4754,7 @@ dependencies = [ "ed25519-dalek", "futures", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "network", "primary", "prometheus", @@ -4764,7 +4832,8 @@ dependencies = [ "cast", "cc", "cexpr", - "cfg-if", + "cfg-if 0.1.10", + "cfg-if 1.0.0", "clang-sys", "clap 2.34.0", "clap 3.2.13", @@ -4898,8 +4967,8 @@ dependencies = [ "multihash", "multihash-derive", "multimap", - "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=123c9e40b529315e1c1d91a54fb717111c3e349c)", "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=20ef52a00135114eb361e28673cfaa9bf4560f6f)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=d965a5a795dcdb4d1c7964acf556bc249fdc58aa)", "nom", "normalize-line-endings", "num-bigint", @@ -4934,12 +5003,15 @@ dependencies = [ "plotters-backend", "plotters-svg", "ppv-lite86", + "pre", + "pre-proc-macro", "predicates", "predicates-core", "predicates-tree", "pretty_assertions", "prettyplease", - "proc-macro-crate", + "proc-macro-crate 0.1.5", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro-error-attr", "proc-macro2 0.4.30", @@ -4974,7 +5046,8 @@ dependencies = [ "rocksdb", "rustc-demangle", "rustc-hash", - "rustc_version", + "rustc_version 0.2.3", + "rustc_version 0.3.3", "rustls", "rustls-pemfile", "rustversion", @@ -4986,8 +5059,10 @@ dependencies = [ "sec1", "secp256k1", "secp256k1-sys", - "semver", - "semver-parser", + "semver 0.11.0", + "semver 0.9.0", + "semver-parser 0.10.2", + "semver-parser 0.7.0", "serde", "serde-reflection", "serde_bytes", diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml index 611cdb2d9..684a00405 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -16,7 +16,7 @@ rand = { version = "0.8.5", optional = true } rocksdb = { version = "0.18.0", features = ["snappy", "lz4", "zstd", "zlib"], default-features = false } serde = { version = "1.0.142", features = ["derive"] } serde_bytes = "0.11.6" -store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } +store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } thiserror = "1.0.31" tokio = { version = "1.20.1", features = ["sync"] } tracing = "0.1.36" diff --git a/executor/Cargo.toml b/executor/Cargo.toml index 85edbe0b2..3f2f1c8be 100644 --- a/executor/Cargo.toml +++ b/executor/Cargo.toml @@ -27,8 +27,8 @@ multiaddr = "0.14.0" types = { path = "../types" } worker = { path = "../worker" } -store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } -mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } +store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } +mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } workspace-hack = { version = "0.1", path = "../workspace-hack" } [dev-dependencies] diff --git a/network/Cargo.toml b/network/Cargo.toml index 419770f86..bcd24f753 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -23,7 +23,7 @@ multiaddr = "0.14.0" anyhow = "1.0.59" prometheus = "0.13.1" -mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } +mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } workspace-hack = { version = "0.1", path = "../workspace-hack" } serde = "1.0.142" diff --git a/node/Cargo.toml b/node/Cargo.toml index 3b4d56229..e5fafa2df 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -17,7 +17,7 @@ futures = "0.3.21" multiaddr = "0.14.0" mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "20ef52a00135114eb361e28673cfaa9bf4560f6f" } rand = "0.8.5" -store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } +store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } thiserror = "1.0.31" tokio = { version = "1.20.1", features = ["full"] } tokio-stream = "0.1.9" @@ -25,7 +25,7 @@ tokio-util = { version = "0.7.3", features = ["codec"] } tracing = "0.1.36" tracing-log = "0.1.3" tracing-subscriber = { version = "0.3.15", features = ["time", "env-filter"] } -telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } +telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } url = "2.2.2" dhat = { version = "0.3.0", optional = true } diff --git a/primary/Cargo.toml b/primary/Cargo.toml index af944708c..bec9eafa8 100644 --- a/primary/Cargo.toml +++ b/primary/Cargo.toml @@ -35,8 +35,8 @@ crypto = { path = "../crypto" } network = { path = "../network" } types = { path = "../types" } -store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } -mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } +store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } +mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } prometheus = "0.13.1" once_cell = "1.13.0" dashmap = "5.3.4" @@ -55,7 +55,7 @@ async-trait = "0.1.57" executor = { path = "../executor" } thiserror = "1.0.31" tracing = "0.1.36" -telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } +telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } indexmap = { version = "1.9.1", features = ["serde"] } [features] diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml index 805a04615..99cc5b3c6 100644 --- a/test_utils/Cargo.toml +++ b/test_utils/Cargo.toml @@ -36,6 +36,6 @@ worker = { path = "../worker"} node = { path = "../node"} executor = { path = "../executor"} -store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } -mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } +store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } +mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } workspace-hack = { version = "0.1", path = "../workspace-hack" } diff --git a/types/Cargo.toml b/types/Cargo.toml index 8271edc12..770a29f7c 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -21,7 +21,7 @@ prost = "0.10.4" rand = "0.8.5" serde = { version = "1.0.142", features = ["derive"] } signature = "1.5.0" -store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } +store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } thiserror = "1.0.31" tokio = { version = "1.20.1", features = ["sync", "rt", "macros"] } tokio-util = { version = "0.7.3", features = ["codec"] } diff --git a/worker/Cargo.toml b/worker/Cargo.toml index 97ccd9749..fdc1cdc71 100644 --- a/worker/Cargo.toml +++ b/worker/Cargo.toml @@ -28,8 +28,8 @@ network = { path = "../network" } primary = { path = "../primary" } types = { path = "../types" } -store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } -mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" } +store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } +mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } prometheus = "0.13.1" workspace-hack = { version = "0.1", path = "../workspace-hack" } diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index c18ef70cf..d9a49290a 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -60,7 +60,8 @@ byteorder = { version = "1", features = ["i128", "std"] } bytes = { version = "1", features = ["std"] } bzip2-sys = { version = "0.1", default-features = false, features = ["static"] } cast = { version = "0.3", default-features = false } -cfg-if = { version = "1", default-features = false } +cfg-if-c65f7effa3be6d31 = { package = "cfg-if", version = "0.1", default-features = false } +cfg-if-dff4ba8e3ae991db = { package = "cfg-if", version = "1", default-features = false } clap-f595c2ba2a3f28df = { package = "clap", version = "2", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] } clap-7b89eefb6aaa9bf3 = { package = "clap", version = "3", features = ["atty", "color", "std", "strsim", "suggestions", "termcolor"] } clap_lex = { version = "0.2", default-features = false } @@ -172,8 +173,8 @@ mio = { version = "0.8", features = ["net", "os-ext", "os-poll"] } mockall = { version = "0.11", default-features = false } multiaddr = { version = "0.14", features = ["url"] } multihash = { version = "0.16", default-features = false, features = ["alloc", "derive", "identity", "multihash-derive", "multihash-impl", "std"] } -mysten-network-c01aa52156ee3946 = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", default-features = false } mysten-network-4bfefd54e41eb1ee = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "20ef52a00135114eb361e28673cfaa9bf4560f6f", default-features = false } +mysten-network-2187a2855c8ab378 = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", default-features = false } normalize-line-endings = { version = "0.3", default-features = false } num-bigint = { version = "0.4", default-features = false } num-integer = { version = "0.1", default-features = false, features = ["i128"] } @@ -201,6 +202,7 @@ plotters = { version = "0.3", default-features = false, features = ["area_series plotters-backend = { version = "0.3", default-features = false } plotters-svg = { version = "0.3", default-features = false } ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] } +pre = { version = "0.2", features = ["alloc", "core", "std"] } predicates = { version = "2", features = ["diff", "difflib", "float-cmp", "normalize-line-endings", "regex"] } predicates-core = { version = "1", default-features = false } predicates-tree = { version = "1", default-features = false } @@ -264,7 +266,7 @@ structopt = { version = "0.3" } subtle = { version = "2", default-features = false, features = ["i128", "std"] } subtle-ng = { version = "2", default-features = false } sync_wrapper = { version = "0.1", default-features = false } -telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } +telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } tempfile = { version = "3", default-features = false } termcolor = { version = "1", default-features = false } terminal_size = { version = "0.1", default-features = false } @@ -303,7 +305,7 @@ tracing-subscriber-6f8ce4dd05d13bba = { package = "tracing-subscriber", version tracing-subscriber-468e82937335b1c9 = { package = "tracing-subscriber", version = "0.3", features = ["alloc", "ansi", "ansi_term", "env-filter", "fmt", "matchers", "once_cell", "regex", "registry", "sharded-slab", "smallvec", "std", "thread_local", "time", "tracing", "tracing-log"] } tracing-test = { version = "0.2", default-features = false } try-lock = { version = "0.2", default-features = false } -typed-store = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", default-features = false } +typed-store = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", default-features = false } typenum = { version = "1", default-features = false } unicode-bidi = { version = "0.3", features = ["hardcoded-data", "std"] } unicode-normalization = { version = "0.1", features = ["std"] } @@ -334,7 +336,8 @@ bitflags = { version = "1" } bytes = { version = "1", features = ["std"] } cc = { version = "1", default-features = false, features = ["jobserver", "parallel"] } cexpr = { version = "0.6", default-features = false } -cfg-if = { version = "1", default-features = false } +cfg-if-c65f7effa3be6d31 = { package = "cfg-if", version = "0.1", default-features = false } +cfg-if-dff4ba8e3ae991db = { package = "cfg-if", version = "1", default-features = false } clang-sys = { version = "1", default-features = false, features = ["clang_3_5", "clang_3_6", "clang_3_7", "clang_3_8", "clang_3_9", "clang_4_0", "clang_5_0", "clang_6_0", "libloading", "runtime"] } cmake = { version = "0.1", default-features = false } darling = { version = "0.14", features = ["suggestions"] } @@ -377,8 +380,10 @@ pest = { version = "2", features = ["std", "thiserror"] } petgraph = { version = "0.6", default-features = false } pin-project-internal = { version = "1", default-features = false } pkg-config = { version = "0.3", default-features = false } +pre-proc-macro = { version = "0.2", default-features = false } prettyplease = { version = "0.1", default-features = false } -proc-macro-crate = { version = "1", default-features = false } +proc-macro-crate-c65f7effa3be6d31 = { package = "proc-macro-crate", version = "0.1", default-features = false } +proc-macro-crate-dff4ba8e3ae991db = { package = "proc-macro-crate", version = "1", default-features = false } proc-macro-error = { version = "1", features = ["syn", "syn-error"] } proc-macro-error-attr = { version = "1", default-features = false } proc-macro2-9fbad63c4bcf4a8f = { package = "proc-macro2", version = "0.4", features = ["proc-macro"] } @@ -395,10 +400,13 @@ regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cac regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } remove_dir_all = { version = "0.5", default-features = false } rustc-hash = { version = "1", features = ["std"] } -rustc_version = { version = "0.3", default-features = false } +rustc_version-6f8ce4dd05d13bba = { package = "rustc_version", version = "0.2", default-features = false } +rustc_version-468e82937335b1c9 = { package = "rustc_version", version = "0.3", default-features = false } rustversion = { version = "1", default-features = false } -semver = { version = "0.11" } -semver-parser = { version = "0.10", default-features = false } +semver-a6292c17cd707f01 = { package = "semver", version = "0.11" } +semver-274715c4dabd11b0 = { package = "semver", version = "0.9" } +semver-parser-93f6ce9d446188ac = { package = "semver-parser", version = "0.10", default-features = false } +semver-parser-ca01ad9e24f5d932 = { package = "semver-parser", version = "0.7", default-features = false } serde = { version = "1", features = ["alloc", "derive", "rc", "serde_derive", "std"] } serde_derive = { version = "1" } serde_with_macros = { version = "2", default-features = false }