diff --git a/Cargo.lock b/Cargo.lock index 4e03d6d5b..c4da1bbc5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -97,9 +97,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0093d23bf026b580c1f66ed3a053d8209c104a446c5264d3ad99587f6edef24e" +checksum = "9f5bedd6a59a2bd3a2f1cb7ff488549a2004302edca4df4d578bf0a814888615" dependencies = [ "alloy-consensus", "alloy-contract", @@ -132,15 +132,16 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad451f9a70c341d951bca4e811d74dbe1e193897acd17e9dbac1353698cc430b" +checksum = "d8b77018eec2154eb158869f9f2914a3ea577adf87b11be2764d4795d5ccccf7" dependencies = [ "alloy-eips", "alloy-primitives 1.2.0", "alloy-rlp", "alloy-serde", "alloy-trie", + "alloy-tx-macros", "arbitrary", "auto_impl", "c-kzg", @@ -149,7 +150,7 @@ dependencies = [ "k256", "once_cell", "rand 0.8.5", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_with", "thiserror 2.0.12", @@ -193,9 +194,9 @@ dependencies = [ [[package]] name = "alloy-core" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b2817489e4391d8c0bdf043c842164855e3d697de7a8e9edf24aa30b153ac5" +checksum = "5968f48d7a62587cd874bd84034831da4f7f577ce5de984828e376766efc0f32" dependencies = [ "alloy-dyn-abi", "alloy-json-abi 1.2.0", @@ -267,9 +268,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3056872f6da48046913e76edb5ddced272861f6032f09461aea1a2497be5ae5d" +checksum = "33d134f3ac4926124eaf521a1031d11ea98816df3d39fc446fcfd6b36884603f" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -290,14 +291,15 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.10.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394b09cf3a32773eedf11828987f9c72dfa74545040be0422e3f5f09a2a3fab9" +checksum = "ff5aae4c6dc600734b206b175f3200085ee82dcdaa388760358830a984ca9869" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-hardforks", "alloy-primitives 1.2.0", + "alloy-rpc-types-eth", "alloy-sol-types 1.2.0", "auto_impl", "derive_more", @@ -309,9 +311,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c98fb40f07997529235cc474de814cd7bd9de561e101716289095696c0e4639d" +checksum = "fb1c2792605e648bdd1fddcfed8ce0d39d3db495c71d2240cb53df8aee8aea1f" dependencies = [ "alloy-eips", "alloy-primitives 1.2.0", @@ -360,12 +362,13 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc08b31ebf9273839bd9a01f9333cbb7a3abb4e820c312ade349dd18bdc79581" +checksum = "31cfdacfeb6b6b40bf6becf92e69e575c68c9f80311c3961d019e29c0b8d6be2" dependencies = [ "alloy-primitives 1.2.0", "alloy-sol-types 1.2.0", + "http", "serde", "serde_json", "thiserror 2.0.12", @@ -374,9 +377,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed117b08f0cc190312bf0c38c34cf4f0dabfb4ea8f330071c587cd7160a88cb2" +checksum = "de68a3f09cd9ab029cf87d08630e1336ca9a530969689fd151d505fa888a2603" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -400,9 +403,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7162ff7be8649c0c391f4e248d1273e85c62076703a1f3ec7daf76b283d886d" +checksum = "fcc2689c8addfc43461544d07a6f5f3a3e1f5f4efae61206cb5783dc383cfc8f" dependencies = [ "alloy-consensus", "alloy-eips", @@ -413,9 +416,9 @@ dependencies = [ [[package]] name = "alloy-op-evm" -version = "0.10.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f32538cc243ec5d4603da9845cc2f5254c6a3a78e82475beb1a2a1de6c0d36c" +checksum = "588a87b77b30452991151667522d2f2f724cec9c2ec6602e4187bc97f66d8095" dependencies = [ "alloy-consensus", "alloy-eips", @@ -498,9 +501,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84eba1fd8b6fe8b02f2acd5dd7033d0f179e304bd722d11e817db570d1fa6c4" +checksum = "8ced931220f547d30313530ad315654b7862ef52631c90ab857d792865f84a7d" dependencies = [ "alloy-chains", "alloy-consensus", @@ -527,6 +530,7 @@ dependencies = [ "either", "futures", "futures-utils-wasm", + "http", "lru 0.13.0", "parking_lot", "pin-project", @@ -585,9 +589,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518a699422a3eab800f3dac2130d8f2edba8e4fff267b27a9c7dc6a2b0d313ee" +checksum = "6d1d1eac6e48b772c7290f0f79211a0e822a38b057535b514cc119abd857d5b6" dependencies = [ "alloy-json-rpc", "alloy-primitives 1.2.0", @@ -613,9 +617,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c000cab4ec26a4b3e29d144e999e1c539c2fa0abed871bf90311eb3466187ca8" +checksum = "8589c6ae318fcc9624d42e9166f7f82b630d9ad13e180c52addf20b93a8af266" dependencies = [ "alloy-primitives 1.2.0", "alloy-rpc-types-engine", @@ -626,9 +630,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ebdc864f573645c5288370c208912b85b5cacc8025b700c50c2b74d06ab9830" +checksum = "0182187bcbe47f3a737f5eced007b7788d4ed37aba19d43fd3df123169b3b05e" dependencies = [ "alloy-genesis", "alloy-primitives 1.2.0", @@ -638,9 +642,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8abecc34549a208b5f91bc7f02df3205c36e2aa6586f1d9375c3382da1066b3b" +checksum = "754d5062b594ed300a3bb0df615acb7bacdbd7bd1cd1a6e5b59fb936c5025a13" dependencies = [ "alloy-primitives 1.2.0", "alloy-rpc-types-eth", @@ -661,9 +665,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241aba7808bddc3ad1c6228e296a831f326f89118b1017012090709782a13334" +checksum = "32c1ddf8fb2e41fa49316185d7826ed034f55819e0017e65dc6715f911b8a1ee" dependencies = [ "alloy-eips", "alloy-primitives 1.2.0", @@ -679,9 +683,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c832f2e851801093928dbb4b7bd83cd22270faf76b2e080646b806a285c8757" +checksum = "7c81ae89a04859751bac72e5e73459bceb3e6a4d2541f2f1374e35be358fd171" dependencies = [ "alloy-primitives 1.2.0", "serde", @@ -689,9 +693,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab52691970553d84879d777419fa7b6a2e92e9fe8641f9324cc071008c2f656" +checksum = "662b720c498883427ffb9f5e38c7f02b56ac5c0cdd60b457e88ce6b6a20b9ce9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -709,9 +713,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcaf7dff0fdd756a714d58014f4f8354a1706ebf9fa2cf73431e0aeec3c9431e" +checksum = "bb082c325bdfd05a7c71f52cd1060e62491fbf6edf55962720bdc380847b0784" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -730,9 +734,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18bd1c5d7b9f3f1caeeaa1c082aa28ba7ce2d67127b12b2a9b462712c8f6e1c5" +checksum = "84c1b50012f55de4a6d58ee9512944089fa61a835e6fe3669844075bb6e0312e" dependencies = [ "alloy-consensus", "alloy-eips", @@ -745,9 +749,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e3507a04e868dd83219ad3cd6a8c58aefccb64d33f426b3934423a206343e84" +checksum = "eaf52c884c7114c5d1f1f2735634ba0f6579911427281fb02cbd5cb8147723ca" dependencies = [ "alloy-primitives 1.2.0", "alloy-rpc-types-eth", @@ -759,9 +763,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eec36272621c3ac82b47dd77f0508346687730b1c2e3e10d3715705c217c0a05" +checksum = "5e4fd0df1af2ed62d02e7acbc408a162a06f30cb91550c2ec34b11c760cdc0ba" dependencies = [ "alloy-primitives 1.2.0", "alloy-rpc-types-eth", @@ -771,9 +775,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "730e8f2edf2fc224cabd1c25d090e1655fa6137b2e409f92e5eec735903f1507" +checksum = "c7f26c17270c2ac1bd555c4304fe067639f0ddafdd3c8d07a200b2bb5a326e03" dependencies = [ "alloy-primitives 1.2.0", "arbitrary", @@ -783,9 +787,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d2428445ec13edc711909e023d7779618504c4800be055a5b940025dbafe3" +checksum = "5d9fd649d6ed5b8d7e5014e01758efb937e8407124b182a7f711bf487a1a2697" dependencies = [ "alloy-primitives 1.2.0", "async-trait", @@ -798,9 +802,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14fe6fedb7fe6e0dfae47fe020684f1d8e063274ef14bca387ddb7a6efa8ec1" +checksum = "c288c5b38be486bb84986701608f5d815183de990e884bb747f004622783e125" dependencies = [ "alloy-consensus", "alloy-network", @@ -958,9 +962,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a712bdfeff42401a7dd9518f72f617574c36226a9b5414537fedc34350b73bf9" +checksum = "e1b790b89e31e183ae36ac0a1419942e21e94d745066f5281417c3e4299ea39e" dependencies = [ "alloy-json-rpc", "alloy-primitives 1.2.0", @@ -981,9 +985,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea5a76d7f2572174a382aedf36875bedf60bcc41116c9f031cf08040703a2dc" +checksum = "f643645a33a681d09ac1ca2112014c2ca09c68aad301da4400484d59c746bc70" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -1034,9 +1038,9 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983d99aa81f586cef9dae38443245e585840fcf0fc58b09aee0b1f27aed1d500" +checksum = "bada1fc392a33665de0dc50d401a3701b62583c655e3522a323490a5da016962" dependencies = [ "alloy-primitives 1.2.0", "alloy-rlp", @@ -1052,6 +1056,19 @@ dependencies = [ "tracing", ] +[[package]] +name = "alloy-tx-macros" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4ef40a046b9bf141afc440cef596c79292708aade57c450dc74e843270fd8e7" +dependencies = [ + "alloy-primitives 1.2.0", + "darling", + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -1681,6 +1698,12 @@ dependencies = [ "tower-service", ] +[[package]] +name = "az" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" + [[package]] name = "backon" version = "1.5.1" @@ -2065,9 +2088,9 @@ dependencies = [ [[package]] name = "bollard" -version = "0.19.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af706e9dc793491dd382c99c22fde6e9934433d4cc0d6a4b34eb2cdc57a5c917" +checksum = "97ccca1260af6a459d75994ad5acc1651bcabcbdbc41467cc9786519ab854c30" dependencies = [ "base64 0.22.1", "bollard-stubs", @@ -2075,14 +2098,20 @@ dependencies = [ "futures-core", "futures-util", "hex", + "home", "http", "http-body-util", "hyper", "hyper-named-pipe", + "hyper-rustls", "hyper-util", "hyperlocal", "log", "pin-project-lite", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "rustls-pki-types", "serde", "serde_derive", "serde_json", @@ -2098,12 +2127,11 @@ dependencies = [ [[package]] name = "bollard-stubs" -version = "1.48.2-rc.28.0.4" +version = "1.47.1-rc.27.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79cdf0fccd5341b38ae0be74b74410bdd5eceeea8876dc149a13edfe57e3b259" +checksum = "3f179cfbddb6e77a5472703d4b30436bff32929c0aa8a9008ecf23d1d3cdd0da" dependencies = [ "serde", - "serde_json", "serde_repr", "serde_with", ] @@ -2984,9 +3012,9 @@ dependencies = [ [[package]] name = "derive-where" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e73f2692d4bd3cac41dca28934a39894200c9fabf49586d77d0e5954af1d7902" +checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b" dependencies = [ "proc-macro2", "quote", @@ -3191,6 +3219,17 @@ dependencies = [ "syn 2.0.101", ] +[[package]] +name = "docker_credential" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d89dfcba45b4afad7450a99b39e751590463e45c04728cf555d36bb66940de8" +dependencies = [ + "base64 0.21.7", + "serde", + "serde_json", +] + [[package]] name = "doctest-file" version = "1.0.0" @@ -3338,7 +3377,7 @@ dependencies = [ "k256", "log", "rand 0.8.5", - "secp256k1", + "secp256k1 0.30.0", "serde", "sha3", "zeroize", @@ -3421,6 +3460,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "etcetera" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26c7b13d0780cb82722fd59f6f57f925e143427e4a75313a6c77243bf5326ae6" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.59.0", +] + [[package]] name = "ethereum_hashing" version = "0.7.0" @@ -3893,6 +3954,16 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gmp-mpfr-sys" +version = "1.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66d61197a68f6323b9afa616cf83d55d69191e1bf364d4eb7d35ae18defe776" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "group" version = "0.13.0" @@ -5268,7 +5339,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.9.1", "libc", - "redox_syscall", + "redox_syscall 0.5.12", ] [[package]] @@ -5976,14 +6047,14 @@ dependencies = [ [[package]] name = "nybbles" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8983bb634df7248924ee0c4c3a749609b5abcb082c28fffe3254b3eb3602b307" +checksum = "11d51b0175c49668a033fe7cc69080110d9833b291566cdf332905f3ad9c68a0" dependencies = [ "alloy-rlp", "arbitrary", - "const-hex", "proptest", + "ruint", "serde", "smallvec", ] @@ -6033,14 +6104,16 @@ checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" [[package]] name = "op-alloy-consensus" -version = "0.17.2" +version = "0.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2423a125ef2daa0d15dacc361805a0b6f76d6acfc6e24a1ff6473582087fe75" +checksum = "a8719d9b783b29cfa1cf8d591b894805786b9ab4940adc700a57fd0d5b721cf5" dependencies = [ "alloy-consensus", "alloy-eips", + "alloy-network", "alloy-primitives 1.2.0", "alloy-rlp", + "alloy-rpc-types-eth", "alloy-serde", "arbitrary", "derive_more", @@ -6057,9 +6130,9 @@ checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" [[package]] name = "op-alloy-network" -version = "0.17.2" +version = "0.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bac5140ed9a01112a1c63866da3c38c74eb387b95917d0f304a4bd4ee825986" +checksum = "839a7a1826dc1d38fdf9c6d30d1f4ed8182c63816c97054e5815206f1ebf08c7" dependencies = [ "alloy-consensus", "alloy-network", @@ -6073,9 +6146,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-jsonrpsee" -version = "0.17.2" +version = "0.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cb0771602eb2b25e38817d64cd0f841ff07ef9df1e9ce96a53c1742776e874" +checksum = "6b9d3de5348e2b34366413412f1f1534dc6b10d2cf6e8e1d97c451749c0c81c0" dependencies = [ "alloy-primitives 1.2.0", "jsonrpsee 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6083,9 +6156,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types" -version = "0.17.2" +version = "0.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82a315004b6720fbf756afdcfdc97ea7ddbcdccfec86ea7df7562bb0da29a3f" +checksum = "9640f9e78751e13963762a4a44c846e9ec7974b130c29a51706f40503fe49152" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6102,9 +6175,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.17.2" +version = "0.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47aea08d8ad3f533df0c5082d3e93428a4c57898b7ade1be928fa03918f22e71" +checksum = "6a4559d84f079b3fdfd01e4ee0bb118025e92105fbb89736f5d77ab3ca261698" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6114,6 +6187,7 @@ dependencies = [ "alloy-serde", "derive_more", "ethereum_ssz", + "ethereum_ssz_derive", "op-alloy-consensus", "serde", "snap", @@ -6141,7 +6215,6 @@ dependencies = [ "alloy-transport-http", "anyhow", "async-trait", - "bollard", "chrono", "clap 4.5.39", "clap_builder", @@ -6219,7 +6292,7 @@ dependencies = [ "revm", "rlimit", "rollup-boost", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_json", "serde_with", @@ -6229,6 +6302,7 @@ dependencies = [ "tar", "tdx", "tempfile", + "testcontainers 0.24.0", "thiserror 1.0.69", "tikv-jemallocator", "time", @@ -6247,9 +6321,9 @@ dependencies = [ [[package]] name = "op-revm" -version = "5.0.1" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0e8a3830a2be82166fbe9ead34361149ff4320743ed7ee5502ab779de221361" +checksum = "2b97d2b54651fcd2955b454e86b2336c031e17925a127f4c44e2b63b2eeda923" dependencies = [ "auto_impl", "once_cell", @@ -6578,11 +6652,36 @@ checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.12", "smallvec", "windows-targets 0.52.6", ] +[[package]] +name = "parse-display" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914a1c2265c98e2446911282c6ac86d8524f495792c38c5bd884f80499c7538a" +dependencies = [ + "parse-display-derive", + "regex", + "regex-syntax 0.8.5", +] + +[[package]] +name = "parse-display-derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae7800a4c974efd12df917266338e79a7a74415173caf7e70aa0a0707345281" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "regex-syntax 0.8.5", + "structmeta", + "syn 2.0.101", +] + [[package]] name = "paste" version = "1.0.15" @@ -6925,17 +7024,17 @@ dependencies = [ [[package]] name = "proptest" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50" +checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f" dependencies = [ "bit-set", "bit-vec", "bitflags 2.9.1", "lazy_static", "num-traits", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand 0.9.1", + "rand_chacha 0.9.0", "rand_xorshift", "regex-syntax 0.8.5", "rusty-fork", @@ -7178,11 +7277,11 @@ dependencies = [ [[package]] name = "rand_xorshift" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" dependencies = [ - "rand_core 0.6.4", + "rand_core 0.9.3", ] [[package]] @@ -7250,6 +7349,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_syscall" version = "0.5.12" @@ -7392,8 +7500,8 @@ checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3" [[package]] name = "reth" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-rpc-types", "aquamarine", @@ -7426,9 +7534,9 @@ dependencies = [ "reth-rpc", "reth-rpc-api", "reth-rpc-builder", + "reth-rpc-convert", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types-compat", "reth-tasks", "reth-tokio-util", "reth-transaction-pool", @@ -7438,8 +7546,8 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7462,8 +7570,8 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7493,8 +7601,8 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-chains", "alloy-consensus", @@ -7513,8 +7621,8 @@ dependencies = [ [[package]] name = "reth-cli" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-genesis", "clap 4.5.39", @@ -7527,8 +7635,8 @@ dependencies = [ [[package]] name = "reth-cli-commands" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "ahash", "alloy-chains", @@ -7586,7 +7694,7 @@ dependencies = [ "reth-static-file-types", "reth-trie", "reth-trie-db", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_json", "tar", @@ -7598,8 +7706,8 @@ dependencies = [ [[package]] name = "reth-cli-runner" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "reth-tasks", "tokio", @@ -7608,8 +7716,8 @@ dependencies = [ [[package]] name = "reth-cli-util" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-eips", "alloy-primitives 1.2.0", @@ -7618,7 +7726,7 @@ dependencies = [ "libc", "rand 0.8.5", "reth-fs-util", - "secp256k1", + "secp256k1 0.30.0", "serde", "thiserror 2.0.12", "tikv-jemallocator", @@ -7626,8 +7734,8 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7646,8 +7754,8 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "convert_case", "proc-macro2", @@ -7657,8 +7765,8 @@ dependencies = [ [[package]] name = "reth-config" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "eyre", "humantime-serde", @@ -7667,12 +7775,13 @@ dependencies = [ "reth-stages-types", "serde", "toml 0.8.22", + "url", ] [[package]] name = "reth-consensus" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-primitives 1.2.0", @@ -7684,8 +7793,8 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7696,8 +7805,8 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7720,8 +7829,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "derive_more", @@ -7746,8 +7855,8 @@ dependencies = [ [[package]] name = "reth-db-api" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -7774,8 +7883,8 @@ dependencies = [ [[package]] name = "reth-db-common" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -7803,8 +7912,8 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-eips", "alloy-primitives 1.2.0", @@ -7818,8 +7927,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "alloy-rlp", @@ -7834,7 +7943,7 @@ dependencies = [ "reth-net-nat", "reth-network-peers", "schnellru", - "secp256k1", + "secp256k1 0.30.0", "serde", "thiserror 2.0.12", "tokio", @@ -7844,8 +7953,8 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "alloy-rlp", @@ -7860,7 +7969,7 @@ dependencies = [ "reth-ethereum-forks", "reth-metrics", "reth-network-peers", - "secp256k1", + "secp256k1 0.30.0", "thiserror 2.0.12", "tokio", "tracing", @@ -7868,8 +7977,8 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "data-encoding", @@ -7881,7 +7990,7 @@ dependencies = [ "reth-network-peers", "reth-tokio-util", "schnellru", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_with", "thiserror 2.0.12", @@ -7892,8 +8001,8 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7927,8 +8036,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "aes", "alloy-primitives 1.2.0", @@ -7945,7 +8054,7 @@ dependencies = [ "pin-project", "rand 0.8.5", "reth-network-peers", - "secp256k1", + "secp256k1 0.30.0", "sha2 0.10.9", "sha3", "thiserror 2.0.12", @@ -7958,8 +8067,8 @@ dependencies = [ [[package]] name = "reth-engine-local" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-primitives 1.2.0", @@ -7968,19 +8077,12 @@ dependencies = [ "futures-util", "op-alloy-rpc-types-engine", "reth-chainspec", - "reth-consensus", "reth-engine-primitives", - "reth-engine-service", - "reth-engine-tree", "reth-ethereum-engine-primitives", - "reth-evm", - "reth-node-types", "reth-optimism-chainspec", "reth-payload-builder", "reth-payload-primitives", "reth-provider", - "reth-prune", - "reth-stages-api", "reth-transaction-pool", "tokio", "tokio-stream", @@ -7989,10 +8091,11 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", + "alloy-eips", "alloy-primitives 1.2.0", "alloy-rpc-types-engine", "auto_impl", @@ -8013,8 +8116,8 @@ dependencies = [ [[package]] name = "reth-engine-service" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "futures", "pin-project", @@ -8036,8 +8139,8 @@ dependencies = [ [[package]] name = "reth-engine-tree" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8088,8 +8191,8 @@ dependencies = [ [[package]] name = "reth-engine-util" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", @@ -8115,8 +8218,8 @@ dependencies = [ [[package]] name = "reth-era" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8131,8 +8234,8 @@ dependencies = [ [[package]] name = "reth-era-downloader" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "bytes", @@ -8146,19 +8249,23 @@ dependencies = [ [[package]] name = "reth-era-utils" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ + "alloy-consensus", "alloy-primitives 1.2.0", + "alloy-rlp", "eyre", "futures-util", "reth-db-api", "reth-era", "reth-era-downloader", + "reth-ethereum-primitives", "reth-etl", "reth-fs-util", "reth-primitives-traits", "reth-provider", + "reth-stages-types", "reth-storage-api", "tokio", "tracing", @@ -8166,8 +8273,8 @@ dependencies = [ [[package]] name = "reth-errors" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -8177,8 +8284,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-chains", "alloy-primitives 1.2.0", @@ -8205,8 +8312,8 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-chains", "alloy-consensus", @@ -8226,8 +8333,8 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8285,8 +8392,8 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8301,8 +8408,8 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-eips", "alloy-primitives 1.2.0", @@ -8319,8 +8426,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -8332,8 +8439,8 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8359,8 +8466,8 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8377,8 +8484,8 @@ dependencies = [ [[package]] name = "reth-etl" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "rayon", "reth-db-api", @@ -8387,8 +8494,8 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8410,8 +8517,8 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8428,8 +8535,8 @@ dependencies = [ [[package]] name = "reth-execution-errors" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-evm", "alloy-primitives 1.2.0", @@ -8441,8 +8548,8 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8459,8 +8566,8 @@ dependencies = [ [[package]] name = "reth-exex" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8497,8 +8604,8 @@ dependencies = [ [[package]] name = "reth-exex-types" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-eips", "alloy-primitives 1.2.0", @@ -8511,8 +8618,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "serde", "serde_json", @@ -8521,8 +8628,8 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-primitives 1.2.0", @@ -8549,8 +8656,8 @@ dependencies = [ [[package]] name = "reth-ipc" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "bytes", "futures", @@ -8569,8 +8676,8 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "bitflags 2.9.1", "byteorder", @@ -8586,8 +8693,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "bindgen 0.70.1", "cc", @@ -8595,8 +8702,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "futures", "metrics", @@ -8607,16 +8714,16 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", ] [[package]] name = "reth-net-nat" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "futures-util", "if-addrs", @@ -8629,8 +8736,8 @@ dependencies = [ [[package]] name = "reth-network" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8672,7 +8779,7 @@ dependencies = [ "reth-transaction-pool", "rustc-hash 2.1.1", "schnellru", - "secp256k1", + "secp256k1 0.30.0", "serde", "smallvec", "thiserror 2.0.12", @@ -8684,8 +8791,8 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "alloy-rpc-types-admin", @@ -8707,8 +8814,8 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8730,13 +8837,13 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "alloy-rlp", "enr", - "secp256k1", + "secp256k1 0.30.0", "serde_with", "thiserror 2.0.12", "tokio", @@ -8745,8 +8852,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-eip2124", "humantime-serde", @@ -8759,8 +8866,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "anyhow", "bincode", @@ -8776,8 +8883,8 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-rpc-types-engine", "eyre", @@ -8800,8 +8907,8 @@ dependencies = [ [[package]] name = "reth-node-builder" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8856,7 +8963,7 @@ dependencies = [ "reth-tokio-util", "reth-tracing", "reth-transaction-pool", - "secp256k1", + "secp256k1 0.30.0", "serde_json", "tokio", "tokio-stream", @@ -8865,8 +8972,8 @@ dependencies = [ [[package]] name = "reth-node-core" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8894,29 +9001,30 @@ dependencies = [ "reth-network-peers", "reth-primitives-traits", "reth-prune-types", + "reth-rpc-convert", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types-compat", "reth-stages-types", "reth-storage-api", "reth-storage-errors", "reth-tracing", "reth-transaction-pool", - "secp256k1", + "secp256k1 0.30.0", "serde", "shellexpand", "strum 0.27.1", "thiserror 2.0.12", "toml 0.8.22", "tracing", + "url", "vergen", "vergen-git2", ] [[package]] name = "reth-node-ethereum" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-eips", "alloy-rpc-types-engine", @@ -8951,8 +9059,8 @@ dependencies = [ [[package]] name = "reth-node-events" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8975,8 +9083,8 @@ dependencies = [ [[package]] name = "reth-node-metrics" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "eyre", "http", @@ -8996,8 +9104,8 @@ dependencies = [ [[package]] name = "reth-node-types" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "reth-chainspec", "reth-db-api", @@ -9009,8 +9117,8 @@ dependencies = [ [[package]] name = "reth-optimism-chainspec" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-chains", "alloy-consensus", @@ -9036,8 +9144,8 @@ dependencies = [ [[package]] name = "reth-optimism-cli" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9083,8 +9191,8 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9108,8 +9216,8 @@ dependencies = [ [[package]] name = "reth-optimism-evm" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9133,8 +9241,8 @@ dependencies = [ [[package]] name = "reth-optimism-forks" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-op-hardforks", "alloy-primitives 1.2.0", @@ -9144,8 +9252,8 @@ dependencies = [ [[package]] name = "reth-optimism-node" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-primitives 1.2.0", @@ -9171,6 +9279,7 @@ dependencies = [ "reth-optimism-payload-builder", "reth-optimism-primitives", "reth-optimism-rpc", + "reth-optimism-storage", "reth-optimism-txpool", "reth-payload-builder", "reth-primitives-traits", @@ -9190,8 +9299,8 @@ dependencies = [ [[package]] name = "reth-optimism-payload-builder" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9229,8 +9338,8 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9249,8 +9358,8 @@ dependencies = [ [[package]] name = "reth-optimism-rpc" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9300,15 +9409,33 @@ dependencies = [ "reth-tasks", "reth-transaction-pool", "revm", + "serde_json", "thiserror 2.0.12", "tokio", + "tower 0.5.2", "tracing", ] +[[package]] +name = "reth-optimism-storage" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" +dependencies = [ + "alloy-consensus", + "alloy-primitives 1.2.0", + "reth-chainspec", + "reth-db-api", + "reth-node-api", + "reth-optimism-primitives", + "reth-primitives-traits", + "reth-provider", + "reth-storage-api", +] + [[package]] name = "reth-optimism-txpool" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9343,8 +9470,8 @@ dependencies = [ [[package]] name = "reth-payload-builder" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-primitives 1.2.0", @@ -9364,8 +9491,8 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "pin-project", "reth-payload-primitives", @@ -9376,8 +9503,8 @@ dependencies = [ [[package]] name = "reth-payload-primitives" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-eips", "alloy-primitives 1.2.0", @@ -9395,8 +9522,8 @@ dependencies = [ [[package]] name = "reth-payload-util" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-primitives 1.2.0", @@ -9405,8 +9532,8 @@ dependencies = [ [[package]] name = "reth-payload-validator" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", @@ -9415,8 +9542,8 @@ dependencies = [ [[package]] name = "reth-primitives" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "c-kzg", @@ -9429,14 +9556,15 @@ dependencies = [ [[package]] name = "reth-primitives-traits" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-genesis", "alloy-primitives 1.2.0", "alloy-rlp", + "alloy-rpc-types-eth", "alloy-trie", "arbitrary", "auto_impl", @@ -9453,7 +9581,7 @@ dependencies = [ "revm-bytecode", "revm-primitives", "revm-state", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_with", "thiserror 2.0.12", @@ -9461,8 +9589,8 @@ dependencies = [ [[package]] name = "reth-provider" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9506,8 +9634,8 @@ dependencies = [ [[package]] name = "reth-prune" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9534,8 +9662,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "arbitrary", @@ -9548,8 +9676,8 @@ dependencies = [ [[package]] name = "reth-ress-protocol" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-primitives 1.2.0", @@ -9567,8 +9695,8 @@ dependencies = [ [[package]] name = "reth-ress-provider" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-primitives 1.2.0", @@ -9594,8 +9722,8 @@ dependencies = [ [[package]] name = "reth-revm" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "reth-primitives-traits", @@ -9607,8 +9735,8 @@ dependencies = [ [[package]] name = "reth-rpc" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -9648,6 +9776,7 @@ dependencies = [ "reth-errors", "reth-ethereum-primitives", "reth-evm", + "reth-evm-ethereum", "reth-execution-types", "reth-metrics", "reth-network-api", @@ -9657,11 +9786,11 @@ dependencies = [ "reth-primitives-traits", "reth-revm", "reth-rpc-api", + "reth-rpc-convert", "reth-rpc-engine-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types-compat", "reth-storage-api", "reth-tasks", "reth-transaction-pool", @@ -9682,8 +9811,8 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-eips", "alloy-genesis", @@ -9710,8 +9839,8 @@ dependencies = [ [[package]] name = "reth-rpc-builder" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-network", "alloy-provider", @@ -9746,10 +9875,32 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-rpc-convert" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" +dependencies = [ + "alloy-consensus", + "alloy-json-rpc", + "alloy-network", + "alloy-primitives 1.2.0", + "alloy-rpc-types-eth", + "jsonrpsee-types 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", + "op-alloy-consensus", + "op-alloy-rpc-types", + "op-revm", + "reth-evm", + "reth-optimism-primitives", + "reth-primitives-traits", + "reth-storage-api", + "revm-context", + "thiserror 2.0.12", +] + [[package]] name = "reth-rpc-engine-api" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-eips", "alloy-primitives 1.2.0", @@ -9778,8 +9929,8 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -9798,6 +9949,7 @@ dependencies = [ "jsonrpsee 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpsee-types 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot", + "reth-chain-state", "reth-chainspec", "reth-errors", "reth-evm", @@ -9806,9 +9958,9 @@ dependencies = [ "reth-payload-builder", "reth-primitives-traits", "reth-revm", + "reth-rpc-convert", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types-compat", "reth-storage-api", "reth-tasks", "reth-transaction-pool", @@ -9821,8 +9973,8 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9845,8 +9997,8 @@ dependencies = [ "reth-metrics", "reth-primitives-traits", "reth-revm", + "reth-rpc-convert", "reth-rpc-server-types", - "reth-rpc-types-compat", "reth-storage-api", "reth-tasks", "reth-transaction-pool", @@ -9863,8 +10015,8 @@ dependencies = [ [[package]] name = "reth-rpc-layer" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-rpc-types-engine", "http", @@ -9877,8 +10029,8 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-eips", "alloy-primitives 1.2.0", @@ -9891,29 +10043,17 @@ dependencies = [ "strum 0.27.1", ] -[[package]] -name = "reth-rpc-types-compat" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" -dependencies = [ - "alloy-consensus", - "alloy-primitives 1.2.0", - "alloy-rpc-types-eth", - "jsonrpsee-types 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", - "reth-primitives-traits", - "serde", -] - [[package]] name = "reth-stages" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives 1.2.0", "bincode", "blake3", + "eyre", "futures-util", "itertools 0.14.0", "num-traits", @@ -9925,6 +10065,9 @@ dependencies = [ "reth-consensus", "reth-db", "reth-db-api", + "reth-era", + "reth-era-downloader", + "reth-era-utils", "reth-ethereum-primitives", "reth-etl", "reth-evm", @@ -9952,8 +10095,8 @@ dependencies = [ [[package]] name = "reth-stages-api" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-eips", "alloy-primitives 1.2.0", @@ -9979,8 +10122,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "arbitrary", @@ -9993,8 +10136,8 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "parking_lot", @@ -10013,8 +10156,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "clap 4.5.39", @@ -10025,8 +10168,8 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10049,8 +10192,8 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-eips", "alloy-primitives 1.2.0", @@ -10065,8 +10208,8 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "auto_impl", "dyn-clone", @@ -10083,8 +10226,8 @@ dependencies = [ [[package]] name = "reth-testing-utils" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10094,13 +10237,13 @@ dependencies = [ "rand 0.9.1", "reth-ethereum-primitives", "reth-primitives-traits", - "secp256k1", + "secp256k1 0.30.0", ] [[package]] name = "reth-tokio-util" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "tokio", "tokio-stream", @@ -10109,8 +10252,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "clap 4.5.39", "eyre", @@ -10124,8 +10267,8 @@ dependencies = [ [[package]] name = "reth-tracing-otlp" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "opentelemetry 0.29.1", "opentelemetry-otlp 0.29.0", @@ -10138,8 +10281,8 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10177,8 +10320,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10202,8 +10345,8 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-consensus", "alloy-primitives 1.2.0", @@ -10228,8 +10371,8 @@ dependencies = [ [[package]] name = "reth-trie-db" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "reth-db-api", @@ -10241,8 +10384,8 @@ dependencies = [ [[package]] name = "reth-trie-parallel" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "alloy-rlp", @@ -10266,8 +10409,8 @@ dependencies = [ [[package]] name = "reth-trie-sparse" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "alloy-primitives 1.2.0", "alloy-rlp", @@ -10284,17 +10427,17 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "1.4.8" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.4.8#127595e23079de2c494048d0821ea1f1107eb624" +version = "1.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.5.0#61e38f9af154fe91e776d8f5e449d20a1571e8cf" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "24.0.1" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d277408ff8d6f747665ad9e52150ab4caf8d5eaf0d787614cf84633c8337b4" +checksum = "7b2a493c73054a0f6635bad6e840cdbef34838e6e6186974833c901dff7dd709" dependencies = [ "revm-bytecode", "revm-context", @@ -10311,9 +10454,9 @@ dependencies = [ [[package]] name = "revm-bytecode" -version = "4.0.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91f9b90b3bab18942252de2d970ee8559794c49ca7452b2cc1774456040f8fb" +checksum = "b395ee2212d44fcde20e9425916fee685b5440c3f8e01fabae8b0f07a2fd7f08" dependencies = [ "bitvec", "once_cell", @@ -10324,9 +10467,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "5.0.1" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01aad49e1233f94cebda48a4e5cef022f7c7ed29b4edf0d202b081af23435ef" +checksum = "7b97b69d05651509b809eb7215a6563dc64be76a941666c40aabe597ab544d38" dependencies = [ "cfg-if", "derive-where", @@ -10340,9 +10483,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "5.0.0" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b844f48a411e62c7dde0f757bf5cce49c85b86d6fc1d3b2722c07f2bec4c3ce" +checksum = "9f8f4f06a1c43bf8e6148509aa06a6c4d28421541944842b9b11ea1a6e53468f" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -10356,9 +10499,9 @@ dependencies = [ [[package]] name = "revm-database" -version = "4.0.1" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad3fbe34f6bb00a9c3155723b3718b9cb9f17066ba38f9eb101b678cd3626775" +checksum = "763eb5867a109a85f8e47f548b9d88c9143c0e443ec056742052f059fa32f4f1" dependencies = [ "alloy-eips", "revm-bytecode", @@ -10370,9 +10513,9 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "4.0.1" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b8acd36784a6d95d5b9e1b7be3ce014f1e759abb59df1fa08396b30f71adc2a" +checksum = "cf5ecd19a5b75b862841113b9abdd864ad4b22e633810e11e6d620e8207e361d" dependencies = [ "auto_impl", "revm-primitives", @@ -10382,11 +10525,12 @@ dependencies = [ [[package]] name = "revm-handler" -version = "5.0.1" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "481e8c3290ff4fa1c066592fdfeb2b172edfd14d12e6cade6f6f5588cad9359a" +checksum = "17b61f992beaa7a5fc3f5fcf79f1093624fa1557dc42d36baa42114c2d836b59" dependencies = [ "auto_impl", + "derive-where", "revm-bytecode", "revm-context", "revm-context-interface", @@ -10400,11 +10544,12 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "5.0.1" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc1167ef8937d8867888e63581d8ece729a72073d322119ef4627d813d99ecb" +checksum = "d7e4400a109a2264f4bf290888ac6d02432b6d5d070492b9dcf134b0c7d51354" dependencies = [ "auto_impl", + "either", "revm-context", "revm-database-interface", "revm-handler", @@ -10417,9 +10562,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.23.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b50ef375dbacefecfdacf8f02afc31df98acc5d8859a6f2b24d121ff2a740a8" +checksum = "2aabdffc06bdb434d9163e2d63b6fae843559afd300ea3fbeb113b8a0d8ec728" dependencies = [ "alloy-primitives 1.2.0", "alloy-rpc-types-eth", @@ -10437,9 +10582,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "20.0.0" +version = "22.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5ee65e57375c6639b0f50555e92a4f1b2434349dd32f52e2176f5c711171697" +checksum = "a2481ef059708772cec0ce6bc4c84b796a40111612efb73b01adf1caed7ff9ac" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -10449,9 +10594,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "21.0.0" +version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9311e735123d8d53a02af2aa81877bba185be7c141be7f931bb3d2f3af449c" +checksum = "6d581e78c8f132832bd00854fb5bf37efd95a52582003da35c25cd2cbfc63849" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -10468,15 +10613,16 @@ dependencies = [ "p256", "revm-primitives", "ripemd", - "secp256k1", + "rug", + "secp256k1 0.31.1", "sha2 0.10.9", ] [[package]] name = "revm-primitives" -version = "19.1.0" +version = "20.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18ea2ea0134568ee1e14281ce52f60e2710d42be316888d464c53e37ff184fd8" +checksum = "52cdf897b3418f2ee05bcade64985e5faed2dbaa349b2b5f27d3d6bfd10fff2a" dependencies = [ "alloy-primitives 1.2.0", "num_enum", @@ -10485,9 +10631,9 @@ dependencies = [ [[package]] name = "revm-state" -version = "4.0.1" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0040c61c30319254b34507383ba33d85f92949933adf6525a2cede05d165e1fa" +checksum = "8d6274928dd78f907103740b10800d3c0db6caeca391e75a159c168a1e5c78f8" dependencies = [ "bitflags 2.9.1", "revm-bytecode", @@ -10597,7 +10743,7 @@ dependencies = [ [[package]] name = "rollup-boost" version = "0.1.0" -source = "git+http://github.com/flashbots/rollup-boost?branch=main#9fdd722ced0c8430097e7edc5a9024f7aa27c5ad" +source = "git+http://github.com/flashbots/rollup-boost?branch=main#7fca09e8a670d61f2a4d85005ac8d7ff7bf33457" dependencies = [ "alloy-primitives 1.2.0", "alloy-rpc-types-engine", @@ -10614,6 +10760,7 @@ dependencies = [ "hyper-util", "jsonrpsee 0.25.1 (git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff)", "metrics", + "metrics-derive", "metrics-exporter-prometheus", "metrics-util", "moka", @@ -10626,15 +10773,20 @@ dependencies = [ "rustls", "serde", "serde_json", + "sha2 0.10.9", + "testcontainers 0.23.3", "thiserror 2.0.12", "tokio", "tokio-tungstenite", + "tokio-util", "tower 0.5.2", "tower-http", "tracing", "tracing-opentelemetry 0.29.0", "tracing-subscriber 0.3.19", "url", + "vergen", + "vergen-git2", ] [[package]] @@ -10643,6 +10795,18 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" +[[package]] +name = "rug" +version = "1.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4207e8d668e5b8eb574bda8322088ccd0d7782d3d03c7e8d562e82ed82bdcbc3" +dependencies = [ + "az", + "gmp-mpfr-sys", + "libc", + "libm", +] + [[package]] name = "ruint" version = "1.15.0" @@ -10785,6 +10949,15 @@ dependencies = [ "security-framework 3.2.0", ] +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "rustls-pki-types" version = "1.12.0" @@ -10928,10 +11101,21 @@ checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ "bitcoin_hashes", "rand 0.8.5", - "secp256k1-sys", + "secp256k1-sys 0.10.1", "serde", ] +[[package]] +name = "secp256k1" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2" +dependencies = [ + "bitcoin_hashes", + "rand 0.9.1", + "secp256k1-sys 0.11.0", +] + [[package]] name = "secp256k1-sys" version = "0.10.1" @@ -10941,6 +11125,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -11452,6 +11645,29 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "structmeta" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" +dependencies = [ + "proc-macro2", + "quote", + "structmeta-derive", + "syn 2.0.101", +] + +[[package]] +name = "structmeta-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "strum" version = "0.26.3" @@ -11686,6 +11902,64 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "testcontainers" +version = "0.23.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a4f01f39bb10fc2a5ab23eb0d888b1e2bb168c157f61a1b98e6c501c639c74" +dependencies = [ + "async-trait", + "bollard", + "bollard-stubs", + "bytes", + "docker_credential", + "either", + "etcetera 0.8.0", + "futures", + "log", + "memchr", + "parse-display", + "pin-project-lite", + "serde", + "serde_json", + "serde_with", + "thiserror 2.0.12", + "tokio", + "tokio-stream", + "tokio-tar", + "tokio-util", + "url", +] + +[[package]] +name = "testcontainers" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23bb7577dca13ad86a78e8271ef5d322f37229ec83b8d98da6d996c588a1ddb1" +dependencies = [ + "async-trait", + "bollard", + "bollard-stubs", + "bytes", + "docker_credential", + "either", + "etcetera 0.10.0", + "futures", + "log", + "memchr", + "parse-display", + "pin-project-lite", + "serde", + "serde_json", + "serde_with", + "thiserror 2.0.12", + "tokio", + "tokio-stream", + "tokio-tar", + "tokio-util", + "url", +] + [[package]] name = "textwrap" version = "0.16.2" @@ -11927,6 +12201,21 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "tokio-tar" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" +dependencies = [ + "filetime", + "futures-core", + "libc", + "redox_syscall 0.3.5", + "tokio", + "tokio-stream", + "xattr", +] + [[package]] name = "tokio-tungstenite" version = "0.26.2" diff --git a/Cargo.toml b/Cargo.toml index c702d0e3d..9505ac3cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,115 +40,115 @@ codegen-units = 1 incremental = false [workspace.dependencies] -reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8", features = [ +reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0", features = [ "test-utils", ] } -reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-storage-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-tasks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-tracing-otlp = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-ipc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } +reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-storage-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-tasks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-tracing-otlp = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-ipc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } # reth optimism -reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" } -reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8", features = [ +reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0" } +reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.5.0", features = [ "client", ] } # compatible with reth "v1.4.7 dependencies -revm = { version = "24.0.1", features = [ +revm = { version = "26.0.1", features = [ "std", "secp256k1", "optional_balance_check", ], default-features = false } -revm-inspectors = { version = "0.22.0", default-features = false } -op-revm = { version = "5.0.1", default-features = false } +revm-inspectors = { version = "0.25.0", default-features = false } +op-revm = { version = "7.0.1", default-features = false } ethereum_ssz_derive = "0.9.0" ethereum_ssz = "0.9.0" -alloy-primitives = { version = "1.1.0", default-features = false } +alloy-primitives = { version = "1.2.0", default-features = false } alloy-rlp = "0.3.10" alloy-chains = "0.2.0" -alloy-evm = { version = "0.8.0", default-features = false } -alloy-provider = { version = "1.0.9", features = [ +alloy-evm = { version = "0.12", default-features = false } +alloy-provider = { version = "1.0.13", features = [ "ipc", "pubsub", "txpool-api", "engine-api", ] } -alloy-pubsub = { version = "1.0.9" } -alloy-eips = { version = "1.0.9" } -alloy-rpc-types = { version = "1.0.9" } -alloy-json-rpc = { version = "1.0.9" } -alloy-transport-http = { version = "1.0.9" } -alloy-network = { version = "1.0.9" } -alloy-network-primitives = { version = "1.0.9" } -alloy-transport = { version = "1.0.9" } -alloy-node-bindings = { version = "1.0.9" } -alloy-consensus = { version = "1.0.9", features = ["kzg"] } -alloy-serde = { version = "1.0.9" } -alloy-rpc-types-beacon = { version = "1.0.9", features = ["ssz"] } -alloy-rpc-types-engine = { version = "1.0.9", features = ["ssz"] } -alloy-rpc-types-eth = { version = "1.0.9" } -alloy-signer-local = { version = "1.0.9" } -alloy-rpc-client = { version = "1.0.9" } -alloy-genesis = { version = "1.0.9" } -alloy-trie = { version = "0.8.1" } -alloy = { version = "1.0.9" } +alloy-pubsub = { version = "1.0.13" } +alloy-eips = { version = "1.0.13" } +alloy-rpc-types = { version = "1.0.13" } +alloy-json-rpc = { version = "1.0.13" } +alloy-transport-http = { version = "1.0.13" } +alloy-network = { version = "1.0.13" } +alloy-network-primitives = { version = "1.0.13" } +alloy-transport = { version = "1.0.13" } +alloy-node-bindings = { version = "1.0.13" } +alloy-consensus = { version = "1.0.13", features = ["kzg"] } +alloy-serde = { version = "1.0.13" } +alloy-rpc-types-beacon = { version = "1.0.13", features = ["ssz"] } +alloy-rpc-types-engine = { version = "1.0.13", features = ["ssz"] } +alloy-rpc-types-eth = { version = "1.0.13" } +alloy-signer-local = { version = "1.0.13" } +alloy-rpc-client = { version = "1.0.13" } +alloy-genesis = { version = "1.0.13" } +alloy-trie = { version = "0.9.0" } +alloy = { version = "1.0.13" } # optimism -alloy-op-evm = { version = "0.10.0", default-features = false } -op-alloy-rpc-types = { version = "0.17.2", default-features = false } -op-alloy-rpc-types-engine = { version = "0.17.2", default-features = false } -op-alloy-rpc-jsonrpsee = { version = "0.17.2", default-features = false } -op-alloy-network = { version = "0.17.2", default-features = false } -op-alloy-consensus = { version = "0.17.2", default-features = false } +alloy-op-evm = { version = "0.12", default-features = false } +op-alloy-rpc-types = { version = "0.18.7", default-features = false } +op-alloy-rpc-types-engine = { version = "0.18.7", default-features = false } +op-alloy-rpc-jsonrpsee = { version = "0.18.7", default-features = false } +op-alloy-network = { version = "0.18.7", default-features = false } +op-alloy-consensus = { version = "0.18.7", default-features = false } op-alloy-flz = { version = "0.13.1", default-features = false } async-trait = { version = "0.1.83" } diff --git a/crates/op-rbuilder/Cargo.toml b/crates/op-rbuilder/Cargo.toml index cc3e395d5..dfca73176 100644 --- a/crates/op-rbuilder/Cargo.toml +++ b/crates/op-rbuilder/Cargo.toml @@ -128,11 +128,11 @@ dcap-rs = { git = "https://github.com/automata-network/dcap-rs.git", optional = dashmap = { version = "6.1", optional = true } nanoid = { version = "0.4", optional = true } reth-ipc = { workspace = true, optional = true } -bollard = { version = "0.19", optional = true } tar = { version = "0.4", optional = true } ctor = { version = "0.4.2", optional = true } rlimit = { version = "0.10", optional = true } macros = { path = "src/tests/framework/macros", optional = true } +testcontainers = "0.24.0" [target.'cfg(unix)'.dependencies] tikv-jemallocator = { version = "0.6", optional = true } @@ -143,7 +143,7 @@ vergen-git2.workspace = true [dev-dependencies] alloy-provider = { workspace = true, default-features = true, features = [ - "txpool-api", + "txpool-api", ] } tempfile = "3.8" macros = { path = "src/tests/framework/macros" } @@ -151,7 +151,6 @@ dashmap = { version = "6.1" } nanoid = { version = "0.4" } reth-ipc = { workspace = true } reth-node-builder = { workspace = true, features = ["test-utils"] } -bollard = "0.19" ctor = "0.4.2" rlimit = { version = "0.10" } @@ -159,15 +158,15 @@ rlimit = { version = "0.10" } default = ["jemalloc"] jemalloc = [ - "dep:tikv-jemallocator", - "reth-cli-util/jemalloc", - "reth-optimism-cli/jemalloc", + "dep:tikv-jemallocator", + "reth-cli-util/jemalloc", + "reth-optimism-cli/jemalloc", ] jemalloc-prof = [ - "jemalloc", - "tikv-jemallocator?/profiling", - "reth/jemalloc-prof", - "reth-cli-util/jemalloc-prof", + "jemalloc", + "tikv-jemallocator?/profiling", + "reth/jemalloc-prof", + "reth-cli-util/jemalloc-prof", ] min-error-logs = ["tracing/release_max_level_error"] @@ -177,14 +176,13 @@ min-debug-logs = ["tracing/release_max_level_debug"] min-trace-logs = ["tracing/release_max_level_trace"] testing = [ - "dashmap", - "nanoid", - "reth-ipc", - "reth-node-builder/test-utils", - "bollard", - "ctor", - "macros", - "rlimit", + "dashmap", + "nanoid", + "reth-ipc", + "reth-node-builder/test-utils", + "ctor", + "macros", + "rlimit", ] interop = [] @@ -203,10 +201,10 @@ ci-features = [ "min-info-logs", "min-debug-logs", "min-trace-logs", - "testing", - "interop", - "telemetry", - "custom-engine-api", + "testing", + "interop", + "telemetry", + "custom-engine-api", ] [[bin]] diff --git a/crates/op-rbuilder/src/builders/context.rs b/crates/op-rbuilder/src/builders/context.rs index f9db06de5..385ad0be9 100644 --- a/crates/op-rbuilder/src/builders/context.rs +++ b/crates/op-rbuilder/src/builders/context.rs @@ -32,7 +32,9 @@ use reth_primitives_traits::{InMemorySize, SignedTransaction}; use reth_provider::ProviderError; use reth_revm::{context::Block, State}; use reth_transaction_pool::{BestTransactionsAttributes, PoolTransaction}; -use revm::{context::result::ResultAndState, Database, DatabaseCommit}; +use revm::{ + context::result::ResultAndState, interpreter::as_u64_saturated, Database, DatabaseCommit, +}; use std::{sync::Arc, time::Instant}; use tokio_util::sync::CancellationToken; use tracing::{debug, info, trace, warn}; @@ -95,7 +97,7 @@ impl OpPayloadBuilderCtx { /// Returns the block number for the block. pub fn block_number(&self) -> u64 { - self.evm_env.block_env.number + as_u64_saturated!(self.evm_env.block_env.number) } /// Returns the current base fee diff --git a/crates/op-rbuilder/src/tests/framework/external.rs b/crates/op-rbuilder/src/tests/framework/external.rs index e67fcfcc3..d8feb7925 100644 --- a/crates/op-rbuilder/src/tests/framework/external.rs +++ b/crates/op-rbuilder/src/tests/framework/external.rs @@ -5,19 +5,20 @@ use alloy_provider::{Identity, Provider, ProviderBuilder, RootProvider}; use alloy_rpc_types_engine::{ ExecutionPayloadV1, ExecutionPayloadV2, ExecutionPayloadV3, PayloadStatusEnum, }; -use bollard::{ - exec::{CreateExecOptions, StartExecResults}, - query_parameters::{ - AttachContainerOptions, CreateContainerOptions, CreateImageOptions, RemoveContainerOptions, - StartContainerOptions, StopContainerOptions, - }, - secret::{ContainerCreateBody, ContainerCreateResponse, HostConfig}, - Docker, -}; use futures::{StreamExt, TryStreamExt}; use op_alloy_network::Optimism; use op_alloy_rpc_types_engine::OpExecutionPayloadV4; use std::path::{Path, PathBuf}; +use testcontainers::bollard::{ + container::{ + AttachContainerOptions, Config, CreateContainerOptions, RemoveContainerOptions, + StartContainerOptions, StopContainerOptions, + }, + exec::{CreateExecOptions, StartExecResults}, + image::CreateImageOptions, + secret::{ContainerCreateResponse, HostConfig}, + Docker, +}; use tokio::signal; use tracing::{debug, warn}; @@ -70,7 +71,7 @@ impl ExternalNode { let container = create_container(&tempdir, &docker, version_tag).await?; docker - .start_container(&container.id, None::) + .start_container(&container.id, None::>) .await?; // Wait for the container to be ready and IPCs to be created @@ -279,8 +280,8 @@ async fn create_container( // first pull the image locally let mut pull_stream = docker.create_image( Some(CreateImageOptions { - from_image: Some("ghcr.io/paradigmxyz/op-reth".to_string()), - tag: Some(version_tag.into()), + from_image: "ghcr.io/paradigmxyz/op-reth".to_string(), + tag: version_tag.into(), ..Default::default() }), None, @@ -295,7 +296,7 @@ async fn create_container( } // Don't expose any ports, as we will only use IPC for communication. - let container_config = ContainerCreateBody { + let container_config = Config { image: Some(format!("ghcr.io/paradigmxyz/op-reth:{version_tag}")), entrypoint: Some(vec!["op-reth".to_string()]), cmd: Some( @@ -320,7 +321,10 @@ async fn create_container( }; Ok(docker - .create_container(Some(CreateContainerOptions::default()), container_config) + .create_container( + Some(CreateContainerOptions::::default()), + container_config, + ) .await?) } @@ -343,7 +347,7 @@ async fn relax_permissions(docker: &Docker, container: &str, path: &str) -> eyre }; while let Some(Ok(output)) = output.next().await { - use bollard::container::LogOutput::*; + use testcontainers::bollard::container::LogOutput::*; match output { StdErr { message } => { return Err(eyre::eyre!( @@ -362,11 +366,11 @@ async fn await_ipc_readiness(docker: &Docker, container: &str) -> eyre::Result<( let mut attach_stream = docker .attach_container( container, - Some(AttachContainerOptions { - stdout: true, - stderr: true, - stream: true, - logs: true, + Some(AttachContainerOptions:: { + stdout: Some(true), + stderr: Some(true), + stream: Some(true), + logs: Some(true), ..Default::default() }), ) @@ -377,7 +381,7 @@ async fn await_ipc_readiness(docker: &Docker, container: &str) -> eyre::Result<( // wait for the node to start and signal that IPCs are ready while let Some(Ok(output)) = attach_stream.output.next().await { - use bollard::container::LogOutput; + use testcontainers::bollard::container::LogOutput; match output { LogOutput::StdOut { message } | LogOutput::StdErr { message } => { let message = String::from_utf8_lossy(&message);