diff --git a/Cargo.lock b/Cargo.lock index bcb6636..88bfe37 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1309,10 +1309,10 @@ dependencies = [ "bincode", "clap", "criterion", - "prost 0.13.1", - "prost-build 0.13.1", - "prost-types 0.13.1", - "prost-wkt-build 0.6.0", + "prost", + "prost-build", + "prost-types", + "prost-wkt-build", "rand", "rayon", "reth-primitives", @@ -3288,16 +3288,6 @@ dependencies = [ "unarray", ] -[[package]] -name = "prost" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" -dependencies = [ - "bytes", - "prost-derive 0.12.6", -] - [[package]] name = "prost" version = "0.13.1" @@ -3305,28 +3295,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", - "prost-derive 0.13.1", -] - -[[package]] -name = "prost-build" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" -dependencies = [ - "bytes", - "heck 0.4.1", - "itertools 0.10.5", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost 0.12.6", - "prost-types 0.12.6", - "regex", - "syn 2.0.74", - "tempfile", + "prost-derive", ] [[package]] @@ -3343,26 +3312,13 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.13.1", - "prost-types 0.13.1", + "prost", + "prost-types", "regex", "syn 2.0.74", "tempfile", ] -[[package]] -name = "prost-derive" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 2.0.74", -] - [[package]] name = "prost-derive" version = "0.13.1" @@ -3376,52 +3332,30 @@ dependencies = [ "syn 2.0.74", ] -[[package]] -name = "prost-types" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" -dependencies = [ - "prost 0.12.6", -] - [[package]] name = "prost-types" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" dependencies = [ - "prost 0.13.1", + "prost", ] [[package]] name = "prost-wkt" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb7ec2850c138ebaa7ab682503b5d08c3cb330343e9c94776612928b6ddb53f" +checksum = "a8d84e2bee181b04c2bac339f2bfe818c46a99750488cc6728ce4181d5aa8299" dependencies = [ "chrono", "inventory", - "prost 0.12.6", + "prost", "serde", "serde_derive", "serde_json", "typetag", ] -[[package]] -name = "prost-wkt-build" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598b7365952c2ed4e32902de0533653aafbe5ae3da436e8e2335c7d375a1cef3" -dependencies = [ - "heck 0.4.1", - "prost 0.12.6", - "prost-build 0.12.6", - "prost-types 0.12.6", - "quote", -] - [[package]] name = "prost-wkt-build" version = "0.6.0" @@ -3429,24 +3363,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a669d5acbe719010c6f62a64e6d7d88fdedc1fe46e419747949ecb6312e9b14" dependencies = [ "heck 0.5.0", - "prost 0.13.1", - "prost-build 0.13.1", - "prost-types 0.13.1", + "prost", + "prost-build", + "prost-types", "quote", ] [[package]] name = "prost-wkt-types" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8eadc2381640a49c1fbfb9f4a857794b4e5bf5a2cbc2d858cfdb74f64dcd22" +checksum = "01ef068e9b82e654614b22e6b13699bd545b6c0e2e721736008b00b38aeb4f64" dependencies = [ "chrono", - "prost 0.12.6", - "prost-build 0.12.6", - "prost-types 0.12.6", + "prost", + "prost-build", + "prost-types", "prost-wkt", - "prost-wkt-build 0.5.1", + "prost-wkt-build", "regex", "serde", "serde_derive", @@ -4240,15 +4174,14 @@ dependencies = [ [[package]] name = "sf-protos" version = "0.1.0" -source = "git+https://github.com/semiotic-ai/sf-protos.git?branch=main#7da33356906ec3315802cf1be9c5316d2dbc0437" +source = "git+https://github.com/semiotic-ai/sf-protos.git?branch=joseph/tru-230-review-how-were-compiling-protobufs-in-sf-protos#0c8fc8208ea8b5a41bb8e00fe30ac9f1b8300ae6" dependencies = [ "alloy-primitives", "ethportal-api", - "prost 0.12.6", - "prost-build 0.12.6", - "prost-types 0.12.6", + "prost", + "prost-build", "prost-wkt", - "prost-wkt-build 0.5.1", + "prost-wkt-build", "prost-wkt-types", "serde", "thiserror", diff --git a/Cargo.toml b/Cargo.toml index 840c83a..e8cf46b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ reth-trie-common = { git = "https://github.com/paradigmxyz/reth", version = "1.0 revm-primitives = "=6.0.0" serde = { version = "1.0.196", features = ["derive"] } serde_json = "1.0.108" -sf-protos = { git = "https://github.com/semiotic-ai/sf-protos.git", branch = "main" } +sf-protos = { git = "https://github.com/semiotic-ai/sf-protos.git", branch = "joseph/tru-230-review-how-were-compiling-protobufs-in-sf-protos" } simple-log = "1.6.0" thiserror = "1.0.44" tokio = { version = "1.35.0", features = ["full"] }