From ec9e7ddc361930e4e9296a5b287ad6b5c838dd3e Mon Sep 17 00:00:00 2001 From: Julian Meyer Date: Mon, 12 Jan 2026 17:27:45 +0000 Subject: [PATCH] Begin upgrading to v1.10.0-rc --- Cargo.lock | 527 +++++++++++------- Cargo.toml | 189 ++++--- .../op-rbuilder/src/builders/builder_tx.rs | 8 +- .../src/builders/flashblocks/payload.rs | 19 +- .../op-rbuilder/src/builders/generator.rs | 5 +- .../src/builders/standard/payload.rs | 9 +- .../src/primitives/reth/engine_api_builder.rs | 1 + .../op-rbuilder/src/primitives/telemetry.rs | 11 +- .../src/tests/framework/instance.rs | 12 + crates/client/flashblocks/src/rpc/eth.rs | 5 +- .../client/flashblocks/src/state_builder.rs | 19 +- crates/client/node/src/test_utils/fixtures.rs | 17 +- crates/shared/primitives/Cargo.toml | 4 +- 13 files changed, 505 insertions(+), 321 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4609f595..55f5cd08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -272,6 +272,17 @@ dependencies = [ "thiserror 2.0.17", ] +[[package]] +name = "alloy-eip7928" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "926b2c0d34e641cf8b17bf54ce50fda16715b9f68ad878fa6128bae410c6f890" +dependencies = [ + "alloy-primitives 1.5.2", + "alloy-rlp", + "serde", +] + [[package]] name = "alloy-eip7928" version = "0.3.0" @@ -312,9 +323,9 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.23.3" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527b47dc39850c6168002ddc1f7a2063e15d26137c1bb5330f6065a7524c1aa9" +checksum = "e6ccc4c702c840148af1ce784cc5c6ed9274a020ef32417c5b1dbeab8c317673" dependencies = [ "alloy-consensus", "alloy-eips", @@ -326,8 +337,7 @@ dependencies = [ "alloy-sol-types 1.5.2", "auto_impl", "derive_more", - "op-alloy-consensus", - "op-alloy-rpc-types-engine", + "op-alloy", "op-revm", "revm", "thiserror 2.0.17", @@ -442,9 +452,9 @@ dependencies = [ [[package]] name = "alloy-op-evm" -version = "0.23.3" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eea81517a852d9e3b03979c10febe00aacc3d50fbd34c5c30281051773285f7" +checksum = "0f640da852f93ddaa3b9a602b7ca41d80e0023f77a67b68aaaf511c32f1fe0ce" dependencies = [ "alloy-consensus", "alloy-eips", @@ -452,7 +462,7 @@ dependencies = [ "alloy-op-hardforks", "alloy-primitives 1.5.2", "auto_impl", - "op-alloy-consensus", + "op-alloy", "op-revm", "revm", "thiserror 2.0.17", @@ -509,6 +519,7 @@ dependencies = [ "cfg-if", "const-hex", "derive_more", + "fixed-cache", "foldhash 0.2.0", "getrandom 0.3.4", "hashbrown 0.16.1", @@ -543,8 +554,10 @@ dependencies = [ "alloy-primitives 1.5.2", "alloy-pubsub", "alloy-rpc-client", + "alloy-rpc-types-debug", "alloy-rpc-types-engine", "alloy-rpc-types-eth", + "alloy-rpc-types-trace", "alloy-rpc-types-txpool", "alloy-signer", "alloy-sol-types 1.5.2", @@ -1857,7 +1870,7 @@ version = "0.2.1" dependencies = [ "alloy-consensus", "alloy-contract", - "alloy-eip7928", + "alloy-eip7928 0.3.0", "alloy-primitives 1.5.2", "alloy-rlp", "alloy-sol-types 1.5.2", @@ -4334,6 +4347,15 @@ dependencies = [ "windows-sys 0.60.2", ] +[[package]] +name = "fixed-cache" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c468bde9b2db8d745d7c9fc33964f1923c6222f0211e10ffd818e6f28b4e190" +dependencies = [ + "equivalent", +] + [[package]] name = "fixed-hash" version = "0.8.0" @@ -5632,6 +5654,23 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" +[[package]] +name = "jemalloc_pprof" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74ff642505c7ce8d31c0d43ec0e235c6fd4585d9b8172d8f9dd04d36590200b5" +dependencies = [ + "anyhow", + "libc", + "mappings", + "once_cell", + "pprof_util", + "tempfile", + "tikv-jemalloc-ctl", + "tokio", + "tracing", +] + [[package]] name = "jni" version = "0.21.1" @@ -6521,6 +6560,19 @@ dependencies = [ "syn 2.0.114", ] +[[package]] +name = "mappings" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db4d277bb50d4508057e7bddd7fcd19ef4a4cc38051b6a5a36868d75ae2cbeb9" +dependencies = [ + "anyhow", + "libc", + "once_cell", + "pprof_util", + "tracing", +] + [[package]] name = "match-lookup" version = "0.1.1" @@ -7222,11 +7274,24 @@ version = "11.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" +[[package]] +name = "op-alloy" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9b8fee21003dd4f076563de9b9d26f8c97840157ef78593cd7f262c5ca99848" +dependencies = [ + "op-alloy-consensus", + "op-alloy-network", + "op-alloy-provider", + "op-alloy-rpc-types", + "op-alloy-rpc-types-engine", +] + [[package]] name = "op-alloy-consensus" -version = "0.22.4" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726da827358a547be9f1e37c2a756b9e3729cb0350f43408164794b370cad8ae" +checksum = "736381a95471d23e267263cfcee9e1d96d30b9754a94a2819148f83379de8a86" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7250,9 +7315,9 @@ checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" [[package]] name = "op-alloy-network" -version = "0.22.4" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63f27e65be273ec8fcb0b6af0fd850b550979465ab93423705ceb3dfddbd2ab" +checksum = "4034183dca6bff6632e7c24c92e75ff5f0eabb58144edb4d8241814851334d47" dependencies = [ "alloy-consensus", "alloy-network", @@ -7264,11 +7329,26 @@ dependencies = [ "op-alloy-rpc-types", ] +[[package]] +name = "op-alloy-provider" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6753d90efbaa8ea8bcb89c1737408ca85fa60d7adb875049d3f382c063666f86" +dependencies = [ + "alloy-network", + "alloy-primitives 1.5.2", + "alloy-provider", + "alloy-rpc-types-engine", + "alloy-transport", + "async-trait", + "op-alloy-rpc-types-engine", +] + [[package]] name = "op-alloy-rpc-jsonrpsee" -version = "0.22.4" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ef9114426b16172254555aad34a8ea96c01895e40da92f5d12ea680a1baeaa7" +checksum = "c1c820ef9c802ebc732281a940bfb6ac2345af4d9fff041cbb64b4b546676686" dependencies = [ "alloy-primitives 1.5.2", "jsonrpsee", @@ -7276,9 +7356,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types" -version = "0.22.4" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562dd4462562c41f9fdc4d860858c40e14a25df7f983ae82047f15f08fce4d19" +checksum = "ddd87c6b9e5b6eee8d6b76f41b04368dca0e9f38d83338e5b00e730c282098a4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7295,9 +7375,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.22.4" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f24b8cb66e4b33e6c9e508bf46b8ecafc92eadd0b93fedd306c0accb477657" +checksum = "77727699310a18cdeed32da3928c709e2704043b6584ed416397d5da65694efc" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7310,6 +7390,7 @@ dependencies = [ "ethereum_ssz_derive", "op-alloy-consensus", "serde", + "sha2", "snap", "thiserror 2.0.17", ] @@ -7451,9 +7532,9 @@ dependencies = [ [[package]] name = "op-revm" -version = "12.0.2" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e31622d03b29c826e48800f4c8f389c8a9c440eb796a3e35203561a288f12985" +checksum = "1475a779c73999fc803778524042319691b31f3d6699d2b560c4ed8be1db802a" dependencies = [ "auto_impl", "revm", @@ -7554,7 +7635,7 @@ dependencies = [ "opentelemetry-http", "opentelemetry-proto", "opentelemetry_sdk", - "prost", + "prost 0.14.3", "reqwest", "thiserror 2.0.17", "tokio", @@ -7570,7 +7651,7 @@ checksum = "a7175df06de5eaee9909d4805a3d07e28bb752c34cab57fa9cff549da596b30f" dependencies = [ "opentelemetry", "opentelemetry_sdk", - "prost", + "prost 0.14.3", "tonic", "tonic-prost", ] @@ -8018,6 +8099,19 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +[[package]] +name = "pprof_util" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4429d44e5e2c8a69399fc0070379201eed018e3df61e04eb7432811df073c224" +dependencies = [ + "anyhow", + "flate2", + "num", + "paste", + "prost 0.13.5", +] + [[package]] name = "ppv-lite86" version = "0.2.21" @@ -8227,6 +8321,16 @@ dependencies = [ "syn 2.0.114", ] +[[package]] +name = "prost" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" +dependencies = [ + "bytes", + "prost-derive 0.13.5", +] + [[package]] name = "prost" version = "0.14.3" @@ -8234,7 +8338,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.14.3", +] + +[[package]] +name = "prost-derive" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" +dependencies = [ + "anyhow", + "itertools 0.14.0", + "proc-macro2", + "quote", + "syn 2.0.114", ] [[package]] @@ -8712,7 +8829,7 @@ checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" [[package]] name = "reth" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-rpc-types", "aquamarine", @@ -8758,7 +8875,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8782,7 +8899,7 @@ dependencies = [ [[package]] name = "reth-chain-state" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8813,7 +8930,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-chains", "alloy-consensus", @@ -8833,7 +8950,7 @@ dependencies = [ [[package]] name = "reth-cli" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-genesis", "clap", @@ -8847,7 +8964,7 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-chains", "alloy-consensus", @@ -8865,6 +8982,7 @@ dependencies = [ "humantime", "itertools 0.14.0", "lz4", + "metrics", "ratatui", "reqwest", "reth-chainspec", @@ -8905,6 +9023,7 @@ dependencies = [ "reth-stages", "reth-static-file", "reth-static-file-types", + "reth-tasks", "reth-trie", "reth-trie-common", "reth-trie-db", @@ -8922,7 +9041,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "reth-tasks", "tokio", @@ -8932,7 +9051,7 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-eips", "alloy-primitives 1.5.2", @@ -8950,7 +9069,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8970,7 +9089,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "proc-macro2", "quote", @@ -8980,13 +9099,14 @@ dependencies = [ [[package]] name = "reth-config" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "eyre", "humantime-serde", "reth-network-types", "reth-prune-types", "reth-stages-types", + "reth-static-file-types", "serde", "toml 0.8.23", "url", @@ -8995,7 +9115,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-primitives 1.5.2", @@ -9008,7 +9128,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9020,7 +9140,7 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9046,7 +9166,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "derive_more", @@ -9072,7 +9192,7 @@ dependencies = [ [[package]] name = "reth-db-api" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -9100,7 +9220,7 @@ dependencies = [ [[package]] name = "reth-db-common" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -9130,7 +9250,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-eips", "alloy-primitives 1.5.2", @@ -9145,7 +9265,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "alloy-rlp", @@ -9170,7 +9290,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "alloy-rlp", @@ -9194,7 +9314,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "data-encoding", @@ -9218,7 +9338,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9253,7 +9373,7 @@ dependencies = [ [[package]] name = "reth-e2e-test-utils" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9311,7 +9431,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "aes", "alloy-primitives 1.5.2", @@ -9323,26 +9443,23 @@ dependencies = [ "ctr", "digest 0.10.7", "futures", - "generic-array", "hmac", "pin-project", "rand 0.8.5", "reth-network-peers", "secp256k1 0.30.0", "sha2", - "sha3", "thiserror 2.0.17", "tokio", "tokio-stream", "tokio-util", "tracing", - "typenum", ] [[package]] name = "reth-engine-local" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-primitives 1.5.2", @@ -9356,6 +9473,7 @@ dependencies = [ "reth-optimism-chainspec", "reth-payload-builder", "reth-payload-primitives", + "reth-primitives-traits", "reth-storage-api", "reth-transaction-pool", "tokio", @@ -9366,7 +9484,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9391,7 +9509,7 @@ dependencies = [ [[package]] name = "reth-engine-service" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "futures", "pin-project", @@ -9413,9 +9531,10 @@ dependencies = [ [[package]] name = "reth-engine-tree" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", + "alloy-eip7928 0.1.0", "alloy-eips", "alloy-evm", "alloy-primitives 1.5.2", @@ -9427,6 +9546,7 @@ dependencies = [ "futures", "metrics", "mini-moka", + "moka", "parking_lot", "rayon", "reth-chain-state", @@ -9468,7 +9588,7 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", @@ -9496,7 +9616,7 @@ dependencies = [ [[package]] name = "reth-era" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9504,7 +9624,6 @@ dependencies = [ "alloy-rlp", "ethereum_ssz", "ethereum_ssz_derive", - "reth-ethereum-primitives", "snap", "thiserror 2.0.17", ] @@ -9512,13 +9631,14 @@ dependencies = [ [[package]] name = "reth-era-downloader" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "bytes", "eyre", "futures-util", "reqwest", + "reth-era", "reth-fs-util", "sha2", "tokio", @@ -9527,7 +9647,7 @@ dependencies = [ [[package]] name = "reth-era-utils" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-primitives 1.5.2", @@ -9549,7 +9669,7 @@ dependencies = [ [[package]] name = "reth-errors" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -9560,7 +9680,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-chains", "alloy-primitives 1.5.2", @@ -9588,7 +9708,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-chains", "alloy-consensus", @@ -9609,7 +9729,7 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "clap", "eyre", @@ -9625,15 +9745,13 @@ dependencies = [ "reth-node-metrics", "reth-rpc-server-types", "reth-tracing", - "reth-tracing-otlp", "tracing", - "url", ] [[package]] name = "reth-ethereum-consensus" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9649,7 +9767,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-eips", "alloy-primitives 1.5.2", @@ -9667,7 +9785,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -9681,7 +9799,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9710,7 +9828,7 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9730,7 +9848,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "rayon", "reth-db-api", @@ -9740,7 +9858,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9750,6 +9868,7 @@ dependencies = [ "derive_more", "futures-util", "metrics", + "rayon", "reth-execution-errors", "reth-execution-types", "reth-metrics", @@ -9763,13 +9882,14 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-evm", "alloy-primitives 1.5.2", "alloy-rpc-types-engine", + "derive_more", "reth-chainspec", "reth-ethereum-forks", "reth-ethereum-primitives", @@ -9783,7 +9903,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-evm", "alloy-primitives 1.5.2", @@ -9796,7 +9916,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9814,7 +9934,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9852,7 +9972,7 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-eips", "alloy-primitives 1.5.2", @@ -9866,7 +9986,7 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "serde", "serde_json", @@ -9876,7 +9996,7 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-primitives 1.5.2", @@ -9904,7 +10024,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "bytes", "futures", @@ -9924,7 +10044,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "bitflags 2.10.0", "byteorder", @@ -9940,7 +10060,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "bindgen 0.71.1", "cc", @@ -9949,7 +10069,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "futures", "metrics", @@ -9961,15 +10081,16 @@ dependencies = [ [[package]] name = "reth-net-banlist" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", + "ipnet", ] [[package]] name = "reth-net-nat" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "futures-util", "if-addrs 0.14.0", @@ -9983,7 +10104,7 @@ dependencies = [ [[package]] name = "reth-network" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10001,6 +10122,7 @@ dependencies = [ "pin-project", "rand 0.8.5", "rand 0.9.2", + "rayon", "reth-chainspec", "reth-consensus", "reth-discv4", @@ -10038,7 +10160,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-primitives 1.5.2", @@ -10063,7 +10185,7 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10086,7 +10208,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "alloy-rlp", @@ -10101,7 +10223,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-eip2124", "humantime-serde", @@ -10115,7 +10237,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "anyhow", "bincode", @@ -10132,7 +10254,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-rpc-types-engine", "eyre", @@ -10156,7 +10278,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10169,11 +10291,11 @@ dependencies = [ "fdlimit", "futures", "jsonrpsee", + "parking_lot", "rayon", "reth-basic-payload-builder", "reth-chain-state", "reth-chainspec", - "reth-cli-util", "reth-config", "reth-consensus", "reth-consensus-debug-client", @@ -10224,7 +10346,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10236,6 +10358,7 @@ dependencies = [ "eyre", "futures", "humantime", + "ipnet", "rand 0.9.2", "reth-chainspec", "reth-cli-util", @@ -10247,11 +10370,13 @@ dependencies = [ "reth-engine-local", "reth-engine-primitives", "reth-ethereum-forks", + "reth-net-banlist", "reth-net-nat", "reth-network", "reth-network-p2p", "reth-network-peers", "reth-primitives-traits", + "reth-provider", "reth-prune-types", "reth-rpc-convert", "reth-rpc-eth-types", @@ -10277,7 +10402,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-eips", "alloy-network", @@ -10315,7 +10440,7 @@ dependencies = [ [[package]] name = "reth-node-ethstats" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-primitives 1.5.2", @@ -10339,7 +10464,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10363,19 +10488,26 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ + "bytes", "eyre", "http", + "http-body-util", + "jemalloc_pprof", "jsonrpsee-server", + "mappings", "metrics", "metrics-exporter-prometheus 0.16.2", "metrics-process", "metrics-util 0.19.1", + "pprof_util", "procfs 0.17.0", "reqwest", + "reth-fs-util", "reth-metrics", "reth-tasks", + "tempfile", "tikv-jemalloc-ctl", "tokio", "tower", @@ -10385,7 +10517,7 @@ dependencies = [ [[package]] name = "reth-node-types" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "reth-chainspec", "reth-db-api", @@ -10397,7 +10529,7 @@ dependencies = [ [[package]] name = "reth-optimism-chainspec" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-chains", "alloy-consensus", @@ -10425,7 +10557,7 @@ dependencies = [ [[package]] name = "reth-optimism-cli" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10464,18 +10596,16 @@ dependencies = [ "reth-static-file", "reth-static-file-types", "reth-tracing", - "reth-tracing-otlp", "serde", "tokio", "tokio-util", "tracing", - "url", ] [[package]] name = "reth-optimism-consensus" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10500,7 +10630,7 @@ dependencies = [ [[package]] name = "reth-optimism-evm" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10528,25 +10658,24 @@ dependencies = [ [[package]] name = "reth-optimism-flashblocks" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives 1.5.2", "alloy-rpc-types-engine", - "alloy-serde", "brotli", "derive_more", "eyre", "futures-util", "metrics", + "op-alloy-rpc-types-engine", "reth-chain-state", "reth-engine-primitives", "reth-errors", "reth-evm", "reth-execution-types", "reth-metrics", - "reth-optimism-evm", "reth-optimism-payload-builder", "reth-optimism-primitives", "reth-payload-primitives", @@ -10556,7 +10685,6 @@ dependencies = [ "reth-storage-api", "reth-tasks", "ringbuffer", - "serde", "serde_json", "tokio", "tokio-tungstenite 0.26.2", @@ -10567,7 +10695,7 @@ dependencies = [ [[package]] name = "reth-optimism-forks" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-op-hardforks", "alloy-primitives 1.5.2", @@ -10578,7 +10706,7 @@ dependencies = [ [[package]] name = "reth-optimism-node" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -10628,7 +10756,7 @@ dependencies = [ [[package]] name = "reth-optimism-payload-builder" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10638,10 +10766,10 @@ dependencies = [ "alloy-rpc-types-debug", "alloy-rpc-types-engine", "derive_more", + "either", "op-alloy-consensus", "op-alloy-rpc-types-engine", "reth-basic-payload-builder", - "reth-chain-state", "reth-chainspec", "reth-evm", "reth-execution-types", @@ -10668,19 +10796,14 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives 1.5.2", "alloy-rlp", - "arbitrary", - "bytes", - "modular-bitfield", "op-alloy-consensus", - "reth-codecs", "reth-primitives-traits", - "reth-zstd-compressors", "serde", "serde_with", ] @@ -10688,7 +10811,7 @@ dependencies = [ [[package]] name = "reth-optimism-rpc" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10749,7 +10872,7 @@ dependencies = [ [[package]] name = "reth-optimism-storage" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "reth-optimism-primitives", @@ -10759,7 +10882,7 @@ dependencies = [ [[package]] name = "reth-optimism-txpool" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10795,7 +10918,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-primitives 1.5.2", @@ -10816,7 +10939,7 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "pin-project", "reth-payload-primitives", @@ -10828,8 +10951,9 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives 1.5.2", "alloy-rpc-types-engine", @@ -10839,7 +10963,9 @@ dependencies = [ "reth-chain-state", "reth-chainspec", "reth-errors", + "reth-execution-types", "reth-primitives-traits", + "reth-trie-common", "serde", "thiserror 2.0.17", "tokio", @@ -10848,7 +10974,7 @@ dependencies = [ [[package]] name = "reth-payload-util" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-primitives 1.5.2", @@ -10858,7 +10984,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", @@ -10868,7 +10994,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "c-kzg", @@ -10882,7 +11008,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10915,7 +11041,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10959,7 +11085,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10975,6 +11101,7 @@ dependencies = [ "reth-primitives-traits", "reth-provider", "reth-prune-types", + "reth-stages-types", "reth-static-file-types", "reth-tokio-util", "rustc-hash 2.1.1", @@ -10986,7 +11113,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "arbitrary", @@ -11001,7 +11128,7 @@ dependencies = [ [[package]] name = "reth-ress-protocol" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-primitives 1.5.2", @@ -11020,7 +11147,7 @@ dependencies = [ [[package]] name = "reth-ress-provider" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-primitives 1.5.2", @@ -11047,7 +11174,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "reth-primitives-traits", @@ -11060,10 +11187,11 @@ dependencies = [ [[package]] name = "reth-rpc" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-dyn-abi", + "alloy-eip7928 0.1.0", "alloy-eips", "alloy-evm", "alloy-genesis", @@ -11102,6 +11230,8 @@ dependencies = [ "reth-consensus-common", "reth-engine-primitives", "reth-errors", + "reth-ethereum-engine-primitives", + "reth-ethereum-primitives", "reth-evm", "reth-evm-ethereum", "reth-execution-types", @@ -11139,8 +11269,9 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ + "alloy-eip7928 0.1.0", "alloy-eips", "alloy-genesis", "alloy-json-rpc", @@ -11162,12 +11293,14 @@ dependencies = [ "reth-network-peers", "reth-rpc-eth-api", "reth-trie-common", + "serde", + "serde_json", ] [[package]] name = "reth-rpc-builder" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-network", "alloy-provider", @@ -11179,6 +11312,7 @@ dependencies = [ "reth-chain-state", "reth-chainspec", "reth-consensus", + "reth-engine-primitives", "reth-evm", "reth-ipc", "reth-metrics", @@ -11193,6 +11327,7 @@ dependencies = [ "reth-rpc-server-types", "reth-storage-api", "reth-tasks", + "reth-tokio-util", "reth-transaction-pool", "serde", "thiserror 2.0.17", @@ -11206,9 +11341,10 @@ dependencies = [ [[package]] name = "reth-rpc-convert" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", + "alloy-evm", "alloy-json-rpc", "alloy-network", "alloy-primitives 1.5.2", @@ -11220,20 +11356,18 @@ dependencies = [ "op-alloy-consensus", "op-alloy-network", "op-alloy-rpc-types", - "op-revm", "reth-ethereum-primitives", "reth-evm", "reth-optimism-primitives", "reth-primitives-traits", "reth-storage-api", - "revm-context", "thiserror 2.0.17", ] [[package]] name = "reth-rpc-engine-api" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-eips", "alloy-primitives 1.5.2", @@ -11242,10 +11376,10 @@ dependencies = [ "jsonrpsee-core", "jsonrpsee-types", "metrics", - "parking_lot", "reth-chainspec", "reth-engine-primitives", "reth-metrics", + "reth-network-api", "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", @@ -11263,7 +11397,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -11307,7 +11441,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -11354,7 +11488,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-rpc-types-engine", "http", @@ -11368,7 +11502,7 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-eips", "alloy-primitives 1.5.2", @@ -11384,7 +11518,7 @@ dependencies = [ [[package]] name = "reth-stages" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -11419,6 +11553,7 @@ dependencies = [ "reth-revm", "reth-stages-api", "reth-static-file-types", + "reth-storage-api", "reth-storage-errors", "reth-testing-utils", "reth-trie", @@ -11432,7 +11567,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-eips", "alloy-primitives 1.5.2", @@ -11459,7 +11594,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "arbitrary", @@ -11473,7 +11608,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "parking_lot", @@ -11493,7 +11628,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "clap", @@ -11505,7 +11640,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -11523,12 +11658,13 @@ dependencies = [ "reth-storage-errors", "reth-trie-common", "revm-database", + "serde_json", ] [[package]] name = "reth-storage-errors" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-eips", "alloy-primitives 1.5.2", @@ -11544,7 +11680,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "auto_impl", "dyn-clone", @@ -11562,7 +11698,7 @@ dependencies = [ [[package]] name = "reth-testing-utils" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -11578,7 +11714,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "tokio", "tokio-stream", @@ -11588,7 +11724,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "clap", "eyre", @@ -11598,14 +11734,14 @@ dependencies = [ "tracing-appender", "tracing-journald", "tracing-logfmt", + "tracing-samply", "tracing-subscriber 0.3.22", - "url", ] [[package]] name = "reth-tracing-otlp" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "clap", "eyre", @@ -11622,7 +11758,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -11663,7 +11799,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -11673,6 +11809,7 @@ dependencies = [ "auto_impl", "itertools 0.14.0", "metrics", + "parking_lot", "reth-execution-errors", "reth-metrics", "reth-primitives-traits", @@ -11688,7 +11825,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-consensus", "alloy-primitives 1.5.2", @@ -11715,12 +11852,14 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "reth-db-api", "reth-execution-errors", "reth-primitives-traits", + "reth-storage-api", + "reth-storage-errors", "reth-trie", "tracing", ] @@ -11728,7 +11867,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "alloy-rlp", @@ -11753,7 +11892,7 @@ dependencies = [ [[package]] name = "reth-trie-sparse" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "alloy-rlp", @@ -11772,7 +11911,7 @@ dependencies = [ [[package]] name = "reth-trie-sparse-parallel" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "alloy-primitives 1.5.2", "alloy-rlp", @@ -11790,16 +11929,16 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" version = "1.9.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" +source = "git+https://github.com/paradigmxyz/reth?rev=6d952f39fe47411164ec0b3978c43fdc7eefe3a8#6d952f39fe47411164ec0b3978c43fdc7eefe3a8" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "31.0.2" +version = "33.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb67a5223602113cae59a305acde2d9936bc18f2478dda879a6124b267cebfb6" +checksum = "0c85ed0028f043f87b3c88d4a4cb6f0a76440085523b6a8afe5ff003cf418054" dependencies = [ "revm-bytecode", "revm-context", @@ -11828,9 +11967,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "11.0.2" +version = "12.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92850e150f4f99d46c05a20ad0cd09286a7ad4ee21866fffb87101de6e602231" +checksum = "f038f0c9c723393ac897a5df9140b21cfa98f5753a2cb7d0f28fa430c4118abf" dependencies = [ "bitvec", "cfg-if", @@ -11845,9 +11984,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "12.0.1" +version = "13.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d701e2c2347d65216b066489ab22a0a8e1f7b2568256110d73a7d5eff3385c" +checksum = "431c9a14e4ef1be41ae503708fd02d974f80ef1f2b6b23b5e402e8d854d1b225" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -11888,9 +12027,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "12.0.2" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45418ed95cfdf0cb19effdbb7633cf2144cab7fb0e6ffd6b0eb9117a50adff6" +checksum = "d44f8f6dbeec3fecf9fe55f78ef0a758bdd92ea46cd4f1ca6e2a946b32c367f3" dependencies = [ "auto_impl", "derive-where", @@ -11907,9 +12046,9 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "12.0.2" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c99801eac7da06cc112df2244bd5a64024f4ef21240e923b26e73c4b4a0e5da6" +checksum = "5617e49216ce1ca6c8826bcead0386bc84f49359ef67cde6d189961735659f93" dependencies = [ "auto_impl", "either", @@ -11925,9 +12064,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.32.0" +version = "0.33.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21caa99f22184a6818946362778cccd3ff02f743c1e085bee87700671570ecb7" +checksum = "01def7351cd9af844150b8e88980bcd11304f33ce23c3d7c25f2a8dab87c1345" dependencies = [ "alloy-primitives 1.5.2", "alloy-rpc-types-eth", @@ -11945,9 +12084,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "29.0.1" +version = "31.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22789ce92c5808c70185e3bc49732f987dc6fd907f77828c8d3470b2299c9c65" +checksum = "26ec36405f7477b9dccdc6caa3be19adf5662a7a0dffa6270cdb13a090c077e5" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -11958,9 +12097,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "29.0.1" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968b124028960201abf6d6bf8e223f15fadebb4307df6b7dc9244a0aab5d2d05" +checksum = "9a62958af953cc4043e93b5be9b8497df84cc3bd612b865c49a7a7dfa26a84e2" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -13836,7 +13975,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67" dependencies = [ "bytes", - "prost", + "prost 0.14.3", "tonic", ] @@ -14011,6 +14150,22 @@ dependencies = [ "web-time", ] +[[package]] +name = "tracing-samply" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c175f7ecc002b6ef04776a39f440503e4e788790ddbdbfac8259b7a069526334" +dependencies = [ + "cfg-if", + "itoa", + "libc", + "mach2", + "memmap2", + "smallvec", + "tracing-core", + "tracing-subscriber 0.3.22", +] + [[package]] name = "tracing-serde" version = "0.2.0" diff --git a/Cargo.toml b/Cargo.toml index a1c4f3fd..3564297e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,135 +66,140 @@ base-txpool = { path = "crates/client/txpool" } base-flashblocks = { path = "crates/client/flashblocks" } # reth -reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-ipc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-tracing = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3", features = [ +reth = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-ipc = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-exex = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-cli = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-db-common = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8", features = [ "client", ] } -reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3", features = [ +reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8", features = [ "op", ] } -reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-storage-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-tasks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-tracing-otlp = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } +reth-chain-state = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-storage-api = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-tasks = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-payload-util = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-node-builder = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-tracing-otlp = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-optimism-flashblocks = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-codecs = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-storage-errors = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } +reth-node-types = { git = "https://github.com/paradigmxyz/reth", rev = "6d952f39fe47411164ec0b3978c43fdc7eefe3a8" } # revm -revm = { version = "31.0.2", features = [ +revm = { version = "33.1.0", features = [ "std", "secp256k1", "optional_balance_check", ], default-features = false } revm-bytecode = { version = "7.1.1", default-features = false } -revm-inspectors = { version = "0.32.0", default-features = false } +revm-inspectors = { version = "0.33.2", default-features = false } revm-database = { version = "9.0.5", default-features = false } revm-state = { version = "8.1.1", default-features = false } revm-primitives = { version = "21.0.2", default-features = false } -revm-interpreter = { version = "29.0.1", default-features = false } -revm-inspector = { version = "12.0.0", default-features = false } -revm-context = { version = "11.0.2", default-features = false } -revm-context-interface = { version = "12.0.1", default-features = false } +revm-interpreter = { version = "31.1.0", default-features = false } revm-database-interface = { version = "8.0.5", default-features = false } # alloy alloy-rlp = "0.3.10" alloy-trie = "0.9.1" -alloy-eips = "1.0.41" -alloy-serde = "1.0.41" +alloy-eips = "1.2.1" +alloy-serde = "1.2.1" alloy-eip7928 = "0.3.0" -alloy-genesis = "1.0.41" -alloy-signer = "1.0.41" -alloy-signer-local = "1.0.41" -alloy-hardforks = "0.4.4" -alloy-provider = { version = "1.0.41", features = [ +alloy-genesis = "1.2.1" +alloy-signer = "1.2.1" +alloy-signer-local = "1.2.1" +alloy-provider = { version = "1.2.1", features = [ "ipc", "pubsub", "txpool-api", "engine-api", ] } -alloy-contract = "1.0.41" +alloy-contract = "1.2.1" alloy-sol-types = { version = "1.4.1", features = ["json"] } alloy-sol-macro = "1.4.1" alloy-primitives = { version = "1.4.1", default-features = false, features = [ "map-foldhash", ] } -alloy-consensus = { version = "1.0.41", features = ["kzg"] } -alloy-rpc-types = "1.0.41" -alloy-rpc-client = "1.0.41" -alloy-rpc-types-eth = "1.0.41" -alloy-rpc-types-engine = { version = "1.0.41", features = ["ssz"] } +alloy-consensus = { version = "1.2.1", features = ["kzg"] } +alloy-rpc-types = "1.2.1" +alloy-rpc-client = "1.2.1" +alloy-rpc-types-eth = "1.2.1" +alloy-rpc-types-engine = { version = "1.2.1", features = ["ssz"] } alloy-chains = "0.2.5" -alloy-evm = { version = "0.23.0", default-features = false } -alloy-pubsub = "1.0.41" -alloy-json-rpc = "1.0.41" -alloy-transport-http = "1.0.41" -alloy-network = "1.0.41" -alloy-network-primitives = "1.0.41" -alloy-transport = "1.0.41" -alloy-node-bindings = "1.0.41" -alloy-rpc-types-beacon = { version = "1.0.41", features = ["ssz"] } +alloy-evm = { version = "0.25.1", default-features = false } +alloy-pubsub = "1.2.1" +alloy-json-rpc = "1.2.1" +alloy-transport-http = "1.2.1" +alloy-network = "1.2.1" +alloy-network-primitives = "1.2.1" +alloy-transport = "1.2.1" +alloy-node-bindings = "1.2.1" +alloy-rpc-types-beacon = { version = "1.2.1", features = ["ssz"] } # op-alloy op-alloy-flz = { version = "0.13.1", default-features = false } -op-alloy-network = { version = "0.22.0", default-features = false } -op-alloy-rpc-types = { version = "0.22.0", default-features = false } -op-alloy-consensus = { version = "0.22.0", default-features = false } -op-alloy-rpc-jsonrpsee = { version = "0.22.0", default-features = false } -op-alloy-rpc-types-engine = { version = "0.22.0", default-features = false } -alloy-op-evm = { version = "0.23.3", default-features = false } +op-alloy-network = { version = "0.23.1", default-features = false } +op-alloy-rpc-types = { version = "0.23.1", default-features = false } +op-alloy-consensus = { version = "0.23.1", default-features = false } +op-alloy-rpc-jsonrpsee = { version = "0.23.1", default-features = false } +op-alloy-rpc-types-engine = { version = "0.23.1", default-features = false } +alloy-op-evm = { version = "0.25.0", default-features = false } + alloy-op-hardforks = "0.4.4" +alloy-hardforks = "0.4.5" # op-revm -op-revm = { version = "12.0.2", default-features = false } +op-revm = { version = "14.1.0", default-features = false } # tokio tokio = "1.48.0" diff --git a/crates/builder/op-rbuilder/src/builders/builder_tx.rs b/crates/builder/op-rbuilder/src/builders/builder_tx.rs index 590ae1b2..7d3a81a9 100644 --- a/crates/builder/op-rbuilder/src/builders/builder_tx.rs +++ b/crates/builder/op-rbuilder/src/builders/builder_tx.rs @@ -12,15 +12,14 @@ use op_alloy_consensus::OpTypedTransaction; use op_alloy_rpc_types::OpTransactionRequest; use op_revm::{OpHaltReason, OpTransactionError}; use reth_evm::{ - ConfigureEvm, Evm, EvmError, InvalidTxError, eth::receipt_builder::ReceiptBuilderCtx, - precompiles::PrecompilesMap, + ConfigureEvm, Evm, EvmEnv, EvmError, InvalidTxError, eth::receipt_builder::ReceiptBuilderCtx, precompiles::PrecompilesMap, rpc::TryIntoTxEnv }; use reth_node_api::PayloadBuilderError; use reth_optimism_primitives::OpTransactionSigned; use reth_primitives::Recovered; use reth_provider::{ProviderError, StateProvider}; use reth_revm::{State, database::StateProviderDatabase}; -use reth_rpc_api::eth::{EthTxEnvError, transaction::TryIntoTxEnv}; +use reth_rpc_api::eth::{EthTxEnvError}; use revm::{ DatabaseCommit, DatabaseRef, context::{ @@ -323,7 +322,8 @@ pub trait BuilderTransactions, evm: &mut OpEvm, ) -> Result, BuilderTransactionError> { - let tx_env = tx.try_into_tx_env(evm.cfg(), evm.block())?; + let evm_env = EvmEnv { cfg_env: evm.cfg().clone(), block_env: evm.block().clone() }; + let tx_env = tx.try_into_tx_env(&evm_env)?; let to = tx_env.base.kind.into_to().unwrap_or_default(); let ResultAndState { result, state } = match evm.transact(tx_env) { diff --git a/crates/builder/op-rbuilder/src/builders/flashblocks/payload.rs b/crates/builder/op-rbuilder/src/builders/flashblocks/payload.rs index 63bc2daf..97d3311e 100644 --- a/crates/builder/op-rbuilder/src/builders/flashblocks/payload.rs +++ b/crates/builder/op-rbuilder/src/builders/flashblocks/payload.rs @@ -21,10 +21,9 @@ use core::time::Duration; use eyre::WrapErr as _; use reth::payload::PayloadBuilderAttributes; use reth_basic_payload_builder::BuildOutcome; -use reth_chain_state::ExecutedBlock; use reth_chainspec::EthChainSpec; use reth_evm::{ConfigureEvm, execute::BlockBuilder}; -use reth_node_api::{Block, NodePrimitives, PayloadBuilderError}; +use reth_node_api::{Block, BuiltPayloadExecutedBlock, NodePrimitives, PayloadBuilderError}; use reth_optimism_consensus::{calculate_receipt_root_no_memo_optimism, isthmus}; use reth_optimism_evm::{OpEvmConfig, OpNextBlockEnvAttributes}; use reth_optimism_forks::OpHardforks; @@ -336,7 +335,7 @@ where .map_err(|e| PayloadBuilderError::Other(e.into()))?; let state_provider = self.client.state_by_block_hash(ctx.parent().hash())?; - let db = StateProviderDatabase::new(&state_provider); + let db = StateProviderDatabase::new(state_provider); self.address_gas_limiter.refresh(ctx.block_number()); // 1. execute the pre steps and seal an early block with that @@ -346,6 +345,8 @@ where .with_bundle_update() .build(); + let state_provider = self.client.state_by_block_hash(ctx.parent().hash())?; + let mut info = execute_pre_steps(&mut state, &ctx)?; let sequencer_tx_time = sequencer_tx_start_time.elapsed(); ctx.metrics.sequencer_tx_duration.record(sequencer_tx_time); @@ -537,13 +538,15 @@ where return Ok(()); } + let state_provider = self.client.state_by_block_hash(ctx.parent().hash())?; + // build first flashblock immediately let next_flashblocks_ctx = match self .build_next_flashblock( &ctx, &mut info, &mut state, - &state_provider, + state_provider, &mut best_txs, &block_cancel, &best_payload, @@ -601,7 +604,7 @@ where ctx: &OpPayloadBuilderCtx, info: &mut ExecutionInfo, state: &mut State, - state_provider: impl reth::providers::StateProvider + Clone, + state_provider: impl reth::providers::StateProvider, best_txs: &mut NextBestFlashblocksTxs, block_cancel: &CancellationToken, best_payload: &BlockCell, @@ -1110,11 +1113,11 @@ where RecoveredBlock::new_unhashed(block.clone(), info.executed_senders.clone()); // create the executed block data - let executed = ExecutedBlock { + let executed = BuiltPayloadExecutedBlock { recovered_block: Arc::new(recovered_block), execution_output: Arc::new(execution_outcome), - hashed_state: Arc::new(hashed_state), - trie_updates: Arc::new(trie_output), + hashed_state: either::Either::Left(Arc::new(hashed_state)), + trie_updates: either::Either::Left(Arc::new(trie_output)), }; debug!(target: "payload_builder", message = "Executed block created"); diff --git a/crates/builder/op-rbuilder/src/builders/generator.rs b/crates/builder/op-rbuilder/src/builders/generator.rs index 4f645cca..041c274d 100644 --- a/crates/builder/op-rbuilder/src/builders/generator.rs +++ b/crates/builder/op-rbuilder/src/builders/generator.rs @@ -470,8 +470,7 @@ mod tests { use alloy_primitives::U256; use rand::rng; use reth::tasks::TokioTaskExecutor; - use reth_chain_state::ExecutedBlock; - use reth_node_api::NodePrimitives; + use reth_node_api::{BuiltPayloadExecutedBlock, NodePrimitives}; use reth_optimism_payload_builder::{OpPayloadPrimitives, payload::OpPayloadBuilderAttributes}; use reth_optimism_primitives::OpPrimitives; use reth_primitives::SealedBlock; @@ -590,7 +589,7 @@ mod tests { } /// Returns the entire execution data for the built block, if available. - fn executed_block(&self) -> Option> { + fn executed_block(&self) -> Option> { None } diff --git a/crates/builder/op-rbuilder/src/builders/standard/payload.rs b/crates/builder/op-rbuilder/src/builders/standard/payload.rs index ed81640e..c8adc03c 100644 --- a/crates/builder/op-rbuilder/src/builders/standard/payload.rs +++ b/crates/builder/op-rbuilder/src/builders/standard/payload.rs @@ -14,9 +14,8 @@ use alloy_evm::Database; use alloy_primitives::U256; use reth::payload::PayloadBuilderAttributes; use reth_basic_payload_builder::{BuildOutcome, BuildOutcomeKind, MissingPayloadBehaviour}; -use reth_chain_state::ExecutedBlock; use reth_evm::{ConfigureEvm, execute::BlockBuilder}; -use reth_node_api::{Block, PayloadBuilderError}; +use reth_node_api::{Block, BuiltPayloadExecutedBlock, PayloadBuilderError}; use reth_optimism_consensus::{calculate_receipt_root_no_memo_optimism, isthmus}; use reth_optimism_evm::{OpEvmConfig, OpNextBlockEnvAttributes}; use reth_optimism_forks::OpHardforks; @@ -586,7 +585,7 @@ impl OpBuilder<'_, Txs> { info!(target: "payload_builder", id=%ctx.attributes().payload_id(), "sealed built block"); // create the executed block data - let executed = ExecutedBlock { + let executed = BuiltPayloadExecutedBlock { recovered_block: Arc::new( RecoveredBlock::>::new_sealed( sealed_block.as_ref().clone(), @@ -594,8 +593,8 @@ impl OpBuilder<'_, Txs> { ), ), execution_output: Arc::new(execution_outcome), - hashed_state: Arc::new(hashed_state), - trie_updates: Arc::new(trie_output), + hashed_state: either::Either::Left(Arc::new(hashed_state)), + trie_updates: either::Either::Left(Arc::new(trie_output)), }; let no_tx_pool = ctx.attributes().no_tx_pool; diff --git a/crates/builder/op-rbuilder/src/primitives/reth/engine_api_builder.rs b/crates/builder/op-rbuilder/src/primitives/reth/engine_api_builder.rs index aaa733ca..99ede483 100644 --- a/crates/builder/op-rbuilder/src/primitives/reth/engine_api_builder.rs +++ b/crates/builder/op-rbuilder/src/primitives/reth/engine_api_builder.rs @@ -78,6 +78,7 @@ where EngineCapabilities::new(OP_ENGINE_CAPABILITIES.iter().copied()), engine_validator, ctx.config.engine.accept_execution_requests_hash, + ctx.node.network().clone(), ); Ok(OpEngineApiExt::new(OpEngineApi::new(inner))) diff --git a/crates/builder/op-rbuilder/src/primitives/telemetry.rs b/crates/builder/op-rbuilder/src/primitives/telemetry.rs index dfedbcc5..30d65dd5 100644 --- a/crates/builder/op-rbuilder/src/primitives/telemetry.rs +++ b/crates/builder/op-rbuilder/src/primitives/telemetry.rs @@ -1,7 +1,9 @@ -use crate::args::TelemetryArgs; +use reth_tracing_otlp::OtlpConfig; use tracing_subscriber::{Layer, filter::Targets}; use url::Url; +use crate::args::TelemetryArgs; + /// Setup telemetry layer with sampling and custom endpoint configuration pub fn setup_telemetry_layer( args: &TelemetryArgs, @@ -19,11 +21,12 @@ pub fn setup_telemetry_layer( } // Create OTLP layer with custom configuration - let otlp_layer = reth_tracing_otlp::span_layer( + let otlp_layer = reth_tracing_otlp::span_layer(OtlpConfig::new( "op-rbuilder", - &Url::parse(args.otlp_endpoint.as_ref().unwrap()).expect("Invalid OTLP endpoint"), + Url::parse(args.otlp_endpoint.as_ref().unwrap()).expect("Invalid OTLP endpoint"), reth_tracing_otlp::OtlpProtocol::Http, - )?; + Some((args.sampling_ratio as f64) / 100.0), + )?)?; // Create a trace filter that sends more data to OTLP but less to stdout let trace_filter = Targets::new() diff --git a/crates/builder/op-rbuilder/src/tests/framework/instance.rs b/crates/builder/op-rbuilder/src/tests/framework/instance.rs index 6025f109..1f72a90d 100644 --- a/crates/builder/op-rbuilder/src/tests/framework/instance.rs +++ b/crates/builder/op-rbuilder/src/tests/framework/instance.rs @@ -337,8 +337,18 @@ pub fn default_node_config() -> NodeConfig { let data_path = tempdir .join(format!("rbuilder.{random_id}.datadir")) .to_path_buf(); + + let rocksdb_path = tempdir + .join(format!("rbuilder.{random_id}.rocksdb")) + .to_path_buf(); + + let pprof_dumps_path = tempdir + .join(format!("rbuilder.{random_id}.pprof-dumps")) + .to_path_buf(); std::fs::create_dir_all(&data_path).expect("Failed to create temporary data directory"); + std::fs::create_dir_all(&rocksdb_path).expect("Failed to create temporary rocksdb directory"); + std::fs::create_dir_all(&pprof_dumps_path).expect("Failed to create temporary pprof dumps directory"); let rpc_ipc_path = tempdir .join(format!("rbuilder.{random_id}.rpc-ipc")) @@ -363,6 +373,8 @@ pub fn default_node_config() -> NodeConfig { .to_string_lossy() .parse() .expect("Failed to parse data dir path"), + rocksdb_path: Some(rocksdb_path), + pprof_dumps_path: Some(pprof_dumps_path), static_files_path: None, }; diff --git a/crates/client/flashblocks/src/rpc/eth.rs b/crates/client/flashblocks/src/rpc/eth.rs index 7408d000..57260ed1 100644 --- a/crates/client/flashblocks/src/rpc/eth.rs +++ b/crates/client/flashblocks/src/rpc/eth.rs @@ -253,8 +253,9 @@ where // state hasn't been cleared yet after canonical block commit if let Some(canonical_tx) = EthTransactions::transaction_by_hash(&self.eth_api, tx_hash) .await? - .map(|tx| tx.into_transaction(self.eth_api.tx_resp_builder())) - .transpose()? + .map(|tx| tx.into_transaction(self.eth_api.converter())) + .transpose() + .map_err(Eth::Error::from)? { return Ok(Some(canonical_tx)); } diff --git a/crates/client/flashblocks/src/state_builder.rs b/crates/client/flashblocks/src/state_builder.rs index 5a655eb7..c72078bc 100644 --- a/crates/client/flashblocks/src/state_builder.rs +++ b/crates/client/flashblocks/src/state_builder.rs @@ -8,7 +8,7 @@ use alloy_op_evm::block::receipt_builder::OpReceiptBuilder; use alloy_primitives::B256; use alloy_rpc_types::TransactionTrait; use alloy_rpc_types_eth::state::StateOverride; -use op_alloy_consensus::{OpDepositReceipt, OpTxEnvelope}; +use op_alloy_consensus::{OpDepositReceipt, OpReceipt, OpTxEnvelope}; use op_alloy_rpc_types::{OpTransactionReceipt, Transaction}; use reth::revm::{Database, DatabaseCommit, context::result::ResultAndState, state::EvmState}; use reth_evm::{ @@ -131,11 +131,9 @@ where effective_gas_price: u128, ) -> Result { let (deposit_receipt_version, deposit_nonce) = if transaction.is_deposit() { - let deposit_receipt = receipt - .inner - .inner - .as_deposit_receipt() - .ok_or(ExecutionError::DepositReceiptMismatch)?; + let OpReceipt::Deposit(deposit_receipt) = &receipt.inner.inner.receipt else { + return Err(ExecutionError::DepositReceiptMismatch.into()); + }; (deposit_receipt.deposit_receipt_version, deposit_receipt.deposit_nonce) } else { @@ -261,11 +259,10 @@ where self.next_log_index += receipt.logs().len(); let (deposit_receipt_version, deposit_nonce) = if transaction.is_deposit() { - let deposit_receipt = op_receipt - .inner - .inner - .as_deposit_receipt() - .ok_or(ExecutionError::DepositReceiptMismatch)?; + let OpReceipt::Deposit(deposit_receipt) = &op_receipt.inner.inner.receipt + else { + return Err(ExecutionError::DepositReceiptMismatch.into()); + }; (deposit_receipt.deposit_receipt_version, deposit_receipt.deposit_nonce) } else { diff --git a/crates/client/node/src/test_utils/fixtures.rs b/crates/client/node/src/test_utils/fixtures.rs index eff8a258..edc39a49 100644 --- a/crates/client/node/src/test_utils/fixtures.rs +++ b/crates/client/node/src/test_utils/fixtures.rs @@ -5,14 +5,20 @@ use std::sync::Arc; use alloy_genesis::GenesisAccount; use alloy_primitives::{U256, utils::Unit}; use base_primitives::{Account, build_test_genesis}; -use reth::api::{NodeTypes, NodeTypesWithDBAdapter}; +use reth::api::NodeTypesWithDBAdapter; use reth_db::{ ClientVersion, DatabaseEnv, init_db, mdbx::{DatabaseArguments, KILOBYTE, MEGABYTE, MaxReadTransactionDuration}, - test_utils::{ERROR_DB_CREATION, TempDatabase, create_test_static_files_dir, tempdir_path}, + test_utils::{ + ERROR_DB_CREATION, TempDatabase, create_test_rocksdb_dir, create_test_static_files_dir, + tempdir_path, + }, }; use reth_optimism_chainspec::OpChainSpec; -use reth_provider::{ProviderFactory, providers::StaticFileProvider}; +use reth_provider::{ + ProviderFactory, + providers::{ProviderNodeTypes, RocksDBProvider, StaticFileProvider}, +}; use crate::test_utils::{GENESIS_GAS_LIMIT, TEST_ACCOUNT_BALANCE_ETH}; @@ -36,16 +42,19 @@ pub fn load_chain_spec() -> Arc { } /// Creates a provider factory for tests with the given chain spec. -pub fn create_provider_factory( +pub fn create_provider_factory( chain_spec: Arc, ) -> ProviderFactory>>> { let (static_dir, _) = create_test_static_files_dir(); let db = create_test_db(); + let (rocksdb_dir, _) = create_test_rocksdb_dir(); ProviderFactory::new( db, chain_spec, StaticFileProvider::read_write(static_dir.keep()).expect("static file provider"), + RocksDBProvider::builder(rocksdb_dir.keep()).build().unwrap(), ) + .unwrap() } /// Creates a temporary test database. diff --git a/crates/shared/primitives/Cargo.toml b/crates/shared/primitives/Cargo.toml index 2a38b5a7..2c533a74 100644 --- a/crates/shared/primitives/Cargo.toml +++ b/crates/shared/primitives/Cargo.toml @@ -18,6 +18,7 @@ test-utils = [ "dep:alloy-contract", "dep:alloy-eips", "dep:alloy-genesis", + "dep:alloy-primitives", "dep:alloy-signer", "dep:alloy-signer-local", "dep:alloy-sol-macro", @@ -29,9 +30,8 @@ test-utils = [ ] [dependencies] -alloy-primitives = { workspace = true, features = ["serde"] } - # test-utils (optional) +alloy-primitives = { workspace = true, features = ["serde"], optional = true } alloy-consensus = { workspace = true, features = ["std"], optional = true } alloy-contract = { workspace = true, optional = true } alloy-eips = { workspace = true, optional = true }