From 9d4ad0b5dab60c9cf01c09098b380f9a8fcab772 Mon Sep 17 00:00:00 2001 From: debjit Date: Thu, 28 Nov 2024 14:26:44 +0530 Subject: [PATCH 1/4] regular dependency upgrade --- Cargo.lock | 1506 ++++++++++++++++++++-------------------- Cargo.toml | 76 +- src/consensus.rs | 83 ++- src/evm_config.rs | 11 +- src/execute.rs | 6 +- src/gnosis.rs | 13 +- src/lib.rs | 8 +- src/main.rs | 2 + src/payload_builder.rs | 24 +- 9 files changed, 888 insertions(+), 841 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a1b5b5..5fbcb5e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,15 +91,15 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" [[package]] name = "alloy-chains" -version = "0.1.46" +version = "0.1.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836cf02383d9ebb35502d379bcd1ae803155094077eaab9c29131d888cd5fa3e" +checksum = "18c5c520273946ecf715c0010b4e3503d7eba9893cd9ce6b7fff5654c4a3c470" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -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", @@ -124,15 +124,16 @@ dependencies = [ "auto_impl", "c-kzg", "derive_more", + "rand", "serde", "serde_with", ] [[package]] name = "alloy-dyn-abi" -version = "0.8.10" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5228b189b18b85761340dc9eaac0141148a8503657b36f9bc3a869413d987ca" +checksum = "1cf633ae9a1f0c82fdb9e559ed2be1c8e415c3e48fc47e1feaf32c6078ec0cdd" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -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", "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", @@ -189,8 +190,6 @@ dependencies = [ "arbitrary", "c-kzg", "derive_more", - "ethereum_ssz", - "ethereum_ssz_derive", "once_cell", "serde", "sha2 0.10.8", @@ -198,9 +197,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", "alloy-serde", @@ -209,9 +208,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.8.10" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31a0f0d51db8a1a30a4d98a9f90e090a94c8f44cb4d9eafc7e03aa6d00aae984" +checksum = "1a500037938085feed8a20dbfc8fce58c599db68c948cfae711147175dee392c" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -221,23 +220,23 @@ 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", "alloy-sol-types", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tracing", ] [[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 +250,16 @@ dependencies = [ "async-trait", "auto_impl", "futures-utils-wasm", - "thiserror", + "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 +270,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.10" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8edae627382349b56cd6a7a2106f4fd69b243a9233e560c55c2e03cabb7e1d3c" +checksum = "3aeeb5825c2fc8c2662167058347cd0cafc3cb15bcb5cdb1758a63c2dca0409e" dependencies = [ "alloy-rlp", "arbitrary", @@ -282,7 +283,7 @@ dependencies = [ "derive_more", "foldhash", "getrandom", - "hashbrown 0.15.0", + "hashbrown 0.15.2", "hex-literal", "indexmap 2.6.0", "itoa", @@ -301,9 +302,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", @@ -331,7 +332,7 @@ dependencies = [ "schnellru", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "url", @@ -340,9 +341,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", @@ -376,14 +377,14 @@ checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[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", @@ -406,9 +407,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", "alloy-rpc-types-engine", @@ -419,9 +420,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", @@ -431,34 +432,35 @@ 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", + "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", "alloy-rpc-types-engine", "serde", "serde_with", - "thiserror", + "thiserror 1.0.69", ] [[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", "serde", @@ -466,9 +468,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", @@ -476,8 +478,6 @@ dependencies = [ "alloy-rlp", "alloy-serde", "derive_more", - "ethereum_ssz", - "ethereum_ssz_derive", "jsonrpsee-types", "jsonwebtoken", "rand", @@ -487,9 +487,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", @@ -508,9 +508,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", @@ -521,23 +521,23 @@ 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", "alloy-rpc-types-eth", "alloy-serde", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[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", "alloy-rpc-types-eth", @@ -547,9 +547,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", "arbitrary", @@ -559,23 +559,23 @@ 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", "async-trait", "auto_impl", "elliptic-curve", "k256", - "thiserror", + "thiserror 1.0.69", ] [[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", @@ -584,28 +584,28 @@ dependencies = [ "async-trait", "k256", "rand", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "alloy-sol-macro" -version = "0.8.10" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841eabaa4710f719fddbc24c95d386eae313f07e6da4babc25830ee37945be0c" +checksum = "5c0279d09463a4695788a3622fd95443625f7be307422deba4b55dd491a9c7a1" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] name = "alloy-sol-macro-expander" -version = "0.8.10" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6672337f19d837b9f7073c45853aeb528ed9f7dd6a4154ce683e9e5cb7794014" +checksum = "4feea540fc8233df2ad1156efd744b2075372f43a8f942a68b3b19c8a00e2c12" dependencies = [ "alloy-sol-macro-input", "const-hex", @@ -614,31 +614,31 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", "syn-solidity", "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "0.8.10" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dff37dd20bfb118b777c96eda83b2067f4226d2644c5cfa00187b3bc01770ba" +checksum = "2a0ad281f3d1b613af814b66977ee698e443d4644a1510962d0241f26e0e53ae" dependencies = [ "const-hex", "dunce", "heck", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "0.8.10" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b853d42292dbb159671a3edae3b2750277ff130f32b726fe07dc2b17aa6f2b5" +checksum = "96eff16c797438add6c37bb335839d015b186c5421ee5626f5559a7bfeb38ef5" dependencies = [ "serde", "winnow", @@ -646,9 +646,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.10" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa828bb1b9a6dc52208fbb18084fb9ce2c30facc2bfda6a5d922349b4990354f" +checksum = "cff34e0682d6665da243a3e81da96f07a2dd50f7e64073e382b1a141f5a2a2f6" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -659,9 +659,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", @@ -669,7 +669,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tower 0.5.1", "tracing", @@ -679,9 +679,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", @@ -694,9 +694,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", @@ -712,9 +712,9 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd7f8b3a7c65ca09b3c7bdd7c7d72d7423d026f5247eda96af53d24e58315c1" +checksum = "b6b2e366c0debf0af77766c23694a3f863b02633050e71e096e257ffbd395e50" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -747,9 +747,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.17" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -796,9 +796,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "aquamarine" @@ -811,14 +811,14 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] name = "arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" dependencies = [ "derive_arbitrary", ] @@ -970,9 +970,9 @@ checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" [[package]] name = "async-compression" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857" +checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" dependencies = [ "brotli", "flate2", @@ -1003,7 +1003,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -1014,7 +1014,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -1052,7 +1052,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -1063,9 +1063,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backon" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4fa97bb310c33c811334143cf64c5bb2b7b3c06e453db6b095d7061eff8f113" +checksum = "ba5289ec98f68f28dd809fd601059e6aa908bb8f6108620930828283d4ee23d7" dependencies = [ "fastrand", "tokio", @@ -1152,7 +1152,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -1293,7 +1293,7 @@ dependencies = [ "static_assertions", "tap", "thin-vec", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -1334,7 +1334,7 @@ checksum = "240f4126219a83519bad05c9a40bfc0303921eeb571fc2d7e44c17ffac99d3f1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", "synstructure", ] @@ -1417,12 +1417,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" dependencies = [ "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "serde", ] @@ -1440,9 +1440,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" dependencies = [ "bytemuck_derive", ] @@ -1455,7 +1455,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -1517,7 +1517,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1537,9 +1537,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.31" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", @@ -1611,9 +1611,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -1621,9 +1621,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -1640,14 +1640,14 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "colorchoice" @@ -1667,14 +1667,14 @@ dependencies = [ [[package]] name = "comfy-table" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" +checksum = "24f165e7b643266ea80cb858aed492ad9280e3e05ce24d4a99d7d7b889b6a4d9" dependencies = [ - "crossterm 0.27.0", + "crossterm", "strum", "strum_macros", - "unicode-width", + "unicode-width 0.2.0", ] [[package]] @@ -1714,9 +1714,9 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586" +checksum = "487981fa1af147182687064d0a2c336586d337a606595ced9ffb0c685c250c73" dependencies = [ "cfg-if", "cpufeatures", @@ -1788,9 +1788,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -1859,19 +1859,6 @@ version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags 2.6.0", - "crossterm_winapi", - "libc", - "parking_lot", - "winapi", -] - [[package]] name = "crossterm" version = "0.28.1" @@ -1969,7 +1956,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -1993,7 +1980,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -2004,7 +1991,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -2111,13 +2098,13 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -2138,7 +2125,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", "unicode-xid", ] @@ -2252,7 +2239,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -2372,7 +2359,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -2383,7 +2370,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -2402,47 +2389,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "ethereum_serde_utils" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70cbccfccf81d67bff0ab36e591fa536c8a935b078a7b0e58c1d00d418332fc9" -dependencies = [ - "alloy-primitives", - "hex", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "ethereum_ssz" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfbba28f4f3f32d92c06a64f5bf6c4537b5d4e21f28c689bd2bbaecfea4e0d3e" -dependencies = [ - "alloy-primitives", - "derivative", - "ethereum_serde_utils", - "itertools 0.13.0", - "serde", - "serde_derive", - "smallvec", - "typenum", -] - -[[package]] -name = "ethereum_ssz_derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d37845ba7c16bf4be8be4b5786f03a2ba5f2fda0d7f9e7cb2282f69cff420d7" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.86", -] - [[package]] name = "eyre" version = "0.6.12" @@ -2461,9 +2407,9 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "fastrlp" @@ -2483,7 +2429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5" dependencies = [ "libc", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2528,9 +2474,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -2628,7 +2574,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -2739,7 +2685,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -2783,9 +2729,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -2830,9 +2776,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "allocator-api2", "equivalent", @@ -3012,9 +2958,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", @@ -3207,7 +3153,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -3228,12 +3174,23 @@ dependencies = [ [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -3257,13 +3214,13 @@ dependencies = [ [[package]] name = "impl-trait-for-tuples" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" +checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -3310,10 +3267,16 @@ checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "arbitrary", "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.15.2", "serde", ] +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + [[package]] name = "inotify" version = "0.9.6" @@ -3346,19 +3309,23 @@ dependencies = [ [[package]] name = "instability" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c" +checksum = "b829f37dead9dc39df40c2d3376c179fdfd2ac771f53f55d3c30dc096a3c0c6e" dependencies = [ + "darling", + "indoc", + "pretty_assertions", + "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] name = "interprocess" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f4e4a06d42fab3e85ab1b419ad32b09eab58b901d40c57935ff92db3287a13" +checksum = "894148491d817cb36b6f778017b8ac46b17408d522dd90f539d677ea938362eb" dependencies = [ "doctest-file", "futures-core", @@ -3432,9 +3399,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jni" @@ -3446,7 +3413,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror", + "thiserror 1.0.69", "walkdir", ] @@ -3509,7 +3476,7 @@ dependencies = [ "rustls-pki-types", "rustls-platform-verifier", "soketto", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-rustls", "tokio-util", @@ -3537,7 +3504,7 @@ dependencies = [ "rustc-hash 2.0.0", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -3562,7 +3529,7 @@ dependencies = [ "rustls-platform-verifier", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tower 0.4.13", "tracing", @@ -3579,7 +3546,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -3601,7 +3568,7 @@ dependencies = [ "serde", "serde_json", "soketto", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -3618,7 +3585,7 @@ dependencies = [ "http", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3739,9 +3706,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.161" +version = "0.2.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" [[package]] name = "libloading" @@ -3761,9 +3728,9 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libp2p-identity" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" +checksum = "257b5621d159b32282eac446bed6670c39c7dc68a200a992d8f056afa0066f6d" dependencies = [ "asn1_der", "bs58", @@ -3773,7 +3740,7 @@ dependencies = [ "multihash", "quick-protobuf", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "tracing", "zeroize", ] @@ -3872,9 +3839,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" @@ -3899,7 +3866,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.0", + "hashbrown 0.15.2", ] [[package]] @@ -3967,9 +3934,9 @@ dependencies = [ [[package]] name = "metrics" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae428771d17306715c5091d446327d1cfdedc82185c65ba8423ab404e45bf10" +checksum = "7a7deb012b3b2767169ff203fadb4c6b0b82b947512e5eb9e0b78c2e186ad9e3" dependencies = [ "ahash", "portable-atomic", @@ -3984,7 +3951,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -3998,14 +3965,14 @@ dependencies = [ "metrics", "metrics-util", "quanta", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "metrics-process" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ca8ecd85575fbb143b2678cb123bb818779391ec0f745b1c4a9dbabadde407" +checksum = "4a82c8add4382f29a122fa64fff1891453ed0f6b2867d971e7d60cb8dfa322ff" dependencies = [ "libc", "libproc", @@ -4025,7 +3992,7 @@ checksum = "15b482df36c13dd1869d73d14d28cd4855fbd6cfc32294bee109908a9f4a4ed7" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.15.0", + "hashbrown 0.15.2", "metrics", "quanta", "sketches-ddsketch", @@ -4311,7 +4278,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -4358,9 +4325,9 @@ dependencies = [ [[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", @@ -4371,48 +4338,14 @@ dependencies = [ "derive_more", "serde", "serde_with", - "spin", -] - -[[package]] -name = "op-alloy-genesis" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccacc2efed3d60d98ea581bddb885df1c6c62a592e55de049cfefd94116112cd" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-sol-types", - "serde", - "serde_repr", -] - -[[package]] -name = "op-alloy-protocol" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f8e6ec6b91c6aaeb20860b455a52fd8e300acfe5d534e96e9073a24f853e74" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-serde", - "async-trait", - "derive_more", - "op-alloy-consensus", - "op-alloy-genesis", - "serde", - "tracing", - "unsigned-varint", + "thiserror 2.0.3", ] [[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", @@ -4421,27 +4354,12 @@ dependencies = [ "alloy-rpc-types-eth", "alloy-serde", "arbitrary", + "derive_more", "op-alloy-consensus", "serde", "serde_json", ] -[[package]] -name = "op-alloy-rpc-types-engine" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b52ee59c86537cff83e8c7f2a6aa287a94f3608bb40c06d442aafd0c2e807a4" -dependencies = [ - "alloy-primitives", - "alloy-rpc-types-engine", - "alloy-serde", - "derive_more", - "ethereum_ssz", - "op-alloy-protocol", - "serde", - "snap", -] - [[package]] name = "opaque-debug" version = "0.3.1" @@ -4478,9 +4396,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.12" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" +checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590" dependencies = [ "arbitrary", "arrayvec", @@ -4489,19 +4407,20 @@ dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec-derive", + "rustversion", "serde", ] [[package]] name = "parity-scale-codec-derive" -version = "3.6.12" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" +checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -4556,7 +4475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.69", "ucd-trie", ] @@ -4600,7 +4519,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -4629,7 +4548,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -4689,9 +4608,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "powerfmt" @@ -4757,14 +4676,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -4855,7 +4774,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -4890,9 +4809,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" dependencies = [ "bytes", "pin-project-lite", @@ -4901,33 +4820,36 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "socket2", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", + "getrandom", "rand", "ring", "rustc-hash 2.0.0", "rustls", + "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.3", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780" +checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" dependencies = [ "cfg_aliases", "libc", @@ -5001,7 +4923,7 @@ dependencies = [ "bitflags 2.6.0", "cassowary", "compact_str", - "crossterm 0.28.1", + "crossterm", "instability", "itertools 0.13.0", "lru", @@ -5010,7 +4932,7 @@ dependencies = [ "strum_macros", "unicode-segmentation", "unicode-truncate", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -5065,7 +4987,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5076,7 +4998,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -5091,9 +5013,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -5152,7 +5074,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tokio", "tokio-rustls", "tower-service", @@ -5176,8 +5098,8 @@ dependencies = [ [[package]] name = "reth" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5224,6 +5146,7 @@ dependencies = [ "reth-payload-primitives", "reth-payload-validator", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-prune", "reth-revm", @@ -5246,41 +5169,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "reth-auto-seal-consensus" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" -dependencies = [ - "alloy-eips", - "alloy-primitives", - "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-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.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5293,9 +5185,12 @@ 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", "reth-transaction-pool", "revm", @@ -5305,9 +5200,10 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", @@ -5322,6 +5218,7 @@ dependencies = [ "reth-network-p2p", "reth-node-types", "reth-payload-builder", + "reth-payload-builder-primitives", "reth-payload-primitives", "reth-payload-validator", "reth-primitives", @@ -5332,7 +5229,7 @@ dependencies = [ "reth-tasks", "reth-tokio-util", "schnellru", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -5340,8 +5237,8 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5373,21 +5270,22 @@ dependencies = [ [[package]] name = "reth-blockchain-tree-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-eips", "alloy-primitives", "reth-consensus", "reth-execution-errors", "reth-primitives", "reth-storage-errors", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "reth-chain-state" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5415,8 +5313,8 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5435,8 +5333,8 @@ dependencies = [ [[package]] name = "reth-cli" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-genesis", "clap", @@ -5449,17 +5347,18 @@ dependencies = [ [[package]] name = "reth-cli-commands" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "ahash", + "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", "backon", "clap", "comfy-table", - "crossterm 0.28.1", + "crossterm", "eyre", "fdlimit", "futures", @@ -5508,8 +5407,8 @@ dependencies = [ [[package]] name = "reth-cli-runner" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "reth-tasks", "tokio", @@ -5518,8 +5417,8 @@ dependencies = [ [[package]] name = "reth-cli-util" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5530,14 +5429,14 @@ dependencies = [ "reth-fs-util", "secp256k1", "serde", - "thiserror", + "thiserror 1.0.69", "tikv-jemallocator", ] [[package]] name = "reth-codecs" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5555,19 +5454,19 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] name = "reth-config" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "eyre", "humantime-serde", @@ -5580,20 +5479,22 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "auto_impl", "derive_more", "reth-primitives", + "reth-primitives-traits", ] [[package]] name = "reth-consensus-common" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5606,15 +5507,15 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-provider", - "alloy-rpc-types", "alloy-rpc-types-engine", + "alloy-rpc-types-eth", "auto_impl", "eyre", "futures", @@ -5630,9 +5531,10 @@ dependencies = [ [[package]] name = "reth-db" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-primitives", "bytes", "derive_more", @@ -5658,14 +5560,15 @@ dependencies = [ "strum", "sysinfo", "tempfile", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "reth-db-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-genesis", "alloy-primitives", "arbitrary", @@ -5688,8 +5591,8 @@ dependencies = [ [[package]] name = "reth-db-common" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -5710,29 +5613,30 @@ dependencies = [ "reth-trie-db", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tracing", ] [[package]] name = "reth-db-models" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-eips", "alloy-primitives", "arbitrary", "bytes", "modular-bitfield", "proptest", "reth-codecs", - "reth-primitives", + "reth-primitives-traits", "serde", ] [[package]] name = "reth-discv4" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5749,7 +5653,7 @@ dependencies = [ "schnellru", "secp256k1", "serde", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -5757,8 +5661,8 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5774,15 +5678,15 @@ dependencies = [ "reth-metrics", "reth-network-peers", "secp256k1", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "reth-dns-discovery" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "data-encoding", @@ -5796,7 +5700,7 @@ dependencies = [ "secp256k1", "serde", "serde_with", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -5805,9 +5709,10 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", @@ -5823,9 +5728,10 @@ dependencies = [ "reth-network-p2p", "reth-network-peers", "reth-primitives", + "reth-primitives-traits", "reth-storage-api", "reth-tasks", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -5834,8 +5740,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "aes", "alloy-primitives", @@ -5855,7 +5761,7 @@ dependencies = [ "secp256k1", "sha2 0.10.8", "sha3", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -5865,8 +5771,8 @@ dependencies = [ [[package]] name = "reth-engine-local" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -5881,6 +5787,7 @@ dependencies = [ "reth-ethereum-engine-primitives", "reth-evm", "reth-payload-builder", + "reth-payload-builder-primitives", "reth-payload-primitives", "reth-payload-validator", "reth-provider", @@ -5895,27 +5802,34 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", + "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.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "futures", "pin-project", "reth-beacon-consensus", "reth-chainspec", "reth-consensus", + "reth-engine-primitives", "reth-engine-tree", "reth-evm", "reth-network-p2p", @@ -5926,14 +5840,15 @@ dependencies = [ "reth-prune", "reth-stages-api", "reth-tasks", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "reth-engine-tree" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", @@ -5951,6 +5866,7 @@ dependencies = [ "reth-metrics", "reth-network-p2p", "reth-payload-builder", + "reth-payload-builder-primitives", "reth-payload-primitives", "reth-payload-validator", "reth-primitives", @@ -5961,15 +5877,16 @@ dependencies = [ "reth-tasks", "reth-trie", "reth-trie-parallel", - "thiserror", + "revm-primitives", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "reth-engine-util" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5979,7 +5896,6 @@ dependencies = [ "futures", "itertools 0.13.0", "pin-project", - "reth-beacon-consensus", "reth-engine-primitives", "reth-errors", "reth-ethereum-forks", @@ -6001,38 +5917,39 @@ dependencies = [ [[package]] name = "reth-errors" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "reth-blockchain-tree-api", "reth-consensus", "reth-execution-errors", "reth-fs-util", "reth-storage-errors", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "reth-eth-wire" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-chains", "alloy-primitives", "alloy-rlp", "bytes", "derive_more", "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", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -6041,10 +5958,11 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-chains", + "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", @@ -6053,14 +5971,15 @@ dependencies = [ "reth-chainspec", "reth-codecs-derive", "reth-primitives", + "reth-primitives-traits", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "reth-ethereum-cli" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "eyre", "reth-chainspec", @@ -6069,8 +5988,8 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6079,13 +5998,14 @@ dependencies = [ "reth-consensus", "reth-consensus-common", "reth-primitives", + "reth-primitives-traits", "tracing", ] [[package]] name = "reth-ethereum-engine-primitives" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6103,8 +6023,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6123,8 +6043,8 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6137,6 +6057,7 @@ dependencies = [ "reth-evm-ethereum", "reth-execution-types", "reth-payload-builder", + "reth-payload-builder-primitives", "reth-payload-primitives", "reth-primitives", "reth-provider", @@ -6144,14 +6065,13 @@ dependencies = [ "reth-transaction-pool", "reth-trie", "revm", - "revm-primitives", "tracing", ] [[package]] name = "reth-etl" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "rayon", "reth-db-api", @@ -6160,9 +6080,10 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "auto_impl", @@ -6186,8 +6107,8 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6205,8 +6126,8 @@ dependencies = [ [[package]] name = "reth-execution-errors" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6221,13 +6142,14 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives", "reth-execution-errors", "reth-primitives", + "reth-primitives-traits", "reth-trie", "revm", "serde", @@ -6236,8 +6158,8 @@ dependencies = [ [[package]] name = "reth-exex" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6255,7 +6177,6 @@ dependencies = [ "reth-metrics", "reth-node-api", "reth-node-core", - "reth-payload-builder", "reth-primitives", "reth-primitives-traits", "reth-provider", @@ -6272,8 +6193,8 @@ dependencies = [ [[package]] name = "reth-exex-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6285,19 +6206,20 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "reth-invalid-block-hooks" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-debug", @@ -6320,8 +6242,8 @@ dependencies = [ [[package]] name = "reth-ipc" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "async-trait", "bytes", @@ -6331,7 +6253,7 @@ dependencies = [ "jsonrpsee", "pin-project", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -6341,8 +6263,8 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -6352,14 +6274,14 @@ dependencies = [ "parking_lot", "reth-mdbx-sys", "smallvec", - "thiserror", + "thiserror 1.0.69", "tracing", ] [[package]] name = "reth-mdbx-sys" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "bindgen", "cc", @@ -6367,8 +6289,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "futures", "metrics", @@ -6379,31 +6301,32 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", ] [[package]] name = "reth-net-nat" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "futures-util", "if-addrs", "reqwest", "serde_with", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "reth-network" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", @@ -6425,6 +6348,7 @@ dependencies = [ "reth-dns-discovery", "reth-ecies", "reth-eth-wire", + "reth-eth-wire-types", "reth-fs-util", "reth-metrics", "reth-net-banlist", @@ -6433,6 +6357,7 @@ dependencies = [ "reth-network-peers", "reth-network-types", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-storage-api", "reth-tasks", @@ -6443,7 +6368,7 @@ dependencies = [ "secp256k1", "serde", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -6452,8 +6377,8 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "alloy-rpc-types-admin", @@ -6468,16 +6393,17 @@ dependencies = [ "reth-network-types", "reth-tokio-util", "serde", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", ] [[package]] name = "reth-network-p2p" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "auto_impl", @@ -6489,6 +6415,7 @@ dependencies = [ "reth-network-peers", "reth-network-types", "reth-primitives", + "reth-primitives-traits", "reth-storage-errors", "tokio", "tracing", @@ -6496,23 +6423,23 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "alloy-rlp", "enr", "secp256k1", "serde_with", - "thiserror", + "thiserror 1.0.69", "tokio", "url", ] [[package]] name = "reth-network-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "humantime-serde", "reth-ethereum-forks", @@ -6525,8 +6452,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "anyhow", "bincode", @@ -6535,16 +6462,17 @@ dependencies = [ "memmap2", "reth-fs-util", "serde", - "thiserror", + "thiserror 1.0.69", "tracing", "zstd", ] [[package]] name = "reth-node-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-rpc-types-engine", "eyre", "reth-beacon-consensus", @@ -6554,9 +6482,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", @@ -6564,9 +6491,10 @@ dependencies = [ [[package]] name = "reth-node-builder" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-primitives", "alloy-rpc-types", "aquamarine", @@ -6575,7 +6503,6 @@ dependencies = [ "futures", "jsonrpsee", "rayon", - "reth-auto-seal-consensus", "reth-beacon-consensus", "reth-blockchain-tree", "reth-chain-state", @@ -6603,7 +6530,6 @@ dependencies = [ "reth-node-events", "reth-node-metrics", "reth-payload-builder", - "reth-payload-primitives", "reth-payload-validator", "reth-primitives", "reth-provider", @@ -6620,6 +6546,7 @@ dependencies = [ "reth-tokio-util", "reth-tracing", "reth-transaction-pool", + "revm-primitives", "secp256k1", "tokio", "tokio-stream", @@ -6628,8 +6555,8 @@ dependencies = [ [[package]] name = "reth-node-core" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6646,7 +6573,7 @@ dependencies = [ "reth-chainspec", "reth-cli-util", "reth-config", - "reth-consensus-common", + "reth-consensus", "reth-db", "reth-discv4", "reth-discv5", @@ -6655,6 +6582,7 @@ dependencies = [ "reth-network-p2p", "reth-network-peers", "reth-primitives", + "reth-primitives-traits", "reth-prune-types", "reth-rpc-eth-types", "reth-rpc-server-types", @@ -6668,7 +6596,7 @@ dependencies = [ "serde", "shellexpand", "strum", - "thiserror", + "thiserror 1.0.69", "toml", "tracing", "vergen", @@ -6676,11 +6604,11 @@ dependencies = [ [[package]] name = "reth-node-ethereum" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "eyre", - "reth-auto-seal-consensus", "reth-basic-payload-builder", "reth-beacon-consensus", "reth-chainspec", @@ -6705,8 +6633,8 @@ dependencies = [ [[package]] name = "reth-node-events" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6716,21 +6644,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.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "eyre", "http", @@ -6742,6 +6670,7 @@ dependencies = [ "procfs 0.16.0", "reth-db-api", "reth-metrics", + "reth-primitives-traits", "reth-provider", "reth-tasks", "tikv-jemalloc-ctl", @@ -6753,32 +6682,62 @@ dependencies = [ [[package]] name = "reth-node-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "reth-chainspec", "reth-db-api", "reth-engine-primitives", - "reth-primitives", "reth-primitives-traits", "reth-trie-db", ] [[package]] -name = "reth-payload-builder" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +name = "reth-optimism-primitives" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", + "alloy-eips", "alloy-primitives", + "alloy-rlp", + "bytes", + "derive_more", + "op-alloy-consensus", + "reth-codecs", + "reth-primitives", + "reth-primitives-traits", + "serde", +] + +[[package]] +name = "reth-payload-builder" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#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?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +dependencies = [ + "alloy-rpc-types-engine", + "async-trait", + "pin-project", "reth-payload-primitives", - "reth-primitives", - "reth-provider", "tokio", "tokio-stream", "tracing", @@ -6786,31 +6745,36 @@ dependencies = [ [[package]] name = "reth-payload-primitives" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives", - "alloy-rpc-types", - "async-trait", - "op-alloy-rpc-types-engine", - "pin-project", + "alloy-rpc-types-engine", "reth-chain-state", "reth-chainspec", "reth-errors", "reth-primitives", - "reth-transaction-pool", + "revm-primitives", "serde", - "thiserror", + "thiserror 1.0.69", "tokio", - "tokio-stream", - "tracing", +] + +[[package]] +name = "reth-payload-util" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "reth-primitives", ] [[package]] name = "reth-payload-validator" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-rpc-types", "reth-chainspec", @@ -6820,15 +6784,17 @@ dependencies = [ [[package]] name = "reth-primitives" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", + "alloy-network", "alloy-primitives", "alloy-rlp", "alloy-rpc-types", "alloy-serde", + "alloy-trie", "arbitrary", "bytes", "c-kzg", @@ -6844,7 +6810,6 @@ dependencies = [ "reth-ethereum-forks", "reth-primitives-traits", "reth-static-file-types", - "reth-trie-common", "revm-primitives", "secp256k1", "serde", @@ -6854,8 +6819,8 @@ dependencies = [ [[package]] name = "reth-primitives-traits" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6863,6 +6828,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "arbitrary", + "auto_impl", "byteorder", "bytes", "derive_more", @@ -6878,8 +6844,8 @@ dependencies = [ [[package]] name = "reth-provider" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6907,6 +6873,7 @@ dependencies = [ "reth-network-p2p", "reth-nippy-jar", "reth-node-types", + "reth-optimism-primitives", "reth-primitives", "reth-prune-types", "reth-stages-types", @@ -6922,8 +6889,8 @@ dependencies = [ [[package]] name = "reth-prune" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "itertools 0.13.0", @@ -6941,15 +6908,15 @@ dependencies = [ "reth-static-file-types", "reth-tokio-util", "rustc-hash 2.0.0", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "reth-prune-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "arbitrary", @@ -6958,18 +6925,19 @@ dependencies = [ "modular-bitfield", "reth-codecs", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "reth-revm" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives", "reth-execution-errors", "reth-primitives", + "reth-primitives-traits", "reth-prune-types", "reth-storage-api", "reth-storage-errors", @@ -6979,8 +6947,8 @@ dependencies = [ [[package]] name = "reth-rpc" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -6993,6 +6961,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", @@ -7038,7 +7007,7 @@ dependencies = [ "revm-primitives", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tower 0.4.13", @@ -7048,8 +7017,8 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-json-rpc", @@ -7068,20 +7037,15 @@ dependencies = [ "jsonrpsee", "reth-engine-primitives", "reth-network-peers", - "reth-primitives", "reth-rpc-eth-api", - "serde", - "serde_with", ] [[package]] name = "reth-rpc-builder" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ - "alloy-network", - "alloy-rpc-types", - "alloy-serde", + "alloy-consensus", "http", "jsonrpsee", "metrics", @@ -7094,7 +7058,6 @@ dependencies = [ "reth-metrics", "reth-network-api", "reth-node-core", - "reth-primitives", "reth-provider", "reth-rpc", "reth-rpc-api", @@ -7105,7 +7068,7 @@ dependencies = [ "reth-tasks", "reth-transaction-pool", "serde", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util", "tower 0.4.13", @@ -7115,8 +7078,8 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7125,12 +7088,14 @@ dependencies = [ "jsonrpsee-core", "jsonrpsee-types", "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", @@ -7139,15 +7104,15 @@ dependencies = [ "reth-tasks", "reth-transaction-pool", "serde", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "reth-rpc-eth-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -7155,9 +7120,9 @@ dependencies = [ "alloy-json-rpc", "alloy-network", "alloy-primitives", - "alloy-rpc-types", "alloy-rpc-types-eth", "alloy-rpc-types-mev", + "alloy-serde", "async-trait", "auto_impl", "dyn-clone", @@ -7189,15 +7154,13 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", - "alloy-rpc-types", "alloy-rpc-types-eth", - "alloy-serde", "alloy-sol-types", "derive_more", "futures", @@ -7225,7 +7188,7 @@ dependencies = [ "revm-primitives", "schnellru", "serde", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -7233,46 +7196,47 @@ dependencies = [ [[package]] name = "reth-rpc-layer" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-rpc-types-engine", "http", "jsonrpsee-http-client", "pin-project", "tower 0.4.13", + "tower-http", "tracing", ] [[package]] name = "reth-rpc-server-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "jsonrpsee-core", "jsonrpsee-types", "reth-errors", "reth-network-api", - "reth-primitives", "serde", "strum", ] [[package]] name = "reth-rpc-types-compat" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types", "alloy-rpc-types-engine", "alloy-rpc-types-eth", "alloy-serde", + "jsonrpsee-types", "reth-primitives", "reth-trie-common", "serde", @@ -7280,9 +7244,10 @@ dependencies = [ [[package]] name = "reth-stages" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ + "alloy-consensus", "alloy-primitives", "bincode", "futures-util", @@ -7309,15 +7274,15 @@ dependencies = [ "reth-storage-errors", "reth-trie", "reth-trie-db", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "reth-stages-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "aquamarine", @@ -7335,15 +7300,15 @@ dependencies = [ "reth-static-file", "reth-static-file-types", "reth-tokio-util", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "reth-stages-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "arbitrary", @@ -7356,8 +7321,8 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "parking_lot", @@ -7375,8 +7340,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "clap", @@ -7387,14 +7352,16 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", + "alloy-rpc-types-engine", "auto_impl", "reth-chainspec", + "reth-db", "reth-db-api", "reth-db-models", "reth-execution-types", @@ -7407,8 +7374,8 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7420,8 +7387,8 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "auto_impl", "dyn-clone", @@ -7430,7 +7397,7 @@ dependencies = [ "pin-project", "rayon", "reth-metrics", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "tracing-futures", @@ -7438,8 +7405,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "tokio", "tokio-stream", @@ -7448,8 +7415,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "clap", "eyre", @@ -7463,8 +7430,8 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7483,7 +7450,9 @@ dependencies = [ "reth-execution-types", "reth-fs-util", "reth-metrics", + "reth-payload-util", "reth-primitives", + "reth-primitives-traits", "reth-storage-api", "reth-tasks", "revm", @@ -7491,7 +7460,7 @@ dependencies = [ "schnellru", "serde", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -7499,12 +7468,13 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-rlp", + "alloy-trie", "auto_impl", "itertools 0.13.0", "metrics", @@ -7524,8 +7494,8 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -7547,8 +7517,8 @@ dependencies = [ [[package]] name = "reth-trie-db" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7570,8 +7540,8 @@ dependencies = [ [[package]] name = "reth-trie-parallel" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7585,8 +7555,9 @@ dependencies = [ "reth-primitives", "reth-provider", "reth-trie", + "reth-trie-common", "reth-trie-db", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -7610,7 +7581,6 @@ dependencies = [ "libc", "rayon", "reth", - "reth-auto-seal-consensus", "reth-basic-payload-builder", "reth-chain-state", "reth-chainspec", @@ -7641,7 +7611,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 1.0.69", "thiserror-no-std", "tikv-jemalloc-ctl", "tikv-jemallocator", @@ -7651,9 +7621,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", @@ -7666,9 +7636,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", "alloy-rpc-types-eth", @@ -7680,14 +7650,14 @@ dependencies = [ "colorchoice", "revm", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[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", @@ -7695,9 +7665,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", @@ -7714,9 +7684,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", @@ -7815,12 +7785,13 @@ dependencies = [ [[package]] name = "roaring" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1" +checksum = "f81dc953b2244ddd5e7860cb0bb2a790494b898ef321d4aff8e260efab60cc88" dependencies = [ "bytemuck", "byteorder", + "serde", ] [[package]] @@ -7916,9 +7887,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.38" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -7929,9 +7900,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.16" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "log", "once_cell", @@ -7969,6 +7940,9 @@ name = "rustls-pki-types" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +dependencies = [ + "web-time", +] [[package]] name = "rustls-platform-verifier" @@ -8049,9 +8023,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -8123,9 +8097,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -8151,9 +8125,9 @@ dependencies = [ [[package]] name = "semver-parser" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2" dependencies = [ "pest", ] @@ -8172,29 +8146,29 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "indexmap 2.6.0", "itoa", @@ -8203,17 +8177,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - [[package]] name = "serde_spanned" version = "0.6.8" @@ -8262,7 +8225,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -8413,7 +8376,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -8485,9 +8448,6 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] name = "spki" @@ -8542,7 +8502,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -8577,9 +8537,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.86" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -8588,14 +8548,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.10" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16320d4a2021ba1a32470b3759676114a918885e9800e68ad60f2c67969fba62" +checksum = "6bdaa7b9e815582ba343a20c66627437cf45f1c6fba7f69772cbfd1358c7e197" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -8606,9 +8566,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] @@ -8621,7 +8581,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -8645,9 +8605,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", @@ -8664,22 +8624,42 @@ checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" [[package]] name = "thiserror" -version = "1.0.66" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" dependencies = [ - "thiserror-impl", + "thiserror-impl 2.0.3", ] [[package]] name = "thiserror-impl" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] @@ -8822,9 +8802,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -8846,7 +8826,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -8974,12 +8954,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", @@ -8996,7 +8976,7 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tower 0.4.13", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", @@ -9017,9 +8997,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -9034,27 +9014,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", - "thiserror", + "thiserror 1.0.69", "time", "tracing-subscriber", ] [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -9163,7 +9143,7 @@ dependencies = [ "once_cell", "rand", "smallvec", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tokio", "tracing", @@ -9186,7 +9166,7 @@ dependencies = [ "resolv-conf", "serde", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "trust-dns-proto", @@ -9214,7 +9194,7 @@ dependencies = [ "rustls", "rustls-pki-types", "sha1", - "thiserror", + "thiserror 1.0.69", "utf-8", ] @@ -9274,9 +9254,9 @@ checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -9301,7 +9281,7 @@ checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" dependencies = [ "itertools 0.13.0", "unicode-segmentation", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -9310,6 +9290,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "unicode-xid" version = "0.2.6" @@ -9340,12 +9326,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna 1.0.3", "percent-encoding", ] @@ -9416,7 +9402,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -9475,7 +9461,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", "wasm-bindgen-shared", ] @@ -9509,7 +9495,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -9522,9 +9508,9 @@ checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[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", @@ -9544,11 +9530,21 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "webpki-roots" -version = "0.26.6" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -9652,7 +9648,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -9663,7 +9659,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -9674,7 +9670,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -9685,7 +9681,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -9919,7 +9915,7 @@ dependencies = [ "pharos", "rustc_version 0.4.1", "send_wrapper 0.6.0", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -9942,9 +9938,9 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -9954,13 +9950,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", "synstructure", ] @@ -9982,27 +9978,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", "synstructure", ] @@ -10023,7 +10019,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] @@ -10045,7 +10041,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.89", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 908b0e8..dcc03fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,43 +12,39 @@ name = "reth" path = "src/main.rs" [dependencies] -reth = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-chain-state = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-auto-seal-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-prune-types = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9", features = ["test-utils"] } -reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-stages = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-stages-api = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-stages-types = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" } -eyre = "0.6.12" +reth = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-chain-state = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +# reth-auto-seal-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-prune-types = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40", features = ["test-utils"] } +reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-stages = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-stages-api = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-stages-types = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +eyre = "0.6" clap = { version = "4.5.6", features = ["derive"] } # revm -revm = { version = "17.0.0", features = [ - "std", - "secp256k1", - "blst", -], default-features = false } -revm-inspectors = "0.10.0" -revm-primitives = { version = "13.0.0", features = [ +revm = { version = "18.0.0", features = ["std"], default-features = false } +revm-inspectors = "0.11.0" +revm-primitives = { version = "14.0.0", features = [ "std", ], default-features = false } @@ -62,16 +58,16 @@ thiserror-no-std = { version = "2.0.2", default-features = false } # eth alloy-chains = "0.1.32" -alloy-dyn-abi = "0.8.0" -alloy-primitives = { version = "0.8.9", default-features = false } +alloy-dyn-abi = "0.8.11" +alloy-primitives = { version = "0.8.11", default-features = false } alloy-rlp = "0.3.4" -alloy-sol-types = "0.8.0" +alloy-sol-types = "0.8.11" alloy-trie = { version = "0.7", default-features = false } -alloy-consensus = { version = "0.5.4", default-features = false } -alloy-eips = { version = "0.5.4", default-features = false } +alloy-consensus = { version = "0.6.4", default-features = false } +alloy-eips = { version = "0.6.4", default-features = false } alloy-sol-macro = "0.8.9" -alloy-serde = { version = "0.5.4", default-features = false } +alloy-serde = { version = "0.6.4", default-features = false } rayon = "1.7" tracing = "0.1.0" diff --git a/src/consensus.rs b/src/consensus.rs index b55509b..bd37231 100644 --- a/src/consensus.rs +++ b/src/consensus.rs @@ -1,6 +1,15 @@ -use reth::primitives::{BlockWithSenders, Header, SealedBlock, SealedHeader}; -use reth_chainspec::ChainSpec; +use alloy_consensus::Header; +use reth::{ + consensus_common::validation::{ + validate_against_parent_4844, validate_against_parent_eip1559_base_fee, + validate_against_parent_hash_number, validate_body_against_header, validate_cancun_gas, + validate_header_base_fee, validate_header_gas, validate_shanghai_withdrawals, + }, + primitives::{BlockBody, BlockWithSenders, SealedBlock, SealedHeader}, +}; +use reth_chainspec::{ChainSpec, EthereumHardforks}; use reth_consensus::{Consensus, ConsensusError, PostExecutionInput}; +use reth_primitives::GotExpected; use revm_primitives::U256; use std::sync::Arc; @@ -18,17 +27,27 @@ impl GnosisBeaconConsensus { // `validate_header`, `validate_header_against_parent`, `validate_header_with_total_difficulty`, `validate_block_pre_execution`, `validate_block_post_execution` impl Consensus for GnosisBeaconConsensus { - fn validate_header(&self, _header: &SealedHeader) -> Result<(), ConsensusError> { - // TODO - Ok(()) + fn validate_header(&self, header: &SealedHeader) -> Result<(), ConsensusError> { + validate_header_gas(header)?; + validate_header_base_fee(header, &self.chain_spec) } fn validate_header_against_parent( &self, - _header: &SealedHeader, - _parent: &SealedHeader, + header: &SealedHeader, + parent: &SealedHeader, ) -> Result<(), ConsensusError> { - // TODO + validate_against_parent_hash_number(header, parent)?; + validate_against_parent_eip1559_base_fee(header, parent, &self.chain_spec)?; + + // ensure that the blob gas fields for this block + if self + .chain_spec + .is_cancun_active_at_timestamp(header.timestamp) + { + validate_against_parent_4844(header, parent)?; + } + Ok(()) } @@ -41,8 +60,52 @@ impl Consensus for GnosisBeaconConsensus { Ok(()) } - fn validate_block_pre_execution(&self, _block: &SealedBlock) -> Result<(), ConsensusError> { - // TODO + fn validate_body_against_header( + &self, + body: &BlockBody, + header: &SealedHeader, + ) -> Result<(), ConsensusError> { + validate_body_against_header(body, header) + } + + // fn validate_block_pre_execution(&self, _block: &SealedBlock) -> Result<(), ConsensusError> { + // // TODO + // Ok(()) + // } + + fn validate_block_pre_execution(&self, block: &SealedBlock) -> Result<(), ConsensusError> { + // Check ommers hash + let ommers_hash = reth_primitives::proofs::calculate_ommers_root(&block.body.ommers); + if block.header.ommers_hash != ommers_hash { + return Err(ConsensusError::BodyOmmersHashDiff( + GotExpected { + got: ommers_hash, + expected: block.header.ommers_hash, + } + .into(), + )); + } + + // Check transaction root + if let Err(error) = block.ensure_transaction_root_valid() { + return Err(ConsensusError::BodyTransactionRootDiff(error.into())); + } + + // EIP-4895: Beacon chain push withdrawals as operations + if self + .chain_spec + .is_shanghai_active_at_timestamp(block.timestamp) + { + validate_shanghai_withdrawals(block)?; + } + + if self + .chain_spec + .is_cancun_active_at_timestamp(block.timestamp) + { + validate_cancun_gas(block)?; + } + Ok(()) } diff --git a/src/evm_config.rs b/src/evm_config.rs index 89962d2..6552720 100644 --- a/src/evm_config.rs +++ b/src/evm_config.rs @@ -1,20 +1,17 @@ +use alloy_consensus::Header; use alloy_primitives::{Address, U256}; use reth::revm::{inspector_handle_register, Database, GetInspector}; use reth::revm::{Evm, EvmBuilder}; use reth_chainspec::ChainSpec; use reth_evm::{ConfigureEvm, ConfigureEvmEnv}; use reth_evm_ethereum::{revm_spec, revm_spec_by_timestamp_after_merge}; -use reth_primitives::{ - revm_primitives::{AnalysisKind, CfgEnvWithHandlerCfg, TxEnv}, - transaction::FillTxEnv, - Head, Header, TransactionSigned, -}; +use reth_primitives::{transaction::FillTxEnv, Head, TransactionSigned}; use revm::{ handler::mainnet::reward_beneficiary as reward_beneficiary_mainnet, interpreter::Gas, Context, }; use revm_primitives::{ - spec_to_generic, BlobExcessGasAndPrice, BlockEnv, Bytes, CfgEnv, EVMError, Env, HandlerCfg, - Spec, SpecId, TxKind, + spec_to_generic, AnalysisKind, BlobExcessGasAndPrice, BlockEnv, Bytes, CfgEnv, + CfgEnvWithHandlerCfg, EVMError, Env, HandlerCfg, Spec, SpecId, TxEnv, TxKind, }; use std::{convert::Infallible, sync::Arc}; diff --git a/src/execute.rs b/src/execute.rs index dad0d03..f443a74 100644 --- a/src/execute.rs +++ b/src/execute.rs @@ -3,7 +3,7 @@ use crate::evm_config::GnosisEvmConfig; use crate::gnosis::apply_post_block_system_calls; use alloc::{boxed::Box, sync::Arc}; -use alloy_consensus::Transaction as _; +use alloy_consensus::{Header, Transaction as _}; use alloy_eips::eip7685::Requests; use alloy_primitives::Address; use core::fmt::Display; @@ -19,7 +19,7 @@ use reth_evm::{ }; use reth_evm_ethereum::eip6110::parse_deposits_from_receipts; use reth_node_ethereum::BasicBlockExecutorProvider; -use reth_primitives::{BlockWithSenders, Header, Receipt}; +use reth_primitives::{BlockWithSenders, Receipt}; use revm::State; use revm_primitives::{ db::{Database, DatabaseCommit}, @@ -101,7 +101,7 @@ where EvmConfig: Clone, { pub fn new(state: State, chain_spec: Arc, evm_config: EvmConfig) -> Self { - let system_caller = SystemCaller::new(evm_config.clone(), (*chain_spec).clone()); + let system_caller = SystemCaller::new(evm_config.clone(), chain_spec.clone()); let block_rewards_contract = chain_spec .genesis() .config diff --git a/src/gnosis.rs b/src/gnosis.rs index c246c7b..d896eb0 100644 --- a/src/gnosis.rs +++ b/src/gnosis.rs @@ -1,22 +1,19 @@ use std::collections::HashMap; use crate::errors::GnosisBlockExecutionError; +use alloy_eips::eip4895::{Withdrawal, Withdrawals}; use alloy_primitives::{address, Address, U256}; use alloy_sol_macro::sol; use alloy_sol_types::SolCall; -use reth::{ - primitives::Withdrawal, - revm::{ - interpreter::Host, - primitives::{ExecutionResult, Output, ResultAndState}, - Database, DatabaseCommit, Evm, State, - }, +use reth::revm::{ + interpreter::Host, + primitives::{ExecutionResult, Output, ResultAndState}, + Database, DatabaseCommit, Evm, State, }; use reth_chainspec::ChainSpec; use reth_chainspec::EthereumHardforks; use reth_errors::BlockValidationError; use reth_evm::{execute::BlockExecutionError, ConfigureEvm}; -use reth_primitives::Withdrawals; use reth_provider::ProviderError; use revm_primitives::{ Account, AccountInfo, AccountStatus, BlockEnv, CfgEnvWithHandlerCfg, EnvWithHandlerCfg, diff --git a/src/lib.rs b/src/lib.rs index 2bf97ed..3283bd3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -180,13 +180,7 @@ where type Consensus = Arc; async fn build_consensus(self, ctx: &BuilderContext) -> eyre::Result { - if ctx.is_dev() { - Ok(Arc::new(reth_auto_seal_consensus::AutoSealConsensus::new( - ctx.chain_spec(), - ))) - } else { - Ok(Arc::new(GnosisBeaconConsensus::new(ctx.chain_spec()))) - } + Ok(Arc::new(GnosisBeaconConsensus::new(ctx.chain_spec()))) } } diff --git a/src/main.rs b/src/main.rs index 490e160..f3eda8f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -66,3 +66,5 @@ fn main() { } } } + +// ./target/debug/reth --chain ./scripts/chiado_genesis_alloc.json init-state ./state_at_26478650.jsonl --without-evm --header ./alt_header.rlp --total-difficulty 8626000110427540000000000000000000000000000000 --header-hash 3eaf85f384900ee9cf4e23f8e7584ef7f3118bcb960d3f56c62cff5ca95166f3 diff --git a/src/payload_builder.rs b/src/payload_builder.rs index 476c110..66cf1f7 100644 --- a/src/payload_builder.rs +++ b/src/payload_builder.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use alloy_consensus::EMPTY_OMMER_ROOT_HASH; +use alloy_consensus::{Header, EMPTY_OMMER_ROOT_HASH}; use alloy_eips::{eip4844::MAX_DATA_GAS_PER_BLOCK, eip7685::Requests, merge::BEACON_NONCE}; use eyre::eyre; use reth::{ @@ -12,7 +12,7 @@ use reth::{ }, primitives::{ proofs::{self}, - Block, Header, Receipt, + Block, Receipt, }, revm::database::StateProviderDatabase, transaction_pool::{noop::NoopTransactionPool, BestTransactionsAttributes, TransactionPool}, @@ -508,13 +508,15 @@ where // only determine cancun fields when active if chain_spec.is_cancun_active_at_timestamp(attributes.timestamp) { // grab the blob sidecars from the executed txs - blob_sidecars = pool.get_all_blobs_exact( - executed_txs - .iter() - .filter(|tx| tx.is_eip4844()) - .map(|tx| tx.hash) - .collect(), - )?; + blob_sidecars = pool + .get_all_blobs_exact( + executed_txs + .iter() + .filter(|tx| tx.is_eip4844()) + .map(|tx| tx.hash) + .collect(), + ) + .map_err(PayloadBuilderError::other)?; excess_blob_gas = if chain_spec.is_cancun_active_at_timestamp(parent_header.timestamp) { let parent_excess_blob_gas = parent_header.excess_blob_gas.unwrap_or_default(); @@ -566,12 +568,12 @@ where }, }; - let sealed_block = block.seal_slow(); + let sealed_block = Arc::new(block.seal_slow()); debug!(target: "payload_builder", ?sealed_block, "sealed built block"); // create the executed block data let executed = ExecutedBlock { - block: Arc::new(sealed_block.clone()), + block: sealed_block.clone(), senders: Arc::new(executed_senders), execution_output: Arc::new(execution_outcome), hashed_state: Arc::new(hashed_state), From 4ffca9f8292648168a2e4880c70269dc2edd1d8a Mon Sep 17 00:00:00 2001 From: debjit Date: Tue, 3 Dec 2024 23:26:07 +0530 Subject: [PATCH 2/4] removed consensus and upgraded to newer --- Cargo.lock | 896 ++++++++++++++++++++++------------------- Cargo.toml | 68 ++-- src/evm_config.rs | 4 +- src/execute.rs | 28 +- src/lib.rs | 44 +- src/payload_builder.rs | 163 +++++--- 6 files changed, 692 insertions(+), 511 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5fbcb5e..b6cecb1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,9 +91,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy-chains" @@ -112,14 +112,15 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae09ffd7c29062431dd86061deefe4e3c6f07fa0d674930095f8dcedb0baf02c" +checksum = "73dd0ab7003dfa3efd252e423873cd3bc241d1456147e752f995cc8aabd1d1f6" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", "alloy-serde", + "alloy-trie", "arbitrary", "auto_impl", "c-kzg", @@ -129,11 +130,25 @@ dependencies = [ "serde_with", ] +[[package]] +name = "alloy-consensus-any" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08234c0eece0e08602db5095a16dc942cad91967cccfcfc2c6a42c25563964f" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "serde", +] + [[package]] name = "alloy-dyn-abi" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cf633ae9a1f0c82fdb9e559ed2be1c8e415c3e48fc47e1feaf32c6078ec0cdd" +checksum = "80759b3f57b3b20fa7cd8fef6479930fc95461b58ff8adea6e87e618449c8a1d" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -178,9 +193,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6aa3961694b30ba53d41006131a2fca3bdab22e4c344e46db2c639e7c2dfdd" +checksum = "50c242de43a1869bcb2fbce3b377130959d10dfd562b87ac7aa2f04d98baac51" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -197,9 +212,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53f7877ded3921d18a0a9556d55bedf84535567198c9edab2aa23106da91855" +checksum = "9dd39b72f860cb0c542fac925f91d1939c2b14a0970b39d0ae304b5b7574a0ac" dependencies = [ "alloy-primitives", "alloy-serde", @@ -208,9 +223,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a500037938085feed8a20dbfc8fce58c599db68c948cfae711147175dee392c" +checksum = "ac4b22b3e51cac09fd2adfcc73b55f447b4df669f983c13f7894ec82b607c63f" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -220,29 +235,31 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3694b7e480728c0b3e228384f223937f14c10caef5a4c766021190fc8f283d35" +checksum = "6c15c11661571a19a06896663c93e804ccf013159275a89a98e892014df514d8" dependencies = [ "alloy-primitives", "alloy-sol-types", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.4", "tracing", ] [[package]] name = "alloy-network" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea94b8ceb5c75d7df0a93ba0acc53b55a22b47b532b600a800a87ef04eb5b0b4" +checksum = "60dd0b99eaa5e715dd90d42021f7f08a0a70976ea84f41a0ad233770e0c1962b" dependencies = [ "alloy-consensus", + "alloy-consensus-any", "alloy-eips", "alloy-json-rpc", "alloy-network-primitives", "alloy-primitives", + "alloy-rpc-types-any", "alloy-rpc-types-eth", "alloy-serde", "alloy-signer", @@ -252,14 +269,14 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.4", ] [[package]] name = "alloy-network-primitives" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df9f3e281005943944d15ee8491534a1c7b3cbf7a7de26f8c433b842b93eb5f9" +checksum = "18abfc73ce48f074c8bc6e05c1f08ef0b1ddc9b04f191a821d0beb9470a42a29" dependencies = [ "alloy-consensus", "alloy-eips", @@ -270,9 +287,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aeeb5825c2fc8c2662167058347cd0cafc3cb15bcb5cdb1758a63c2dca0409e" +checksum = "9db948902dfbae96a73c2fbf1f7abec62af034ab883e4c777c3fd29702bd6e2c" dependencies = [ "alloy-rlp", "arbitrary", @@ -285,7 +302,7 @@ dependencies = [ "getrandom", "hashbrown 0.15.2", "hex-literal", - "indexmap 2.6.0", + "indexmap 2.7.0", "itoa", "k256", "keccak-asm", @@ -294,7 +311,7 @@ dependencies = [ "proptest-derive", "rand", "ruint", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "serde", "sha3", "tiny-keccak", @@ -302,9 +319,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c1f9eede27bf4c13c099e8e64d54efd7ce80ef6ea47478aa75d5d74e2dba3b" +checksum = "4933c761f10e44d5e901804b56efb2ce6e0945e6c57d2fa1e5ace303fae6f74a" dependencies = [ "alloy-chains", "alloy-consensus", @@ -332,7 +349,7 @@ dependencies = [ "schnellru", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tracing", "url", @@ -341,9 +358,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f1f34232f77341076541c405482e4ae12f0ee7153d8f9969fc1691201b2247" +checksum = "808719714bfb2aa24b0eb2a38411ce8e654ba11c0ebf2a6648fcbe9fabfe696d" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -377,14 +394,14 @@ checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] name = "alloy-rpc-client" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374dbe0dc3abdc2c964f36b3d3edf9cdb3db29d16bda34aa123f03d810bec1dd" +checksum = "6ce26c25efb8290b6ba559ae6c40bf6630d337e107ae242e5790501420dba7b7" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -407,9 +424,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74832aa474b670309c20fffc2a869fa141edab7c79ff7963fad0a08de60bae1" +checksum = "41080ce2640928f0df45c41d2af629b88db3cb31af3abbe614964ae10001ddac" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -420,9 +437,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bfd9b2cc3a1985f1f6da5afc41120256f9f9316fcd89e054cea99dbb10172f6" +checksum = "db981579da4d597d9d35f56ad7641b929bf8f551ab696715132f554863c83540" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -432,9 +449,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca97963132f78ddfc60e43a017348e6d52eea983925c23652f5b330e8e02291" +checksum = "252b7433e731e5d24f7eb7a54a368bc813a1086aaf84643ab10e99599a6ff16c" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -442,25 +459,37 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-rpc-types-any" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abca110e59f760259e26d0c84912121468008aba48dd227af0f306cfd7bce9ae" +dependencies = [ + "alloy-consensus-any", + "alloy-rpc-types-eth", + "alloy-serde", +] + [[package]] name = "alloy-rpc-types-beacon" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fa76678d2f9f07ea1b19309b5cfbf244c6029dcba3515227b515fdd6ed4a7" +checksum = "45c8db5fb70d2fece7bc1cd5adf42e72fc8a23547adeff8f558d9063f1e7788c" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", + "alloy-serde", "serde", "serde_with", - "thiserror 1.0.69", + "thiserror 2.0.4", ] [[package]] name = "alloy-rpc-types-debug" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba2253bee958658ebd614c07a61c40580e09dd1fad3f017684314442332ab753" +checksum = "ea3a662ced0bfbe582d26ed85d6a0092310787331555c8f7a86f843c7ca272ef" dependencies = [ "alloy-primitives", "serde", @@ -468,9 +497,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56294dce86af23ad6ee8df46cf8b0d292eb5d1ff67dc88a0886051e32b1faf" +checksum = "d3b000c7f3469e7faa575ba70207294cf07e91dfd6ce4d04d5d5d8069f974a66" dependencies = [ "alloy-consensus", "alloy-eips", @@ -487,11 +516,12 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a477281940d82d29315846c7216db45b15e90bcd52309da9f54bcf7ad94a11" +checksum = "3468e7385fbb86b0fde5497d685c02f765ea09d36f7e07c5d1c9a52b077d38e2" dependencies = [ "alloy-consensus", + "alloy-consensus-any", "alloy-eips", "alloy-network-primitives", "alloy-primitives", @@ -508,12 +538,13 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8647f8135ee3d5de1cf196706c905c05728a4e38bb4a5b61a7214bd1ba8f60a6" +checksum = "26988fb56d87414c96b8fd9b69ad6ce3768bc9acc953ed02c18a66f74ab98c66" dependencies = [ "alloy-eips", "alloy-primitives", + "alloy-rpc-types-eth", "alloy-serde", "serde", "serde_json", @@ -521,23 +552,23 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd8b4877ef520c138af702097477cdd19504a8e1e4675ba37e92ba40f2d3c6f" +checksum = "7a90be1bc8e3659db1c9512191873a268a917efbc62b8bd39a92c12bf613b193" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", "alloy-serde", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.4", ] [[package]] name = "alloy-rpc-types-txpool" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d4ab49acf90a71f7fb894dc5fd485f1f07a1e348966c714c4d1e0b7478850a8" +checksum = "beade2858d292442f5be6fce452c923072a7ac4d3898d333abf42703945444d0" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -547,9 +578,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dfa4a7ccf15b2492bb68088692481fd6b2604ccbee1d0d6c44c21427ae4df83" +checksum = "42de6002e2154b50b3568aea27e26bd9caf7b754658f43065f2e9b6ee0a8c839" dependencies = [ "alloy-primitives", "arbitrary", @@ -559,23 +590,23 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e10aec39d60dc27edcac447302c7803d2371946fb737245320a05b78eb2fafd" +checksum = "f288a9a25e2578dab17845fd8d2be1d32de33565783ed185ded161a65f92381b" dependencies = [ "alloy-primitives", "async-trait", "auto_impl", "elliptic-curve", "k256", - "thiserror 1.0.69", + "thiserror 2.0.4", ] [[package]] name = "alloy-signer-local" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8396f6dff60700bc1d215ee03d86ff56de268af96e2bf833a14d0bafcab9882" +checksum = "0d8081f589ddc11a959605e30c723d51cad2562d9072305f8e3ef311f077e5eb" dependencies = [ "alloy-consensus", "alloy-network", @@ -584,61 +615,61 @@ dependencies = [ "async-trait", "k256", "rand", - "thiserror 1.0.69", + "thiserror 2.0.4", ] [[package]] name = "alloy-sol-macro" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0279d09463a4695788a3622fd95443625f7be307422deba4b55dd491a9c7a1" +checksum = "3bfd7853b65a2b4f49629ec975fee274faf6dff15ab8894c620943398ef283c0" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] name = "alloy-sol-macro-expander" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feea540fc8233df2ad1156efd744b2075372f43a8f942a68b3b19c8a00e2c12" +checksum = "82ec42f342d9a9261699f8078e57a7a4fda8aaa73c1a212ed3987080e6a9cd13" dependencies = [ "alloy-sol-macro-input", "const-hex", "heck", - "indexmap 2.6.0", + "indexmap 2.7.0", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "syn-solidity", "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0ad281f3d1b613af814b66977ee698e443d4644a1510962d0241f26e0e53ae" +checksum = "ed2c50e6a62ee2b4f7ab3c6d0366e5770a21cad426e109c2f40335a1b3aff3df" dependencies = [ "const-hex", "dunce", "heck", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96eff16c797438add6c37bb335839d015b186c5421ee5626f5559a7bfeb38ef5" +checksum = "ac17c6e89a50fb4a758012e4b409d9a0ba575228e69b539fe37d7a1bd507ca4a" dependencies = [ "serde", "winnow", @@ -646,9 +677,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff34e0682d6665da243a3e81da96f07a2dd50f7e64073e382b1a141f5a2a2f6" +checksum = "c9dc0fffe397aa17628160e16b89f704098bf3c9d74d5d369ebc239575936de5" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -659,9 +690,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f99acddb34000d104961897dbb0240298e8b775a7efffb9fda2a1a3efedd65b3" +checksum = "90352f4cf78017905c3244f48b38fadc345970bbc9095087c0f985a580550488" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -669,7 +700,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tower 0.5.1", "tracing", @@ -679,9 +710,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc013132e34eeadaa0add7e74164c1503988bfba8bae885b32e0918ba85a8a6" +checksum = "7d26c94d51fa8b1aee3d15db113dd0773776c02bb36dbaa2590b900dadd7e7d0" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -694,9 +725,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abd170e600801116d5efe64f74a4fc073dbbb35c807013a7d0a388742aeebba0" +checksum = "cd7b21335b55c9f715e2acca0228dc1d6880d961756916c13a9ce70f9f413e70" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -811,7 +842,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1003,7 +1034,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1014,7 +1045,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1052,7 +1083,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1152,7 +1183,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1247,9 +1278,9 @@ dependencies = [ "bitflags 2.6.0", "boa_interner", "boa_macros", - "indexmap 2.6.0", + "indexmap 2.7.0", "num-bigint", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", ] [[package]] @@ -1273,7 +1304,7 @@ dependencies = [ "fast-float", "hashbrown 0.14.5", "icu_normalizer", - "indexmap 2.6.0", + "indexmap 2.7.0", "intrusive-collections", "itertools 0.13.0", "num-bigint", @@ -1285,7 +1316,7 @@ dependencies = [ "portable-atomic", "rand", "regress", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "ryu-js", "serde", "serde_json", @@ -1319,10 +1350,10 @@ dependencies = [ "boa_gc", "boa_macros", "hashbrown 0.14.5", - "indexmap 2.6.0", + "indexmap 2.7.0", "once_cell", "phf", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "static_assertions", ] @@ -1334,7 +1365,7 @@ checksum = "240f4126219a83519bad05c9a40bfc0303921eeb571fc2d7e44c17ffac99d3f1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -1354,7 +1385,7 @@ dependencies = [ "num-bigint", "num-traits", "regress", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", ] [[package]] @@ -1371,7 +1402,7 @@ checksum = "ae85205289bab1f2c7c8a30ddf0541cf89ba2ff7dbd144feef50bbfa664288d4" dependencies = [ "fast-float", "paste", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "sptr", "static_assertions", ] @@ -1455,7 +1486,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1466,9 +1497,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" dependencies = [ "serde", ] @@ -1499,9 +1530,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" dependencies = [ "serde", ] @@ -1537,9 +1568,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" dependencies = [ "jobserver", "libc", @@ -1640,7 +1671,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1714,9 +1745,9 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.13.2" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487981fa1af147182687064d0a2c336586d337a606595ced9ffb0c685c250c73" +checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c" dependencies = [ "cfg-if", "cpufeatures", @@ -1867,7 +1898,7 @@ checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ "bitflags 2.6.0", "crossterm_winapi", - "mio 1.0.2", + "mio 1.0.3", "parking_lot", "rustix", "signal-hook", @@ -1956,7 +1987,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1980,7 +2011,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1991,7 +2022,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2104,7 +2135,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2125,7 +2156,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "unicode-xid", ] @@ -2239,7 +2270,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2359,7 +2390,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2370,7 +2401,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2381,12 +2412,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2574,7 +2605,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2739,7 +2770,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.6.0", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -2918,9 +2949,9 @@ dependencies = [ [[package]] name = "http-range-header" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a397c49fec283e3d6211adbe480be95aae5f304cfb923e9970e08956d5168a" +checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" [[package]] name = "httparse" @@ -3153,7 +3184,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -3220,7 +3251,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -3261,9 +3292,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "arbitrary", "equivalent", @@ -3318,7 +3349,7 @@ dependencies = [ "pretty_assertions", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -3434,10 +3465,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -3501,7 +3533,7 @@ dependencies = [ "parking_lot", "pin-project", "rand", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "serde", "serde_json", "thiserror 1.0.69", @@ -3546,7 +3578,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -3706,15 +3738,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.166" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", "windows-targets 0.52.6", @@ -3951,7 +3983,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -3961,7 +3993,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b6f8152da6d7892ff1b7a1c0fa3f435e92b5918ad67035c3bb432111d9a29b" dependencies = [ "base64 0.22.1", - "indexmap 2.6.0", + "indexmap 2.7.0", "metrics", "metrics-util", "quanta", @@ -4043,11 +4075,10 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi", "libc", "log", "wasi", @@ -4278,7 +4309,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -4325,9 +4356,9 @@ dependencies = [ [[package]] name = "op-alloy-consensus" -version = "0.6.8" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce158d886815d419222daa67fcdf949a34f7950653a4498ebeb4963331f70ed" +checksum = "77284451ec70602f148f4f3bc6d1106fdfefd57c11ff459c4b2985e400ed1a18" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4338,14 +4369,14 @@ dependencies = [ "derive_more", "serde", "serde_with", - "thiserror 2.0.3", + "thiserror 2.0.4", ] [[package]] name = "op-alloy-rpc-types" -version = "0.6.8" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060ebeaea8c772e396215f69bb86d231ec8b7f36aca0dd6ce367ceaa9a8c33e6" +checksum = "2bdc32eba4d43bbd23f1f16dece7afd991d41ab4ffc2494a72b048e9f38db622" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4396,9 +4427,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.7.0" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arbitrary", "arrayvec", @@ -4407,20 +4438,19 @@ dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec-derive", - "rustversion", "serde", ] [[package]] name = "parity-scale-codec-derive" -version = "3.7.0" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.89", + "syn 1.0.109", ] [[package]] @@ -4519,7 +4549,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -4548,7 +4578,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -4676,7 +4706,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -4774,7 +4804,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -4817,10 +4847,10 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "rustls", "socket2", - "thiserror 2.0.3", + "thiserror 2.0.4", "tokio", "tracing", ] @@ -4835,11 +4865,11 @@ dependencies = [ "getrandom", "rand", "ring", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.3", + "thiserror 2.0.4", "tinyvec", "tracing", "web-time", @@ -5099,7 +5129,7 @@ dependencies = [ [[package]] name = "reth" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5172,7 +5202,7 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5201,7 +5231,7 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5211,6 +5241,8 @@ dependencies = [ "itertools 0.13.0", "metrics", "reth-blockchain-tree-api", + "reth-codecs", + "reth-db-api", "reth-engine-primitives", "reth-errors", "reth-ethereum-consensus", @@ -5222,6 +5254,7 @@ dependencies = [ "reth-payload-primitives", "reth-payload-validator", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-prune", "reth-stages-api", @@ -5229,7 +5262,7 @@ dependencies = [ "reth-tasks", "reth-tokio-util", "schnellru", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tokio-stream", "tracing", @@ -5238,7 +5271,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5271,7 +5304,7 @@ dependencies = [ [[package]] name = "reth-blockchain-tree-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5279,20 +5312,19 @@ dependencies = [ "reth-execution-errors", "reth-primitives", "reth-storage-errors", - "thiserror 1.0.69", + "thiserror 2.0.4", ] [[package]] name = "reth-chain-state" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-signer", "alloy-signer-local", - "auto_impl", "derive_more", "metrics", "parking_lot", @@ -5303,6 +5335,7 @@ dependencies = [ "reth-execution-types", "reth-metrics", "reth-primitives", + "reth-primitives-traits", "reth-storage-api", "reth-trie", "revm", @@ -5314,7 +5347,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5334,7 +5367,7 @@ dependencies = [ [[package]] name = "reth-cli" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-genesis", "clap", @@ -5348,7 +5381,7 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "ahash", "alloy-consensus", @@ -5370,6 +5403,7 @@ dependencies = [ "reth-cli", "reth-cli-runner", "reth-cli-util", + "reth-codecs", "reth-config", "reth-consensus", "reth-db", @@ -5385,6 +5419,7 @@ dependencies = [ "reth-network", "reth-network-p2p", "reth-network-peers", + "reth-node-api", "reth-node-builder", "reth-node-core", "reth-node-events", @@ -5408,7 +5443,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "reth-tasks", "tokio", @@ -5418,7 +5453,7 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5429,14 +5464,14 @@ dependencies = [ "reth-fs-util", "secp256k1", "serde", - "thiserror 1.0.69", + "thiserror 2.0.4", "tikv-jemallocator", ] [[package]] name = "reth-codecs" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5455,18 +5490,18 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] name = "reth-config" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "eyre", "humantime-serde", @@ -5480,7 +5515,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5494,7 +5529,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5502,13 +5537,14 @@ dependencies = [ "reth-chainspec", "reth-consensus", "reth-primitives", + "reth-primitives-traits", "revm-primitives", ] [[package]] name = "reth-consensus-debug-client" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5532,7 +5568,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5542,7 +5578,6 @@ dependencies = [ "metrics", "page_size", "parking_lot", - "paste", "reth-db-api", "reth-fs-util", "reth-libmdbx", @@ -5555,18 +5590,18 @@ dependencies = [ "reth-storage-errors", "reth-tracing", "reth-trie-common", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "serde", "strum", "sysinfo", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.4", ] [[package]] name = "reth-db-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -5586,14 +5621,16 @@ dependencies = [ "reth-stages-types", "reth-storage-errors", "reth-trie-common", + "roaring", "serde", ] [[package]] name = "reth-db-common" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ + "alloy-consensus", "alloy-genesis", "alloy-primitives", "boyer-moore-magiclen", @@ -5613,14 +5650,14 @@ dependencies = [ "reth-trie-db", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.4", "tracing", ] [[package]] name = "reth-db-models" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5636,7 +5673,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5653,7 +5690,7 @@ dependencies = [ "schnellru", "secp256k1", "serde", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tokio-stream", "tracing", @@ -5662,7 +5699,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5678,7 +5715,7 @@ dependencies = [ "reth-metrics", "reth-network-peers", "secp256k1", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tracing", ] @@ -5686,7 +5723,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-primitives", "data-encoding", @@ -5700,7 +5737,7 @@ dependencies = [ "secp256k1", "serde", "serde_with", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tokio-stream", "tracing", @@ -5710,7 +5747,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5731,7 +5768,7 @@ dependencies = [ "reth-primitives-traits", "reth-storage-api", "reth-tasks", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tokio-stream", "tokio-util", @@ -5741,7 +5778,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "aes", "alloy-primitives", @@ -5761,7 +5798,7 @@ dependencies = [ "secp256k1", "sha2 0.10.8", "sha3", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tokio-stream", "tokio-util", @@ -5772,8 +5809,9 @@ dependencies = [ [[package]] name = "reth-engine-local" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ + "alloy-consensus", "alloy-primitives", "alloy-rpc-types-engine", "eyre", @@ -5786,10 +5824,10 @@ dependencies = [ "reth-engine-tree", "reth-ethereum-engine-primitives", "reth-evm", + "reth-node-types", "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-payload-validator", "reth-provider", "reth-prune", "reth-rpc-types-compat", @@ -5803,8 +5841,9 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ + "alloy-consensus", "alloy-primitives", "alloy-rpc-types-engine", "futures", @@ -5813,16 +5852,17 @@ dependencies = [ "reth-payload-builder-primitives", "reth-payload-primitives", "reth-primitives", + "reth-primitives-traits", "reth-trie", "serde", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", ] [[package]] name = "reth-engine-service" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "futures", "pin-project", @@ -5835,30 +5875,30 @@ dependencies = [ "reth-network-p2p", "reth-node-types", "reth-payload-builder", - "reth-payload-validator", "reth-provider", "reth-prune", "reth-stages-api", "reth-tasks", - "thiserror 1.0.69", + "thiserror 2.0.4", ] [[package]] name = "reth-engine-tree" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", + "alloy-rlp", "alloy-rpc-types-engine", "futures", "metrics", + "rayon", "reth-beacon-consensus", "reth-blockchain-tree", "reth-blockchain-tree-api", "reth-chain-state", - "reth-chainspec", "reth-consensus", "reth-engine-primitives", "reth-errors", @@ -5868,7 +5908,6 @@ dependencies = [ "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-payload-validator", "reth-primitives", "reth-provider", "reth-prune", @@ -5876,9 +5915,11 @@ dependencies = [ "reth-stages-api", "reth-tasks", "reth-trie", + "reth-trie-db", "reth-trie-parallel", + "reth-trie-sparse", "revm-primitives", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tracing", ] @@ -5886,7 +5927,7 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5896,6 +5937,7 @@ dependencies = [ "futures", "itertools 0.13.0", "pin-project", + "reth-consensus-common", "reth-engine-primitives", "reth-errors", "reth-ethereum-forks", @@ -5918,20 +5960,20 @@ dependencies = [ [[package]] name = "reth-errors" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "reth-blockchain-tree-api", "reth-consensus", "reth-execution-errors", "reth-fs-util", "reth-storage-errors", - "thiserror 1.0.69", + "thiserror 2.0.4", ] [[package]] name = "reth-eth-wire" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-chains", "alloy-primitives", @@ -5949,7 +5991,7 @@ dependencies = [ "reth-primitives-traits", "serde", "snap", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tokio-stream", "tokio-util", @@ -5959,7 +6001,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5970,16 +6012,17 @@ dependencies = [ "derive_more", "reth-chainspec", "reth-codecs-derive", + "reth-ethereum-forks", "reth-primitives", "reth-primitives-traits", "serde", - "thiserror 1.0.69", + "thiserror 2.0.4", ] [[package]] name = "reth-ethereum-cli" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "eyre", "reth-chainspec", @@ -5989,7 +6032,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6005,7 +6048,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6015,6 +6058,7 @@ dependencies = [ "reth-chainspec", "reth-engine-primitives", "reth-payload-primitives", + "reth-payload-validator", "reth-primitives", "reth-rpc-types-compat", "serde", @@ -6024,7 +6068,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6036,15 +6080,15 @@ dependencies = [ "once_cell", "proptest", "proptest-derive", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "serde", - "thiserror-no-std", + "thiserror 2.0.4", ] [[package]] name = "reth-ethereum-payload-builder" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6071,7 +6115,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "rayon", "reth-db-api", @@ -6081,7 +6125,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6108,7 +6152,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6127,30 +6171,32 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", - "derive_more", "nybbles", "reth-consensus", "reth-prune-types", "reth-storage-errors", "revm-primitives", + "thiserror 2.0.4", ] [[package]] name = "reth-execution-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "reth-execution-errors", "reth-primitives", "reth-primitives-traits", "reth-trie", + "reth-trie-common", "revm", "serde", "serde_with", @@ -6159,8 +6205,9 @@ dependencies = [ [[package]] name = "reth-exex" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "eyre", @@ -6194,12 +6241,14 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-eips", "alloy-primitives", "reth-chain-state", "reth-execution-types", + "reth-primitives", + "reth-primitives-traits", "serde", "serde_with", ] @@ -6207,17 +6256,17 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.4", ] [[package]] name = "reth-invalid-block-hooks" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -6231,6 +6280,7 @@ dependencies = [ "reth-engine-primitives", "reth-evm", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-revm", "reth-rpc-api", @@ -6243,7 +6293,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "async-trait", "bytes", @@ -6253,7 +6303,7 @@ dependencies = [ "jsonrpsee", "pin-project", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tokio-stream", "tokio-util", @@ -6264,24 +6314,24 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "bitflags 2.6.0", "byteorder", "dashmap 6.1.0", "derive_more", - "indexmap 2.6.0", + "indexmap 2.7.0", "parking_lot", "reth-mdbx-sys", "smallvec", - "thiserror 1.0.69", + "thiserror 2.0.4", "tracing", ] [[package]] name = "reth-mdbx-sys" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "bindgen", "cc", @@ -6290,7 +6340,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "futures", "metrics", @@ -6302,7 +6352,7 @@ dependencies = [ [[package]] name = "reth-net-banlist" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-primitives", ] @@ -6310,13 +6360,13 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "futures-util", "if-addrs", "reqwest", "serde_with", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tracing", ] @@ -6324,7 +6374,7 @@ dependencies = [ [[package]] name = "reth-network" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6349,6 +6399,7 @@ dependencies = [ "reth-ecies", "reth-eth-wire", "reth-eth-wire-types", + "reth-ethereum-forks", "reth-fs-util", "reth-metrics", "reth-net-banlist", @@ -6363,12 +6414,12 @@ dependencies = [ "reth-tasks", "reth-tokio-util", "reth-transaction-pool", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "schnellru", "secp256k1", "serde", "smallvec", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tokio-stream", "tokio-util", @@ -6378,7 +6429,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-primitives", "alloy-rpc-types-admin", @@ -6393,7 +6444,7 @@ dependencies = [ "reth-network-types", "reth-tokio-util", "serde", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tokio-stream", ] @@ -6401,7 +6452,7 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6424,14 +6475,14 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-primitives", "alloy-rlp", "enr", "secp256k1", "serde_with", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "url", ] @@ -6439,7 +6490,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "humantime-serde", "reth-ethereum-forks", @@ -6453,7 +6504,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "anyhow", "bincode", @@ -6462,7 +6513,7 @@ dependencies = [ "memmap2", "reth-fs-util", "serde", - "thiserror 1.0.69", + "thiserror 2.0.4", "tracing", "zstd", ] @@ -6470,7 +6521,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", @@ -6492,7 +6543,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -6556,7 +6607,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6577,6 +6628,7 @@ dependencies = [ "reth-db", "reth-discv4", "reth-discv5", + "reth-ethereum-forks", "reth-net-nat", "reth-network", "reth-network-p2p", @@ -6596,7 +6648,7 @@ dependencies = [ "serde", "shellexpand", "strum", - "thiserror 1.0.69", + "thiserror 2.0.4", "toml", "tracing", "vergen", @@ -6605,7 +6657,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "eyre", @@ -6634,7 +6686,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6647,7 +6699,7 @@ dependencies = [ "reth-engine-primitives", "reth-network-api", "reth-primitives-traits", - "reth-prune", + "reth-prune-types", "reth-stages", "reth-static-file-types", "reth-storage-api", @@ -6658,20 +6710,17 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "eyre", "http", - "jsonrpsee", + "jsonrpsee-server", "metrics", "metrics-exporter-prometheus", "metrics-process", "metrics-util", "procfs 0.16.0", - "reth-db-api", "reth-metrics", - "reth-primitives-traits", - "reth-provider", "reth-tasks", "tikv-jemalloc-ctl", "tokio", @@ -6683,7 +6732,7 @@ dependencies = [ [[package]] name = "reth-node-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "reth-chainspec", "reth-db-api", @@ -6695,25 +6744,29 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", + "arbitrary", "bytes", "derive_more", "op-alloy-consensus", + "rand", "reth-codecs", "reth-primitives", "reth-primitives-traits", + "revm-primitives", + "secp256k1", "serde", ] [[package]] name = "reth-payload-builder" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-rpc-types", "async-trait", @@ -6732,7 +6785,7 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-rpc-types-engine", "async-trait", @@ -6746,7 +6799,7 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6757,14 +6810,14 @@ dependencies = [ "reth-primitives", "revm-primitives", "serde", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", ] [[package]] name = "reth-payload-util" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -6774,7 +6827,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-rpc-types", "reth-chainspec", @@ -6785,7 +6838,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6820,7 +6873,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6833,11 +6886,11 @@ dependencies = [ "bytes", "derive_more", "modular-bitfield", + "op-alloy-consensus", "proptest", "proptest-arbitrary-interop", "reth-codecs", "revm-primitives", - "roaring", "serde", "serde_with", ] @@ -6845,7 +6898,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6875,6 +6928,7 @@ dependencies = [ "reth-node-types", "reth-optimism-primitives", "reth-primitives", + "reth-primitives-traits", "reth-prune-types", "reth-stages-types", "reth-storage-api", @@ -6890,8 +6944,10 @@ dependencies = [ [[package]] name = "reth-prune" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ + "alloy-consensus", + "alloy-eips", "alloy-primitives", "itertools 0.13.0", "metrics", @@ -6903,12 +6959,13 @@ dependencies = [ "reth-errors", "reth-exex-types", "reth-metrics", + "reth-primitives-traits", "reth-provider", "reth-prune-types", "reth-static-file-types", "reth-tokio-util", - "rustc-hash 2.0.0", - "thiserror 1.0.69", + "rustc-hash 2.1.0", + "thiserror 2.0.4", "tokio", "tracing", ] @@ -6916,7 +6973,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-primitives", "arbitrary", @@ -6925,13 +6982,13 @@ dependencies = [ "modular-bitfield", "reth-codecs", "serde", - "thiserror 1.0.69", + "thiserror 2.0.4", ] [[package]] name = "reth-revm" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6948,7 +7005,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -6991,6 +7048,7 @@ dependencies = [ "reth-network-types", "reth-payload-validator", "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-revm", "reth-rpc-api", @@ -7007,7 +7065,7 @@ dependencies = [ "revm-primitives", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tokio-stream", "tower 0.4.13", @@ -7018,7 +7076,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-eips", "alloy-json-rpc", @@ -7043,7 +7101,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "http", @@ -7058,6 +7116,7 @@ dependencies = [ "reth-metrics", "reth-network-api", "reth-node-core", + "reth-primitives", "reth-provider", "reth-rpc", "reth-rpc-api", @@ -7068,7 +7127,7 @@ dependencies = [ "reth-tasks", "reth-transaction-pool", "serde", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tokio-util", "tower 0.4.13", @@ -7079,7 +7138,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7104,7 +7163,7 @@ dependencies = [ "reth-tasks", "reth-transaction-pool", "serde", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tracing", ] @@ -7112,7 +7171,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -7145,6 +7204,7 @@ dependencies = [ "reth-tasks", "reth-transaction-pool", "reth-trie", + "reth-trie-common", "revm", "revm-inspectors", "revm-primitives", @@ -7155,7 +7215,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7172,10 +7232,10 @@ dependencies = [ "reth-chain-state", "reth-chainspec", "reth-errors", - "reth-evm", "reth-execution-types", "reth-metrics", "reth-primitives", + "reth-primitives-traits", "reth-revm", "reth-rpc-server-types", "reth-rpc-types-compat", @@ -7188,7 +7248,7 @@ dependencies = [ "revm-primitives", "schnellru", "serde", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tokio-stream", "tracing", @@ -7197,7 +7257,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-rpc-types-engine", "http", @@ -7211,7 +7271,7 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7227,7 +7287,7 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7235,19 +7295,18 @@ dependencies = [ "alloy-rlp", "alloy-rpc-types-engine", "alloy-rpc-types-eth", - "alloy-serde", "jsonrpsee-types", "reth-primitives", - "reth-trie-common", "serde", ] [[package]] name = "reth-stages" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", + "alloy-eips", "alloy-primitives", "bincode", "futures-util", @@ -7274,7 +7333,7 @@ dependencies = [ "reth-storage-errors", "reth-trie", "reth-trie-db", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tracing", ] @@ -7282,7 +7341,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-primitives", "aquamarine", @@ -7300,7 +7359,7 @@ dependencies = [ "reth-static-file", "reth-static-file-types", "reth-tokio-util", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tracing", ] @@ -7308,7 +7367,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-primitives", "arbitrary", @@ -7322,13 +7381,15 @@ dependencies = [ [[package]] name = "reth-static-file" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-primitives", "parking_lot", "rayon", + "reth-codecs", "reth-db", "reth-db-api", + "reth-primitives-traits", "reth-provider", "reth-prune-types", "reth-stages-types", @@ -7341,7 +7402,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-primitives", "clap", @@ -7353,7 +7414,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7366,29 +7427,32 @@ dependencies = [ "reth-db-models", "reth-execution-types", "reth-primitives", + "reth-primitives-traits", "reth-prune-types", "reth-stages-types", "reth-storage-errors", "reth-trie", + "reth-trie-db", ] [[package]] name = "reth-storage-errors" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", "derive_more", "reth-fs-util", - "reth-primitives", + "reth-primitives-traits", + "reth-static-file-types", ] [[package]] name = "reth-tasks" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "auto_impl", "dyn-clone", @@ -7397,7 +7461,7 @@ dependencies = [ "pin-project", "rayon", "reth-metrics", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tracing", "tracing-futures", @@ -7406,7 +7470,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "tokio", "tokio-stream", @@ -7416,7 +7480,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "clap", "eyre", @@ -7431,7 +7495,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7456,11 +7520,11 @@ dependencies = [ "reth-storage-api", "reth-tasks", "revm", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "schnellru", "serde", "smallvec", - "thiserror 1.0.69", + "thiserror 2.0.4", "tokio", "tokio-stream", "tracing", @@ -7469,7 +7533,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7485,9 +7549,8 @@ dependencies = [ "reth-stages-types", "reth-storage-errors", "reth-trie-common", + "reth-trie-sparse", "revm", - "serde", - "serde_with", "tracing", "triehash", ] @@ -7495,12 +7558,14 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-consensus", "alloy-genesis", "alloy-primitives", "alloy-rlp", + "alloy-rpc-types-eth", + "alloy-serde", "alloy-trie", "arbitrary", "bytes", @@ -7513,12 +7578,13 @@ dependencies = [ "reth-primitives-traits", "revm-primitives", "serde", + "serde_with", ] [[package]] name = "reth-trie-db" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7531,7 +7597,6 @@ dependencies = [ "reth-primitives", "reth-storage-errors", "reth-trie", - "reth-trie-common", "revm", "serde", "tracing", @@ -7541,7 +7606,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "1.1.2" -source = "git+https://github.com/paradigmxyz/reth?rev=496bf0bf715f0a1fafc198f8d72ccd71913d1a40#496bf0bf715f0a1fafc198f8d72ccd71913d1a40" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7557,10 +7622,24 @@ dependencies = [ "reth-trie", "reth-trie-common", "reth-trie-db", - "thiserror 1.0.69", + "thiserror 2.0.4", "tracing", ] +[[package]] +name = "reth-trie-sparse" +version = "1.1.2" +source = "git+https://github.com/paradigmxyz/reth?rev=8f61af0136e1a20119832925081c341ae89b93f0#8f61af0136e1a20119832925081c341ae89b93f0" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "reth-primitives-traits", + "reth-tracing", + "reth-trie-common", + "smallvec", + "thiserror 2.0.4", +] + [[package]] name = "reth_gnosis" version = "0.1.0" @@ -7611,7 +7690,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror 1.0.69", + "thiserror 2.0.4", "thiserror-no-std", "tikv-jemalloc-ctl", "tikv-jemallocator", @@ -7636,9 +7715,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747291a18ad6726a08dd73f8b6a6b3a844db582ecae2063ccf0a04880c44f482" +checksum = "41bbeb6004cc4ed48d27756f0479011df91a6f5642a3abab9309eda5ce67c4ad" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -7791,7 +7870,6 @@ checksum = "f81dc953b2244ddd5e7860cb0bb2a790494b898ef321d4aff8e260efab60cc88" dependencies = [ "bytemuck", "byteorder", - "serde", ] [[package]] @@ -7854,9 +7932,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" dependencies = [ "rand", ] @@ -8161,7 +8239,7 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -8170,7 +8248,7 @@ version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "itoa", "memchr", "ryu", @@ -8208,7 +8286,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_derive", "serde_json", @@ -8225,7 +8303,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -8324,7 +8402,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio 1.0.2", + "mio 1.0.3", "signal-hook", ] @@ -8419,9 +8497,9 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -8429,9 +8507,9 @@ dependencies = [ [[package]] name = "soketto" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" +checksum = "2e859df029d160cb88608f5d7df7fb4753fd20fdfb4de5644f3d8b8440841721" dependencies = [ "base64 0.22.1", "bytes", @@ -8502,7 +8580,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -8537,9 +8615,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.89" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -8548,14 +8626,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdaa7b9e815582ba343a20c66627437cf45f1c6fba7f69772cbfd1358c7e197" +checksum = "da0523f59468a2696391f2a772edc089342aacd53c3caa2ac3264e598edf119b" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -8581,14 +8659,14 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] name = "sysinfo" -version = "0.31.4" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" +checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af" dependencies = [ "core-foundation-sys", "libc", @@ -8633,11 +8711,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490" dependencies = [ - "thiserror-impl 2.0.3", + "thiserror-impl 2.0.4", ] [[package]] @@ -8648,18 +8726,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] name = "thiserror-impl" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -8734,9 +8812,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -8758,9 +8836,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -8802,14 +8880,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.1" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.2", + "mio 1.0.3", "parking_lot", "pin-project-lite", "signal-hook-registry", @@ -8826,7 +8904,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -8910,7 +8988,7 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -9027,7 +9105,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -9052,26 +9130,15 @@ dependencies = [ [[package]] name = "tracing-journald" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd" +checksum = "fc0b4143302cf1022dac868d521e36e8b27691f72c84b3311750d5188ebba657" dependencies = [ "libc", "tracing-core", "tracing-subscriber", ] -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-logfmt" version = "0.3.5" @@ -9086,9 +9153,9 @@ dependencies = [ [[package]] name = "tracing-serde" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" dependencies = [ "serde", "tracing-core", @@ -9096,9 +9163,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers", "nu-ansi-term", @@ -9107,11 +9174,9 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec", "thread_local", "tracing", "tracing-core", - "tracing-log", "tracing-serde", ] @@ -9402,7 +9467,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -9441,9 +9506,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" dependencies = [ "cfg-if", "once_cell", @@ -9452,36 +9517,37 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -9489,22 +9555,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" [[package]] name = "wasmtimer" @@ -9522,9 +9588,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" dependencies = [ "js-sys", "wasm-bindgen", @@ -9648,7 +9714,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -9659,7 +9725,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -9670,7 +9736,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -9681,7 +9747,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -9956,7 +10022,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -9978,7 +10044,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -9998,7 +10064,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -10019,7 +10085,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -10041,7 +10107,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index dcc03fc..5751dca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,62 +12,62 @@ name = "reth" path = "src/main.rs" [dependencies] -reth = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-chain-state = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -# reth-auto-seal-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-prune-types = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40", features = ["test-utils"] } -reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-stages = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-stages-api = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-stages-types = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } -reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "496bf0bf715f0a1fafc198f8d72ccd71913d1a40" } +reth = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-chain-state = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +# reth-auto-seal-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-prune-types = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0", features = ["test-utils"] } +reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-stages = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-stages-api = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-stages-types = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } +reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "8f61af0136e1a20119832925081c341ae89b93f0" } eyre = "0.6" clap = { version = "4.5.6", features = ["derive"] } # revm revm = { version = "18.0.0", features = ["std"], default-features = false } -revm-inspectors = "0.11.0" +revm-inspectors = "0.12.0" revm-primitives = { version = "14.0.0", features = [ "std", ], default-features = false } -serde_json = "1.0.94" serde = { version = "1.0", default-features = false } +serde_json = "1.0.94" serde_with = "3.3.0" hex = "0.4.3" walkdir = "2.3.3" -thiserror = "1.0" +thiserror = { version = "2.0.0", default-features = false } thiserror-no-std = { version = "2.0.2", default-features = false } # eth -alloy-chains = "0.1.32" +alloy-chains = { version = "0.1.32", default-features = false } alloy-dyn-abi = "0.8.11" alloy-primitives = { version = "0.8.11", default-features = false } -alloy-rlp = "0.3.4" +alloy-rlp = { version = "0.3.4", default-features = false } alloy-sol-types = "0.8.11" alloy-trie = { version = "0.7", default-features = false } -alloy-consensus = { version = "0.6.4", default-features = false } -alloy-eips = { version = "0.6.4", default-features = false } +alloy-consensus = { version = "0.7.2", default-features = false } +alloy-eips = { version = "0.7.2", default-features = false } alloy-sol-macro = "0.8.9" -alloy-serde = { version = "0.6.4", default-features = false } +alloy-serde = { version = "0.7.2", default-features = false } rayon = "1.7" tracing = "0.1.0" diff --git a/src/evm_config.rs b/src/evm_config.rs index 6552720..a9a3b6c 100644 --- a/src/evm_config.rs +++ b/src/evm_config.rs @@ -2,10 +2,10 @@ use alloy_consensus::Header; use alloy_primitives::{Address, U256}; use reth::revm::{inspector_handle_register, Database, GetInspector}; use reth::revm::{Evm, EvmBuilder}; -use reth_chainspec::ChainSpec; +use reth_chainspec::{ChainSpec, Head}; use reth_evm::{ConfigureEvm, ConfigureEvmEnv}; use reth_evm_ethereum::{revm_spec, revm_spec_by_timestamp_after_merge}; -use reth_primitives::{transaction::FillTxEnv, Head, TransactionSigned}; +use reth_primitives::{transaction::FillTxEnv, TransactionSigned}; use revm::{ handler::mainnet::reward_beneficiary as reward_beneficiary_mainnet, interpreter::Gas, Context, }; diff --git a/src/execute.rs b/src/execute.rs index f443a74..3383d26 100644 --- a/src/execute.rs +++ b/src/execute.rs @@ -9,6 +9,9 @@ use alloy_primitives::Address; use core::fmt::Display; use reth_chainspec::ChainSpec; use reth_chainspec::EthereumHardforks; +use reth_errors::ConsensusError; +use reth_ethereum_consensus::validate_block_post_execution; +use reth_evm::system_calls::OnStateHook; use reth_evm::{ execute::{ BlockExecutionError, BlockExecutionStrategy, BlockExecutionStrategyFactory, @@ -19,6 +22,7 @@ use reth_evm::{ }; use reth_evm_ethereum::eip6110::parse_deposits_from_receipts; use reth_node_ethereum::BasicBlockExecutorProvider; +use reth_primitives::EthPrimitives; use reth_primitives::{BlockWithSenders, Receipt}; use revm::State; use revm_primitives::{ @@ -76,6 +80,8 @@ where .build(); GnosisExecutionStrategy::new(state, self.chain_spec.clone(), self.evm_config.clone()) } + + type Primitives = EthPrimitives; } // Block execution strategy for Gnosis @@ -139,13 +145,18 @@ where } } -impl BlockExecutionStrategy for GnosisExecutionStrategy +impl BlockExecutionStrategy for GnosisExecutionStrategy where DB: Database + Display>, EvmConfig: ConfigureEvm
, { + type DB = DB; type Error = BlockExecutionError; + type Primitives = EthPrimitives; + + fn init(&mut self, _tx_env_overrides: Box) {} + fn apply_pre_execution_changes( &mut self, block: &BlockWithSenders, @@ -201,7 +212,7 @@ where error: Box::new(new_err), } })?; - self.system_caller.on_state(&result_and_state); + self.system_caller.on_state(&result_and_state.state); let ResultAndState { result, state } = result_and_state; evm.db_mut().commit(state); @@ -272,6 +283,19 @@ where fn state_mut(&mut self) -> &mut State { &mut self.state } + + fn with_state_hook(&mut self, hook: Option>) { + self.system_caller.with_state_hook(hook); + } + + fn validate_block_post_execution( + &self, + block: &BlockWithSenders, + receipts: &[Receipt], + requests: &Requests, + ) -> Result<(), ConsensusError> { + validate_block_post_execution(block, &self.chain_spec.clone(), receipts, requests) + } } /// Helper type with backwards compatible methods to obtain executor providers. diff --git a/src/lib.rs b/src/lib.rs index 3283bd3..9d949f0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -use consensus::GnosisBeaconConsensus; +// use consensus::GnosisBeaconConsensus; use evm_config::GnosisEvmConfig; use execute::GnosisExecutionStrategyFactory; use eyre::eyre; @@ -15,16 +15,18 @@ use reth::{ }; use reth_chainspec::ChainSpec; use reth_engine_primitives::EngineValidator; +use reth_ethereum_consensus::EthBeaconConsensus; use reth_ethereum_engine_primitives::EthereumEngineValidator; use reth_node_ethereum::{ node::{EthereumNetworkBuilder, EthereumPoolBuilder}, BasicBlockExecutorProvider, EthEngineTypes, EthereumNode, }; +use reth_primitives::EthPrimitives; +use reth_provider::EthStorage; use reth_rpc::EthApi; use reth_trie_db::MerklePatriciaTrie; use std::sync::Arc; -mod consensus; mod errors; mod evm_config; pub mod execute; @@ -64,8 +66,18 @@ impl GnosisNode { GnosisConsensusBuilder, > where + // Node: FullNodeTypes>, + // ::Engine: PayloadTypes< + // BuiltPayload = EthBuiltPayload, + // PayloadAttributes = EthPayloadAttributes, + // PayloadBuilderAttributes = EthPayloadBuilderAttributes, + // >, Node: FullNodeTypes< - Types: NodeTypesWithEngine, + Types: NodeTypesWithEngine< + Engine = EthEngineTypes, + ChainSpec = ChainSpec, + Primitives = EthPrimitives, + >, >, { EthereumNode::components::() @@ -80,9 +92,10 @@ impl GnosisNode { /// Configure the node types impl NodeTypes for GnosisNode { - type Primitives = (); + type Primitives = EthPrimitives; type ChainSpec = ChainSpec; type StateCommitment = MerklePatriciaTrie; + type Storage = EthStorage; } impl NodeTypesWithEngine for GnosisNode { @@ -103,7 +116,14 @@ pub type GnosisAddOns = RpcAddOns< impl Node for GnosisNode where - N: FullNodeTypes>, + N: FullNodeTypes< + Types: NodeTypesWithEngine< + Engine = EthEngineTypes, + ChainSpec = ChainSpec, + Primitives = EthPrimitives, + Storage = EthStorage, + >, + >, { type ComponentsBuilder = ComponentsBuilder< N, @@ -135,7 +155,13 @@ pub struct GnosisExecutorBuilder; impl ExecutorBuilder for GnosisExecutorBuilder where - Node: FullNodeTypes>, + Node: FullNodeTypes< + Types: NodeTypesWithEngine< + Engine = EthEngineTypes, + ChainSpec = ChainSpec, + Primitives = EthPrimitives, + >, + >, { // Must implement ConfigureEvm; type EVM = GnosisEvmConfig; @@ -175,12 +201,12 @@ pub struct GnosisConsensusBuilder; impl ConsensusBuilder for GnosisConsensusBuilder where - Node: FullNodeTypes>, + Node: FullNodeTypes>, { - type Consensus = Arc; + type Consensus = Arc; async fn build_consensus(self, ctx: &BuilderContext) -> eyre::Result { - Ok(Arc::new(GnosisBeaconConsensus::new(ctx.chain_spec()))) + Ok(Arc::new(EthBeaconConsensus::new(ctx.chain_spec()))) } } diff --git a/src/payload_builder.rs b/src/payload_builder.rs index 66cf1f7..1e38498 100644 --- a/src/payload_builder.rs +++ b/src/payload_builder.rs @@ -1,7 +1,10 @@ use std::sync::Arc; use alloy_consensus::{Header, EMPTY_OMMER_ROOT_HASH}; -use alloy_eips::{eip4844::MAX_DATA_GAS_PER_BLOCK, eip7685::Requests, merge::BEACON_NONCE}; +use alloy_eips::{ + eip4844::MAX_DATA_GAS_PER_BLOCK, eip7002::WITHDRAWAL_REQUEST_TYPE, + eip7251::CONSOLIDATION_REQUEST_TYPE, eip7685::Requests, merge::BEACON_NONCE, +}; use eyre::eyre; use reth::{ api::{FullNodeTypes, NodeTypesWithEngine}, @@ -10,16 +13,15 @@ use reth::{ EthBuiltPayload, EthPayloadBuilderAttributes, PayloadBuilderError, PayloadBuilderHandle, PayloadBuilderService, }, - primitives::{ - proofs::{self}, - Block, Receipt, - }, revm::database::StateProviderDatabase, - transaction_pool::{noop::NoopTransactionPool, BestTransactionsAttributes, TransactionPool}, + transaction_pool::{ + error::InvalidPoolTransactionError, noop::NoopTransactionPool, BestTransactions, + BestTransactionsAttributes, PoolTransaction, TransactionPool, ValidPoolTransaction, + }, }; use reth_basic_payload_builder::{ - is_better_payload, BasicPayloadJobGenerator, BasicPayloadJobGeneratorConfig, BuildArguments, - BuildOutcome, PayloadBuilder, PayloadConfig, WithdrawalsOutcome, + commit_withdrawals, is_better_payload, BasicPayloadJobGenerator, + BasicPayloadJobGeneratorConfig, BuildArguments, BuildOutcome, PayloadBuilder, PayloadConfig, }; use reth_chain_state::ExecutedBlock; use reth_chainspec::{ChainSpec, EthereumHardforks}; @@ -27,7 +29,10 @@ use reth_errors::RethError; use reth_evm::{system_calls::SystemCaller, ConfigureEvm, ConfigureEvmEnv, NextBlockEnvAttributes}; use reth_evm_ethereum::eip6110::parse_deposits_from_receipts; use reth_node_ethereum::EthEngineTypes; -use reth_primitives::BlockBody; +use reth_primitives::{ + proofs::{self}, + Block, BlockBody, BlockExt, EthPrimitives, InvalidTransactionError, Receipt, TransactionSigned, +}; use reth_provider::{ CanonStateSubscriptions, ChainSpecProvider, ExecutionOutcome, StateProviderFactory, }; @@ -41,6 +46,10 @@ use tracing::{debug, trace, warn}; use crate::{evm_config::GnosisEvmConfig, gnosis::apply_post_block_system_calls}; +type BestTransactionsIter = Box< + dyn BestTransactions::Transaction>>>, +>; + /// A basic Gnosis payload service builder #[derive(Debug, Default, Clone)] pub struct GnosisPayloadServiceBuilder { @@ -56,10 +65,16 @@ impl GnosisPayloadServiceBuilder { impl PayloadServiceBuilder for GnosisPayloadServiceBuilder where - Node: FullNodeTypes>, - ::Provider: reth_provider::StateProviderFactory - + reth_provider::ChainSpecProvider, - Pool: TransactionPool + Unpin + 'static, + Node: FullNodeTypes< + Types: NodeTypesWithEngine< + Engine = EthEngineTypes, + ChainSpec = ChainSpec, + Primitives = EthPrimitives, + >, + >, + Pool: TransactionPool> + + Unpin + + 'static, { async fn spawn_payload_service( self, @@ -162,7 +177,7 @@ impl PayloadBuilder for GnosisPayloadBuil where EvmConfig: ConfigureEvm
, Client: StateProviderFactory + ChainSpecProvider, - Pool: TransactionPool, + Pool: TransactionPool>, { type Attributes = EthPayloadBuilderAttributes; type BuiltPayload = EthBuiltPayload; @@ -174,12 +189,14 @@ where let (cfg_env, block_env) = self .cfg_and_block_env(&args.config, &args.config.parent_header) .map_err(PayloadBuilderError::other)?; + let pool = args.pool.clone(); default_ethereum_payload( self.evm_config.clone(), args, cfg_env, block_env, self.block_rewards_contract, + |attributes| pool.best_transactions_with_attributes(attributes), ) } @@ -199,12 +216,15 @@ where let (cfg_env, block_env) = self .cfg_and_block_env(&args.config, &args.config.parent_header) .map_err(PayloadBuilderError::other)?; + + let pool = args.pool.clone(); default_ethereum_payload( self.evm_config.clone(), args, cfg_env, block_env, self.block_rewards_contract, + |attributes| pool.best_transactions_with_attributes(attributes), )? .into_payload() .ok_or_else(|| PayloadBuilderError::MissingPayload) @@ -220,17 +240,19 @@ where /// and configuration, this function creates a transaction payload. Returns /// a result indicating success with the payload or an error in case of failure. #[inline] -pub fn default_ethereum_payload( +pub fn default_ethereum_payload( evm_config: EvmConfig, args: BuildArguments, initialized_cfg: CfgEnvWithHandlerCfg, initialized_block_env: BlockEnv, block_rewards_contract: Address, + best_txs: F, ) -> Result, PayloadBuilderError> where EvmConfig: ConfigureEvm
, Client: StateProviderFactory + ChainSpecProvider, - Pool: TransactionPool, + Pool: TransactionPool>, + F: FnOnce(BestTransactionsAttributes) -> BestTransactionsIter, { let BuildArguments { client, @@ -244,7 +266,7 @@ where let state_provider = client.state_by_block_hash(config.parent_header.hash())?; let state = StateProviderDatabase::new(state_provider); let mut db = State::builder() - .with_database_ref(cached_reads.as_db(state)) + .with_database(cached_reads.as_db_mut(state)) .with_bundle_update() .build(); let PayloadConfig { @@ -262,13 +284,12 @@ where let mut executed_txs = Vec::new(); let mut executed_senders = Vec::new(); - let mut best_txs = pool.best_transactions_with_attributes(BestTransactionsAttributes::new( + let mut best_txs = best_txs(BestTransactionsAttributes::new( base_fee, initialized_block_env .get_blob_gasprice() .map(|gasprice| gasprice as u64), )); - let mut total_fees = U256::ZERO; let block_number = initialized_block_env.number.to::(); @@ -311,7 +332,10 @@ where // we can't fit this transaction into the block, so we need to mark it as invalid // which also removes all dependent transaction from the iterator before we can // continue - best_txs.mark_invalid(&pool_tx); + best_txs.mark_invalid( + &pool_tx, + InvalidPoolTransactionError::ExceedsGasLimit(pool_tx.gas_limit(), block_gas_limit), + ); continue; } @@ -321,7 +345,7 @@ where } // convert tx to a signed transaction - let tx = pool_tx.to_recovered_transaction(); + let tx = pool_tx.to_consensus(); // There's only limited amount of blob space available per block, so we need to check if // the EIP-4844 can still fit in the block @@ -333,7 +357,13 @@ where // the iterator. This is similar to the gas limit condition // for regular transactions above. trace!(target: "payload_builder", tx=?tx.hash, ?sum_blob_gas_used, ?tx_blob_gas, "skipping blob transaction because it would exceed the max data gas per block"); - best_txs.mark_invalid(&pool_tx); + best_txs.mark_invalid( + &pool_tx, + InvalidPoolTransactionError::ExceedsGasLimit( + tx_blob_gas, + MAX_DATA_GAS_PER_BLOCK, + ), + ); continue; } } @@ -359,7 +389,12 @@ where // if the transaction is invalid, we can skip it and all of its // descendants trace!(target: "payload_builder", %err, ?tx, "skipping invalid transaction and its descendants"); - best_txs.mark_invalid(&pool_tx); + best_txs.mark_invalid( + &pool_tx, + InvalidPoolTransactionError::Consensus( + InvalidTransactionError::TxTypeNotSupported, + ), + ); } continue; @@ -371,10 +406,8 @@ where } } }; - // drop evm so db is released. - drop(evm); // commit changes - db.commit(state); + evm.db_mut().commit(state); // add to the total blob gas used if the transaction successfully executed if let Some(blob_tx) = tx.transaction.as_eip4844() { @@ -441,28 +474,55 @@ where let requests = if chain_spec.is_prague_active_at_timestamp(attributes.timestamp) { let deposit_requests = parse_deposits_from_receipts(&chain_spec, receipts.iter().flatten()) .map_err(|err| PayloadBuilderError::Internal(RethError::Execution(err.into())))?; - Some(Requests::new(vec![deposit_requests])) - } else { - None - }; + let withdrawal_requests = system_caller + .post_block_withdrawal_requests_contract_call( + &mut db, + &initialized_cfg, + &initialized_block_env, + ) + .map_err(|err| PayloadBuilderError::Internal(err.into()))?; + let consolidation_requests = system_caller + .post_block_consolidation_requests_contract_call( + &mut db, + &initialized_cfg, + &initialized_block_env, + ) + .map_err(|err| PayloadBuilderError::Internal(err.into()))?; - let WithdrawalsOutcome { - withdrawals_root, - withdrawals, - } = if !chain_spec.is_shanghai_active_at_timestamp(attributes.timestamp) { - WithdrawalsOutcome::pre_shanghai() - } else if attributes.withdrawals.is_empty() { - WithdrawalsOutcome::empty() - } else { - let withdrawals_root = proofs::calculate_withdrawals_root(&attributes.withdrawals); + let mut requests = Requests::default(); - // calculate withdrawals root - WithdrawalsOutcome { - withdrawals: Some(attributes.withdrawals), - withdrawals_root: Some(withdrawals_root), + if !deposit_requests.is_empty() { + requests.push_request(core::iter::once(0).chain(deposit_requests).collect()); } + + if !withdrawal_requests.is_empty() { + requests.push_request( + core::iter::once(WITHDRAWAL_REQUEST_TYPE) + .chain(withdrawal_requests) + .collect(), + ); + } + + if !consolidation_requests.is_empty() { + requests.push_request( + core::iter::once(CONSOLIDATION_REQUEST_TYPE) + .chain(consolidation_requests) + .collect(), + ); + } + + Some(requests) + } else { + None }; + let withdrawals_root = commit_withdrawals( + &mut db, + &chain_spec, + attributes.timestamp, + &attributes.withdrawals, + )?; + // merge all transitions into bundle state, this would apply the withdrawal balance changes // and 4788 contract call db.merge_transitions(BundleRetention::Reverts); @@ -470,7 +530,7 @@ where let requests_hash = requests.as_ref().map(|requests| requests.requests_hash()); let execution_outcome = ExecutionOutcome::new( db.take_bundle(), - vec![receipts.clone()].into(), + vec![receipts].into(), block_number, vec![requests.clone().unwrap_or_default()], ); @@ -484,9 +544,8 @@ where // calculate the state root let hashed_state = HashedPostState::from_bundle_state(&execution_outcome.state().state); let (state_root, trie_output) = { - let state_provider = db.database.0.inner.borrow_mut(); - state_provider - .db + db.database + .inner() .state_root_with_updates(hashed_state.clone()) .inspect_err(|err| { warn!(target: "payload_builder", @@ -513,7 +572,7 @@ where executed_txs .iter() .filter(|tx| tx.is_eip4844()) - .map(|tx| tx.hash) + .map(|tx| tx.hash()) .collect(), ) .map_err(PayloadBuilderError::other)?; @@ -556,8 +615,13 @@ where blob_gas_used: blob_gas_used.map(Into::into), excess_blob_gas: excess_blob_gas.map(Into::into), requests_hash, + target_blobs_per_block: None, }; + let withdrawals = chain_spec + .is_shanghai_active_at_timestamp(attributes.timestamp) + .then(|| attributes.withdrawals.clone()); + // seal the block let block = Block { header, @@ -569,7 +633,7 @@ where }; let sealed_block = Arc::new(block.seal_slow()); - debug!(target: "payload_builder", ?sealed_block, "sealed built block"); + debug!(target: "payload_builder", id=%attributes.id, sealed_block_header = ?sealed_block.header, "sealed built block"); // create the executed block data let executed = ExecutedBlock { @@ -579,6 +643,7 @@ where hashed_state: Arc::new(hashed_state), trie: Arc::new(trie_output), }; + let mut payload = EthBuiltPayload::new( attributes.id, sealed_block, From dbde27a28dcf28b8a33b4defc67d1547f44b8b50 Mon Sep 17 00:00:00 2001 From: debjit Date: Tue, 3 Dec 2024 23:26:33 +0530 Subject: [PATCH 3/4] fix --- src/consensus.rs | 120 ----------------------------------------------- 1 file changed, 120 deletions(-) delete mode 100644 src/consensus.rs diff --git a/src/consensus.rs b/src/consensus.rs deleted file mode 100644 index bd37231..0000000 --- a/src/consensus.rs +++ /dev/null @@ -1,120 +0,0 @@ -use alloy_consensus::Header; -use reth::{ - consensus_common::validation::{ - validate_against_parent_4844, validate_against_parent_eip1559_base_fee, - validate_against_parent_hash_number, validate_body_against_header, validate_cancun_gas, - validate_header_base_fee, validate_header_gas, validate_shanghai_withdrawals, - }, - primitives::{BlockBody, BlockWithSenders, SealedBlock, SealedHeader}, -}; -use reth_chainspec::{ChainSpec, EthereumHardforks}; -use reth_consensus::{Consensus, ConsensusError, PostExecutionInput}; -use reth_primitives::GotExpected; -use revm_primitives::U256; -use std::sync::Arc; - -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct GnosisBeaconConsensus { - /// Configuration - chain_spec: Arc, -} - -impl GnosisBeaconConsensus { - pub fn new(chain_spec: Arc) -> Self { - Self { chain_spec } - } -} - -// `validate_header`, `validate_header_against_parent`, `validate_header_with_total_difficulty`, `validate_block_pre_execution`, `validate_block_post_execution` -impl Consensus for GnosisBeaconConsensus { - fn validate_header(&self, header: &SealedHeader) -> Result<(), ConsensusError> { - validate_header_gas(header)?; - validate_header_base_fee(header, &self.chain_spec) - } - - fn validate_header_against_parent( - &self, - header: &SealedHeader, - parent: &SealedHeader, - ) -> Result<(), ConsensusError> { - validate_against_parent_hash_number(header, parent)?; - validate_against_parent_eip1559_base_fee(header, parent, &self.chain_spec)?; - - // ensure that the blob gas fields for this block - if self - .chain_spec - .is_cancun_active_at_timestamp(header.timestamp) - { - validate_against_parent_4844(header, parent)?; - } - - Ok(()) - } - - fn validate_header_with_total_difficulty( - &self, - _header: &Header, - _total_difficulty: U256, - ) -> Result<(), ConsensusError> { - // TODO - Ok(()) - } - - fn validate_body_against_header( - &self, - body: &BlockBody, - header: &SealedHeader, - ) -> Result<(), ConsensusError> { - validate_body_against_header(body, header) - } - - // fn validate_block_pre_execution(&self, _block: &SealedBlock) -> Result<(), ConsensusError> { - // // TODO - // Ok(()) - // } - - fn validate_block_pre_execution(&self, block: &SealedBlock) -> Result<(), ConsensusError> { - // Check ommers hash - let ommers_hash = reth_primitives::proofs::calculate_ommers_root(&block.body.ommers); - if block.header.ommers_hash != ommers_hash { - return Err(ConsensusError::BodyOmmersHashDiff( - GotExpected { - got: ommers_hash, - expected: block.header.ommers_hash, - } - .into(), - )); - } - - // Check transaction root - if let Err(error) = block.ensure_transaction_root_valid() { - return Err(ConsensusError::BodyTransactionRootDiff(error.into())); - } - - // EIP-4895: Beacon chain push withdrawals as operations - if self - .chain_spec - .is_shanghai_active_at_timestamp(block.timestamp) - { - validate_shanghai_withdrawals(block)?; - } - - if self - .chain_spec - .is_cancun_active_at_timestamp(block.timestamp) - { - validate_cancun_gas(block)?; - } - - Ok(()) - } - - fn validate_block_post_execution( - &self, - _block: &BlockWithSenders, - _input: PostExecutionInput<'_>, - ) -> Result<(), ConsensusError> { - // TODO - Ok(()) - } -} From 9660ed87e4d6a596a87574da6ca3de4e95def4c0 Mon Sep 17 00:00:00 2001 From: debjit Date: Wed, 4 Dec 2024 14:26:06 +0530 Subject: [PATCH 4/4] cleanup --- src/lib.rs | 6 ------ src/main.rs | 2 -- 2 files changed, 8 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 9d949f0..2ca4a0a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -66,12 +66,6 @@ impl GnosisNode { GnosisConsensusBuilder, > where - // Node: FullNodeTypes>, - // ::Engine: PayloadTypes< - // BuiltPayload = EthBuiltPayload, - // PayloadAttributes = EthPayloadAttributes, - // PayloadBuilderAttributes = EthPayloadBuilderAttributes, - // >, Node: FullNodeTypes< Types: NodeTypesWithEngine< Engine = EthEngineTypes, diff --git a/src/main.rs b/src/main.rs index f3eda8f..490e160 100644 --- a/src/main.rs +++ b/src/main.rs @@ -66,5 +66,3 @@ fn main() { } } } - -// ./target/debug/reth --chain ./scripts/chiado_genesis_alloc.json init-state ./state_at_26478650.jsonl --without-evm --header ./alt_header.rlp --total-difficulty 8626000110427540000000000000000000000000000000 --header-hash 3eaf85f384900ee9cf4e23f8e7584ef7f3118bcb960d3f56c62cff5ca95166f3