From 0c07c5abf18ad09d4de3566fb4d628555bbc7813 Mon Sep 17 00:00:00 2001 From: refcell Date: Thu, 24 Oct 2024 15:27:09 -0400 Subject: [PATCH] chore: Update Dependencies (#109) ### Description - Bumps `alloy-*` deps to `0.5.4` - Bumps `op-alloy-*` to `0.5.1` - Bumps `superchain` deps to `0.8.2` - Updates kona (still can't publish kona crates due to `thiserror` `no_std` support not being merged :/) --- Cargo.lock | 1118 ++++++++--------- Cargo.toml | 103 +- crates/{providers-local => derive}/Cargo.toml | 10 +- .../src/blob_provider.rs | 7 +- .../src/chain_provider.rs | 13 +- crates/{providers-local => derive}/src/lib.rs | 0 crates/rollup/Cargo.toml | 12 +- crates/rollup/src/driver/context/exex.rs | 2 +- .../rollup/src/driver/context/standalone.rs | 3 +- crates/rollup/src/driver/cursor.rs | 4 +- crates/rollup/src/driver/mod.rs | 7 +- crates/rollup/src/pipeline.rs | 11 +- 12 files changed, 576 insertions(+), 714 deletions(-) rename crates/{providers-local => derive}/Cargo.toml (71%) rename crates/{providers-local => derive}/src/blob_provider.rs (97%) rename crates/{providers-local => derive}/src/chain_provider.rs (97%) rename crates/{providers-local => derive}/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index b1fb54b..e4eb784 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -110,9 +110,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42642aed67f938363d9c7543e5ca4163cfb4205d9ec15fe933dc4e865d2932dd" +checksum = "41ed961a48297c732a5d97ee321aa8bb5009ecadbcb077d8bec90cb54e651629" dependencies = [ "alloy-eips", "alloy-primitives", @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6228abfc751a29cde117b0879b805a3e0b3b641358f063272c83ca459a56886" +checksum = "5647fce5a168f9630f935bf7821c4207b1755184edaeba783cb4e11d35058484" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -159,13 +159,14 @@ dependencies = [ [[package]] name = "alloy-eip7702" -version = "0.2.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeffd2590ce780ddfaa9d0ae340eb2b4e08627650c4676eef537cef0b4bf535d" +checksum = "64ffc577390ce50234e02d841214b3dc0bea6aaaae8e04bbf3cb82e9a45da9eb" dependencies = [ "alloy-primitives", "alloy-rlp", "arbitrary", + "derive_more", "k256", "rand", "serde", @@ -174,9 +175,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbc52a30df46f9831ed74557dfad0d94b12420393662a8b9ef90e2d6c8cb4b0" +checksum = "b69e06cf9c37be824b9d26d6d101114fdde6af0c87de2828b414c05c4b3daa71" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -195,9 +196,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0787d1688b9806290313cc335d416cc7ee39b11e3245f3d218544c62572d92ba" +checksum = "dde15e14944a88bd6a57d325e9a49b75558746fe16aaccc79713ae50a6a9574c" dependencies = [ "alloy-primitives", "alloy-serde", @@ -206,9 +207,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d46eb5871592c216d39192499c95a99f7175cb94104f88c307e6dc960676d9f1" +checksum = "4b5671117c38b1c2306891f97ad3828d85487087f54ebe2c7591a055ea5bcea7" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -218,23 +219,23 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d55a16a5f9ca498a217c060414bcd1c43e934235dc8058b31b87dcd69ff4f105" +checksum = "af5979e0d5a7bf9c7eb79749121e8256e59021af611322aee56e77e20776b4b3" dependencies = [ "alloy-primitives", "alloy-sol-types", "serde", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tracing", ] [[package]] name = "alloy-network" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d236a8c3e1d5adc09b1b63c81815fc9b757d9a4ba9482cc899f9679b55dd437" +checksum = "204237129086ce5dc17a58025e93739b01b45313841f98fa339eb1d780511e57" dependencies = [ "alloy-consensus", "alloy-eips", @@ -248,14 +249,14 @@ dependencies = [ "async-trait", "auto_impl", "futures-utils-wasm", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] name = "alloy-network-primitives" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15a0990fa8a56d85a42d6a689719aa4eebf5e2f1a5c5354658c0bfc52cac9a" +checksum = "514f70ee2a953db21631cd817b13a1571474ec77ddc03d47616d5e8203489fde" dependencies = [ "alloy-consensus", "alloy-eips", @@ -266,9 +267,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f35429a652765189c1c5092870d8360ee7b7769b09b06d89ebaefd34676446" +checksum = "c71738eb20c42c5fb149571e76536a0f309d142f3957c28791662b96baf77a3d" dependencies = [ "alloy-rlp", "arbitrary", @@ -298,9 +299,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "316f522bb6f9ac3805132112197957013b570e20cfdad058e8339dae6030c849" +checksum = "4814d141ede360bb6cd1b4b064f1aab9de391e7c4d0d4d50ac89ea4bc1e25fbd" dependencies = [ "alloy-chains", "alloy-consensus", @@ -323,13 +324,13 @@ dependencies = [ "futures", "futures-utils-wasm", "lru", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "reqwest", "schnellru", "serde", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tracing", "url", @@ -338,9 +339,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222cd9b17b1c5ad48de51a88ffbdb17f17145170288f22662f80ac88739125e6" +checksum = "96ba46eb69ddf7a9925b81f15229cb74658e6eebe5dd30a5b74e2cd040380573" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -357,9 +358,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26154390b1d205a4a7ac7352aa2eb4f81f391399d4e2f546fb81a2f8bb383f62" +checksum = "da0822426598f95e45dd1ea32a738dac057529a709ee645fcc516ffa4cbde08f" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -368,20 +369,20 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" +checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] name = "alloy-rpc-client" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b2ab59712c594c9624aaa69e38e4d38f180cb569f1fa46cdaf8c21fd50793e5" +checksum = "7fc2bd1e7403463a5f2c61e955bcc9d3072b63aa177442b0f9aa6a6d22a941e3" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -405,9 +406,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba21284319e12d053baa204d438db6c1577aedd94c1298e4becefdac1f9cec87" +checksum = "eea9bf1abdd506f985a53533f5ac01296bcd6102c5e139bbc5d40bc468d2c916" dependencies = [ "alloy-primitives", "alloy-rpc-types-beacon", @@ -419,9 +420,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416cc9f391d0b876c4c8da85f7131e771a88a55b917cc9a35e1724d9409e3b1c" +checksum = "ea02c25541fb19eaac4278aa5c41d2d7e0245898887e54a74bfc0f3103e99415" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -431,9 +432,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba40bea86c3102b9ed9b3be579e32e0b3e54e766248d873de5fc0437238c8df2" +checksum = "2382fc63fb0cf3e02818d547b80cb66cc49a31f8803d0c328402b2008bc13650" dependencies = [ "alloy-primitives", "alloy-serde", @@ -442,9 +443,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b535781fe224c101c3d957b514cb9f438d165ff0280e5c0b2f87a0d9a2950593" +checksum = "45357a642081c8ce235c0ad990c4e9279f5f18a723545076b38cfcc05cc25234" dependencies = [ "alloy-eips", "alloy-primitives", @@ -453,14 +454,14 @@ dependencies = [ "ethereum_ssz_derive", "serde", "serde_with", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] name = "alloy-rpc-types-debug" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4303deacf4cbf12ed4431a5a1bbc3284f0defb4b8b72d9aa2b888656cc5ae657" +checksum = "a5afe3ab1038f90faf56304aa0adf1e6a8c9844615d8f83967f932f3a70390b1" dependencies = [ "alloy-primitives", "serde", @@ -468,9 +469,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44848fced3b42260b9cb61f22102246636dfe5a2d0132f8d10a617df3cb1a74b" +checksum = "886d22d41992287a235af2f3af4299b5ced2bcafb81eb835572ad35747476946" dependencies = [ "alloy-consensus", "alloy-eips", @@ -489,9 +490,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35894711990019fafff0012b82b9176cbb744516eb2a9bbe6b8e5cae522163ee" +checksum = "00b034779a4850b4b03f5be5ea674a1cf7d746b2da762b34d1860ab45e48ca27" dependencies = [ "alloy-consensus", "alloy-eips", @@ -509,9 +510,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac6250cad380a005ecb5ffc6d2facf03df0e72628d819a63dd8c3ade7a766ff" +checksum = "3246948dfa5f5060a9abe04233d741ea656ef076b12958f3242416ce9f375058" dependencies = [ "alloy-eips", "alloy-primitives", @@ -522,23 +523,23 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f568c5624881896d8a25e19acbdcbabadd8df339427ea2f10b2ee447d57c4509" +checksum = "4e5fb6c5c401321f802f69dcdb95b932f30f8158f6798793f914baac5995628e" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", "alloy-serde", "serde", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] name = "alloy-rpc-types-txpool" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a37d2e1ed9b7daf20ad0b3e0092613cbae46737e0e988b23caa556c7067ce6" +checksum = "9ad066b49c3b1b5f64cdd2399177a19926a6a15db2dbf11e2098de621f9e7480" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -548,9 +549,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2843c195675f06b29c09a4315cccdc233ab5bdc7c0a3775909f9f0cab5e9ae0f" +checksum = "028e72eaa9703e4882344983cfe7636ce06d8cce104a78ea62fd19b46659efc4" dependencies = [ "alloy-primitives", "arbitrary", @@ -560,23 +561,23 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b2a00d9803dfef99963303ffe41a7bf2221f3342f0a503d6741a9f4a18e5e5" +checksum = "592c185d7100258c041afac51877660c7bf6213447999787197db4842f0e938e" dependencies = [ "alloy-primitives", "async-trait", "auto_impl", "elliptic-curve", "k256", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] name = "alloy-signer-local" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a2505d4f8c98dcae86152d58d549cb4bcf953f8352fca903410e0a0ef535571" +checksum = "6614f02fc1d5b079b2a4a5320018317b506fd0a6d67c1fd5542a71201724986c" dependencies = [ "alloy-consensus", "alloy-network", @@ -585,28 +586,28 @@ dependencies = [ "async-trait", "k256", "rand", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] name = "alloy-sol-macro" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2395336745358cc47207442127c47c63801a7065ecc0aa928da844f8bb5576" +checksum = "b0900b83f4ee1f45c640ceee596afbc118051921b9438fdb5a3175c1a7e05f8b" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] name = "alloy-sol-macro-expander" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed5047c9a241df94327879c2b0729155b58b941eae7805a7ada2e19436e6b39" +checksum = "a41b1e78dde06b5e12e6702fa8c1d30621bf07728ba75b801fb801c9c6a0ba10" dependencies = [ "alloy-sol-macro-input", "const-hex", @@ -615,31 +616,31 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", "syn-solidity", "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dee02a81f529c415082235129f0df8b8e60aa1601b9c9298ffe54d75f57210b" +checksum = "91dc311a561a306664393407b88d3e53ae58581624128afd8a15faa5de3627dc" dependencies = [ "const-hex", "dunce", "heck", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f631f0bd9a9d79619b27c91b6b1ab2c4ef4e606a65192369a1ee05d40dcf81cc" +checksum = "45d1fbee9e698f3ba176b6e7a145f4aefe6d2b746b611e8bb246fe11a0e9f6c4" dependencies = [ "serde", "winnow", @@ -647,9 +648,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2841af22d99e2c0f82a78fe107b6481be3dd20b89bfb067290092794734343a" +checksum = "086f41bc6ebcd8cb15f38ba20e47be38dd03692149681ce8061c35d960dbf850" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -660,9 +661,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dc2c8f6b8c227ef0398f702d954c4ab572c2ead3c1ed4a5157aa1cbaf959747" +checksum = "be77579633ebbc1266ae6fd7694f75c408beb1aeb6865d0b18f22893c265a061" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -670,7 +671,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tower 0.5.1", "tracing", @@ -680,9 +681,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd328e990d57f4c4e63899fb2c26877597d6503f8e0022a3d71b2d753ecbfc0c" +checksum = "91fd1a5d0827939847983b46f2f79510361f901dc82f8e3c38ac7397af142c6e" dependencies = [ "alloy-json-rpc", "alloy-rpc-types-engine", @@ -700,9 +701,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89aea26aaf1d67904a7ff95ec4a24ddd5e7d419a6945f641b885962d7c2803e2" +checksum = "8073d1186bfeeb8fbdd1292b6f1a0731f3aed8e21e1463905abfae0b96a887a6" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -719,9 +720,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e222e950ecc4ea12fbfb524b9a2275cac2cd5f57c8ce25bcaf1bd3ff80dd8fc8" +checksum = "61f27837bb4a1d6c83a28231c94493e814882f0e9058648a97e908a5f3fc9fcf" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -817,22 +818,22 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.90" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" [[package]] name = "aquamarine" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" +checksum = "0f50776554130342de4836ba542aa85a4ddb361690d7e8df13774d7284c3d5c2" dependencies = [ "include_dir", "itertools 0.10.5", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -1004,7 +1005,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "time", ] @@ -1016,7 +1017,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", "synstructure", ] @@ -1028,7 +1029,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -1039,9 +1040,9 @@ checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" [[package]] name = "async-compression" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103db485efc3e41214fe4fda9f3dbeae2eb9082f48fd236e6095627a9422066e" +checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857" dependencies = [ "brotli", "flate2", @@ -1102,7 +1103,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -1113,7 +1114,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -1175,7 +1176,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -1306,7 +1307,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.79", + "syn 2.0.85", "which", ] @@ -1325,7 +1326,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -1474,7 +1475,7 @@ dependencies = [ "static_assertions", "tap", "thin-vec", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "time", ] @@ -1515,7 +1516,7 @@ checksum = "240f4126219a83519bad05c9a40bfc0303921eeb571fc2d7e44c17ffac99d3f1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", "synstructure", ] @@ -1596,6 +1597,17 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "regex-automata 0.4.8", + "serde", +] + [[package]] name = "bumpalo" version = "3.16.0" @@ -1625,7 +1637,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -1636,9 +1648,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" dependencies = [ "serde", ] @@ -1687,7 +1699,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] @@ -1829,7 +1841,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -2075,7 +2087,7 @@ dependencies = [ "bitflags 2.6.0", "crossterm_winapi", "libc", - "parking_lot 0.12.3", + "parking_lot", "winapi", ] @@ -2088,7 +2100,7 @@ dependencies = [ "bitflags 2.6.0", "crossterm_winapi", "mio 1.0.2", - "parking_lot 0.12.3", + "parking_lot", "rustix", "signal-hook", "signal-hook-mio", @@ -2176,7 +2188,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -2200,7 +2212,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -2211,7 +2223,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -2224,7 +2236,7 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.10", + "parking_lot_core", ] [[package]] @@ -2238,7 +2250,8 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.10", + "parking_lot_core", + "serde", ] [[package]] @@ -2273,16 +2286,6 @@ version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" -[[package]] -name = "delay_map" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4355c25cbf99edcb6b4a0e906f6bdc6956eda149e84455bea49696429b2f8e8" -dependencies = [ - "futures", - "tokio-util", -] - [[package]] name = "delay_map" version = "0.4.0" @@ -2347,7 +2350,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -2368,7 +2371,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", "unicode-xid", ] @@ -2441,39 +2444,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "discv5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f569b8c367554666c8652305621e8bae3634a2ff5c6378081d5bd8c399c99f23" -dependencies = [ - "aes", - "aes-gcm", - "alloy-rlp", - "arrayvec", - "ctr", - "delay_map 0.3.0", - "enr", - "fnv", - "futures", - "hashlink 0.8.4", - "hex", - "hkdf", - "lazy_static", - "libp2p-identity", - "lru", - "more-asserts", - "multiaddr", - "parking_lot 0.11.2", - "rand", - "smallvec", - "socket2 0.4.10", - "tokio", - "tracing", - "uint 0.9.5", - "zeroize", -] - [[package]] name = "discv5" version = "0.8.0" @@ -2485,20 +2455,22 @@ dependencies = [ "alloy-rlp", "arrayvec", "ctr", - "delay_map 0.4.0", + "delay_map", "enr", "fnv", "futures", - "hashlink 0.9.1", + "hashlink", "hex", "hkdf", "lazy_static", + "libp2p-identity", "lru", "more-asserts", - "parking_lot 0.12.3", + "multiaddr", + "parking_lot", "rand", "smallvec", - "socket2 0.5.7", + "socket2", "tokio", "tracing", "uint 0.10.0", @@ -2513,7 +2485,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -2612,9 +2584,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -2648,7 +2620,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -2659,7 +2631,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -2716,7 +2688,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -2780,7 +2752,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5" dependencies = [ "libc", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] @@ -2957,7 +2929,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -3034,6 +3006,7 @@ version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ + "serde", "typenum", "version_check", "zeroize", @@ -3089,7 +3062,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -3203,15 +3176,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.5", -] - [[package]] name = "hashlink" version = "0.9.1" @@ -3300,8 +3264,8 @@ dependencies = [ "ipnet", "once_cell", "rand", - "socket2 0.5.7", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2", + "thiserror 1.0.65", "tinyvec", "tokio", "tracing", @@ -3320,11 +3284,11 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "rand", "resolv-conf", "smallvec", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tracing", ] @@ -3501,7 +3465,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", "tower-service", "tracing", @@ -3578,7 +3542,7 @@ dependencies = [ "http-body 1.0.1", "hyper 1.5.0", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", "tower-service", "tracing", @@ -3722,7 +3686,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -3914,7 +3878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c" dependencies = [ "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -3956,7 +3920,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.7", + "socket2", "widestring", "windows-sys 0.48.0", "winreg", @@ -4027,7 +3991,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "walkdir", ] @@ -4090,7 +4054,7 @@ dependencies = [ "rustls-pki-types", "rustls-platform-verifier", "soketto", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-rustls", "tokio-util", @@ -4112,13 +4076,13 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "jsonrpsee-types", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "rand", "rustc-hash 2.0.0", "serde", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", "tracing", @@ -4143,7 +4107,7 @@ dependencies = [ "rustls-platform-verifier", "serde", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tower 0.4.13", "tracing", @@ -4160,7 +4124,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -4182,7 +4146,7 @@ dependencies = [ "serde", "serde_json", "soketto", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", "tokio-util", @@ -4199,7 +4163,7 @@ dependencies = [ "http 1.1.0", "serde", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] @@ -4277,7 +4241,7 @@ dependencies = [ [[package]] name = "kona-derive" version = "0.0.3" -source = "git+https://github.com/anton-rs/kona?branch=main#2991b08121c2dcdeab9fa8e95e6847126191f280" +source = "git+https://github.com/anton-rs/kona?branch=main#330deeb1380c1e9cdca9efaf075e43a789211559" dependencies = [ "alloc-no-stdlib", "alloy-consensus", @@ -4287,35 +4251,21 @@ dependencies = [ "alloy-rpc-types-engine", "async-trait", "brotli", - "kona-providers", "miniz_oxide", "op-alloy-consensus", "op-alloy-genesis", "op-alloy-protocol", "op-alloy-rpc-types-engine", "serde", - "thiserror 1.0.64 (git+https://github.com/quartiq/thiserror?branch=no-std)", + "thiserror 1.0.64", "tracing", "unsigned-varint 0.8.0", ] [[package]] -name = "kona-providers" -version = "0.0.1" -source = "git+https://github.com/anton-rs/kona?branch=main#2991b08121c2dcdeab9fa8e95e6847126191f280" -dependencies = [ - "alloy-consensus", - "alloy-primitives", - "async-trait", - "op-alloy-consensus", - "op-alloy-genesis", - "op-alloy-protocol", -] - -[[package]] -name = "kona-providers-alloy" +name = "kona-derive-alloy" version = "0.0.1" -source = "git+https://github.com/anton-rs/kona?branch=main#2991b08121c2dcdeab9fa8e95e6847126191f280" +source = "git+https://github.com/anton-rs/kona?branch=main#330deeb1380c1e9cdca9efaf075e43a789211559" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4327,7 +4277,6 @@ dependencies = [ "alloy-transport", "async-trait", "kona-derive", - "kona-providers", "lru", "op-alloy-consensus", "op-alloy-genesis", @@ -4338,7 +4287,7 @@ dependencies = [ ] [[package]] -name = "kona-providers-local" +name = "kona-derive-local" version = "0.0.0" dependencies = [ "alloy-consensus", @@ -4348,12 +4297,10 @@ dependencies = [ "alloy-signer", "async-trait", "eyre", - "hashbrown 0.15.0", "kona-derive", - "kona-providers", - "kona-providers-alloy", + "kona-derive-alloy", "op-alloy-protocol", - "parking_lot 0.12.3", + "parking_lot", "reth", "tracing", "url", @@ -4460,7 +4407,7 @@ dependencies = [ "multiaddr", "pin-project", "rw-stream-sink", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] @@ -4502,13 +4449,13 @@ dependencies = [ "multihash", "multistream-select", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "quick-protobuf", "rand", "rw-stream-sink", "smallvec", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tracing", "unsigned-varint 0.8.0", "void", @@ -4526,7 +4473,7 @@ dependencies = [ "hickory-resolver", "libp2p-core", "libp2p-identity", - "parking_lot 0.12.3", + "parking_lot", "smallvec", "tracing", ] @@ -4577,7 +4524,7 @@ dependencies = [ "quick-protobuf", "rand", "sha2 0.10.8", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tracing", "zeroize", ] @@ -4597,7 +4544,7 @@ dependencies = [ "libp2p-swarm", "rand", "smallvec", - "socket2 0.5.7", + "socket2", "tokio", "tracing", "void", @@ -4640,7 +4587,7 @@ dependencies = [ "sha2 0.10.8", "snow", "static_assertions", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tracing", "x25519-dalek", "zeroize", @@ -4677,13 +4624,13 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-tls", - "parking_lot 0.12.3", + "parking_lot", "quinn", "rand", "ring 0.17.8", "rustls", - "socket2 0.5.7", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2", + "thiserror 1.0.65", "tokio", "tracing", ] @@ -4721,7 +4668,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -4736,7 +4683,7 @@ dependencies = [ "libc", "libp2p-core", "libp2p-identity", - "socket2 0.5.7", + "socket2", "tokio", "tracing", ] @@ -4755,7 +4702,7 @@ dependencies = [ "ring 0.17.8", "rustls", "rustls-webpki 0.101.7", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "x509-parser", "yasna", ] @@ -4785,7 +4732,7 @@ dependencies = [ "either", "futures", "libp2p-core", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tracing", "yamux 0.12.1", "yamux 0.13.3", @@ -4810,7 +4757,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.7", + "redox_syscall", ] [[package]] @@ -4874,6 +4821,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" dependencies = [ "linked-hash-map", + "serde", ] [[package]] @@ -4896,6 +4844,7 @@ checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", + "serde", ] [[package]] @@ -5005,7 +4954,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -5019,7 +4968,7 @@ dependencies = [ "metrics 0.23.0", "metrics-util 0.17.0", "quanta", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] @@ -5038,21 +4987,21 @@ dependencies = [ "metrics 0.24.0", "metrics-util 0.18.0", "quanta", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tracing", ] [[package]] name = "metrics-process" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69e6ced169644e186e060ddc15f3923fdf06862c811a867bb1e5e7c7824f4d0" +checksum = "57ca8ecd85575fbb143b2678cb123bb818779391ec0f745b1c4a9dbabadde407" dependencies = [ "libc", "libproc", "mach2", - "metrics 0.23.0", + "metrics 0.24.0", "once_cell", "procfs 0.17.0", "rlimit", @@ -5209,12 +5158,12 @@ dependencies = [ [[package]] name = "multihash" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" +checksum = "cc41f430805af9d1cf4adae4ed2149c759b877b01d909a1f40256188d09345d2" dependencies = [ "core2", - "unsigned-varint 0.7.2", + "unsigned-varint 0.8.0", ] [[package]] @@ -5283,7 +5232,7 @@ dependencies = [ "anyhow", "byteorder", "paste", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] @@ -5297,7 +5246,7 @@ dependencies = [ "log", "netlink-packet-core", "netlink-sys", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", ] @@ -5355,6 +5304,7 @@ dependencies = [ "libc", "log", "mio 0.8.11", + "serde", "walkdir", "windows-sys 0.48.0", ] @@ -5487,7 +5437,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -5542,8 +5492,9 @@ dependencies = [ [[package]] name = "op-alloy-consensus" -version = "0.5.0" -source = "git+https://github.com/alloy-rs/op-alloy?branch=main#6675ced9bff1f9166d39df6f01d554d71ac52a36" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba7c98055fd048073738df0cc6d6537e992a0d8828f39d99a469e870db126dbd" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5559,8 +5510,9 @@ dependencies = [ [[package]] name = "op-alloy-genesis" -version = "0.5.0" -source = "git+https://github.com/alloy-rs/op-alloy?branch=main#6675ced9bff1f9166d39df6f01d554d71ac52a36" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d631e8113cf88d30e621022677209caa148a9ca3ccb590fd34bbd1c731e3aff3" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5572,8 +5524,9 @@ dependencies = [ [[package]] name = "op-alloy-protocol" -version = "0.5.0" -source = "git+https://github.com/alloy-rs/op-alloy?branch=main#6675ced9bff1f9166d39df6f01d554d71ac52a36" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b39574acb1873315e6bd89df174f6223e897188fb87eeea2ad1eda04f7d28eb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5588,8 +5541,9 @@ dependencies = [ [[package]] name = "op-alloy-provider" -version = "0.5.0" -source = "git+https://github.com/alloy-rs/op-alloy?branch=main#6675ced9bff1f9166d39df6f01d554d71ac52a36" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a600ee2df86a6c7169607c63a4535a25407c0a47dfbfdf571f7e1088bdb2ce" dependencies = [ "alloy-network", "alloy-primitives", @@ -5602,8 +5556,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-jsonrpsee" -version = "0.5.0" -source = "git+https://github.com/alloy-rs/op-alloy?branch=main#6675ced9bff1f9166d39df6f01d554d71ac52a36" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "691af862796b3c869c243d693066a3f90584dbc08af8316db0d3ff806e6b4ca5" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5613,8 +5568,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types" -version = "0.5.0" -source = "git+https://github.com/alloy-rs/op-alloy?branch=main#6675ced9bff1f9166d39df6f01d554d71ac52a36" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "919e9b69212d61f3c8932bfb717c7ad458ea3fc52072b3433d99994f8223d555" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5629,8 +5585,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.5.0" -source = "git+https://github.com/alloy-rs/op-alloy?branch=main#6675ced9bff1f9166d39df6f01d554d71ac52a36" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e3a47ea24cee189b4351be247fd138c68571704ee57060cf5a722502f44412c" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -5651,7 +5608,7 @@ dependencies = [ "alloy-rpc-types-engine", "arbitrary", "arbtest", - "discv5 0.8.0", + "discv5", "eyre", "futures", "lazy_static", @@ -5677,7 +5634,7 @@ dependencies = [ "op-alloy-rpc-types", "reqwest", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tracing", ] @@ -5722,7 +5679,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -5733,9 +5690,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.3.2+3.3.2" +version = "300.4.0+3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" +checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6" dependencies = [ "cc", ] @@ -5808,17 +5765,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.3" @@ -5826,21 +5772,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -5851,7 +5783,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.7", + "redox_syscall", "smallvec", "windows-targets 0.52.6", ] @@ -5885,7 +5817,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "ucd-trie", ] @@ -5929,7 +5861,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -5943,29 +5875,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -6066,12 +5998,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -6094,30 +6026,6 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro-error-attr2" version = "2.0.0" @@ -6137,14 +6045,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] name = "proc-macro2" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -6205,7 +6113,7 @@ checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" dependencies = [ "dtoa", "itoa", - "parking_lot 0.12.3", + "parking_lot", "prometheus-client-derive-encode", ] @@ -6217,7 +6125,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -6248,7 +6156,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -6290,7 +6198,7 @@ dependencies = [ "asynchronous-codec", "bytes", "quick-protobuf", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "unsigned-varint 0.8.0", ] @@ -6307,8 +6215,8 @@ dependencies = [ "quinn-udp", "rustc-hash 2.0.0", "rustls", - "socket2 0.5.7", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2", + "thiserror 1.0.65", "tokio", "tracing", ] @@ -6325,7 +6233,7 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "slab", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tinyvec", "tracing", ] @@ -6338,7 +6246,7 @@ checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", - "socket2 0.5.7", + "socket2", "tracing", "windows-sys 0.59.0", ] @@ -6466,15 +6374,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.7" @@ -6492,14 +6391,14 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -6611,7 +6510,7 @@ dependencies = [ [[package]] name = "reth" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6683,7 +6582,7 @@ dependencies = [ [[package]] name = "reth-auto-seal-consensus" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6714,21 +6613,22 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rlp", "futures-core", "futures-util", "metrics 0.23.0", "reth-chainspec", + "reth-evm", "reth-metrics", "reth-payload-builder", "reth-payload-primitives", "reth-primitives", "reth-provider", - "reth-revm", "reth-tasks", "reth-transaction-pool", "revm", @@ -6739,8 +6639,9 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ + "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "futures", @@ -6764,7 +6665,7 @@ dependencies = [ "reth-tasks", "reth-tokio-util", "schnellru", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", "tracing", @@ -6773,14 +6674,14 @@ dependencies = [ [[package]] name = "reth-blockchain-tree" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", "aquamarine", "linked_hash_set", "metrics 0.23.0", - "parking_lot 0.12.3", + "parking_lot", "reth-blockchain-tree-api", "reth-consensus", "reth-db", @@ -6806,27 +6707,27 @@ dependencies = [ [[package]] name = "reth-blockchain-tree-api" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "reth-consensus", "reth-execution-errors", "reth-primitives", "reth-storage-errors", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] name = "reth-chain-state" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", "auto_impl", "derive_more", "metrics 0.23.0", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "reth-chainspec", "reth-errors", @@ -6843,7 +6744,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6863,7 +6764,7 @@ dependencies = [ [[package]] name = "reth-cli" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-genesis", "clap", @@ -6877,7 +6778,7 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "ahash", "alloy-eips", @@ -6935,7 +6836,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "reth-tasks", "tokio", @@ -6945,7 +6846,7 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6955,14 +6856,14 @@ dependencies = [ "rand", "reth-fs-util", "secp256k1", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tikv-jemallocator", ] [[package]] name = "reth-codecs" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6977,18 +6878,18 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] name = "reth-config" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "eyre", "humantime-serde", @@ -7002,7 +6903,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7014,9 +6915,10 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", + "alloy-eips", "alloy-primitives", "reth-chainspec", "reth-consensus", @@ -7027,7 +6929,7 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7051,7 +6953,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "bytes", @@ -7076,13 +6978,13 @@ dependencies = [ "serde", "strum", "sysinfo", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] name = "reth-db-api" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -7105,7 +7007,7 @@ dependencies = [ [[package]] name = "reth-db-common" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -7126,14 +7028,14 @@ dependencies = [ "reth-trie-db", "serde", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tracing", ] [[package]] name = "reth-db-models" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "bytes", @@ -7146,14 +7048,15 @@ dependencies = [ [[package]] name = "reth-discv4" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "alloy-rlp", - "discv5 0.7.0", + "discv5", "enr", "generic-array", - "parking_lot 0.12.3", + "parking_lot", + "rand", "reth-ethereum-forks", "reth-net-banlist", "reth-net-nat", @@ -7161,7 +7064,7 @@ dependencies = [ "schnellru", "secp256k1", "serde", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", "tracing", @@ -7170,12 +7073,12 @@ dependencies = [ [[package]] name = "reth-discv5" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "alloy-rlp", "derive_more", - "discv5 0.7.0", + "discv5", "enr", "futures", "itertools 0.13.0", @@ -7186,7 +7089,7 @@ dependencies = [ "reth-metrics", "reth-network-peers", "secp256k1", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tracing", ] @@ -7194,19 +7097,21 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "data-encoding", "enr", "linked_hash_set", - "parking_lot 0.12.3", + "parking_lot", "reth-ethereum-forks", "reth-network-peers", "reth-tokio-util", "schnellru", "secp256k1", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", + "serde_with", + "thiserror 1.0.65", "tokio", "tokio-stream", "tracing", @@ -7216,7 +7121,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7235,7 +7140,7 @@ dependencies = [ "reth-primitives", "reth-storage-api", "reth-tasks", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", "tokio-util", @@ -7245,7 +7150,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "aes", "alloy-primitives", @@ -7265,7 +7170,7 @@ dependencies = [ "secp256k1", "sha2 0.10.8", "sha3", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", "tokio-util", @@ -7276,7 +7181,7 @@ dependencies = [ [[package]] name = "reth-engine-local" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -7306,7 +7211,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "reth-execution-types", @@ -7319,7 +7224,7 @@ dependencies = [ [[package]] name = "reth-engine-service" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "futures", "pin-project", @@ -7336,13 +7241,13 @@ dependencies = [ "reth-prune", "reth-stages-api", "reth-tasks", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] name = "reth-engine-tree" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7371,7 +7276,7 @@ dependencies = [ "reth-tasks", "reth-trie", "reth-trie-parallel", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tracing", ] @@ -7379,9 +7284,10 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "eyre", @@ -7411,20 +7317,20 @@ dependencies = [ [[package]] name = "reth-errors" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "reth-blockchain-tree-api", "reth-consensus", "reth-execution-errors", "reth-fs-util", "reth-storage-errors", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] name = "reth-eth-wire" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7439,8 +7345,9 @@ dependencies = [ "reth-metrics", "reth-network-peers", "reth-primitives", + "serde", "snap", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", "tokio-util", @@ -7450,7 +7357,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-chains", "alloy-eips", @@ -7461,13 +7368,14 @@ dependencies = [ "reth-chainspec", "reth-codecs-derive", "reth-primitives", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", + "thiserror 1.0.65", ] [[package]] name = "reth-ethereum-cli" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "eyre", "reth-chainspec", @@ -7477,7 +7385,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7492,7 +7400,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7511,7 +7419,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-chains", "alloy-primitives", @@ -7528,7 +7436,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7555,7 +7463,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "rayon", "reth-db-api", @@ -7565,7 +7473,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7574,6 +7482,7 @@ dependencies = [ "metrics 0.23.0", "reth-chainspec", "reth-consensus", + "reth-consensus-common", "reth-execution-errors", "reth-execution-types", "reth-metrics", @@ -7589,7 +7498,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7600,9 +7509,7 @@ dependencies = [ "reth-ethereum-consensus", "reth-ethereum-forks", "reth-evm", - "reth-execution-types", "reth-primitives", - "reth-prune-types", "reth-revm", "revm-primitives", ] @@ -7610,7 +7517,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7626,7 +7533,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7641,7 +7548,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7649,7 +7556,7 @@ dependencies = [ "futures", "itertools 0.13.0", "metrics 0.23.0", - "parking_lot 0.12.3", + "parking_lot", "reth-chain-state", "reth-chainspec", "reth-config", @@ -7677,7 +7584,7 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7690,17 +7597,17 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "serde", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] name = "reth-invalid-block-hooks" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7725,7 +7632,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "async-trait", "bytes", @@ -7735,7 +7642,7 @@ dependencies = [ "jsonrpsee", "pin-project", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", "tokio-util", @@ -7746,24 +7653,24 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "bitflags 2.6.0", "byteorder", "dashmap 6.1.0", "derive_more", "indexmap 2.6.0", - "parking_lot 0.12.3", + "parking_lot", "reth-mdbx-sys", "smallvec", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tracing", ] [[package]] name = "reth-mdbx-sys" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "bindgen 0.70.1", "cc", @@ -7772,7 +7679,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "futures", "metrics 0.23.0", @@ -7784,7 +7691,7 @@ dependencies = [ [[package]] name = "reth-net-banlist" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", ] @@ -7792,13 +7699,13 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "futures-util", "if-addrs 0.13.3", "reqwest", "serde_with", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tracing", ] @@ -7806,7 +7713,7 @@ dependencies = [ [[package]] name = "reth-network" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7814,12 +7721,12 @@ dependencies = [ "aquamarine", "auto_impl", "derive_more", - "discv5 0.7.0", + "discv5", "enr", "futures", "itertools 0.13.0", "metrics 0.23.0", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "rand", "reth-chainspec", @@ -7837,6 +7744,7 @@ dependencies = [ "reth-network-peers", "reth-network-types", "reth-primitives", + "reth-provider", "reth-storage-api", "reth-tasks", "reth-tokio-util", @@ -7846,7 +7754,7 @@ dependencies = [ "secp256k1", "serde", "smallvec", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", "tokio-util", @@ -7856,7 +7764,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "alloy-rpc-types-admin", @@ -7871,7 +7779,7 @@ dependencies = [ "reth-network-types", "reth-tokio-util", "serde", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", ] @@ -7879,7 +7787,7 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7899,14 +7807,14 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "alloy-rlp", "enr", "secp256k1", "serde_with", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "url", ] @@ -7914,7 +7822,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "humantime-serde", "reth-ethereum-forks", @@ -7928,7 +7836,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "anyhow", "bincode", @@ -7937,7 +7845,7 @@ dependencies = [ "memmap2", "reth-fs-util", "serde", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tracing", "zstd", ] @@ -7945,7 +7853,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-rpc-types-engine", "eyre", @@ -7968,7 +7876,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -8032,9 +7940,10 @@ dependencies = [ [[package]] name = "reth-node-core" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "clap", @@ -8072,7 +7981,7 @@ dependencies = [ "serde", "shellexpand", "strum", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "toml", "tracing", "vergen", @@ -8081,7 +7990,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "eyre", "reth-auto-seal-consensus", @@ -8091,6 +8000,7 @@ dependencies = [ "reth-consensus", "reth-ethereum-engine-primitives", "reth-ethereum-payload-builder", + "reth-evm", "reth-evm-ethereum", "reth-network", "reth-node-api", @@ -8108,8 +8018,9 @@ dependencies = [ [[package]] name = "reth-node-events" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ + "alloy-consensus", "alloy-primitives", "alloy-rpc-types-engine", "futures", @@ -8131,7 +8042,7 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "eyre", "http 1.1.0", @@ -8155,7 +8066,7 @@ dependencies = [ [[package]] name = "reth-node-types" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "reth-chainspec", "reth-db-api", @@ -8167,7 +8078,7 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -8187,7 +8098,7 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -8200,7 +8111,7 @@ dependencies = [ "reth-primitives", "reth-transaction-pool", "serde", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", "tracing", @@ -8209,10 +8120,8 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ - "alloy-eips", - "alloy-primitives", "alloy-rpc-types", "reth-chainspec", "reth-primitives", @@ -8222,12 +8131,13 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", + "alloy-serde", "bytes", "c-kzg", "derive_more", @@ -8251,7 +8161,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8272,8 +8182,9 @@ dependencies = [ [[package]] name = "reth-provider" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", @@ -8282,7 +8193,7 @@ dependencies = [ "itertools 0.13.0", "metrics 0.23.0", "notify", - "parking_lot 0.12.3", + "parking_lot", "rayon", "reth-blockchain-tree-api", "reth-chain-state", @@ -8314,7 +8225,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "itertools 0.13.0", @@ -8332,7 +8243,7 @@ dependencies = [ "reth-static-file-types", "reth-tokio-util", "rustc-hash 2.0.0", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tracing", ] @@ -8340,7 +8251,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "bytes", @@ -8348,30 +8259,29 @@ dependencies = [ "modular-bitfield", "reth-codecs", "serde", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] name = "reth-revm" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", - "reth-chainspec", - "reth-consensus-common", "reth-execution-errors", "reth-primitives", "reth-prune-types", "reth-storage-api", "reth-storage-errors", + "reth-trie", "revm", ] [[package]] name = "reth-rpc" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -8398,7 +8308,7 @@ dependencies = [ "hyper 1.5.0", "jsonrpsee", "jsonwebtoken", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "rand", "reth-chainspec", @@ -8426,7 +8336,7 @@ dependencies = [ "revm-primitives", "serde", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", "tower 0.4.13", @@ -8437,7 +8347,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-json-rpc", @@ -8463,7 +8373,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-network", "alloy-rpc-types", @@ -8490,7 +8400,7 @@ dependencies = [ "reth-tasks", "reth-transaction-pool", "serde", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tower 0.4.13", "tower-http", "tracing", @@ -8499,7 +8409,7 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8522,7 +8432,7 @@ dependencies = [ "reth-tasks", "reth-transaction-pool", "serde", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tracing", ] @@ -8530,7 +8440,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -8547,7 +8457,7 @@ dependencies = [ "futures", "jsonrpsee", "jsonrpsee-types", - "parking_lot 0.12.3", + "parking_lot", "reth-chainspec", "reth-errors", "reth-evm", @@ -8572,7 +8482,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8607,7 +8517,7 @@ dependencies = [ "revm-primitives", "schnellru", "serde", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", "tracing", @@ -8616,7 +8526,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-rpc-types-engine", "http 1.1.0", @@ -8629,7 +8539,7 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -8645,7 +8555,7 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8657,12 +8567,13 @@ dependencies = [ "alloy-serde", "reth-primitives", "reth-trie-common", + "serde", ] [[package]] name = "reth-stages" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "bincode", @@ -8690,7 +8601,7 @@ dependencies = [ "reth-storage-errors", "reth-trie", "reth-trie-db", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tracing", ] @@ -8698,7 +8609,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "aquamarine", @@ -8716,7 +8627,7 @@ dependencies = [ "reth-static-file", "reth-static-file-types", "reth-tokio-util", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tracing", ] @@ -8724,7 +8635,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "bytes", @@ -8737,16 +8648,13 @@ dependencies = [ [[package]] name = "reth-static-file" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", - "parking_lot 0.12.3", + "parking_lot", "rayon", - "reth-chainspec", "reth-db", "reth-db-api", - "reth-nippy-jar", - "reth-node-types", "reth-provider", "reth-prune-types", "reth-stages-types", @@ -8759,7 +8667,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "clap", @@ -8771,7 +8679,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8791,7 +8699,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8804,7 +8712,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "auto_impl", "dyn-clone", @@ -8813,7 +8721,7 @@ dependencies = [ "pin-project", "rayon", "reth-metrics", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tracing", "tracing-futures", @@ -8822,7 +8730,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "tokio", "tokio-stream", @@ -8832,7 +8740,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "clap", "eyre", @@ -8847,7 +8755,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8858,7 +8766,8 @@ dependencies = [ "bitflags 2.6.0", "futures-util", "metrics 0.23.0", - "parking_lot 0.12.3", + "parking_lot", + "rand", "reth-chain-state", "reth-chainspec", "reth-eth-wire-types", @@ -8873,7 +8782,7 @@ dependencies = [ "schnellru", "serde", "smallvec", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tokio-stream", "tracing", @@ -8882,13 +8791,12 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-rlp", "auto_impl", - "derive_more", "itertools 0.13.0", "metrics 0.23.0", "rayon", @@ -8907,7 +8815,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -8927,32 +8835,29 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "alloy-rlp", - "auto_impl", "derive_more", - "itertools 0.13.0", "metrics 0.23.0", - "rayon", "reth-db", "reth-db-api", "reth-execution-errors", "reth-metrics", "reth-primitives", - "reth-stages-types", "reth-storage-errors", "reth-trie", "reth-trie-common", "revm", + "serde", "tracing", ] [[package]] name = "reth-trie-parallel" version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth?rev=1efa764#1efa764b34f163e70890bbd54eac64ad2b6adcce" +source = "git+https://github.com/paradigmxyz/reth?rev=2fba3c0#2fba3c027b7396db868b162e16635197cd584822" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8961,22 +8866,21 @@ dependencies = [ "metrics 0.23.0", "rayon", "reth-db", - "reth-db-api", "reth-execution-errors", "reth-metrics", "reth-primitives", "reth-provider", "reth-trie", "reth-trie-db", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tracing", ] [[package]] name = "revm" -version = "16.0.0" +version = "17.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e44692d5736cc44c697a372e507890f8797f06d1541c5f4b9bec594d90fd8a" +checksum = "055bee6a81aaeee8c2389ae31f0d4de87f44df24f4444a1116f9755fd87a76ad" dependencies = [ "auto_impl", "cfg-if", @@ -8989,9 +8893,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64e2246ad480167548724eb9c9c66945241b867c7d50894de3ca860c9823a45" +checksum = "1e29c662f7887f3b659d4b0fd234673419a8fcbeaa1ecc29bf7034c0a75cc8ea" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -9003,14 +8907,14 @@ dependencies = [ "colorchoice", "revm", "serde_json", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", ] [[package]] name = "revm-interpreter" -version = "12.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f89940d17d5d077570de1977f52f69049595322e237cb6c754c3d47f668f023" +checksum = "fac2034454f8bc69dc7d3c94cdb1b57559e27f5ef0518771f1787de543d7d6a1" dependencies = [ "revm-primitives", "serde", @@ -9018,9 +8922,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "13.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f816aaea3245cbdbe7fdd84955df33597f9322c7912c3e3ba7bc855e03211f" +checksum = "7a88c8c7c5f9b988a9e65fc0990c6ce859cdb74114db705bd118a96d22d08027" dependencies = [ "aurora-engine-modexp", "blst", @@ -9037,9 +8941,9 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "12.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532411bbde45a46707c1d434dcdc29866cf261c1b748fb01b303ce3b4310b361" +checksum = "0d11fa1e195b0bebaf3fb18596f314a13ba3a4cb1fdd16d3465934d812fd921e" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -9188,12 +9092,10 @@ dependencies = [ "clap", "eyre", "futures", - "hashbrown 0.15.0", "http-body-util", "kona-derive", - "kona-providers", - "kona-providers-alloy", - "kona-providers-local", + "kona-derive-alloy", + "kona-derive-local", "metrics-exporter-prometheus 0.16.0", "op-alloy-genesis", "op-alloy-protocol", @@ -9230,7 +9132,7 @@ dependencies = [ "netlink-packet-route", "netlink-proto", "nix", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", ] @@ -9628,29 +9530,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] name = "serde_json" -version = "1.0.131" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "indexmap 2.6.0", "itoa", @@ -9667,7 +9569,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -9718,7 +9620,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -9845,6 +9747,10 @@ name = "similar" version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" +dependencies = [ + "bstr", + "unicode-segmentation", +] [[package]] name = "similar-asserts" @@ -9853,6 +9759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfe85670573cd6f0fa97940f26e7e6601213c3b0555246c24234131f88c5709e" dependencies = [ "console", + "serde", "similar", ] @@ -9864,7 +9771,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "time", ] @@ -9927,16 +9834,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.5.7" @@ -10031,7 +9928,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -10055,8 +9952,8 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "superchain" -version = "0.8.0" -source = "git+https://github.com/anton-rs/superchain?branch=main#997fbbac38c6d0647cd14b192e40d10bf1dfdfed" +version = "0.9.2" +source = "git+https://github.com/anton-rs/superchain?branch=main#ebb7ee237da081a2107466da3adb29fac97f64ae" dependencies = [ "alloy-primitives", "lazy_static", @@ -10078,9 +9975,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -10089,14 +9986,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfc1bfd06acc78f16d8fd3ef846bc222ee7002468d10a7dce8d703d6eab89a3" +checksum = "9d5e0c2ea8db64b2898b62ea2fbd60204ca95e0b2c6bdf53ff768bbe916fbe4d" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -10122,7 +10019,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -10208,39 +10105,39 @@ checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" [[package]] name = "thiserror" version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +source = "git+https://github.com/quartiq/thiserror?branch=no-std#e779e1b70023cee5807f378e147f66387d1ccd4f" dependencies = [ - "thiserror-impl 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror-impl 1.0.64", ] [[package]] name = "thiserror" -version = "1.0.64" -source = "git+https://github.com/quartiq/thiserror?branch=no-std#e779e1b70023cee5807f378e147f66387d1ccd4f" +version = "1.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ - "thiserror-impl 1.0.64 (git+https://github.com/quartiq/thiserror?branch=no-std)", + "thiserror-impl 1.0.65", ] [[package]] name = "thiserror-impl" version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +source = "git+https://github.com/quartiq/thiserror?branch=no-std#e779e1b70023cee5807f378e147f66387d1ccd4f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] name = "thiserror-impl" -version = "1.0.64" -source = "git+https://github.com/quartiq/thiserror?branch=no-std#e779e1b70023cee5807f378e147f66387d1ccd4f" +version = "1.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -10383,18 +10280,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", "libc", "mio 1.0.2", - "parking_lot 0.12.3", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2", "tokio-macros", "windows-sys 0.52.0", ] @@ -10407,7 +10304,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -10605,7 +10502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "time", "tracing-subscriber", ] @@ -10618,7 +10515,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -10724,7 +10621,7 @@ dependencies = [ "once_cell", "rand", "smallvec", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tinyvec", "tokio", "tracing", @@ -10742,11 +10639,12 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "rand", "resolv-conf", + "serde", "smallvec", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "tokio", "tracing", "trust-dns-proto", @@ -10774,7 +10672,7 @@ dependencies = [ "rustls", "rustls-pki-types", "sha1", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "utf-8", ] @@ -11048,7 +10946,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", "wasm-bindgen-shared", ] @@ -11082,7 +10980,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -11101,7 +10999,7 @@ checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee" dependencies = [ "futures", "js-sys", - "parking_lot 0.12.3", + "parking_lot", "pin-utils", "slab", "wasm-bindgen", @@ -11266,7 +11164,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -11277,7 +11175,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -11288,7 +11186,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -11299,7 +11197,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -11533,7 +11431,7 @@ dependencies = [ "pharos", "rustc_version 0.4.1", "send_wrapper 0.6.0", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -11573,7 +11471,7 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.65", "time", ] @@ -11601,7 +11499,7 @@ dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "rand", "static_assertions", @@ -11616,7 +11514,7 @@ dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "rand", "static_assertions", @@ -11658,7 +11556,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", "synstructure", ] @@ -11680,7 +11578,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -11700,7 +11598,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", "synstructure", ] @@ -11721,7 +11619,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -11743,7 +11641,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 7c2ef32..219040d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,103 +9,77 @@ keywords = ["ethereum", "crypto"] categories = ["cryptography", "cryptography::cryptocurrencies"] [workspace] +resolver = "2" members = ["bin/*", "crates/*"] default-members = ["bin/hera"] -# Explicitly set the resolver to version 2, which is the default for packages with edition >= 2021 -# https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html -resolver = "2" - [profile.release] -strip = "debuginfo" lto = "thin" panic = "unwind" +strip = "debuginfo" codegen-units = 1 incremental = false -[patch.crates-io] -op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" } -op-alloy-protocol = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" } -op-alloy-genesis = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" } -op-alloy-rpc-types = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" } -op-alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" } -op-alloy-rpc-jsonrpsee = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" } -op-alloy-provider = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" } - [workspace.dependencies] # Workspace ser = { path = "crates/ser" } op-net = { path = "crates/net" } rollup = { path = "crates/rollup" } -kona-providers-local = { path = "crates/providers-local" } +kona-derive-local = { path = "crates/derive" } -# Kona -kona-derive = { git = "https://github.com/anton-rs/kona", branch = "main", default-features = true } -kona-providers = { git = "https://github.com/anton-rs/kona", branch = "main", default-features = true } -kona-providers-alloy = { git = "https://github.com/anton-rs/kona", branch = "main", default-features = true } - -# Superchain +# anton-rs superchain = { git = "https://github.com/anton-rs/superchain", branch = "main", default-features = false } +kona-derive = { git = "https://github.com/anton-rs/kona", branch = "main", default-features = true } +kona-derive-alloy = { git = "https://github.com/anton-rs/kona", branch = "main", default-features = true } # Alloy -alloy-rlp = { version = "0.3.8", default-features = false } -alloy-eips = { version = "0.5", default-features = false } -alloy-signer = { version = "0.5.2", default-features = false } -alloy-network = { version = "0.5.2", default-features = false } -alloy-provider = { version = "0.5.2", default-features = false } -alloy-contract = { version = "0.5.2", default-features = false } -alloy-transport = { version = "0.5.2", default-features = false } -alloy-rpc-types = { version = "0.5.2", default-features = false } -alloy-consensus = { version = "0.5.2", default-features = false } -alloy-primitives = { version = "0.8.8", default-features = false } -alloy-rpc-client = { version = "0.5.2", default-features = false } -alloy-rpc-types-eth = { version = "0.5.2", default-features = false } -alloy-transport-http = { version = "0.5.2", default-features = false } -alloy-rpc-types-engine = { version = "0.5.2", default-features = false } +alloy-rlp = { version = "0.3.9", default-features = false } +alloy-eips = { version = "0.5.4", default-features = false } +alloy-signer = { version = "0.5.4", default-features = false } +alloy-network = { version = "0.5.4", default-features = false } +alloy-provider = { version = "0.5.4", default-features = false } +alloy-contract = { version = "0.5.4", default-features = false } +alloy-transport = { version = "0.5.4", default-features = false } +alloy-rpc-types = { version = "0.5.4", default-features = false } +alloy-consensus = { version = "0.5.4", default-features = false } +alloy-primitives = { version = "0.8.9", default-features = false } +alloy-rpc-client = { version = "0.5.4", default-features = false } +alloy-rpc-types-eth = { version = "0.5.4", default-features = false } +alloy-transport-http = { version = "0.5.4", default-features = false } +alloy-rpc-types-engine = { version = "0.5.4", default-features = false } # Op Alloy -op-alloy-genesis = { version = "0.5.0", default-features = false } -op-alloy-provider = { version = "0.5.0", default-features = false } -op-alloy-protocol = { version = "0.5.0", default-features = false } -op-alloy-consensus = { version = "0.5.0", default-features = false } -op-alloy-rpc-types = { version = "0.5.0", default-features = false } -op-alloy-rpc-jsonrpsee = { version = "0.5.0", default-features = false } -op-alloy-rpc-types-engine = { version = "0.5.0", default-features = false } +op-alloy-genesis = { version = "0.5.1", default-features = false } +op-alloy-provider = { version = "0.5.1", default-features = false } +op-alloy-protocol = { version = "0.5.1", default-features = false } +op-alloy-consensus = { version = "0.5.1", default-features = false } +op-alloy-rpc-types = { version = "0.5.1", default-features = false } +op-alloy-rpc-jsonrpsee = { version = "0.5.1", default-features = false } +op-alloy-rpc-types-engine = { version = "0.5.1", default-features = false } # Reth -reth = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-exex = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-discv5 = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } -reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", rev = "1efa764" } +reth = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" } +reth-exex = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" } +reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" } +reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "2fba3c0" } # Tokio -tokio = { version = "1.21", default-features = false } +tokio = { version = "1.41", default-features = false } # Serialization serde_json = "1" ethereum_ssz = "0.8.0" # RPC -jsonrpsee = { version = "0.24", default-features = false } jsonrpsee-types = "0.24" +jsonrpsee = { version = "0.24", default-features = false } # Networking snap = "1.1.1" discv5 = "0.8.0" -libp2p = "0.54.0" -openssl = "0.10.66" +libp2p = "0.54.1" +openssl = "0.10.68" libp2p-identity = "0.2.9" # Testing @@ -115,14 +89,13 @@ arbitrary = "1" # Misc url = "2.5.2" eyre = "0.6.12" -clap = "4.5.4" +clap = "4.5.20" reqwest = "0.12" tracing = "0.1.40" thiserror = "1.0" lazy_static = "1.5.0" -futures = "0.3.30" +futures = "0.3.31" async-trait = "0.1.83" -hashbrown = "0.15.0" parking_lot = "0.12.3" unsigned-varint = "0.8.0" tower = "0.5" diff --git a/crates/providers-local/Cargo.toml b/crates/derive/Cargo.toml similarity index 71% rename from crates/providers-local/Cargo.toml rename to crates/derive/Cargo.toml index 0af9f20..f9f0024 100644 --- a/crates/providers-local/Cargo.toml +++ b/crates/derive/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "kona-providers-local" -description = "Local provider implementations for Kona trait abstractions" +name = "kona-derive-local" +description = "kona-derive with local trait implementations" version = "0.0.0" edition.workspace = true authors.workspace = true @@ -16,15 +16,14 @@ alloy-rlp.workspace = true alloy-eips.workspace = true alloy-signer.workspace = true alloy-consensus.workspace = true -alloy-primitives.workspace = true +alloy-primitives = { workspace = true, features = ["map"] } # Op Alloy op-alloy-protocol.workspace = true # Kona kona-derive.workspace = true -kona-providers.workspace = true -kona-providers-alloy.workspace = true +kona-derive-alloy.workspace = true # Reth reth.workspace = true @@ -33,6 +32,5 @@ reth.workspace = true url.workspace = true eyre.workspace = true tracing.workspace = true -hashbrown.workspace = true async-trait.workspace = true parking_lot.workspace = true diff --git a/crates/providers-local/src/blob_provider.rs b/crates/derive/src/blob_provider.rs similarity index 97% rename from crates/providers-local/src/blob_provider.rs rename to crates/derive/src/blob_provider.rs index d080d9b..c065480 100644 --- a/crates/providers-local/src/blob_provider.rs +++ b/crates/derive/src/blob_provider.rs @@ -1,14 +1,13 @@ //! Blob Providers use alloc::{boxed::Box, collections::VecDeque, string::ToString, sync::Arc, vec::Vec}; -use hashbrown::HashMap; use alloy_eips::eip4844::Blob; -use alloy_primitives::B256; +use alloy_primitives::{map::HashMap, B256}; use async_trait::async_trait; use eyre::{eyre, Result}; use kona_derive::{errors::BlobProviderError, sources::IndexedBlobHash, traits::BlobProvider}; -use kona_providers_alloy::{ +use kona_derive_alloy::{ OnlineBeaconClient, OnlineBlobProviderBuilder, OnlineBlobProviderWithFallback, }; use op_alloy_protocol::BlockInfo; @@ -63,7 +62,7 @@ impl InnerBlobProvider { pub fn with_capacity(cap: usize) -> Self { Self { capacity: cap, - blocks_to_blob_sidecars: HashMap::with_capacity(cap), + blocks_to_blob_sidecars: HashMap::default(), key_order: VecDeque::with_capacity(cap), } } diff --git a/crates/providers-local/src/chain_provider.rs b/crates/derive/src/chain_provider.rs similarity index 97% rename from crates/providers-local/src/chain_provider.rs rename to crates/derive/src/chain_provider.rs index d355413..32756c7 100644 --- a/crates/providers-local/src/chain_provider.rs +++ b/crates/derive/src/chain_provider.rs @@ -1,19 +1,18 @@ //! Chain Provider use alloc::{boxed::Box, collections::vec_deque::VecDeque, sync::Arc, vec::Vec}; -use hashbrown::HashMap; +use alloy_primitives::{map::HashMap, B256}; use alloy_consensus::{ Header, Receipt, Signed, TxEip1559, TxEip2930, TxEip4844, TxEip4844Variant, TxEnvelope, TxLegacy, }; use alloy_eips::BlockNumHash; -use alloy_primitives::B256; use alloy_rlp::{Decodable, Encodable}; use alloy_signer::Signature; use async_trait::async_trait; use eyre::eyre; -use kona_providers::ChainProvider; +use kona_derive::traits::ChainProvider; use op_alloy_protocol::BlockInfo; use parking_lot::RwLock; use reth::{primitives::Transaction, providers::Chain}; @@ -73,10 +72,10 @@ impl InMemoryChainProviderInner { Self { capacity: cap, key_order: VecDeque::new(), - hash_to_header: HashMap::with_capacity(cap), - hash_to_block_info: HashMap::with_capacity(cap), - hash_to_receipts: HashMap::with_capacity(cap), - hash_to_txs: HashMap::with_capacity(cap), + hash_to_header: HashMap::default(), + hash_to_block_info: HashMap::default(), + hash_to_receipts: HashMap::default(), + hash_to_txs: HashMap::default(), } } diff --git a/crates/providers-local/src/lib.rs b/crates/derive/src/lib.rs similarity index 100% rename from crates/providers-local/src/lib.rs rename to crates/derive/src/lib.rs diff --git a/crates/rollup/Cargo.toml b/crates/rollup/Cargo.toml index edf4b6c..8cf6dfa 100644 --- a/crates/rollup/Cargo.toml +++ b/crates/rollup/Cargo.toml @@ -12,13 +12,12 @@ categories.workspace = true [dependencies] # Kona kona-derive.workspace = true -kona-providers.workspace = true -kona-providers-alloy.workspace = true -kona-providers-local.workspace = true +kona-derive-alloy.workspace = true +kona-derive-local.workspace = true # Alloy alloy-eips.workspace = true -alloy-primitives.workspace = true +alloy-primitives = { workspace = true, features = ["map"] } alloy-provider = { workspace = true, features = ["ipc"] } alloy-transport.workspace = true alloy-transport-http = { workspace = true, features = ["jwt-auth"] } @@ -44,10 +43,10 @@ reth-execution-types.workspace = true reth-exex = { workspace = true, features = ["serde"] } # Telemetry -tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt"] } +tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt"] } metrics-exporter-prometheus = { version = "0.16.0", features = ["http-listener"] } -# Misc +# Misc url.workspace = true serde_json.workspace = true eyre.workspace = true @@ -55,7 +54,6 @@ tracing.workspace = true async-trait.workspace = true tokio.workspace = true futures.workspace = true -hashbrown.workspace = true tower.workspace = true http-body-util.workspace = true clap = { workspace = true, features = ["derive", "env"] } diff --git a/crates/rollup/src/driver/context/exex.rs b/crates/rollup/src/driver/context/exex.rs index 83b2be8..757616c 100644 --- a/crates/rollup/src/driver/context/exex.rs +++ b/crates/rollup/src/driver/context/exex.rs @@ -1,7 +1,7 @@ use alloy_eips::BlockNumHash; use async_trait::async_trait; use futures::StreamExt; -use kona_providers_local::InMemoryChainProvider; +use kona_derive_local::InMemoryChainProvider; use reth_exex::{ExExContext, ExExEvent}; use reth_node_api::FullNodeComponents; diff --git a/crates/rollup/src/driver/context/standalone.rs b/crates/rollup/src/driver/context/standalone.rs index a62e816..a1e4150 100644 --- a/crates/rollup/src/driver/context/standalone.rs +++ b/crates/rollup/src/driver/context/standalone.rs @@ -1,9 +1,8 @@ -use hashbrown::HashMap; use std::{collections::BTreeMap, time::Duration}; use alloy_eips::{eip1898::BlockNumHash, BlockId}; use alloy_network::Ethereum; -use alloy_primitives::{BlockNumber, B256}; +use alloy_primitives::{map::HashMap, BlockNumber, B256}; use alloy_provider::{IpcConnect, Provider, ProviderBuilder, ReqwestProvider, WsConnect}; use alloy_rpc_types_eth::Block; use alloy_transport::{TransportErrorKind, TransportResult}; diff --git a/crates/rollup/src/driver/cursor.rs b/crates/rollup/src/driver/cursor.rs index ddb96ad..f0d06d6 100644 --- a/crates/rollup/src/driver/cursor.rs +++ b/crates/rollup/src/driver/cursor.rs @@ -1,4 +1,4 @@ -use hashbrown::HashMap; +use alloy_primitives::map::HashMap; use std::collections::{BTreeMap, VecDeque}; use op_alloy_protocol::{BlockInfo, L2BlockInfo}; @@ -35,7 +35,7 @@ impl SyncCursor { capacity, channel_timeout, l1_origin_key_order: VecDeque::with_capacity(capacity), - l1_origin_block_info: HashMap::with_capacity(capacity), + l1_origin_block_info: HashMap::default(), l1_origin_to_l2_blocks: BTreeMap::new(), } } diff --git a/crates/rollup/src/driver/mod.rs b/crates/rollup/src/driver/mod.rs index dc45731..d7db0c4 100644 --- a/crates/rollup/src/driver/mod.rs +++ b/crates/rollup/src/driver/mod.rs @@ -7,11 +7,10 @@ use eyre::{bail, eyre, Result}; use kona_derive::{ errors::{PipelineError, PipelineErrorKind}, pipeline::{Pipeline, StepResult}, - traits::{BlobProvider, ResetSignal, SignalReceiver}, + traits::{BlobProvider, ChainProvider, L2ChainProvider, ResetSignal, SignalReceiver}, }; -use kona_providers::{ChainProvider, L2ChainProvider}; -use kona_providers_alloy::{AlloyChainProvider, AlloyL2ChainProvider, OnlineBlobProviderBuilder}; -use kona_providers_local::{DurableBlobProvider, InMemoryChainProvider, LayeredBlobProvider}; +use kona_derive_alloy::{AlloyChainProvider, AlloyL2ChainProvider, OnlineBlobProviderBuilder}; +use kona_derive_local::{DurableBlobProvider, InMemoryChainProvider, LayeredBlobProvider}; use op_alloy_genesis::RollupConfig; use op_alloy_protocol::{BlockInfo, L2BlockInfo}; use reth_exex::ExExContext; diff --git a/crates/rollup/src/pipeline.rs b/crates/rollup/src/pipeline.rs index 7ea6ac3..cdc07c5 100644 --- a/crates/rollup/src/pipeline.rs +++ b/crates/rollup/src/pipeline.rs @@ -7,13 +7,12 @@ use kona_derive::{ pipeline::{DerivationPipeline, PipelineBuilder}, sources::EthereumDataSource, stages::{ - AttributesQueue, BatchQueue, BatchStream, ChannelProvider, ChannelReader, FrameQueue, + AttributesQueue, BatchProvider, BatchStream, ChannelProvider, ChannelReader, FrameQueue, L1Retrieval, L1Traversal, }, - traits::BlobProvider, + traits::{BlobProvider, ChainProvider}, }; -use kona_providers::ChainProvider; -use kona_providers_alloy::AlloyL2ChainProvider; +use kona_derive_alloy::AlloyL2ChainProvider; use op_alloy_genesis::RollupConfig; use op_alloy_protocol::BlockInfo; @@ -22,9 +21,9 @@ use op_alloy_protocol::BlockInfo; type L1FrameQueue = FrameQueue, L1Traversal>>; /// A concrete [NextAttributes](kona_derive::traits::NextAttributes) stage implementation that -/// accepts batches from the [BatchQueue] stage and transforms them into payload attributes. +/// accepts batches from the [BatchProvider] stage and transforms them into payload attributes. type L1AttributesQueue = AttributesQueue< - BatchQueue>>, L2CP>, L2CP>, + BatchProvider>>, L2CP>, L2CP>, StatefulAttributesBuilder, >;