diff --git a/narwhal/config/Cargo.toml b/narwhal/config/Cargo.toml index 2377a67bd302d..d756aeb6d1305 100644 --- a/narwhal/config/Cargo.toml +++ b/narwhal/config/Cargo.toml @@ -6,14 +6,14 @@ authors = ["Mysten Labs "] edition = "2021" [dependencies] +multiaddr = "0.14.0" serde = { version = "1.0.142", features = ["derive"] } serde_json = "1.0.83" thiserror = "1.0.32" tracing = "0.1.36" -multiaddr = "0.14.0" +arc-swap = { version = "1.5.1", features = ["serde"] } crypto = { path = "../crypto" } -arc-swap = { version = "1.5.1", features = ["serde"] } workspace-hack = { version = "0.1", path = "../workspace-hack" } [dev-dependencies] @@ -22,4 +22,4 @@ rand = "0.8.5" tempfile = "3.3.0" tracing-test = "0.2.3" -test_utils = { path = "../test_utils"} +test_utils = { path = "../test_utils" } diff --git a/narwhal/consensus/Cargo.toml b/narwhal/consensus/Cargo.toml index 0b0654a5ebae1..c10ffaf8d7520 100644 --- a/narwhal/consensus/Cargo.toml +++ b/narwhal/consensus/Cargo.toml @@ -15,7 +15,6 @@ rand = { version = "0.8.5", optional = true } # deactivation of bzip2 due to https://github.com/rust-rocksdb/rust-rocksdb/issues/609 rocksdb = { version = "0.18.0", features = ["snappy", "lz4", "zstd", "zlib"], default-features = false } serde = { version = "1.0.142", features = ["derive"] } -serde_bytes = "0.11.7" store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } thiserror = "1.0.32" tokio = { version = "1.20.1", features = ["sync"] } @@ -24,17 +23,17 @@ tracing = "0.1.36" config = { path = "../config" } crypto = { path = "../crypto" } dag = { path = "../dag" } -types = { path = "../types" } prometheus = "0.13.1" +types = { path = "../types" } workspace-hack = { version = "0.1", path = "../workspace-hack" } [dev-dependencies] -futures = "0.3.21" bincode = "1.3.3" criterion = "0.3.6" ed25519-dalek = { version = "1.0.1", features = ["batch", "serde"] } -test_utils = { path = "../test_utils"} +futures = "0.3.21" indexmap = { version = "1.9.1", features = ["serde"] } +test_utils = { path = "../test_utils" } [target.'cfg(unix)'.dev-dependencies] pprof = { version = "0.10.0", features = ["criterion", "flamegraph"] } diff --git a/narwhal/crypto/Cargo.toml b/narwhal/crypto/Cargo.toml index fa0ab29786059..4e95f612e4a84 100644 --- a/narwhal/crypto/Cargo.toml +++ b/narwhal/crypto/Cargo.toml @@ -8,19 +8,19 @@ publish = false [dependencies] anyhow = { version = "1.0.59", features = ["backtrace"] } +ark-bls12-377 = { version = "0.3.0", features = ["std"], optional = true } base64ct = { version = "1.5.1", features = ["alloc"] } ed25519-consensus = { version = "2.0.1", features = ["serde"] } eyre = "0.6.8" hex = "0.4.3" +hkdf = { version = "0.12.3", features = ["std"] } rand = { version = "0.8.5", features = ["std"] } +rust_secp256k1 = { version = "0.24.0", package = "secp256k1", features = ["recovery", "rand-std", "bitcoin_hashes", "global-context"] } serde = { version = "1.0.142", features = ["derive"] } -zeroize = "1.5.7" +serde_with = "2.0.0" signature = "1.5.0" tokio = { version = "1.20.1", features = ["sync", "rt", "macros"] } -ark-bls12-377 = { version = "0.3.0", features = ["std"], optional = true } -hkdf = { version = "0.12.3", features = ["std"] } -serde_with = "2.0.0" -rust_secp256k1 = { version = "0.24.0", package = "secp256k1", features = ["recovery", "rand-std", "bitcoin_hashes", "global-context"] } +zeroize = "1.5.7" # TODO: switch to https://github.com/celo-org/celo-bls-snark-rs # when https://github.com/celo-org/celo-bls-snark-rs/issues/228 is solved @@ -32,10 +32,9 @@ ark-serialize = { version = "0.3.0", features = ["std"], optional = true } ark-std = { version = "0.3.0", features = ["std"], optional = true } blake2 = "0.9" blst = "0.3.10" +digest = "0.10.3" once_cell = "1.13.0" readonly = "0.2.2" -serde_bytes = "0.11.7" -digest = "0.10.3" workspace-hack = { version = "0.1", path = "../workspace-hack" } [[bench]] @@ -51,9 +50,9 @@ copy_key = [] [dev-dependencies] bincode = "1.3.3" criterion = "0.3.6" -sha3 = "0.10.2" hex-literal = "0.3.4" +k256 = { version = "0.11.3", features = ["ecdsa", "sha256", "keccak256"] } proptest = "1.0.0" proptest-derive = "0.3.0" serde_json = "1.0.83" -k256 = { version = "0.11.3", features = ["ecdsa", "sha256", "keccak256"] } +sha3 = "0.10.2" diff --git a/narwhal/dag/Cargo.toml b/narwhal/dag/Cargo.toml index 504863c33e47d..992402358392d 100644 --- a/narwhal/dag/Cargo.toml +++ b/narwhal/dag/Cargo.toml @@ -7,16 +7,16 @@ publish = false edition = "2021" [dependencies] +arc-swap = "1.5.1" crypto = { path = "../crypto" } dashmap = "5.3.4" either = "1.7.0" itertools = "0.10.3" +once_cell = "1.13.0" +rayon = "1.5.3" serde = "1.0.142" thiserror = "1.0.32" -arc-swap = "1.5.1" -once_cell = "1.13.0" workspace-hack = { version = "0.1", path = "../workspace-hack" } -rayon = "1.5.3" [dev-dependencies] hex = "0.4.3" diff --git a/narwhal/examples/Cargo.toml b/narwhal/examples/Cargo.toml index ea6a707d5dbd8..c31edeb4a1584 100644 --- a/narwhal/examples/Cargo.toml +++ b/narwhal/examples/Cargo.toml @@ -11,11 +11,11 @@ name = "demo_client" path = "src/demo_client.rs" [dependencies] +base64 = "0.13.0" clap = "2.34" -tonic = "0.7.2" prost = "0.10.4" tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread"] } -base64 = "0.13.0" +tonic = "0.7.2" workspace-hack = { version = "0.1", path = "../workspace-hack" } [build-dependencies] diff --git a/narwhal/executor/Cargo.toml b/narwhal/executor/Cargo.toml index fbb808572df48..852377f8f00bd 100644 --- a/narwhal/executor/Cargo.toml +++ b/narwhal/executor/Cargo.toml @@ -10,29 +10,29 @@ async-trait = "0.1.57" bincode = "1.3.3" blake2 = "0.9" bytes = "1.2.1" +config = { path = "../config" } +consensus = { path = "../consensus" } +crypto = { path = "../crypto" } futures = "0.3.21" +multiaddr = "0.14.0" +primary = { path = "../primary" } rocksdb = { version = "0.18.0", features = ["snappy", "lz4", "zstd", "zlib"], default-features = false } serde = { version = "1.0.142", features = ["derive"] } thiserror = "1.0.32" tokio = { version = "1.20.1", features = ["sync"] } tokio-util = { version = "0.7.3", features = ["codec"] } -tracing = "0.1.36" -config = { path = "../config" } -consensus = { path = "../consensus" } -crypto = { path = "../crypto" } -primary = { path = "../primary" } tonic = "0.7.2" -multiaddr = "0.14.0" +tracing = "0.1.36" types = { path = "../types" } worker = { path = "../worker" } +mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } -mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } workspace-hack = { version = "0.1", path = "../workspace-hack" } [dev-dependencies] +indexmap = { version = "1.9.1", features = ["serde"] } rand = "0.8.5" tempfile = "3.3.0" test_utils = { path = "../test_utils" } -indexmap = { version = "1.9.1", features = ["serde"] } \ No newline at end of file diff --git a/narwhal/network/Cargo.toml b/narwhal/network/Cargo.toml index 79f9093e8c220..c4e3a91ae6377 100644 --- a/narwhal/network/Cargo.toml +++ b/narwhal/network/Cargo.toml @@ -7,25 +7,25 @@ edition = "2021" publish = false [dependencies] +anyhow = "1.0.59" async-trait = "0.1.57" +backoff = { version = "0.4.0", features = ["tokio"] } bytes = "1.2.1" +crypto = { path = "../crypto" } futures = "0.3.21" +multiaddr = "0.14.0" +prometheus = "0.13.1" rand = { version = "0.8.5", features = ["small_rng"] } thiserror = "1.0.32" tokio = { version = "1.20.1", features = ["rt", "net", "sync", "macros", "time"] } tokio-util = { version = "0.7.3", features = ["codec"] } +tonic = { version = "0.7.2", features = ["tls"] } tracing = "0.1.36" types = { path = "../types" } -crypto = { path = "../crypto" } -tonic = { version = "0.7.2", features = ["tls"] } -backoff = { version = "0.4.0", features = ["tokio"] } -multiaddr = "0.14.0" -anyhow = "1.0.59" -prometheus = "0.13.1" mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } -workspace-hack = { version = "0.1", path = "../workspace-hack" } serde = "1.0.142" +workspace-hack = { version = "0.1", path = "../workspace-hack" } [dev-dependencies] bincode = "1.3.3" diff --git a/narwhal/node/Cargo.toml b/narwhal/node/Cargo.toml index a6621201d5bda..883ab137d3ce9 100644 --- a/narwhal/node/Cargo.toml +++ b/narwhal/node/Cargo.toml @@ -13,11 +13,13 @@ bincode = "1.3.3" bytes = "1.2.1" cfg-if = "1.0.0" clap = "2.34" +dhat = { version = "0.3.0", optional = true } futures = "0.3.21" multiaddr = "0.14.0" mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "20ef52a00135114eb361e28673cfaa9bf4560f6f" } rand = "0.8.5" store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } +telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } thiserror = "1.0.32" tokio = { version = "1.20.1", features = ["full"] } tokio-stream = "0.1.9" @@ -25,20 +27,18 @@ tokio-util = { version = "0.7.3", features = ["codec"] } tracing = "0.1.36" tracing-log = "0.1.3" tracing-subscriber = { version = "0.3.15", features = ["time", "env-filter"] } -telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } url = "2.2.2" -dhat = { version = "0.3.0", optional = true } +axum = "0.5.13" config = { path = "../config" } consensus = { path = "../consensus" } crypto = { path = "../crypto" } executor = { path = "../executor" } +network = { path = "../network" } primary = { path = "../primary" } +prometheus = "0.13.1" types = { path = "../types" } worker = { path = "../worker" } -network = { path = "../network" } -axum = "0.5.13" -prometheus = "0.13.1" workspace-hack = { version = "0.1", path = "../workspace-hack" } [dev-dependencies] diff --git a/narwhal/primary/Cargo.toml b/narwhal/primary/Cargo.toml index c08e06456aad3..2edbdae5922c4 100644 --- a/narwhal/primary/Cargo.toml +++ b/narwhal/primary/Cargo.toml @@ -14,11 +14,14 @@ bincode = "1.3.3" blake2 = "0.9" bytes = "1.2.1" config = { path = "../config" } +dashmap = "5.3.4" derive_builder = "0.11.2" -ed25519-dalek = "1.0.1" +dhat = { version = "0.3.0", optional = true } futures = "0.3.21" itertools = "0.10.3" multiaddr = "0.14.0" +once_cell = "1.13.0" +prometheus = "0.13.1" prost = "0.10.4" rand = { version = "0.8.5", features = ["small_rng"] } serde = { version = "1.0.142", features = ["derive"] } @@ -28,35 +31,31 @@ tokio-util = { version = "0.7.3", features = ["codec"] } tonic = "0.7.2" tower = "0.4.13" tracing = "0.1.36" -dhat = { version = "0.3.0", optional = true } consensus = { path = "../consensus" } crypto = { path = "../crypto" } network = { path = "../network" } types = { path = "../types" } +mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } -mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } -prometheus = "0.13.1" -once_cell = "1.13.0" -dashmap = "5.3.4" workspace-hack = { version = "0.1", path = "../workspace-hack" } [dev-dependencies] arc-swap = { version = "1.5.1", features = ["serde"] } +async-trait = "0.1.57" +executor = { path = "../executor" } +indexmap = { version = "1.9.1", features = ["serde"] } itertools = "0.10.3" mockall = "0.11.2" node = { path = "../node" } +telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } tempfile = "3.3.0" test_utils = { path = "../test_utils" } -tracing-test = "0.2.3" -worker = { path = "../worker" } -async-trait = "0.1.57" -executor = { path = "../executor" } thiserror = "1.0.32" tracing = "0.1.36" -telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } -indexmap = { version = "1.9.1", features = ["serde"] } +tracing-test = "0.2.3" +worker = { path = "../worker" } [features] benchmark = [] diff --git a/narwhal/test_utils/Cargo.toml b/narwhal/test_utils/Cargo.toml index 3f5f0f96b5d96..4a3e7ac6bc40f 100644 --- a/narwhal/test_utils/Cargo.toml +++ b/narwhal/test_utils/Cargo.toml @@ -13,29 +13,28 @@ bincode = "1.3.3" blake2 = "0.9" bytes = "1.2.1" derive_builder = "0.11.2" -ed25519-dalek = "1.0.1" futures = "0.3.21" -rand = "0.8.5" +indexmap = { version = "1.9.1", features = ["serde"] } +itertools = "0.10.3" +multiaddr = "0.14.0" prometheus = "0.13.1" +rand = "0.8.5" serde = { version = "1.0.142", features = ["derive"] } tempfile = "3.3.0" thiserror = "1.0.32" tokio = { version = "1.20.1", features = ["sync", "rt", "macros"] } tokio-util = { version = "0.7.3", features = ["codec"] } tonic = "0.7.2" -multiaddr = "0.14.0" tracing = "0.1.36" -indexmap = { version = "1.9.1", features = ["serde"] } -itertools = "0.10.3" config = { path = "../config" } crypto = { path = "../crypto", features = ["copy_key"] } +executor = { path = "../executor" } +node = { path = "../node" } primary = { path = "../primary" } types = { path = "../types" } -worker = { path = "../worker"} -node = { path = "../node"} -executor = { path = "../executor"} +worker = { path = "../worker" } +mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } -mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } workspace-hack = { version = "0.1", path = "../workspace-hack" } diff --git a/narwhal/types/Cargo.toml b/narwhal/types/Cargo.toml index 8095f548a1d3e..17ade7f283b6d 100644 --- a/narwhal/types/Cargo.toml +++ b/narwhal/types/Cargo.toml @@ -14,6 +14,7 @@ bytes = "1.2.1" derive_builder = "0.11.2" ed25519-dalek = "1.0.1" futures = "0.3.21" +indexmap = { version = "1.9.1", features = ["serde"] } prometheus = "0.13.1" proptest = "1.0.0" proptest-derive = "0.3.0" @@ -26,23 +27,20 @@ thiserror = "1.0.32" tokio = { version = "1.20.1", features = ["sync", "rt", "macros"] } tokio-util = { version = "0.7.3", features = ["codec"] } tonic = { version = "0.7.2", features = ["tls"] } -indexmap = { version = "1.9.1", features = ["serde"] } config = { path = "../config" } crypto = { path = "../crypto" } dag = { path = "../dag" } workspace-hack = { version = "0.1", path = "../workspace-hack" } - - [dev-dependencies] +criterion = "0.3.6" hex = "0.4.3" serde_test = "1.0.142" -criterion = "0.3.6" [build-dependencies] -rustversion = "1.0.9" prost-build = "0.10.4" +rustversion = "1.0.9" tonic-build = { version = "0.7.2", features = [ "prost", "transport" ] } [features] diff --git a/narwhal/worker/Cargo.toml b/narwhal/worker/Cargo.toml index 16c17910bd7bc..61ab388ccb353 100644 --- a/narwhal/worker/Cargo.toml +++ b/narwhal/worker/Cargo.toml @@ -11,26 +11,25 @@ async-trait = "0.1.57" bincode = "1.3.3" blake2 = "0.9" bytes = "1.2.1" -ed25519-dalek = "1.0.1" futures = "0.3.21" +multiaddr = "0.14.0" serde = { version = "1.0.142", features = ["derive"] } tokio = { version = "1.20.1", features = ["sync", "rt", "macros"] } +tokio-stream = "0.1.9" tokio-util = { version = "0.7.3", features = ["codec"] } -tracing = "0.1.36" tonic = "0.7.2" -tokio-stream = "0.1.9" tower = "0.4.13" -multiaddr = "0.14.0" +tracing = "0.1.36" config = { path = "../config" } crypto = { path = "../crypto" } network = { path = "../network" } primary = { path = "../primary" } types = { path = "../types" } - -store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } prometheus = "0.13.1" + +store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" } workspace-hack = { version = "0.1", path = "../workspace-hack" } [dev-dependencies] @@ -39,6 +38,5 @@ rand = "0.8.5" tempfile = "3.3.0" test_utils = { path = "../test_utils" } - [features] benchmark = []