diff --git a/Cargo.lock b/Cargo.lock index c52cdfa2d..ebf8242c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d213580c17d239ae83c0d897ac3315db7cda83d2d4936a9823cc3517552f2e24" +checksum = "59094911f05dbff1cf5b29046a00ef26452eccc8d47136d50a47c0cf22f00c85" dependencies = [ "alloy-eips", "alloy-primitives", @@ -132,15 +132,16 @@ dependencies = [ "rand 0.8.5", "secp256k1 0.30.0", "serde", + "serde_json", "serde_with", "thiserror 2.0.16", ] [[package]] name = "alloy-consensus-any" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81443e3b8dccfeac7cd511aced15928c97ff253f4177acbb97de97178e543f6c" +checksum = "903cb8f728107ca27c816546f15be38c688df3c381d7bd1a4a9f215effc1ddb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -214,9 +215,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a15b4b0f6bab47aae017d52bb5a739bda381553c09fb9918b7172721ef5f5de" +checksum = "ac7f1c9a1ccc7f3e03c36976455751a6166a4f0d2d2c530c3f87dfe7d0cdc836" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -239,19 +240,21 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.20.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbe7c66c859b658d879b22e8aaa19546dab726b0639f4649a424ada3d99349e" +checksum = "06a5f67ee74999aa4fe576a83be1996bdf74a30fce3d248bf2007d6fc7dae8aa" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-hardforks", "alloy-primitives", + "alloy-rpc-types-engine", "alloy-rpc-types-eth", "alloy-sol-types", "auto_impl", "derive_more", "op-alloy-consensus", + "op-alloy-rpc-types-engine", "op-revm", "revm", "thiserror 2.0.16", @@ -259,9 +262,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ba1cbc25a07e0142e8875fcbe80e1fdb02be8160ae186b90f4b9a69a72ed2b" +checksum = "1421f6c9d15e5b86afbfe5865ca84dea3b9f77173a0963c1a2ee4e626320ada9" dependencies = [ "alloy-eips", "alloy-primitives", @@ -273,9 +276,9 @@ dependencies = [ [[package]] name = "alloy-hardforks" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c8616642b176f21e98e2740e27d28917b5d30d8612450cafff21772d4926bc" +checksum = "889eb3949b58368a09d4f16931c660275ef5fb08e5fbd4a96573b19c7085c41f" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -299,9 +302,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8882ec8e4542cfd02aadc6dccbe90caa73038f60016d936734eb6ced53d2167" +checksum = "65f763621707fa09cece30b73ecc607eb43fd7a72451fe3b46f645b905086926" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -314,9 +317,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d6d87d588bda509881a7a66ae77c86514bd1193ac30fbff0e0f24db95eb5a5" +checksum = "2f59a869fa4b4c3a7f08b1c8cb79aec61c29febe6e24a24fe0fcfded8a9b5703" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -340,9 +343,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b14fa9ba5774e0b30ae6a04176d998211d516c8af69c9c530af7c6c42a8c508" +checksum = "46e9374c667c95c41177602ebe6f6a2edd455193844f011d973d374b65501b38" dependencies = [ "alloy-consensus", "alloy-eips", @@ -383,9 +386,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475a5141313c3665b75d818be97d5fa3eb5e0abb7e832e9767edd94746db28e3" +checksum = "77818b7348bd5486491a5297579dbfe5f706a81f8e1f5976393025f1e22a7c7d" dependencies = [ "alloy-chains", "alloy-consensus", @@ -425,9 +428,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f97c18795ce1ce8151c5539ce1e4200940389674173f677c7455f79bfb00e5df" +checksum = "249b45103a66c9ad60ad8176b076106d03a2399a37f0ee7b0e03692e6b354cb9" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -469,9 +472,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25289674cd8c58fcca2568b5350423cb0dd7bca8c596c5e2869bfe4c5c57ed14" +checksum = "2430d5623e428dd012c6c2156ae40b7fe638d6fca255e3244e0fba51fa698e93" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -495,9 +498,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39676beaa50db545cf15447fc94ec5513b64e85a48357a0625b9a04aef08a910" +checksum = "e9e131624d08a25cfc40557041e7dc42e1182fa1153e7592d120f769a1edce56" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -508,9 +511,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65acc9264342069decb617aa344847f55180ba3aeab1c8d1db062d0619881029" +checksum = "c59407723b1850ebaa49e46d10c2ba9c10c10b3aedf2f7e97015ee23c3f4e639" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -520,9 +523,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c8cad42fa936000be72ab80fcd97386a6a226c35c2989212756da9e76c1521" +checksum = "d65e3266095e6d8e8028aab5f439c6b8736c5147314f7e606c61597e014cb8a0" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -532,9 +535,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01bac57c987c93773787619e20f89167db74d460a2d1d40f591d94fb7c22c379" +checksum = "07429a1099cd17227abcddb91b5e38c960aaeb02a6967467f5bb561fbe716ac6" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -543,9 +546,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3c0e6cc87a8be5582d08f929f96db25843f44cb636a0985a4a6bf02609c02f" +checksum = "59e0e876b20eb9debf316d3e875536f389070635250f22b5a678cf4632a3e0cf" dependencies = [ "alloy-eips", "alloy-primitives", @@ -562,9 +565,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2fe118e6c152d54cb4549b9835fb87d38b12754bb121375183ee3ec84bd0849" +checksum = "aeff305b7d10cc1c888456d023e7bb8a5ea82e9e42b951e37619b88cc1a1486d" dependencies = [ "alloy-primitives", "derive_more", @@ -574,9 +577,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a41624eb84bc743e414198bf10eb48b611a5554d6a9fd6205f7384d57dfd7f" +checksum = "222ecadcea6aac65e75e32b6735635ee98517aa63b111849ee01ae988a71d685" dependencies = [ "alloy-consensus", "alloy-eips", @@ -594,9 +597,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd1e1b4dcdf13eaa96343e5c0dafc2d2e8ce5d20b90347169d46a1df0dec210" +checksum = "db46b0901ee16bbb68d986003c66dcb74a12f9d9b3c44f8e85d51974f2458f0f" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -616,9 +619,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01620baa48d3f49fc908c781eb91ded71f3226e719bb6404697c2851cac4e098" +checksum = "791a60d4baadd3f278faa4e2305cca095dfd4ab286e071b768ff09181d8ae215" dependencies = [ "alloy-consensus", "alloy-eips", @@ -631,9 +634,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc33d9d0e0b3cfe9c2e82a1a427c9ed516fcfebe764f0adf7ceb8107f702dd1" +checksum = "36f10620724bd45f80c79668a8cdbacb6974f860686998abce28f6196ae79444" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -645,9 +648,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fa9e9b3e613425d2a2ee1a322bdad5f1cedf835406fd4b59538822500b44bc" +checksum = "864f41befa90102d4e02327679699a7e9510930e2924c529e31476086609fa89" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -657,9 +660,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b3b1078b8775077525bc9fe9f6577e815ceaecd6c412a4f3b4d8aa2836e8f6" +checksum = "5413814be7a22fbc81e0f04a2401fcc3eb25e56fd53b04683e8acecc6e1fe01b" dependencies = [ "alloy-primitives", "arbitrary", @@ -669,9 +672,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10ab1b8d4649bf7d0db8ab04e31658a6cc20364d920795484d886c35bed3bab4" +checksum = "53410a18a61916e2c073a6519499514e027b01e77eeaf96acd1df7cf96ef6bb2" dependencies = [ "alloy-primitives", "async-trait", @@ -684,9 +687,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bdeec36c8d9823102b571b3eab8b323e053dc19c12da14a9687bd474129bf2a" +checksum = "e6006c4cbfa5d08cadec1fcabea6cb56dc585a30a9fce40bcf81e307d6a71c8e" dependencies = [ "alloy-consensus", "alloy-network", @@ -770,9 +773,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce5129146a76ca6139a19832c75ad408857a56bcd18cd2c684183b8eacd78d8" +checksum = "d94ee404368a3d9910dfe61b203e888c6b0e151a50e147f95da8baff9f9c7763" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -794,9 +797,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2379d998f46d422ec8ef2b61603bc28cda931e5e267aea1ebe71f62da61d101" +checksum = "a2f8a6338d594f6c6481292215ee8f2fd7b986c80aba23f3f44e761a8658de78" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -809,9 +812,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "041aa5db2e907692a9a93a0a908057665c03e59364e1fbbeed613511a0159289" +checksum = "17a37a8ca18006fa0a58c7489645619ff58cfa073f2b29c4e052c9bd114b123a" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -829,9 +832,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6d44395e6793566e9c89bd82297cc4b0566655c1e78a1d69362640814784cc6" +checksum = "679b0122b7bca9d4dc5eb2c0549677a3c53153f6e232f23f4b3ba5575f74ebde" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -867,9 +870,9 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.0.30" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b5becb9c269a7d05a2f28d549f86df5a5dbc923e2667eff84fdecac8cda534c" +checksum = "e64c09ec565a90ed8390d82aa08cd3b22e492321b96cb4a3d4f58414683c9e2f" dependencies = [ "alloy-primitives", "darling 0.21.3", @@ -1939,6 +1942,24 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "bindgen" +version = "0.71.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" +dependencies = [ + "bitflags 2.9.2", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "proc-macro2", + "quote", + "regex", + "rustc-hash 2.1.1", + "shlex", + "syn 2.0.106", +] + [[package]] name = "bit-set" version = "0.8.0" @@ -2280,9 +2301,9 @@ dependencies = [ [[package]] name = "c-kzg" -version = "2.1.1" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7318cfa722931cb5fe0838b98d3ce5621e75f6a6408abc21721d80de9223f2e4" +checksum = "e00bf4b112b07b505472dbefd19e37e53307e2bfed5a79e0cc161d58ccd0e687" dependencies = [ "arbitrary", "blst", @@ -5792,9 +5813,9 @@ checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" [[package]] name = "op-alloy-consensus" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9ade20c592484ba1ea538006e0454284174447a3adf9bb59fa99ed512f95493" +checksum = "3a501241474c3118833d6195312ae7eb7cc90bbb0d5f524cbb0b06619e49ff67" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5810,9 +5831,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4256b1eda5766a9fa7de5874e54515994500bef632afda41e940aed015f9455" +checksum = "14e50c94013a1d036a529df259151991dbbd6cf8dc215e3b68b784f95eec60e6" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6722,8 +6743,8 @@ checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3" [[package]] name = "reth" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-rpc-types", "aquamarine", @@ -6768,8 +6789,8 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6792,8 +6813,8 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6823,8 +6844,8 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6843,8 +6864,8 @@ dependencies = [ [[package]] name = "reth-cli" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-genesis", "clap", @@ -6857,8 +6878,8 @@ dependencies = [ [[package]] name = "reth-cli-commands" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6938,8 +6959,8 @@ dependencies = [ [[package]] name = "reth-cli-runner" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "reth-tasks", "tokio", @@ -6948,8 +6969,8 @@ dependencies = [ [[package]] name = "reth-cli-util" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6966,8 +6987,8 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6986,8 +7007,8 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "convert_case", "proc-macro2", @@ -6997,8 +7018,8 @@ dependencies = [ [[package]] name = "reth-config" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "eyre", "humantime-serde", @@ -7012,8 +7033,8 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7025,8 +7046,8 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7037,8 +7058,8 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7046,6 +7067,7 @@ dependencies = [ "alloy-primitives", "alloy-provider", "alloy-rpc-types-engine", + "alloy-transport", "auto_impl", "derive_more", "eyre", @@ -7062,8 +7084,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "derive_more", @@ -7088,8 +7110,8 @@ dependencies = [ [[package]] name = "reth-db-api" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -7116,8 +7138,8 @@ dependencies = [ [[package]] name = "reth-db-common" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -7146,8 +7168,8 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7161,8 +7183,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7187,8 +7209,8 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7211,8 +7233,8 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "data-encoding", @@ -7235,8 +7257,8 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7265,8 +7287,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "aes", "alloy-primitives", @@ -7296,8 +7318,8 @@ dependencies = [ [[package]] name = "reth-engine-local" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7318,8 +7340,8 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7343,8 +7365,8 @@ dependencies = [ [[package]] name = "reth-engine-service" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "futures", "pin-project", @@ -7366,8 +7388,8 @@ dependencies = [ [[package]] name = "reth-engine-tree" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7415,8 +7437,8 @@ dependencies = [ [[package]] name = "reth-engine-util" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", @@ -7443,8 +7465,8 @@ dependencies = [ [[package]] name = "reth-era" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7459,8 +7481,8 @@ dependencies = [ [[package]] name = "reth-era-downloader" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "bytes", @@ -7474,8 +7496,8 @@ dependencies = [ [[package]] name = "reth-era-utils" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7496,8 +7518,8 @@ dependencies = [ [[package]] name = "reth-errors" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -7507,8 +7529,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-chains", "alloy-primitives", @@ -7536,8 +7558,8 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-chains", "alloy-consensus", @@ -7560,8 +7582,8 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "clap", "eyre", @@ -7575,14 +7597,15 @@ dependencies = [ "reth-node-core", "reth-node-ethereum", "reth-node-metrics", + "reth-rpc-server-types", "reth-tracing", "tracing", ] [[package]] name = "reth-ethereum-consensus" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7597,8 +7620,8 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7615,8 +7638,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -7629,8 +7652,8 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7658,13 +7681,15 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", + "alloy-rpc-types-eth", + "alloy-serde", "arbitrary", "modular-bitfield", "reth-codecs", @@ -7676,8 +7701,8 @@ dependencies = [ [[package]] name = "reth-etl" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "rayon", "reth-db-api", @@ -7686,8 +7711,8 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7709,8 +7734,8 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7730,8 +7755,8 @@ dependencies = [ [[package]] name = "reth-execution-errors" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-evm", "alloy-primitives", @@ -7743,8 +7768,8 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7761,8 +7786,8 @@ dependencies = [ [[package]] name = "reth-exex" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7799,8 +7824,8 @@ dependencies = [ [[package]] name = "reth-exex-types" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7813,8 +7838,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "serde", "serde_json", @@ -7823,8 +7848,8 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7850,8 +7875,8 @@ dependencies = [ [[package]] name = "reth-ipc" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "bytes", "futures", @@ -7870,14 +7895,13 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "bitflags 2.9.2", "byteorder", "dashmap 6.1.0", "derive_more", - "indexmap 2.10.0", "parking_lot", "reth-mdbx-sys", "smallvec", @@ -7887,17 +7911,17 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ - "bindgen 0.70.1", + "bindgen 0.71.1", "cc", ] [[package]] name = "reth-metrics" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "futures", "metrics", @@ -7908,16 +7932,16 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", ] [[package]] name = "reth-net-nat" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "futures-util", "if-addrs", @@ -7930,8 +7954,8 @@ dependencies = [ [[package]] name = "reth-network" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7985,8 +8009,8 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8010,8 +8034,8 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8032,8 +8056,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8047,8 +8071,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-eip2124", "humantime-serde", @@ -8061,8 +8085,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "anyhow", "bincode", @@ -8078,8 +8102,8 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-rpc-types-engine", "eyre", @@ -8102,8 +8126,8 @@ dependencies = [ [[package]] name = "reth-node-builder" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8124,6 +8148,7 @@ dependencies = [ "reth-config", "reth-consensus", "reth-consensus-debug-client", + "reth-db", "reth-db-api", "reth-db-common", "reth-downloaders", @@ -8169,8 +8194,8 @@ dependencies = [ [[package]] name = "reth-node-core" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8221,8 +8246,8 @@ dependencies = [ [[package]] name = "reth-node-ethereum" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-eips", "alloy-network", @@ -8259,8 +8284,8 @@ dependencies = [ [[package]] name = "reth-node-ethstats" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8283,8 +8308,8 @@ dependencies = [ [[package]] name = "reth-node-events" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8307,8 +8332,8 @@ dependencies = [ [[package]] name = "reth-node-metrics" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "eyre", "http 1.3.1", @@ -8328,8 +8353,8 @@ dependencies = [ [[package]] name = "reth-node-types" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "reth-chainspec", "reth-db-api", @@ -8340,8 +8365,8 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8359,10 +8384,11 @@ dependencies = [ [[package]] name = "reth-payload-builder" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", + "alloy-primitives", "alloy-rpc-types", "futures-util", "metrics", @@ -8379,8 +8405,8 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "pin-project", "reth-payload-primitives", @@ -8391,13 +8417,14 @@ dependencies = [ [[package]] name = "reth-payload-primitives" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "auto_impl", + "either", "op-alloy-rpc-types-engine", "reth-chain-state", "reth-chainspec", @@ -8410,8 +8437,8 @@ dependencies = [ [[package]] name = "reth-payload-validator" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", @@ -8420,8 +8447,8 @@ dependencies = [ [[package]] name = "reth-primitives" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "c-kzg", @@ -8434,8 +8461,8 @@ dependencies = [ [[package]] name = "reth-primitives-traits" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8467,8 +8494,8 @@ dependencies = [ [[package]] name = "reth-provider" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8512,8 +8539,8 @@ dependencies = [ [[package]] name = "reth-prune" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8540,8 +8567,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "arbitrary", @@ -8554,8 +8581,8 @@ dependencies = [ [[package]] name = "reth-ress-protocol" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8573,8 +8600,8 @@ dependencies = [ [[package]] name = "reth-ress-provider" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8600,8 +8627,8 @@ dependencies = [ [[package]] name = "reth-revm" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "reth-primitives-traits", @@ -8613,8 +8640,8 @@ dependencies = [ [[package]] name = "reth-rpc" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -8639,6 +8666,7 @@ dependencies = [ "alloy-signer-local", "async-trait", "derive_more", + "dyn-clone", "futures", "http 1.3.1", "http-body 1.0.1", @@ -8691,8 +8719,8 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-eips", "alloy-genesis", @@ -8719,11 +8747,12 @@ dependencies = [ [[package]] name = "reth-rpc-builder" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-network", "alloy-provider", + "dyn-clone", "http 1.3.1", "jsonrpsee", "metrics", @@ -8757,8 +8786,8 @@ dependencies = [ [[package]] name = "reth-rpc-convert" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-json-rpc", @@ -8766,6 +8795,8 @@ dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", "alloy-signer", + "auto_impl", + "dyn-clone", "jsonrpsee-types", "reth-ethereum-primitives", "reth-evm", @@ -8776,8 +8807,8 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8806,8 +8837,8 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -8850,8 +8881,8 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8897,8 +8928,8 @@ dependencies = [ [[package]] name = "reth-rpc-layer" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-rpc-types-engine", "http 1.3.1", @@ -8911,8 +8942,8 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8927,8 +8958,8 @@ dependencies = [ [[package]] name = "reth-stages" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8971,8 +9002,8 @@ dependencies = [ [[package]] name = "reth-stages-api" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8998,8 +9029,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "arbitrary", @@ -9012,8 +9043,8 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "parking_lot", @@ -9032,8 +9063,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "clap", @@ -9044,8 +9075,8 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9067,8 +9098,8 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-eips", "alloy-primitives", @@ -9083,8 +9114,8 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "auto_impl", "dyn-clone", @@ -9101,8 +9132,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "tokio", "tokio-stream", @@ -9111,8 +9142,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "clap", "eyre", @@ -9126,8 +9157,8 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9166,8 +9197,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9191,8 +9222,8 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -9217,8 +9248,8 @@ dependencies = [ [[package]] name = "reth-trie-db" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "reth-db-api", @@ -9230,8 +9261,8 @@ dependencies = [ [[package]] name = "reth-trie-parallel" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -9255,8 +9286,8 @@ dependencies = [ [[package]] name = "reth-trie-sparse" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -9274,8 +9305,8 @@ dependencies = [ [[package]] name = "reth-trie-sparse-parallel" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -9292,8 +9323,8 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "1.7.0" -source = "git+https://github.com/sprites0/reth?rev=40dd1247a55fdceca05e38a1320c054010d5bb34#40dd1247a55fdceca05e38a1320c054010d5bb34" +version = "1.8.2" +source = "git+https://github.com/sprites0/reth?rev=83baf84bcb6d88081fc1b39f97733b8ec345cb88#83baf84bcb6d88081fc1b39f97733b8ec345cb88" dependencies = [ "zstd", ] @@ -9401,9 +9432,9 @@ dependencies = [ [[package]] name = "revm" -version = "29.0.0" +version = "29.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c278b6ee9bba9e25043e3fae648fdce632d1944d3ba16f5203069b43bddd57f" +checksum = "718d90dce5f07e115d0e66450b1b8aa29694c1cf3f89ebddaddccc2ccbd2f13e" dependencies = [ "revm-bytecode", "revm-context", @@ -9432,9 +9463,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "9.0.2" +version = "9.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fb02c5dab3b535aa5b18277b1d21c5117a25d42af717e6ce133df0ea56663e1" +checksum = "5a20c98e7008591a6f012550c2a00aa36cba8c14cc88eb88dec32eb9102554b4" dependencies = [ "bitvec", "cfg-if", @@ -9449,9 +9480,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "10.1.0" +version = "10.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8e9311d27cf75fbf819e7ba4ca05abee1ae02e44ff6a17301c7ab41091b259" +checksum = "b50d241ed1ce647b94caf174fcd0239b7651318b2c4c06b825b59b973dfb8495" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -9492,9 +9523,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "10.0.0" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528d2d81cc918d311b8231c35330fac5fba8b69766ddc538833e2b5593ee016e" +checksum = "550331ea85c1d257686e672081576172fe3d5a10526248b663bbf54f1bef226a" dependencies = [ "auto_impl", "derive-where", @@ -9511,9 +9542,9 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "10.0.0" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf443b664075999a14916b50c5ae9e35a7d71186873b8f8302943d50a672e5e0" +checksum = "7c0a6e9ccc2ae006f5bed8bd80cd6f8d3832cd55c5e861b9402fdd556098512f" dependencies = [ "auto_impl", "either", @@ -9529,9 +9560,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.29.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fdb678b03faa678a7007a7c761a78efa9ca9adcd9434ef3d1ad894aec6e43d1" +checksum = "e9b329afcc0f9fd5adfa2c6349a7435a8558e82bcae203142103a9a95e2a63b6" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -9549,9 +9580,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "25.0.2" +version = "25.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d6406b711fac73b4f13120f359ed8e65964380dd6182bd12c4c09ad0d4641f" +checksum = "06575dc51b1d8f5091daa12a435733a90b4a132dca7ccee0666c7db3851bc30c" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -10223,18 +10254,28 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 1c7fcb04e..914515598 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "reth_hl" version = "0.1.0" -edition = "2021" +edition = "2024" build = "build.rs" [lib] @@ -26,67 +26,67 @@ lto = "fat" codegen-units = 1 [dependencies] -reth = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-cli = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-cli-commands = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-basic-payload-builder = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-db = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-db-api = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-chainspec = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-cli-util = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-discv4 = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-engine-primitives = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-ethereum-forks = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-ethereum-payload-builder = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-ethereum-primitives = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-eth-wire = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-eth-wire-types = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-evm = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-evm-ethereum = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-node-core = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-revm = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-network = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-network-p2p = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-network-api = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-node-ethereum = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-network-peers = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-payload-primitives = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-primitives = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-primitives-traits = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-provider = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34", features = ["test-utils"] } -reth-rpc = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-rpc-eth-api = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-rpc-engine-api = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-tracing = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-trie-common = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-trie-db = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-codecs = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-transaction-pool = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-stages-types = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-storage-api = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-errors = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-rpc-convert = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-rpc-eth-types = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-rpc-server-types = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -reth-metrics = { git = "https://github.com/sprites0/reth", rev = "40dd1247a55fdceca05e38a1320c054010d5bb34" } -revm = { version = "29.0.0", default-features = false } +reth = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-cli = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-cli-commands = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-basic-payload-builder = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-db = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-db-api = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-chainspec = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-cli-util = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-discv4 = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-engine-primitives = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-ethereum-forks = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-ethereum-payload-builder = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-ethereum-primitives = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-eth-wire = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-eth-wire-types = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-evm = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-evm-ethereum = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-node-core = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-revm = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-network = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-network-p2p = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-network-api = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-node-ethereum = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-network-peers = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-payload-primitives = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-primitives = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-primitives-traits = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-provider = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88", features = ["test-utils"] } +reth-rpc = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-rpc-eth-api = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-rpc-engine-api = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-tracing = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-trie-common = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-trie-db = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-codecs = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-transaction-pool = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-stages-types = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-storage-api = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-errors = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-rpc-convert = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-rpc-eth-types = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-rpc-server-types = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +reth-metrics = { git = "https://github.com/sprites0/reth", rev = "83baf84bcb6d88081fc1b39f97733b8ec345cb88" } +revm = { version = "29.0.1", default-features = false } # alloy dependencies -alloy-genesis = { version = "1.0.30", default-features = false } -alloy-consensus = { version = "1.0.30", default-features = false } +alloy-genesis = { version = "1.0.37", default-features = false } +alloy-consensus = { version = "1.0.37", default-features = false } alloy-chains = { version = "0.2.5", default-features = false } -alloy-eips = { version = "1.0.30", default-features = false } -alloy-evm = { version = "0.20.1", default-features = false } +alloy-eips = { version = "1.0.37", default-features = false } +alloy-evm = { version = "0.21.0", default-features = false } alloy-json-abi = { version = "1.3.1", default-features = false } -alloy-json-rpc = { version = "1.0.30", default-features = false } +alloy-json-rpc = { version = "1.0.37", default-features = false } alloy-dyn-abi = "1.3.1" -alloy-network = { version = "1.0.30", default-features = false } +alloy-network = { version = "1.0.37", default-features = false } alloy-primitives = { version = "1.3.1", default-features = false, features = ["map-foldhash"] } alloy-rlp = { version = "0.3.10", default-features = false, features = ["core-net"] } -alloy-rpc-types = { version = "1.0.30", features = ["eth"], default-features = false } -alloy-rpc-types-eth = { version = "1.0.30", default-features = false } -alloy-rpc-types-engine = { version = "1.0.30", default-features = false } -alloy-signer = { version = "1.0.30", default-features = false } +alloy-rpc-types = { version = "1.0.37", features = ["eth"], default-features = false } +alloy-rpc-types-eth = { version = "1.0.37", default-features = false } +alloy-rpc-types-engine = { version = "1.0.37", default-features = false } +alloy-signer = { version = "1.0.37", default-features = false } alloy-sol-macro = "1.3.1" alloy-sol-types = { version = "1.3.1", default-features = false } diff --git a/src/addons/hl_node_compliance.rs b/src/addons/hl_node_compliance.rs index 009fc16ab..3cd227cc5 100644 --- a/src/addons/hl_node_compliance.rs +++ b/src/addons/hl_node_compliance.rs @@ -7,7 +7,10 @@ //! For non-system transactions, we can just return the log as is, and the client will //! adjust the transaction index accordingly. -use alloy_consensus::{transaction::TransactionMeta, BlockHeader, TxReceipt}; +use alloy_consensus::{ + BlockHeader, TxReceipt, + transaction::{TransactionMeta, TxHashRef}, +}; use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_json_rpc::RpcObject; use alloy_primitives::{B256, U256}; @@ -30,7 +33,7 @@ use reth_rpc_eth_api::{ RpcConvert, RpcHeader, RpcNodeCoreExt, RpcReceipt, RpcTransaction, RpcTxReq, }; use serde::Serialize; -use std::{borrow::Cow, marker::PhantomData, sync::Arc}; +use std::{marker::PhantomData, sync::Arc}; use tokio_stream::{Stream, StreamExt}; use tracing::{trace, Instrument}; @@ -182,7 +185,7 @@ impl HlSystemTransactionExt { }; let input = ConvertReceiptInput { - receipt: Cow::Borrowed(receipt), + receipt: receipt.clone(), tx, gas_used: receipt.cumulative_gas_used() - gas_used, next_log_index, @@ -530,7 +533,7 @@ async fn adjust_block_receipts( }; let input = ConvertReceiptInput { - receipt: Cow::Borrowed(receipt), + receipt: receipt.clone(), tx, gas_used: receipt.cumulative_gas_used() - gas_used, next_log_index, diff --git a/src/main.rs b/src/main.rs index 72910f4ea..4c5232749 100644 --- a/src/main.rs +++ b/src/main.rs @@ -27,11 +27,6 @@ static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; fn main() -> eyre::Result<()> { reth_cli_util::sigsegv_handler::install(); - // Enable backtraces unless a RUST_BACKTRACE value has already been explicitly provided. - if std::env::var_os("RUST_BACKTRACE").is_none() { - std::env::set_var("RUST_BACKTRACE", "1"); - } - // Initialize custom version metadata before parsing CLI so --version uses reth-hl values reth_hl::version::init_reth_hl_version(); @@ -80,8 +75,8 @@ fn main() -> eyre::Result<()> { Ok(()) }) - .apply(|builder| { - builder.db().create_tables_for::().expect("create tables"); + .apply(|mut builder| { + builder.db_mut().create_tables_for::().expect("create tables"); builder }) .launch() diff --git a/src/node/cli.rs b/src/node/cli.rs index aa51d9740..f232bc183 100644 --- a/src/node/cli.rs +++ b/src/node/cli.rs @@ -136,8 +136,9 @@ where // Install the prometheus recorder to be sure to record all metrics let _ = install_prometheus_recorder(); - let components = - |spec: Arc| (HlEvmConfig::new(spec.clone()), HlConsensus::new(spec)); + let components = |spec: Arc| { + (HlEvmConfig::new(spec.clone()), Arc::new(HlConsensus::new(spec))) + }; match self.command { Commands::Node(command) => runner.run_command_until_exit(|ctx| { @@ -157,9 +158,6 @@ where runner.run_command_until_exit(|ctx| command.execute::(ctx, components)) } Commands::Config(command) => runner.run_until_ctrl_c(command.execute()), - Commands::Recover(command) => { - runner.run_command_until_exit(|ctx| command.execute::(ctx)) - } Commands::Prune(command) => runner.run_until_ctrl_c(command.execute::()), Commands::Import(command) => { runner.run_blocking_until_ctrl_c(command.execute::(components)) diff --git a/src/node/consensus/mod.rs b/src/node/consensus/mod.rs index 440e066ed..ce2ea1dda 100644 --- a/src/node/consensus/mod.rs +++ b/src/node/consensus/mod.rs @@ -1,7 +1,7 @@ use crate::{hardforks::HlHardforks, node::HlNode, HlBlock, HlBlockBody, HlPrimitives}; use alloy_consensus::Header; use reth::{ - api::FullNodeTypes, + api::{FullNodeTypes, NodeTypes}, beacon_consensus::EthBeaconConsensus, builder::{components::ConsensusBuilder, BuilderContext}, consensus::{Consensus, ConsensusError, FullConsensus, HeaderValidator}, @@ -24,7 +24,7 @@ impl ConsensusBuilder for HlConsensusBuilder where Node: FullNodeTypes, { - type Consensus = Arc>; + type Consensus = Arc::ChainSpec>>; async fn build_consensus(self, ctx: &BuilderContext) -> eyre::Result { Ok(Arc::new(HlConsensus::new(ctx.chain_spec()))) diff --git a/src/node/evm/config.rs b/src/node/evm/config.rs index 22c670e6f..c2783bec4 100644 --- a/src/node/evm/config.rs +++ b/src/node/evm/config.rs @@ -106,7 +106,10 @@ where } else { // for the first post-fork block, both parent.blob_gas_used and // parent.excess_blob_gas are evaluated as 0 - Some(alloy_eips::eip7840::BlobParams::cancun().next_block_excess_blob_gas(0, 0)) + Some( + alloy_eips::eip7840::BlobParams::cancun() + .next_block_excess_blob_gas_osaka(0, 0, 0), + ) }; } @@ -284,7 +287,7 @@ where self } - fn evm_env(&self, header: &Header) -> EvmEnv { + fn evm_env(&self, header: &Header) -> Result, Self::Error> { let blob_params = self.chain_spec().blob_params_at_timestamp(header.timestamp); let spec = revm_spec_by_timestamp_and_block_number( self.chain_spec().clone(), @@ -324,7 +327,7 @@ where blob_excess_gas_and_price, }; - EvmEnv { cfg_env, block_env } + Ok(EvmEnv { cfg_env, block_env }) } fn next_evm_env( @@ -373,9 +376,9 @@ where fn context_for_block<'a>( &self, block: &'a SealedBlock>, - ) -> ExecutionCtxFor<'a, Self> { + ) -> Result, Self::Error> { let block_body = block.body(); - HlBlockExecutionCtx { + Ok(HlBlockExecutionCtx { ctx: EthBlockExecutionCtx { parent_hash: block.header().parent_hash, parent_beacon_block_root: block.header().parent_beacon_block_root, @@ -386,15 +389,15 @@ where read_precompile_calls: block_body.read_precompile_calls.clone(), highest_precompile_address: block_body.highest_precompile_address, }, - } + }) } fn context_for_next_block( &self, parent: &SealedHeader>, attributes: Self::NextBlockEnvCtx, - ) -> ExecutionCtxFor<'_, Self> { - HlBlockExecutionCtx { + ) -> Result, Self::Error> { + Ok(HlBlockExecutionCtx { ctx: EthBlockExecutionCtx { parent_hash: parent.hash(), parent_beacon_block_root: attributes.parent_beacon_block_root, @@ -402,13 +405,13 @@ where withdrawals: attributes.withdrawals.map(Cow::Owned), }, extras: HlExtras::default(), // TODO: hacky, double check if this is correct - } + }) } } impl ConfigureEngineEvm for HlEvmConfig { fn evm_env_for_payload(&self, payload: &HlExecutionData) -> EvmEnvFor { - self.evm_env(&payload.0.header) + self.evm_env(&payload.0.header).unwrap() } fn context_for_payload<'a>(&self, payload: &'a HlExecutionData) -> ExecutionCtxFor<'a, Self> { diff --git a/src/node/evm/executor.rs b/src/node/evm/executor.rs index 358ceb453..9da938dc4 100644 --- a/src/node/evm/executor.rs +++ b/src/node/evm/executor.rs @@ -8,29 +8,26 @@ use crate::{ }, }; use alloy_consensus::{Transaction, TxReceipt}; -use alloy_eips::{eip7685::Requests, Encodable2718}; +use alloy_eips::{Encodable2718, eip7685::Requests}; use alloy_evm::{block::ExecutableTx, eth::receipt_builder::ReceiptBuilderCtx}; -use alloy_primitives::{address, hex, Address, Bytes, U160, U256}; +use alloy_primitives::{Address, Bytes, U160, U256, address, hex}; use reth_chainspec::{EthChainSpec, EthereumHardforks, Hardforks}; use reth_evm::{ - block::{BlockValidationError, CommitChanges}, + Database, Evm, FromRecoveredTx, FromTxWithEncoded, IntoTxEnv, OnStateHook, + block::BlockValidationError, eth::receipt_builder::ReceiptBuilder, execute::{BlockExecutionError, BlockExecutor}, precompiles::{DynPrecompile, PrecompileInput, PrecompilesMap}, - Database, Evm, FromRecoveredTx, FromTxWithEncoded, IntoTxEnv, OnStateHook, }; use reth_provider::BlockExecutionResult; use reth_revm::State; use revm::{ - context::{ - result::{ExecutionResult, ResultAndState}, - TxEnv, - }, + DatabaseCommit, + context::{TxEnv, result::ResultAndState}, interpreter::instructions::utility::IntoU256, precompile::{PrecompileError, PrecompileOutput, PrecompileResult}, primitives::HashMap, state::Bytecode, - DatabaseCommit, }; pub fn is_system_transaction(tx: &TransactionSigned) -> bool { @@ -87,12 +84,12 @@ impl<'a, DB, EVM, Spec, R: ReceiptBuilder> HlBlockExecutor<'a, EVM, Spec, R> where DB: Database + 'a, EVM: Evm< - DB = &'a mut State, - Precompiles = PrecompilesMap, - Tx: FromRecoveredTx - + FromRecoveredTx - + FromTxWithEncoded, - >, + DB = &'a mut State, + Precompiles = PrecompilesMap, + Tx: FromRecoveredTx + + FromRecoveredTx + + FromTxWithEncoded, + >, Spec: EthereumHardforks + HlHardforks + EthChainSpec + Hardforks + Clone, R: ReceiptBuilder, ::Transaction: Unpin + From, @@ -110,7 +107,9 @@ where const COREWRITER_ENABLED_BLOCK_NUMBER: u64 = 7578300; const COREWRITER_CONTRACT_ADDRESS: Address = address!("0x3333333333333333333333333333333333333333"); - const COREWRITER_CODE: &[u8] = &hex!("608060405234801561000f575f5ffd5b5060043610610029575f3560e01c806317938e131461002d575b5f5ffd5b61004760048036038101906100429190610123565b610049565b005b5f5f90505b61019081101561006557808060010191505061004e565b503373ffffffffffffffffffffffffffffffffffffffff167f8c7f585fb295f7eb1e6aeb8fba61b23a4fe60beda405f0045073b185c74412e383836040516100ae9291906101c8565b60405180910390a25050565b5f5ffd5b5f5ffd5b5f5ffd5b5f5ffd5b5f5ffd5b5f5f83601f8401126100e3576100e26100c2565b5b8235905067ffffffffffffffff811115610100576100ff6100c6565b5b60208301915083600182028301111561011c5761011b6100ca565b5b9250929050565b5f5f60208385031215610139576101386100ba565b5b5f83013567ffffffffffffffff811115610156576101556100be565b5b610162858286016100ce565b92509250509250929050565b5f82825260208201905092915050565b828183375f83830152505050565b5f601f19601f8301169050919050565b5f6101a7838561016e565b93506101b483858461017e565b6101bd8361018c565b840190509392505050565b5f6020820190508181035f8301526101e181848661019c565b9050939250505056fea2646970667358221220f01517e1fbaff8af4bd72cb063cccecbacbb00b07354eea7dd52265d355474fb64736f6c634300081c0033"); + const COREWRITER_CODE: &[u8] = &hex!( + "608060405234801561000f575f5ffd5b5060043610610029575f3560e01c806317938e131461002d575b5f5ffd5b61004760048036038101906100429190610123565b610049565b005b5f5f90505b61019081101561006557808060010191505061004e565b503373ffffffffffffffffffffffffffffffffffffffff167f8c7f585fb295f7eb1e6aeb8fba61b23a4fe60beda405f0045073b185c74412e383836040516100ae9291906101c8565b60405180910390a25050565b5f5ffd5b5f5ffd5b5f5ffd5b5f5ffd5b5f5ffd5b5f5f83601f8401126100e3576100e26100c2565b5b8235905067ffffffffffffffff811115610100576100ff6100c6565b5b60208301915083600182028301111561011c5761011b6100ca565b5b9250929050565b5f5f60208385031215610139576101386100ba565b5b5f83013567ffffffffffffffff811115610156576101556100be565b5b610162858286016100ce565b92509250509250929050565b5f82825260208201905092915050565b828183375f83830152505050565b5f601f19601f8301169050919050565b5f6101a7838561016e565b93506101b483858461017e565b6101bd8361018c565b840190509392505050565b5f6020820190508181035f8301526101e181848661019c565b9050939250505056fea2646970667358221220f01517e1fbaff8af4bd72cb063cccecbacbb00b07354eea7dd52265d355474fb64736f6c634300081c0033" + ); if self.evm.block().number != U256::from(COREWRITER_ENABLED_BLOCK_NUMBER) { return Ok(()); @@ -137,12 +136,12 @@ impl<'a, DB, E, Spec, R> BlockExecutor for HlBlockExecutor<'a, E, Spec, R> where DB: Database + 'a, E: Evm< - DB = &'a mut State, - Tx: FromRecoveredTx - + FromRecoveredTx - + FromTxWithEncoded, - Precompiles = PrecompilesMap, - >, + DB = &'a mut State, + Tx: FromRecoveredTx + + FromRecoveredTx + + FromTxWithEncoded, + Precompiles = PrecompilesMap, + >, Spec: EthereumHardforks + HlHardforks + EthChainSpec + Hardforks, R: ReceiptBuilder, ::Transaction: Unpin + From, @@ -161,11 +160,10 @@ where Ok(()) } - fn execute_transaction_with_commit_condition( + fn execute_transaction_without_commit( &mut self, tx: impl ExecutableTx, - f: impl FnOnce(&ExecutionResult<::HaltReason>) -> CommitChanges, - ) -> Result, BlockExecutionError> { + ) -> Result::HaltReason>, BlockExecutionError> { // The sum of the transaction's gas limit, Tg, and the gas utilized in this block prior, // must be no greater than the block's gasLimit. let block_available_gas = self.evm.block().gas_limit - self.gas_used; @@ -178,15 +176,19 @@ where .into()); } - // Execute transaction. - let ResultAndState { result, mut state } = self - .evm - .transact(&tx) - .map_err(|err| BlockExecutionError::evm(err, tx.tx().trie_hash()))?; + // Execute transaction and return the result + self.evm.transact(&tx).map_err(|err| { + let hash = tx.tx().trie_hash(); + BlockExecutionError::evm(err, hash) + }) + } - if !f(&result).should_commit() { - return Ok(None); - } + fn commit_transaction( + &mut self, + output: ResultAndState<::HaltReason>, + tx: impl ExecutableTx, + ) -> Result { + let ResultAndState { result, mut state } = output; let gas_used = result.gas_used(); @@ -215,7 +217,7 @@ where // Commit the state changes. self.evm.db_mut().commit(state); - Ok(Some(gas_used)) + Ok(gas_used) } fn finish(self) -> Result<(Self::Evm, BlockExecutionResult), BlockExecutionError> { diff --git a/src/node/primitives/tx_wrapper.rs b/src/node/primitives/tx_wrapper.rs index ee5a17a47..872439901 100644 --- a/src/node/primitives/tx_wrapper.rs +++ b/src/node/primitives/tx_wrapper.rs @@ -1,30 +1,32 @@ //! HlNodePrimitives::TransactionSigned; it's the same as ethereum transaction type, //! except that it supports pseudo signer for system transactions. +use std::convert::Infallible; + use crate::evm::transaction::HlTxEnv; use alloy_consensus::{ - crypto::RecoveryError, error::ValueError, SignableTransaction, Signed, - Transaction as TransactionTrait, TransactionEnvelope, TxEip1559, TxEip2930, TxEip4844, - TxEip7702, TxLegacy, TxType, TypedTransaction, + SignableTransaction, Signed, Transaction as TransactionTrait, TransactionEnvelope, TxEip1559, + TxEip2930, TxEip4844, TxEip7702, TxLegacy, TxType, TypedTransaction, crypto::RecoveryError, + error::ValueError, transaction::TxHashRef, }; use alloy_eips::Encodable2718; use alloy_network::TxSigner; -use alloy_primitives::{address, Address, TxHash, U256}; +use alloy_primitives::{Address, TxHash, U256, address}; use alloy_rpc_types::{Transaction, TransactionInfo, TransactionRequest}; use alloy_signer::Signature; use reth_codecs::alloy::transaction::{Envelope, FromTxCompact}; use reth_db::{ - table::{Compress, Decompress}, DatabaseError, + table::{Compress, Decompress}, }; use reth_ethereum_primitives::PooledTransactionVariant; use reth_evm::FromRecoveredTx; use reth_primitives::Recovered; use reth_primitives_traits::{ - serde_bincode_compat::SerdeBincodeCompat, InMemorySize, SignedTransaction, SignerRecoverable, + InMemorySize, SignedTransaction, SignerRecoverable, serde_bincode_compat::SerdeBincodeCompat, }; use reth_rpc_eth_api::{ - transaction::{FromConsensusTx, TryIntoTxEnv}, EthTxEnvError, SignTxRequestError, SignableTxRequest, TryIntoSimTx, + transaction::{FromConsensusTx, TryIntoTxEnv}, }; use revm::context::{BlockEnv, CfgEnv, TxEnv}; @@ -46,6 +48,12 @@ fn s_to_address(s: U256) -> Address { Address::from_slice(&buf) } +impl TxHashRef for TransactionSigned { + fn tx_hash(&self) -> &TxHash { + self.inner().tx_hash() + } +} + impl SignerRecoverable for TransactionSigned { fn recover_signer(&self) -> Result { if self.is_system_transaction() { @@ -69,11 +77,7 @@ impl SignerRecoverable for TransactionSigned { } } -impl SignedTransaction for TransactionSigned { - fn tx_hash(&self) -> &TxHash { - self.inner().tx_hash() - } -} +impl SignedTransaction for TransactionSigned {} // ------------------------------------------------------------ // NOTE: All lines below are just wrappers for the inner type. @@ -250,9 +254,17 @@ impl TryIntoTxEnv> for TransactionRequest { impl FromConsensusTx for Transaction { type TxInfo = TransactionInfo; + type Err = Infallible; - fn from_consensus_tx(tx: TransactionSigned, signer: Address, tx_info: Self::TxInfo) -> Self { - Self::from_transaction(Recovered::new_unchecked(tx.into_inner().into(), signer), tx_info) + fn from_consensus_tx( + tx: TransactionSigned, + signer: Address, + tx_info: Self::TxInfo, + ) -> Result { + Ok(Self::from_transaction( + Recovered::new_unchecked(tx.into_inner().into(), signer), + tx_info, + )) } } diff --git a/src/node/rpc/block.rs b/src/node/rpc/block.rs index ea4867fbb..d9fcaca2a 100644 --- a/src/node/rpc/block.rs +++ b/src/node/rpc/block.rs @@ -1,12 +1,12 @@ use crate::node::rpc::{HlEthApi, HlRpcNodeCore}; use reth::rpc::server_types::eth::{ - builder::config::PendingBlockKind, error::FromEvmError, EthApiError, PendingBlock, + EthApiError, PendingBlock, builder::config::PendingBlockKind, error::FromEvmError, }; use reth_rpc_eth_api::{ - helpers::{ - pending_block::PendingEnvBuilder, EthBlocks, LoadBlock, LoadPendingBlock, LoadReceipt, - }, RpcConvert, + helpers::{ + EthBlocks, LoadBlock, LoadPendingBlock, LoadReceipt, pending_block::PendingEnvBuilder, + }, }; impl EthBlocks for HlEthApi @@ -29,7 +29,7 @@ impl LoadPendingBlock for HlEthApi where N: HlRpcNodeCore, EthApiError: FromEvmError, - Rpc: RpcConvert, + Rpc: RpcConvert, { #[inline] fn pending_block(&self) -> &tokio::sync::Mutex>> { @@ -50,7 +50,6 @@ where impl LoadReceipt for HlEthApi where N: HlRpcNodeCore, - EthApiError: FromEvmError, Rpc: RpcConvert, { } diff --git a/src/node/rpc/call.rs b/src/node/rpc/call.rs index 179a16477..c7fe46a21 100644 --- a/src/node/rpc/call.rs +++ b/src/node/rpc/call.rs @@ -3,11 +3,11 @@ use core::fmt; use super::{HlEthApi, HlRpcNodeCore}; use crate::{node::evm::apply_precompiles, HlBlock}; use alloy_evm::Evm; +use alloy_consensus::transaction::TxHashRef; use alloy_primitives::B256; use reth::rpc::server_types::eth::EthApiError; use reth_evm::{ConfigureEvm, Database, EvmEnvFor, HaltReasonFor, InspectorFor, SpecFor, TxEnvFor}; use reth_primitives::{NodePrimitives, Recovered}; -use reth_primitives_traits::SignedTransaction; use reth_provider::{ProviderError, ProviderTx}; use reth_rpc_eth_api::{ helpers::{Call, EthCall}, diff --git a/src/node/rpc/mod.rs b/src/node/rpc/mod.rs index c68a95d44..840314b1a 100644 --- a/src/node/rpc/mod.rs +++ b/src/node/rpc/mod.rs @@ -1,7 +1,7 @@ use crate::{ + HlBlock, HlPrimitives, chainspec::HlChainSpec, node::{evm::apply_precompiles, types::HlExtras}, - HlBlock, HlPrimitives, }; use alloy_eips::BlockId; use alloy_evm::Evm; @@ -10,19 +10,19 @@ use alloy_primitives::U256; use reth::{ api::{FullNodeTypes, HeaderTy, NodeTypes, PrimitivesTy}, builder::{ - rpc::{EthApiBuilder, EthApiCtx}, FullNodeComponents, + rpc::{EthApiBuilder, EthApiCtx}, }, rpc::{ - eth::{core::EthApiInner, DevSigner, FullEthApiServer}, + eth::{DevSigner, FullEthApiServer, core::EthApiInner}, server_types::eth::{ - receipt::EthReceiptConverter, EthApiError, EthStateCache, FeeHistoryCache, - GasPriceOracle, + EthApiError, EthStateCache, FeeHistoryCache, GasPriceOracle, + receipt::EthReceiptConverter, }, }, tasks::{ - pool::{BlockingTaskGuard, BlockingTaskPool}, TaskSpawner, + pool::{BlockingTaskGuard, BlockingTaskPool}, }, }; use reth_evm::{ConfigureEvm, Database, EvmEnvFor, HaltReasonFor, InspectorFor, TxEnvFor}; @@ -32,12 +32,12 @@ use reth_provider::{ }; use reth_rpc::RpcTypes; use reth_rpc_eth_api::{ - helpers::{ - pending_block::BuildPendingEnv, spec::SignersForApi, AddDevSigners, EthApiSpec, EthFees, - EthState, LoadFee, LoadPendingBlock, LoadState, SpawnBlocking, Trace, - }, EthApiTypes, FromEvmError, RpcConvert, RpcConverter, RpcNodeCore, RpcNodeCoreExt, SignableTxRequest, + helpers::{ + AddDevSigners, EthApiSpec, EthFees, EthState, LoadFee, LoadPendingBlock, LoadState, + SpawnBlocking, Trace, pending_block::BuildPendingEnv, spec::SignersForApi, + }, }; use revm::context::result::ResultAndState; use std::{fmt, marker::PhantomData, sync::Arc}; @@ -60,12 +60,17 @@ pub(crate) struct HlEthApiInner { type HlRpcConvert = RpcConverter::Evm, EthReceiptConverter>; -#[derive(Clone)] pub struct HlEthApi { /// Gateway to node's core components. pub(crate) inner: Arc>, } +impl Clone for HlEthApi { + fn clone(&self) -> Self { + Self { inner: self.inner.clone() } + } +} + impl fmt::Debug for HlEthApi where N: HlRpcNodeCore, @@ -79,7 +84,7 @@ where impl EthApiTypes for HlEthApi where N: HlRpcNodeCore, - Rpc: RpcConvert, + Rpc: RpcConvert, { type Error = EthApiError; type NetworkTypes = Rpc::Network; @@ -155,7 +160,7 @@ where impl SpawnBlocking for HlEthApi where N: HlRpcNodeCore, - Rpc: RpcConvert, + Rpc: RpcConvert, { #[inline] fn io_task_spawner(&self) -> impl TaskSpawner { diff --git a/src/node/rpc/transaction.rs b/src/node/rpc/transaction.rs index d24bea2ba..67f5d70ae 100644 --- a/src/node/rpc/transaction.rs +++ b/src/node/rpc/transaction.rs @@ -1,9 +1,11 @@ +use std::time::Duration; + use crate::node::rpc::{HlEthApi, HlRpcNodeCore}; -use alloy_primitives::{Bytes, B256}; +use alloy_primitives::{B256, Bytes}; use reth::rpc::server_types::eth::EthApiError; use reth_rpc_eth_api::{ - helpers::{spec::SignersForRpc, EthTransactions, LoadTransaction}, RpcConvert, + helpers::{EthTransactions, LoadTransaction, spec::SignersForRpc}, }; impl LoadTransaction for HlEthApi @@ -25,4 +27,8 @@ where async fn send_raw_transaction(&self, _tx: Bytes) -> Result { unreachable!() } + + fn send_raw_transaction_sync_timeout(&self) -> Duration { + self.inner.eth_api.send_raw_transaction_sync_timeout() + } }