From 0c24e394d6c7ad0fae194491b527ef526bef4c2c Mon Sep 17 00:00:00 2001 From: Cody Wang Date: Fri, 21 Feb 2025 11:25:10 -0500 Subject: [PATCH] bump to reth 1.2.0 + new data format --- Cargo.lock | 1741 +++++++++++++++++++++++++++----------------- Cargo.toml | 48 +- src/flashblocks.rs | 151 ++-- src/main.rs | 22 +- src/rpc.rs | 49 +- 5 files changed, 1202 insertions(+), 809 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 98be905..c108ef4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -110,29 +110,27 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4138dc275554afa6f18c4217262ac9388790b2fc393c2dfe03c51d357abf013" +checksum = "69e32ef5c74bbeb1733c37f4ac7f866f8c8af208b7b4265e21af609dcac5bd5e" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", "alloy-serde", "alloy-trie", - "arbitrary", "auto_impl", "c-kzg", "derive_more", - "rand 0.8.5", "serde", "serde_with", ] [[package]] name = "alloy-consensus-any" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa04e1882c31288ce1028fdf31b6ea94cfa9eafa2e497f903ded631c8c6a42c" +checksum = "0fa13b7b1e1e3fedc42f0728103bfa3b4d566d3d42b606db449504d88dbdbdcf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -181,8 +179,6 @@ checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" dependencies = [ "alloy-primitives", "alloy-rlp", - "arbitrary", - "rand 0.8.5", "serde", ] @@ -194,26 +190,25 @@ checksum = "cabf647eb4650c91a9d38cb6f972bb320009e7e9d61765fb688a86f1563b33e8" dependencies = [ "alloy-primitives", "alloy-rlp", - "arbitrary", "derive_more", "k256", - "rand 0.8.5", "serde", "serde_with", ] [[package]] name = "alloy-eips" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52dd5869ed09e399003e0e0ec6903d981b2a92e74c5d37e6b40890bad2517526" +checksum = "5591581ca2ab0b3e7226a4047f9a1bfcf431da1d0cce3752fda609fea3c27e37" dependencies = [ + "alloy-eip2124", "alloy-eip2930", "alloy-eip7702", "alloy-primitives", "alloy-rlp", "alloy-serde", - "arbitrary", + "auto_impl", "c-kzg", "derive_more", "ethereum_ssz", @@ -225,9 +220,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d2a7fe5c1a9bd6793829ea21a636f30fc2b3f5d2e7418ba86d96e41dd1f460" +checksum = "0cded3a2d4bd7173f696458c5d4c98c18a628dfcc9f194385e80a486e412e2e0" dependencies = [ "alloy-eips", "alloy-primitives", @@ -250,9 +245,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2008bedb8159a255b46b7c8614516eda06679ea82f620913679afbd8031fea72" +checksum = "762414662d793d7aaa36ee3af6928b6be23227df1681ce9c039f6f11daadef64" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -264,9 +259,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4556f01fe41d0677495df10a648ddcf7ce118b0e8aa9642a0e2b6dd1fb7259de" +checksum = "8be03f2ebc00cf88bd06d3c6caf387dceaa9c7e6b268216779fa68a9bf8ab4e6" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -289,9 +284,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31c3c6b71340a1d076831823f09cb6e02de01de5c6630a9631bdb36f947ff80" +checksum = "3a00ce618ae2f78369918be0c20f620336381502c83b6ed62c2f7b2db27698b0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -307,11 +302,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc1360603efdfba91151e623f13a4f4d3dc4af4adc1cbd90bf37c81e84db4c77" dependencies = [ "alloy-rlp", - "arbitrary", "bytes", "cfg-if", "const-hex", - "derive_arbitrary", "derive_more", "foldhash", "getrandom 0.2.15", @@ -322,7 +315,6 @@ dependencies = [ "keccak-asm", "paste", "proptest", - "proptest-derive", "rand 0.8.5", "ruint", "rustc-hash 2.1.0", @@ -333,9 +325,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22c4441b3ebe2d77fa9cf629ba68c3f713eb91779cff84275393db97eddd82" +checksum = "cbe0a2acff0c4bd1669c71251ce10fc455cbffa1b4d0a817d5ea4ba7e5bb3db7" dependencies = [ "alloy-chains", "alloy-consensus", @@ -347,20 +339,21 @@ dependencies = [ "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types-eth", + "alloy-sol-types", "alloy-transport", "alloy-transport-http", + "alloy-transport-ipc", "alloy-transport-ws", "async-stream", "async-trait", "auto_impl", - "dashmap", + "dashmap 6.1.0", "futures", "futures-utils-wasm", - "lru", + "lru 0.13.0", "parking_lot", "pin-project", "reqwest 0.12.12", - "schnellru", "serde", "serde_json", "thiserror 2.0.11", @@ -372,9 +365,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2269fd635f7b505f27c63a3cb293148cd02301efce4c8bdd9ff54fbfc4a20e23" +checksum = "de3a68996f193f542f9e29c88dfa8ed1369d6ee04fa764c1bf23dc11b2f9e4a2" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -413,15 +406,16 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06a292b37e182e514903ede6e623b9de96420e8109ce300da288a96d88b7e4b" +checksum = "b37cc3c7883dc41be1b01460127ad7930466d0a4bb6ba15a02ee34d2745e2d7c" dependencies = [ "alloy-json-rpc", "alloy-primitives", "alloy-pubsub", "alloy-transport", "alloy-transport-http", + "alloy-transport-ipc", "alloy-transport-ws", "futures", "pin-project", @@ -438,9 +432,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9383845dd924939e7ab0298bbfe231505e20928907d7905aa3bf112287305e06" +checksum = "6f18e68a3882f372e045ddc89eb455469347767d17878ca492cfbac81e71a111" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -451,9 +445,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fcea70b3872c645fa0ee7fb23370d685f98e8c35f47297de619fb2e9f607ff" +checksum = "b4e30339fff15d53a3a258a7add476c7d24b61d6f4a71476cc39c8b567666772" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -463,9 +457,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11495cb8c8d3141fc27556a4c9188b81531ad5ec3076a0394c61a6dcfbce9f34" +checksum = "10d06300df4a87d960add35909240fc72da355dd2ac926fa6999f9efafbdc5a7" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -475,9 +469,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca445cef0eb6c2cf51cfb4e214fbf1ebd00893ae2e6f3b944c8101b07990f988" +checksum = "318ae46dd12456df42527c3b94c1ae9001e1ceb707f7afe2c7807ac4e49ebad9" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -486,9 +480,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4009405b1d3f5e8c529b8cf353f74e815fd2102549af4172fc721b4b9ea09133" +checksum = "799103aa44270c7bea076ec5d3d7b6c6d29557ab5485c91a74d3068327adb485" dependencies = [ "alloy-eips", "alloy-primitives", @@ -502,9 +496,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358d6a8d7340b9eb1a7589a6c1fb00df2c9b26e90737fa5ed0108724dd8dac2c" +checksum = "2834b7012054cb2f90ee9893b7cc97702edca340ec1ef386c30c42e55e6cd691" dependencies = [ "alloy-primitives", "serde", @@ -512,9 +506,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f821f30344862a0b6eb9a1c2eb91dfb2ff44c7489f37152a526cdcab79264" +checksum = "e83dde9fcf1ccb9b815cc0c89bba26bbbbaae5150a53ae624ed0fc63cb3676c1" dependencies = [ "alloy-consensus", "alloy-eips", @@ -533,9 +527,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0938bc615c02421bd86c1733ca7205cc3d99a122d9f9bff05726bd604b76a5c2" +checksum = "8b4dbee4d82f8a22dde18c28257bed759afeae7ba73da4a1479a039fd1445d04" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -554,9 +548,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06bd42cf54b8a05b596322267f396a7dbdf141a56e93502a2ab4464fb718467a" +checksum = "418eb6584edd695dfe496dda85a19102c1ae4838f142efce11e2463ed2288d71" dependencies = [ "alloy-eips", "alloy-primitives", @@ -568,9 +562,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd38207e056cc7d1372367fbb4560ddf9107cbd20731743f641246bf0dede149" +checksum = "7bd951155515fa452a2ca4b5434d4b3ab742bcd3d1d1b9a91704bcef5b8d2604" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -582,9 +576,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7fd456a3fa9ea732d1c0611c9d52b5326ee29f4d02d01b07dac453ed68d9eb5" +checksum = "21d8dd5bd94993eda3d56a8c4c0d693548183a35462523ffc4385c0b020d3b0c" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -594,25 +588,25 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae0465c71d4dced7525f408d84873aeebb71faf807d22d74c4a426430ccd9b55" +checksum = "8732058f5ca28c1d53d241e8504620b997ef670315d7c8afab856b3e3b80d945" dependencies = [ "alloy-primitives", - "arbitrary", "serde", "serde_json", ] [[package]] name = "alloy-signer" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfa395ad5cc952c82358d31e4c68b27bf4a89a5456d9b27e226e77dac50e4ff" +checksum = "f96b3526fdd779a4bd0f37319cfb4172db52a7ac24cdbb8804b72091c18e1701" dependencies = [ "alloy-primitives", "async-trait", "auto_impl", + "either", "elliptic-curve", "k256", "thiserror 2.0.11", @@ -620,9 +614,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdc63ce9eda1283fcbaca66ba4a414b841c0e3edbeef9c86a71242fc9e84ccc" +checksum = "fe8f78cd6b7501c7e813a1eb4a087b72d23af51f5bb66d4e948dc840bdd207d8" dependencies = [ "alloy-consensus", "alloy-network", @@ -706,13 +700,12 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d17722a198f33bbd25337660787aea8b8f57814febb7c746bc30407bdfc39448" +checksum = "5a8d762eadce3e9b65eac09879430c6f4fce3736cac3cac123f9b1bf435ddd13" dependencies = [ "alloy-json-rpc", "base64 0.22.1", - "futures-util", "futures-utils-wasm", "serde", "serde_json", @@ -726,9 +719,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1509599021330a31c4a6816b655e34bf67acb1cc03c564e09fd8754ff6c5de" +checksum = "20819c4cb978fb39ce6ac31991ba90f386d595f922f42ef888b4a18be190713e" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -739,11 +732,31 @@ dependencies = [ "url", ] +[[package]] +name = "alloy-transport-ipc" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e88304aa8b796204e5e2500dfe235933ed692745e3effd94c3733643db6d218" +dependencies = [ + "alloy-json-rpc", + "alloy-pubsub", + "alloy-transport", + "bytes", + "futures", + "interprocess", + "pin-project", + "serde", + "serde_json", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "alloy-transport-ws" -version = "0.9.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58011745b2f17b334db40df9077d75b181f78360a5bc5c35519e15d4bfce15e2" +checksum = "b9653ea9aa06d0e02fcbe2f04f1c47f35a85c378ccefa98e54ae85210bc8bbfa" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -752,16 +765,16 @@ dependencies = [ "rustls", "serde_json", "tokio", - "tokio-tungstenite 0.24.0", + "tokio-tungstenite", "tracing", "ws_stream_wasm", ] [[package]] name = "alloy-trie" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6917c79e837aa7b77b7a6dae9f89cbe15313ac161c4d3cfaf8909ef21f3d22d8" +checksum = "d95a94854e420f07e962f7807485856cde359ab99ab6413883e15235ad996e8b" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -858,15 +871,6 @@ dependencies = [ "syn 2.0.98", ] -[[package]] -name = "arbitrary" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" -dependencies = [ - "derive_arbitrary", -] - [[package]] name = "ark-ff" version = "0.3.0" @@ -1116,6 +1120,78 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +[[package]] +name = "aws-lc-rs" +version = "1.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2b7ddaa2c56a367ad27a094ad8ef4faacf8a617c2575acb2ba88949df999ca" +dependencies = [ + "aws-lc-sys", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ac4f13dad353b209b34cbec082338202cbc01c8f00336b55c750c13ac91f8f" +dependencies = [ + "bindgen 0.69.5", + "cc", + "cmake", + "dunce", + "fs_extra", + "paste", +] + +[[package]] +name = "axum" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 1.0.2", + "tower 0.5.2", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.2", + "tower-layer", + "tower-service", +] + [[package]] name = "backon" version = "1.3.0" @@ -1192,6 +1268,29 @@ dependencies = [ "serde", ] +[[package]] +name = "bindgen" +version = "0.69.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +dependencies = [ + "bitflags 2.8.0", + "cexpr", + "clang-sys", + "itertools 0.10.5", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.98", + "which", +] + [[package]] name = "bindgen" version = "0.70.1" @@ -1253,6 +1352,20 @@ dependencies = [ "wyz", ] +[[package]] +name = "blake3" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1230237285e3e10cde447185e8975408ae24deaa67205ce684805c25bc0c7937" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "memmap2", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -1324,7 +1437,7 @@ dependencies = [ "boa_string", "bytemuck", "cfg-if", - "dashmap", + "dashmap 6.1.0", "fast-float2", "hashbrown 0.15.2", "icu_normalizer", @@ -1493,6 +1606,12 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" +[[package]] +name = "bytecount" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" + [[package]] name = "bytemuck" version = "1.21.0" @@ -1561,6 +1680,19 @@ dependencies = [ "serde", ] +[[package]] +name = "cargo_metadata" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +dependencies = [ + "camino", + "cargo-platform", + "semver 1.0.25", + "serde", + "serde_json", +] + [[package]] name = "cargo_metadata" version = "0.18.1" @@ -1704,6 +1836,15 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +[[package]] +name = "cmake" +version = "0.1.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +dependencies = [ + "cc", +] + [[package]] name = "colorchoice" version = "1.0.3" @@ -1786,6 +1927,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + [[package]] name = "convert_case" version = "0.6.0" @@ -2038,6 +2185,19 @@ dependencies = [ "syn 2.0.98", ] +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "dashmap" version = "6.1.0" @@ -2126,17 +2286,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_arbitrary" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "derive_more" version = "1.0.0" @@ -2248,7 +2397,7 @@ dependencies = [ "hkdf", "lazy_static", "libp2p-identity", - "lru", + "lru 0.12.5", "more-asserts", "multiaddr", "parking_lot", @@ -2278,6 +2427,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" +[[package]] +name = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + [[package]] name = "dunce" version = "1.0.5" @@ -2371,6 +2526,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + [[package]] name = "enr" version = "0.12.1" @@ -2430,6 +2591,15 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", +] + [[package]] name = "ethereum_serde_utils" version = "0.7.0" @@ -2599,6 +2769,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "fsevent-sys" version = "4.1.0" @@ -2897,6 +3073,9 @@ name = "hashbrown" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] [[package]] name = "hashbrown" @@ -3046,6 +3225,15 @@ dependencies = [ "hmac 0.8.1", ] +[[package]] +name = "home" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "hostname" version = "0.3.1" @@ -3218,6 +3406,19 @@ dependencies = [ "webpki-roots", ] +[[package]] +name = "hyper-timeout" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" +dependencies = [ + "hyper 1.6.0", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -3231,6 +3432,22 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.6.0", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.10" @@ -3490,7 +3707,6 @@ version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ - "arbitrary", "equivalent", "hashbrown 0.15.2", "serde", @@ -3915,6 +4131,12 @@ dependencies = [ "spin", ] +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + [[package]] name = "libc" version = "0.2.169" @@ -3956,7 +4178,7 @@ version = "0.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78a09b56be5adbcad5aa1197371688dc6bb249a26da3bca2011ee2fb987ebfb" dependencies = [ - "bindgen", + "bindgen 0.70.1", "errno", "libc", ] @@ -4080,100 +4302,44 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" -dependencies = [ - "hashbrown 0.15.2", -] - -[[package]] -name = "lz4_flex" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" - -[[package]] -name = "mach2" -version = "0.4.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" dependencies = [ - "libc", + "hashbrown 0.13.2", ] [[package]] -name = "maili-consensus" -version = "0.1.7" +name = "lru" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6c278346ab9cfef7688510e28a042d8a23c953380e7361a1286920ccbd0d847" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-serde", - "serde", + "hashbrown 0.15.2", ] [[package]] -name = "maili-flz" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6900ede45d18362a5b2878bd0b5266f885b694c620320fc90fc030a591f445c4" - -[[package]] -name = "maili-genesis" -version = "0.1.11" +name = "lru" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "768927c57b7b345e05f11762bec4c0338dea99dba1f3954a9d762998e9fc8c5f" +checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-sol-types", - "maili-serde", - "serde", - "serde_repr", - "thiserror 2.0.11", + "hashbrown 0.15.2", ] [[package]] -name = "maili-protocol" -version = "0.1.7" +name = "lz4_flex" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3783dd37a00d981ce24259ad0a7859717e882e507749c4abaa372049923b9563" -dependencies = [ - "alloc-no-stdlib", - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-serde", - "alloy-sol-types", - "async-trait", - "brotli", - "derive_more", - "maili-consensus", - "maili-flz", - "maili-genesis", - "miniz_oxide", - "rand 0.8.5", - "serde", - "thiserror 2.0.11", - "tracing", - "unsigned-varint", -] +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" [[package]] -name = "maili-serde" -version = "0.1.11" +name = "mach2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1de634cf1a237843cab05c84f5fcbc95106ce7754b5e66c4b5a43f2c0aef13" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ - "alloy-primitives", - "serde", - "serde_json", + "libc", ] [[package]] @@ -4191,6 +4357,12 @@ dependencies = [ "regex-automata 0.1.10", ] +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + [[package]] name = "memchr" version = "2.7.4" @@ -4244,11 +4416,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd7399781913e5393588a8d8c6a2867bf85fb38eaf2502fdce465aad2dc6f034" dependencies = [ "base64 0.22.1", + "http-body-util", + "hyper 1.6.0", + "hyper-rustls", + "hyper-util", "indexmap 2.7.1", + "ipnet", "metrics", "metrics-util 0.19.0", "quanta", "thiserror 1.0.69", + "tokio", + "tracing", ] [[package]] @@ -4273,7 +4452,16 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15b482df36c13dd1869d73d14d28cd4855fbd6cfc32294bee109908a9f4a4ed7" dependencies = [ + "aho-corasick", + "crossbeam-epoch", + "crossbeam-utils", + "hashbrown 0.15.2", + "indexmap 2.7.1", "metrics", + "ordered-float", + "quanta", + "radix_trie", + "sketches-ddsketch", ] [[package]] @@ -4308,6 +4496,21 @@ dependencies = [ "unicase", ] +[[package]] +name = "mini-moka" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c325dfab65f261f386debee8b0969da215b3fa0037e74c8a1234db7ba986d803" +dependencies = [ + "crossbeam-channel", + "crossbeam-utils", + "dashmap 5.5.3", + "skeptic", + "smallvec", + "tagptr", + "triomphe", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -4450,6 +4653,15 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + [[package]] name = "nom" version = "7.1.3" @@ -4651,27 +4863,32 @@ dependencies = [ [[package]] name = "op-alloy-consensus" -version = "0.9.0" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0adb232ec805af3aa35606c19329aa7dc44c4457ae318ed0b8fc7f799dd7dbfe" +checksum = "621e69964165285ce750bf7ba961707e26c31df9f0b25652d6219dcee1f7f5b5" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", "alloy-serde", - "arbitrary", "derive_more", "serde", "serde_with", "thiserror 2.0.11", ] +[[package]] +name = "op-alloy-flz" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbee9e684edfb73081bc22337be374b1b454d5eea87790b61ca95a6564953807" + [[package]] name = "op-alloy-network" -version = "0.9.0" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19872a58b7acceeffb8e88ea048bee1690e7cde53068bd652976435d61fcd1de" +checksum = "c45f90eaee907df6f1c75d9295c303cfc018fdb3ef91b13b9f46e9922bfb1625" dependencies = [ "alloy-consensus", "alloy-network", @@ -4682,33 +4899,21 @@ dependencies = [ "op-alloy-rpc-types", ] -[[package]] -name = "op-alloy-protocol" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a144b1ed079913b11c0640f4eaa3d2ac1bdb6cc35e3658a1640e88b241e0c32" -dependencies = [ - "maili-protocol", -] - [[package]] name = "op-alloy-rpc-jsonrpsee" -version = "0.9.0" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b1f2547067c5b60f3144ae1033a54ce1d11341d8327fa8f203b048d51465e9" +checksum = "409274d1940cdd6806c431157eb2b68b93ec2d019785f625b665d1c72c51d04e" dependencies = [ - "alloy-eips", "alloy-primitives", "jsonrpsee", - "op-alloy-rpc-types", - "op-alloy-rpc-types-engine", ] [[package]] name = "op-alloy-rpc-types" -version = "0.9.0" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68d1a51fe3ee143f102b82f54fa237f21d12635da363276901e6d3ef6c65b7b" +checksum = "7a206be9e4aab37bfa352352d63d8dfa9d48d9df1f30478e4a9477865fd88ad6" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4724,18 +4929,20 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.9.0" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8833ef149ceb74f8f25a79801d110d88ec2db32e700fa10db6c5f5b5cbb71a" +checksum = "158a8f5cec81cd301a2bdf97474b9918dda6318447619fbdfcf3f5bbc394d6be" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "alloy-serde", "derive_more", + "ethereum_ssz", "op-alloy-consensus", - "op-alloy-protocol", "serde", + "snap", "thiserror 2.0.11", ] @@ -4789,12 +4996,104 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "opentelemetry" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "570074cc999d1a58184080966e5bd3bf3a9a4af650c3b05047c2621e7405cd17" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror 1.0.69", +] + +[[package]] +name = "opentelemetry-http" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6351496aeaa49d7c267fb480678d85d1cd30c5edb20b497c48c56f62a8c14b99" +dependencies = [ + "async-trait", + "bytes", + "http 1.2.0", + "opentelemetry", + "reqwest 0.12.12", +] + +[[package]] +name = "opentelemetry-otlp" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e1f9c8b032d4f635c730c0efcf731d5e2530ea13fa8bef7939ddc8420696bd" +dependencies = [ + "async-trait", + "futures-core", + "http 1.2.0", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-proto", + "opentelemetry_sdk", + "prost", + "reqwest 0.12.12", + "serde_json", + "thiserror 1.0.69", + "tokio", + "tonic", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d3968ce3aefdcca5c27e3c4ea4391b37547726a70893aab52d3de95d5f8b34" +dependencies = [ + "hex", + "opentelemetry", + "opentelemetry_sdk", + "prost", + "serde", + "tonic", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c627d9f4c9cdc1f21a29ee4bfbd6028fcb8bcf2a857b43f3abdf72c9c862f3" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry", + "percent-encoding", + "rand 0.8.5", + "serde_json", + "thiserror 1.0.69", + "tokio", + "tokio-stream", +] + [[package]] name = "option-ext" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +[[package]] +name = "ordered-float" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" +dependencies = [ + "num-traits", +] + [[package]] name = "overload" version = "0.1.1" @@ -5055,6 +5354,16 @@ dependencies = [ "yansi", ] +[[package]] +name = "prettyplease" +version = "0.2.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" +dependencies = [ + "proc-macro2", + "syn 2.0.98", +] + [[package]] name = "primeorder" version = "0.13.6" @@ -5184,16 +5493,39 @@ dependencies = [ ] [[package]] -name = "proptest-derive" -version = "0.5.1" +name = "prost" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49" +checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" +dependencies = [ + "anyhow", + "itertools 0.13.0", "proc-macro2", "quote", "syn 2.0.98", ] +[[package]] +name = "pulldown-cmark" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +dependencies = [ + "bitflags 2.8.0", + "memchr", + "unicase", +] + [[package]] name = "quanta" version = "0.12.5" @@ -5291,6 +5623,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] + [[package]] name = "rand" version = "0.8.5" @@ -5383,7 +5725,7 @@ dependencies = [ "crossterm", "instability", "itertools 0.13.0", - "lru", + "lru 0.12.5", "paste", "strum", "strum_macros", @@ -5516,7 +5858,7 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper 0.14.32", - "hyper-tls", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -5530,7 +5872,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 0.1.2", - "system-configuration", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", "tokio-util", @@ -5551,18 +5893,23 @@ checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ "base64 0.22.1", "bytes", + "encoding_rs", + "futures-channel", "futures-core", "futures-util", + "h2 0.4.7", "http 1.2.0", "http-body 1.0.1", "http-body-util", "hyper 1.6.0", "hyper-rustls", + "hyper-tls 0.6.0", "hyper-util", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -5575,7 +5922,9 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 1.0.2", + "system-configuration 0.6.1", "tokio", + "tokio-native-tls", "tokio-rustls", "tower 0.5.2", "tower-service", @@ -5599,8 +5948,8 @@ dependencies = [ [[package]] name = "reth" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5613,8 +5962,6 @@ dependencies = [ "eyre", "futures", "reth-basic-payload-builder", - "reth-beacon-consensus", - "reth-blockchain-tree", "reth-chainspec", "reth-cli", "reth-cli-commands", @@ -5626,10 +5973,10 @@ dependencies = [ "reth-db", "reth-db-api", "reth-downloaders", - "reth-engine-util", "reth-errors", "reth-ethereum-cli", "reth-ethereum-payload-builder", + "reth-ethereum-primitives", "reth-evm", "reth-execution-types", "reth-exex", @@ -5672,8 +6019,8 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5688,110 +6035,19 @@ dependencies = [ "reth-payload-builder-primitives", "reth-payload-primitives", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-revm", "reth-tasks", - "reth-transaction-pool", "revm", "tokio", "tracing", ] -[[package]] -name = "reth-beacon-consensus" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rpc-types-engine", - "futures", - "itertools 0.13.0", - "metrics", - "reth-blockchain-tree-api", - "reth-chainspec", - "reth-codecs", - "reth-db-api", - "reth-engine-primitives", - "reth-errors", - "reth-ethereum-consensus", - "reth-metrics", - "reth-network-p2p", - "reth-node-types", - "reth-payload-builder", - "reth-payload-builder-primitives", - "reth-payload-primitives", - "reth-payload-validator", - "reth-primitives", - "reth-primitives-traits", - "reth-provider", - "reth-prune", - "reth-stages-api", - "reth-static-file", - "reth-tasks", - "reth-tokio-util", - "schnellru", - "thiserror 2.0.11", - "tokio", - "tokio-stream", - "tracing", -] - -[[package]] -name = "reth-blockchain-tree" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "aquamarine", - "linked_hash_set", - "metrics", - "parking_lot", - "reth-blockchain-tree-api", - "reth-consensus", - "reth-db", - "reth-db-api", - "reth-evm", - "reth-execution-errors", - "reth-execution-types", - "reth-metrics", - "reth-network", - "reth-node-types", - "reth-primitives", - "reth-provider", - "reth-revm", - "reth-stages-api", - "reth-storage-errors", - "reth-trie", - "reth-trie-db", - "reth-trie-parallel", - "tokio", - "tracing", -] - -[[package]] -name = "reth-blockchain-tree-api" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "reth-consensus", - "reth-execution-errors", - "reth-primitives", - "reth-primitives-traits", - "reth-storage-errors", - "thiserror 2.0.11", -] - [[package]] name = "reth-chain-state" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5816,8 +6072,8 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5827,7 +6083,6 @@ dependencies = [ "alloy-trie", "auto_impl", "derive_more", - "once_cell", "reth-ethereum-forks", "reth-network-peers", "reth-primitives-traits", @@ -5836,8 +6091,8 @@ dependencies = [ [[package]] name = "reth-cli" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-genesis", "clap", @@ -5850,8 +6105,8 @@ dependencies = [ [[package]] name = "reth-cli-commands" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "ahash", "alloy-consensus", @@ -5868,7 +6123,6 @@ dependencies = [ "human_bytes", "itertools 0.13.0", "ratatui", - "reth-beacon-consensus", "reth-chainspec", "reth-cli", "reth-cli-runner", @@ -5895,6 +6149,7 @@ dependencies = [ "reth-node-events", "reth-node-metrics", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-prune", "reth-stages", @@ -5912,8 +6167,8 @@ dependencies = [ [[package]] name = "reth-cli-runner" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "reth-tasks", "tokio", @@ -5922,8 +6177,8 @@ dependencies = [ [[package]] name = "reth-cli-util" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5940,8 +6195,8 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5957,8 +6212,8 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "convert_case", "proc-macro2", @@ -5968,8 +6223,8 @@ dependencies = [ [[package]] name = "reth-config" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "eyre", "humantime-serde", @@ -5982,36 +6237,34 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "auto_impl", "derive_more", - "reth-primitives", "reth-primitives-traits", ] [[package]] name = "reth-consensus-common" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "reth-chainspec", "reth-consensus", - "reth-primitives", "reth-primitives-traits", ] [[package]] name = "reth-consensus-debug-client" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6034,8 +6287,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -6065,8 +6318,8 @@ dependencies = [ [[package]] name = "reth-db-api" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -6091,8 +6344,8 @@ dependencies = [ [[package]] name = "reth-db-common" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -6120,8 +6373,8 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6134,8 +6387,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6160,8 +6413,8 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6184,8 +6437,8 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-primitives", "data-encoding", @@ -6208,8 +6461,8 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6241,8 +6494,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "aes", "alloy-primitives", @@ -6272,8 +6525,8 @@ dependencies = [ [[package]] name = "reth-engine-local" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -6281,7 +6534,6 @@ dependencies = [ "eyre", "futures-util", "op-alloy-rpc-types-engine", - "reth-beacon-consensus", "reth-chainspec", "reth-consensus", "reth-engine-primitives", @@ -6290,8 +6542,8 @@ dependencies = [ "reth-ethereum-engine-primitives", "reth-evm", "reth-node-types", + "reth-optimism-chainspec", "reth-payload-builder", - "reth-payload-builder-primitives", "reth-payload-primitives", "reth-provider", "reth-prune", @@ -6304,13 +6556,16 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", + "auto_impl", "futures", + "reth-chain-state", "reth-errors", "reth-execution-types", "reth-payload-builder-primitives", @@ -6325,12 +6580,11 @@ dependencies = [ [[package]] name = "reth-engine-service" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "futures", "pin-project", - "reth-beacon-consensus", "reth-chainspec", "reth-consensus", "reth-engine-primitives", @@ -6349,8 +6603,8 @@ dependencies = [ [[package]] name = "reth-engine-tree" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6360,21 +6614,19 @@ dependencies = [ "derive_more", "futures", "metrics", + "mini-moka", "rayon", - "reth-beacon-consensus", - "reth-blockchain-tree", - "reth-blockchain-tree-api", "reth-chain-state", "reth-consensus", + "reth-db", "reth-engine-primitives", "reth-errors", + "reth-ethereum-primitives", "reth-evm", "reth-metrics", "reth-network-p2p", "reth-payload-builder", - "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-primitives", "reth-primitives-traits", "reth-provider", "reth-prune", @@ -6382,9 +6634,11 @@ dependencies = [ "reth-stages-api", "reth-tasks", "reth-trie", + "reth-trie-db", "reth-trie-parallel", "reth-trie-sparse", "revm-primitives", + "schnellru", "thiserror 2.0.11", "tokio", "tracing", @@ -6392,8 +6646,8 @@ dependencies = [ [[package]] name = "reth-engine-util" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6403,17 +6657,19 @@ dependencies = [ "futures", "itertools 0.13.0", "pin-project", + "reth-chainspec", "reth-consensus-common", "reth-engine-primitives", "reth-errors", "reth-ethereum-forks", "reth-evm", "reth-fs-util", + "reth-payload-primitives", "reth-payload-validator", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-revm", - "reth-rpc-types-compat", "reth-trie", "revm-primitives", "serde", @@ -6425,10 +6681,9 @@ dependencies = [ [[package]] name = "reth-errors" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ - "reth-blockchain-tree-api", "reth-consensus", "reth-execution-errors", "reth-fs-util", @@ -6438,8 +6693,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6466,8 +6721,8 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6479,7 +6734,7 @@ dependencies = [ "reth-chainspec", "reth-codecs-derive", "reth-ethereum-forks", - "reth-primitives", + "reth-ethereum-primitives", "reth-primitives-traits", "serde", "thiserror 2.0.11", @@ -6487,8 +6742,8 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "eyre", "reth-chainspec", @@ -6497,8 +6752,8 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6513,28 +6768,26 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", - "reth-chain-state", "reth-chainspec", "reth-engine-primitives", "reth-payload-primitives", "reth-payload-validator", "reth-primitives", - "reth-rpc-types-compat", "serde", "sha2 0.10.8", ] [[package]] name = "reth-ethereum-forks" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -6548,23 +6801,22 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "reth-basic-payload-builder", - "reth-chain-state", "reth-chainspec", "reth-errors", + "reth-ethereum-primitives", "reth-evm", "reth-evm-ethereum", "reth-execution-types", "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-primitives", "reth-primitives-traits", "reth-revm", "reth-storage-api", @@ -6573,10 +6825,32 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-ethereum-primitives" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-network", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-eth", + "alloy-serde", + "derive_more", + "modular-bitfield", + "reth-codecs", + "reth-primitives-traits", + "reth-zstd-compressors", + "revm-primitives", + "secp256k1", + "serde", +] + [[package]] name = "reth-etl" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "rayon", "reth-db-api", @@ -6585,8 +6859,8 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6597,13 +6871,12 @@ dependencies = [ "reth-chainspec", "reth-consensus", "reth-consensus-common", + "reth-ethereum-primitives", "reth-execution-errors", "reth-execution-types", "reth-metrics", "reth-primitives", "reth-primitives-traits", - "reth-prune-types", - "reth-revm", "reth-storage-errors", "revm", "revm-primitives", @@ -6611,13 +6884,14 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-sol-types", + "derive_more", "reth-chainspec", "reth-consensus", "reth-ethereum-consensus", @@ -6625,30 +6899,27 @@ dependencies = [ "reth-evm", "reth-primitives", "reth-primitives-traits", - "reth-revm", + "revm", "revm-primitives", ] [[package]] name = "reth-execution-errors" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", "nybbles", - "reth-consensus", - "reth-prune-types", "reth-storage-errors", - "revm-primitives", "thiserror 2.0.11", ] [[package]] name = "reth-execution-types" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6665,8 +6936,8 @@ dependencies = [ [[package]] name = "reth-exex" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6694,6 +6965,7 @@ dependencies = [ "reth-tasks", "reth-tracing", "rmp-serde", + "thiserror 2.0.11", "tokio", "tokio-util", "tracing", @@ -6701,8 +6973,8 @@ dependencies = [ [[package]] name = "reth-exex-types" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6722,7 +6994,9 @@ dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rpc-types", + "alloy-rpc-types-engine", "alloy-rpc-types-eth", + "alloy-trie", "clap", "futures", "futures-util", @@ -6743,19 +7017,21 @@ dependencies = [ "reth-primitives", "reth-rpc-eth-api", "reth-rpc-types-compat", + "revm", + "rollup-boost", "serde", "serde_json", "tokio", "tokio-stream", - "tokio-tungstenite 0.26.2", + "tokio-tungstenite", "tracing", "url", ] [[package]] name = "reth-fs-util" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "serde", "serde_json", @@ -6764,8 +7040,8 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -6791,8 +7067,8 @@ dependencies = [ [[package]] name = "reth-ipc" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "async-trait", "bytes", @@ -6812,12 +7088,12 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "bitflags 2.8.0", "byteorder", - "dashmap", + "dashmap 6.1.0", "derive_more", "indexmap 2.7.1", "parking_lot", @@ -6829,17 +7105,17 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ - "bindgen", + "bindgen 0.70.1", "cc", ] [[package]] name = "reth-metrics" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "futures", "metrics", @@ -6850,16 +7126,16 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-primitives", ] [[package]] name = "reth-net-nat" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "futures-util", "if-addrs", @@ -6872,8 +7148,8 @@ dependencies = [ [[package]] name = "reth-network" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6926,8 +7202,8 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-primitives", "alloy-rpc-types-admin", @@ -6949,8 +7225,8 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6960,9 +7236,9 @@ dependencies = [ "futures", "reth-consensus", "reth-eth-wire-types", + "reth-ethereum-primitives", "reth-network-peers", "reth-network-types", - "reth-primitives", "reth-primitives-traits", "reth-storage-errors", "tokio", @@ -6971,8 +7247,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6986,11 +7262,11 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ + "alloy-eip2124", "humantime-serde", - "reth-ethereum-forks", "reth-net-banlist", "reth-network-peers", "serde", @@ -7000,8 +7276,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "anyhow", "bincode", @@ -7017,12 +7293,12 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-rpc-types-engine", "eyre", - "reth-beacon-consensus", + "reth-basic-payload-builder", "reth-consensus", "reth-db-api", "reth-engine-primitives", @@ -7030,17 +7306,19 @@ dependencies = [ "reth-network-api", "reth-node-core", "reth-node-types", + "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", "reth-provider", "reth-tasks", + "reth-tokio-util", "reth-transaction-pool", ] [[package]] name = "reth-node-builder" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7052,8 +7330,7 @@ dependencies = [ "futures", "jsonrpsee", "rayon", - "reth-beacon-consensus", - "reth-blockchain-tree", + "reth-basic-payload-builder", "reth-chain-state", "reth-chainspec", "reth-cli-util", @@ -7079,7 +7356,6 @@ dependencies = [ "reth-node-events", "reth-node-metrics", "reth-payload-builder", - "reth-payload-validator", "reth-primitives", "reth-provider", "reth-prune", @@ -7103,8 +7379,8 @@ dependencies = [ [[package]] name = "reth-node-core" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7152,26 +7428,28 @@ dependencies = [ [[package]] name = "reth-node-ethereum" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "eyre", - "reth-basic-payload-builder", - "reth-beacon-consensus", "reth-chainspec", "reth-consensus", + "reth-ethereum-consensus", "reth-ethereum-engine-primitives", "reth-ethereum-payload-builder", + "reth-ethereum-primitives", "reth-evm", "reth-evm-ethereum", "reth-network", "reth-node-api", "reth-node-builder", - "reth-payload-builder", - "reth-primitives", "reth-provider", "reth-revm", "reth-rpc", + "reth-rpc-api", + "reth-rpc-builder", + "reth-rpc-eth-types", + "reth-rpc-server-types", "reth-tracing", "reth-transaction-pool", "reth-trie-db", @@ -7180,8 +7458,8 @@ dependencies = [ [[package]] name = "reth-node-events" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7191,7 +7469,6 @@ dependencies = [ "futures", "humantime", "pin-project", - "reth-beacon-consensus", "reth-engine-primitives", "reth-network-api", "reth-primitives-traits", @@ -7205,8 +7482,8 @@ dependencies = [ [[package]] name = "reth-node-metrics" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "eyre", "http 1.2.0", @@ -7214,7 +7491,7 @@ dependencies = [ "metrics", "metrics-exporter-prometheus", "metrics-process", - "metrics-util 0.18.0", + "metrics-util 0.19.0", "procfs 0.16.0", "reth-metrics", "reth-tasks", @@ -7227,20 +7504,21 @@ dependencies = [ [[package]] name = "reth-node-types" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "reth-chainspec", "reth-db-api", "reth-engine-primitives", + "reth-payload-primitives", "reth-primitives-traits", "reth-trie-db", ] [[package]] name = "reth-optimism-chainspec" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-chains", "alloy-consensus", @@ -7262,8 +7540,8 @@ dependencies = [ [[package]] name = "reth-optimism-cli" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7290,6 +7568,7 @@ dependencies = [ "reth-node-events", "reth-node-metrics", "reth-optimism-chainspec", + "reth-optimism-consensus", "reth-optimism-evm", "reth-optimism-node", "reth-optimism-primitives", @@ -7308,13 +7587,14 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-trie", + "op-alloy-consensus", "reth-chainspec", "reth-consensus", "reth-consensus-common", @@ -7322,13 +7602,14 @@ dependencies = [ "reth-optimism-forks", "reth-optimism-primitives", "reth-primitives", + "reth-primitives-traits", "tracing", ] [[package]] name = "reth-optimism-evm" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7346,10 +7627,7 @@ dependencies = [ "reth-optimism-consensus", "reth-optimism-forks", "reth-optimism-primitives", - "reth-primitives", "reth-primitives-traits", - "reth-prune-types", - "reth-revm", "revm", "revm-primitives", "thiserror 2.0.11", @@ -7358,11 +7636,12 @@ dependencies = [ [[package]] name = "reth-optimism-forks" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-chains", "alloy-primitives", + "auto_impl", "once_cell", "reth-ethereum-forks", "serde", @@ -7370,21 +7649,17 @@ dependencies = [ [[package]] name = "reth-optimism-node" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "clap", - "derive_more", "eyre", "op-alloy-consensus", "op-alloy-rpc-types-engine", - "parking_lot", - "reth-basic-payload-builder", - "reth-beacon-consensus", "reth-chainspec", "reth-consensus", "reth-db", @@ -7400,6 +7675,7 @@ dependencies = [ "reth-optimism-payload-builder", "reth-optimism-primitives", "reth-optimism-rpc", + "reth-optimism-txpool", "reth-payload-builder", "reth-payload-util", "reth-payload-validator", @@ -7407,8 +7683,9 @@ dependencies = [ "reth-primitives-traits", "reth-provider", "reth-revm", + "reth-rpc-eth-api", + "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types-compat", "reth-tracing", "reth-transaction-pool", "reth-trie-db", @@ -7419,8 +7696,8 @@ dependencies = [ [[package]] name = "reth-optimism-payload-builder" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7436,7 +7713,6 @@ dependencies = [ "reth-chainspec", "reth-evm", "reth-execution-types", - "reth-optimism-chainspec", "reth-optimism-consensus", "reth-optimism-evm", "reth-optimism-forks", @@ -7446,9 +7722,9 @@ dependencies = [ "reth-payload-primitives", "reth-payload-util", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-revm", - "reth-rpc-types-compat", "reth-transaction-pool", "revm", "sha2 0.10.8", @@ -7458,23 +7734,22 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", - "arbitrary", + "alloy-rpc-types-eth", + "alloy-serde", "bytes", "derive_more", "modular-bitfield", - "once_cell", "op-alloy-consensus", "proptest", "rand 0.8.5", "reth-codecs", - "reth-primitives", "reth-primitives-traits", "reth-zstd-compressors", "revm-primitives", @@ -7484,14 +7759,18 @@ dependencies = [ [[package]] name = "reth-optimism-rpc" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rpc-types-debug", + "alloy-rpc-types-engine", "alloy-rpc-types-eth", + "async-trait", + "derive_more", + "jsonrpsee", "jsonrpsee-core", "jsonrpsee-types", "op-alloy-consensus", @@ -7512,11 +7791,13 @@ dependencies = [ "reth-optimism-forks", "reth-optimism-payload-builder", "reth-optimism-primitives", + "reth-optimism-txpool", "reth-primitives", "reth-primitives-traits", "reth-provider", "reth-rpc", "reth-rpc-api", + "reth-rpc-engine-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", @@ -7529,14 +7810,37 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-optimism-txpool" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-eth", + "c-kzg", + "derive_more", + "op-alloy-consensus", + "op-alloy-flz", + "parking_lot", + "reth-chainspec", + "reth-optimism-evm", + "reth-optimism-forks", + "reth-optimism-primitives", + "reth-primitives-traits", + "reth-storage-api", + "reth-transaction-pool", + "revm", +] + [[package]] name = "reth-payload-builder" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-rpc-types", - "async-trait", "futures-util", "metrics", "reth-chain-state", @@ -7552,11 +7856,9 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ - "alloy-rpc-types-engine", - "async-trait", "pin-project", "reth-payload-primitives", "tokio", @@ -7566,18 +7868,18 @@ dependencies = [ [[package]] name = "reth-payload-primitives" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", + "auto_impl", "op-alloy-rpc-types-engine", "reth-chain-state", "reth-chainspec", "reth-errors", "reth-primitives", - "revm-primitives", "serde", "thiserror 2.0.11", "tokio", @@ -7585,61 +7887,44 @@ dependencies = [ [[package]] name = "reth-payload-util" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-primitives", - "reth-primitives", + "reth-transaction-pool", ] [[package]] name = "reth-payload-validator" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-rpc-types", "reth-chainspec", + "reth-engine-primitives", "reth-primitives", "reth-primitives-traits", ] [[package]] name = "reth-primitives" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", - "alloy-eips", - "alloy-network", - "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types", - "alloy-serde", - "alloy-trie", - "bytes", "c-kzg", - "derive_more", - "modular-bitfield", "once_cell", - "op-alloy-consensus", - "op-alloy-rpc-types", - "rayon", - "reth-codecs", "reth-ethereum-forks", + "reth-ethereum-primitives", "reth-primitives-traits", "reth-static-file-types", - "reth-zstd-compressors", - "revm-primitives", - "secp256k1", - "serde", - "serde_with", ] [[package]] name = "reth-primitives-traits" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7653,6 +7938,7 @@ dependencies = [ "derive_more", "k256", "modular-bitfield", + "once_cell", "op-alloy-consensus", "rayon", "reth-codecs", @@ -7665,21 +7951,21 @@ dependencies = [ [[package]] name = "reth-provider" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "auto_impl", - "dashmap", + "dashmap 6.1.0", + "eyre", "itertools 0.13.0", "metrics", "notify", "parking_lot", "rayon", - "reth-blockchain-tree-api", "reth-chain-state", "reth-chainspec", "reth-codecs", @@ -7693,7 +7979,6 @@ dependencies = [ "reth-network-p2p", "reth-nippy-jar", "reth-node-types", - "reth-optimism-primitives", "reth-primitives", "reth-primitives-traits", "reth-prune-types", @@ -7710,8 +7995,8 @@ dependencies = [ [[package]] name = "reth-prune" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7739,8 +8024,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-primitives", "derive_more", @@ -7752,15 +8037,11 @@ dependencies = [ [[package]] name = "reth-revm" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ - "alloy-eips", "alloy-primitives", - "reth-execution-errors", - "reth-primitives", "reth-primitives-traits", - "reth-prune-types", "reth-storage-api", "reth-storage-errors", "reth-trie", @@ -7769,8 +8050,8 @@ dependencies = [ [[package]] name = "reth-rpc" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -7808,9 +8089,11 @@ dependencies = [ "reth-engine-primitives", "reth-errors", "reth-evm", + "reth-metrics", "reth-network-api", "reth-network-peers", "reth-network-types", + "reth-node-api", "reth-primitives", "reth-primitives-traits", "reth-provider", @@ -7838,10 +8121,11 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-eips", + "alloy-genesis", "alloy-json-rpc", "alloy-primitives", "alloy-rpc-types", @@ -7863,16 +8147,17 @@ dependencies = [ [[package]] name = "reth-rpc-builder" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ + "alloy-network", + "alloy-provider", "http 1.2.0", "jsonrpsee", "metrics", "pin-project", "reth-chainspec", "reth-consensus", - "reth-engine-primitives", "reth-evm", "reth-ipc", "reth-metrics", @@ -7899,8 +8184,8 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7910,16 +8195,14 @@ dependencies = [ "jsonrpsee-types", "metrics", "parking_lot", - "reth-beacon-consensus", "reth-chainspec", "reth-engine-primitives", "reth-metrics", "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-primitives", + "reth-primitives-traits", "reth-rpc-api", - "reth-rpc-types-compat", "reth-storage-api", "reth-tasks", "reth-transaction-pool", @@ -7931,8 +8214,8 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -7975,8 +8258,8 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7993,6 +8276,7 @@ dependencies = [ "reth-chain-state", "reth-chainspec", "reth-errors", + "reth-evm", "reth-execution-types", "reth-metrics", "reth-primitives", @@ -8017,8 +8301,8 @@ dependencies = [ [[package]] name = "reth-rpc-layer" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-rpc-types-engine", "http 1.2.0", @@ -8031,8 +8315,8 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8047,13 +8331,11 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", - "alloy-eips", "alloy-primitives", - "alloy-rpc-types-engine", "alloy-rpc-types-eth", "jsonrpsee-types", "reth-primitives", @@ -8063,17 +8345,19 @@ dependencies = [ [[package]] name = "reth-stages" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "bincode", + "blake3", "futures-util", "itertools 0.13.0", "num-traits", "rayon", + "reqwest 0.12.12", "reth-codecs", "reth-config", "reth-consensus", @@ -8083,6 +8367,7 @@ dependencies = [ "reth-evm", "reth-execution-types", "reth-exex", + "reth-fs-util", "reth-network-p2p", "reth-primitives", "reth-primitives-traits", @@ -8094,6 +8379,7 @@ dependencies = [ "reth-storage-errors", "reth-trie", "reth-trie-db", + "serde", "thiserror 2.0.11", "tokio", "tracing", @@ -8101,8 +8387,8 @@ dependencies = [ [[package]] name = "reth-stages-api" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8128,8 +8414,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-primitives", "bytes", @@ -8141,8 +8427,8 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-primitives", "parking_lot", @@ -8162,8 +8448,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-primitives", "clap", @@ -8174,8 +8460,8 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8199,23 +8485,23 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", "derive_more", - "reth-fs-util", "reth-primitives-traits", + "reth-prune-types", "reth-static-file-types", "thiserror 2.0.11", ] [[package]] name = "reth-tasks" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "auto_impl", "dyn-clone", @@ -8232,8 +8518,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "tokio", "tokio-stream", @@ -8242,8 +8528,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "clap", "eyre", @@ -8257,8 +8543,8 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8277,7 +8563,6 @@ dependencies = [ "reth-execution-types", "reth-fs-util", "reth-metrics", - "reth-payload-util", "reth-primitives", "reth-primitives-traits", "reth-storage-api", @@ -8296,8 +8581,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8307,10 +8592,9 @@ dependencies = [ "auto_impl", "itertools 0.13.0", "metrics", - "rayon", "reth-execution-errors", "reth-metrics", - "reth-primitives", + "reth-primitives-traits", "reth-stages-types", "reth-storage-errors", "reth-trie-common", @@ -8321,8 +8605,8 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8334,16 +8618,18 @@ dependencies = [ "derive_more", "itertools 0.13.0", "nybbles", + "rayon", "reth-codecs", "reth-primitives-traits", + "revm", "serde", "serde_with", ] [[package]] name = "reth-trie-db" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8353,7 +8639,7 @@ dependencies = [ "reth-db-api", "reth-execution-errors", "reth-metrics", - "reth-primitives", + "reth-primitives-traits", "reth-storage-errors", "reth-trie", "revm", @@ -8362,8 +8648,8 @@ dependencies = [ [[package]] name = "reth-trie-parallel" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8385,8 +8671,8 @@ dependencies = [ [[package]] name = "reth-trie-sparse" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8400,17 +8686,17 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "1.1.5" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.5#3212af2d85a54eb207661361ac9fe1d7de4b5b8e" +version = "1.2.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.2.0#1e965caf5fa176f244a31c0d2662ba1b590938db" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "19.4.0" +version = "19.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1538aea4d103a8044820eede9b1254e1b5a2a2abaf3f9a67bef19f8865cf1826" +checksum = "dfc5bef3c95fadf3b6a24a253600348380c169ef285f9780a793bb7090c8990d" dependencies = [ "auto_impl", "cfg-if", @@ -8424,9 +8710,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc873bc873e12a1723493e1a35804fa79b673a0bfb1c19cfee659d46def8be42" +checksum = "6d87cdf1c0d878b48423f8a86232950657abaf72a2d0d14af609467542313b1a" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -8437,15 +8723,16 @@ dependencies = [ "boa_gc", "colorchoice", "revm", + "serde", "serde_json", "thiserror 2.0.11", ] [[package]] name = "revm-interpreter" -version = "15.1.0" +version = "15.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f632e761f171fb2f6ace8d1552a5793e0350578d4acec3e79ade1489f4c2a6" +checksum = "7dcab7ef2064057acfc84731205f4bc77f4ec1b35630800b26ff6a185731c5ab" dependencies = [ "revm-primitives", "serde", @@ -8453,9 +8740,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "16.0.0" +version = "16.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6542fb37650dfdbf4b9186769e49c4a8bc1901a3280b2ebf32f915b6c8850f36" +checksum = "6caa1a7ff2cc4a09a263fcf9de99151706f323d30f33d519ed329f017a02b046" dependencies = [ "aurora-engine-modexp", "blst", @@ -8473,9 +8760,9 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "15.1.0" +version = "15.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48faea1ecf2c9f80d9b043bbde0db9da616431faed84c4cfa3dd7393005598e6" +checksum = "f0f987564210317706def498421dfba2ae1af64a8edce82c6102758b48133fcb" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -8591,6 +8878,56 @@ dependencies = [ "chrono", ] +[[package]] +name = "rollup-boost" +version = "0.1.0" +source = "git+http://github.com/flashbots/rollup-boost?rev=0b089a37b8525d328ab93962bb8121811ee3ca1f#0b089a37b8525d328ab93962bb8121811ee3ca1f" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "alloy-serde", + "clap", + "dotenv", + "eyre", + "futures", + "futures-util", + "http 1.2.0", + "http-body 0.4.6", + "http-body-util", + "hyper 1.6.0", + "hyper-util", + "jsonrpsee", + "lazy_static", + "lru 0.10.1", + "metrics", + "metrics-derive", + "metrics-exporter-prometheus", + "metrics-process", + "metrics-util 0.18.0", + "op-alloy-rpc-jsonrpsee", + "op-alloy-rpc-types", + "op-alloy-rpc-types-engine", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-otlp", + "opentelemetry_sdk", + "paste", + "reqwest 0.12.12", + "serde", + "serde_json", + "thiserror 1.0.69", + "time", + "tokio", + "tokio-tungstenite", + "tower 0.4.13", + "tracing", + "tracing-opentelemetry", + "tracing-subscriber", + "url", +] + [[package]] name = "route-recognizer" version = "0.3.1" @@ -8604,7 +8941,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c3cc4c2511671f327125da14133d0c5c5d137f006a1017a16f557bc85b16286" dependencies = [ "alloy-rlp", - "arbitrary", "ark-ff 0.3.0", "ark-ff 0.4.2", "bytes", @@ -8692,6 +9028,7 @@ version = "0.23.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7" dependencies = [ + "aws-lc-rs", "log", "once_cell", "ring", @@ -8786,6 +9123,7 @@ version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -9006,17 +9344,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "serde_spanned" version = "0.6.8" @@ -9236,6 +9563,21 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" +[[package]] +name = "skeptic" +version = "0.13.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" +dependencies = [ + "bytecount", + "cargo_metadata 0.14.2", + "error-chain", + "glob", + "pulldown-cmark", + "tempfile", + "walkdir", +] + [[package]] name = "sketches-ddsketch" version = "0.3.0" @@ -9454,7 +9796,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation 0.9.4", - "system-configuration-sys", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.8.0", + "core-foundation 0.9.4", + "system-configuration-sys 0.6.0", ] [[package]] @@ -9467,6 +9820,16 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tagptr" version = "0.2.0" @@ -9718,22 +10081,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-tungstenite" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" -dependencies = [ - "futures-util", - "log", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tungstenite 0.24.0", - "webpki-roots", -] - [[package]] name = "tokio-tungstenite" version = "0.26.2" @@ -9743,9 +10090,13 @@ dependencies = [ "futures-util", "log", "native-tls", + "rustls", + "rustls-pki-types", "tokio", "tokio-native-tls", - "tungstenite 0.26.2", + "tokio-rustls", + "tungstenite", + "webpki-roots", ] [[package]] @@ -9797,6 +10148,36 @@ dependencies = [ "winnow", ] +[[package]] +name = "tonic" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.22.1", + "bytes", + "h2 0.4.7", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.6.0", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost", + "socket2", + "tokio", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower" version = "0.4.13" @@ -9965,6 +10346,24 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "tracing-opentelemetry" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc58af5d3f6c5811462cabb3289aec0093f7338e367e5a33d28c0433b3c7360b" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "smallvec", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", + "web-time", +] + [[package]] name = "tracing-serde" version = "0.2.0" @@ -9997,30 +10396,16 @@ dependencies = [ ] [[package]] -name = "try-lock" -version = "0.2.5" +name = "triomphe" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" [[package]] -name = "tungstenite" -version = "0.24.0" +name = "try-lock" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.2.0", - "httparse", - "log", - "rand 0.8.5", - "rustls", - "rustls-pki-types", - "sha1", - "thiserror 1.0.69", - "utf-8", -] +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" @@ -10035,6 +10420,8 @@ dependencies = [ "log", "native-tls", "rand 0.9.0", + "rustls", + "rustls-pki-types", "sha1", "thiserror 2.0.11", "utf-8", @@ -10215,7 +10602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" dependencies = [ "anyhow", - "cargo_metadata", + "cargo_metadata 0.18.1", "cfg-if", "regex", "rustversion", @@ -10398,6 +10785,18 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + [[package]] name = "widestring" version = "1.1.0" diff --git a/Cargo.toml b/Cargo.toml index d3f4a1e..2f9210e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,16 +8,17 @@ homepage = "https://github.com/base-org/reth-flashblocks" repository = "https://github.com/base-org/reth-flashblocks" [dependencies] -reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" } -reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" } -reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" } -reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" } -reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" } -reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" } -reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" } -reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" } -reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" } -reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5" } +revm = { version = "19.5.0", default-features = false } +reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.2.0" } +reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.2.0" } +reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.2.0" } +reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.2.0" } +reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.2.0" } +reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.2.0" } +reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", tag = "v1.2.0" } +reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.2.0" } +reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.2.0" } +reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.2.0" } clap = { version = "4.4.3" } jsonrpsee = { version = "0.24.8" } tracing = { version = "0.1.41" } @@ -30,19 +31,20 @@ futures-util = "0.3" reqwest = { version = "0.11", features = ["json", "stream"] } url = "2.5" tokio-tungstenite = { version = "0.26.2", features = ["native-tls"] } +rollup-boost = { git = "http://github.com/flashbots/rollup-boost", rev = "0b089a37b8525d328ab93962bb8121811ee3ca1f" } -# TODO: Pinning dependencies to work around deposit-transaction being removed and Reth 1.1.5 not being updated, see: -# https://github.com/alloy-rs/op-alloy/pull/383/files. This can be removed in the future -op-alloy-rpc-types = { version = "=0.9.0", default-features = false } -op-alloy-rpc-types-engine = { version = "=0.9.0", default-features = false } -op-alloy-rpc-jsonrpsee = { version = "=0.9.0", default-features = false } -op-alloy-network = { version = "=0.9.0", default-features = false } -op-alloy-consensus = { version = "=0.9.0", default-features = false } -alloy-primitives = { version = "=0.8.20", default-features = false } -alloy-eips = { version = "=0.9.2", default-features = false } -alloy-rpc-types = { version = "=0.9.2", default-features = false } -alloy-rpc-types-eth = { version = "=0.9.2" } -alloy-consensus = { version = "=0.9.2" } +op-alloy-rpc-types = { version = "0.10.3", default-features = false } +op-alloy-rpc-types-engine = { version = "0.10.3", default-features = false } +op-alloy-rpc-jsonrpsee = { version = "0.10.3", default-features = false } +op-alloy-network = { version = "0.10.3", default-features = false } +op-alloy-consensus = { version = "0.10.3", default-features = false } +alloy-primitives = { version = "0.8.20", default-features = false, features = ["map-foldhash"] } +alloy-eips = { version = "0.11.1", default-features = false } +alloy-rpc-types = { version = "0.11.1", default-features = false } +alloy-rpc-types-engine = { version = "0.11.1", default-features = false } +alloy-rpc-types-eth = { version = "0.11.1" } +alloy-consensus = { version = "0.11.1" } +alloy-trie = { version = "0.7.9", default-features = false } [features] default = ["optimism"] @@ -50,7 +52,7 @@ default = ["optimism"] optimism = [ "reth-optimism-node/optimism", "reth-optimism-cli/optimism", - "reth-primitives/optimism", + #"reth-primitives/optimism", "reth-optimism-primitives/optimism", "reth-optimism-rpc/optimism", "reth-optimism-evm/optimism", diff --git a/src/flashblocks.rs b/src/flashblocks.rs index f095a1c..c3f8059 100644 --- a/src/flashblocks.rs +++ b/src/flashblocks.rs @@ -1,14 +1,14 @@ use crate::cache::Cache; -use alloy_primitives::{map::foldhash::HashMap, Address, B256, U256}; +use alloy_primitives::map::foldhash::HashMap; +use alloy_rpc_types_engine::{ExecutionPayloadV1, ExecutionPayloadV2, ExecutionPayloadV3}; use futures_util::StreamExt; -use op_alloy_rpc_types_engine::OpExecutionPayloadEnvelopeV3; -use reth::core::primitives::SignedTransaction; use reth_optimism_primitives::{OpBlock, OpReceipt}; +use rollup_boost::{ExecutionPayloadBaseV1, FlashblocksPayloadV1}; use serde::{Deserialize, Serialize}; use std::sync::Arc; use tokio::sync::mpsc; use tokio_tungstenite::{connect_async, tungstenite::protocol::Message}; -use tracing::{error, info}; +use tracing::error; use url::Url; #[derive(Debug, Deserialize, Serialize)] @@ -19,15 +19,17 @@ struct FlashbotsMessage { id: Option, } +#[derive(Debug, Deserialize)] +struct Metadata { + receipts: HashMap, + new_account_balances: HashMap, // Address -> Balance (hex) + block_number: u64, +} + // Simplify actor messages to just handle shutdown #[derive(Debug)] enum ActorMessage { - BestPayload { - response: OpExecutionPayloadEnvelopeV3, - receipts: Vec, - tx_hashes: Vec, - //new_account_balances: HashMap, - }, + BestPayload { payload: FlashblocksPayloadV1 }, } pub struct FlashblocksClient { @@ -68,7 +70,7 @@ impl FlashblocksClient { while let Some(msg) = read.next().await { match msg { Ok(Message::Text(text)) => { - let message: serde_json::Value = + let payload: FlashblocksPayloadV1 = match serde_json::from_str(&text) { Ok(m) => m, Err(e) => { @@ -76,46 +78,9 @@ impl FlashblocksClient { continue; } }; - let payload: OpExecutionPayloadEnvelopeV3 = - match serde_json::from_value(message["response"].clone()) { - Ok(p) => p, - Err(e) => { - error!("failed to parse payload: {}", e); - continue; - } - }; - let receipts: Vec = - match serde_json::from_value(message["receipts"].clone()) { - Ok(r) => r, - Err(e) => { - error!("failed to parse receipts: {}", e); - continue; - } - }; - let tx_hashes: Vec = match serde_json::from_value( - message["tx_hashes"].clone(), - ) { - Ok(h) => h, - Err(e) => { - error!("failed to parse tx_hashes: {}", e); - continue; - } - }; - // let new_account_balances: HashMap = match serde_json::from_value(message["new_account_balances"].clone()) { - // Ok(b) => b, - // Err(e) => { - // error!("failed to parse account balances: {}", e); - // continue; - // } - // }; let _ = sender - .send(ActorMessage::BestPayload { - response: payload, - receipts, - tx_hashes, - //new_account_balances, - }) + .send(ActorMessage::BestPayload { payload: payload }) .await; } Ok(Message::Close(_)) => break, @@ -143,13 +108,59 @@ impl FlashblocksClient { tokio::spawn(async move { while let Some(message) = mailbox.recv().await { match message { - ActorMessage::BestPayload { - response, - receipts, - tx_hashes, - // new_account_balances, - } => { - let execution_payload = response.execution_payload; + ActorMessage::BestPayload { payload } => { + let metadata: Metadata = serde_json::from_value(payload.metadata) + .expect("failed to deserialize metadata"); + let receipts = metadata.receipts; + let new_account_balances = metadata.new_account_balances; + let block_number = metadata.block_number; + let diff = payload.diff; + let withdrawals = diff.withdrawals.clone(); + + // Skip if index is 0 and base is not cached, likely the first payload + if payload.index != 0 + && cache_clone + .get::(&format!("base:{:?}", block_number)) + .is_none() + { + continue; + } + + let base = if let Some(base) = payload.base { + cache_clone + .set(&format!("base:{:?}", block_number), &base, Some(10)) + .expect("failed to set base in cache"); + base + } else { + cache_clone + .get(&format!("base:{:?}", block_number)) + .expect("failed to get base from cache") + }; + + let execution_payload: ExecutionPayloadV3 = ExecutionPayloadV3 { + blob_gas_used: 0, + excess_blob_gas: 0, + payload_inner: ExecutionPayloadV2 { + withdrawals: withdrawals, + payload_inner: ExecutionPayloadV1 { + parent_hash: base.parent_hash, + fee_recipient: base.fee_recipient, + state_root: diff.state_root, + receipts_root: diff.receipts_root, + logs_bloom: diff.logs_bloom, + prev_randao: base.prev_randao, + block_number: base.block_number, + gas_limit: base.gas_limit, + gas_used: diff.gas_used, + timestamp: base.timestamp, + extra_data: base.extra_data, + base_fee_per_gas: base.base_fee_per_gas, + block_hash: diff.block_hash, + transactions: diff.transactions.clone(), + }, + }, + }; + let block: OpBlock = execution_payload .try_into_block() .expect("failed to convert execution payload to block"); @@ -160,34 +171,26 @@ impl FlashblocksClient { println!("block number {:?}", block.number); // Store receipts + let all_receipts = receipts.values().cloned().collect::>(); cache_clone - .set(&format!("pending_receipts"), &receipts, Some(10)) + .set(&format!("pending_receipts"), &all_receipts, Some(10)) .expect("failed to set receipts in cache"); - // Store transactions - for tx in block.body.transactions { - let tx_hash = *tx.tx_hash(); - cache_clone - .set(&format!("{:?}", tx_hash), &tx, Some(10)) - .expect("failed to set tx in cache"); - println!("stored tx {:?}", tx_hash); - } - // Store tx receipts - for (tx_hash, receipt) in tx_hashes.iter().zip(receipts.iter()) { + for (tx_hash, receipt) in receipts.iter() { cache_clone - .set(&format!("receipt:{:?}", tx_hash), &receipt, Some(10)) + .set(&format!("receipt:{:?}", tx_hash), receipt, Some(10)) .expect("failed to set receipt in cache"); println!("stored receipt {:?}", tx_hash); } // Store account balances - // for (address, balance) in new_account_balances.iter() { - // cache_clone - // .set(&format!("{:?}", address), &balance, Some(10)) - // .expect("failed to set account balance in cache"); - // println!("stored account balance {:?}", address); - // } + for (address, balance) in new_account_balances.iter() { + cache_clone + .set(&format!("{:?}", address), &balance, Some(10)) + .expect("failed to set account balance in cache"); + println!("stored account balance {:?}", address); + } } } } diff --git a/src/main.rs b/src/main.rs index 3f6bc41..c0c2930 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,7 +12,7 @@ use clap::Parser; use reth::builder::Node; use reth::{ builder::{engine_tree_config::TreeConfig, EngineNodeLauncher}, - providers::providers::BlockchainProvider2, + providers::providers::BlockchainProvider, }; use reth_optimism_cli::{chainspec::OpChainSpecParser, Cli}; use reth_optimism_node::args::RollupArgs; @@ -39,7 +39,7 @@ fn main() { let cache_clone = Arc::clone(&cache); let handle = builder - .with_types_and_provider::>() + .with_types_and_provider::>() .with_components(op_node.components()) .with_add_ons(op_node.add_ons()) .on_component_initialized(move |_ctx| Ok(())) @@ -54,15 +54,15 @@ fn main() { Ok(()) }) .launch_with_fn(|builder| { - let engine_tree_config = TreeConfig::default() - .with_persistence_threshold( - flashblocks_rollup_args.rollup_args.persistence_threshold, - ) - .with_memory_block_buffer_target( - flashblocks_rollup_args - .rollup_args - .memory_block_buffer_target, - ); + let engine_tree_config = TreeConfig::default(); + // .with_persistence_threshold( + // flashblocks_rollup_args.rollup_args.persistence_threshold, + // ) + // .with_memory_block_buffer_target( + // flashblocks_rollup_args + // .rollup_args + // .memory_block_buffer_target, + // ); let launcher = EngineNodeLauncher::new( builder.task_executor().clone(), builder.config().datadir(), diff --git a/src/rpc.rs b/src/rpc.rs index c07b703..4ff4fa9 100644 --- a/src/rpc.rs +++ b/src/rpc.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use crate::cache::Cache; use alloy_consensus::transaction::TransactionMeta; -use alloy_consensus::{transaction::Recovered, transaction::TransactionInfo, Signed}; +use alloy_consensus::{transaction::Recovered, transaction::TransactionInfo}; use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_primitives::{Address, Sealable, TxHash, B256, U256}; use alloy_rpc_types::TransactionTrait; @@ -11,14 +11,13 @@ use jsonrpsee::{ core::{async_trait, RpcResult}, proc_macros::rpc, }; -use op_alloy_consensus::{OpTxEnvelope, OpTypedTransaction}; +use op_alloy_consensus::OpTxEnvelope; use op_alloy_network::Optimism; use op_alloy_rpc_types::Transaction; use reth::{api::BlockBody, core::primitives::SignedTransaction, providers::HeaderProvider}; use reth_optimism_chainspec::{OpChainSpec, OP_SEPOLIA}; use reth_optimism_primitives::{OpBlock, OpReceipt, OpTransactionSigned}; use reth_optimism_rpc::OpReceiptBuilder; -use reth_primitives::RecoveredTx; use reth_rpc_eth_api::RpcReceipt; use reth_rpc_eth_api::{ helpers::{EthBlocks, EthState}, @@ -95,36 +94,25 @@ impl EthApiExt { pub fn transform_tx( &self, - tx: RecoveredTx, + tx: Recovered, tx_info: TransactionInfo, ) -> Transaction { - let from = tx.signer(); - let hash = *tx.tx_hash(); - let OpTransactionSigned { - transaction, - signature, - .. - } = tx.into_tx(); + let (tx, from) = tx.into_parts(); let mut deposit_receipt_version = None; let mut deposit_nonce = None; - let inner = match transaction { - OpTypedTransaction::Legacy(tx) => Signed::new_unchecked(tx, signature, hash).into(), - OpTypedTransaction::Eip2930(tx) => Signed::new_unchecked(tx, signature, hash).into(), - OpTypedTransaction::Eip1559(tx) => Signed::new_unchecked(tx, signature, hash).into(), - OpTypedTransaction::Eip7702(tx) => Signed::new_unchecked(tx, signature, hash).into(), - OpTypedTransaction::Deposit(tx) => { - let receipt = self - .cache - .get::(&format!("receipt:{:?}", hash)) - .unwrap(); - if let OpReceipt::Deposit(receipt) = receipt { - deposit_receipt_version = receipt.deposit_receipt_version; - deposit_nonce = receipt.deposit_nonce; - } - OpTxEnvelope::Deposit(tx.seal_unchecked(hash)) + let inner: OpTxEnvelope = tx.into(); + + if inner.is_deposit() { + let receipt = self + .cache + .get::(&format!("receipt:{:?}", tx_info.hash)) + .unwrap(); + if let OpReceipt::Deposit(receipt) = receipt { + deposit_receipt_version = receipt.deposit_receipt_version; + deposit_nonce = receipt.deposit_nonce; } - }; + } let TransactionInfo { block_hash, @@ -145,7 +133,7 @@ impl EthApiExt { inner .effective_tip_per_gas(base_fee as u64) .unwrap_or_default() - + base_fee + + base_fee as u128 }) .unwrap_or_else(|| inner.max_fee_per_gas()) }; @@ -175,7 +163,7 @@ impl EthApiExt { .get::(&tx_hash.to_string()) .unwrap(); let block = self.cache.get::("pending").unwrap(); - let l1_block_info = + let mut l1_block_info = reth_optimism_evm::extract_l1_info(&block.body).expect("failed to extract l1 info"); let meta = TransactionMeta { @@ -199,7 +187,7 @@ impl EthApiExt { meta, &receipt, &all_receipts, - l1_block_info, + &mut l1_block_info, ) .expect("failed to build receipt") .build() @@ -239,6 +227,7 @@ where &self, tx_hash: TxHash, ) -> RpcResult>> { + println!("get_transaction_receipt {:?}", tx_hash); if let Some(receipt) = self .cache .get::(&format!("receipt:{:?}", tx_hash))