From e7cfd675f1d6cf7bde6308b327942e76f5f0336d Mon Sep 17 00:00:00 2001 From: Solar Mithril Date: Mon, 19 May 2025 16:59:02 +0600 Subject: [PATCH 1/4] Bump reth to 1.4.1 --- Cargo.lock | 1402 ++++++++++------- Cargo.toml | 152 +- Dockerfile | 2 +- crates/op-rbuilder/Cargo.toml | 4 +- crates/op-rbuilder/src/bin/tester/main.rs | 2 +- crates/op-rbuilder/src/integration/mod.rs | 0 crates/op-rbuilder/src/payload_builder.rs | 18 +- .../src/payload_builder_vanilla.rs | 18 +- rust-toolchain.toml | 2 +- 9 files changed, 959 insertions(+), 641 deletions(-) create mode 100644 crates/op-rbuilder/src/integration/mod.rs diff --git a/Cargo.lock b/Cargo.lock index 651584b..b2088b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -110,14 +110,14 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2179ba839ac532f50279f5da2a6c5047f791f03f6f808b4dfab11327b97902f" +checksum = "785982a9b7b86d3fdf4ca43eb9a82447ccb7188ea78804ce64b6d6d82cc3e202" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 1.0.3", "alloy-trie", "arbitrary", "auto_impl", @@ -127,6 +127,7 @@ dependencies = [ "k256", "once_cell", "rand 0.8.5", + "secp256k1", "serde", "serde_with", "thiserror 2.0.12", @@ -134,24 +135,24 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec6f67bdc62aa277e0ec13c1b1fb396c8a62b65c8e9bd8c1d3583cc6d1a8dd3" +checksum = "81d0d4b81bd538d023236b5301582c962aa2f2043d1b3a1373ea88fbee82a8e0" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 1.0.3", "arbitrary", "serde", ] [[package]] name = "alloy-dyn-abi" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884a5d4560f7e5e34ec3c5e54a60223c56352677dd049b495fbb59384cf72a90" +checksum = "4f90b63261b7744642f6075ed17db6de118eecbe9516ea6c6ffd444b80180b75" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -220,7 +221,27 @@ dependencies = [ "alloy-eip7702", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.14.0", + "auto_impl", + "c-kzg", + "derive_more", + "either", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "alloy-eips" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f29e7fda66a9d3315db883947a21b79f018cf6d873ee51660a93cb712696928" +dependencies = [ + "alloy-eip2124", + "alloy-eip2930", + "alloy-eip7702", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 1.0.3", "arbitrary", "auto_impl", "c-kzg", @@ -234,12 +255,12 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.5.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caabd28657614cecc14d77fde0a630c5c177bfe432ce4ad99db0ad41d9219856" +checksum = "de0210f2d5854895b376f7fbbf78f3e33eb4f0e59abc503502cc0ed8d295a837" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-hardforks", "alloy-primitives", "alloy-sol-types", @@ -253,13 +274,13 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dfec8348d97bd624901c6a4b22bb4c24df8a3128fc3d5e42d24f7b79dfa8588" +checksum = "cfc71c06880f44758e8c748db17f3e4661240bfa06f665089097e8cdd0583ca4" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", - "alloy-serde", + "alloy-serde 1.0.3", "alloy-trie", "serde", ] @@ -280,9 +301,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5189fa9a8797e92396bc4b4454c5f2073a4945f7c2b366af9af60f9536558f7a" +checksum = "0068ae277f5ee3153a95eaea8ff10e188ed8ccde9b7f9926305415a2c0ab2442" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -292,9 +313,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3994ab6ff6bdeb5aebe65381a8f6a47534789817570111555e8ac413e242ce06" +checksum = "265ebe8c014bf3f1c7872a208e6fd3a157b93405ec826383492dbe31085197aa" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -306,19 +327,19 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be3aa020a6d3aa7601185b4c1a7d6f3a5228cb5424352db63064b29a455c891" +checksum = "1a9d67becc5c6dd5c85e0f4a9cda0a1f4d5805749b8b4da906d96947ef801dd5" dependencies = [ "alloy-consensus", "alloy-consensus-any", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-json-rpc", "alloy-network-primitives", "alloy-primitives", "alloy-rpc-types-any", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 1.0.3", "alloy-signer", "alloy-sol-types", "async-trait", @@ -332,25 +353,25 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498f2ee2eef38a6db0fc810c7bf7daebdf5f2fa8d04adb8bd53e54e91ddbdea3" +checksum = "60301cdd4e0b9059ec53a5b34dc93c245947638b95634000f92c5f10acd17fbf" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", - "alloy-serde", + "alloy-serde 1.0.3", "serde", ] [[package]] name = "alloy-op-evm" -version = "0.5.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360e7f865a76106d9fe976fda85da52b380ae2a9ffcb09d2d81953c979503c7f" +checksum = "5ee0165cc5f92d8866c0a21320ee6f089a7e1d0cebbf7008c37a6380a912ebe2" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-evm", "alloy-op-hardforks", "alloy-primitives", @@ -372,9 +393,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b98b99c1dcfbe74d7f0b31433ff215e7d1555e367d90e62db904f3c9d4ff53" +checksum = "6a12fe11d0b8118e551c29e1a67ccb6d01cc07ef08086df30f07487146de6fa1" dependencies = [ "alloy-rlp", "arbitrary", @@ -403,13 +424,13 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6ba76d476f475668925f858cc4db51781f12abdaa4e0274eb57a09f574e869" +checksum = "4af4bd045e414b3b52e929d31a9413bf072dd78cee9b962eb2d9fc5e500c3ccb" dependencies = [ "alloy-chains", "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-json-rpc", "alloy-network", "alloy-network-primitives", @@ -445,9 +466,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04135d2fd7fa1fba3afe9f79ec2967259dbc0948e02fa0cd0e33a4a812e2cb0a" +checksum = "cfbb328bc2538e10b17570eae25e5ecb2cdb97b729caa115617e124b05e9463e" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -488,9 +509,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6a6985b48a536b47aa0aece56e6a0f49240ce5d33a7f0c94f1b312eda79aa1" +checksum = "6707200ade3dd821585ec208022a273889f328ee1e76014c9a81820ef6d3c48d" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -516,22 +537,22 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf27873220877cb15125eb6eec2f86c6e9b41473aca85844bd3d9d755bfc0a0" +checksum = "a891e871830c1ef6e105a08f615fbb178b2edc4c75c203bf47c64dfa21acd849" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 1.0.3", "serde", ] [[package]] name = "alloy-rpc-types-admin" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "564fbba310fbfdadf16512c973315d0fa8eaf8fd2c442f1265bfc24e51f41ddf" +checksum = "3a151f6fe7fec5969bfcfdf2de4e1cbcc809c4e13a2fdd14f9da8339a12d0053" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -541,34 +562,34 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c349f7339476f13e23308111dfeb67d136c11e7b2a6b1d162f6a124ad4ffb9b" +checksum = "2f7e3f1efdb3ef6f2e0e09036099933f9d96ff1d3129be4b2e5394550a58b39d" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 1.0.3", "serde", ] [[package]] name = "alloy-rpc-types-any" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a40595b927dfb07218459037837dbc8de8500a26024bb6ff0548dd2ccc13e0" +checksum = "518c67d8465f885c7524f0fe2cc32861635e9409a6f2efc015e306ca8d73f377" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 1.0.3", ] [[package]] name = "alloy-rpc-types-beacon" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c08a6f2593a8b6401e579996a887b22794543e0ff5976c5c21ddd361755dec" +checksum = "def573959c8954ebf3b51074e5215241bf252ac383bd4daf0e24f697c6688712" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rpc-types-engine", "ethereum_ssz", @@ -582,9 +603,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05525519bd7f37f98875354f0b3693d3ad3c7a7f067e3b8946777920be15cb5b" +checksum = "5cc83d5587cdfcfb3f9cfb83484c319ce1f5eec4da11c357153725785c17433c" dependencies = [ "alloy-primitives", "serde", @@ -592,19 +613,19 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4235d79af20fe5583ca26096258fe9307571a345745c433cfd8c91b41aa2611e" +checksum = "85872461c13427e7715809871dfff8945df9309169e378a8737c8b0880a72b1b" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 1.0.3", "derive_more", "ethereum_ssz", "ethereum_ssz_derive", - "jsonrpsee-types", + "jsonrpsee-types 0.25.1", "jsonwebtoken", "rand 0.8.5", "serde", @@ -613,21 +634,21 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a9f64e0f69cfb6029e2a044519a1bdd44ce9fc334d5315a7b9837f7a6748e5" +checksum = "117b370f315c7f6c856c51d840fef8728f9738ce46f5f48c2f6a901da454da81" dependencies = [ "alloy-consensus", "alloy-consensus-any", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-network-primitives", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 1.0.3", "alloy-sol-types", "arbitrary", "itertools 0.14.0", - "jsonrpsee-types", + "jsonrpsee-types 0.25.1", "serde", "serde_json", "thiserror 2.0.12", @@ -635,27 +656,28 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b38fc4f5a198a14b1411c27c530c95fd05800613175a4c98ae61475c41b7c5" +checksum = "1cfd78b3b0043b341005ab177902ab61a0bb264a72982e590e5b3afba1461e42" dependencies = [ - "alloy-eips", + "alloy-consensus", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 1.0.3", "serde", "serde_json", ] [[package]] name = "alloy-rpc-types-trace" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bccbe4594eaa2d69d21fa0b558c44e36202e599eb209da70b405415cb37a354" +checksum = "356253f9ad65afe964733c6c3677a70041424359bd6340ab5597ff37185c1a82" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 1.0.3", "serde", "serde_json", "thiserror 2.0.12", @@ -663,13 +685,13 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b8de4afea88d9ca1504b9dee40ffae69a2364aed82ab6e88e4348b41f57f6b" +checksum = "d17e23d6d3e3fafaed4e4950c93172ee23ec665f54ca644dbdab418f90d24e46" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 1.0.3", "serde", ] @@ -678,6 +700,17 @@ name = "alloy-serde" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4dba6ff08916bc0a9cbba121ce21f67c0b554c39cf174bc7b9df6c651bd3c3b" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-serde" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcfe8652fc1500463a9193e90feb4628f243f5758e54abd41fa6310df80d3de9" dependencies = [ "alloy-primitives", "arbitrary", @@ -687,9 +720,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c580da7f00f3999e44e327223044d6732358627f93043e22d92c583f6583556" +checksum = "167a38442a3626ef0bf8295422f339b1392f56574c13017f2718bf5bdf878c6a" dependencies = [ "alloy-primitives", "async-trait", @@ -702,9 +735,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00f0f07862bd8f6bc66c953660693c5903062c2c9d308485b2a6eee411089e7" +checksum = "92f04bf5386358318a17d189bb56bc1ef00320de4aa9ce939ae8cf76e3178ca0" dependencies = [ "alloy-consensus", "alloy-network", @@ -718,9 +751,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60fcfa26956bcb22f66ab13407115197f26ef23abca5b48d39a1946897382d74" +checksum = "5d3ef8e0d622453d969ba3cded54cf6800efdc85cb929fe22c5bdf8335666757" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -732,9 +765,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a9b402f0013f1ff8c24066eeafc2207a8e52810a2b18b77776ce7fead5af41" +checksum = "f0e84bd0693c69a8fbe3ec0008465e029c6293494df7cb07580bf4a33eff52e1" dependencies = [ "alloy-sol-macro-input", "const-hex", @@ -750,9 +783,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d02d61741337bb6b3f4899c2e3173fe17ffa2810e143d3b28acd953197c8dd79" +checksum = "f3de663412dadf9b64f4f92f507f78deebcc92339d12cf15f88ded65d41c7935" dependencies = [ "const-hex", "dunce", @@ -766,9 +799,9 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b5f5f9f561c29f78ea521ebe2e5ac1633f1b1442dae582f68ecd57c6350042" +checksum = "251273c5aa1abb590852f795c938730fa641832fc8fa77b5478ed1bf11b6097e" dependencies = [ "serde", "winnow", @@ -776,9 +809,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02635bce18205ff8149fb752c753b0a91ea3f3c8ee04c58846448be4811a640" +checksum = "5460a975434ae594fe2b91586253c1beb404353b78f0a55bf124abcd79557b15" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -789,11 +822,12 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1f1a55f9ff9a48aa0b4a8c616803754620010fbb266edae2f4548f4304373b" +checksum = "c4f91badc9371554f9f5e1c4d0731c208fcfb14cfd1583af997425005a962689" dependencies = [ "alloy-json-rpc", + "alloy-primitives", "base64", "derive_more", "futures", @@ -811,9 +845,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171b3d8824b6697d6c8325373ec410d230b6c59ce552edfbfabe4e7b8a26aac3" +checksum = "1ca577cff7579e39d3b4312dcd68809bd1ca693445cfdcf53f4f466a9b6b3df3" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -826,9 +860,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a71043836f2144e1fe30f874eb2e9d71d2632d530e35b09fadbf787232f3f4" +checksum = "aed6f489a90092929a480cbe30d16a147fa89f859f8d9ef26f60555681503c8b" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -846,9 +880,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.14.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5b241745076bcbf2fcad818f2c42203bd2c5f4b50ea43b628ccbd2147ad6" +checksum = "30aa80247a43d71bf683294907e74c634be7b4307d02530c856fac7fc4c2566a" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -1932,9 +1966,9 @@ dependencies = [ [[package]] name = "c-kzg" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7e3c397401eb76228c89561cf22f85f41c95aa799ee9d860de3ea1cbc728fc" +checksum = "7318cfa722931cb5fe0838b98d3ce5621e75f6a6408abc21721d80de9223f2e4" dependencies = [ "arbitrary", "blst", @@ -2955,17 +2989,6 @@ dependencies = [ "syn 2.0.100", ] -[[package]] -name = "enumn" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.100", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -4287,13 +4310,28 @@ name = "jsonrpsee" version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b26c20e2178756451cfeb0661fb74c47dd5988cb7e3939de7e9241fd604d42" +dependencies = [ + "jsonrpsee-core 0.24.9", + "jsonrpsee-http-client 0.24.9", + "jsonrpsee-proc-macros 0.24.9", + "jsonrpsee-server 0.24.9", + "jsonrpsee-types 0.24.9", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fba77a59c4c644fd48732367624d1bcf6f409f9c9a286fbc71d2f1fc0b2ea16" dependencies = [ "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-http-client", - "jsonrpsee-proc-macros", - "jsonrpsee-server", - "jsonrpsee-types", + "jsonrpsee-core 0.25.1", + "jsonrpsee-http-client 0.25.1", + "jsonrpsee-proc-macros 0.25.1", + "jsonrpsee-server 0.25.1", + "jsonrpsee-types 0.25.1", "jsonrpsee-wasm-client", "jsonrpsee-ws-client", "tokio", @@ -4302,22 +4340,22 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.24.9" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bacb85abf4117092455e1573625e21b8f8ef4dec8aff13361140b2dc266cdff2" +checksum = "a2a320a3f1464e4094f780c4d48413acd786ce5627aaaecfac9e9c7431d13ae1" dependencies = [ "base64", "futures-channel", "futures-util", "gloo-net", "http", - "jsonrpsee-core", + "jsonrpsee-core 0.25.1", "pin-project", "rustls", "rustls-pki-types", "rustls-platform-verifier", "soketto", - "thiserror 1.0.69", + "thiserror 2.0.12", "tokio", "tokio-rustls", "tokio-util", @@ -4333,21 +4371,45 @@ checksum = "456196007ca3a14db478346f58c7238028d55ee15c1df15115596e411ff27925" dependencies = [ "async-trait", "bytes", - "futures-timer", "futures-util", "http", "http-body", "http-body-util", - "jsonrpsee-types", + "jsonrpsee-types 0.24.9", "parking_lot", - "pin-project", "rand 0.8.5", "rustc-hash 2.1.1", "serde", "serde_json", "thiserror 1.0.69", "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693c93cbb7db25f4108ed121304b671a36002c2db67dff2ee4391a688c738547" +dependencies = [ + "async-trait", + "bytes", + "futures-timer", + "futures-util", + "http", + "http-body", + "http-body-util", + "jsonrpsee-types 0.25.1", + "parking_lot", + "pin-project", + "rand 0.9.0", + "rustc-hash 2.1.1", + "serde", + "serde_json", + "thiserror 2.0.12", + "tokio", "tokio-stream", + "tower 0.5.2", "tracing", "wasm-bindgen-futures", ] @@ -4364,8 +4426,8 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-util", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.24.9", + "jsonrpsee-types 0.24.9", "rustls", "rustls-platform-verifier", "serde", @@ -4377,6 +4439,29 @@ dependencies = [ "url", ] +[[package]] +name = "jsonrpsee-http-client" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6962d2bd295f75e97dd328891e58fce166894b974c1f7ce2e7597f02eeceb791" +dependencies = [ + "base64", + "http-body", + "hyper", + "hyper-rustls", + "hyper-util", + "jsonrpsee-core 0.25.1", + "jsonrpsee-types 0.25.1", + "rustls", + "rustls-platform-verifier", + "serde", + "serde_json", + "thiserror 2.0.12", + "tokio", + "tower 0.5.2", + "url", +] + [[package]] name = "jsonrpsee-proc-macros" version = "0.24.9" @@ -4390,6 +4475,19 @@ dependencies = [ "syn 2.0.100", ] +[[package]] +name = "jsonrpsee-proc-macros" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fa4f5daed39f982a1bb9d15449a28347490ad42b212f8eaa2a2a344a0dce9e9" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.100", +] + [[package]] name = "jsonrpsee-server" version = "0.24.9" @@ -4402,8 +4500,8 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.24.9", + "jsonrpsee-types 0.24.9", "pin-project", "route-recognizer", "serde", @@ -4417,6 +4515,33 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-server" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38b0bcf407ac68d241f90e2d46041e6a06988f97fe1721fb80b91c42584fae6" +dependencies = [ + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "jsonrpsee-core 0.25.1", + "jsonrpsee-types 0.25.1", + "pin-project", + "route-recognizer", + "serde", + "serde_json", + "soketto", + "thiserror 2.0.12", + "tokio", + "tokio-stream", + "tokio-util", + "tower 0.5.2", + "tracing", +] + [[package]] name = "jsonrpsee-types" version = "0.24.9" @@ -4429,27 +4554,41 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "jsonrpsee-types" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66df7256371c45621b3b7d2fb23aea923d577616b9c0e9c0b950a6ea5c2be0ca" +dependencies = [ + "http", + "serde", + "serde_json", + "thiserror 2.0.12", +] + [[package]] name = "jsonrpsee-wasm-client" -version = "0.24.9" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6558a9586cad43019dafd0b6311d0938f46efc116b34b28c74778bc11a2edf6" +checksum = "6b67695cbcf4653f39f8f8738925547e0e23fd9fe315bccf951097b9f6a38781" dependencies = [ "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.25.1", + "jsonrpsee-types 0.25.1", + "tower 0.5.2", ] [[package]] name = "jsonrpsee-ws-client" -version = "0.24.9" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b3323d890aa384f12148e8d2a1fd18eb66e9e7e825f9de4fa53bcc19b93eef" +checksum = "2da2694c9ff271a9d3ebfe520f6b36820e85133a51be77a3cb549fd615095261" dependencies = [ "http", "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.25.1", + "jsonrpsee-types 0.25.1", + "tower 0.5.2", "url", ] @@ -4751,6 +4890,25 @@ dependencies = [ "hashbrown 0.15.2", ] +[[package]] +name = "lz4" +version = "1.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20b523e860d03443e98350ceaac5e71c6ba89aea7d960769ec3ce37f4de5af4" +dependencies = [ + "lz4-sys", +] + +[[package]] +name = "lz4-sys" +version = "1.11.1+lz4-1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "lz4_flex" version = "0.11.3" @@ -5278,15 +5436,15 @@ dependencies = [ [[package]] name = "op-alloy-consensus" -version = "0.14.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f400404e37862bb974fbc3ad2d8ca2a2df286b718e762446496d04267ee912" +checksum = "6f318b09e24148f07392c5e011bae047a0043851f9041145df5f3b01e4fedd1e" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 1.0.3", "arbitrary", "derive_more", "serde", @@ -5302,9 +5460,9 @@ checksum = "4ef71f23a8caf6f2a2d5cafbdc44956d44e6014dcb9aa58abf7e4e6481c6ec34" [[package]] name = "op-alloy-network" -version = "0.14.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755dd4bac11264c082a46f928488f2be5efca629a09859890fea94631ab9ae37" +checksum = "3a567640236a672a1a0007959c437dbe846dd3e8e9b1d5656dba9c8b4879f67a" dependencies = [ "alloy-consensus", "alloy-network", @@ -5317,44 +5475,45 @@ dependencies = [ [[package]] name = "op-alloy-rpc-jsonrpsee" -version = "0.14.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6934aff7ad07f363d5cb1dbd553f64ce75fde80ea888c4097660fb8592566202" +checksum = "0d817bec4d9475405cb69f3c990946763b26ba6c70cfa03674d21c77c671864c" dependencies = [ "alloy-primitives", - "jsonrpsee", + "jsonrpsee 0.25.1", ] [[package]] name = "op-alloy-rpc-types" -version = "0.14.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9c3d02ca72f67039ff8f1cdaa0792aea339dd35f504c28be7cad3b63af2534" +checksum = "15ede8322c10c21249de4fced204e2af4978972e715afee34b6fe684d73880cf" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-network-primitives", "alloy-primitives", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 1.0.3", "derive_more", "op-alloy-consensus", "serde", "serde_json", + "thiserror 2.0.12", ] [[package]] name = "op-alloy-rpc-types-engine" -version = "0.14.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e614936d3f113b8e3dd2724382bd8db6700bd48fcd1f4d62bef537f3be8f710e" +checksum = "f6f6cb2e937e88faa8f3d38d38377398d17e44cecd5b019e6d7e1fbde0f5af2a" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", - "alloy-serde", + "alloy-serde 1.0.3", "derive_more", "ethereum_ssz", "op-alloy-consensus", @@ -5368,7 +5527,7 @@ name = "op-rbuilder" version = "0.1.0" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-network", "alloy-op-evm", "alloy-primitives", @@ -5377,7 +5536,7 @@ dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-engine", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 1.0.3", "alloy-transport", "alloy-transport-http", "async-trait", @@ -5388,7 +5547,7 @@ dependencies = [ "eyre", "futures", "futures-util", - "jsonrpsee", + "jsonrpsee 0.25.1", "metrics", "op-alloy-consensus", "op-alloy-network", @@ -5445,7 +5604,7 @@ dependencies = [ "tokio", "tokio-tungstenite", "tokio-util", - "tower 0.4.13", + "tower 0.5.2", "tracing", "tracing-subscriber 0.3.19", "url", @@ -5456,9 +5615,9 @@ dependencies = [ [[package]] name = "op-revm" -version = "3.0.2" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8646cb935063087579f44da58fe1dea329c280c3b35898d6fd01a928de91f" +checksum = "e2d9ddee86c9927dd88cd3037008f98c04016b013cd7c2822015b134e8d9b465" dependencies = [ "auto_impl", "once_cell", @@ -6441,11 +6600,13 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls", + "tokio-util", "tower 0.5.2", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "webpki-roots", "windows-registry", @@ -6462,54 +6623,34 @@ dependencies = [ [[package]] name = "reth" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", "alloy-rpc-types", "aquamarine", - "backon", "clap", "eyre", - "futures", - "reth-basic-payload-builder", "reth-chainspec", - "reth-cli", - "reth-cli-commands", "reth-cli-runner", "reth-cli-util", - "reth-config", "reth-consensus", "reth-consensus-common", "reth-db", - "reth-db-api", - "reth-downloaders", - "reth-errors", "reth-ethereum-cli", "reth-ethereum-payload-builder", "reth-ethereum-primitives", "reth-evm", - "reth-execution-types", - "reth-exex", - "reth-fs-util", "reth-network", "reth-network-api", - "reth-network-p2p", "reth-node-api", "reth-node-builder", "reth-node-core", "reth-node-ethereum", - "reth-node-events", "reth-node-metrics", "reth-payload-builder", "reth-payload-primitives", "reth-primitives", - "reth-primitives-traits", "reth-provider", - "reth-prune", "reth-ress-protocol", "reth-ress-provider", "reth-revm", @@ -6519,27 +6660,20 @@ dependencies = [ "reth-rpc-eth-types", "reth-rpc-server-types", "reth-rpc-types-compat", - "reth-stages", - "reth-static-file", "reth-tasks", "reth-tokio-util", - "reth-tracing", "reth-transaction-pool", - "reth-trie", - "reth-trie-db", - "serde_json", - "similar-asserts", "tokio", "tracing", ] [[package]] name = "reth-basic-payload-builder" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "futures-core", "futures-util", @@ -6559,11 +6693,11 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-signer", "alloy-signer-local", @@ -6589,12 +6723,12 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-chains", "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-evm", "alloy-genesis", "alloy-primitives", @@ -6609,8 +6743,8 @@ dependencies = [ [[package]] name = "reth-cli" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-genesis", "clap", @@ -6623,12 +6757,13 @@ dependencies = [ [[package]] name = "reth-cli-commands" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "ahash", + "alloy-chains", "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", "backon", @@ -6640,7 +6775,9 @@ dependencies = [ "futures", "human_bytes", "itertools 0.14.0", + "lz4", "ratatui", + "reqwest", "reth-chainspec", "reth-cli", "reth-cli-runner", @@ -6651,12 +6788,18 @@ dependencies = [ "reth-db", "reth-db-api", "reth-db-common", + "reth-discv4", + "reth-discv5", "reth-downloaders", "reth-ecies", + "reth-era-downloader", + "reth-era-utils", "reth-eth-wire", + "reth-etl", "reth-evm", "reth-exex", "reth-fs-util", + "reth-net-nat", "reth-network", "reth-network-p2p", "reth-network-peers", @@ -6676,15 +6819,17 @@ dependencies = [ "secp256k1", "serde", "serde_json", + "tar", "tokio", + "tokio-stream", "toml", "tracing", ] [[package]] name = "reth-cli-runner" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "reth-tasks", "tokio", @@ -6693,10 +6838,10 @@ dependencies = [ [[package]] name = "reth-cli-util" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "cfg-if", "eyre", @@ -6711,11 +6856,11 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-genesis", "alloy-primitives", "alloy-trie", @@ -6731,8 +6876,8 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "convert_case", "proc-macro2", @@ -6742,8 +6887,8 @@ dependencies = [ [[package]] name = "reth-config" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "eyre", "humantime-serde", @@ -6756,8 +6901,8 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -6769,11 +6914,11 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "reth-chainspec", "reth-consensus", "reth-primitives-traits", @@ -6781,11 +6926,12 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", + "alloy-json-rpc", "alloy-primitives", "alloy-provider", "alloy-rpc-types-engine", @@ -6804,8 +6950,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "derive_more", @@ -6830,8 +6976,8 @@ dependencies = [ [[package]] name = "reth-db-api" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -6858,8 +7004,8 @@ dependencies = [ [[package]] name = "reth-db-common" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -6887,10 +7033,10 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "arbitrary", "bytes", @@ -6902,8 +7048,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6928,8 +7074,8 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6952,8 +7098,8 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "data-encoding", @@ -6976,11 +7122,11 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", "futures", @@ -7006,8 +7152,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "aes", "alloy-primitives", @@ -7037,8 +7183,8 @@ dependencies = [ [[package]] name = "reth-engine-local" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7068,8 +7214,8 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7092,8 +7238,8 @@ dependencies = [ [[package]] name = "reth-engine-service" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "futures", "pin-project", @@ -7115,11 +7261,11 @@ dependencies = [ [[package]] name = "reth-engine-tree" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-evm", "alloy-primitives", "alloy-rlp", @@ -7152,6 +7298,7 @@ dependencies = [ "reth-trie-db", "reth-trie-parallel", "reth-trie-sparse", + "revm", "revm-primitives", "schnellru", "thiserror 2.0.12", @@ -7161,8 +7308,8 @@ dependencies = [ [[package]] name = "reth-engine-util" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", @@ -7186,10 +7333,61 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-era" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" +dependencies = [ + "alloy-consensus", + "alloy-eips 1.0.3", + "alloy-primitives", + "alloy-rlp", + "ethereum_ssz", + "ethereum_ssz_derive", + "reth-ethereum-primitives", + "snap", + "thiserror 2.0.12", +] + +[[package]] +name = "reth-era-downloader" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" +dependencies = [ + "alloy-primitives", + "bytes", + "eyre", + "futures-util", + "reqwest", + "reth-fs-util", + "sha2 0.10.8", + "tokio", +] + +[[package]] +name = "reth-era-utils" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" +dependencies = [ + "alloy-primitives", + "eyre", + "futures-util", + "reth-db-api", + "reth-era", + "reth-era-downloader", + "reth-etl", + "reth-fs-util", + "reth-primitives-traits", + "reth-provider", + "reth-storage-api", + "tokio", + "tracing", +] + [[package]] name = "reth-errors" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -7199,8 +7397,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-chains", "alloy-primitives", @@ -7227,12 +7425,12 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-chains", "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-hardforks", "alloy-primitives", "alloy-rlp", @@ -7248,21 +7446,70 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ + "alloy-consensus", + "alloy-eips 1.0.3", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types", + "backon", + "clap", "eyre", + "futures", + "reth-basic-payload-builder", "reth-chainspec", "reth-cli", + "reth-cli-commands", + "reth-cli-runner", + "reth-cli-util", + "reth-config", + "reth-consensus", + "reth-db", + "reth-db-api", + "reth-downloaders", + "reth-errors", + "reth-ethereum-payload-builder", + "reth-ethereum-primitives", + "reth-evm", + "reth-execution-types", + "reth-exex", + "reth-fs-util", + "reth-network", + "reth-network-api", + "reth-network-p2p", + "reth-node-api", + "reth-node-builder", + "reth-node-core", + "reth-node-ethereum", + "reth-node-events", + "reth-node-metrics", + "reth-payload-builder", + "reth-primitives-traits", + "reth-provider", + "reth-prune", + "reth-revm", + "reth-stages", + "reth-static-file", + "reth-tasks", + "reth-tracing", + "reth-transaction-pool", + "reth-trie", + "reth-trie-db", + "serde_json", + "similar-asserts", + "tokio", + "tracing", ] [[package]] name = "reth-ethereum-consensus" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "reth-chainspec", "reth-consensus", @@ -7274,10 +7521,10 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", @@ -7287,12 +7534,13 @@ dependencies = [ "reth-primitives-traits", "serde", "sha2 0.10.8", + "thiserror 2.0.12", ] [[package]] name = "reth-ethereum-forks" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -7304,11 +7552,11 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rpc-types-engine", "reth-basic-payload-builder", @@ -7331,33 +7579,26 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", - "alloy-evm", - "alloy-network", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth", "arbitrary", - "derive_more", "modular-bitfield", - "rand 0.8.5", "reth-codecs", "reth-primitives-traits", "reth-zstd-compressors", - "revm-context", - "secp256k1", "serde", "serde_with", ] [[package]] name = "reth-etl" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "rayon", "reth-db-api", @@ -7366,20 +7607,17 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-evm", "alloy-primitives", "auto_impl", "derive_more", "futures-util", "metrics", - "op-revm", - "parking_lot", - "reth-ethereum-primitives", "reth-execution-errors", "reth-execution-types", "reth-metrics", @@ -7392,11 +7630,11 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-evm", "alloy-primitives", "reth-chainspec", @@ -7410,8 +7648,8 @@ dependencies = [ [[package]] name = "reth-execution-errors" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-evm", "alloy-primitives", @@ -7423,11 +7661,11 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-evm", "alloy-primitives", "derive_more", @@ -7441,11 +7679,11 @@ dependencies = [ [[package]] name = "reth-exex" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "eyre", "futures", @@ -7479,10 +7717,10 @@ dependencies = [ [[package]] name = "reth-exex-types" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "reth-chain-state", "reth-execution-types", @@ -7493,8 +7731,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "serde", "serde_json", @@ -7503,8 +7741,8 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7512,7 +7750,7 @@ dependencies = [ "alloy-rpc-types-debug", "eyre", "futures", - "jsonrpsee", + "jsonrpsee 0.25.1", "pretty_assertions", "reth-chainspec", "reth-engine-primitives", @@ -7523,35 +7761,36 @@ dependencies = [ "reth-rpc-api", "reth-tracing", "reth-trie", + "revm-bytecode", + "revm-database", "serde", "serde_json", ] [[package]] name = "reth-ipc" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ - "async-trait", "bytes", "futures", "futures-util", "interprocess", - "jsonrpsee", + "jsonrpsee 0.25.1", "pin-project", "serde_json", "thiserror 2.0.12", "tokio", "tokio-stream", "tokio-util", - "tower 0.4.13", + "tower 0.5.2", "tracing", ] [[package]] name = "reth-libmdbx" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "bitflags 2.9.0", "byteorder", @@ -7567,8 +7806,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "bindgen 0.70.1", "cc", @@ -7576,8 +7815,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "futures", "metrics", @@ -7588,16 +7827,16 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", ] [[package]] name = "reth-net-nat" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "futures-util", "if-addrs", @@ -7610,11 +7849,11 @@ dependencies = [ [[package]] name = "reth-network" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", "aquamarine", @@ -7665,8 +7904,8 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "alloy-rpc-types-admin", @@ -7688,16 +7927,15 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "auto_impl", "derive_more", "futures", - "parking_lot", "reth-consensus", "reth-eth-wire-types", "reth-ethereum-primitives", @@ -7711,8 +7949,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7726,8 +7964,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-eip2124", "humantime-serde", @@ -7740,8 +7978,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "anyhow", "bincode", @@ -7757,8 +7995,8 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-rpc-types-engine", "eyre", @@ -7781,19 +8019,20 @@ dependencies = [ [[package]] name = "reth-node-builder" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", + "alloy-provider", "alloy-rpc-types", "alloy-rpc-types-engine", "aquamarine", "eyre", "fdlimit", "futures", - "jsonrpsee", + "jsonrpsee 0.25.1", "rayon", "reth-basic-payload-builder", "reth-chain-state", @@ -7837,6 +8076,7 @@ dependencies = [ "reth-tracing", "reth-transaction-pool", "secp256k1", + "serde_json", "tokio", "tokio-stream", "tracing", @@ -7844,11 +8084,11 @@ dependencies = [ [[package]] name = "reth-node-core" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rpc-types-engine", "clap", @@ -7894,10 +8134,10 @@ dependencies = [ [[package]] name = "reth-node-ethereum" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-rpc-types-engine", "alloy-rpc-types-eth", "eyre", @@ -7930,11 +8170,11 @@ dependencies = [ [[package]] name = "reth-node-events" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rpc-types-engine", "derive_more", @@ -7954,12 +8194,12 @@ dependencies = [ [[package]] name = "reth-node-metrics" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "eyre", "http", - "jsonrpsee-server", + "jsonrpsee-server 0.25.1", "metrics", "metrics-exporter-prometheus", "metrics-process", @@ -7969,14 +8209,14 @@ dependencies = [ "reth-tasks", "tikv-jemalloc-ctl", "tokio", - "tower 0.4.13", + "tower 0.5.2", "tracing", ] [[package]] name = "reth-node-types" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "reth-chainspec", "reth-db-api", @@ -7988,33 +8228,38 @@ dependencies = [ [[package]] name = "reth-optimism-chainspec" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-chains", "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-genesis", "alloy-hardforks", "alloy-primitives", "derive_more", + "miniz_oxide", "op-alloy-rpc-types", + "paste", "reth-chainspec", "reth-ethereum-forks", "reth-network-peers", "reth-optimism-forks", "reth-optimism-primitives", "reth-primitives-traits", + "serde", "serde_json", + "tar-no-std", + "thiserror 2.0.12", ] [[package]] name = "reth-optimism-cli" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", "clap", @@ -8057,11 +8302,11 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-trie", "op-alloy-consensus", @@ -8082,11 +8327,11 @@ dependencies = [ [[package]] name = "reth-optimism-evm" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-evm", "alloy-op-evm", "alloy-primitives", @@ -8107,8 +8352,8 @@ dependencies = [ [[package]] name = "reth-optimism-forks" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-op-hardforks", "alloy-primitives", @@ -8118,8 +8363,8 @@ dependencies = [ [[package]] name = "reth-optimism-node" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8163,11 +8408,11 @@ dependencies = [ [[package]] name = "reth-optimism-payload-builder" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-debug", @@ -8194,6 +8439,7 @@ dependencies = [ "reth-storage-api", "reth-transaction-pool", "revm", + "serde", "sha2 0.10.8", "thiserror 2.0.12", "tracing", @@ -8201,10 +8447,11 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", "arbitrary", @@ -8220,11 +8467,11 @@ dependencies = [ [[package]] name = "reth-optimism-rpc" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-json-rpc", "alloy-primitives", "alloy-rpc-client", @@ -8236,9 +8483,9 @@ dependencies = [ "async-trait", "derive_more", "eyre", - "jsonrpsee", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee 0.25.1", + "jsonrpsee-core 0.25.1", + "jsonrpsee-types 0.25.1", "op-alloy-consensus", "op-alloy-network", "op-alloy-rpc-jsonrpsee", @@ -8277,22 +8524,23 @@ dependencies = [ [[package]] name = "reth-optimism-txpool" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-json-rpc", "alloy-primitives", "alloy-rpc-client", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 1.0.3", "c-kzg", "derive_more", "futures-util", "metrics", "op-alloy-consensus", "op-alloy-flz", + "op-alloy-rpc-types", "op-revm", "parking_lot", "reth-chain-state", @@ -8312,8 +8560,8 @@ dependencies = [ [[package]] name = "reth-payload-builder" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-rpc-types", @@ -8332,8 +8580,8 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "pin-project", "reth-payload-primitives", @@ -8344,10 +8592,10 @@ dependencies = [ [[package]] name = "reth-payload-primitives" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rpc-types-engine", "auto_impl", @@ -8363,8 +8611,8 @@ dependencies = [ [[package]] name = "reth-payload-util" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8373,8 +8621,8 @@ dependencies = [ [[package]] name = "reth-payload-validator" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", @@ -8383,8 +8631,8 @@ dependencies = [ [[package]] name = "reth-primitives" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "c-kzg", @@ -8397,11 +8645,11 @@ dependencies = [ [[package]] name = "reth-primitives-traits" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-genesis", "alloy-primitives", "alloy-rlp", @@ -8411,7 +8659,6 @@ dependencies = [ "byteorder", "bytes", "derive_more", - "k256", "modular-bitfield", "once_cell", "op-alloy-consensus", @@ -8430,14 +8677,13 @@ dependencies = [ [[package]] name = "reth-provider" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rpc-types-engine", - "auto_impl", "dashmap 6.1.0", "eyre", "itertools 0.14.0", @@ -8457,7 +8703,6 @@ dependencies = [ "reth-execution-types", "reth-fs-util", "reth-metrics", - "reth-network-p2p", "reth-nippy-jar", "reth-node-types", "reth-primitives-traits", @@ -8477,11 +8722,11 @@ dependencies = [ [[package]] name = "reth-prune" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "itertools 0.14.0", "metrics", @@ -8505,8 +8750,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "arbitrary", @@ -8519,8 +8764,8 @@ dependencies = [ [[package]] name = "reth-ress-protocol" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8538,8 +8783,8 @@ dependencies = [ [[package]] name = "reth-ress-provider" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8564,8 +8809,8 @@ dependencies = [ [[package]] name = "reth-revm" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "reth-primitives-traits", @@ -8577,12 +8822,12 @@ dependencies = [ [[package]] name = "reth-rpc" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-dyn-abi", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-evm", "alloy-genesis", "alloy-network", @@ -8597,7 +8842,7 @@ dependencies = [ "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde", + "alloy-serde 1.0.3", "alloy-signer", "alloy-signer-local", "async-trait", @@ -8606,7 +8851,8 @@ dependencies = [ "http", "http-body", "hyper", - "jsonrpsee", + "jsonrpsee 0.25.1", + "jsonrpsee-types 0.25.1", "jsonwebtoken", "parking_lot", "pin-project", @@ -8642,17 +8888,17 @@ dependencies = [ "thiserror 2.0.12", "tokio", "tokio-stream", - "tower 0.4.13", + "tower 0.5.2", "tracing", "tracing-futures", ] [[package]] name = "reth-rpc-api" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-genesis", "alloy-json-rpc", "alloy-primitives", @@ -8666,8 +8912,8 @@ dependencies = [ "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde", - "jsonrpsee", + "alloy-serde 1.0.3", + "jsonrpsee 0.25.1", "reth-engine-primitives", "reth-network-peers", "reth-rpc-eth-api", @@ -8675,15 +8921,16 @@ dependencies = [ [[package]] name = "reth-rpc-builder" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-network", "alloy-provider", "http", - "jsonrpsee", + "jsonrpsee 0.25.1", "metrics", "pin-project", + "reth-chain-state", "reth-chainspec", "reth-consensus", "reth-evm", @@ -8692,35 +8939,35 @@ dependencies = [ "reth-network-api", "reth-node-core", "reth-primitives-traits", - "reth-provider", "reth-rpc", "reth-rpc-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-layer", "reth-rpc-server-types", + "reth-storage-api", "reth-tasks", "reth-transaction-pool", "serde", "thiserror 2.0.12", "tokio", "tokio-util", - "tower 0.4.13", + "tower 0.5.2", "tower-http 0.6.2", "tracing", ] [[package]] name = "reth-rpc-engine-api" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rpc-types-engine", "async-trait", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.25.1", + "jsonrpsee-types 0.25.1", "metrics", "parking_lot", "reth-chainspec", @@ -8731,7 +8978,6 @@ dependencies = [ "reth-payload-primitives", "reth-primitives-traits", "reth-rpc-api", - "reth-rpc-server-types", "reth-storage-api", "reth-tasks", "reth-transaction-pool", @@ -8743,25 +8989,25 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-dyn-abi", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-json-rpc", "alloy-network", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-eth", "alloy-rpc-types-mev", - "alloy-serde", + "alloy-serde 1.0.3", "async-trait", "auto_impl", "dyn-clone", "futures", - "jsonrpsee", - "jsonrpsee-types", + "jsonrpsee 0.25.1", + "jsonrpsee-types 0.25.1", "parking_lot", "reth-chainspec", "reth-errors", @@ -8786,19 +9032,19 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rpc-types-eth", "alloy-sol-types", "derive_more", "futures", "itertools 0.14.0", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.25.1", + "jsonrpsee-types 0.25.1", "metrics", "rand 0.9.0", "reth-chain-state", @@ -8828,28 +9074,28 @@ dependencies = [ [[package]] name = "reth-rpc-layer" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-rpc-types-engine", "http", - "jsonrpsee-http-client", + "jsonrpsee-http-client 0.25.1", "pin-project", - "tower 0.4.13", + "tower 0.5.2", "tower-http 0.6.2", "tracing", ] [[package]] name = "reth-rpc-server-types" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rpc-types-engine", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.25.1", + "jsonrpsee-types 0.25.1", "reth-errors", "reth-network-api", "serde", @@ -8858,24 +9104,24 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-rpc-types-eth", - "jsonrpsee-types", + "jsonrpsee-types 0.25.1", "reth-primitives-traits", "serde", ] [[package]] name = "reth-stages" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "bincode", "blake3", @@ -8913,10 +9159,10 @@ dependencies = [ [[package]] name = "reth-stages-api" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "aquamarine", "auto_impl", @@ -8940,8 +9186,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "arbitrary", @@ -8954,8 +9200,8 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "parking_lot", @@ -8974,8 +9220,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "clap", @@ -8986,11 +9232,11 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rpc-types-engine", "auto_impl", @@ -9010,10 +9256,10 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", "derive_more", @@ -9026,8 +9272,8 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "auto_impl", "dyn-clone", @@ -9044,11 +9290,11 @@ dependencies = [ [[package]] name = "reth-testing-utils" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-genesis", "alloy-primitives", "rand 0.8.5", @@ -9060,8 +9306,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "tokio", "tokio-stream", @@ -9070,8 +9316,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "clap", "eyre", @@ -9085,11 +9331,11 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", "aquamarine", @@ -9123,11 +9369,11 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-eips 1.0.3", "alloy-primitives", "alloy-rlp", "alloy-trie", @@ -9148,14 +9394,14 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 1.0.3", "alloy-trie", "arbitrary", "bytes", @@ -9174,8 +9420,8 @@ dependencies = [ [[package]] name = "reth-trie-db" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "reth-db-api", @@ -9187,8 +9433,8 @@ dependencies = [ [[package]] name = "reth-trie-parallel" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -9212,8 +9458,8 @@ dependencies = [ [[package]] name = "reth-trie-sparse" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -9222,24 +9468,24 @@ dependencies = [ "reth-execution-errors", "reth-metrics", "reth-primitives-traits", - "reth-tracing", "reth-trie-common", "smallvec", + "tracing", ] [[package]] name = "reth-zstd-compressors" -version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +version = "1.4.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.1#e6ce41ebba0d8752cef9ed885aae057e09226d05" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "22.0.1" +version = "23.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5378e95ffe5c8377002dafeb6f7d370a55517cef7d6d6c16fc552253af3b123" +checksum = "df1eb83c8652836bc0422f9a144522179134d8befcc7ab595c1ada60dac39e51" dependencies = [ "revm-bytecode", "revm-context", @@ -9256,11 +9502,12 @@ dependencies = [ [[package]] name = "revm-bytecode" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e138d520c5c5bc25ecc82506e9e4e6e85a811809fc5251c594378dccabfc6" +checksum = "a052afe63f2211d0b8be342ba4eff04b143be4bc77c2a96067ab6b90a90865d7" dependencies = [ "bitvec", + "once_cell", "phf", "revm-primitives", "serde", @@ -9268,9 +9515,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "3.0.1" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9765628dfea4f3686aa8f2a72471c52801e6b38b601939ac16965f49bac66580" +checksum = "bcd6faa992a1a10b84723326d6117203764c040d3519fd1ba34950d049389eb7" dependencies = [ "cfg-if", "derive-where", @@ -9284,13 +9531,14 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "3.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d74335aa1f14222cc4d3be1f62a029cc7dc03819cc8d080ff17b7e1d76375f" +checksum = "6c2b42cac141cd388c38db420d3d18e7b23013c5747d5ed648d2d9a225263d51" dependencies = [ "alloy-eip2930", "alloy-eip7702", "auto_impl", + "either", "revm-database-interface", "revm-primitives", "revm-state", @@ -9299,11 +9547,11 @@ dependencies = [ [[package]] name = "revm-database" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5c80c5a2fd605f2119ee32a63fb3be941fb6a81ced8cdb3397abca28317224" +checksum = "a16e1a58d5614bef333402ae8682d0ea7ba4f4b0563b3a58a6c0ad9d392db4f6" dependencies = [ - "alloy-eips", + "alloy-eips 0.14.0", "revm-bytecode", "revm-database-interface", "revm-primitives", @@ -9313,9 +9561,9 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0e4dfbc734b1ea67b5e8f8b3c7dc4283e2210d978cdaf6c7a45e97be5ea53b3" +checksum = "6839eb2e1667d3acd9cba59f77299fae8802c229fae50bc6f0435ed4c4ef398e" dependencies = [ "auto_impl", "revm-primitives", @@ -9325,9 +9573,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "3.0.1" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8676379521c7bf179c31b685c5126ce7800eab5844122aef3231b97026d41a10" +checksum = "511e50a8c7f14e97681ec96266ee53bf8316c0dea1d4a6633ff6f37c5c0fe9d0" dependencies = [ "auto_impl", "revm-bytecode", @@ -9343,9 +9591,9 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "3.0.1" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfed4ecf999a3f6ae776ae2d160478c5dca986a8c2d02168e04066b1e34c789e" +checksum = "d9f6c88fcf481f8e315bfd87377aa0ae83e1159dd381430122cbf431474ce39c" dependencies = [ "auto_impl", "revm-context", @@ -9360,9 +9608,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.19.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859fdfb2ef545140a68f44d02cfe5524964f9478896cd0c793f5948959818640" +checksum = "b7be11a6666252d5331e5bcab524b87459e9822c01430dbbdc182eab112b995f" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -9380,9 +9628,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "18.0.0" +version = "19.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb20260342003cfb791536e678ef5bbea1bfd1f8178b170e8885ff821985473" +checksum = "b0b7d75106333808bc97df3cd6a1864ced4ffec9be28fd3e459733813f3c300e" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -9392,9 +9640,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "19.0.0" +version = "20.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418e95eba68c9806c74f3e36cd5d2259170b61e90ac608b17ff8c435038ddace" +checksum = "a06769068a34fd237c74193118530af3912e1b16922137a96fc302f29c119966" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -9417,20 +9665,20 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "18.0.0" +version = "19.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc2283ff87358ec7501956c5dd8724a6c2be959c619c4861395ae5e0054575f" +checksum = "86d8369df999a4d5d7e53fd866c43a19d38213a00e1c86f72b782bbe7b19cb30" dependencies = [ "alloy-primitives", - "enumn", + "num_enum", "serde", ] [[package]] name = "revm-state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09dd121f6e66d75ab111fb51b4712f129511569bc3e41e6067ae760861418bd8" +checksum = "5ac26c71bf0fe5a9cd9fe6adaa13487afedbf8c2ee6e228132eae074cb3c2b58" dependencies = [ "bitflags 2.9.0", "revm-bytecode", @@ -9540,12 +9788,12 @@ dependencies = [ [[package]] name = "rollup-boost" version = "0.1.0" -source = "git+http://github.com/flashbots/rollup-boost?rev=6945842487ac0b0021800589d1660ec9c20cf254#6945842487ac0b0021800589d1660ec9c20cf254" +source = "git+http://github.com/flashbots/rollup-boost?rev=6f994a2092967108e7dda0ade57625ba10940310#6f994a2092967108e7dda0ade57625ba10940310" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 1.0.3", "clap", "dotenv", "eyre", @@ -9555,7 +9803,7 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-util", - "jsonrpsee", + "jsonrpsee 0.24.9", "metrics", "metrics-exporter-prometheus", "metrics-util", @@ -10409,9 +10657,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c9c96de1f835488c1501092847b522be88c9ac6fb0d4c0fbea92992324c8f4" +checksum = "3d0f0d4760f4c2a0823063b2c70e97aa2ad185f57be195172ccc0e23c4b787c4" dependencies = [ "paste", "proc-macro2", @@ -10464,11 +10712,34 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tar" +version = "0.4.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tar-no-std" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15574aa79d3c04a12f3cb53ff976d5571e53b9d8e0bdbe4021df0a06473dd1c9" +dependencies = [ + "bitflags 2.9.0", + "log", + "memchr", + "num-traits", +] + [[package]] name = "tempfile" -version = "3.19.1" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" dependencies = [ "fastrand", "getrandom 0.3.2", @@ -10807,7 +11078,6 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "hdrhistogram", "indexmap 1.9.3", "pin-project", "pin-project-lite", @@ -10828,11 +11098,16 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", + "hdrhistogram", + "indexmap 2.9.0", "pin-project-lite", + "slab", "sync_wrapper", "tokio", + "tokio-util", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -11462,6 +11737,19 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "wasm-streams" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wasmtimer" version = "0.4.1" @@ -12105,6 +12393,16 @@ dependencies = [ "tap", ] +[[package]] +name = "xattr" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e" +dependencies = [ + "libc", + "rustix 1.0.5", +] + [[package]] name = "yansi" version = "1.0.1" diff --git a/Cargo.toml b/Cargo.toml index 10a1b19..75bfb06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace.package] version = "0.1.0" edition = "2021" -rust-version = "1.85" +rust-version = "1.86" license = "MIT OR Apache-2.0" homepage = "https://github.com/flashbots/op-rbuilder" repository = "https://github.com/flashbots/op-rbuilder" @@ -40,105 +40,105 @@ codegen-units = 1 incremental = false [workspace.dependencies] -reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12", features = [ +reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1", features = [ "test-utils", ] } -reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } +reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } # reth optimism -reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } +reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } +reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" } -# compatible with reth "v1.3.12 dependencies -revm = { version = "22.0.1", features = [ +# compatible with reth "v1.4.1 dependencies +revm = { version = "23.1.0", features = [ "std", "secp256k1", "optional_balance_check", ], default-features = false } -revm-inspectors = { version = "0.19.0", default-features = false } -op-revm = { version = "3.0.2", default-features = false } +revm-inspectors = { version = "0.22.0", default-features = false } +op-revm = { version = "4.0.2", default-features = false } ethereum_ssz_derive = "0.9.0" ethereum_ssz = "0.9.0" -alloy-primitives = { version = "1.0.0", default-features = false } +alloy-primitives = { version = "1.1.0", default-features = false } alloy-rlp = "0.3.10" alloy-chains = "0.2.0" -alloy-evm = { version = "0.5.0", default-features = false } -alloy-provider = { version = "0.14.0", features = ["ipc", "pubsub"] } -alloy-pubsub = { version = "0.14.0" } -alloy-eips = { version = "0.14.0" } -alloy-rpc-types = { version = "0.14.0" } -alloy-json-rpc = { version = "0.14.0" } -alloy-transport-http = { version = "0.14.0" } -alloy-network = { version = "0.14.0" } -alloy-network-primitives = { version = "0.14.0" } -alloy-transport = { version = "0.14.0" } -alloy-node-bindings = { version = "0.14.0" } -alloy-consensus = { version = "0.14.0", features = ["kzg"] } -alloy-serde = { version = "0.14.0" } -alloy-rpc-types-beacon = { version = "0.14.0", features = ["ssz"] } -alloy-rpc-types-engine = { version = "0.14.0", features = ["ssz"] } -alloy-rpc-types-eth = { version = "0.14.0" } -alloy-signer-local = { version = "0.14.0" } -alloy-rpc-client = { version = "0.14.0" } -alloy-genesis = { version = "0.14.0" } +alloy-evm = { version = "0.8.0", default-features = false } +alloy-provider = { version = "1.0.3", features = ["ipc", "pubsub"] } +alloy-pubsub = { version = "1.0.3" } +alloy-eips = { version = "1.0.3" } +alloy-rpc-types = { version = "1.0.3" } +alloy-json-rpc = { version = "1.0.3" } +alloy-transport-http = { version = "1.0.3" } +alloy-network = { version = "1.0.3" } +alloy-network-primitives = { version = "1.0.3" } +alloy-transport = { version = "1.0.3" } +alloy-node-bindings = { version = "1.0.3" } +alloy-consensus = { version = "1.0.3", features = ["kzg"] } +alloy-serde = { version = "1.0.3" } +alloy-rpc-types-beacon = { version = "1.0.3", features = ["ssz"] } +alloy-rpc-types-engine = { version = "1.0.3", features = ["ssz"] } +alloy-rpc-types-eth = { version = "1.0.3" } +alloy-signer-local = { version = "1.0.3" } +alloy-rpc-client = { version = "1.0.3" } +alloy-genesis = { version = "1.0.3" } alloy-trie = { version = "0.8.1" } # optimism -alloy-op-evm = { version = "0.5.0", default-features = false } -op-alloy-rpc-types = { version = "0.14.1", default-features = false } -op-alloy-rpc-types-engine = { version = "0.14.1", default-features = false } -op-alloy-rpc-jsonrpsee = { version = "0.14.1", default-features = false } -op-alloy-network = { version = "0.14.1", default-features = false } -op-alloy-consensus = { version = "0.14.1", default-features = false } +alloy-op-evm = { version = "0.8.0", default-features = false } +op-alloy-rpc-types = { version = "0.16.0", default-features = false } +op-alloy-rpc-types-engine = { version = "0.16.0", default-features = false } +op-alloy-rpc-jsonrpsee = { version = "0.16.0", default-features = false } +op-alloy-network = { version = "0.16.0", default-features = false } +op-alloy-consensus = { version = "0.16.0", default-features = false } async-trait = { version = "0.1.83" } clap = { version = "4.4.3", features = ["derive", "env"] } clap_builder = { version = "4.5.19" } thiserror = { version = "1.0.64" } eyre = { version = "0.6.12" } -jsonrpsee = { version = "0.24.4" } -jsonrpsee-types = { version = "0.24.4" } +jsonrpsee = { version = "0.25.1" } +jsonrpsee-types = { version = "0.25.1" } parking_lot = { version = "0.12.3" } tokio = { version = "1.40.0" } auto_impl = { version = "1.2.0" } diff --git a/Dockerfile b/Dockerfile index e907708..2280277 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ARG FEATURES ARG RBUILDER_BIN="op-rbuilder" -FROM rust:1.85 AS base +FROM rust:1.86 AS base ARG TARGETPLATFORM RUN apt-get update \ diff --git a/crates/op-rbuilder/Cargo.toml b/crates/op-rbuilder/Cargo.toml index 853b91d..bf4d550 100644 --- a/crates/op-rbuilder/Cargo.toml +++ b/crates/op-rbuilder/Cargo.toml @@ -84,7 +84,7 @@ thiserror.workspace = true parking_lot.workspace = true url.workspace = true -tower = "0.4" +tower = "0.5" futures = "0.3" futures-util = "0.3.31" time = { version = "0.3.36", features = ["macros", "formatting", "parsing"] } @@ -98,7 +98,7 @@ serde_yaml = { version = "0.9" } # `flashblocks` branch -rollup-boost = { git = "http://github.com/flashbots/rollup-boost", rev = "6945842487ac0b0021800589d1660ec9c20cf254" } +rollup-boost = { git = "http://github.com/flashbots/rollup-boost", rev = "6f994a2092967108e7dda0ade57625ba10940310" } [target.'cfg(unix)'.dependencies] tikv-jemallocator = { version = "0.6", optional = true } diff --git a/crates/op-rbuilder/src/bin/tester/main.rs b/crates/op-rbuilder/src/bin/tester/main.rs index b861380..f470785 100644 --- a/crates/op-rbuilder/src/bin/tester/main.rs +++ b/crates/op-rbuilder/src/bin/tester/main.rs @@ -66,7 +66,7 @@ async fn main() -> eyre::Result<()> { .await } Commands::Deposit { address, amount } => { - let engine_api = EngineApi::builder().build().unwrap(); + let engine_api = EngineApi::default(); let mut generator = BlockGenerator::new(engine_api, None, false, 1, None); generator.init().await?; diff --git a/crates/op-rbuilder/src/integration/mod.rs b/crates/op-rbuilder/src/integration/mod.rs new file mode 100644 index 0000000..e69de29 diff --git a/crates/op-rbuilder/src/payload_builder.rs b/crates/op-rbuilder/src/payload_builder.rs index 9460289..791a565 100644 --- a/crates/op-rbuilder/src/payload_builder.rs +++ b/crates/op-rbuilder/src/payload_builder.rs @@ -31,7 +31,7 @@ use reth_evm::{ Database, Evm, EvmError, InvalidTxError, }; use reth_execution_types::ExecutionOutcome; -use reth_node_api::{NodePrimitives, NodeTypes, TxTy}; +use reth_node_api::{NodePrimitives, NodeTypes, PrimitivesTy, TxTy}; use reth_optimism_chainspec::OpChainSpec; use reth_optimism_consensus::{calculate_receipt_root_no_memo_optimism, isthmus}; use reth_optimism_evm::{OpEvmConfig, OpNextBlockEnvAttributes}; @@ -123,7 +123,7 @@ impl CustomOpPayloadBuilder { } } -impl PayloadBuilderBuilder for CustomOpPayloadBuilder +impl PayloadBuilderBuilder for CustomOpPayloadBuilder where Node: FullNodeTypes< Types: NodeTypes< @@ -135,6 +135,10 @@ where Pool: TransactionPool>> + Unpin + 'static, + Evm: ConfigureEvm< + Primitives = PrimitivesTy, + NextBlockEnvCtx = OpNextBlockEnvAttributes, + > + 'static, { type PayloadBuilder = OpPayloadBuilder; @@ -142,6 +146,7 @@ where self, ctx: &BuilderContext, pool: Pool, + _evm_config: Evm, ) -> eyre::Result { Ok(OpPayloadBuilder::new( OpEvmConfig::optimism(ctx.chain_spec()), @@ -154,7 +159,7 @@ where } } -impl PayloadServiceBuilder for CustomOpPayloadBuilder +impl PayloadServiceBuilder for CustomOpPayloadBuilder where Node: FullNodeTypes< Types: NodeTypes< @@ -167,16 +172,21 @@ where + Unpin + 'static, ::Transaction: OpPooledTx, + Evm: ConfigureEvm< + Primitives = PrimitivesTy, + NextBlockEnvCtx = OpNextBlockEnvAttributes, + > + 'static, { async fn spawn_payload_builder_service( self, ctx: &BuilderContext, pool: Pool, + evm_config: Evm, ) -> eyre::Result::Payload>> { tracing::info!("Spawning a custom payload builder"); let extra_block_deadline = self.extra_block_deadline; let enable_revert_protection = self.enable_revert_protection; - let payload_builder = self.build_payload_builder(ctx, pool).await?; + let payload_builder = self.build_payload_builder(ctx, pool, evm_config).await?; let payload_job_config = BasicPayloadJobGeneratorConfig::default(); let payload_generator = BlockPayloadJobGenerator::with_builder( diff --git a/crates/op-rbuilder/src/payload_builder_vanilla.rs b/crates/op-rbuilder/src/payload_builder_vanilla.rs index bcf9999..e2b1e27 100644 --- a/crates/op-rbuilder/src/payload_builder_vanilla.rs +++ b/crates/op-rbuilder/src/payload_builder_vanilla.rs @@ -35,7 +35,7 @@ use reth_evm::{ Database, Evm, EvmError, InvalidTxError, }; use reth_execution_types::ExecutionOutcome; -use reth_node_api::{NodePrimitives, NodeTypes, TxTy}; +use reth_node_api::{NodePrimitives, NodeTypes, PrimitivesTy, TxTy}; use reth_node_builder::components::BasicPayloadServiceBuilder; use reth_optimism_chainspec::OpChainSpec; use reth_optimism_consensus::{calculate_receipt_root_no_memo_optimism, isthmus}; @@ -128,7 +128,7 @@ impl CustomOpPayloadBuilder { } } -impl PayloadBuilderBuilder for CustomOpPayloadBuilder +impl PayloadBuilderBuilder for CustomOpPayloadBuilder where Node: FullNodeTypes< Types: NodeTypes< @@ -141,6 +141,10 @@ where + Unpin + 'static, ::Transaction: OpPooledTx, + Evm: ConfigureEvm< + Primitives = PrimitivesTy, + NextBlockEnvCtx = OpNextBlockEnvAttributes, + > + 'static, { type PayloadBuilder = OpPayloadBuilderVanilla; @@ -148,6 +152,7 @@ where self, ctx: &BuilderContext, pool: Pool, + _evm_config: Evm, ) -> eyre::Result { Ok(OpPayloadBuilderVanilla::new( OpEvmConfig::optimism(ctx.chain_spec()), @@ -159,7 +164,7 @@ where } } -impl PayloadServiceBuilder for CustomOpPayloadBuilder +impl PayloadServiceBuilder for CustomOpPayloadBuilder where Node: FullNodeTypes< Types: NodeTypes< @@ -172,16 +177,21 @@ where + Unpin + 'static, ::Transaction: OpPooledTx, + Evm: ConfigureEvm< + Primitives = PrimitivesTy, + NextBlockEnvCtx = OpNextBlockEnvAttributes, + > + 'static, { async fn spawn_payload_builder_service( self, ctx: &BuilderContext, pool: Pool, + evm_config: Evm, ) -> eyre::Result::Payload>> { tracing::info!("Spawning a custom payload builder"); let extra_block_deadline = self.extra_block_deadline; let enable_revert_protection = self.enable_revert_protection; - let payload_builder = self.build_payload_builder(ctx, pool).await?; + let payload_builder = self.build_payload_builder(ctx, pool, evm_config).await?; let payload_job_config = BasicPayloadJobGeneratorConfig::default(); let payload_generator = BlockPayloadJobGenerator::with_builder( diff --git a/rust-toolchain.toml b/rust-toolchain.toml index b475f2f..d092944 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.85.0" +channel = "1.86.0" components = ["rustfmt", "clippy"] From ef714db98157f8b561b188362aa1977c91ae60ff Mon Sep 17 00:00:00 2001 From: Solar Mithril Date: Mon, 19 May 2025 17:13:15 +0600 Subject: [PATCH 2/4] Fix integration --- crates/op-rbuilder/src/integration/integration_test.rs | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 crates/op-rbuilder/src/integration/integration_test.rs diff --git a/crates/op-rbuilder/src/integration/integration_test.rs b/crates/op-rbuilder/src/integration/integration_test.rs new file mode 100644 index 0000000..e69de29 From 445849c3e34d267a5077f12263d15918f6d4ec2c Mon Sep 17 00:00:00 2001 From: Solar Mithril Date: Mon, 19 May 2025 17:19:07 +0600 Subject: [PATCH 3/4] Fix test --- crates/op-rbuilder/src/tx_signer.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/op-rbuilder/src/tx_signer.rs b/crates/op-rbuilder/src/tx_signer.rs index 6a6a2c5..bbfb77f 100644 --- a/crates/op-rbuilder/src/tx_signer.rs +++ b/crates/op-rbuilder/src/tx_signer.rs @@ -70,9 +70,8 @@ impl FromStr for Signer { #[cfg(test)] mod test { use super::*; - use alloy_consensus::TxEip1559; + use alloy_consensus::{transaction::SignerRecoverable, TxEip1559}; use alloy_primitives::{address, fixed_bytes, TxKind as TransactionKind}; - use reth::core::primitives::SignedTransaction; #[test] fn test_sign_transaction() { let secret = From 818b8546cff1bf643b022f5369fa65d6c263f079 Mon Sep 17 00:00:00 2001 From: Solar Mithril Date: Wed, 21 May 2025 14:31:10 +0600 Subject: [PATCH 4/4] Fix merge conflict --- Cargo.lock | 2 +- crates/op-rbuilder/Cargo.toml | 4 +- crates/op-rbuilder/src/bin/tester/main.rs | 2 +- .../src/integration/integration_test.rs | 0 crates/op-rbuilder/src/integration/mod.rs | 0 .../op-rbuilder/src/tests/framework/apis.rs | 39 ++++++++++--------- .../src/tests/framework/harness.rs | 2 +- 7 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 crates/op-rbuilder/src/integration/integration_test.rs delete mode 100644 crates/op-rbuilder/src/integration/mod.rs diff --git a/Cargo.lock b/Cargo.lock index b2088b6..222f307 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9788,7 +9788,7 @@ dependencies = [ [[package]] name = "rollup-boost" version = "0.1.0" -source = "git+http://github.com/flashbots/rollup-boost?rev=6f994a2092967108e7dda0ade57625ba10940310#6f994a2092967108e7dda0ade57625ba10940310" +source = "git+http://github.com/flashbots/rollup-boost?rev=b9e6353d08672bd19e754a9525de47e04b34c84c#b9e6353d08672bd19e754a9525de47e04b34c84c" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", diff --git a/crates/op-rbuilder/Cargo.toml b/crates/op-rbuilder/Cargo.toml index bf4d550..e3a0ecb 100644 --- a/crates/op-rbuilder/Cargo.toml +++ b/crates/op-rbuilder/Cargo.toml @@ -97,8 +97,8 @@ shellexpand = "3.1" serde_yaml = { version = "0.9" } -# `flashblocks` branch -rollup-boost = { git = "http://github.com/flashbots/rollup-boost", rev = "6f994a2092967108e7dda0ade57625ba10940310" } +# `msozin/flashblocks-v1.4.1` branch based on `flashblocks-rebase` +rollup-boost = { git = "http://github.com/flashbots/rollup-boost", rev = "8506dfb7d84c65746f7c88d250983658438f59e8" } [target.'cfg(unix)'.dependencies] tikv-jemallocator = { version = "0.6", optional = true } diff --git a/crates/op-rbuilder/src/bin/tester/main.rs b/crates/op-rbuilder/src/bin/tester/main.rs index f470785..b861380 100644 --- a/crates/op-rbuilder/src/bin/tester/main.rs +++ b/crates/op-rbuilder/src/bin/tester/main.rs @@ -66,7 +66,7 @@ async fn main() -> eyre::Result<()> { .await } Commands::Deposit { address, amount } => { - let engine_api = EngineApi::default(); + let engine_api = EngineApi::builder().build().unwrap(); let mut generator = BlockGenerator::new(engine_api, None, false, 1, None); generator.init().await?; diff --git a/crates/op-rbuilder/src/integration/integration_test.rs b/crates/op-rbuilder/src/integration/integration_test.rs deleted file mode 100644 index e69de29..0000000 diff --git a/crates/op-rbuilder/src/integration/mod.rs b/crates/op-rbuilder/src/integration/mod.rs deleted file mode 100644 index e69de29..0000000 diff --git a/crates/op-rbuilder/src/tests/framework/apis.rs b/crates/op-rbuilder/src/tests/framework/apis.rs index 37ac84d..cdcba08 100644 --- a/crates/op-rbuilder/src/tests/framework/apis.rs +++ b/crates/op-rbuilder/src/tests/framework/apis.rs @@ -3,21 +3,21 @@ use alloy_eips::BlockNumberOrTag; use alloy_primitives::B256; use alloy_rpc_types_engine::{ExecutionPayloadV3, ForkchoiceUpdated, PayloadStatus}; use jsonrpsee::{ - core::RpcResult, - http_client::{transport::HttpBackend, HttpClient}, + core::{client::SubscriptionClientT, RpcResult}, proc_macros::rpc, }; use reth::rpc::{api::EngineApiClient, types::engine::ForkchoiceState}; use reth_node_api::{EngineTypes, PayloadTypes}; use reth_optimism_node::OpEngineTypes; use reth_payload_builder::PayloadId; -use reth_rpc_layer::{AuthClientLayer, AuthClientService, JwtSecret}; +use reth_rpc_layer::{AuthClientLayer, JwtSecret}; use serde_json::Value; use std::str::FromStr; /// Helper for engine api operations pub struct EngineApi { - pub engine_api_client: HttpClient>, + url: url::Url, + jwt_secret: JwtSecret, } /// Builder for EngineApi configuration @@ -46,15 +46,9 @@ impl EngineApiBuilder { } pub fn build(self) -> Result> { - let secret_layer = AuthClientLayer::new(JwtSecret::from_str(&self.jwt_secret)?); - let middleware = tower::ServiceBuilder::default().layer(secret_layer); - let client = jsonrpsee::http_client::HttpClientBuilder::default() - .set_http_middleware(middleware) - .build(&self.url) - .expect("Failed to create http client"); - Ok(EngineApi { - engine_api_client: client, + url: self.url.parse()?, + jwt_secret: JwtSecret::from_str(&self.jwt_secret)?, }) } } @@ -74,6 +68,16 @@ impl EngineApi { .build() } + pub fn http_client(&self) -> impl SubscriptionClientT + Clone + Send + Sync + Unpin + 'static { + // Create a middleware that adds a new JWT token to every request. + let secret_layer = AuthClientLayer::new(self.jwt_secret); + let middleware = tower::ServiceBuilder::default().layer(secret_layer); + jsonrpsee::http_client::HttpClientBuilder::default() + .set_http_middleware(middleware) + .build(&self.url) + .expect("Failed to create http client") + } + pub async fn get_payload_v3( &self, payload_id: PayloadId, @@ -85,7 +89,7 @@ impl EngineApi { ); Ok( - EngineApiClient::::get_payload_v3(&self.engine_api_client, payload_id) + EngineApiClient::::get_payload_v3(&self.http_client(), payload_id) .await?, ) } @@ -99,7 +103,7 @@ impl EngineApi { println!("Submitting new payload at {}...", chrono::Utc::now()); Ok(EngineApiClient::::new_payload_v3( - &self.engine_api_client, + &self.http_client(), payload, versioned_hashes, parent_beacon_block_root, @@ -116,7 +120,7 @@ impl EngineApi { println!("Updating forkchoice at {}...", chrono::Utc::now()); Ok(EngineApiClient::::fork_choice_updated_v3( - &self.engine_api_client, + &self.http_client(), ForkchoiceState { head_block_hash: new_head, safe_block_hash: current_head, @@ -137,10 +141,7 @@ impl EngineApi { number: BlockNumberOrTag, include_txs: bool, ) -> eyre::Result> { - Ok( - BlockApiClient::get_block_by_number(&self.engine_api_client, number, include_txs) - .await?, - ) + Ok(BlockApiClient::get_block_by_number(&self.http_client(), number, include_txs).await?) } } diff --git a/crates/op-rbuilder/src/tests/framework/harness.rs b/crates/op-rbuilder/src/tests/framework/harness.rs index c9f355c..e5a0195 100644 --- a/crates/op-rbuilder/src/tests/framework/harness.rs +++ b/crates/op-rbuilder/src/tests/framework/harness.rs @@ -149,7 +149,7 @@ impl TestHarness { pub fn provider(&self) -> eyre::Result> { let url = format!("http://localhost:{}", self.builder_http_port); let provider = - ProviderBuilder::::default().on_http(url.parse()?); + ProviderBuilder::::default().connect_http(url.parse()?); Ok(provider) }