diff --git a/Cargo.lock b/Cargo.lock index 46b598fd..d6ee29ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed961a48297c732a5d97ee321aa8bb5009ecadbcb077d8bec90cb54e651629" +checksum = "ae09ffd7c29062431dd86061deefe4e3c6f07fa0d674930095f8dcedb0baf02c" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", @@ -124,6 +124,7 @@ dependencies = [ "auto_impl", "c-kzg", "derive_more 1.0.0", + "rand 0.8.5", "serde", "serde_with", ] @@ -161,9 +162,9 @@ dependencies = [ [[package]] name = "alloy-eip7702" -version = "0.3.2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ffc577390ce50234e02d841214b3dc0bea6aaaae8e04bbf3cb82e9a45da9eb" +checksum = "4c986539255fb839d1533c128e190e557e52ff652c9ef62939e233a81dd93f7e" dependencies = [ "alloy-primitives 0.8.12", "alloy-rlp", @@ -177,9 +178,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69e06cf9c37be824b9d26d6d101114fdde6af0c87de2828b414c05c4b3daa71" +checksum = "5b6aa3961694b30ba53d41006131a2fca3bdab22e4c344e46db2c639e7c2dfdd" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -198,9 +199,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde15e14944a88bd6a57d325e9a49b75558746fe16aaccc79713ae50a6a9574c" +checksum = "e53f7877ded3921d18a0a9556d55bedf84535567198c9edab2aa23106da91855" dependencies = [ "alloy-primitives 0.8.12", "alloy-serde", @@ -221,9 +222,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af5979e0d5a7bf9c7eb79749121e8256e59021af611322aee56e77e20776b4b3" +checksum = "3694b7e480728c0b3e228384f223937f14c10caef5a4c766021190fc8f283d35" dependencies = [ "alloy-primitives 0.8.12", "alloy-sol-types", @@ -235,9 +236,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "204237129086ce5dc17a58025e93739b01b45313841f98fa339eb1d780511e57" +checksum = "ea94b8ceb5c75d7df0a93ba0acc53b55a22b47b532b600a800a87ef04eb5b0b4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -251,14 +252,16 @@ dependencies = [ "async-trait", "auto_impl", "futures-utils-wasm", + "serde", + "serde_json", "thiserror 1.0.69", ] [[package]] name = "alloy-network-primitives" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514f70ee2a953db21631cd817b13a1571474ec77ddc03d47616d5e8203489fde" +checksum = "df9f3e281005943944d15ee8491534a1c7b3cbf7a7de26f8c433b842b93eb5f9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -269,9 +272,9 @@ dependencies = [ [[package]] name = "alloy-node-bindings" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27444ea67d360508753022807cdd0b49a95c878924c9c5f8f32668b7d7768245" +checksum = "c9805d126f24be459b958973c0569c73e1aadd27d4535eee82b2b6764aa03616" dependencies = [ "alloy-genesis", "alloy-primitives 0.8.12", @@ -340,9 +343,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4814d141ede360bb6cd1b4b064f1aab9de391e7c4d0d4d50ac89ea4bc1e25fbd" +checksum = "40c1f9eede27bf4c13c099e8e64d54efd7ce80ef6ea47478aa75d5d74e2dba3b" dependencies = [ "alloy-chains", "alloy-consensus", @@ -380,9 +383,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba46eb69ddf7a9925b81f15229cb74658e6eebe5dd30a5b74e2cd040380573" +checksum = "90f1f34232f77341076541c405482e4ae12f0ee7153d8f9969fc1691201b2247" dependencies = [ "alloy-json-rpc", "alloy-primitives 0.8.12", @@ -421,9 +424,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc2bd1e7403463a5f2c61e955bcc9d3072b63aa177442b0f9aa6a6d22a941e3" +checksum = "374dbe0dc3abdc2c964f36b3d3edf9cdb3db29d16bda34aa123f03d810bec1dd" dependencies = [ "alloy-json-rpc", "alloy-primitives 0.8.12", @@ -447,9 +450,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea9bf1abdd506f985a53533f5ac01296bcd6102c5e139bbc5d40bc468d2c916" +checksum = "c74832aa474b670309c20fffc2a869fa141edab7c79ff7963fad0a08de60bae1" dependencies = [ "alloy-primitives 0.8.12", "alloy-rpc-types-engine", @@ -460,9 +463,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea02c25541fb19eaac4278aa5c41d2d7e0245898887e54a74bfc0f3103e99415" +checksum = "6bfd9b2cc3a1985f1f6da5afc41120256f9f9316fcd89e054cea99dbb10172f6" dependencies = [ "alloy-genesis", "alloy-primitives 0.8.12", @@ -472,20 +475,21 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2382fc63fb0cf3e02818d547b80cb66cc49a31f8803d0c328402b2008bc13650" +checksum = "5ca97963132f78ddfc60e43a017348e6d52eea983925c23652f5b330e8e02291" dependencies = [ "alloy-primitives 0.8.12", + "alloy-rpc-types-eth", "alloy-serde", "serde", ] [[package]] name = "alloy-rpc-types-beacon" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45357a642081c8ce235c0ad990c4e9279f5f18a723545076b38cfcc05cc25234" +checksum = "922fa76678d2f9f07ea1b19309b5cfbf244c6029dcba3515227b515fdd6ed4a7" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", @@ -499,9 +503,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5afe3ab1038f90faf56304aa0adf1e6a8c9844615d8f83967f932f3a70390b1" +checksum = "ba2253bee958658ebd614c07a61c40580e09dd1fad3f017684314442332ab753" dependencies = [ "alloy-primitives 0.8.12", "serde", @@ -509,9 +513,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886d22d41992287a235af2f3af4299b5ced2bcafb81eb835572ad35747476946" +checksum = "3f56294dce86af23ad6ee8df46cf8b0d292eb5d1ff67dc88a0886051e32b1faf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -530,9 +534,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b034779a4850b4b03f5be5ea674a1cf7d746b2da762b34d1860ab45e48ca27" +checksum = "a8a477281940d82d29315846c7216db45b15e90bcd52309da9f54bcf7ad94a11" dependencies = [ "alloy-consensus", "alloy-eips", @@ -551,9 +555,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3246948dfa5f5060a9abe04233d741ea656ef076b12958f3242416ce9f375058" +checksum = "8647f8135ee3d5de1cf196706c905c05728a4e38bb4a5b61a7214bd1ba8f60a6" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", @@ -564,9 +568,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5fb6c5c401321f802f69dcdb95b932f30f8158f6798793f914baac5995628e" +checksum = "ecd8b4877ef520c138af702097477cdd19504a8e1e4675ba37e92ba40f2d3c6f" dependencies = [ "alloy-primitives 0.8.12", "alloy-rpc-types-eth", @@ -578,9 +582,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad066b49c3b1b5f64cdd2399177a19926a6a15db2dbf11e2098de621f9e7480" +checksum = "1d4ab49acf90a71f7fb894dc5fd485f1f07a1e348966c714c4d1e0b7478850a8" dependencies = [ "alloy-primitives 0.8.12", "alloy-rpc-types-eth", @@ -590,9 +594,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028e72eaa9703e4882344983cfe7636ce06d8cce104a78ea62fd19b46659efc4" +checksum = "4dfa4a7ccf15b2492bb68088692481fd6b2604ccbee1d0d6c44c21427ae4df83" dependencies = [ "alloy-primitives 0.8.12", "arbitrary", @@ -602,9 +606,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592c185d7100258c041afac51877660c7bf6213447999787197db4842f0e938e" +checksum = "2e10aec39d60dc27edcac447302c7803d2371946fb737245320a05b78eb2fafd" dependencies = [ "alloy-primitives 0.8.12", "async-trait", @@ -616,9 +620,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6614f02fc1d5b079b2a4a5320018317b506fd0a6d67c1fd5542a71201724986c" +checksum = "d8396f6dff60700bc1d215ee03d86ff56de268af96e2bf833a14d0bafcab9882" dependencies = [ "alloy-consensus", "alloy-network", @@ -702,9 +706,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be77579633ebbc1266ae6fd7694f75c408beb1aeb6865d0b18f22893c265a061" +checksum = "f99acddb34000d104961897dbb0240298e8b775a7efffb9fda2a1a3efedd65b3" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -722,9 +726,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fd1a5d0827939847983b46f2f79510361f901dc82f8e3c38ac7397af142c6e" +checksum = "5dc013132e34eeadaa0add7e74164c1503988bfba8bae885b32e0918ba85a8a6" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -737,9 +741,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8073d1186bfeeb8fbdd1292b6f1a0731f3aed8e21e1463905abfae0b96a887a6" +checksum = "063edc0660e81260653cc6a95777c29d54c2543a668aa5da2359fb450d25a1ba" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -756,9 +760,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.5.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f27837bb4a1d6c83a28231c94493e814882f0e9058648a97e908a5f3fc9fcf" +checksum = "abd170e600801116d5efe64f74a4fc073dbbb35c807013a7d0a388742aeebba0" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -1384,7 +1388,7 @@ dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.13.0", "proc-macro2", "quote", "regex", @@ -2402,7 +2406,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.10.1", + "phf 0.11.2", "smallvec", ] @@ -6209,7 +6213,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", "syn 2.0.87", @@ -6271,9 +6275,9 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "op-alloy-consensus" -version = "0.5.2" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26c3b35b7b3e36d15e0563eebffe13c1d9ca16b7aaffcb6a64354633547e16b" +checksum = "fce158d886815d419222daa67fcdf949a34f7950653a4498ebeb4963331f70ed" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6284,14 +6288,14 @@ dependencies = [ "derive_more 1.0.0", "serde", "serde_with", - "spin", + "thiserror 2.0.3", ] [[package]] name = "op-alloy-genesis" -version = "0.5.2" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccacc2efed3d60d98ea581bddb885df1c6c62a592e55de049cfefd94116112cd" +checksum = "2734e9a65efb90fe4520303f984c124766b7d2f2e5dd51cbe54d6269c85a3c91" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6299,47 +6303,52 @@ dependencies = [ "alloy-sol-types", "serde", "serde_repr", + "thiserror 2.0.3", ] [[package]] name = "op-alloy-network" -version = "0.5.2" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ff6fc0f94702ea0f4d8466bffdc990067ae6df9213465df9b7957f74f1e5461" +checksum = "87e4aef8ed017004a176ab1de49df419f59c0fb4a6ce3b693a10fe099fe1afe7" dependencies = [ "alloy-consensus", "alloy-network", "alloy-primitives 0.8.12", "alloy-rpc-types-eth", + "alloy-signer", "op-alloy-consensus", "op-alloy-rpc-types", ] [[package]] name = "op-alloy-protocol" -version = "0.5.2" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f8e6ec6b91c6aaeb20860b455a52fd8e300acfe5d534e96e9073a24f853e74" +checksum = "6c68a3e2770890da3ad2fd20d7fe0c8e15672707577b4168a60e388c8eceaca0" dependencies = [ + "alloc-no-stdlib", "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "alloy-rlp", "alloy-serde", "async-trait", - "derive_more 1.0.0", + "brotli 7.0.0", + "miniz_oxide", "op-alloy-consensus", "op-alloy-genesis", "serde", + "thiserror 2.0.3", "tracing", "unsigned-varint 0.8.0", ] [[package]] name = "op-alloy-rpc-types" -version = "0.5.2" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bae9bf91b620e1e2c2291562e5998bc1247bd8ada011773e1997b31a95de99" +checksum = "060ebeaea8c772e396215f69bb86d231ec8b7f36aca0dd6ce367ceaa9a8c33e6" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6348,6 +6357,7 @@ dependencies = [ "alloy-rpc-types-eth", "alloy-serde", "arbitrary", + "derive_more 1.0.0", "op-alloy-consensus", "serde", "serde_json", @@ -6355,18 +6365,21 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.5.2" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b52ee59c86537cff83e8c7f2a6aa287a94f3608bb40c06d442aafd0c2e807a4" +checksum = "864dbd5511ef4ef00b6c2c980739259b25b24048007b7751ca0069b30b1e3fee" dependencies = [ + "alloy-eips", "alloy-primitives 0.8.12", "alloy-rpc-types-engine", "alloy-serde", "derive_more 1.0.0", "ethereum_ssz", + "op-alloy-consensus", "op-alloy-protocol", "serde", "snap", + "thiserror 2.0.3", ] [[package]] @@ -6393,6 +6406,7 @@ dependencies = [ name = "op-rbuilder-node-optimism" version = "0.0.0" dependencies = [ + "alloy-consensus", "clap 4.5.21", "eyre", "op-rbuilder-payload-builder", @@ -6726,9 +6740,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_macros 0.10.0", "phf_shared 0.10.0", - "proc-macro-hack", ] [[package]] @@ -6737,7 +6749,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros 0.11.2", + "phf_macros", "phf_shared 0.11.2", ] @@ -6771,20 +6783,6 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "phf_macros" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "phf_macros" version = "0.11.2" @@ -7360,12 +7358,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - [[package]] name = "proc-macro2" version = "1.0.89" @@ -7733,6 +7725,7 @@ dependencies = [ "alloy-eips", "alloy-json-rpc", "alloy-network", + "alloy-network-primitives", "alloy-node-bindings", "alloy-primitives 0.8.12", "alloy-provider", @@ -8054,8 +8047,8 @@ dependencies = [ [[package]] name = "reth" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8102,6 +8095,7 @@ dependencies = [ "reth-payload-primitives", "reth-payload-validator", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-prune", "reth-revm", @@ -8124,42 +8118,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "reth-auto-seal-consensus" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" -dependencies = [ - "alloy-eips", - "alloy-primitives 0.8.12", - "alloy-rpc-types-engine", - "futures-util", - "reth-beacon-consensus", - "reth-chainspec", - "reth-consensus", - "reth-engine-primitives", - "reth-evm", - "reth-execution-errors", - "reth-execution-types", - "reth-network-p2p", - "reth-network-peers", - "reth-optimism-consensus", - "reth-primitives", - "reth-provider", - "reth-revm", - "reth-stages-api", - "reth-tokio-util", - "reth-transaction-pool", - "reth-trie", - "revm-primitives", - "tokio", - "tokio-stream", - "tracing", -] - [[package]] name = "reth-basic-payload-builder" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8172,8 +8134,10 @@ dependencies = [ "reth-evm", "reth-metrics", "reth-payload-builder", + "reth-payload-builder-primitives", "reth-payload-primitives", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-revm", "reth-tasks", @@ -8185,9 +8149,10 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "alloy-rpc-types-engine", @@ -8203,6 +8168,7 @@ dependencies = [ "reth-network-p2p", "reth-node-types", "reth-payload-builder", + "reth-payload-builder-primitives", "reth-payload-primitives", "reth-payload-validator", "reth-primitives", @@ -8221,8 +8187,8 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", @@ -8254,8 +8220,8 @@ dependencies = [ [[package]] name = "reth-blockchain-tree-api" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", @@ -8268,8 +8234,8 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8297,8 +8263,8 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-chains", "alloy-consensus", @@ -8317,8 +8283,8 @@ dependencies = [ [[package]] name = "reth-cli" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-genesis", "clap 4.5.21", @@ -8331,10 +8297,11 @@ dependencies = [ [[package]] name = "reth-cli-commands" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "ahash", + "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "alloy-rlp", @@ -8390,8 +8357,8 @@ dependencies = [ [[package]] name = "reth-cli-runner" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "reth-tasks", "tokio", @@ -8400,8 +8367,8 @@ dependencies = [ [[package]] name = "reth-cli-util" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", @@ -8418,8 +8385,8 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8437,8 +8404,8 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -8448,8 +8415,8 @@ dependencies = [ [[package]] name = "reth-config" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "eyre", "humantime-serde", @@ -8462,20 +8429,22 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "auto_impl", "derive_more 1.0.0", "reth-primitives", + "reth-primitives-traits", ] [[package]] name = "reth-consensus-common" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8488,15 +8457,15 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "alloy-provider", - "alloy-rpc-types", "alloy-rpc-types-engine", + "alloy-rpc-types-eth", "auto_impl", "eyre", "futures", @@ -8512,9 +8481,10 @@ dependencies = [ [[package]] name = "reth-db" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-primitives 0.8.12", "bytes", "derive_more 1.0.0", @@ -8545,9 +8515,10 @@ dependencies = [ [[package]] name = "reth-db-api" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-genesis", "alloy-primitives 0.8.12", "arbitrary", @@ -8570,8 +8541,8 @@ dependencies = [ [[package]] name = "reth-db-common" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-genesis", "alloy-primitives 0.8.12", @@ -8598,9 +8569,10 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-eips", "alloy-primitives 0.8.12", "arbitrary", "bytes", @@ -8613,8 +8585,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "alloy-rlp", @@ -8639,8 +8611,8 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "alloy-rlp", @@ -8663,8 +8635,8 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "data-encoding", @@ -8687,9 +8659,10 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "alloy-rlp", @@ -8701,10 +8674,13 @@ dependencies = [ "rayon", "reth-config", "reth-consensus", + "reth-db", + "reth-db-api", "reth-metrics", "reth-network-p2p", "reth-network-peers", "reth-primitives", + "reth-primitives-traits", "reth-storage-api", "reth-tasks", "thiserror 1.0.69", @@ -8716,8 +8692,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "aes", "alloy-primitives 0.8.12", @@ -8747,8 +8723,8 @@ dependencies = [ [[package]] name = "reth-engine-local" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "alloy-rpc-types-engine", @@ -8764,6 +8740,7 @@ dependencies = [ "reth-ethereum-engine-primitives", "reth-evm", "reth-payload-builder", + "reth-payload-builder-primitives", "reth-payload-primitives", "reth-payload-validator", "reth-provider", @@ -8778,27 +8755,34 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", + "alloy-rpc-types-engine", + "futures", + "reth-errors", "reth-execution-types", + "reth-payload-builder-primitives", "reth-payload-primitives", "reth-primitives", "reth-trie", "serde", + "thiserror 1.0.69", + "tokio", ] [[package]] name = "reth-engine-service" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "futures", "pin-project", "reth-beacon-consensus", "reth-chainspec", "reth-consensus", + "reth-engine-primitives", "reth-engine-tree", "reth-evm", "reth-network-p2p", @@ -8814,9 +8798,10 @@ dependencies = [ [[package]] name = "reth-engine-tree" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "alloy-rpc-types-engine", @@ -8834,6 +8819,7 @@ dependencies = [ "reth-metrics", "reth-network-p2p", "reth-payload-builder", + "reth-payload-builder-primitives", "reth-payload-primitives", "reth-payload-validator", "reth-primitives", @@ -8847,14 +8833,13 @@ dependencies = [ "revm-primitives", "thiserror 1.0.69", "tokio", - "tokio-stream", "tracing", ] [[package]] name = "reth-engine-util" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8864,7 +8849,6 @@ dependencies = [ "futures", "itertools 0.13.0", "pin-project", - "reth-beacon-consensus", "reth-engine-primitives", "reth-errors", "reth-ethereum-forks", @@ -8886,8 +8870,8 @@ dependencies = [ [[package]] name = "reth-errors" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "reth-blockchain-tree-api", "reth-consensus", @@ -8899,22 +8883,23 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-chains", "alloy-primitives 0.8.12", "alloy-rlp", "bytes", "derive_more 1.0.0", "futures", "pin-project", - "reth-chainspec", "reth-codecs", "reth-ecies", "reth-eth-wire-types", + "reth-ethereum-forks", "reth-metrics", "reth-network-peers", - "reth-primitives", + "reth-primitives-traits", "serde", "snap", "thiserror 1.0.69", @@ -8926,10 +8911,11 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-chains", + "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "alloy-rlp", @@ -8938,14 +8924,15 @@ dependencies = [ "reth-chainspec", "reth-codecs-derive", "reth-primitives", + "reth-primitives-traits", "serde", "thiserror 1.0.69", ] [[package]] name = "reth-ethereum-cli" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "eyre", "reth-chainspec", @@ -8954,8 +8941,8 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8964,13 +8951,14 @@ dependencies = [ "reth-consensus", "reth-consensus-common", "reth-primitives", + "reth-primitives-traits", "tracing", ] [[package]] name = "reth-ethereum-engine-primitives" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", @@ -8988,8 +8976,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-chains", "alloy-primitives 0.8.12", @@ -9008,8 +8996,8 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9022,6 +9010,7 @@ dependencies = [ "reth-evm-ethereum", "reth-execution-types", "reth-payload-builder", + "reth-payload-builder-primitives", "reth-payload-primitives", "reth-primitives", "reth-provider", @@ -9029,14 +9018,13 @@ dependencies = [ "reth-transaction-pool", "reth-trie", "revm", - "revm-primitives", "tracing", ] [[package]] name = "reth-etl" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "rayon", "reth-db-api", @@ -9045,9 +9033,10 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "auto_impl", @@ -9071,8 +9060,8 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9090,8 +9079,8 @@ dependencies = [ [[package]] name = "reth-execution-errors" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", @@ -9106,13 +9095,14 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", "reth-execution-errors", "reth-primitives", + "reth-primitives-traits", "reth-trie", "revm", "serde", @@ -9121,8 +9111,8 @@ dependencies = [ [[package]] name = "reth-exex" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", @@ -9140,7 +9130,6 @@ dependencies = [ "reth-metrics", "reth-node-api", "reth-node-core", - "reth-payload-builder", "reth-primitives", "reth-primitives-traits", "reth-provider", @@ -9157,8 +9146,8 @@ dependencies = [ [[package]] name = "reth-exex-types" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", @@ -9170,8 +9159,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "serde", "serde_json", @@ -9180,9 +9169,10 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-primitives 0.8.12", "alloy-rlp", "alloy-rpc-types-debug", @@ -9205,8 +9195,8 @@ dependencies = [ [[package]] name = "reth-ipc" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "async-trait", "bytes", @@ -9226,8 +9216,8 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -9243,8 +9233,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "bindgen", "cc", @@ -9252,8 +9242,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "futures", "metrics", @@ -9264,16 +9254,16 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", ] [[package]] name = "reth-net-nat" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "futures-util", "if-addrs", @@ -9286,9 +9276,10 @@ dependencies = [ [[package]] name = "reth-network" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "alloy-rlp", @@ -9310,6 +9301,7 @@ dependencies = [ "reth-dns-discovery", "reth-ecies", "reth-eth-wire", + "reth-eth-wire-types", "reth-fs-util", "reth-metrics", "reth-net-banlist", @@ -9318,6 +9310,7 @@ dependencies = [ "reth-network-peers", "reth-network-types", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-storage-api", "reth-tasks", @@ -9337,8 +9330,8 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "alloy-rpc-types-admin", @@ -9360,9 +9353,10 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "auto_impl", @@ -9374,6 +9368,7 @@ dependencies = [ "reth-network-peers", "reth-network-types", "reth-primitives", + "reth-primitives-traits", "reth-storage-errors", "tokio", "tracing", @@ -9381,8 +9376,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "alloy-rlp", @@ -9396,8 +9391,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "humantime-serde", "reth-ethereum-forks", @@ -9410,8 +9405,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "anyhow", "bincode", @@ -9427,9 +9422,10 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-rpc-types-engine", "eyre", "reth-beacon-consensus", @@ -9439,9 +9435,8 @@ dependencies = [ "reth-network-api", "reth-node-core", "reth-node-types", - "reth-payload-builder", + "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-primitives", "reth-provider", "reth-tasks", "reth-transaction-pool", @@ -9449,9 +9444,10 @@ dependencies = [ [[package]] name = "reth-node-builder" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-primitives 0.8.12", "alloy-rpc-types", "aquamarine", @@ -9460,7 +9456,6 @@ dependencies = [ "futures", "jsonrpsee 0.24.7", "rayon", - "reth-auto-seal-consensus", "reth-beacon-consensus", "reth-blockchain-tree", "reth-chain-state", @@ -9488,7 +9483,6 @@ dependencies = [ "reth-node-events", "reth-node-metrics", "reth-payload-builder", - "reth-payload-primitives", "reth-payload-validator", "reth-primitives", "reth-provider", @@ -9505,6 +9499,7 @@ dependencies = [ "reth-tokio-util", "reth-tracing", "reth-transaction-pool", + "revm-primitives", "secp256k1", "tokio", "tokio-stream", @@ -9513,8 +9508,8 @@ dependencies = [ [[package]] name = "reth-node-core" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9531,7 +9526,7 @@ dependencies = [ "reth-chainspec", "reth-cli-util", "reth-config", - "reth-consensus-common", + "reth-consensus", "reth-db", "reth-discv4", "reth-discv5", @@ -9540,6 +9535,7 @@ dependencies = [ "reth-network-p2p", "reth-network-peers", "reth-primitives", + "reth-primitives-traits", "reth-prune-types", "reth-rpc-eth-types", "reth-rpc-server-types", @@ -9561,11 +9557,11 @@ dependencies = [ [[package]] name = "reth-node-ethereum" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "eyre", - "reth-auto-seal-consensus", "reth-basic-payload-builder", "reth-beacon-consensus", "reth-chainspec", @@ -9590,8 +9586,8 @@ dependencies = [ [[package]] name = "reth-node-events" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9601,21 +9597,21 @@ dependencies = [ "humantime", "pin-project", "reth-beacon-consensus", - "reth-network", + "reth-engine-primitives", "reth-network-api", "reth-primitives-traits", - "reth-provider", "reth-prune", "reth-stages", - "reth-static-file", + "reth-static-file-types", + "reth-storage-api", "tokio", "tracing", ] [[package]] name = "reth-node-metrics" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "eyre", "http 1.1.0", @@ -9627,6 +9623,7 @@ dependencies = [ "procfs 0.16.0", "reth-db-api", "reth-metrics", + "reth-primitives-traits", "reth-provider", "reth-tasks", "tikv-jemalloc-ctl", @@ -9638,21 +9635,20 @@ dependencies = [ [[package]] name = "reth-node-types" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "reth-chainspec", "reth-db-api", "reth-engine-primitives", - "reth-primitives", "reth-primitives-traits", "reth-trie-db", ] [[package]] name = "reth-optimism-chainspec" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-chains", "alloy-consensus", @@ -9672,14 +9668,18 @@ dependencies = [ [[package]] name = "reth-optimism-cli" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", + "alloy-eips", "alloy-primitives 0.8.12", "alloy-rlp", "clap 4.5.21", + "derive_more 1.0.0", "eyre", "futures-util", + "op-alloy-consensus", "reth-chainspec", "reth-cli", "reth-cli-commands", @@ -9709,6 +9709,7 @@ dependencies = [ "reth-static-file", "reth-static-file-types", "reth-tracing", + "serde", "tokio", "tokio-util", "tracing", @@ -9716,11 +9717,12 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-primitives 0.8.12", + "alloy-trie", "reth-chainspec", "reth-consensus", "reth-consensus-common", @@ -9733,8 +9735,8 @@ dependencies = [ [[package]] name = "reth-optimism-evm" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9760,8 +9762,8 @@ dependencies = [ [[package]] name = "reth-optimism-forks" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-chains", "alloy-primitives 0.8.12", @@ -9772,9 +9774,10 @@ dependencies = [ [[package]] name = "reth-optimism-node" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "alloy-rpc-types-engine", @@ -9782,7 +9785,6 @@ dependencies = [ "eyre", "op-alloy-rpc-types-engine", "parking_lot", - "reth-auto-seal-consensus", "reth-basic-payload-builder", "reth-beacon-consensus", "reth-chainspec", @@ -9799,9 +9801,11 @@ dependencies = [ "reth-optimism-payload-builder", "reth-optimism-rpc", "reth-payload-builder", + "reth-payload-util", "reth-primitives", "reth-provider", "reth-revm", + "reth-rpc-server-types", "reth-tracing", "reth-transaction-pool", "reth-trie-db", @@ -9812,13 +9816,14 @@ dependencies = [ [[package]] name = "reth-optimism-payload-builder" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "alloy-rlp", + "alloy-rpc-types-debug", "alloy-rpc-types-engine", "op-alloy-consensus", "op-alloy-rpc-types-engine", @@ -9832,7 +9837,9 @@ dependencies = [ "reth-optimism-evm", "reth-optimism-forks", "reth-payload-builder", + "reth-payload-builder-primitives", "reth-payload-primitives", + "reth-payload-util", "reth-primitives", "reth-provider", "reth-revm", @@ -9847,29 +9854,39 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", + "alloy-eips", "alloy-primitives 0.8.12", + "alloy-rlp", + "bytes", + "derive_more 1.0.0", + "op-alloy-consensus", + "reth-codecs", "reth-primitives", + "reth-primitives-traits", + "serde", ] [[package]] name = "reth-optimism-rpc" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", - "alloy-rpc-types", + "alloy-rpc-types-debug", "alloy-rpc-types-eth", "derive_more 1.0.0", + "jsonrpsee-core 0.24.7", "jsonrpsee-types 0.24.7", "op-alloy-consensus", "op-alloy-network", "op-alloy-rpc-types", + "op-alloy-rpc-types-engine", "parking_lot", "reqwest 0.12.9", "reth-chainspec", @@ -9881,9 +9898,11 @@ dependencies = [ "reth-optimism-consensus", "reth-optimism-evm", "reth-optimism-forks", + "reth-optimism-payload-builder", "reth-primitives", "reth-provider", "reth-rpc", + "reth-rpc-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", @@ -9898,17 +9917,32 @@ dependencies = [ [[package]] name = "reth-payload-builder" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-rpc-types", "async-trait", "futures-util", "metrics", + "reth-chain-state", "reth-ethereum-engine-primitives", "reth-metrics", + "reth-payload-builder-primitives", + "reth-payload-primitives", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "reth-payload-builder-primitives" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +dependencies = [ + "alloy-rpc-types-engine", + "async-trait", + "pin-project", "reth-payload-primitives", - "reth-provider", "tokio", "tokio-stream", "tracing", @@ -9916,31 +9950,37 @@ dependencies = [ [[package]] name = "reth-payload-primitives" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", - "alloy-rpc-types", - "async-trait", + "alloy-rpc-types-engine", "op-alloy-rpc-types-engine", - "pin-project", "reth-chain-state", "reth-chainspec", "reth-errors", "reth-primitives", - "reth-transaction-pool", + "revm-primitives", "serde", "thiserror 1.0.69", "tokio", - "tokio-stream", - "tracing", +] + +[[package]] +name = "reth-payload-util" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +dependencies = [ + "alloy-consensus", + "alloy-primitives 0.8.12", + "reth-primitives", ] [[package]] name = "reth-payload-validator" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-rpc-types", "reth-chainspec", @@ -9950,15 +9990,17 @@ dependencies = [ [[package]] name = "reth-primitives" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", + "alloy-network", "alloy-primitives 0.8.12", "alloy-rlp", "alloy-rpc-types", "alloy-serde", + "alloy-trie", "arbitrary", "bytes", "c-kzg", @@ -9974,7 +10016,6 @@ dependencies = [ "reth-ethereum-forks", "reth-primitives-traits", "reth-static-file-types", - "reth-trie-common", "revm-primitives", "secp256k1", "serde", @@ -9984,8 +10025,8 @@ dependencies = [ [[package]] name = "reth-primitives-traits" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9993,6 +10034,7 @@ dependencies = [ "alloy-primitives 0.8.12", "alloy-rlp", "arbitrary", + "auto_impl", "byteorder", "bytes", "derive_more 1.0.0", @@ -10008,8 +10050,8 @@ dependencies = [ [[package]] name = "reth-provider" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10053,8 +10095,8 @@ dependencies = [ [[package]] name = "reth-prune" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "itertools 0.13.0", @@ -10079,8 +10121,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "arbitrary", @@ -10113,13 +10155,14 @@ dependencies = [ [[package]] name = "reth-revm" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", "reth-execution-errors", "reth-primitives", + "reth-primitives-traits", "reth-prune-types", "reth-storage-api", "reth-storage-errors", @@ -10129,8 +10172,8 @@ dependencies = [ [[package]] name = "reth-rpc" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -10143,6 +10186,7 @@ dependencies = [ "alloy-rpc-types-admin", "alloy-rpc-types-beacon", "alloy-rpc-types-debug", + "alloy-rpc-types-engine", "alloy-rpc-types-eth", "alloy-rpc-types-mev", "alloy-rpc-types-trace", @@ -10198,8 +10242,8 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-json-rpc", @@ -10219,15 +10263,14 @@ dependencies = [ "reth-engine-primitives", "reth-network-peers", "reth-rpc-eth-api", - "serde", - "serde_with", ] [[package]] name = "reth-rpc-builder" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "http 1.1.0", "jsonrpsee 0.24.7", "metrics", @@ -10240,7 +10283,6 @@ dependencies = [ "reth-metrics", "reth-network-api", "reth-node-core", - "reth-primitives", "reth-provider", "reth-rpc", "reth-rpc-api", @@ -10261,8 +10303,8 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", @@ -10271,12 +10313,14 @@ dependencies = [ "jsonrpsee-core 0.24.7", "jsonrpsee-types 0.24.7", "metrics", + "parking_lot", "reth-beacon-consensus", "reth-chainspec", "reth-engine-primitives", "reth-evm", "reth-metrics", "reth-payload-builder", + "reth-payload-builder-primitives", "reth-payload-primitives", "reth-primitives", "reth-rpc-api", @@ -10292,8 +10336,8 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -10301,9 +10345,9 @@ dependencies = [ "alloy-json-rpc", "alloy-network", "alloy-primitives 0.8.12", - "alloy-rpc-types", "alloy-rpc-types-eth", "alloy-rpc-types-mev", + "alloy-serde", "async-trait", "auto_impl", "dyn-clone", @@ -10335,13 +10379,12 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", - "alloy-rpc-types", "alloy-rpc-types-eth", "alloy-sol-types", "derive_more 1.0.0", @@ -10378,21 +10421,22 @@ dependencies = [ [[package]] name = "reth-rpc-layer" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-rpc-types-engine", "http 1.1.0", "jsonrpsee-http-client 0.24.7", "pin-project", "tower 0.4.13", + "tower-http", "tracing", ] [[package]] name = "reth-rpc-server-types" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", @@ -10407,16 +10451,17 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", "alloy-rlp", - "alloy-rpc-types", "alloy-rpc-types-engine", "alloy-rpc-types-eth", + "alloy-serde", + "jsonrpsee-types 0.24.7", "reth-primitives", "reth-trie-common", "serde", @@ -10424,9 +10469,10 @@ dependencies = [ [[package]] name = "reth-stages" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-primitives 0.8.12", "bincode", "futures-util", @@ -10460,8 +10506,8 @@ dependencies = [ [[package]] name = "reth-stages-api" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "aquamarine", @@ -10486,8 +10532,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "arbitrary", @@ -10500,8 +10546,8 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "parking_lot", @@ -10519,8 +10565,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "clap 4.5.21", @@ -10531,14 +10577,16 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives 0.8.12", + "alloy-rpc-types-engine", "auto_impl", "reth-chainspec", + "reth-db", "reth-db-api", "reth-db-models", "reth-execution-types", @@ -10551,8 +10599,8 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives 0.8.12", @@ -10564,8 +10612,8 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "auto_impl", "dyn-clone", @@ -10582,8 +10630,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "tokio", "tokio-stream", @@ -10592,8 +10640,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "clap 4.5.21", "eyre", @@ -10607,8 +10655,8 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10627,7 +10675,9 @@ dependencies = [ "reth-execution-types", "reth-fs-util", "reth-metrics", + "reth-payload-util", "reth-primitives", + "reth-primitives-traits", "reth-storage-api", "reth-tasks", "revm", @@ -10643,12 +10693,13 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-primitives 0.8.12", "alloy-rlp", + "alloy-trie", "auto_impl", "itertools 0.13.0", "metrics", @@ -10668,8 +10719,8 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -10691,8 +10742,8 @@ dependencies = [ [[package]] name = "reth-trie-db" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "alloy-rlp", @@ -10714,8 +10765,8 @@ dependencies = [ [[package]] name = "reth-trie-parallel" -version = "1.1.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.1.2#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives 0.8.12", "alloy-rlp", @@ -10729,6 +10780,7 @@ dependencies = [ "reth-primitives", "reth-provider", "reth-trie", + "reth-trie-common", "reth-trie-db", "thiserror 1.0.69", "tracing", @@ -10736,9 +10788,9 @@ dependencies = [ [[package]] name = "revm" -version = "17.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055bee6a81aaeee8c2389ae31f0d4de87f44df24f4444a1116f9755fd87a76ad" +checksum = "15689a3c6a8d14b647b4666f2e236ef47b5a5133cdfd423f545947986fff7013" dependencies = [ "auto_impl", "cfg-if", @@ -10751,9 +10803,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e29c662f7887f3b659d4b0fd234673419a8fcbeaa1ecc29bf7034c0a75cc8ea" +checksum = "747291a18ad6726a08dd73f8b6a6b3a844db582ecae2063ccf0a04880c44f482" dependencies = [ "alloy-primitives 0.8.12", "alloy-rpc-types-eth", @@ -10770,9 +10822,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "13.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac2034454f8bc69dc7d3c94cdb1b57559e27f5ef0518771f1787de543d7d6a1" +checksum = "74e3f11d0fed049a4a10f79820c59113a79b38aed4ebec786a79d5c667bfeb51" dependencies = [ "revm-primitives", "serde", @@ -10780,9 +10832,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "14.0.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a88c8c7c5f9b988a9e65fc0990c6ce859cdb74114db705bd118a96d22d08027" +checksum = "e381060af24b750069a2b2d2c54bba273d84e8f5f9e8026fc9262298e26cc336" dependencies = [ "aurora-engine-modexp", "blst", @@ -10800,9 +10852,9 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "13.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d11fa1e195b0bebaf3fb18596f314a13ba3a4cb1fdd16d3465934d812fd921e" +checksum = "3702f132bb484f4f0d0ca4f6fbde3c82cfd745041abbedd6eda67730e1868ef0" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -10930,6 +10982,7 @@ checksum = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1" dependencies = [ "bytemuck", "byteorder", + "serde", ] [[package]] @@ -12895,12 +12948,12 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.5.2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" dependencies = [ "async-compression", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.6.0", "bytes", "futures-core", @@ -12917,7 +12970,7 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tower 0.4.13", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", @@ -13619,9 +13672,9 @@ dependencies = [ [[package]] name = "wasmtimer" -version = "0.2.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee" +checksum = "0048ad49a55b9deb3953841fa1fc5858f0efbcb7a18868c899a360269fac1b23" dependencies = [ "futures", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index fd9045e5..8a5f4524 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ members = [ "crates/rbuilder/src/telemetry/metrics_macros", "crates/transaction-pool-bundle-ext", "crates/transaction-pool-bundle-ext/bundle_pool_ops/rbuilder", - "crates/eth-sparse-mpt" + "crates/eth-sparse-mpt", ] default-members = ["crates/rbuilder", "crates/reth-rbuilder"] resolver = "2" @@ -30,97 +30,95 @@ version = "0.1.0" edition = "2021" [workspace.dependencies] -reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-beacon-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-libmdbx = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1", features = ["test-utils"] } -reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-auto-seal-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-tracing = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-rpc-api-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-discv4 = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-discv5 = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-network = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-storage-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } -reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.1" } +reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-beacon-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-libmdbx = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2", features = [ + "test-utils", +] } +reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-auto-seal-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-tracing = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-rpc-api-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-discv4 = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-discv5 = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-network = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-storage-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } +reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.2" } -# version is copied from reth "v1.1.1" dependencies -revm = { version = "17.0.0", features = [ +# version is copied from reth "v1.1.2" dependencies +revm = { version = "18.0.0", features = [ "std", "secp256k1", "optional_balance_check", ], default-features = false } -revm-inspectors = "0.10.0" -revm-primitives = { version = "13.0.0", features = [ +revm-inspectors = "0.11.0" +revm-primitives = { version = "14.0.0", features = [ "std", ], default-features = false } ethereum_ssz_derive = "0.8" ethereum_ssz = "0.8" -alloy-primitives = { version = "0.8.9", default-features = false } +alloy-primitives = { version = "0.8.11", default-features = false } alloy-rlp = "0.3.4" alloy-chains = "0.1.33" -alloy-provider = { version = "0.5.4", features = ["ipc", "pubsub"] } -alloy-pubsub = { version = "0.5.4" } -alloy-eips = { version = "0.5.4" } -alloy-rpc-types = { version = "0.5.4" } -alloy-json-rpc = { version = "0.5.4" } -alloy-transport-http = { version = "0.5.4" } -alloy-network = { version = "0.5.4" } -alloy-transport = { version = "0.5.4" } -alloy-node-bindings = { version = "0.5.4" } -alloy-consensus = { version = "0.5.4", features = ["kzg"] } -op-alloy-consensus = { version = "0.5.2", features = ["kzg"] } -alloy-serde = { version = "0.5.4" } -alloy-rpc-types-beacon = { version = "0.5.4", features = [ - "ssz", -] } -alloy-rpc-types-engine = { version = "0.5.4", features = [ - "ssz", -] } -alloy-rpc-types-eth = { version = "0.5.4" } -alloy-signer-local = { version = "0.5.4" } -alloy-genesis = { version = "0.5.4" } +alloy-provider = { version = "0.6.4", features = ["ipc", "pubsub"] } +alloy-pubsub = { version = "0.6.4" } +alloy-eips = { version = "0.6.4" } +alloy-rpc-types = { version = "0.6.4" } +alloy-json-rpc = { version = "0.6.4" } +alloy-transport-http = { version = "0.6.4" } +alloy-network = { version = "0.6.4" } +alloy-network-primitives = { version = "0.6.4" } +alloy-transport = { version = "0.6.4" } +alloy-node-bindings = { version = "0.6.4" } +alloy-consensus = { version = "0.6.4", features = ["kzg"] } +op-alloy-consensus = { version = "0.6.8", features = ["kzg"] } +alloy-serde = { version = "0.6.4" } +alloy-rpc-types-beacon = { version = "0.6.4", features = ["ssz"] } +alloy-rpc-types-engine = { version = "0.6.4", features = ["ssz"] } +alloy-rpc-types-eth = { version = "0.6.4" } +alloy-signer-local = { version = "0.6.4" } +alloy-genesis = { version = "0.6.4" } alloy-trie = { version = "0.7" } - async-trait = { version = "0.1.83" } clap = { version = "4.4.3" } thiserror = { version = "1.0.64" } diff --git a/crates/op-rbuilder/node/Cargo.toml b/crates/op-rbuilder/node/Cargo.toml index 8ec3d539..29d1b732 100644 --- a/crates/op-rbuilder/node/Cargo.toml +++ b/crates/op-rbuilder/node/Cargo.toml @@ -8,6 +8,9 @@ op-rbuilder-payload-builder = { path = "../payload_builder" } transaction-pool-bundle-ext = { path = "../../transaction-pool-bundle-ext" } rbuilder-bundle-pool-operations = { path = "../../transaction-pool-bundle-ext/bundle_pool_ops/rbuilder" } +# alloy +alloy-consensus.workspace = true + # reth reth-payload-builder.workspace = true reth-primitives.workspace = true @@ -37,5 +40,5 @@ optimism = [ "reth-optimism-node/optimism", "reth-primitives/optimism", "reth-provider/optimism", - "op-rbuilder-payload-builder/optimism" + "op-rbuilder-payload-builder/optimism", ] diff --git a/crates/op-rbuilder/node/src/node.rs b/crates/op-rbuilder/node/src/node.rs index 4e24cb8e..f0008304 100644 --- a/crates/op-rbuilder/node/src/node.rs +++ b/crates/op-rbuilder/node/src/node.rs @@ -3,6 +3,7 @@ //! Inherits Network, Executor, and Consensus Builders from the optimism node, //! and overrides the Pool and Payload Builders. +use alloy_consensus::Header; use rbuilder_bundle_pool_operations::BundlePoolOps; use reth_basic_payload_builder::{BasicPayloadJobGenerator, BasicPayloadJobGeneratorConfig}; use reth_evm::ConfigureEvm; @@ -16,12 +17,12 @@ use reth_node_builder::{ use reth_optimism_chainspec::OpChainSpec; use reth_optimism_evm::OpEvmConfig; use reth_optimism_node::{ - node::{OpConsensusBuilder, OpExecutorBuilder, OpNetworkBuilder, OpPrimitives, OptimismAddOns}, + node::{OpAddOns, OpConsensusBuilder, OpExecutorBuilder, OpNetworkBuilder, OpPrimitives}, txpool::OpTransactionValidator, OpEngineTypes, }; use reth_payload_builder::{PayloadBuilderHandle, PayloadBuilderService}; -use reth_primitives::{Header, TransactionSigned}; +use reth_primitives::TransactionSigned; use reth_provider::{BlockReader, CanonStateSubscriptions, DatabaseProviderFactory}; use reth_tracing::tracing::{debug, info}; use reth_transaction_pool::{ @@ -37,11 +38,14 @@ use transaction_pool_bundle_ext::{ use crate::args::OpRbuilderArgs; /// Optimism primitive types. -#[derive(Debug)] +#[derive(Clone, Debug, Default, Eq, PartialEq)] pub struct OpRbuilderPrimitives; impl NodePrimitives for OpRbuilderPrimitives { type Block = reth_primitives::Block; + type SignedTx = reth_primitives::TransactionSigned; + type TxType = reth_primitives::TxType; + type Receipt = reth_primitives::Receipt; } /// Type configuration for an Optimism rbuilder. @@ -109,9 +113,8 @@ where OpConsensusBuilder, >; - type AddOns = OptimismAddOns< - NodeAdapter>::Components>, - >; + type AddOns = + OpAddOns>::Components>>; fn components_builder(&self) -> Self::ComponentsBuilder { let Self { args } = self; @@ -119,7 +122,7 @@ where } fn add_ons(&self) -> Self::AddOns { - OptimismAddOns::new(self.args.sequencer_http.clone()) + OpAddOns::new(self.args.sequencer_http.clone()) } } diff --git a/crates/op-rbuilder/payload_builder/Cargo.toml b/crates/op-rbuilder/payload_builder/Cargo.toml index 38885cf5..51f2afd9 100644 --- a/crates/op-rbuilder/payload_builder/Cargo.toml +++ b/crates/op-rbuilder/payload_builder/Cargo.toml @@ -43,9 +43,8 @@ optimism = [ "reth-execution-types/optimism", "reth-optimism-evm/optimism", "reth-optimism-node/optimism", - "reth-optimism-payload-builder/optimism", "reth-primitives/optimism", "reth-provider/optimism", "revm/optimism", - "reth-optimism-consensus/optimism" + "reth-optimism-consensus/optimism", ] diff --git a/crates/op-rbuilder/payload_builder/src/builder.rs b/crates/op-rbuilder/payload_builder/src/builder.rs index 84e75c26..1030e6dd 100644 --- a/crates/op-rbuilder/payload_builder/src/builder.rs +++ b/crates/op-rbuilder/payload_builder/src/builder.rs @@ -1,6 +1,6 @@ //! Optimism payload builder implementation with Flashbots bundle support. -use alloy_consensus::{BlockHeader, Transaction, EMPTY_OMMER_ROOT_HASH}; +use alloy_consensus::{BlockHeader, Header, Transaction, EMPTY_OMMER_ROOT_HASH}; use alloy_eips::merge::BEACON_NONCE; use alloy_rpc_types_beacon::events::{PayloadAttributesData, PayloadAttributesEvent}; use alloy_rpc_types_engine::payload::PayloadAttributes; @@ -12,12 +12,12 @@ use reth_evm::{system_calls::SystemCaller, ConfigureEvm, ConfigureEvmEnv, NextBl use reth_execution_types::ExecutionOutcome; use reth_optimism_chainspec::OpChainSpec; use reth_optimism_consensus::calculate_receipt_root_no_memo_optimism; -use reth_optimism_forks::OptimismHardforks; +use reth_optimism_forks::OpHardforks; use reth_optimism_node::{OpBuiltPayload, OpPayloadBuilderAttributes}; -use reth_optimism_payload_builder::error::OptimismPayloadBuilderError; +use reth_optimism_payload_builder::error::OpPayloadBuilderError; use reth_payload_builder::PayloadBuilderError; use reth_payload_primitives::PayloadBuilderAttributes; -use reth_primitives::{proofs, Block, BlockBody, Header, Receipt, TransactionSigned, TxType}; +use reth_primitives::{proofs, Block, BlockBody, Receipt, TransactionSigned, TxType}; use reth_provider::StateProviderFactory; use reth_revm::database::StateProviderDatabase; use reth_trie::HashedPostState; @@ -257,7 +257,7 @@ where ) .map_err(|err| { warn!(target: "payload_builder", %err, "missing create2 deployer, skipping block."); - PayloadBuilderError::other(OptimismPayloadBuilderError::ForceCreate2DeployerFail) + PayloadBuilderError::other(OpPayloadBuilderError::ForceCreate2DeployerFail) })?; let mut receipts = Vec::with_capacity(attributes.transactions.len()); @@ -270,7 +270,7 @@ where // A sequencer's block should never contain blob transactions. if sequencer_tx.value().is_eip4844() { return Err(PayloadBuilderError::other( - OptimismPayloadBuilderError::BlobTransactionRejected, + OpPayloadBuilderError::BlobTransactionRejected, )); } @@ -283,7 +283,7 @@ where .clone() .try_into_ecrecovered() .map_err(|_| { - PayloadBuilderError::other(OptimismPayloadBuilderError::TransactionEcRecoverFailed) + PayloadBuilderError::other(OpPayloadBuilderError::TransactionEcRecoverFailed) })?; // Cache the depositor account prior to the state transition for the deposit nonce. @@ -298,7 +298,7 @@ where }) .transpose() .map_err(|_| { - PayloadBuilderError::other(OptimismPayloadBuilderError::AccountLoadFailed( + PayloadBuilderError::other(OpPayloadBuilderError::AccountLoadFailed( sequencer_tx.signer(), )) })?; @@ -386,7 +386,7 @@ where // convert tx to a signed transaction let tx = pool_tx.try_into_ecrecovered().map_err(|_| { - PayloadBuilderError::other(OptimismPayloadBuilderError::TransactionEcRecoverFailed) + PayloadBuilderError::other(OpPayloadBuilderError::TransactionEcRecoverFailed) })?; let env = EnvWithHandlerCfg::new_with_cfg_env( @@ -583,7 +583,7 @@ where let payload = OpBuiltPayload::new( attributes.payload_attributes.id, - sealed_block, + Arc::new(sealed_block), total_fees, chain_spec, attributes, diff --git a/crates/op-rbuilder/src/main.rs b/crates/op-rbuilder/src/main.rs index b899725d..d38fa2a1 100644 --- a/crates/op-rbuilder/src/main.rs +++ b/crates/op-rbuilder/src/main.rs @@ -41,7 +41,7 @@ use reth::{ providers::providers::BlockchainProvider2, }; use reth_optimism_cli::{chainspec::OpChainSpecParser, Cli}; -use reth_optimism_node::node::OptimismAddOns; +use reth_optimism_node::node::OpAddOns; use tracing as _; // jemalloc provides better performance @@ -71,7 +71,7 @@ fn main() { let handle = builder .with_types_and_provider::>() .with_components(OpRbuilderNode::components(op_rbuilder_args)) - .with_add_ons(OptimismAddOns::new(sequencer_http_arg)) + .with_add_ons(OpAddOns::new(sequencer_http_arg)) .extend_rpc_modules(move |ctx| { // register eth bundle api let ext = EthBundleMinimalApi::new(ctx.registry.pool().clone()); diff --git a/crates/rbuilder/Cargo.toml b/crates/rbuilder/Cargo.toml index 9b7f6a5c..5297aaf8 100644 --- a/crates/rbuilder/Cargo.toml +++ b/crates/rbuilder/Cargo.toml @@ -44,6 +44,7 @@ alloy-rpc-types.workspace = true alloy-json-rpc.workspace = true alloy-transport-http.workspace = true alloy-network.workspace = true +alloy-network-primitives.workspace = true alloy-transport.workspace = true alloy-rpc-types-beacon.workspace = true alloy-rpc-types-engine.workspace = true @@ -139,16 +140,15 @@ criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] } [features] optimism = [ - "reth-db/optimism", - "reth-node-core/optimism", - "reth-primitives/optimism", - "reth-provider/optimism", - "revm-primitives/optimism", - "revm/optimism" + "reth-db/optimism", + "reth-node-core/optimism", + "reth-primitives/optimism", + "reth-provider/optimism", + "revm-primitives/optimism", + "revm/optimism", ] redact-sensitive = [] [[bench]] name = "bench_main" harness = false - diff --git a/crates/rbuilder/benches/benchmarks/mev_boost.rs b/crates/rbuilder/benches/benchmarks/mev_boost.rs index bf6614b5..63607da6 100644 --- a/crates/rbuilder/benches/benchmarks/mev_boost.rs +++ b/crates/rbuilder/benches/benchmarks/mev_boost.rs @@ -1,10 +1,11 @@ +use alloy_eips::eip4844::BlobTransactionSidecar; use alloy_primitives::{BlockHash, U256}; use criterion::{criterion_group, Criterion}; use primitive_types::H384; use rbuilder::mev_boost::{ rpc::TestDataGenerator, sign_block_for_relay, BLSBlockSigner, DenebSubmitBlockRequest, }; -use reth::primitives::{BlobTransactionSidecar, SealedBlock}; +use reth::primitives::SealedBlock; use reth_chainspec::SEPOLIA; use reth_primitives::{kzg::Blob, SealedHeader}; use std::{fs, path::PathBuf, sync::Arc}; @@ -96,7 +97,8 @@ fn bench_mevboost_sign(c: &mut Criterion) { // Create a sealed block that is after the Cancun hard fork in Sepolia // this is, a timestamp higher than 1706655072 - let mut sealed_block_deneb = SealedBlock::default(); + let mut sealed_block_deneb: SealedBlock = + SealedBlock::default(); let mut header = sealed_block_deneb.header().clone(); header.timestamp = 2706655072; header.blob_gas_used = Some(64); diff --git a/crates/rbuilder/src/backtest/fetch/mod.rs b/crates/rbuilder/src/backtest/fetch/mod.rs index ce173d26..14432d22 100644 --- a/crates/rbuilder/src/backtest/fetch/mod.rs +++ b/crates/rbuilder/src/backtest/fetch/mod.rs @@ -13,7 +13,7 @@ use crate::{ }; use alloy_provider::Provider; -use alloy_rpc_types::{Block, BlockId, BlockNumberOrTag}; +use alloy_rpc_types::{Block, BlockId, BlockNumberOrTag, BlockTransactionsKind}; use eyre::WrapErr; use flashbots_db::RelayDB; @@ -105,7 +105,10 @@ impl HistoricalDataFetcher { async fn get_onchain_block(&self, block_number: u64) -> eyre::Result { let block = self .eth_provider - .get_block_by_number(BlockNumberOrTag::Number(block_number), true) + .get_block_by_number( + BlockNumberOrTag::Number(block_number), + BlockTransactionsKind::Full, + ) .await .wrap_err_with(|| format!("Failed to fetch block {}", block_number))? .ok_or_else(|| eyre::eyre!("Block {} not found", block_number))?; diff --git a/crates/rbuilder/src/backtest/mod.rs b/crates/rbuilder/src/backtest/mod.rs index e0b42c9a..9f95064d 100644 --- a/crates/rbuilder/src/backtest/mod.rs +++ b/crates/rbuilder/src/backtest/mod.rs @@ -20,6 +20,8 @@ use crate::{ }, utils::offset_datetime_to_timestamp_ms, }; +use alloy_consensus::Transaction as TransactionTrait; +use alloy_network_primitives::TransactionResponse; use alloy_primitives::{Address, TxHash, I256}; use alloy_rpc_types::{BlockTransactions, Transaction}; pub use fetch::HistoricalDataFetcher; @@ -168,8 +170,8 @@ impl BlockData { } if let BlockTransactions::Full(txs) = &self.onchain_block.transactions { for tx in txs { - if !available_txs.contains(&tx.hash) && !self.is_validator_fee_payment(tx) { - result.push(tx.hash); + if !available_txs.contains(&tx.tx_hash()) && !self.is_validator_fee_payment(tx) { + result.push(tx.tx_hash()); } } } else { @@ -191,13 +193,13 @@ impl BlockData { .filter(|tx| { !available_accounts .iter() - .any(|x| x.nonce == tx.nonce && x.address == tx.from) + .any(|x| x.nonce == tx.nonce() && x.address == tx.from) }) .map(|tx| { ( - tx.hash, + tx.tx_hash(), AccountNonce { - nonce: tx.nonce, + nonce: tx.nonce(), account: tx.from, }, ) @@ -209,9 +211,8 @@ impl BlockData { } fn is_validator_fee_payment(&self, tx: &Transaction) -> bool { - tx.from == self.onchain_block.header.miner - && tx - .to + tx.from == self.onchain_block.header.beneficiary + && TransactionTrait::to(tx) .is_some_and(|to| to == self.winning_bid_trace.proposer_fee_recipient) } } diff --git a/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs b/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs index 8edbfdab..5f570f9b 100644 --- a/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs +++ b/crates/rbuilder/src/backtest/restore_landed_orders/resim_landed_block.rs @@ -40,7 +40,7 @@ where let txs = extract_onchain_block_txs(&onchain_block)?; let suggested_fee_recipient = find_suggested_fee_recipient(&onchain_block, &txs); - let coinbase = onchain_block.header.miner; + let coinbase = onchain_block.header.beneficiary; let ctx = BlockBuildingContext::from_onchain_block( onchain_block, diff --git a/crates/rbuilder/src/backtest/store.rs b/crates/rbuilder/src/backtest/store.rs index 61b2a356..ff153e19 100644 --- a/crates/rbuilder/src/backtest/store.rs +++ b/crates/rbuilder/src/backtest/store.rs @@ -621,9 +621,11 @@ mod test { SimValue, }, }; - use alloy_primitives::{hex, Address, Bloom, Bytes, B256, U256, U64}; - use alloy_rpc_types::{Block, BlockTransactions, Header, Signature, Transaction}; + use alloy_consensus::TxEnvelope; + use alloy_primitives::{hex, Address, PrimitiveSignature, B256, U256, U64}; + use alloy_rpc_types::{Block, BlockTransactions, Header, Transaction}; use time::OffsetDateTime; + #[tokio::test] async fn test_create_tables() { let mut storage = HistoricalDataStorage::new_from_memory().await.unwrap(); @@ -723,28 +725,9 @@ mod test { fn create_empty_block_header() -> Header { Header { hash: B256::default(), - parent_hash: B256::default(), - uncles_hash: B256::default(), - miner: Address::default(), - state_root: B256::default(), - transactions_root: B256::default(), - receipts_root: B256::default(), - logs_bloom: Bloom::default(), - difficulty: U256::default(), - number: 0, - gas_limit: 0, - gas_used: 0, - timestamp: 0, - extra_data: Bytes::default(), - mix_hash: None, - nonce: None, - base_fee_per_gas: None, - withdrawals_root: None, - blob_gas_used: None, - excess_blob_gas: None, - parent_beacon_block_root: None, + inner: Default::default(), total_difficulty: None, - requests_hash: None, + size: None, } } @@ -755,38 +738,32 @@ mod test { // IMPORTANT: Due to what seems to be a bug on BlockTransactions serde serialization we must put a tx // since BlockTransactions::Full(empty) deserializes wrongly to BlockTransactions::Hashes(empty) transactions: BlockTransactions::Full(vec![create_test_tx()]), - size: None, withdrawals: None, } } fn create_test_tx() -> Transaction { - Transaction { - hash: B256::with_last_byte(1), + let inner_tx = alloy_consensus::TxEip1559 { + chain_id: 1, nonce: 2, + gas_limit: 3, + max_fee_per_gas: 4, + max_priority_fee_per_gas: 5, + value: U256::from(6), + ..Default::default() + }; + let tx = alloy_consensus::Signed::new_unchecked( + inner_tx, + PrimitiveSignature::test_signature(), + B256::default(), + ); + Transaction { + inner: TxEnvelope::from(tx), block_hash: Some(B256::with_last_byte(3)), block_number: Some(4), transaction_index: Some(5), from: Address::with_last_byte(6), - to: Some(Address::with_last_byte(7)), - value: U256::from(8), - gas_price: Some(9), - gas: 10, - input: Bytes::from(vec![11, 12, 13]), - signature: Some(Signature { - v: U256::from(14), - r: U256::from(14), - s: U256::from(14), - y_parity: None, - }), - chain_id: Some(17), - blob_versioned_hashes: None, - access_list: None, - transaction_type: Some(20), - max_fee_per_gas: Some(21), - max_priority_fee_per_gas: Some(22), - max_fee_per_blob_gas: None, - authorization_list: None, + effective_gas_price: Some(7), } } } diff --git a/crates/rbuilder/src/bin/debug-bench-machine.rs b/crates/rbuilder/src/bin/debug-bench-machine.rs index de56509b..417f6648 100644 --- a/crates/rbuilder/src/bin/debug-bench-machine.rs +++ b/crates/rbuilder/src/bin/debug-bench-machine.rs @@ -2,6 +2,7 @@ //! This only works when reth node is stopped and the chain moved forward form its synced state //! It downloads block aftre the last one synced and re-executes all the txs in it. use alloy_provider::Provider; +use alloy_rpc_types::BlockTransactionsKind; use clap::Parser; use eyre::Context; use itertools::Itertools; @@ -46,7 +47,7 @@ async fn main() -> eyre::Result<()> { let last_block = provider_factory.last_block_number()?; let onchain_block = rpc - .get_block_by_number((last_block + 1).into(), true) + .get_block_by_number((last_block + 1).into(), BlockTransactionsKind::Full) .await? .ok_or_else(|| eyre::eyre!("block not found on rpc"))?; @@ -58,7 +59,7 @@ async fn main() -> eyre::Result<()> { txs.len() ); - let coinbase = onchain_block.header.miner; + let coinbase = onchain_block.header.beneficiary; let ctx = BlockBuildingContext::from_onchain_block( onchain_block, diff --git a/crates/rbuilder/src/building/builders/mod.rs b/crates/rbuilder/src/building/builders/mod.rs index 2297a4c2..a8a70378 100644 --- a/crates/rbuilder/src/building/builders/mod.rs +++ b/crates/rbuilder/src/building/builders/mod.rs @@ -12,12 +12,10 @@ use crate::{ utils::{is_provider_factory_health_error, NonceCache}, }; use ahash::HashSet; +use alloy_eips::eip4844::BlobTransactionSidecar; use alloy_primitives::{Address, Bytes, B256}; use block_building_helper::BlockBuildingHelper; -use reth::{ - primitives::{BlobTransactionSidecar, SealedBlock}, - revm::cached::CachedReads, -}; +use reth::{primitives::SealedBlock, revm::cached::CachedReads}; use reth_db::Database; use reth_errors::ProviderError; use reth_provider::{DatabaseProviderFactory, StateProviderFactory}; diff --git a/crates/rbuilder/src/building/builders/parallel_builder/simulation_cache.rs b/crates/rbuilder/src/building/builders/parallel_builder/simulation_cache.rs index 630c447a..4dfa6249 100644 --- a/crates/rbuilder/src/building/builders/parallel_builder/simulation_cache.rs +++ b/crates/rbuilder/src/building/builders/parallel_builder/simulation_cache.rs @@ -186,8 +186,8 @@ impl Default for SharedSimulationCache { mod tests { use super::*; use alloy_primitives::{Address, B256, U256}; - use reth_primitives::revm_primitives::AccountInfo; use revm::db::{states::StorageSlot, AccountStatus, BundleAccount}; + use revm_primitives::AccountInfo; use std::collections::HashMap; type AlloyHashMap = HashMap; struct TestDataGenerator { diff --git a/crates/rbuilder/src/building/mod.rs b/crates/rbuilder/src/building/mod.rs index 7a32d48a..6c1c9498 100644 --- a/crates/rbuilder/src/building/mod.rs +++ b/crates/rbuilder/src/building/mod.rs @@ -10,7 +10,7 @@ pub mod payout_tx; pub mod sim; pub mod testing; pub mod tracers; -use alloy_consensus::EMPTY_OMMER_ROOT_HASH; +use alloy_consensus::{Header, EMPTY_OMMER_ROOT_HASH}; use alloy_primitives::{Address, Bytes, Sealable, U256}; pub use block_orders::BlockOrders; use eth_sparse_mpt::SparseTrieSharedCache; @@ -24,15 +24,15 @@ use crate::{ utils::{a2r_withdrawal, calc_gas_limit, timestamp_as_u64, Signer}, }; use ahash::HashSet; -use alloy_eips::{calc_excess_blob_gas, eip7685::Requests, merge::BEACON_NONCE}; +use alloy_eips::{ + calc_excess_blob_gas, eip4844::BlobTransactionSidecar, eip4895::Withdrawals, eip7685::Requests, + merge::BEACON_NONCE, +}; use alloy_rpc_types_beacon::events::PayloadAttributesEvent; use jsonrpsee::core::Serialize; use reth::{ payload::PayloadId, - primitives::{ - proofs, revm_primitives::InvalidTransaction, BlobTransactionSidecar, Block, Head, Header, - Receipt, Receipts, SealedBlock, Withdrawals, - }, + primitives::{proofs, Block, Head, Receipt, Receipts, SealedBlock}, providers::ExecutionOutcome, revm::cached::CachedReads, }; @@ -47,6 +47,7 @@ use revm::{ db::states::bundle_state::BundleRetention, primitives::{BlobExcessGasAndPrice, BlockEnv, CfgEnvWithHandlerCfg, SpecId}, }; +use revm_primitives::InvalidTransaction; use serde::Deserialize; use std::{ hash::Hash, @@ -193,7 +194,7 @@ impl BlockBuildingContext { coinbase, timestamp: U256::from(onchain_block.header.timestamp), difficulty: onchain_block.header.difficulty, - prevrandao: onchain_block.header.mix_hash, + prevrandao: Some(onchain_block.header.mix_hash), basefee: U256::from( onchain_block .header @@ -219,7 +220,7 @@ impl BlockBuildingContext { parent: onchain_block.header.parent_hash, timestamp: timestamp_as_u64(&onchain_block), suggested_fee_recipient, - prev_randao: onchain_block.header.mix_hash.unwrap_or_default(), + prev_randao: onchain_block.header.mix_hash, withdrawals, parent_beacon_block_root: onchain_block.header.parent_beacon_block_root, }; diff --git a/crates/rbuilder/src/building/testing/test_chain_state.rs b/crates/rbuilder/src/building/testing/test_chain_state.rs index b508d4cd..507ca25d 100644 --- a/crates/rbuilder/src/building/testing/test_chain_state.rs +++ b/crates/rbuilder/src/building/testing/test_chain_state.rs @@ -1,5 +1,5 @@ use ahash::HashSet; -use alloy_consensus::TxEip1559; +use alloy_consensus::{Header, TxEip1559}; use alloy_primitives::{ keccak256, utils::parse_ether, Address, BlockHash, Bytes, TxKind as TransactionKind, B256, B64, U256, @@ -7,7 +7,7 @@ use alloy_primitives::{ use alloy_rpc_types_beacon::events::{PayloadAttributesData, PayloadAttributesEvent}; use lazy_static::lazy_static; use reth::{ - primitives::{Account, BlockBody, Bytecode, Header, SealedBlock, TransactionSignedEcRecovered}, + primitives::{Account, BlockBody, Bytecode, SealedBlock, TransactionSignedEcRecovered}, providers::ProviderFactory, rpc::types::{engine::PayloadAttributes, Withdrawal}, }; diff --git a/crates/rbuilder/src/live_builder/mod.rs b/crates/rbuilder/src/live_builder/mod.rs index 5b7c78e2..fa704a52 100644 --- a/crates/rbuilder/src/live_builder/mod.rs +++ b/crates/rbuilder/src/live_builder/mod.rs @@ -22,13 +22,14 @@ use crate::{ utils::{error_storage::spawn_error_storage_writer, Signer}, }; use ahash::HashSet; +use alloy_consensus::Header; use alloy_primitives::{Address, B256}; use building::BlockBuildingPool; use eyre::Context; use jsonrpsee::RpcModule; use order_input::ReplaceableOrderPoolCommand; use payload_events::MevBoostSlotData; -use reth::{primitives::Header, providers::HeaderProvider}; +use reth::providers::HeaderProvider; use reth_chainspec::ChainSpec; use reth_db::Database; use reth_provider::{BlockReader, DatabaseProviderFactory, StateProviderFactory}; diff --git a/crates/rbuilder/src/live_builder/order_input/clean_orderpool.rs b/crates/rbuilder/src/live_builder/order_input/clean_orderpool.rs index 914f7fa6..51c4628d 100644 --- a/crates/rbuilder/src/live_builder/order_input/clean_orderpool.rs +++ b/crates/rbuilder/src/live_builder/order_input/clean_orderpool.rs @@ -41,8 +41,8 @@ where }; let mut new_block_stream = pin!(new_block_stream); - while let Some(block) = new_block_stream.next().await { - let block_number = block.header.number; + while let Some(header) = new_block_stream.next().await { + let block_number = header.number; set_current_block(block_number); let state = match provider_factory.latest() { Ok(state) => state, diff --git a/crates/rbuilder/src/mev_boost/sign_payload.rs b/crates/rbuilder/src/mev_boost/sign_payload.rs index ee43c826..cab033dd 100644 --- a/crates/rbuilder/src/mev_boost/sign_payload.rs +++ b/crates/rbuilder/src/mev_boost/sign_payload.rs @@ -3,7 +3,7 @@ use super::{ SubmitBlockRequest, }; use crate::utils::u256decimal_serde_helper; -use alloy_eips::eip2718::Encodable2718; +use alloy_eips::{eip2718::Encodable2718, eip4844::BlobTransactionSidecar}; use alloy_primitives::{Address, BlockHash, Bytes, FixedBytes, B256, U256}; use alloy_rpc_types_beacon::{ events::PayloadAttributesData, @@ -22,7 +22,7 @@ use ethereum_consensus::{ }; use primitive_types::H384; use reth_chainspec::{ChainSpec, EthereumHardforks}; -use reth_primitives::{BlobTransactionSidecar, SealedBlock}; +use reth_primitives::SealedBlock; use serde_with::{serde_as, DisplayFromStr}; use std::sync::Arc; diff --git a/crates/rbuilder/src/primitives/mod.rs b/crates/rbuilder/src/primitives/mod.rs index 37b4e696..af0c9df1 100644 --- a/crates/rbuilder/src/primitives/mod.rs +++ b/crates/rbuilder/src/primitives/mod.rs @@ -10,15 +10,14 @@ use crate::building::evm_inspector::UsedStateTrace; use alloy_consensus::Transaction as _; use alloy_eips::{ eip2718::{Decodable2718, Eip2718Error, Encodable2718}, - eip4844::{Blob, Bytes48}, + eip4844::{Blob, BlobTransactionSidecar, Bytes48}, }; use alloy_primitives::{keccak256, Address, Bytes, TxHash, B256, U256}; use derivative::Derivative; use integer_encoding::VarInt; use reth_primitives::{ kzg::{BYTES_PER_BLOB, BYTES_PER_COMMITMENT, BYTES_PER_PROOF}, - BlobTransactionSidecar, PooledTransactionsElement, TransactionSigned, - TransactionSignedEcRecovered, + PooledTransactionsElement, TransactionSigned, TransactionSignedEcRecovered, }; use serde::{Deserialize, Serialize}; use sha2::{Digest, Sha256}; diff --git a/crates/rbuilder/src/roothash/mod.rs b/crates/rbuilder/src/roothash/mod.rs index 9d5fea1e..b8ece6eb 100644 --- a/crates/rbuilder/src/roothash/mod.rs +++ b/crates/rbuilder/src/roothash/mod.rs @@ -9,7 +9,7 @@ use reth::providers::{providers::ConsistentDbView, ExecutionOutcome}; use reth_errors::ProviderError; use reth_provider::{BlockReader, DatabaseProviderFactory}; use reth_trie::TrieInput; -use reth_trie_parallel::parallel_root::{ParallelStateRoot, ParallelStateRootError}; +use reth_trie_parallel::root::{ParallelStateRoot, ParallelStateRootError}; use tracing::trace; pub use prefetcher::run_trie_prefetcher; diff --git a/crates/rbuilder/src/utils/mod.rs b/crates/rbuilder/src/utils/mod.rs index 5112ce77..768ca0dd 100644 --- a/crates/rbuilder/src/utils/mod.rs +++ b/crates/rbuilder/src/utils/mod.rs @@ -210,7 +210,7 @@ pub fn find_suggested_fee_recipient( block: &alloy_rpc_types::Block, txs: &[TransactionSignedEcRecoveredWithBlobs], ) -> Address { - let coinbase = block.header.miner; + let coinbase = block.header.beneficiary; let (last_tx_signer, last_tx_to) = if let Some((signer, to)) = txs .last() .map(|tx| (tx.signer(), tx.to().unwrap_or_default())) @@ -232,7 +232,8 @@ pub fn extract_onchain_block_txs( ) -> eyre::Result> { let mut result = Vec::new(); for tx in onchain_block.transactions.clone().into_transactions() { - let tx_envelope: TxEnvelope = tx.try_into()?; + let tx_envelope: TxEnvelope = + >::into(tx); let encoded = tx_envelope.encoded_2718(); let tx = RawTx { tx: encoded.into() }.decode(TxEncoding::NoBlobData)?; result.push(tx.tx_with_blobs); diff --git a/crates/rbuilder/src/utils/provider_factory_reopen.rs b/crates/rbuilder/src/utils/provider_factory_reopen.rs index 997e2382..f8439d38 100644 --- a/crates/rbuilder/src/utils/provider_factory_reopen.rs +++ b/crates/rbuilder/src/utils/provider_factory_reopen.rs @@ -1,4 +1,5 @@ use crate::telemetry::{inc_provider_bad_reopen_counter, inc_provider_reopen_counter}; +use alloy_consensus::Header; use alloy_eips::{BlockNumHash, BlockNumberOrTag}; use alloy_primitives::{BlockHash, BlockNumber}; use parking_lot::{Mutex, RwLock}; @@ -7,7 +8,7 @@ use reth_chainspec::ChainInfo; use reth_db::{Database, DatabaseError}; use reth_errors::{ProviderError, ProviderResult, RethResult}; use reth_node_api::NodeTypesWithDB; -use reth_primitives::{Header, SealedHeader}; +use reth_primitives::SealedHeader; use reth_provider::{ providers::{ProviderNodeTypes, StaticFileProvider}, BlockIdReader, BlockNumReader, DatabaseProvider, DatabaseProviderFactory, DatabaseProviderRO, diff --git a/crates/rbuilder/src/utils/test_utils.rs b/crates/rbuilder/src/utils/test_utils.rs index 17d517ed..9b8f38aa 100644 --- a/crates/rbuilder/src/utils/test_utils.rs +++ b/crates/rbuilder/src/utils/test_utils.rs @@ -27,7 +27,7 @@ pub fn tx(tx_hash: u64) -> TransactionSignedEcRecoveredWithBlobs { TransactionSignedEcRecovered::from_signed_transaction( TransactionSigned { hash: hash(tx_hash), - signature: alloy_primitives::Signature::test_signature(), + signature: alloy_primitives::PrimitiveSignature::test_signature(), transaction: Default::default(), }, Address::default(), diff --git a/crates/rbuilder/src/utils/tx_signer.rs b/crates/rbuilder/src/utils/tx_signer.rs index 697ae38f..dfaf955c 100644 --- a/crates/rbuilder/src/utils/tx_signer.rs +++ b/crates/rbuilder/src/utils/tx_signer.rs @@ -1,4 +1,4 @@ -use alloy_primitives::{Address, Parity, Signature, B256, U256}; +use alloy_primitives::{Address, PrimitiveSignature as Signature, B256, U256}; use reth_primitives::{ public_key_to_address, Transaction, TransactionSigned, TransactionSignedEcRecovered, }; @@ -29,7 +29,7 @@ impl Signer { let signature = Signature::new( U256::try_from_be_slice(&data[..32]).expect("The slice has at most 32 bytes"), U256::try_from_be_slice(&data[32..64]).expect("The slice has at most 32 bytes"), - Parity::Parity(rec_id.to_i32() != 0), + rec_id.to_i32() != 0, ); Ok(signature) } diff --git a/crates/transaction-pool-bundle-ext/Cargo.toml b/crates/transaction-pool-bundle-ext/Cargo.toml index ef22b78c..83b64ddd 100644 --- a/crates/transaction-pool-bundle-ext/Cargo.toml +++ b/crates/transaction-pool-bundle-ext/Cargo.toml @@ -8,12 +8,9 @@ reth = { workspace = true } reth-eth-wire-types = { workspace = true } reth-primitives = { workspace = true } reth-transaction-pool = { workspace = true } -alloy-primitives = { version = "0.8.9", default-features = false } -alloy-rpc-types-beacon = { version = "0.5.4", features = [ - "ssz", -] } -alloy-eips = { version = "0.5.4" } +alloy-primitives = { workspace = true, default-features = false } +alloy-rpc-types-beacon = { workspace = true, features = ["ssz"] } +alloy-eips = { workspace = true } tokio = { workspace = true } -