From a33542eb8a728a38806d9881c84b007104438a1d Mon Sep 17 00:00:00 2001 From: refcell Date: Fri, 31 Jan 2025 08:02:00 -0500 Subject: [PATCH] chore: alloy v11 updates --- Cargo.lock | 200 +++++++++--------- Cargo.toml | 32 +-- bin/host/src/eth/mod.rs | 6 +- bin/host/src/interop/fetcher.rs | 10 +- bin/host/src/interop/orchestrator.rs | 6 +- bin/host/src/single/fetcher.rs | 10 +- bin/host/src/single/orchestrator.rs | 6 +- crates/executor/src/test_utils.rs | 6 +- crates/providers-alloy/src/chain_provider.rs | 8 +- .../providers-alloy/src/l2_chain_provider.rs | 8 +- 10 files changed, 147 insertions(+), 145 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 692cdbecc..74b49b805 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4138dc275554afa6f18c4217262ac9388790b2fc393c2dfe03c51d357abf013" +checksum = "ce20c85f6b24a5da40b2350a748e348417f0465dedbb523a4d149143bc4a41ce" dependencies = [ "alloy-eips", "alloy-primitives", @@ -100,9 +100,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa04e1882c31288ce1028fdf31b6ea94cfa9eafa2e497f903ded631c8c6a42c" +checksum = "8e23af02ccded0031ef2b70df4fe9965b1c742c5d5384c8c767ae0311f7e62b9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -112,6 +112,18 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-eip2124" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675264c957689f0fd75f5993a73123c2cc3b5c235a38f5b9037fe6c826bfb2c0" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "crc", + "thiserror 2.0.11", +] + [[package]] name = "alloy-eip2930" version = "0.1.0" @@ -138,15 +150,17 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52dd5869ed09e399003e0e0ec6903d981b2a92e74c5d37e6b40890bad2517526" +checksum = "7149e011edbd588f6df6564b369c75f6b538d76db14053d95e0b43b2d92e4266" dependencies = [ + "alloy-eip2124", "alloy-eip2930", "alloy-eip7702", "alloy-primitives", "alloy-rlp", "alloy-serde", + "auto_impl", "c-kzg", "derive_more", "once_cell", @@ -168,9 +182,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2008bedb8159a255b46b7c8614516eda06679ea82f620913679afbd8031fea72" +checksum = "c0c5c9651fd20a2fd4a57606b6a570d1c17ab86e686b962b2f1ecac68b51e020" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -182,9 +196,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4556f01fe41d0677495df10a648ddcf7ce118b0e8aa9642a0e2b6dd1fb7259de" +checksum = "b02ed56783fb2c086a4ac8961175dd6d3ad163e6cf6125f0b83f7de03379b607" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -207,9 +221,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31c3c6b71340a1d076831823f09cb6e02de01de5c6630a9631bdb36f947ff80" +checksum = "a0624cfa9311aa8283cd3bf5eed883d0d1e823e2a4d57b30e1b49af4b3678a6b" dependencies = [ "alloy-consensus", "alloy-eips", @@ -250,9 +264,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22c4441b3ebe2d77fa9cf629ba68c3f713eb91779cff84275393db97eddd82" +checksum = "07c68df5354225da542efeb6d9388b65773b3304309b437416146e9d1e2bc1bd" dependencies = [ "alloy-chains", "alloy-consensus", @@ -274,11 +288,10 @@ dependencies = [ "dashmap", "futures", "futures-utils-wasm", - "lru 0.12.5", + "lru", "parking_lot", "pin-project", "reqwest", - "schnellru", "serde", "serde_json", "thiserror 2.0.11", @@ -290,9 +303,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2269fd635f7b505f27c63a3cb293148cd02301efce4c8bdd9ff54fbfc4a20e23" +checksum = "7ef6ef167ea24e7aac569dfd90b668c1f7dca0e48214e70364586d5341a89431" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -331,9 +344,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06a292b37e182e514903ede6e623b9de96420e8109ce300da288a96d88b7e4b" +checksum = "0371aae9b44a35e374c94c7e1df5cbccf0f52b2ef7c782291ed56e86d88ec106" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -357,9 +370,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9383845dd924939e7ab0298bbfe231505e20928907d7905aa3bf112287305e06" +checksum = "1428d64569961b00373c503a3de306656e94ef1f2a474e93fd41a6daae0d6ac7" dependencies = [ "alloy-primitives", "alloy-rpc-types-debug", @@ -370,9 +383,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca445cef0eb6c2cf51cfb4e214fbf1ebd00893ae2e6f3b944c8101b07990f988" +checksum = "66e119337400d8b0348e1576ab37ffa56d1a04cbc977a84d4fa0a527d7cb0c21" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -381,9 +394,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4009405b1d3f5e8c529b8cf353f74e815fd2102549af4172fc721b4b9ea09133" +checksum = "9deadb4c8927dc702b58c8fb675f9fb88782c4c9c95096682058c1574141b8b7" dependencies = [ "alloy-eips", "alloy-primitives", @@ -395,9 +408,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358d6a8d7340b9eb1a7589a6c1fb00df2c9b26e90737fa5ed0108724dd8dac2c" +checksum = "fea98e1c4ac005ffe5f8691164f5f2ef5ee8dda50b1fdba173d44892141909e2" dependencies = [ "alloy-primitives", "serde", @@ -405,9 +418,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f821f30344862a0b6eb9a1c2eb91dfb2ff44c7489f37152a526cdcab79264" +checksum = "b582c59b6f493d9b15bea32f44f662fa6749e5464ef5305d8429a864ace60684" dependencies = [ "alloy-consensus", "alloy-eips", @@ -421,9 +434,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0938bc615c02421bd86c1733ca7205cc3d99a122d9f9bff05726bd604b76a5c2" +checksum = "8a4a43d8b1344e3ef115ed7a2cee934876e4a64d2b9d9bee8738f9806900757e" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -433,7 +446,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", - "itertools 0.13.0", + "itertools 0.14.0", "serde", "serde_json", "thiserror 2.0.11", @@ -441,9 +454,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae0465c71d4dced7525f408d84873aeebb71faf807d22d74c4a426430ccd9b55" +checksum = "86aa42c36e3c0db5bd9a7314e98aa261a61d5e3d6a0bd7e51fb8b0a3d6438481" dependencies = [ "alloy-primitives", "serde", @@ -452,9 +465,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfa395ad5cc952c82358d31e4c68b27bf4a89a5456d9b27e226e77dac50e4ff" +checksum = "c613222abd016e03ba548f41db938a2c99108b59c0c66ca105eab1b7a2e6b40a" dependencies = [ "alloy-primitives", "async-trait", @@ -536,13 +549,12 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d17722a198f33bbd25337660787aea8b8f57814febb7c746bc30407bdfc39448" +checksum = "40e2f34fcd849676c8fe274a6e72f0664dfede7ce06d12daa728d2e72f1b4393" dependencies = [ "alloy-json-rpc", "base64", - "futures-util", "futures-utils-wasm", "serde", "serde_json", @@ -556,9 +568,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1509599021330a31c4a6816b655e34bf67acb1cc03c564e09fd8754ff6c5de" +checksum = "6e291c97c3c0ebb5d03c34e3a55c0f7c5bfa307536a2efaaa6fae4b3a4d09851" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -571,9 +583,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4da44bc9a5155ab599666d26decafcf12204b72a80eeaba7c5e234ee8ac205" +checksum = "8d3e991f40d2d81c6ee036a34d81127bfec5fadf7e649791b5225181126c1959" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -582,6 +594,7 @@ dependencies = [ "futures", "interprocess", "pin-project", + "serde", "serde_json", "tokio", "tokio-util", @@ -590,9 +603,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58011745b2f17b334db40df9077d75b181f78360a5bc5c35519e15d4bfce15e2" +checksum = "fc8c544f7dc764735664756805f8b8b770020cc295a0b96b09cbefd099c172c7" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -1325,6 +1338,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "criterion" version = "0.5.1" @@ -1986,12 +2014,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" - [[package]] name = "hashbrown" version = "0.14.5" @@ -2411,9 +2433,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] @@ -2496,7 +2518,7 @@ dependencies = [ "kona-proof-interop", "kona-std-fpvm", "kona-std-fpvm-proc", - "lru 0.13.0", + "lru", "maili-genesis", "maili-protocol", "op-alloy-consensus", @@ -2697,7 +2719,7 @@ dependencies = [ "kona-executor", "kona-mpt", "kona-preimage", - "lru 0.13.0", + "lru", "maili-genesis", "maili-protocol", "maili-registry", @@ -2750,7 +2772,7 @@ dependencies = [ "alloy-transport", "async-trait", "kona-derive", - "lru 0.13.0", + "lru", "maili-genesis", "maili-protocol", "op-alloy-consensus", @@ -2876,15 +2898,6 @@ version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" -[[package]] -name = "lru" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" -dependencies = [ - "hashbrown 0.15.2", -] - [[package]] name = "lru" version = "0.13.0" @@ -2897,8 +2910,7 @@ dependencies = [ [[package]] name = "maili-genesis" version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "768927c57b7b345e05f11762bec4c0338dea99dba1f3954a9d762998e9fc8c5f" +source = "git+https://github.com/op-rs/maili?branch=matt/bump-alloy11#0a04bfdabd493194dfc5de2921c089cd6c6448dd" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2914,8 +2926,7 @@ dependencies = [ [[package]] name = "maili-protocol" version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91207581f38f02ed815f23bcb8457b1d0b9506212139cf54f4b35e89cac9560f" +source = "git+https://github.com/op-rs/maili?branch=matt/bump-alloy11#0a04bfdabd493194dfc5de2921c089cd6c6448dd" dependencies = [ "alloc-no-stdlib", "alloy-consensus", @@ -2942,8 +2953,7 @@ dependencies = [ [[package]] name = "maili-registry" version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01189e3ca0c4c04f3a1228af969350b0501ae1dd052dec3538939399d1f412be" +source = "git+https://github.com/op-rs/maili?branch=matt/bump-alloy11#0a04bfdabd493194dfc5de2921c089cd6c6448dd" dependencies = [ "alloy-primitives", "lazy_static", @@ -2957,8 +2967,7 @@ dependencies = [ [[package]] name = "maili-rpc" version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c508f63e1d0fd1e5c51cda4cedaf8a73ec4ab4fb3fbc4815d9d6033a90c9662" +source = "git+https://github.com/op-rs/maili?branch=matt/bump-alloy11#0a04bfdabd493194dfc5de2921c089cd6c6448dd" dependencies = [ "alloy-eips", "alloy-primitives", @@ -2970,8 +2979,7 @@ dependencies = [ [[package]] name = "maili-serde" version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1de634cf1a237843cab05c84f5fcbc95106ce7754b5e66c4b5a43f2c0aef13" +source = "git+https://github.com/op-rs/maili?branch=matt/bump-alloy11#0a04bfdabd493194dfc5de2921c089cd6c6448dd" dependencies = [ "alloy-primitives", "serde", @@ -2981,8 +2989,7 @@ dependencies = [ [[package]] name = "maili-superchain" version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15aed5565dc34a47dc82d6cf624c5cf8e129e7c821e56e14f31d7a1ae48470d" +source = "git+https://github.com/op-rs/maili?branch=matt/bump-alloy11#0a04bfdabd493194dfc5de2921c089cd6c6448dd" dependencies = [ "alloy-primitives", "maili-genesis", @@ -3257,9 +3264,9 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "op-alloy-consensus" -version = "0.9.6" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28dc4e397dd8969f7f98ea6454a5c531349a58c76e12448b0c2de6581df7b8c" +checksum = "36e8e67b41afd338096ca31f24c5e7800797858b963490be2e8971d17d733f49" dependencies = [ "alloy-consensus", "alloy-eips", @@ -3273,15 +3280,15 @@ dependencies = [ [[package]] name = "op-alloy-flz" -version = "0.9.6" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76b44f5edbd5293636934a88ec38d683ee2075bfce43658d1033d76191e7aff6" +checksum = "f5402b85f0fa22712960498c3a123875d7b53da21928b24a8f8667babb268c4c" [[package]] name = "op-alloy-rpc-types-engine" -version = "0.9.6" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d05b5b5b3cff7f24eec2bc366f86a7ff0934678b1bda36d0ecaadba9504170" +checksum = "26c6735ec88e69917c0cb0a3ee60ad7e5cd14dcb905a6ca55fbc7004b72c5e20" dependencies = [ "alloy-eips", "alloy-primitives", @@ -4257,17 +4264,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "schnellru" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356285bbf17bea63d9e52e96bd18f039672ac92b55b8cb997d6162a2a37d1649" -dependencies = [ - "ahash", - "cfg-if", - "hashbrown 0.13.2", -] - [[package]] name = "scopeguard" version = "1.2.0" @@ -4959,9 +4955,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.24.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" +checksum = "be4bf6fecd69fcdede0ec680aaf474cdab988f9de6bc73d3758f0160e3b7025a" dependencies = [ "futures-util", "log", @@ -5113,9 +5109,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.24.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +checksum = "413083a99c579593656008130e29255e54dcaae495be556cc26888f211648c24" dependencies = [ "byteorder", "bytes", @@ -5127,7 +5123,7 @@ dependencies = [ "rustls", "rustls-pki-types", "sha1", - "thiserror 1.0.69", + "thiserror 2.0.11", "utf-8", ] @@ -5384,9 +5380,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.7" +version = "0.26.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" +checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9" dependencies = [ "rustls-pki-types", ] diff --git a/Cargo.toml b/Cargo.toml index a21e7621f..f22c37a65 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -62,6 +62,12 @@ panic = "abort" codegen-units = 1 lto = "fat" +[patch.crates-io] +maili-rpc = { git = "https://github.com/op-rs/maili", branch = "matt/bump-alloy11" } +maili-protocol = { git = "https://github.com/op-rs/maili", branch = "matt/bump-alloy11" } +maili-registry = { git = "https://github.com/op-rs/maili", branch = "matt/bump-alloy11" } +maili-genesis = { git = "https://github.com/op-rs/maili", branch = "matt/bump-alloy11" } + [workspace.dependencies] # Workspace kona-host = { path = "bin/host", version = "0.1.0", default-features = false } @@ -87,23 +93,23 @@ maili-genesis = { version = "0.1.11", default-features = false } # Alloy alloy-rlp = { version = "0.3.11", default-features = false } alloy-trie = { version = "0.7.8", default-features = false } -alloy-eips = { version = "0.9.2", default-features = false } -alloy-serde = { version = "0.9.2", default-features = false } -alloy-provider = { version = "0.9.2", default-features = false } -alloy-consensus = { version = "0.9.2", default-features = false } -alloy-transport = { version = "0.9.2", default-features = false } -alloy-rpc-types = { version = "0.9.2", default-features = false } -alloy-rpc-client = { version = "0.9.2", default-features = false } +alloy-eips = { version = "0.11.0", default-features = false } +alloy-serde = { version = "0.11.0", default-features = false } +alloy-provider = { version = "0.11.0", default-features = false } +alloy-consensus = { version = "0.11.0", default-features = false } +alloy-transport = { version = "0.11.0", default-features = false } +alloy-rpc-types = { version = "0.11.0", default-features = false } +alloy-rpc-client = { version = "0.11.0", default-features = false } alloy-primitives = { version = "0.8.19", default-features = false } -alloy-node-bindings = { version = "0.9.2", default-features = false } -alloy-transport-http = { version = "0.9.2", default-features = false } -alloy-rpc-types-engine = { version = "0.9.2", default-features = false } -alloy-rpc-types-beacon = { version = "0.9.2", default-features = false } +alloy-node-bindings = { version = "0.11.0", default-features = false } +alloy-transport-http = { version = "0.11.0", default-features = false } +alloy-rpc-types-engine = { version = "0.11.0", default-features = false } +alloy-rpc-types-beacon = { version = "0.11.0", default-features = false } alloy-sol-types = { version = "0.8.19", default-features = false } # OP Alloy -op-alloy-consensus = { version = "0.9.6", default-features = false } -op-alloy-rpc-types-engine = { version = "0.9.6", default-features = false } +op-alloy-consensus = { version = "0.10.0", default-features = false } +op-alloy-rpc-types-engine = { version = "0.10.0", default-features = false } # General lru = "0.13.0" diff --git a/bin/host/src/eth/mod.rs b/bin/host/src/eth/mod.rs index 8e94d4537..0b7003e80 100644 --- a/bin/host/src/eth/mod.rs +++ b/bin/host/src/eth/mod.rs @@ -1,6 +1,6 @@ //! Ethereum utilities for the host binary. -use alloy_provider::ReqwestProvider; +use alloy_provider::RootProvider; use alloy_rpc_client::RpcClient; use alloy_transport_http::Http; use reqwest::Client; @@ -9,8 +9,8 @@ mod precompiles; pub(crate) use precompiles::execute; /// Returns an HTTP provider for the given URL. -pub fn http_provider(url: &str) -> ReqwestProvider { +pub fn http_provider(url: &str) -> RootProvider { let url = url.parse().unwrap(); let http = Http::::new(url); - ReqwestProvider::new(RpcClient::new(http, true)) + RootProvider::new(RpcClient::new(http, true)) } diff --git a/bin/host/src/interop/fetcher.rs b/bin/host/src/interop/fetcher.rs index 67744dc1c..fb45ca9fa 100644 --- a/bin/host/src/interop/fetcher.rs +++ b/bin/host/src/interop/fetcher.rs @@ -10,7 +10,7 @@ use alloy_eips::{ BlockId, }; use alloy_primitives::{address, keccak256, map::HashMap, Address, Bytes, B256}; -use alloy_provider::{Provider, ReqwestProvider}; +use alloy_provider::{Provider, RootProvider}; use alloy_rlp::{Decodable, Encodable, EMPTY_STRING_CODE}; use alloy_rpc_types::{ Block, BlockNumberOrTag, BlockTransactions, BlockTransactionsKind, Transaction, @@ -51,11 +51,11 @@ where /// Key-value store for preimages. kv_store: Arc>, /// L1 chain provider. - l1_provider: ReqwestProvider, + l1_provider: RootProvider, /// The blob provider blob_provider: OnlineBlobProvider, /// L2 chain providers, keyed by chain ID. - l2_providers: HashMap, + l2_providers: HashMap, /// The cached active L2 chain ID. active_l2_chain_id: u64, /// The last hint that was received. [None] if no hint has been received yet. @@ -70,9 +70,9 @@ where pub fn new( cfg: InteropHostCli, kv_store: Arc>, - l1_provider: ReqwestProvider, + l1_provider: RootProvider, blob_provider: OnlineBlobProvider, - l2_providers: HashMap, + l2_providers: HashMap, ) -> Self { let active_l2_chain_id = cfg.active_l2_chain_id().expect("No active L2 chain ID"); Self { diff --git a/bin/host/src/interop/orchestrator.rs b/bin/host/src/interop/orchestrator.rs index 4931ad60d..15834e057 100644 --- a/bin/host/src/interop/orchestrator.rs +++ b/bin/host/src/interop/orchestrator.rs @@ -3,7 +3,7 @@ use super::{InteropFetcher, InteropHostCli, LocalKeyValueStore}; use crate::eth::http_provider; use alloy_primitives::map::HashMap; -use alloy_provider::{Provider, ReqwestProvider}; +use alloy_provider::{Provider, RootProvider}; use anyhow::{anyhow, Result}; use async_trait::async_trait; use kona_host::{ @@ -19,11 +19,11 @@ use tokio::sync::RwLock; #[derive(Debug)] pub struct InteropProviders { /// The L1 EL provider. - l1_provider: ReqwestProvider, + l1_provider: RootProvider, /// The L1 beacon node provider. blob_provider: OnlineBlobProvider, /// The L2 EL providers, keyed by chain ID. - l2_providers: HashMap, + l2_providers: HashMap, } #[async_trait] diff --git a/bin/host/src/single/fetcher.rs b/bin/host/src/single/fetcher.rs index 0f5de16f6..c747448bd 100644 --- a/bin/host/src/single/fetcher.rs +++ b/bin/host/src/single/fetcher.rs @@ -8,7 +8,7 @@ use alloy_eips::{ BlockId, }; use alloy_primitives::{address, keccak256, map::HashMap, Address, Bytes, B256}; -use alloy_provider::{Provider, ReqwestProvider}; +use alloy_provider::{Provider, RootProvider}; use alloy_rlp::{Decodable, EMPTY_STRING_CODE}; use alloy_rpc_types::{ debug::ExecutionWitness, Block, BlockNumberOrTag, BlockTransactions, BlockTransactionsKind, @@ -37,11 +37,11 @@ where /// Key-value store for preimages. kv_store: Arc>, /// L1 chain provider. - l1_provider: ReqwestProvider, + l1_provider: RootProvider, /// The blob provider blob_provider: OnlineBlobProvider, /// L2 chain provider. - l2_provider: ReqwestProvider, + l2_provider: RootProvider, /// L2 head l2_head: B256, /// The last hint that was received. [None] if no hint has been received yet. @@ -55,9 +55,9 @@ where /// Create a new [SingleChainFetcher] with the given [KeyValueStore]. pub fn new( kv_store: Arc>, - l1_provider: ReqwestProvider, + l1_provider: RootProvider, blob_provider: OnlineBlobProvider, - l2_provider: ReqwestProvider, + l2_provider: RootProvider, l2_head: B256, ) -> Self { Self { diff --git a/bin/host/src/single/orchestrator.rs b/bin/host/src/single/orchestrator.rs index bb61ae546..02f8b4fde 100644 --- a/bin/host/src/single/orchestrator.rs +++ b/bin/host/src/single/orchestrator.rs @@ -2,7 +2,7 @@ use super::{LocalKeyValueStore, SingleChainFetcher, SingleChainHostCli}; use crate::eth::http_provider; -use alloy_provider::ReqwestProvider; +use alloy_provider::RootProvider; use anyhow::{anyhow, Result}; use async_trait::async_trait; use kona_host::{ @@ -18,11 +18,11 @@ use tokio::sync::RwLock; #[derive(Debug)] pub struct SingleChainProviders { /// The L1 EL provider. - l1_provider: ReqwestProvider, + l1_provider: RootProvider, /// The L1 beacon node provider. blob_provider: OnlineBlobProvider, /// The L2 EL provider. - l2_provider: ReqwestProvider, + l2_provider: RootProvider, } #[async_trait] diff --git a/crates/executor/src/test_utils.rs b/crates/executor/src/test_utils.rs index 928fb3f0d..1beac0cc9 100644 --- a/crates/executor/src/test_utils.rs +++ b/crates/executor/src/test_utils.rs @@ -7,7 +7,7 @@ use alloy_consensus::Header; use alloy_primitives::{Bytes, Sealable, B256}; use alloy_provider::{ network::primitives::{BlockTransactions, BlockTransactionsKind}, - Provider, ReqwestProvider, + Provider, RootProvider, }; use alloy_rlp::Decodable; use alloy_rpc_client::RpcClient; @@ -47,7 +47,7 @@ pub(crate) struct ExecutorTestFixture { #[derive(Debug)] pub(crate) struct ExecutorTestFixtureCreator { /// The RPC provider for the L2 execution layer. - pub(crate) provider: ReqwestProvider, + pub(crate) provider: RootProvider, /// The block number to create the test fixture for. pub(crate) block_number: u64, /// The key value store for the test fixture. @@ -66,7 +66,7 @@ impl ExecutorTestFixtureCreator { let url = provider_url.parse().expect("Invalid provider URL"); let http = Http::::new(url); - let provider = ReqwestProvider::new(RpcClient::new(http, false)); + let provider = RootProvider::new(RpcClient::new(http, false)); Self { provider, diff --git a/crates/providers-alloy/src/chain_provider.rs b/crates/providers-alloy/src/chain_provider.rs index 50bb75326..74960ea94 100644 --- a/crates/providers-alloy/src/chain_provider.rs +++ b/crates/providers-alloy/src/chain_provider.rs @@ -2,7 +2,7 @@ use alloy_consensus::{Block, Header, Receipt, ReceiptWithBloom, TxEnvelope, TxType}; use alloy_primitives::{Bytes, B256, U64}; -use alloy_provider::{Provider, ReqwestProvider}; +use alloy_provider::{Provider, RootProvider}; use alloy_rlp::{Buf, Decodable}; use alloy_transport::{RpcError, TransportErrorKind}; use async_trait::async_trait; @@ -25,7 +25,7 @@ const CACHE_SIZE: usize = 16; #[derive(Debug, Clone)] pub struct AlloyChainProvider { /// The inner Ethereum JSON-RPC provider. - inner: ReqwestProvider, + inner: RootProvider, /// `header_by_hash` LRU cache. header_by_hash_cache: LruCache, /// `receipts_by_hash_cache` LRU cache. @@ -36,7 +36,7 @@ pub struct AlloyChainProvider { impl AlloyChainProvider { /// Creates a new [AlloyChainProvider] with the given alloy provider. - pub fn new(inner: ReqwestProvider) -> Self { + pub fn new(inner: RootProvider) -> Self { Self { inner, header_by_hash_cache: LruCache::new(NonZeroUsize::new(CACHE_SIZE).unwrap()), @@ -49,7 +49,7 @@ impl AlloyChainProvider { /// Creates a new [AlloyChainProvider] from the provided [reqwest::Url]. pub fn new_http(url: reqwest::Url) -> Self { - let inner = ReqwestProvider::new_http(url); + let inner = RootProvider::new_http(url); Self::new(inner) } diff --git a/crates/providers-alloy/src/l2_chain_provider.rs b/crates/providers-alloy/src/l2_chain_provider.rs index 3a6a75d2d..c5bf513dd 100644 --- a/crates/providers-alloy/src/l2_chain_provider.rs +++ b/crates/providers-alloy/src/l2_chain_provider.rs @@ -1,7 +1,7 @@ //! Providers that use alloy provider types on the backend. use alloy_primitives::{Bytes, U64}; -use alloy_provider::{Provider, ReqwestProvider}; +use alloy_provider::{Provider, RootProvider}; use alloy_rlp::Decodable; use alloy_transport::{RpcError, TransportErrorKind}; use async_trait::async_trait; @@ -23,14 +23,14 @@ use std::sync::Arc; #[derive(Debug, Clone)] pub struct AlloyL2ChainProvider { /// The inner Ethereum JSON-RPC provider. - inner: ReqwestProvider, + inner: RootProvider, /// The rollup configuration. rollup_config: Arc, } impl AlloyL2ChainProvider { /// Creates a new [AlloyL2ChainProvider] with the given alloy provider and [RollupConfig]. - pub fn new(inner: ReqwestProvider, rollup_config: Arc) -> Self { + pub fn new(inner: RootProvider, rollup_config: Arc) -> Self { Self { inner, rollup_config } } @@ -46,7 +46,7 @@ impl AlloyL2ChainProvider { /// Creates a new [AlloyL2ChainProvider] from the provided [reqwest::Url]. pub fn new_http(url: reqwest::Url, rollup_config: Arc) -> Self { - let inner = ReqwestProvider::new_http(url); + let inner = RootProvider::new_http(url); Self::new(inner, rollup_config) } }