diff --git a/Cargo.lock b/Cargo.lock index 8b3e7509d13c0..47f59ff8843ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,7 +76,7 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -376,7 +376,7 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "serde_urlencoded", "sync_wrapper", @@ -454,7 +454,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "510fd83e3eaf7263b06182f3550b4c0af2af42cb36ab8024969ff5ea7fcb2833" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", "thiserror", ] @@ -464,7 +464,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -499,7 +499,7 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -529,7 +529,7 @@ dependencies = [ "bitcoin_hashes 0.9.7", "rand 0.6.5", "rand_core 0.4.2", - "serde 1.0.143", + "serde 1.0.144", "unicode-normalization", ] @@ -676,7 +676,7 @@ dependencies = [ "lazy_static 1.4.0", "memchr", "regex-automata", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -692,7 +692,7 @@ dependencies = [ "merlin", "rand 0.8.5", "rand_core 0.6.3", - "serde 1.0.143", + "serde 1.0.144", "serde_derive", "sha3 0.9.1", "subtle-ng", @@ -752,7 +752,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -761,7 +761,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -773,7 +773,7 @@ dependencies = [ "camino", "cargo-platform", "semver 1.0.9", - "serde 1.0.143", + "serde 1.0.144", "serde_json", ] @@ -848,7 +848,7 @@ dependencies = [ "js-sys", "num-integer", "num-traits 0.2.15", - "serde 1.0.143", + "serde 1.0.144", "time 0.1.43", "wasm-bindgen", "winapi", @@ -986,7 +986,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3362992a0d9f1dd7c3d0e89e0ab2bb540b7a95fea8cd798090e758fda2899b5e" dependencies = [ "codespan-reporting", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -995,7 +995,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", "termcolor", "unicode-width", ] @@ -1041,17 +1041,19 @@ dependencies = [ [[package]] name = "config" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f" +source = "git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d#e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" dependencies = [ "arc-swap", + "crypto", "fastcrypto", + "match_opt", "multiaddr", "rand 0.8.5", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "thiserror", "tracing", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d)", ] [[package]] @@ -1063,7 +1065,7 @@ dependencies = [ "lazy_static 1.4.0", "nom 5.1.2", "rust-ini", - "serde 1.0.143", + "serde 1.0.144", "serde-hjson", "serde_json", "toml", @@ -1073,7 +1075,7 @@ dependencies = [ [[package]] name = "consensus" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f" +source = "git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d#e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" dependencies = [ "arc-swap", "bincode", @@ -1081,18 +1083,20 @@ dependencies = [ "bytes", "cfg-if 1.0.0", "config 0.1.0", + "crypto", "dag", "fastcrypto", "match_opt", "prometheus", "rand 0.8.5", - "serde 1.0.143", + "serde 1.0.144", + "storage", "thiserror", "tokio", "tracing", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d)", ] [[package]] @@ -1187,7 +1191,7 @@ dependencies = [ "plotters", "rayon", "regex", - "serde 1.0.143", + "serde 1.0.144", "serde_cbor", "serde_derive", "serde_json", @@ -1356,6 +1360,36 @@ dependencies = [ "winapi", ] +[[package]] +name = "crypto" +version = "0.1.0" +source = "git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d#e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" +dependencies = [ + "base64ct", + "blake2", + "blst", + "bulletproofs", + "curve25519-dalek-ng", + "digest 0.10.3", + "ed25519-consensus", + "eyre", + "fastcrypto", + "hex", + "hkdf", + "merlin", + "once_cell", + "rand 0.8.5", + "readonly", + "secp256k1", + "serde 1.0.144", + "serde_bytes", + "serde_with 2.0.0", + "signature", + "tokio", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d)", + "zeroize", +] + [[package]] name = "crypto-bigint" version = "0.4.8" @@ -1398,7 +1432,7 @@ dependencies = [ "csv-core", "itoa 0.4.8", "ryu", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -1429,7 +1463,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "serde 1.0.143", + "serde 1.0.144", "subtle", "zeroize", ] @@ -1457,7 +1491,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.6.3", - "serde 1.0.143", + "serde 1.0.144", "subtle-ng", "zeroize", ] @@ -1465,7 +1499,7 @@ dependencies = [ [[package]] name = "dag" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f" +source = "git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d#e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" dependencies = [ "arc-swap", "dashmap", @@ -1474,9 +1508,9 @@ dependencies = [ "itertools", "once_cell", "rayon", - "serde 1.0.143", + "serde 1.0.144", "thiserror", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d)", ] [[package]] @@ -1660,7 +1694,7 @@ dependencies = [ "once_cell", "petgraph 0.6.2", "rayon", - "serde 1.0.143", + "serde 1.0.144", "toml", ] @@ -1680,7 +1714,7 @@ dependencies = [ "lazy_static 1.4.0", "parking_lot 0.11.2", "rustc-hash", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "thousands", ] @@ -1836,7 +1870,7 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", "signature", ] @@ -1849,7 +1883,7 @@ dependencies = [ "curve25519-dalek-ng", "hex", "rand_core 0.6.3", - "serde 1.0.143", + "serde 1.0.144", "sha2 0.9.9", "thiserror", "zeroize", @@ -1864,7 +1898,7 @@ dependencies = [ "curve25519-dalek-fiat", "ed25519", "rand 0.8.5", - "serde 1.0.143", + "serde 1.0.144", "serde_bytes", "sha2 0.9.9", "zeroize", @@ -1872,9 +1906,9 @@ dependencies = [ [[package]] name = "either" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "elliptic-curve" @@ -1988,7 +2022,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "executor" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f" +source = "git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d#e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" dependencies = [ "async-trait", "backoff", @@ -2001,18 +2035,18 @@ dependencies = [ "futures", "match_opt", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "primary", "prometheus", - "serde 1.0.143", + "serde 1.0.144", "thiserror", "tokio", "tokio-util", "tonic", "tracing", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d)", ] [[package]] @@ -2039,7 +2073,7 @@ dependencies = [ [[package]] name = "fastcrypto" version = "0.1.0" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=a9e58305dc463c40b9d357730203406214909f04#a9e58305dc463c40b9d357730203406214909f04" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b#c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b" dependencies = [ "base64ct", "blake2", @@ -2056,7 +2090,7 @@ dependencies = [ "rand 0.8.5", "readonly", "secp256k1", - "serde 1.0.143", + "serde 1.0.144", "serde_bytes", "serde_with 2.0.0", "signature", @@ -2400,7 +2434,7 @@ dependencies = [ "gloo-utils", "js-sys", "pin-project", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "thiserror", "wasm-bindgen", @@ -2463,7 +2497,7 @@ dependencies = [ "petgraph 0.6.2", "rayon", "semver 1.0.9", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "smallvec", "static_assertions", @@ -2482,7 +2516,7 @@ dependencies = [ "diffus", "guppy-workspace-hack", "semver 1.0.9", - "serde 1.0.143", + "serde 1.0.144", "toml", ] @@ -2531,7 +2565,7 @@ dependencies = [ "owo-colors", "pathdiff", "rayon", - "serde 1.0.143", + "serde 1.0.144", "tabular", "target-spec", "toml", @@ -2867,7 +2901,7 @@ checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg 1.1.0", "hashbrown 0.12.1", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -2881,7 +2915,7 @@ dependencies = [ "once_cell", "pest", "pest_derive", - "serde 1.0.143", + "serde 1.0.144", "similar", "yaml-rust", ] @@ -3068,7 +3102,7 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "soketto", "thiserror", @@ -3091,7 +3125,7 @@ dependencies = [ "jsonrpsee-core", "jsonrpsee-types", "rustc-hash", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "thiserror", "tokio", @@ -3110,7 +3144,7 @@ dependencies = [ "hyper", "jsonrpsee-core", "jsonrpsee-types", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "tokio", "tracing", @@ -3137,7 +3171,7 @@ checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d" dependencies = [ "anyhow", "beef", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "thiserror", "tracing", @@ -3211,7 +3245,7 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b310ccceade8121d7d77fee406160e457c2f4e7c7982d589da3499bc7ea4526" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -3354,7 +3388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -3516,7 +3550,7 @@ dependencies = [ "move-command-line-common", "move-core-types", "move-model", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -3528,7 +3562,7 @@ dependencies = [ "move-core-types", "once_cell", "ref-cast", - "serde 1.0.143", + "serde 1.0.144", "variant_count", ] @@ -3549,7 +3583,7 @@ dependencies = [ "move-core-types", "move-ir-types", "move-symbol-pool", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -3630,7 +3664,7 @@ dependencies = [ "read-write-set", "read-write-set-dynamic", "reqwest", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "serde_yaml", "tempfile", @@ -3650,7 +3684,7 @@ dependencies = [ "move-core-types", "num-bigint", "once_cell", - "serde 1.0.143", + "serde 1.0.144", "sha2 0.9.9", "walkdir", ] @@ -3695,7 +3729,7 @@ dependencies = [ "once_cell", "rand 0.8.5", "ref-cast", - "serde 1.0.143", + "serde 1.0.144", "serde_bytes", ] @@ -3716,7 +3750,7 @@ dependencies = [ "move-ir-types", "once_cell", "petgraph 0.5.1", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -3752,7 +3786,7 @@ dependencies = [ "num", "once_cell", "regex", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -3766,7 +3800,7 @@ dependencies = [ "move-command-line-common", "move-core-types", "move-model", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -3831,7 +3865,7 @@ dependencies = [ "move-core-types", "move-symbol-pool", "once_cell", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -3857,7 +3891,7 @@ dependencies = [ "num", "once_cell", "regex", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -3887,7 +3921,7 @@ dependencies = [ "ptree", "regex", "reqwest", - "serde 1.0.143", + "serde 1.0.144", "serde_yaml", "sha2 0.9.9", "tempfile", @@ -3926,7 +3960,7 @@ dependencies = [ "once_cell", "pretty", "rand 0.8.5", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "simplelog", "tokio", @@ -3955,7 +3989,7 @@ dependencies = [ "pretty", "rand 0.8.5", "regex", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "tera", "tokio", @@ -3969,7 +4003,7 @@ dependencies = [ "anyhow", "move-binary-format", "move-core-types", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -3984,7 +4018,7 @@ dependencies = [ "move-bytecode-utils", "move-core-types", "once_cell", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -4011,7 +4045,7 @@ dependencies = [ "once_cell", "paste", "petgraph 0.5.1", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -4029,7 +4063,7 @@ dependencies = [ "move-model", "move-stackless-bytecode", "num", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -4060,7 +4094,7 @@ version = "0.1.0" source = "git+https://github.com/move-language/move?rev=70b34a66473c34ad30d101290b249f2db3c847a2#70b34a66473c34ad30d101290b249f2db3c847a2" dependencies = [ "once_cell", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -4169,7 +4203,7 @@ dependencies = [ "move-core-types", "move-vm-types", "once_cell", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -4181,7 +4215,7 @@ dependencies = [ "move-binary-format", "move-core-types", "once_cell", - "serde 1.0.143", + "serde 1.0.144", "smallvec", ] @@ -4197,7 +4231,7 @@ dependencies = [ "data-encoding", "multihash", "percent-encoding", - "serde 1.0.143", + "serde 1.0.144", "static_assertions", "unsigned-varint", "url", @@ -4237,7 +4271,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "mysten-network" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=7ef7415a4e11cf68fa68ce9db884c46e704e0445#7ef7415a4e11cf68fa68ce9db884c46e704e0445" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331#696fa25982acdc87ab64ec6a33cb111edc63a331" dependencies = [ "bincode", "bytes", @@ -4245,7 +4279,7 @@ dependencies = [ "futures", "http", "multiaddr", - "serde 1.0.143", + "serde 1.0.144", "tokio", "tokio-stream", "tonic", @@ -4258,7 +4292,7 @@ dependencies = [ [[package]] name = "mysten-network" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab#8d090689be14078f2ca41c356e7bbc0af21f73ab" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=7ef7415a4e11cf68fa68ce9db884c46e704e0445#7ef7415a4e11cf68fa68ce9db884c46e704e0445" dependencies = [ "bincode", "bytes", @@ -4266,7 +4300,7 @@ dependencies = [ "futures", "http", "multiaddr", - "serde 1.0.143", + "serde 1.0.144", "tokio", "tokio-stream", "tonic", @@ -4327,7 +4361,7 @@ checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e" [[package]] name = "network" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f" +source = "git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d#e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" dependencies = [ "async-trait", "backoff", @@ -4336,17 +4370,17 @@ dependencies = [ "fastcrypto", "futures", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "prometheus", "rand 0.8.5", - "serde 1.0.143", + "serde 1.0.144", "thiserror", "tokio", "tokio-util", "tonic", "tracing", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d)", ] [[package]] @@ -4361,7 +4395,7 @@ dependencies = [ "hakari", "hex", "once_cell", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -4376,7 +4410,7 @@ dependencies = [ "guppy", "nexlint", "regex", - "serde 1.0.143", + "serde 1.0.144", "toml", ] @@ -4405,7 +4439,7 @@ dependencies = [ [[package]] name = "node" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f" +source = "git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d#e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" dependencies = [ "arc-swap", "async-trait", @@ -4416,17 +4450,19 @@ dependencies = [ "clap 2.34.0", "config 0.1.0", "consensus", + "crypto", "executor", "eyre", "fastcrypto", "futures", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "network", "primary", "prometheus", "rand 0.8.5", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "storage", + "telemetry-subscribers 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "thiserror", "tokio", "tokio-stream", @@ -4434,11 +4470,11 @@ dependencies = [ "tracing", "tracing-log", "tracing-subscriber 0.3.15", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "types", "url", "worker", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d)", ] [[package]] @@ -5176,7 +5212,7 @@ dependencies = [ [[package]] name = "primary" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f" +source = "git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d#e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" dependencies = [ "async-recursion", "async-trait", @@ -5186,19 +5222,21 @@ dependencies = [ "bytes", "config 0.1.0", "consensus", + "crypto", "dashmap", "derive_builder", "fastcrypto", "futures", "itertools", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "network", "once_cell", "prometheus", "prost", "rand 0.8.5", - "serde 1.0.143", + "serde 1.0.144", + "storage", "tap", "thiserror", "tokio", @@ -5206,9 +5244,9 @@ dependencies = [ "tonic", "tower", "tracing", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d)", ] [[package]] @@ -5390,7 +5428,7 @@ dependencies = [ "config 0.11.0", "directories", "petgraph 0.6.2", - "serde 1.0.143", + "serde 1.0.144", "serde-value", "tint", ] @@ -5816,7 +5854,7 @@ dependencies = [ "native-tls", "percent-encoding", "pin-project-lite", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "serde_urlencoded", "tokio", @@ -6061,7 +6099,7 @@ dependencies = [ "dyn-clone", "either", "schemars_derive", - "serde 1.0.143", + "serde 1.0.144", "serde_json", ] @@ -6174,7 +6212,7 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -6206,9 +6244,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.143" +version = "1.0.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" +checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" dependencies = [ "serde_derive", ] @@ -6231,7 +6269,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b5b14ebbcc4e4f2b3642fa99c388649da58d1dc3308c7d109f39f565d1710f0" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", "thiserror", ] @@ -6242,7 +6280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f05a5f801ac62a51a49d378fdb3884480041b99aced450b28990673e8ff99895" dependencies = [ "once_cell", - "serde 1.0.143", + "serde 1.0.144", "thiserror", ] @@ -6253,7 +6291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" dependencies = [ "ordered-float 2.10.0", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -6262,7 +6300,7 @@ version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -6272,14 +6310,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ "half", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] name = "serde_derive" -version = "1.0.143" +version = "1.0.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391" +checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" dependencies = [ "proc-macro2 1.0.42", "quote 1.0.21", @@ -6299,13 +6337,13 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" +checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" dependencies = [ "itoa 1.0.2", "ryu", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -6314,7 +6352,7 @@ version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b0651a2f427e4a4d74d458947aa5ca36c62c1b503344d143763ec06216a975" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -6326,7 +6364,7 @@ dependencies = [ "form_urlencoded", "itoa 1.0.2", "ryu", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -6336,7 +6374,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" dependencies = [ "hex", - "serde 1.0.143", + "serde 1.0.144", "serde_with_macros 1.5.2", ] @@ -6350,7 +6388,7 @@ dependencies = [ "chrono", "hex", "indexmap", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "serde_with_macros 2.0.0", "time 0.3.9", @@ -6388,7 +6426,7 @@ checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ "indexmap", "ryu", - "serde 1.0.143", + "serde 1.0.144", "yaml-rust", ] @@ -6746,6 +6784,24 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "storage" +version = "0.1.0" +source = "git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d#e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" +dependencies = [ + "dashmap", + "fastcrypto", + "futures", + "thiserror", + "tokio", + "tokio-util", + "tonic", + "tracing", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", + "types", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d)", +] + [[package]] name = "str-buf" version = "1.0.6" @@ -6879,7 +6935,7 @@ dependencies = [ "rocksdb", "rustyline", "rustyline-derive", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "serde_with 1.14.0", "shell-words", @@ -6953,7 +7009,7 @@ dependencies = [ "rand_distr", "rayon", "rocksdb", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "serde_with 1.14.0", "strum", @@ -6985,7 +7041,7 @@ dependencies = [ "futures", "prometheus", "reqwest", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "sui", "sui-config", @@ -7025,7 +7081,7 @@ dependencies = [ "multiaddr", "once_cell", "rand 0.8.5", - "serde 1.0.143", + "serde 1.0.144", "serde_with 1.14.0", "serde_yaml", "sha3 0.10.2", @@ -7070,7 +7126,7 @@ dependencies = [ "rand 0.8.5", "rocksdb", "scopeguard", - "serde 1.0.143", + "serde 1.0.144", "serde-reflection", "serde_json", "serde_with 1.14.0", @@ -7112,7 +7168,7 @@ dependencies = [ "move-vm-test-utils", "move-vm-types", "once_cell", - "serde 1.0.143", + "serde 1.0.144", "strum", "strum_macros", "sui-config", @@ -7135,7 +7191,7 @@ dependencies = [ "http", "prometheus", "scopeguard", - "serde 1.0.143", + "serde 1.0.144", "sui", "sui-config", "sui-json-rpc-types", @@ -7210,7 +7266,7 @@ dependencies = [ "move-package", "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=7ef7415a4e11cf68fa68ce9db884c46e704e0445)", "prometheus", - "serde 1.0.143", + "serde 1.0.144", "sui-config", "sui-core", "sui-framework", @@ -7238,7 +7294,7 @@ dependencies = [ "move-core-types", "move-package", "schemars", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "sui-adapter", "sui-framework", @@ -7262,7 +7318,7 @@ dependencies = [ "move-bytecode-utils", "move-core-types", "prometheus", - "serde 1.0.143", + "serde 1.0.144", "signature", "sui-core", "sui-cost", @@ -7291,7 +7347,7 @@ dependencies = [ "move-bytecode-utils", "move-core-types", "schemars", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "serde_with 1.14.0", "sui-json", @@ -7354,7 +7410,7 @@ dependencies = [ "pretty_assertions", "rand 0.8.5", "schemars", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "sui", "sui-config", @@ -7412,7 +7468,7 @@ dependencies = [ "move-bytecode-utils", "move-core-types", "rand 0.8.5", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "sha3 0.10.2", "signature", @@ -7444,7 +7500,7 @@ dependencies = [ "num_cpus", "pretty_assertions", "rocksdb", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "sqlx", "strum", @@ -7487,7 +7543,7 @@ name = "sui-telemetry" version = "0.1.0" dependencies = [ "reqwest", - "serde 1.0.143", + "serde 1.0.144", "tokio", "tracing", "workspace-hack 0.1.0", @@ -7502,7 +7558,7 @@ dependencies = [ "clap 3.2.17", "http", "move-package", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "sui", "sui-cluster-test", @@ -7526,7 +7582,7 @@ dependencies = [ "futures", "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=7ef7415a4e11cf68fa68ce9db884c46e704e0445)", "rocksdb", - "serde 1.0.143", + "serde 1.0.144", "serde_with 1.14.0", "strum", "strum_macros", @@ -7599,7 +7655,7 @@ dependencies = [ "rand 0.8.5", "roaring", "schemars", - "serde 1.0.143", + "serde 1.0.144", "serde-name", "serde_bytes", "serde_json", @@ -7708,14 +7764,14 @@ checksum = "462215968f204588ef2d3499333d07729b692aa01f79f9b0925071127b3b353f" dependencies = [ "cfg-expr", "guppy-workspace-hack", - "serde 1.0.143", + "serde 1.0.144", "target-lexicon", ] [[package]] name = "telemetry-subscribers" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=7ef7415a4e11cf68fa68ce9db884c46e704e0445#7ef7415a4e11cf68fa68ce9db884c46e704e0445" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331#696fa25982acdc87ab64ec6a33cb111edc63a331" dependencies = [ "crossterm 0.25.0", "once_cell", @@ -7733,7 +7789,7 @@ dependencies = [ [[package]] name = "telemetry-subscribers" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab#8d090689be14078f2ca41c356e7bbc0af21f73ab" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=7ef7415a4e11cf68fa68ce9db884c46e704e0445#7ef7415a4e11cf68fa68ce9db884c46e704e0445" dependencies = [ "crossterm 0.25.0", "once_cell", @@ -7778,7 +7834,7 @@ dependencies = [ "pest_derive", "rand 0.8.5", "regex", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "slug", "unic-segment", @@ -7815,7 +7871,7 @@ version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03298404c433dd9e5bb84e2d6e587e80aa98a01a818c45150327d06c3ae1c72" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", "test-fuzz-internal", "test-fuzz-macro", "test-fuzz-runtime", @@ -7830,7 +7886,7 @@ dependencies = [ "cargo_metadata", "proc-macro2 1.0.42", "quote 1.0.21", - "serde 1.0.143", + "serde 1.0.144", "strum_macros", ] @@ -7861,7 +7917,7 @@ dependencies = [ "bincode", "hex", "num-traits 0.2.15", - "serde 1.0.143", + "serde 1.0.144", "sha-1 0.10.0", "test-fuzz-internal", ] @@ -7993,7 +8049,7 @@ dependencies = [ "itoa 1.0.2", "libc", "num_threads", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -8011,7 +8067,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" dependencies = [ - "serde 1.0.143", + "serde 1.0.144", "serde_json", ] @@ -8139,7 +8195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "indexmap", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -8163,7 +8219,7 @@ dependencies = [ "combine", "indexmap", "itertools", - "serde 1.0.143", + "serde 1.0.144", ] [[package]] @@ -8348,7 +8404,7 @@ checksum = "a788f2119fde477cd33823330c14004fa8cdac6892fd6f12181bbda9dbf14fc9" dependencies = [ "gethostname", "log", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "time 0.3.9", "tracing", @@ -8503,7 +8559,7 @@ checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae" [[package]] name = "typed-store" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=7ef7415a4e11cf68fa68ce9db884c46e704e0445#7ef7415a4e11cf68fa68ce9db884c46e704e0445" +source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331#696fa25982acdc87ab64ec6a33cb111edc63a331" dependencies = [ "bincode", "collectable", @@ -8511,7 +8567,7 @@ dependencies = [ "fdlimit", "pre", "rocksdb", - "serde 1.0.143", + "serde 1.0.144", "tap", "thiserror", "tokio", @@ -8521,7 +8577,7 @@ dependencies = [ [[package]] name = "typed-store" version = "0.1.0" -source = "git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab#8d090689be14078f2ca41c356e7bbc0af21f73ab" +source = "git+https://github.com/MystenLabs/mysten-infra?rev=7ef7415a4e11cf68fa68ce9db884c46e704e0445#7ef7415a4e11cf68fa68ce9db884c46e704e0445" dependencies = [ "bincode", "collectable", @@ -8529,7 +8585,7 @@ dependencies = [ "fdlimit", "pre", "rocksdb", - "serde 1.0.143", + "serde 1.0.144", "tap", "thiserror", "tokio", @@ -8562,14 +8618,16 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "types" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f" +source = "git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d#e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" dependencies = [ "base64", "bincode", "blake2", "bytes", "config 0.1.0", + "crypto", "dag", + "dashmap", "derive_builder", "fastcrypto", "futures", @@ -8581,15 +8639,16 @@ dependencies = [ "prost-build", "rand 0.8.5", "rustversion", - "serde 1.0.143", + "serde 1.0.144", "signature", "thiserror", "tokio", "tokio-util", "tonic", "tonic-build 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)", + "tracing", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d)", ] [[package]] @@ -8893,7 +8952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.143", + "serde 1.0.144", "serde_json", "wasm-bindgen-macro", ] @@ -9139,30 +9198,32 @@ dependencies = [ [[package]] name = "worker" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f" +source = "git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d#e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" dependencies = [ "async-trait", "bincode", "blake2", "bytes", "config 0.1.0", + "crypto", "fastcrypto", "futures", "multiaddr", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "network", "primary", "prometheus", - "serde 1.0.143", + "serde 1.0.144", + "tap", "tokio", "tokio-stream", "tokio-util", "tonic", "tower", "tracing", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "types", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d)", ] [[package]] @@ -9288,6 +9349,7 @@ dependencies = [ "crossterm 0.22.1", "crossterm 0.23.2", "crossterm 0.25.0", + "crypto", "crypto-bigint", "crypto-common", "crypto-mac", @@ -9511,8 +9573,8 @@ dependencies = [ "multihash", "multihash-derive", "multimap", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=7ef7415a4e11cf68fa68ce9db884c46e704e0445)", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "name-variant", "named-lock", "nested", @@ -9673,7 +9735,7 @@ dependencies = [ "semver-parser 0.7.0", "send_wrapper", "serde 0.8.23", - "serde 1.0.143", + "serde 1.0.144", "serde-hjson", "serde-name", "serde-reflection", @@ -9719,6 +9781,7 @@ dependencies = [ "sqlx-rt", "stable_deref_trait", "static_assertions", + "storage", "stringprep", "strip-ansi-escapes", "strsim 0.10.0", @@ -9738,8 +9801,8 @@ dependencies = [ "tap", "target-lexicon", "target-spec", + "telemetry-subscribers 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=7ef7415a4e11cf68fa68ce9db884c46e704e0445)", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "tempfile", "tera", "termcolor", @@ -9799,8 +9862,8 @@ dependencies = [ "tui", "twox-hash", "typed-arena", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=7ef7415a4e11cf68fa68ce9db884c46e704e0445)", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", "typed-store-macros", "typenum", "types", @@ -9850,7 +9913,7 @@ dependencies = [ "which", "whoami", "worker", - "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)", + "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d)", "yaml-rust", "zeroize", "zeroize_derive", @@ -9860,7 +9923,7 @@ dependencies = [ [[package]] name = "workspace-hack" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f" +source = "git+https://github.com/MystenLabs/narwhal?rev=e994f67cacc2a42dd5d73fe3a64b9b490da72c3d#e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" dependencies = [ "addr2line", "adler", @@ -10052,7 +10115,7 @@ dependencies = [ "multihash", "multihash-derive", "multimap", - "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "nom 7.1.1", "normalize-line-endings", "num-bigint", @@ -10147,7 +10210,7 @@ dependencies = [ "semver 0.9.0", "semver-parser 0.10.2", "semver-parser 0.7.0", - "serde 1.0.143", + "serde 1.0.144", "serde-reflection", "serde_bytes", "serde_cbor", @@ -10182,7 +10245,7 @@ dependencies = [ "sync_wrapper", "synstructure", "tap", - "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "telemetry-subscribers 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "tempfile", "termcolor", "terminal_size", @@ -10227,7 +10290,7 @@ dependencies = [ "tracing-test", "tracing-test-macro", "try-lock", - "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)", + "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)", "typenum", "ucd-trie", "unicode-bidi", diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml index e64481a486d5d..ee49f1bd6e6e3 100644 --- a/crates/sui-benchmark/Cargo.toml +++ b/crates/sui-benchmark/Cargo.toml @@ -11,7 +11,7 @@ async-trait = "0.1.57" rayon = "1.5.3" anyhow = { version = "1.0.57", features = ["backtrace"] } futures = "0.3.23" -serde = { version = "1.0.142", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.83" tempfile = "3.3.0" tokio = { version = "1.20.1", features = ["full"] } @@ -41,7 +41,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 = "70b34a66473c34ad30d101290b249f2db3c847a2", features = ["address20"] } -narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "node" } +narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "node" } workspace-hack = { path = "../workspace-hack"} test-utils = { path = "../test-utils" } diff --git a/crates/sui-cluster-test/Cargo.toml b/crates/sui-cluster-test/Cargo.toml index 34dc5de00b5af..3646da8aa4fc6 100644 --- a/crates/sui-cluster-test/Cargo.toml +++ b/crates/sui-cluster-test/Cargo.toml @@ -7,7 +7,7 @@ publish = false edition = "2021" [dependencies] -serde = { version = "1.0.142", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } futures = "0.3.23" serde_json = "1.0.83" tempfile = "3.3.0" @@ -32,4 +32,4 @@ sui-core = { path = "../sui-core" } sui-json = { path = "../sui-json" } sui-config = { path = "../sui-config" } test-utils = { path = "../test-utils" } -workspace-hack = { path = "../workspace-hack"} \ No newline at end of file +workspace-hack = { path = "../workspace-hack"} diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml index 8b326a16f6275..266dbfb65e929 100644 --- a/crates/sui-config/Cargo.toml +++ b/crates/sui-config/Cargo.toml @@ -11,7 +11,7 @@ bcs = "0.1.3" arc-swap = "1.5.1" camino = "1.1.1" anyhow = { version = "1.0.58", features = ["backtrace"] } -serde = { version = "1.0.141", features = ["derive", "rc"] } +serde = { version = "1.0.144", features = ["derive", "rc"] } serde_with = "1.14.0" serde_yaml = "0.8.26" rand = "0.8.5" @@ -20,13 +20,13 @@ multiaddr = "0.14.0" once_cell = "1.13.1" tracing = "0.1.36" -fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a9e58305dc463c40b9d357730203406214909f04" } +fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b" } move-binary-format = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" } move-package = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" } move-core-types = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2", features = ["address20"] } move-vm-runtime = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" } -narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "config" } +narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "config" } sui-framework = { path = "../sui-framework" } diff --git a/crates/sui-config/src/genesis.rs b/crates/sui-config/src/genesis.rs index 374db04dbfe6d..5ae5361d409d8 100644 --- a/crates/sui-config/src/genesis.rs +++ b/crates/sui-config/src/genesis.rs @@ -67,6 +67,9 @@ impl Genesis { .validator_set .iter() .map(|validator| { + // Strong requirement here for narwhal and sui to be on the same version of fastcrypto + // for AuthorityPublicBytes to cast to type alias PublicKey defined in narwhal to + // construct narwhal Committee struct. let name = validator .protocol_key() .try_into() @@ -75,6 +78,29 @@ impl Genesis { primary_to_primary: validator.narwhal_primary_to_primary.clone(), worker_to_primary: validator.narwhal_worker_to_primary.clone(), }; + let authority = narwhal_config::Authority { + stake: validator.stake as narwhal_config::Stake, //TODO this should at least be the same size integer + primary, + }; + + (name, authority) + }) + .collect(); + std::sync::Arc::new(arc_swap::ArcSwap::from_pointee(narwhal_config::Committee { + authorities: narwhal_committee, + epoch: self.epoch() as narwhal_config::Epoch, + })) + } + + pub fn narwhal_worker_cache(&self) -> narwhal_config::SharedWorkerCache { + let workers = self + .validator_set + .iter() + .map(|validator| { + let name = validator + .protocol_key() + .try_into() + .expect("Can't get narwhal public key"); let workers = [( 0, // worker_id narwhal_config::WorkerInfo { @@ -85,19 +111,16 @@ impl Genesis { )] .into_iter() .collect(); - let authority = narwhal_config::Authority { - stake: validator.stake as narwhal_config::Stake, //TODO this should at least be the same size integer - primary, - workers, - }; + let worker_index = narwhal_config::WorkerIndex(workers); - (name, authority) + (name, worker_index) }) .collect(); - std::sync::Arc::new(arc_swap::ArcSwap::from_pointee(narwhal_config::Committee { - authorities: narwhal_committee, + narwhal_config::WorkerCache { + workers, epoch: self.epoch() as narwhal_config::Epoch, - })) + } + .into() } pub fn sui_system_object(&self) -> SuiSystemState { diff --git a/crates/sui-config/tests/snapshot_tests.rs b/crates/sui-config/tests/snapshot_tests.rs index bb94b287f3144..7dea4bf71a83d 100644 --- a/crates/sui-config/tests/snapshot_tests.rs +++ b/crates/sui-config/tests/snapshot_tests.rs @@ -93,6 +93,7 @@ fn populated_genesis_snapshot_matches() { assert_yaml_snapshot!(genesis.validator_set()); assert_yaml_snapshot!(genesis.committee().unwrap()); assert_yaml_snapshot!(genesis.narwhal_committee()); + assert_yaml_snapshot!(genesis.narwhal_worker_cache()); assert_yaml_snapshot!(genesis.sui_system_object()); // Serialized `genesis` is not static and cannot be snapshot tested. } diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-3.snap b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-3.snap index f49320302eff7..3b7f76cab385c 100644 --- a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-3.snap +++ b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-3.snap @@ -8,10 +8,4 @@ authorities: primary: primary_to_primary: "" worker_to_primary: "" - workers: - 0: - transactions: "" - worker_to_worker: "" - primary_to_worker: "" epoch: 0 - diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-4.snap b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-4.snap index 82f3c1556f1b9..f337149044cdf 100644 --- a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-4.snap +++ b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-4.snap @@ -1,338 +1,11 @@ --- source: crates/sui-config/tests/snapshot_tests.rs -expression: genesis.sui_system_object() +expression: genesis.narwhal_worker_cache() --- -info: - id: "0x0000000000000000000000000000000000000005" +workers: + ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=: + 0: + transactions: "" + worker_to_worker: "" + primary_to_worker: "" epoch: 0 -validators: - validator_stake: 1 - delegation_stake: 0 - quorum_stake_threshold: 1 - active_validators: - - metadata: - sui_address: 375741c9373ae27bde5e6b5f5cc79f074cd84587 - pubkey_bytes: - - 185 - - 198 - - 238 - - 22 - - 48 - - 239 - - 62 - - 113 - - 17 - - 68 - - 166 - - 72 - - 219 - - 6 - - 187 - - 178 - - 40 - - 79 - - 114 - - 116 - - 207 - - 190 - - 229 - - 63 - - 252 - - 238 - - 80 - - 60 - - 193 - - 164 - - 146 - - 0 - network_pubkey_bytes: - - 65 - - 76 - - 110 - - 71 - - 55 - - 104 - - 89 - - 119 - - 55 - - 122 - - 53 - - 120 - - 69 - - 85 - - 83 - - 109 - - 83 - - 78 - - 115 - - 71 - - 117 - - 55 - - 73 - - 111 - - 84 - - 51 - - 74 - - 48 - - 122 - - 55 - - 55 - - 108 - - 80 - - 47 - - 122 - - 117 - - 85 - - 68 - - 122 - - 66 - - 112 - - 74 - - 73 - - 65 - proof_of_possession_bytes: - - 9 - - 244 - - 30 - - 127 - - 150 - - 249 - - 92 - - 80 - - 137 - - 37 - - 198 - - 94 - - 200 - - 72 - - 82 - - 231 - - 31 - - 184 - - 204 - - 174 - - 16 - - 221 - - 223 - - 207 - - 203 - - 116 - - 224 - - 209 - - 253 - - 41 - - 75 - - 199 - - 201 - - 174 - - 66 - - 189 - - 190 - - 115 - - 207 - - 66 - - 176 - - 118 - - 43 - - 204 - - 184 - - 193 - - 6 - - 231 - - 133 - - 181 - - 243 - - 229 - - 225 - - 15 - - 222 - - 35 - - 103 - - 126 - - 235 - - 122 - - 127 - - 51 - - 178 - - 10 - name: - - 48 - net_address: [] - next_epoch_stake: 1 - next_epoch_delegation: 0 - next_epoch_gas_price: 1 - stake_amount: 1 - delegation: 0 - pending_stake: 0 - pending_withdraw: 0 - pending_delegation: 0 - pending_delegation_withdraw: 0 - delegator_count: 0 - pending_delegator_count: 0 - pending_delegator_withdraw_count: 0 - gas_price: 1 - pending_validators: [] - pending_removals: [] - next_epoch_validators: - - sui_address: 375741c9373ae27bde5e6b5f5cc79f074cd84587 - pubkey_bytes: - - 185 - - 198 - - 238 - - 22 - - 48 - - 239 - - 62 - - 113 - - 17 - - 68 - - 166 - - 72 - - 219 - - 6 - - 187 - - 178 - - 40 - - 79 - - 114 - - 116 - - 207 - - 190 - - 229 - - 63 - - 252 - - 238 - - 80 - - 60 - - 193 - - 164 - - 146 - - 0 - network_pubkey_bytes: - - 65 - - 76 - - 110 - - 71 - - 55 - - 104 - - 89 - - 119 - - 55 - - 122 - - 53 - - 120 - - 69 - - 85 - - 83 - - 109 - - 83 - - 78 - - 115 - - 71 - - 117 - - 55 - - 73 - - 111 - - 84 - - 51 - - 74 - - 48 - - 122 - - 55 - - 55 - - 108 - - 80 - - 47 - - 122 - - 117 - - 85 - - 68 - - 122 - - 66 - - 112 - - 74 - - 73 - - 65 - proof_of_possession_bytes: - - 9 - - 244 - - 30 - - 127 - - 150 - - 249 - - 92 - - 80 - - 137 - - 37 - - 198 - - 94 - - 200 - - 72 - - 82 - - 231 - - 31 - - 184 - - 204 - - 174 - - 16 - - 221 - - 223 - - 207 - - 203 - - 116 - - 224 - - 209 - - 253 - - 41 - - 75 - - 199 - - 201 - - 174 - - 66 - - 189 - - 190 - - 115 - - 207 - - 66 - - 176 - - 118 - - 43 - - 204 - - 184 - - 193 - - 6 - - 231 - - 133 - - 181 - - 243 - - 229 - - 225 - - 15 - - 222 - - 35 - - 103 - - 126 - - 235 - - 122 - - 127 - - 51 - - 178 - - 10 - name: - - 48 - net_address: [] - next_epoch_stake: 1 - next_epoch_delegation: 0 - next_epoch_gas_price: 1 -treasury_cap: - value: 100000000000001 -storage_fund: - value: 100000000000000 -parameters: - min_validator_stake: 100000000000000 - max_validator_candidate_count: 100 - storage_gas_price: 1 -delegation_reward: - value: 0 -reference_gas_price: 0 - diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-5.snap b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-5.snap new file mode 100644 index 0000000000000..cc150bb525247 --- /dev/null +++ b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-5.snap @@ -0,0 +1,337 @@ +--- +source: crates/sui-config/tests/snapshot_tests.rs +expression: genesis.sui_system_object() +--- +info: + id: "0x0000000000000000000000000000000000000005" +epoch: 0 +validators: + validator_stake: 1 + delegation_stake: 0 + quorum_stake_threshold: 1 + active_validators: + - metadata: + sui_address: 375741c9373ae27bde5e6b5f5cc79f074cd84587 + pubkey_bytes: + - 185 + - 198 + - 238 + - 22 + - 48 + - 239 + - 62 + - 113 + - 17 + - 68 + - 166 + - 72 + - 219 + - 6 + - 187 + - 178 + - 40 + - 79 + - 114 + - 116 + - 207 + - 190 + - 229 + - 63 + - 252 + - 238 + - 80 + - 60 + - 193 + - 164 + - 146 + - 0 + network_pubkey_bytes: + - 65 + - 76 + - 110 + - 71 + - 55 + - 104 + - 89 + - 119 + - 55 + - 122 + - 53 + - 120 + - 69 + - 85 + - 83 + - 109 + - 83 + - 78 + - 115 + - 71 + - 117 + - 55 + - 73 + - 111 + - 84 + - 51 + - 74 + - 48 + - 122 + - 55 + - 55 + - 108 + - 80 + - 47 + - 122 + - 117 + - 85 + - 68 + - 122 + - 66 + - 112 + - 74 + - 73 + - 65 + proof_of_possession_bytes: + - 9 + - 244 + - 30 + - 127 + - 150 + - 249 + - 92 + - 80 + - 137 + - 37 + - 198 + - 94 + - 200 + - 72 + - 82 + - 231 + - 31 + - 184 + - 204 + - 174 + - 16 + - 221 + - 223 + - 207 + - 203 + - 116 + - 224 + - 209 + - 253 + - 41 + - 75 + - 199 + - 201 + - 174 + - 66 + - 189 + - 190 + - 115 + - 207 + - 66 + - 176 + - 118 + - 43 + - 204 + - 184 + - 193 + - 6 + - 231 + - 133 + - 181 + - 243 + - 229 + - 225 + - 15 + - 222 + - 35 + - 103 + - 126 + - 235 + - 122 + - 127 + - 51 + - 178 + - 10 + name: + - 48 + net_address: [] + next_epoch_stake: 1 + next_epoch_delegation: 0 + next_epoch_gas_price: 1 + stake_amount: 1 + delegation: 0 + pending_stake: 0 + pending_withdraw: 0 + pending_delegation: 0 + pending_delegation_withdraw: 0 + delegator_count: 0 + pending_delegator_count: 0 + pending_delegator_withdraw_count: 0 + gas_price: 1 + pending_validators: [] + pending_removals: [] + next_epoch_validators: + - sui_address: 375741c9373ae27bde5e6b5f5cc79f074cd84587 + pubkey_bytes: + - 185 + - 198 + - 238 + - 22 + - 48 + - 239 + - 62 + - 113 + - 17 + - 68 + - 166 + - 72 + - 219 + - 6 + - 187 + - 178 + - 40 + - 79 + - 114 + - 116 + - 207 + - 190 + - 229 + - 63 + - 252 + - 238 + - 80 + - 60 + - 193 + - 164 + - 146 + - 0 + network_pubkey_bytes: + - 65 + - 76 + - 110 + - 71 + - 55 + - 104 + - 89 + - 119 + - 55 + - 122 + - 53 + - 120 + - 69 + - 85 + - 83 + - 109 + - 83 + - 78 + - 115 + - 71 + - 117 + - 55 + - 73 + - 111 + - 84 + - 51 + - 74 + - 48 + - 122 + - 55 + - 55 + - 108 + - 80 + - 47 + - 122 + - 117 + - 85 + - 68 + - 122 + - 66 + - 112 + - 74 + - 73 + - 65 + proof_of_possession_bytes: + - 9 + - 244 + - 30 + - 127 + - 150 + - 249 + - 92 + - 80 + - 137 + - 37 + - 198 + - 94 + - 200 + - 72 + - 82 + - 231 + - 31 + - 184 + - 204 + - 174 + - 16 + - 221 + - 223 + - 207 + - 203 + - 116 + - 224 + - 209 + - 253 + - 41 + - 75 + - 199 + - 201 + - 174 + - 66 + - 189 + - 190 + - 115 + - 207 + - 66 + - 176 + - 118 + - 43 + - 204 + - 184 + - 193 + - 6 + - 231 + - 133 + - 181 + - 243 + - 229 + - 225 + - 15 + - 222 + - 35 + - 103 + - 126 + - 235 + - 122 + - 127 + - 51 + - 178 + - 10 + name: + - 48 + net_address: [] + next_epoch_stake: 1 + next_epoch_delegation: 0 + next_epoch_gas_price: 1 +treasury_cap: + value: 100000000000001 +storage_fund: + value: 100000000000000 +parameters: + min_validator_stake: 100000000000000 + max_validator_candidate_count: 100 + storage_gas_price: 1 +delegation_reward: + value: 0 +reference_gas_price: 0 diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml index 7363f74f3228d..f8f37db2e9a51 100644 --- a/crates/sui-core/Cargo.toml +++ b/crates/sui-core/Cargo.toml @@ -13,7 +13,7 @@ bcs = "0.1.3" chrono = "0.4.0" futures = "0.3.23" bytes = "1.2.1" -serde = { version = "1.0.142", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.83" serde_with = "1.14.0" tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] } @@ -50,13 +50,13 @@ typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef74 typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445"} mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445" } -narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "config" } -narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "consensus" } -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "executor" } -narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "types" } -narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "node" } +narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "config" } +narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "consensus" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "executor" } +narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "types" } +narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "node" } -fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a9e58305dc463c40b9d357730203406214909f04"} +fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b"} workspace-hack = { path = "../workspace-hack"} thiserror = "1.0.32" eyre = "0.6.8" diff --git a/crates/sui-core/src/authority_server.rs b/crates/sui-core/src/authority_server.rs index 9850050fe6ecb..b046ae185e1db 100644 --- a/crates/sui-core/src/authority_server.rs +++ b/crates/sui-core/src/authority_server.rs @@ -182,6 +182,7 @@ impl ValidatorService { .ok_or_else(|| anyhow!("Validator is missing consensus config"))?; let consensus_keypair = config.protocol_key_pair().copy(); let consensus_committee = config.genesis()?.narwhal_committee().load(); + let consensus_worker_cache = config.genesis()?.narwhal_worker_cache(); let consensus_storage_base_path = consensus_config.db_path().to_path_buf(); let consensus_execution_state = state.clone(); let consensus_parameters = consensus_config.narwhal_config().to_owned(); @@ -191,6 +192,7 @@ impl ValidatorService { narwhal_node::restarter::NodeRestarter::watch( consensus_keypair, &*consensus_committee, + consensus_worker_cache, consensus_storage_base_path, consensus_execution_state, consensus_parameters, diff --git a/crates/sui-cost/Cargo.toml b/crates/sui-cost/Cargo.toml index 50a0b0f9aebd6..1bd840a66be43 100644 --- a/crates/sui-cost/Cargo.toml +++ b/crates/sui-cost/Cargo.toml @@ -17,7 +17,7 @@ workspace-hack = { path = "../workspace-hack"} sui-types = {path = "../sui-types"} anyhow = { version = "1.0.58", features = ["backtrace"] } tokio = { version = "1.20.1", features = ["full"] } -serde = { version = "1.0.141", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } strum = { version = "0.24", features = ["derive"] } strum_macros = "0.24" toml = "0.5.9" diff --git a/crates/sui-faucet/Cargo.toml b/crates/sui-faucet/Cargo.toml index 836c710e72b8d..8b25bd7ee57f7 100644 --- a/crates/sui-faucet/Cargo.toml +++ b/crates/sui-faucet/Cargo.toml @@ -14,7 +14,7 @@ clap = { version = "3.2.17", features = ["derive"] } thiserror = "1.0.32" tokio = { version = "1.20.1", features = ["full"] } tracing = "0.1.36" -serde = { version = "1.0.141", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } tower = { version = "0.4.12", features = ["util", "timeout", "load-shed", "limit"] } tower-http = { version = "0.3.4", features = ["cors"] } http = { version = "0.2.8" } diff --git a/crates/sui-framework/Cargo.toml b/crates/sui-framework/Cargo.toml index 8115f6ddd8de3..304cdc5aebf4b 100644 --- a/crates/sui-framework/Cargo.toml +++ b/crates/sui-framework/Cargo.toml @@ -32,7 +32,7 @@ move-stdlib = { git = "https://github.com/move-language/move", rev = "70b34a6647 move-unit-test = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" } move-vm-runtime = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" } move-vm-types = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" } -fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a9e58305dc463c40b9d357730203406214909f04" } +fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b" } workspace-hack = { path = "../workspace-hack"} move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" } diff --git a/crates/sui-gateway/Cargo.toml b/crates/sui-gateway/Cargo.toml index 2dfb3e8bdb148..c13b471003d52 100644 --- a/crates/sui-gateway/Cargo.toml +++ b/crates/sui-gateway/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] anyhow = { version = "1.0.58", features = ["backtrace"] } async-trait = "0.1.57" -serde = { version = "1.0.142", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } tracing = "0.1.36" tokio = { version = "1.20.1", features = ["full"] } futures = "0.3.23" diff --git a/crates/sui-json-rpc-types/Cargo.toml b/crates/sui-json-rpc-types/Cargo.toml index 2bea0f7d58298..a7c21369a86c2 100644 --- a/crates/sui-json-rpc-types/Cargo.toml +++ b/crates/sui-json-rpc-types/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" async-trait = "0.1.57" anyhow = "1.0.58" schemars = { version = "0.8.10", features = ["either"] } -serde = { version = "1.0.141", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.83" serde_with = { version = "1.14.0", features = ["hex"] } colored = "2.0.0" diff --git a/crates/sui-json-rpc/Cargo.toml b/crates/sui-json-rpc/Cargo.toml index d377e07e22ccc..43715b5f469a3 100644 --- a/crates/sui-json-rpc/Cargo.toml +++ b/crates/sui-json-rpc/Cargo.toml @@ -17,7 +17,7 @@ prometheus = "0.13.1" anyhow = "1.0.58" tracing = "0.1.36" async-trait = "0.1.57" -serde = { version = "1.0.141", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } futures = "0.3.23" tokio = { version = "1.20.1", features = ["full"] } signature = "1.6.0" diff --git a/crates/sui-json/Cargo.toml b/crates/sui-json/Cargo.toml index b0c97a5c34ae4..d77f3fe0437aa 100644 --- a/crates/sui-json/Cargo.toml +++ b/crates/sui-json/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" anyhow = { version = "1.0.58", features = ["backtrace"] } bcs = "0.1.3" hex = "0.4.3" -serde = { version = "1.0.141", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.83" schemars = "0.8.10" diff --git a/crates/sui-sdk/Cargo.toml b/crates/sui-sdk/Cargo.toml index bac53f9dea629..f3d762dec6b88 100644 --- a/crates/sui-sdk/Cargo.toml +++ b/crates/sui-sdk/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" anyhow = "1.0.58" async-trait = "0.1.57" jsonrpsee = { version = "0.15.1", features = ["full"] } -serde = { version = "1.0.141", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.83" futures-core = "0.3.21" futures = "0.3.23" @@ -46,4 +46,4 @@ sha3 = "0.10.2" [[example]] name = "tic-tac-toe" path = "examples/tic_tac_toe.rs" -test = false \ No newline at end of file +test = false diff --git a/crates/sui-storage/Cargo.toml b/crates/sui-storage/Cargo.toml index 33d35d79dc033..22a9de71c836c 100644 --- a/crates/sui-storage/Cargo.toml +++ b/crates/sui-storage/Cargo.toml @@ -13,7 +13,7 @@ enum_dispatch = "^0.3" fdlimit = "0.2.1" futures = "0.3.23" flexstr = "^0.9" -serde = { version = "1.0.141", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.83" tokio = { version = "1.20.1", features = ["full", "tracing"] } tokio-stream = "^0.1" @@ -43,4 +43,4 @@ telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", re [[bench]] name = "write_ahead_log" -harness = false \ No newline at end of file +harness = false diff --git a/crates/sui-telemetry/Cargo.toml b/crates/sui-telemetry/Cargo.toml index db07100b3667d..7229ab246c8bc 100644 --- a/crates/sui-telemetry/Cargo.toml +++ b/crates/sui-telemetry/Cargo.toml @@ -7,7 +7,7 @@ publish = false edition = "2021" [dependencies] -serde = { version = "1.0.141", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } reqwest = { version = "0.11.10", features = ["json"] } tokio = { version = "1.17.0", features = ["full", "tracing"] } tracing = "0.1.36" diff --git a/crates/sui-tool/Cargo.toml b/crates/sui-tool/Cargo.toml index ce1f10edf5579..739d508bbfcea 100644 --- a/crates/sui-tool/Cargo.toml +++ b/crates/sui-tool/Cargo.toml @@ -19,12 +19,12 @@ rocksdb = "0.19.0" typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445"} typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445"} tempfile = "3.3.0" -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "executor" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "executor" } serde_with = { version = "1.14.0", features = ["hex"] } sui-storage = { path = "../sui-storage" } strum_macros = "^0.24" strum = "0.24.1" -serde = { version = "1.0.141", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } eyre = "0.6.8" sui-core = { path = "../sui-core" } diff --git a/crates/sui-types/Cargo.toml b/crates/sui-types/Cargo.toml index 2196c23f232d1..860706aeecfd3 100644 --- a/crates/sui-types/Cargo.toml +++ b/crates/sui-types/Cargo.toml @@ -12,7 +12,7 @@ bcs = "0.1.3" itertools = "0.10.3" once_cell = "1.13.1" rand = "0.8.5" -serde = { version = "1.0.141", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } curve25519-dalek = { version = "3", default-features = false, features = ["serde", "u64_backend"] } serde-name = "0.2.1" sha2 = "0.9.9" @@ -50,9 +50,9 @@ move-ir-types = { git = "https://github.com/move-language/move", rev = "70b34a66 move-vm-types = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" } move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" } -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "executor" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "executor" } -fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a9e58305dc463c40b9d357730203406214909f04", features = ["copy_key"] } +fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b", features = ["copy_key"] } workspace-hack = { path = "../workspace-hack"} diff --git a/crates/sui-types/src/README.md b/crates/sui-types/src/README.md index 90779b1d57d46..e595b86096733 100644 --- a/crates/sui-types/src/README.md +++ b/crates/sui-types/src/README.md @@ -6,25 +6,20 @@ Currently, three files are equipped with signature and hashing functionality (`c `messages.rs`). As of today: account signatures utilize the ed25519 scheme. Regarding validators, they still utilize the ed25519 scheme, but we’re exploring transitioning to BLS12-381 due to native aggregation functionality. -For security purposes (i.e., the recent [Chalkias double pub-key api vulnerability](https://github.com/MystenLabs/ed25519-unsafe-libs)) -and forward evolution, we wrap existing structs/functions into our own crates. In particular, our -current backing ed25519 library is `ed25519-dalek` and for BLS it's the `blst` crate; both of them have proven -themselves as some of the fastest Rust implementations for these algorithms. -*Note that we're going to replace the [dalek-ed25519](https://github.com/dalek-cryptography/ed25519-dalek) -backing library with [ed25519-consensus](https://github.com/penumbra-zone/ed25519-consensus), which enforces co-factored -ed25519 signature verification and enables compatibility between single and batch verification.* +Sui uses fastcrypto with an extension trait by adding an additional 1-byte flag to identify signatures `flag || signature` with its associated signing scheme. See [fastcrypto](https://github.com/MystenLabs/fastcrypto) for concrete implementation of various cryprography libraries. ## Quick links -* [crypto.rs](crypto.rs), the main library for cryptography (sign/verify/hash) structs and functions. -* [signature_seed.rs](signature_seed.rs), deterministic signer using a seed, domain and some key identifier. Potential -usage includes custodial services, in which user keys are not deterministically derived from BIP44/BIP32, but from their -username (i.e., email address). -* [messages.rs](messages.rs), functionality for adding/verifying signatures to transactions (for both account holders -and validators). +- [crypto.rs](crypto.rs), the main library for cryptography (sign/verify/hash) structs and functions. +- [signature_seed.rs](signature_seed.rs), deterministic signer using a seed, domain and some key identifier. Potential + usage includes custodial services, in which user keys are not deterministically derived from BIP44/BIP32, but from their + username (i.e., email address). +- [messages.rs](messages.rs), functionality for adding/verifying signatures to transactions (for both account holders + and validators). ## Tests Unit tests exist under the `unit_tests` folder, in particular -* `messages_tests`: to handle signed values, aggregation and certificates. -* `signature_seed_tests`: for deterministic key derivation functionality. + +- `messages_tests`: to handle signed values, aggregation and certificates. +- `signature_seed_tests`: for deterministic key derivation functionality. diff --git a/crates/sui-types/src/crypto.rs b/crates/sui-types/src/crypto.rs index 7244620483428..257506e4c6618 100644 --- a/crates/sui-types/src/crypto.rs +++ b/crates/sui-types/src/crypto.rs @@ -1275,8 +1275,14 @@ impl VerificationObligation { pub fn verify_all(self) -> SuiResult<()> { AggregateAuthoritySignature::batch_verify( - &self.signatures[..], - &self.public_keys.iter().map(|x| &x[..]).collect::>(), + &self + .signatures + .iter() + .collect::>(), + self.public_keys + .iter() + .map(|x| x.iter()) + .collect::>(), &self.messages.iter().map(|x| &x[..]).collect::>()[..], ) .map_err(|error| SuiError::InvalidSignature { diff --git a/crates/sui/Cargo.toml b/crates/sui/Cargo.toml index f810561811c09..c7213dd9ac5a7 100644 --- a/crates/sui/Cargo.toml +++ b/crates/sui/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] anyhow = { version = "1.0.58", features = ["backtrace"] } -serde = { version = "1.0.142", features = ["derive"] } +serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.83" signature = "1.6.0" camino = "1.1.1" @@ -39,7 +39,7 @@ rocksdb = "0.19.0" typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445"} typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445"} tempfile = "3.3.0" -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "executor" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", package = "executor" } move-core-types = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2", features = ["address20"] } move-prover = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" } diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml index 82e10ad0fd94c..527b17578620b 100644 --- a/crates/workspace-hack/Cargo.toml +++ b/crates/workspace-hack/Cargo.toml @@ -95,9 +95,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-31526ba76f738040 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false } +config-d465d040b7c142e8 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", features = ["benchmark", "rand"] } +consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", 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 } @@ -116,6 +116,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 = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" } 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"] } @@ -124,7 +125,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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false } +dag = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", default-features = false } dashmap = { version = "5", default-features = false } data-encoding = { version = "2", features = ["alloc", "std"] } datatest-stable = { version = "0.1", default-features = false } @@ -160,10 +161,10 @@ 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false } +executor = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", default-features = false } eyre = { version = "0.6", features = ["auto-install", "track-caller"] } fail = { version = "0.4", default-features = false } -fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a9e58305dc463c40b9d357730203406214909f04", features = ["copy_key"] } +fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b", features = ["copy_key"] } fastrand = { version = "1", default-features = false } fd-lock = { version = "3", default-features = false } fdlimit = { version = "0.2", default-features = false } @@ -315,14 +316,14 @@ move-vm-types = { git = "https://github.com/move-language/move", rev = "70b34a66 multiaddr = { version = "0.14", features = ["url"] } multihash = { version = "0.16", default-features = false, features = ["alloc", "derive", "identity", "multihash-derive", "multihash-impl", "std"] } mysten-network-e69a2070840aba7a = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445", default-features = false } -mysten-network-b490ae82c09da4e6 = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", default-features = false } +mysten-network-8918ee214dd81cc5 = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "696fa25982acdc87ab64ec6a33cb111edc63a331", 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false } +network = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false, features = ["benchmark"] } +node = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", default-features = false, features = ["benchmark"] } 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 } @@ -376,7 +377,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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false, features = ["benchmark"] } +primary = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", 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"] } @@ -479,6 +480,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 = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", 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 } @@ -493,7 +495,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-e69a2070840aba7a = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } -telemetry-subscribers-b490ae82c09da4e6 = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } +telemetry-subscribers-8918ee214dd81cc5 = { package = "telemetry-subscribers", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "696fa25982acdc87ab64ec6a33cb111edc63a331", 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 } @@ -546,9 +548,9 @@ tui = { version = "0.17", features = ["crossterm"] } twox-hash = { version = "1", default-features = false } typed-arena = { version = "2", features = ["std"] } typed-store-e69a2070840aba7a = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445", default-features = false } -typed-store-b490ae82c09da4e6 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", default-features = false } +typed-store-8918ee214dd81cc5 = { package = "typed-store", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "696fa25982acdc87ab64ec6a33cb111edc63a331", default-features = false } typenum = { version = "1", default-features = false } -types = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f" } +types = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" } ucd-trie = { version = "0.1", default-features = false, features = ["std"] } uncased = { version = "0.9", default-features = false } unescape = { version = "0.1", default-features = false } @@ -582,8 +584,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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false, features = ["benchmark"] } -workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false } +worker = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", default-features = false, features = ["benchmark"] } +workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", default-features = false } yaml-rust = { version = "0.4", default-features = false } zeroize = { version = "1", features = ["alloc", "zeroize_derive"] } zstd-sys = { version = "2", features = ["legacy", "zdict_builder"] } @@ -687,9 +689,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-31526ba76f738040 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false } +config-d465d040b7c142e8 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", features = ["benchmark", "rand"] } +consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", 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 } @@ -708,6 +710,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 = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" } 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"] } @@ -716,7 +719,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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false } +dag = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", 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"] } @@ -763,10 +766,10 @@ 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false } +executor = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", default-features = false } eyre = { version = "0.6", features = ["auto-install", "track-caller"] } fail = { version = "0.4", default-features = false } -fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a9e58305dc463c40b9d357730203406214909f04", features = ["copy_key"] } +fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b", features = ["copy_key"] } fastrand = { version = "1", default-features = false } fd-lock = { version = "3", default-features = false } fdlimit = { version = "0.2", default-features = false } @@ -932,15 +935,15 @@ 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-e69a2070840aba7a = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445", default-features = false } -mysten-network-b490ae82c09da4e6 = { package = "mysten-network", git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", default-features = false } +mysten-network-8918ee214dd81cc5 = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "696fa25982acdc87ab64ec6a33cb111edc63a331", default-features = false } name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445", 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false } +network = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false, features = ["benchmark"] } +node = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", default-features = false, features = ["benchmark"] } 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 } @@ -1008,7 +1011,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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false, features = ["benchmark"] } +primary = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", 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"] } @@ -1139,6 +1142,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 = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", 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 } @@ -1159,7 +1163,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-e69a2070840aba7a = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } -telemetry-subscribers-b490ae82c09da4e6 = { package = "telemetry-subscribers", git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] } +telemetry-subscribers-8918ee214dd81cc5 = { package = "telemetry-subscribers", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "696fa25982acdc87ab64ec6a33cb111edc63a331", 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 } @@ -1220,10 +1224,10 @@ tui = { version = "0.17", features = ["crossterm"] } twox-hash = { version = "1", default-features = false } typed-arena = { version = "2", features = ["std"] } typed-store-e69a2070840aba7a = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445", default-features = false } -typed-store-b490ae82c09da4e6 = { package = "typed-store", git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", default-features = false } +typed-store-8918ee214dd81cc5 = { package = "typed-store", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "696fa25982acdc87ab64ec6a33cb111edc63a331", default-features = false } typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "7ef7415a4e11cf68fa68ce9db884c46e704e0445", default-features = false } typenum = { version = "1", default-features = false } -types = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f" } +types = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d" } ucd-trie = { version = "0.1", default-features = false, features = ["std"] } uncased = { version = "0.9", default-features = false } unescape = { version = "0.1", default-features = false } @@ -1269,8 +1273,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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false, features = ["benchmark"] } -workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false } +worker = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", default-features = false, features = ["benchmark"] } +workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "e994f67cacc2a42dd5d73fe3a64b9b490da72c3d", default-features = false } yaml-rust = { version = "0.4", default-features = false } zeroize = { version = "1", features = ["alloc", "zeroize_derive"] } zeroize_derive = { version = "1", default-features = false } diff --git a/crates/x/src/lint.rs b/crates/x/src/lint.rs index a07ed0c97bd3f..ccd696b531dcf 100644 --- a/crates/x/src/lint.rs +++ b/crates/x/src/lint.rs @@ -7,10 +7,7 @@ use nexlint_lints::{ content::*, handle_lint_results, package::*, - project::{ - BannedDeps, BannedDepsConfig, DirectDepDups, DirectDepDupsConfig, - DirectDuplicateGitDependencies, - }, + project::{BannedDeps, BannedDepsConfig, DirectDuplicateGitDependencies}, }; static LICENSE_HEADER: &str = "Copyright (c) 2022, Mysten Labs, Inc.\n\ @@ -23,10 +20,6 @@ pub struct Args { } pub fn run(args: Args) -> crate::Result<()> { - // rand can be removed if/when ed25519_dalek upgrades to rand 0.8 - let direct_dups_config = DirectDepDupsConfig { - allow: vec!["rand".to_string()], - }; let banned_deps_config = BannedDepsConfig { direct: vec![ ( @@ -42,7 +35,6 @@ pub fn run(args: Args) -> crate::Result<()> { .collect(), }; let project_linters: &[&dyn ProjectLinter] = &[ - &DirectDepDups::new(&direct_dups_config), &BannedDeps::new(&banned_deps_config), &DirectDuplicateGitDependencies, ];