From aebaaf654fad65ba5cbab8ef6db503ef857121db Mon Sep 17 00:00:00 2001 From: elizabeth Date: Fri, 28 Nov 2025 19:23:00 -0500 Subject: [PATCH 1/4] move flashblock primitive types to rollup-boost-core crate --- Cargo.lock | 570 +++++++++--------- Cargo.toml | 4 +- crates/flashblocks-rpc/Cargo.toml | 1 + crates/flashblocks-rpc/src/cache.rs | 5 +- crates/flashblocks-rpc/src/flashblocks.rs | 2 +- crates/flashblocks-rpc/src/tests/mod.rs | 2 +- crates/rollup-boost-core/Cargo.toml | 13 + crates/rollup-boost-core/src/lib.rs | 84 +++ crates/rollup-boost/Cargo.toml | 1 + crates/rollup-boost/src/client/rpc.rs | 4 +- .../rollup-boost/src/flashblocks/inbound.rs | 3 +- crates/rollup-boost/src/flashblocks/mod.rs | 3 - .../rollup-boost/src/flashblocks/outbound.rs | 2 +- .../src/flashblocks/primitives.rs | 82 --- .../rollup-boost/src/flashblocks/service.rs | 6 +- crates/rollup-boost/src/lib.rs | 4 + 16 files changed, 398 insertions(+), 388 deletions(-) create mode 100644 crates/rollup-boost-core/Cargo.toml create mode 100644 crates/rollup-boost-core/src/lib.rs delete mode 100644 crates/rollup-boost/src/flashblocks/primitives.rs diff --git a/Cargo.lock b/Cargo.lock index 6bb4e403..ccf07199 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,9 +88,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy-chains" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6068f356948cd84b5ad9ac30c50478e433847f14a50714d2b68f15d052724049" +checksum = "4bc32535569185cbcb6ad5fa64d989a47bccb9a08e27284b1f2a3ccf16e6d010" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -229,9 +229,9 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.23.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6223235f0b785a83dd10dc1599b7f3763c65e4f98b4e9e4e10e576bbbdf7dfa2" +checksum = "527b47dc39850c6168002ddc1f7a2063e15d26137c1bb5330f6065a7524c1aa9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -292,9 +292,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b67c5a702121e618217f7a86f314918acb2622276d0273490e2d4534490bc0" +checksum = "003f46c54f22854a32b9cc7972660a476968008ad505427eabab49225309ec40" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -346,9 +346,9 @@ dependencies = [ [[package]] name = "alloy-op-evm" -version = "0.23.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ad8f3a679eb44ee21481edabd628d191c9a42d182ed29923b4d43a27a0f2cc8" +checksum = "6eea81517a852d9e3b03979c10febe00aacc3d50fbd34c5c30281051773285f7" dependencies = [ "alloy-consensus", "alloy-eips", @@ -388,8 +388,8 @@ dependencies = [ "derive_more", "foldhash 0.2.0", "getrandom 0.3.4", - "hashbrown 0.16.0", - "indexmap 2.12.0", + "hashbrown 0.16.1", + "indexmap 2.12.1", "itoa", "k256", "keccak-asm", @@ -448,9 +448,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810766eeed6b10ffa11815682b3f37afc5019809e3b470b23555297d5770ce63" +checksum = "f77d20cdbb68a614c7a86b3ffef607b37d087bb47a03c58f4c3f8f99bc3ace3b" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -487,14 +487,14 @@ checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] name = "alloy-rpc-client" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f802228273056528dfd6cc8845cc91a7c7e0c6fc1a66d19e8673743dacdc7e" +checksum = "31c89883fe6b7381744cbe80fef638ac488ead4f1956a4278956a1362c71cd2e" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -586,9 +586,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977698b458738369ba5ca645d2cdb4d51ba07a81db37306ff85322853161ea3a" +checksum = "1b2ca3a434a6d49910a7e8e51797eb25db42ef8a5578c52d877fcb26d0afe7bc" dependencies = [ "alloy-primitives", "derive_more", @@ -681,9 +681,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751d1887f7d202514a82c5b3caf28ee8bd4a2ad9549e4f498b6f0bff99b52add" +checksum = "a6f180c399ca7c1e2fe17ea58343910cad0090878a696ff5a50241aee12fc529" dependencies = [ "alloy-primitives", "arbitrary", @@ -693,9 +693,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf0b42ffbf558badfecf1dde0c3c5ed91f29bb7e97876d0bed008c3d5d67171" +checksum = "ecc39ad2c0a3d2da8891f4081565780703a593f090f768f884049aa3aa929cbc" dependencies = [ "alloy-primitives", "async-trait", @@ -736,7 +736,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -748,11 +748,11 @@ dependencies = [ "alloy-sol-macro-input", "const-hex", "heck", - "indexmap 2.12.0", + "indexmap 2.12.1", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "syn-solidity", "tiny-keccak", ] @@ -769,7 +769,7 @@ dependencies = [ "macro-string", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "syn-solidity", ] @@ -797,9 +797,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b3deee699d6f271eab587624a9fa84d02d0755db7a95a043d52a6488d16ebe" +checksum = "cae82426d98f8bc18f53c5223862907cac30ab8fc5e4cd2bb50808e6d3ab43d8" dependencies = [ "alloy-json-rpc", "auto_impl", @@ -820,9 +820,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1720bd2ba8fe7e65138aca43bb0f680e4e0bcbd3ca39bf9d3035c9d7d2757f24" +checksum = "90aa6825760905898c106aba9c804b131816a15041523e80b6d4fe7af6380ada" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -835,9 +835,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea89c214c7ddd2bcad100da929d6b642bbfed85788caf3b1be473abacd3111f9" +checksum = "6ace83a4a6bb896e5894c3479042e6ba78aa5271dde599aa8c36a021d49cc8cc" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -855,9 +855,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571aadf0afce0d515a28b2c6352662a39cb9f48b4eeff9a5c34557d6ea126730" +checksum = "86c9ab4c199e3a8f3520b60ba81aa67bb21fed9ed0d8304e0569094d0758a56f" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -893,14 +893,14 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7ce8ed34106acd6e21942022b6a15be6454c2c3ead4d76811d3bdcd63cf771" +checksum = "ae109e33814b49fc0a62f2528993aa8a2dd346c26959b151f05441dc0b9da292" dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -944,22 +944,22 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.10" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -979,7 +979,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1127,7 +1127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1165,7 +1165,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1254,7 +1254,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1325,9 +1325,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c1f86859c1af3d514fa19e8323147ff10ea98684e6c7b307912509f50e67b2" +checksum = "0e86f6d3dc9dc4352edeea6b8e499e13e3f5dc3b964d7ca5fd411415a3498473" dependencies = [ "compression-codecs", "compression-core", @@ -1366,7 +1366,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1377,7 +1377,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1415,7 +1415,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1476,9 +1476,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871" +checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425" dependencies = [ "axum-core 0.5.5", "base64 0.22.1", @@ -1656,7 +1656,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.110", + "syn 2.0.111", "which", ] @@ -1669,13 +1669,13 @@ dependencies = [ "bitflags 2.10.0", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools 0.13.0", "proc-macro2", "quote", "regex", "rustc-hash 2.1.1", "shlex", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1687,13 +1687,13 @@ dependencies = [ "bitflags 2.10.0", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools 0.13.0", "proc-macro2", "quote", "regex", "rustc-hash 2.1.1", "shlex", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1837,9 +1837,9 @@ dependencies = [ [[package]] name = "boyer-moore-magiclen" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e6233f2d926b5b123caf9d58e3885885255567fbe7776a7fdcae2a4d7241c4" +checksum = "7441b4796eb8a7107d4cd99d829810be75f5573e1081c37faa0e8094169ea0d6" dependencies = [ "debug-helper", ] @@ -1918,9 +1918,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" dependencies = [ "serde", ] @@ -2050,7 +2050,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -2076,9 +2076,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.51" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" +checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" dependencies = [ "clap_builder", "clap_derive", @@ -2086,9 +2086,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.51" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" +checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" dependencies = [ "anstream", "anstyle", @@ -2105,7 +2105,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2217,9 +2217,9 @@ dependencies = [ [[package]] name = "compression-codecs" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "680dc087785c5230f8e8843e2e57ac7c1c90488b6a91b88caa265410568f441b" +checksum = "302266479cb963552d11bd042013a58ef1adc56768016c8b82b4199488f2d4ad" dependencies = [ "brotli", "compression-core", @@ -2231,9 +2231,9 @@ dependencies = [ [[package]] name = "compression-core" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9b614a5787ef0c8802a55766480563cb3a93b435898c422ed2a359cf811582" +checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" [[package]] name = "concat-kdf" @@ -2352,9 +2352,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" dependencies = [ "crc-catalog", ] @@ -2473,9 +2473,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -2531,7 +2531,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2565,7 +2565,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2580,7 +2580,7 @@ dependencies = [ "quote", "serde", "strsim", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2591,7 +2591,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core 0.20.11", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2602,7 +2602,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core 0.21.3", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2655,7 +2655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976" dependencies = [ "data-encoding", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2714,7 +2714,7 @@ checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2725,7 +2725,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2746,7 +2746,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2756,7 +2756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2777,7 +2777,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "unicode-xid", ] @@ -2842,7 +2842,7 @@ dependencies = [ "libc", "option-ext", "redox_users 0.5.2", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2897,7 +2897,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3008,7 +3008,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3084,7 +3084,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3104,7 +3104,7 @@ checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3120,7 +3120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3191,7 +3191,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3348,6 +3348,7 @@ dependencies = [ "reth-tasks", "reth-tracing", "rollup-boost", + "rollup-boost-core", "serde", "serde_json", "tokio", @@ -3360,7 +3361,7 @@ dependencies = [ name = "flashblocks-websocket-proxy" version = "0.1.0" dependencies = [ - "axum 0.8.6", + "axum 0.8.7", "backoff", "brotli", "clap", @@ -3382,7 +3383,7 @@ dependencies = [ "tokio-tungstenite 0.26.2", "tokio-util", "tracing", - "tracing-subscriber 0.3.20", + "tracing-subscriber 0.3.22", "uuid", ] @@ -3524,7 +3525,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3719,7 +3720,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.12.0", + "indexmap 2.12.1", "slab", "tokio", "tokio-util", @@ -3766,14 +3767,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ "allocator-api2", "equivalent", "foldhash 0.2.0", "serde", + "serde_core", ] [[package]] @@ -3815,9 +3817,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hex-conservative" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +checksum = "fda06d18ac606267c40c04e41b9947729bf8b9efe74bd4e82b61a5f26a510b9f" dependencies = [ "arrayvec", ] @@ -3899,23 +3901,22 @@ dependencies = [ [[package]] name = "hostname" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" +checksum = "617aaa3557aef3810a6369d0a99fac8a080891b68bd9f9812a1eeda0c0730cbd" dependencies = [ "cfg-if", "libc", - "windows-link 0.1.3", + "windows-link", ] [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -3984,9 +3985,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1744436df46f0bde35af3eda22aeaba453aada65d8f1c171cd8a5f59030bd69f" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ "atomic-waker", "bytes", @@ -4070,9 +4071,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" +checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" dependencies = [ "base64 0.22.1", "bytes", @@ -4268,7 +4269,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4309,13 +4310,13 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" dependencies = [ "arbitrary", "equivalent", - "hashbrown 0.16.0", + "hashbrown 0.16.1", "serde", "serde_core", ] @@ -4369,7 +4370,7 @@ dependencies = [ "indoc", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4506,9 +4507,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.82" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" dependencies = [ "once_cell", "wasm-bindgen", @@ -4663,7 +4664,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4849,7 +4850,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -4901,9 +4902,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.22" +version = "1.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" +checksum = "15d118bbf3771060e7311cc7bb0545b01d08a8b4a7de949198dec1fa0ca1c0f7" dependencies = [ "cc", "libc", @@ -4991,7 +4992,7 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f" dependencies = [ - "hashbrown 0.16.0", + "hashbrown 0.16.1", ] [[package]] @@ -5042,7 +5043,7 @@ checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5094,9 +5095,9 @@ dependencies = [ [[package]] name = "metrics" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dea7ac8057892855ec285c440160265225438c3c45072613c25a4b26e98ef5" +checksum = "5d5312e9ba3771cfa961b585728215e3d972c950a3eed9252aa093d6301277e8" dependencies = [ "ahash", "portable-atomic", @@ -5111,7 +5112,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5125,7 +5126,7 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-util", - "indexmap 2.12.0", + "indexmap 2.12.1", "ipnet", "metrics", "metrics-util 0.19.1", @@ -5146,10 +5147,10 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-util", - "indexmap 2.12.0", + "indexmap 2.12.1", "ipnet", "metrics", - "metrics-util 0.20.0", + "metrics-util 0.20.1", "quanta", "thiserror 2.0.17", "tokio", @@ -5182,7 +5183,7 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.15.5", - "indexmap 2.12.0", + "indexmap 2.12.1", "metrics", "ordered-float", "quanta", @@ -5194,13 +5195,13 @@ dependencies = [ [[package]] name = "metrics-util" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe8db7a05415d0f919ffb905afa37784f71901c9a773188876984b4f769ab986" +checksum = "cdfb1365fea27e6dd9dc1dbc19f570198bc86914533ad639dae939635f096be4" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.15.5", + "hashbrown 0.16.1", "metrics", "quanta", "rand 0.9.2", @@ -5437,7 +5438,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5549,7 +5550,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5594,9 +5595,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "op-alloy-consensus" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d7ec388eb83a3e6c71774131dbbb2ba9c199b6acac7dce172ed8de2f819e91" +checksum = "726da827358a547be9f1e37c2a756b9e3729cb0350f43408164794b370cad8ae" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5620,9 +5621,9 @@ checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" [[package]] name = "op-alloy-network" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "979fe768bbb571d1d0bd7f84bc35124243b4db17f944b94698872a4701e743a0" +checksum = "f63f27e65be273ec8fcb0b6af0fd850b550979465ab93423705ceb3dfddbd2ab" dependencies = [ "alloy-consensus", "alloy-network", @@ -5636,9 +5637,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-jsonrpsee" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bdbb3c0453fe2605fb008851ea0b45f3f2ba607722c9f2e4ffd7198958ce501" +checksum = "8ef9114426b16172254555aad34a8ea96c01895e40da92f5d12ea680a1baeaa7" dependencies = [ "alloy-primitives", "jsonrpsee", @@ -5646,9 +5647,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc252b5fa74dbd33aa2f9a40e5ff9cfe34ed2af9b9b235781bc7cc8ec7d6aca8" +checksum = "562dd4462562c41f9fdc4d860858c40e14a25df7f983ae82047f15f08fce4d19" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5665,9 +5666,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1abe694cd6718b8932da3f824f46778be0f43289e4103c88abc505c63533a04" +checksum = "d8f24b8cb66e4b33e6c9e508bf46b8ecafc92eadd0b93fedd306c0accb477657" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5724,7 +5725,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5975,7 +5976,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6004,7 +6005,7 @@ dependencies = [ "libc", "redox_syscall 0.5.18", "smallvec", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -6029,7 +6030,7 @@ dependencies = [ "regex", "regex-syntax", "structmeta", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6066,9 +6067,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.3" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e7521a040efde50c3ab6bbadafbe15ab6dc042686926be59ac35d74607df4" +checksum = "cbcfd20a6d4eeba40179f05735784ad32bdaef05ce8e8af05f180d45bb3e7e22" dependencies = [ "memchr", "ucd-trie", @@ -6115,7 +6116,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6144,7 +6145,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6273,7 +6274,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6324,7 +6325,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6419,7 +6420,7 @@ checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6430,7 +6431,7 @@ checksum = "095a99f75c69734802359b682be8daaf8980296731f6470434ea2c652af1dd30" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6463,7 +6464,7 @@ dependencies = [ "itertools 0.14.0", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6476,7 +6477,7 @@ dependencies = [ "itertools 0.14.0", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6816,7 +6817,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6899,9 +6900,9 @@ dependencies = [ [[package]] name = "resolv-conf" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3789b30bd25ba102de4beabd95d21ac45b69b1be7d14522bab988c526d6799" +checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" [[package]] name = "reth-basic-payload-builder" @@ -7121,7 +7122,7 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea8 dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -9683,7 +9684,7 @@ dependencies = [ "tracing-appender", "tracing-journald", "tracing-logfmt", - "tracing-subscriber 0.3.20", + "tracing-subscriber 0.3.22", "url", ] @@ -9700,7 +9701,7 @@ dependencies = [ "opentelemetry_sdk 0.31.0", "tracing", "tracing-opentelemetry 0.32.0", - "tracing-subscriber 0.3.20", + "tracing-subscriber 0.3.22", "url", ] @@ -9946,9 +9947,9 @@ dependencies = [ [[package]] name = "revm-database" -version = "9.0.5" +version = "9.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b6c15bb255481fcf29f5ef7c97f00ed4c28a6ab6c490d77b990d73603031569" +checksum = "980d8d6bba78c5dd35b83abbb6585b0b902eb25ea4448ed7bfba6283b0337191" dependencies = [ "alloy-eips", "revm-bytecode", @@ -10231,6 +10232,7 @@ dependencies = [ "reqwest", "reth-optimism-payload-builder", "reth-rpc-layer 1.4.7", + "rollup-boost-core", "rustls", "serde", "serde_json", @@ -10246,13 +10248,25 @@ dependencies = [ "tower-http", "tracing", "tracing-opentelemetry 0.29.0", - "tracing-subscriber 0.3.20", + "tracing-subscriber 0.3.22", "url", "uuid", "vergen", "vergen-git2", ] +[[package]] +name = "rollup-boost-core" +version = "0.1.0" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "alloy-serde", + "serde", + "serde_json", +] + [[package]] name = "route-recognizer" version = "0.3.1" @@ -10368,7 +10382,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.11.0", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -10410,9 +10424,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" +checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c" dependencies = [ "web-time", "zeroize", @@ -10714,7 +10728,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -10723,7 +10737,7 @@ version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ - "indexmap 2.12.0", + "indexmap 2.12.1", "itoa", "memchr", "ryu", @@ -10750,7 +10764,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -10776,15 +10790,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.15.1" +version = "3.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04" +checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.12.0", + "indexmap 2.12.1", "schemars 0.9.0", "schemars 1.1.0", "serde_core", @@ -10795,14 +10809,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.15.1" +version = "3.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955" +checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -10837,7 +10851,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -10935,9 +10949,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.6" +version = "1.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" +checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" dependencies = [ "libc", ] @@ -11092,7 +11106,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -11103,7 +11117,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -11134,7 +11148,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -11146,7 +11160,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -11168,9 +11182,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.110" +version = "2.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" dependencies = [ "proc-macro2", "quote", @@ -11186,7 +11200,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -11206,7 +11220,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -11287,7 +11301,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix 1.1.2", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -11360,7 +11374,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -11371,7 +11385,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -11484,7 +11498,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -11616,7 +11630,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.12.0", + "indexmap 2.12.1", "serde", "serde_spanned", "toml_datetime 0.6.11", @@ -11630,7 +11644,7 @@ version = "0.23.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" dependencies = [ - "indexmap 2.12.0", + "indexmap 2.12.1", "toml_datetime 0.7.3", "toml_parser", "winnow", @@ -11747,7 +11761,7 @@ dependencies = [ "futures-core", "futures-util", "hdrhistogram", - "indexmap 2.12.0", + "indexmap 2.12.1", "pin-project-lite", "slab", "sync_wrapper", @@ -11760,9 +11774,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456" dependencies = [ "async-compression", "base64 0.22.1", @@ -11803,9 +11817,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" dependencies = [ "log", "pin-project-lite", @@ -11815,32 +11829,32 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +checksum = "786d480bce6247ab75f005b14ae1624ad978d3029d9113f0a22fa1ac773faeaf" dependencies = [ "crossbeam-channel", - "thiserror 1.0.69", + "thiserror 2.0.17", "time", - "tracing-subscriber 0.3.20", + "tracing-subscriber 0.3.22", ] [[package]] name = "tracing-attributes" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] name = "tracing-core" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" dependencies = [ "once_cell", "valuable", @@ -11858,13 +11872,13 @@ dependencies = [ [[package]] name = "tracing-journald" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0b4143302cf1022dac868d521e36e8b27691f72c84b3311750d5188ebba657" +checksum = "2d3a81ed245bfb62592b1e2bc153e77656d94ee6a0497683a65a12ccaf2438d0" dependencies = [ "libc", "tracing-core", - "tracing-subscriber 0.3.20", + "tracing-subscriber 0.3.22", ] [[package]] @@ -11887,7 +11901,7 @@ dependencies = [ "time", "tracing", "tracing-core", - "tracing-subscriber 0.3.20", + "tracing-subscriber 0.3.22", ] [[package]] @@ -11904,7 +11918,7 @@ dependencies = [ "tracing", "tracing-core", "tracing-log", - "tracing-subscriber 0.3.20", + "tracing-subscriber 0.3.22", "web-time", ] @@ -11923,7 +11937,7 @@ dependencies = [ "tracing", "tracing-core", "tracing-log", - "tracing-subscriber 0.3.20", + "tracing-subscriber 0.3.22", "web-time", ] @@ -11948,9 +11962,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.20" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" +checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" dependencies = [ "matchers", "nu-ansi-term", @@ -11989,7 +12003,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -12270,7 +12284,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -12318,9 +12332,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" dependencies = [ "cfg-if", "once_cell", @@ -12331,9 +12345,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.55" +version = "0.4.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" dependencies = [ "cfg-if", "js-sys", @@ -12344,9 +12358,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -12354,22 +12368,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" dependencies = [ "unicode-ident", ] @@ -12403,9 +12417,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.82" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" dependencies = [ "js-sys", "wasm-bindgen", @@ -12497,7 +12511,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] @@ -12557,9 +12571,9 @@ checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement 0.60.2", "windows-interface 0.59.3", - "windows-link 0.2.1", + "windows-link", "windows-result 0.4.1", - "windows-strings 0.5.1", + "windows-strings", ] [[package]] @@ -12569,7 +12583,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" dependencies = [ "windows-core 0.62.2", - "windows-link 0.2.1", + "windows-link", "windows-threading", ] @@ -12581,7 +12595,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -12592,7 +12606,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -12603,7 +12617,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -12614,15 +12628,9 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - [[package]] name = "windows-link" version = "0.2.1" @@ -12636,18 +12644,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" dependencies = [ "windows-core 0.62.2", - "windows-link 0.2.1", + "windows-link", ] [[package]] name = "windows-registry" -version = "0.5.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" dependencies = [ - "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", + "windows-link", + "windows-result 0.4.1", + "windows-strings", ] [[package]] @@ -12659,31 +12667,13 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-result" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" -dependencies = [ - "windows-link 0.1.3", -] - [[package]] name = "windows-result" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link 0.2.1", -] - -[[package]] -name = "windows-strings" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" -dependencies = [ - "windows-link 0.1.3", + "windows-link", ] [[package]] @@ -12692,7 +12682,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -12746,7 +12736,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -12801,7 +12791,7 @@ version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows-link 0.2.1", + "windows-link", "windows_aarch64_gnullvm 0.53.1", "windows_aarch64_msvc 0.53.1", "windows_i686_gnu 0.53.1", @@ -12818,7 +12808,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -13003,9 +12993,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" dependencies = [ "memchr", ] @@ -13095,28 +13085,28 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.27" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +checksum = "4ea879c944afe8a2b25fef16bb4ba234f47c694565e97383b36f3a878219065c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.27" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +checksum = "cf955aa904d6040f70dc8e9384444cb1030aed272ba3cb09bbc4ab9e7c1f34f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -13136,7 +13126,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "synstructure", ] @@ -13157,7 +13147,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -13190,7 +13180,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index eac34881..87a6fd7b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,11 +4,13 @@ resolver = "3" members = [ "crates/rollup-boost", "crates/websocket-proxy", - "crates/flashblocks-rpc", + "crates/flashblocks-rpc", + "crates/rollup-boost-core", ] [workspace.dependencies] rollup-boost = { path = "crates/rollup-boost" } +rollup-boost-core = { path = "crates/rollup-boost-core" } tracing = "0.1.4" tracing-subscriber = { version = "0.3.20", features = ["env-filter", "json"] } diff --git a/crates/flashblocks-rpc/Cargo.toml b/crates/flashblocks-rpc/Cargo.toml index 44e843ef..0b1c0e6a 100644 --- a/crates/flashblocks-rpc/Cargo.toml +++ b/crates/flashblocks-rpc/Cargo.toml @@ -6,6 +6,7 @@ license = "MIT" [dependencies] rollup-boost.workspace = true +rollup-boost-core.workspace = true reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } diff --git a/crates/flashblocks-rpc/src/cache.rs b/crates/flashblocks-rpc/src/cache.rs index 792a83a7..cb073935 100644 --- a/crates/flashblocks-rpc/src/cache.rs +++ b/crates/flashblocks-rpc/src/cache.rs @@ -21,9 +21,8 @@ use reth_primitives_traits::block::body::BlockBody; use reth_rpc_eth_api::transaction::ConvertReceiptInput; use reth_rpc_eth_api::{RpcBlock, RpcReceipt}; -use rollup_boost::{ - FlashblockBuilder, FlashblocksPayloadV1, OpExecutionPayloadEnvelope, PayloadVersion, -}; +use rollup_boost::{FlashblockBuilder, OpExecutionPayloadEnvelope, PayloadVersion}; +use rollup_boost_core::flashblocks::FlashblocksPayloadV1; use serde::{Deserialize, Serialize}; use std::{collections::HashMap, str::FromStr, sync::Arc}; diff --git a/crates/flashblocks-rpc/src/flashblocks.rs b/crates/flashblocks-rpc/src/flashblocks.rs index fe3e3c42..55f21223 100644 --- a/crates/flashblocks-rpc/src/flashblocks.rs +++ b/crates/flashblocks-rpc/src/flashblocks.rs @@ -5,7 +5,7 @@ use jsonrpsee::core::async_trait; use op_alloy_network::Optimism; use reth_optimism_chainspec::OpChainSpec; use reth_rpc_eth_api::{RpcBlock, RpcReceipt}; -use rollup_boost::FlashblocksPayloadV1; +use rollup_boost_core::flashblocks::FlashblocksPayloadV1; use std::{io::Read, sync::Arc}; use tokio::sync::mpsc; use tokio_tungstenite::{connect_async, tungstenite::Message}; diff --git a/crates/flashblocks-rpc/src/tests/mod.rs b/crates/flashblocks-rpc/src/tests/mod.rs index 27597e7b..2dcc54eb 100644 --- a/crates/flashblocks-rpc/src/tests/mod.rs +++ b/crates/flashblocks-rpc/src/tests/mod.rs @@ -17,7 +17,7 @@ mod tests { use reth_optimism_primitives::OpReceipt; use reth_provider::providers::BlockchainProvider; use reth_tasks::TaskManager; - use rollup_boost::{ + use rollup_boost_core::flashblocks::{ ExecutionPayloadBaseV1, ExecutionPayloadFlashblockDeltaV1, FlashblocksPayloadV1, }; use std::{any::Any, collections::HashMap, net::SocketAddr, str::FromStr, sync::Arc}; diff --git a/crates/rollup-boost-core/Cargo.toml b/crates/rollup-boost-core/Cargo.toml new file mode 100644 index 00000000..e628f919 --- /dev/null +++ b/crates/rollup-boost-core/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "rollup-boost-core" +version = "0.1.0" +edition = "2024" +license = "MIT" + +[dependencies] +alloy-primitives = { workspace = true } +alloy-rpc-types-engine = { workspace = true } +alloy-rpc-types-eth = { workspace = true } +alloy-serde = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } diff --git a/crates/rollup-boost-core/src/lib.rs b/crates/rollup-boost-core/src/lib.rs new file mode 100644 index 00000000..ed365207 --- /dev/null +++ b/crates/rollup-boost-core/src/lib.rs @@ -0,0 +1,84 @@ +pub mod flashblocks { + use alloy_primitives::{Address, B256, Bloom, Bytes, U256}; + use alloy_rpc_types_engine::PayloadId; + use alloy_rpc_types_eth::Withdrawal; + use serde::{Deserialize, Serialize}; + use serde_json::Value; + + /// Represents the modified portions of an execution payload within a flashblock. + /// This structure contains only the fields that can be updated during block construction, + /// such as state root, receipts, logs, and new transactions. Other immutable block fields + /// like parent hash and block number are excluded since they remain constant throughout + /// the block's construction. + #[derive(Clone, Debug, PartialEq, Default, Deserialize, Serialize)] + pub struct ExecutionPayloadFlashblockDeltaV1 { + /// The state root of the block. + pub state_root: B256, + /// The receipts root of the block. + pub receipts_root: B256, + /// The logs bloom of the block. + pub logs_bloom: Bloom, + /// The gas used of the block. + #[serde(with = "alloy_serde::quantity")] + pub gas_used: u64, + /// The block hash of the block. + pub block_hash: B256, + /// The transactions of the block. + pub transactions: Vec, + /// Array of [`Withdrawal`] enabled with V2 + pub withdrawals: Vec, + /// The withdrawals root of the block. + pub withdrawals_root: B256, + /// The blob gas used + #[serde( + default, + skip_serializing_if = "Option::is_none", + with = "alloy_serde::quantity::opt" + )] + pub blob_gas_used: Option, + } + + /// Represents the base configuration of an execution payload that remains constant + /// throughout block construction. This includes fundamental block properties like + /// parent hash, block number, and other header fields that are determined at + /// block creation and cannot be modified. + #[derive(Clone, Debug, PartialEq, Default, Deserialize, Serialize)] + pub struct ExecutionPayloadBaseV1 { + /// Ecotone parent beacon block root + pub parent_beacon_block_root: B256, + /// The parent hash of the block. + pub parent_hash: B256, + /// The fee recipient of the block. + pub fee_recipient: Address, + /// The previous randao of the block. + pub prev_randao: B256, + /// The block number. + #[serde(with = "alloy_serde::quantity")] + pub block_number: u64, + /// The gas limit of the block. + #[serde(with = "alloy_serde::quantity")] + pub gas_limit: u64, + /// The timestamp of the block. + #[serde(with = "alloy_serde::quantity")] + pub timestamp: u64, + /// The extra data of the block. + pub extra_data: Bytes, + /// The base fee per gas of the block. + pub base_fee_per_gas: U256, + } + + #[derive(Clone, Debug, PartialEq, Default, Deserialize, Serialize)] + pub struct FlashblocksPayloadV1 { + /// The payload id of the flashblock + pub payload_id: PayloadId, + /// The index of the flashblock in the block + pub index: u64, + /// The base execution payload configuration + #[serde(skip_serializing_if = "Option::is_none")] + pub base: Option, + /// The delta/diff containing modified portions of the execution payload + pub diff: ExecutionPayloadFlashblockDeltaV1, + /// Additional metadata associated with the flashblock + pub metadata: Value, + } +} diff --git a/crates/rollup-boost/Cargo.toml b/crates/rollup-boost/Cargo.toml index 0d2e3364..80db77ed 100644 --- a/crates/rollup-boost/Cargo.toml +++ b/crates/rollup-boost/Cargo.toml @@ -5,6 +5,7 @@ edition = "2024" license = "MIT" [dependencies] +rollup-boost-core.workspace = true tracing.workspace = true tracing-subscriber.workspace = true clap.workspace = true diff --git a/crates/rollup-boost/src/client/rpc.rs b/crates/rollup-boost/src/client/rpc.rs index 8560496a..511eaaab 100644 --- a/crates/rollup-boost/src/client/rpc.rs +++ b/crates/rollup-boost/src/client/rpc.rs @@ -10,7 +10,7 @@ use alloy_rpc_types_engine::{ PayloadStatus, }; use alloy_rpc_types_eth::{Block, BlockNumberOrTag}; -use clap::{Parser, arg}; +use clap::Parser; use eyre::bail; use http::{HeaderMap, Uri}; use jsonrpsee::core::async_trait; @@ -27,7 +27,7 @@ use paste::paste; use std::path::PathBuf; use std::time::Duration; use thiserror::Error; -use tracing::{error, info, instrument}; +use tracing::{info, instrument}; use super::auth::Auth; diff --git a/crates/rollup-boost/src/flashblocks/inbound.rs b/crates/rollup-boost/src/flashblocks/inbound.rs index 83e01ec8..328cef91 100644 --- a/crates/rollup-boost/src/flashblocks/inbound.rs +++ b/crates/rollup-boost/src/flashblocks/inbound.rs @@ -1,10 +1,11 @@ -use super::{metrics::FlashblocksWsInboundMetrics, primitives::FlashblocksPayloadV1}; +use super::metrics::FlashblocksWsInboundMetrics; use crate::FlashblocksWebsocketConfig; use backoff::ExponentialBackoff; use backoff::backoff::Backoff; use bytes::Bytes; use futures::{SinkExt, StreamExt}; use lru::LruCache; +use rollup_boost_core::flashblocks::FlashblocksPayloadV1; use std::num::NonZeroUsize; use std::sync::Arc; use std::sync::Mutex; diff --git a/crates/rollup-boost/src/flashblocks/mod.rs b/crates/rollup-boost/src/flashblocks/mod.rs index 2e219c61..1499a26d 100644 --- a/crates/rollup-boost/src/flashblocks/mod.rs +++ b/crates/rollup-boost/src/flashblocks/mod.rs @@ -2,12 +2,9 @@ mod launcher; pub use launcher::*; -mod primitives; mod service; pub use service::*; -pub use primitives::*; - mod inbound; mod outbound; diff --git a/crates/rollup-boost/src/flashblocks/outbound.rs b/crates/rollup-boost/src/flashblocks/outbound.rs index 86f1eb2a..a0ca04bc 100644 --- a/crates/rollup-boost/src/flashblocks/outbound.rs +++ b/crates/rollup-boost/src/flashblocks/outbound.rs @@ -1,4 +1,3 @@ -use super::primitives::FlashblocksPayloadV1; use core::{ fmt::{Debug, Formatter}, net::SocketAddr, @@ -7,6 +6,7 @@ use core::{ task::{Context, Poll}, }; use futures::{Sink, SinkExt, StreamExt}; +use rollup_boost_core::flashblocks::FlashblocksPayloadV1; use std::{io, net::TcpListener, sync::Arc}; use tokio::{ net::TcpStream, diff --git a/crates/rollup-boost/src/flashblocks/primitives.rs b/crates/rollup-boost/src/flashblocks/primitives.rs deleted file mode 100644 index cec0533c..00000000 --- a/crates/rollup-boost/src/flashblocks/primitives.rs +++ /dev/null @@ -1,82 +0,0 @@ -use alloy_primitives::{Address, B256, Bloom, Bytes, U256}; -use alloy_rpc_types_engine::PayloadId; -use alloy_rpc_types_eth::Withdrawal; -use serde::{Deserialize, Serialize}; -use serde_json::Value; - -/// Represents the modified portions of an execution payload within a flashblock. -/// This structure contains only the fields that can be updated during block construction, -/// such as state root, receipts, logs, and new transactions. Other immutable block fields -/// like parent hash and block number are excluded since they remain constant throughout -/// the block's construction. -#[derive(Clone, Debug, PartialEq, Default, Deserialize, Serialize)] -pub struct ExecutionPayloadFlashblockDeltaV1 { - /// The state root of the block. - pub state_root: B256, - /// The receipts root of the block. - pub receipts_root: B256, - /// The logs bloom of the block. - pub logs_bloom: Bloom, - /// The gas used of the block. - #[serde(with = "alloy_serde::quantity")] - pub gas_used: u64, - /// The block hash of the block. - pub block_hash: B256, - /// The transactions of the block. - pub transactions: Vec, - /// Array of [`Withdrawal`] enabled with V2 - pub withdrawals: Vec, - /// The withdrawals root of the block. - pub withdrawals_root: B256, - /// The blob gas used - #[serde( - default, - skip_serializing_if = "Option::is_none", - with = "alloy_serde::quantity::opt" - )] - pub blob_gas_used: Option, -} - -/// Represents the base configuration of an execution payload that remains constant -/// throughout block construction. This includes fundamental block properties like -/// parent hash, block number, and other header fields that are determined at -/// block creation and cannot be modified. -#[derive(Clone, Debug, PartialEq, Default, Deserialize, Serialize)] -pub struct ExecutionPayloadBaseV1 { - /// Ecotone parent beacon block root - pub parent_beacon_block_root: B256, - /// The parent hash of the block. - pub parent_hash: B256, - /// The fee recipient of the block. - pub fee_recipient: Address, - /// The previous randao of the block. - pub prev_randao: B256, - /// The block number. - #[serde(with = "alloy_serde::quantity")] - pub block_number: u64, - /// The gas limit of the block. - #[serde(with = "alloy_serde::quantity")] - pub gas_limit: u64, - /// The timestamp of the block. - #[serde(with = "alloy_serde::quantity")] - pub timestamp: u64, - /// The extra data of the block. - pub extra_data: Bytes, - /// The base fee per gas of the block. - pub base_fee_per_gas: U256, -} - -#[derive(Clone, Debug, PartialEq, Default, Deserialize, Serialize)] -pub struct FlashblocksPayloadV1 { - /// The payload id of the flashblock - pub payload_id: PayloadId, - /// The index of the flashblock in the block - pub index: u64, - /// The base execution payload configuration - #[serde(skip_serializing_if = "Option::is_none")] - pub base: Option, - /// The delta/diff containing modified portions of the execution payload - pub diff: ExecutionPayloadFlashblockDeltaV1, - /// Additional metadata associated with the flashblock - pub metadata: Value, -} diff --git a/crates/rollup-boost/src/flashblocks/service.rs b/crates/rollup-boost/src/flashblocks/service.rs index 9da05933..5730f6f7 100644 --- a/crates/rollup-boost/src/flashblocks/service.rs +++ b/crates/rollup-boost/src/flashblocks/service.rs @@ -1,7 +1,4 @@ use super::outbound::WebSocketPublisher; -use super::primitives::{ - ExecutionPayloadBaseV1, ExecutionPayloadFlashblockDeltaV1, FlashblocksPayloadV1, -}; use crate::flashblocks::metrics::FlashblocksServiceMetrics; use crate::{ ClientResult, EngineApiExt, NewPayload, OpExecutionPayloadEnvelope, PayloadVersion, RpcClient, @@ -19,6 +16,9 @@ use op_alloy_rpc_types_engine::{ OpPayloadAttributes, }; use reth_optimism_payload_builder::payload_id_optimism; +use rollup_boost_core::flashblocks::{ + ExecutionPayloadBaseV1, ExecutionPayloadFlashblockDeltaV1, FlashblocksPayloadV1, +}; use std::io; use std::sync::Arc; use std::sync::atomic::{AtomicU64, Ordering}; diff --git a/crates/rollup-boost/src/lib.rs b/crates/rollup-boost/src/lib.rs index 5d79271e..728d4892 100644 --- a/crates/rollup-boost/src/lib.rs +++ b/crates/rollup-boost/src/lib.rs @@ -44,3 +44,7 @@ pub use engine_api::*; mod version; pub use version::*; + +// re-export rollup-boost-core flashblocks types +// this can be removed once dependent crates migrate to using rollup-boost-core directly +pub use rollup_boost_core::flashblocks::*; From 75e8f27d184e2d461ed3e2bc3baa5ada915344c3 Mon Sep 17 00:00:00 2001 From: elizabeth Date: Mon, 1 Dec 2025 15:35:44 -0500 Subject: [PATCH 2/4] move payload types to rollup-boost-core --- crates/flashblocks-rpc/src/cache.rs | 3 +- crates/rollup-boost-core/Cargo.toml | 4 + crates/rollup-boost-core/src/flashblocks.rs | 82 ++++++++++++++++++ crates/rollup-boost-core/src/lib.rs | 86 +------------------ .../src/payload.rs | 0 crates/rollup-boost/Cargo.toml | 2 +- crates/rollup-boost/src/cli.rs | 4 +- crates/rollup-boost/src/client/http.rs | 2 +- crates/rollup-boost/src/client/rpc.rs | 6 +- crates/rollup-boost/src/engine_api.rs | 3 +- .../rollup-boost/src/flashblocks/service.rs | 11 +-- crates/rollup-boost/src/health.rs | 3 +- crates/rollup-boost/src/lib.rs | 3 - crates/rollup-boost/src/proxy.rs | 3 +- crates/rollup-boost/src/selection.rs | 2 +- crates/rollup-boost/src/server.rs | 8 +- crates/rollup-boost/src/tests/common/mod.rs | 6 +- crates/websocket-proxy/src/subscriber.rs | 2 +- 18 files changed, 118 insertions(+), 112 deletions(-) create mode 100644 crates/rollup-boost-core/src/flashblocks.rs rename crates/{rollup-boost => rollup-boost-core}/src/payload.rs (100%) diff --git a/crates/flashblocks-rpc/src/cache.rs b/crates/flashblocks-rpc/src/cache.rs index cb073935..7ffaea93 100644 --- a/crates/flashblocks-rpc/src/cache.rs +++ b/crates/flashblocks-rpc/src/cache.rs @@ -21,8 +21,9 @@ use reth_primitives_traits::block::body::BlockBody; use reth_rpc_eth_api::transaction::ConvertReceiptInput; use reth_rpc_eth_api::{RpcBlock, RpcReceipt}; -use rollup_boost::{FlashblockBuilder, OpExecutionPayloadEnvelope, PayloadVersion}; +use rollup_boost::FlashblockBuilder; use rollup_boost_core::flashblocks::FlashblocksPayloadV1; +use rollup_boost_core::payload::{OpExecutionPayloadEnvelope, PayloadVersion}; use serde::{Deserialize, Serialize}; use std::{collections::HashMap, str::FromStr, sync::Arc}; diff --git a/crates/rollup-boost-core/Cargo.toml b/crates/rollup-boost-core/Cargo.toml index e628f919..b109d9fb 100644 --- a/crates/rollup-boost-core/Cargo.toml +++ b/crates/rollup-boost-core/Cargo.toml @@ -9,5 +9,9 @@ alloy-primitives = { workspace = true } alloy-rpc-types-engine = { workspace = true } alloy-rpc-types-eth = { workspace = true } alloy-serde = { workspace = true } +futures = { workspace = true } +moka = { workspace = true } +op-alloy-rpc-types-engine = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } +tracing = { workspace = true } diff --git a/crates/rollup-boost-core/src/flashblocks.rs b/crates/rollup-boost-core/src/flashblocks.rs new file mode 100644 index 00000000..cec0533c --- /dev/null +++ b/crates/rollup-boost-core/src/flashblocks.rs @@ -0,0 +1,82 @@ +use alloy_primitives::{Address, B256, Bloom, Bytes, U256}; +use alloy_rpc_types_engine::PayloadId; +use alloy_rpc_types_eth::Withdrawal; +use serde::{Deserialize, Serialize}; +use serde_json::Value; + +/// Represents the modified portions of an execution payload within a flashblock. +/// This structure contains only the fields that can be updated during block construction, +/// such as state root, receipts, logs, and new transactions. Other immutable block fields +/// like parent hash and block number are excluded since they remain constant throughout +/// the block's construction. +#[derive(Clone, Debug, PartialEq, Default, Deserialize, Serialize)] +pub struct ExecutionPayloadFlashblockDeltaV1 { + /// The state root of the block. + pub state_root: B256, + /// The receipts root of the block. + pub receipts_root: B256, + /// The logs bloom of the block. + pub logs_bloom: Bloom, + /// The gas used of the block. + #[serde(with = "alloy_serde::quantity")] + pub gas_used: u64, + /// The block hash of the block. + pub block_hash: B256, + /// The transactions of the block. + pub transactions: Vec, + /// Array of [`Withdrawal`] enabled with V2 + pub withdrawals: Vec, + /// The withdrawals root of the block. + pub withdrawals_root: B256, + /// The blob gas used + #[serde( + default, + skip_serializing_if = "Option::is_none", + with = "alloy_serde::quantity::opt" + )] + pub blob_gas_used: Option, +} + +/// Represents the base configuration of an execution payload that remains constant +/// throughout block construction. This includes fundamental block properties like +/// parent hash, block number, and other header fields that are determined at +/// block creation and cannot be modified. +#[derive(Clone, Debug, PartialEq, Default, Deserialize, Serialize)] +pub struct ExecutionPayloadBaseV1 { + /// Ecotone parent beacon block root + pub parent_beacon_block_root: B256, + /// The parent hash of the block. + pub parent_hash: B256, + /// The fee recipient of the block. + pub fee_recipient: Address, + /// The previous randao of the block. + pub prev_randao: B256, + /// The block number. + #[serde(with = "alloy_serde::quantity")] + pub block_number: u64, + /// The gas limit of the block. + #[serde(with = "alloy_serde::quantity")] + pub gas_limit: u64, + /// The timestamp of the block. + #[serde(with = "alloy_serde::quantity")] + pub timestamp: u64, + /// The extra data of the block. + pub extra_data: Bytes, + /// The base fee per gas of the block. + pub base_fee_per_gas: U256, +} + +#[derive(Clone, Debug, PartialEq, Default, Deserialize, Serialize)] +pub struct FlashblocksPayloadV1 { + /// The payload id of the flashblock + pub payload_id: PayloadId, + /// The index of the flashblock in the block + pub index: u64, + /// The base execution payload configuration + #[serde(skip_serializing_if = "Option::is_none")] + pub base: Option, + /// The delta/diff containing modified portions of the execution payload + pub diff: ExecutionPayloadFlashblockDeltaV1, + /// Additional metadata associated with the flashblock + pub metadata: Value, +} diff --git a/crates/rollup-boost-core/src/lib.rs b/crates/rollup-boost-core/src/lib.rs index ed365207..3e2fe256 100644 --- a/crates/rollup-boost-core/src/lib.rs +++ b/crates/rollup-boost-core/src/lib.rs @@ -1,84 +1,2 @@ -pub mod flashblocks { - use alloy_primitives::{Address, B256, Bloom, Bytes, U256}; - use alloy_rpc_types_engine::PayloadId; - use alloy_rpc_types_eth::Withdrawal; - use serde::{Deserialize, Serialize}; - use serde_json::Value; - - /// Represents the modified portions of an execution payload within a flashblock. - /// This structure contains only the fields that can be updated during block construction, - /// such as state root, receipts, logs, and new transactions. Other immutable block fields - /// like parent hash and block number are excluded since they remain constant throughout - /// the block's construction. - #[derive(Clone, Debug, PartialEq, Default, Deserialize, Serialize)] - pub struct ExecutionPayloadFlashblockDeltaV1 { - /// The state root of the block. - pub state_root: B256, - /// The receipts root of the block. - pub receipts_root: B256, - /// The logs bloom of the block. - pub logs_bloom: Bloom, - /// The gas used of the block. - #[serde(with = "alloy_serde::quantity")] - pub gas_used: u64, - /// The block hash of the block. - pub block_hash: B256, - /// The transactions of the block. - pub transactions: Vec, - /// Array of [`Withdrawal`] enabled with V2 - pub withdrawals: Vec, - /// The withdrawals root of the block. - pub withdrawals_root: B256, - /// The blob gas used - #[serde( - default, - skip_serializing_if = "Option::is_none", - with = "alloy_serde::quantity::opt" - )] - pub blob_gas_used: Option, - } - - /// Represents the base configuration of an execution payload that remains constant - /// throughout block construction. This includes fundamental block properties like - /// parent hash, block number, and other header fields that are determined at - /// block creation and cannot be modified. - #[derive(Clone, Debug, PartialEq, Default, Deserialize, Serialize)] - pub struct ExecutionPayloadBaseV1 { - /// Ecotone parent beacon block root - pub parent_beacon_block_root: B256, - /// The parent hash of the block. - pub parent_hash: B256, - /// The fee recipient of the block. - pub fee_recipient: Address, - /// The previous randao of the block. - pub prev_randao: B256, - /// The block number. - #[serde(with = "alloy_serde::quantity")] - pub block_number: u64, - /// The gas limit of the block. - #[serde(with = "alloy_serde::quantity")] - pub gas_limit: u64, - /// The timestamp of the block. - #[serde(with = "alloy_serde::quantity")] - pub timestamp: u64, - /// The extra data of the block. - pub extra_data: Bytes, - /// The base fee per gas of the block. - pub base_fee_per_gas: U256, - } - - #[derive(Clone, Debug, PartialEq, Default, Deserialize, Serialize)] - pub struct FlashblocksPayloadV1 { - /// The payload id of the flashblock - pub payload_id: PayloadId, - /// The index of the flashblock in the block - pub index: u64, - /// The base execution payload configuration - #[serde(skip_serializing_if = "Option::is_none")] - pub base: Option, - /// The delta/diff containing modified portions of the execution payload - pub diff: ExecutionPayloadFlashblockDeltaV1, - /// Additional metadata associated with the flashblock - pub metadata: Value, - } -} +pub mod flashblocks; +pub mod payload; diff --git a/crates/rollup-boost/src/payload.rs b/crates/rollup-boost-core/src/payload.rs similarity index 100% rename from crates/rollup-boost/src/payload.rs rename to crates/rollup-boost-core/src/payload.rs diff --git a/crates/rollup-boost/Cargo.toml b/crates/rollup-boost/Cargo.toml index 80db77ed..0dc022f8 100644 --- a/crates/rollup-boost/Cargo.toml +++ b/crates/rollup-boost/Cargo.toml @@ -18,6 +18,7 @@ tokio.workspace = true eyre.workspace = true url.workspace = true sha2.workspace = true +moka = { workspace = true, features = ["future"] } reth-optimism-payload-builder.workspace = true op-alloy-rpc-types-engine.workspace = true @@ -30,7 +31,6 @@ tokio-tungstenite.workspace = true metrics-derive.workspace = true jsonrpsee = { workspace = true, features = ["server", "http-client", "macros"] } -moka = { version = "0.12.10", features = ["future"] } http = "1.1.0" dotenvy = "0.15.7" tower = { version = "0.5.2", features = ["timeout"] } diff --git a/crates/rollup-boost/src/cli.rs b/crates/rollup-boost/src/cli.rs index dfc25040..ef823c16 100644 --- a/crates/rollup-boost/src/cli.rs +++ b/crates/rollup-boost/src/cli.rs @@ -5,14 +5,14 @@ use tokio::signal::unix::{SignalKind, signal as unix_signal}; use tracing::{Level, info}; use crate::{ - BlockSelectionPolicy, ClientArgs, DebugServer, FlashblocksArgs, PayloadSource, ProxyLayer, - RollupBoostServer, + BlockSelectionPolicy, ClientArgs, DebugServer, FlashblocksArgs, ProxyLayer, RollupBoostServer, client::rpc::{BuilderArgs, L2ClientArgs}, debug_api::ExecutionMode, get_version, init_metrics, probe::ProbeLayer, }; use crate::{FlashblocksService, RpcClient}; +use rollup_boost_core::payload::PayloadSource; #[derive(Clone, Debug, clap::Args)] pub struct RollupBoostLibArgs { diff --git a/crates/rollup-boost/src/client/http.rs b/crates/rollup-boost/src/client/http.rs index 5e18edd7..8bb8216a 100644 --- a/crates/rollup-boost/src/client/http.rs +++ b/crates/rollup-boost/src/client/http.rs @@ -1,7 +1,6 @@ use std::time::Duration; use crate::client::auth::AuthLayer; -use crate::payload::PayloadSource; use alloy_primitives::bytes::Bytes; use alloy_rpc_types_engine::JwtSecret; use http::Uri; @@ -14,6 +13,7 @@ use hyper_util::rt::TokioExecutor; use jsonrpsee::core::BoxError; use jsonrpsee::server::HttpBody; use opentelemetry::trace::SpanKind; +use rollup_boost_core::payload::PayloadSource; use tower::{ Service as _, ServiceBuilder, ServiceExt, timeout::{Timeout, TimeoutLayer}, diff --git a/crates/rollup-boost/src/client/rpc.rs b/crates/rollup-boost/src/client/rpc.rs index 511eaaab..c40ccaa6 100644 --- a/crates/rollup-boost/src/client/rpc.rs +++ b/crates/rollup-boost/src/client/rpc.rs @@ -1,7 +1,6 @@ use crate::EngineApiExt; use crate::client::auth::AuthLayer; use crate::client::http::HttpClient as RollupBoostHttpClient; -use crate::payload::{NewPayload, OpExecutionPayloadEnvelope, PayloadSource, PayloadVersion}; use crate::server::EngineApiClient; use crate::version::{CARGO_PKG_VERSION, VERGEN_GIT_SHA}; use alloy_primitives::{B256, Bytes}; @@ -24,6 +23,9 @@ use op_alloy_rpc_types_engine::{ }; use opentelemetry::trace::SpanKind; use paste::paste; +use rollup_boost_core::payload::{ + NewPayload, OpExecutionPayloadEnvelope, PayloadSource, PayloadVersion, +}; use std::path::PathBuf; use std::time::Duration; use thiserror::Error; @@ -476,12 +478,12 @@ pub mod tests { use jsonrpsee::core::client::ClientT; use parking_lot::Mutex; - use crate::payload::PayloadSource; use alloy_rpc_types_engine::JwtSecret; use jsonrpsee::core::client::Error as ClientError; use jsonrpsee::server::{ServerBuilder, ServerHandle}; use jsonrpsee::{RpcModule, rpc_params}; use predicates::prelude::*; + use rollup_boost_core::payload::PayloadSource; use std::collections::HashSet; use std::net::SocketAddr; use std::net::TcpListener; diff --git a/crates/rollup-boost/src/engine_api.rs b/crates/rollup-boost/src/engine_api.rs index 29d6d90e..8fe48ab9 100644 --- a/crates/rollup-boost/src/engine_api.rs +++ b/crates/rollup-boost/src/engine_api.rs @@ -3,7 +3,8 @@ use alloy_rpc_types_eth::{Block, BlockNumberOrTag}; use jsonrpsee::core::async_trait; use op_alloy_rpc_types_engine::OpPayloadAttributes; -use crate::{ClientResult, NewPayload, OpExecutionPayloadEnvelope, PayloadVersion}; +use crate::ClientResult; +use rollup_boost_core::payload::{NewPayload, OpExecutionPayloadEnvelope, PayloadVersion}; #[async_trait] pub trait EngineApiExt: Send + Sync + 'static { diff --git a/crates/rollup-boost/src/flashblocks/service.rs b/crates/rollup-boost/src/flashblocks/service.rs index 5730f6f7..04581e4b 100644 --- a/crates/rollup-boost/src/flashblocks/service.rs +++ b/crates/rollup-boost/src/flashblocks/service.rs @@ -1,8 +1,6 @@ use super::outbound::WebSocketPublisher; use crate::flashblocks::metrics::FlashblocksServiceMetrics; -use crate::{ - ClientResult, EngineApiExt, NewPayload, OpExecutionPayloadEnvelope, PayloadVersion, RpcClient, -}; +use crate::{ClientResult, EngineApiExt, RpcClient}; use alloy_primitives::U256; use alloy_rpc_types_engine::{ BlobsBundleV1, ExecutionPayloadV1, ExecutionPayloadV2, ExecutionPayloadV3, @@ -19,6 +17,7 @@ use reth_optimism_payload_builder::payload_id_optimism; use rollup_boost_core::flashblocks::{ ExecutionPayloadBaseV1, ExecutionPayloadFlashblockDeltaV1, FlashblocksPayloadV1, }; +use rollup_boost_core::payload::{NewPayload, OpExecutionPayloadEnvelope, PayloadVersion}; use std::io; use std::sync::Arc; use std::sync::atomic::{AtomicU64, Ordering}; @@ -390,12 +389,10 @@ impl EngineApiExt for FlashblocksService { #[cfg(test)] mod tests { use super::*; - use crate::{ - PayloadSource, - server::tests::{MockEngineServer, spawn_server}, - }; + use crate::server::tests::{MockEngineServer, spawn_server}; use http::Uri; use reth_rpc_layer::JwtSecret; + use rollup_boost_core::payload::PayloadSource; use std::str::FromStr; /// Test that we fallback to the getPayload method if the flashblocks payload is not available diff --git a/crates/rollup-boost/src/health.rs b/crates/rollup-boost/src/health.rs index 045f958b..1b0cb132 100644 --- a/crates/rollup-boost/src/health.rs +++ b/crates/rollup-boost/src/health.rs @@ -172,7 +172,8 @@ mod tests { use tokio::net::TcpListener; use super::*; - use crate::{Probes, payload::PayloadSource}; + use crate::Probes; + use rollup_boost_core::payload::PayloadSource; use serial_test::serial; pub struct MockHttpServer { diff --git a/crates/rollup-boost/src/lib.rs b/crates/rollup-boost/src/lib.rs index 728d4892..ac18f119 100644 --- a/crates/rollup-boost/src/lib.rs +++ b/crates/rollup-boost/src/lib.rs @@ -33,9 +33,6 @@ pub use health::*; #[cfg(test)] pub mod tests; -mod payload; -pub use payload::*; - mod selection; pub use selection::*; diff --git a/crates/rollup-boost/src/proxy.rs b/crates/rollup-boost/src/proxy.rs index 64709ccb..7588bb02 100644 --- a/crates/rollup-boost/src/proxy.rs +++ b/crates/rollup-boost/src/proxy.rs @@ -129,8 +129,9 @@ where #[cfg(test)] mod tests { + use crate::ClientArgs; use crate::probe::ProbeLayer; - use crate::{ClientArgs, PayloadSource}; + use rollup_boost_core::payload::PayloadSource; use super::*; use alloy_primitives::{B256, Bytes, U64, U128, hex}; diff --git a/crates/rollup-boost/src/selection.rs b/crates/rollup-boost/src/selection.rs index d6ef583d..3933739c 100644 --- a/crates/rollup-boost/src/selection.rs +++ b/crates/rollup-boost/src/selection.rs @@ -1,4 +1,4 @@ -use crate::{OpExecutionPayloadEnvelope, PayloadSource}; +use rollup_boost_core::payload::{OpExecutionPayloadEnvelope, PayloadSource}; use serde::{Deserialize, Serialize}; /// Defines the strategy for choosing between the builder block and the L2 client block diff --git a/crates/rollup-boost/src/server.rs b/crates/rollup-boost/src/server.rs index fd0d093d..f6b98d7e 100644 --- a/crates/rollup-boost/src/server.rs +++ b/crates/rollup-boost/src/server.rs @@ -6,10 +6,6 @@ use crate::{ use crate::{ client::rpc::RpcClient, health::HealthHandle, - payload::{ - NewPayload, NewPayloadV3, NewPayloadV4, OpExecutionPayloadEnvelope, PayloadSource, - PayloadTraceContext, PayloadVersion, - }, probe::{Health, Probes}, }; use alloy_primitives::{B256, Bytes, bytes}; @@ -36,6 +32,10 @@ use op_alloy_rpc_types_engine::{ }; use opentelemetry::trace::SpanKind; use parking_lot::Mutex; +use rollup_boost_core::payload::{ + NewPayload, NewPayloadV3, NewPayloadV4, OpExecutionPayloadEnvelope, PayloadSource, + PayloadTraceContext, PayloadVersion, +}; use std::net::{IpAddr, SocketAddr}; use std::str::FromStr; use std::sync::Arc; diff --git a/crates/rollup-boost/src/tests/common/mod.rs b/crates/rollup-boost/src/tests/common/mod.rs index 3b7feadb..ed3acfe8 100644 --- a/crates/rollup-boost/src/tests/common/mod.rs +++ b/crates/rollup-boost/src/tests/common/mod.rs @@ -1,8 +1,7 @@ #![allow(dead_code)] use crate::DebugClient; +use crate::EngineApiClient; use crate::{AuthLayer, AuthService}; -use crate::{EngineApiClient, OpExecutionPayloadEnvelope, PayloadVersion}; -use crate::{NewPayload, PayloadSource}; use alloy_eips::Encodable2718; use alloy_primitives::{B256, Bytes, TxKind, U256, address, hex}; use alloy_rpc_types_engine::{ExecutionPayload, JwtSecret}; @@ -23,6 +22,9 @@ use op_alloy_consensus::TxDeposit; use op_alloy_rpc_types_engine::OpPayloadAttributes; use parking_lot::Mutex; use proxy::{BuilderProxyHandler, start_proxy_server}; +use rollup_boost_core::payload::{ + NewPayload, OpExecutionPayloadEnvelope, PayloadSource, PayloadVersion, +}; use serde_json::Value; use services::op_reth::{AUTH_RPC_PORT, OpRethConfig, OpRethImage, OpRethMehods, P2P_PORT}; use services::rollup_boost::{RollupBoost, RollupBoostConfig}; diff --git a/crates/websocket-proxy/src/subscriber.rs b/crates/websocket-proxy/src/subscriber.rs index 23f6af9e..c4598e65 100644 --- a/crates/websocket-proxy/src/subscriber.rs +++ b/crates/websocket-proxy/src/subscriber.rs @@ -299,7 +299,7 @@ mod tests { use tokio::net::{TcpListener, TcpStream}; use tokio::sync::broadcast; use tokio::time::{sleep, timeout, Duration}; - use tokio_tungstenite::{accept_async, tungstenite::Message}; + use tokio_tungstenite::accept_async; struct MockServer { addr: SocketAddr, From 753767212b87148ebd6d764b758fc2f511a5f66e Mon Sep 17 00:00:00 2001 From: elizabeth Date: Mon, 1 Dec 2025 15:41:57 -0500 Subject: [PATCH 3/4] cargo update --- Cargo.lock | 4 ++++ Cargo.toml | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ccf07199..3b5ec992 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10263,8 +10263,12 @@ dependencies = [ "alloy-rpc-types-engine", "alloy-rpc-types-eth", "alloy-serde", + "futures", + "moka", + "op-alloy-rpc-types-engine", "serde", "serde_json", + "tracing", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 87a6fd7b..16329c94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,20 +12,21 @@ members = [ rollup-boost = { path = "crates/rollup-boost" } rollup-boost-core = { path = "crates/rollup-boost-core" } -tracing = "0.1.4" -tracing-subscriber = { version = "0.3.20", features = ["env-filter", "json"] } +backoff = "0.4.0" clap = { version = "4", features = ["derive", "env"] } +eyre = "0.6.12" futures = "0.3.31" -thiserror = "2.0.11" -serde = { version = "1", features = ["derive"] } -serde_json = "1.0.96" metrics = "0.24.0" metrics-derive = "0.1" +moka = { version = "0.12.10", features = ["future"] } +serde = { version = "1", features = ["derive"] } +serde_json = "1.0.96" +sha2 = { version = "0.10", default-features = false } +thiserror = "2.0.11" tokio = { version = "1", features = ["full"] } -eyre = "0.6.12" +tracing = "0.1.4" +tracing-subscriber = { version = "0.3.20", features = ["env-filter", "json"] } url = "2.2.0" -sha2 = { version = "0.10", default-features = false } -backoff = "0.4.0" # Reth deps reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } From 2674134f62450326f27ab0762ecf4a2996a5d78e Mon Sep 17 00:00:00 2001 From: elizabeth Date: Thu, 4 Dec 2025 17:07:21 -0500 Subject: [PATCH 4/4] rename to rollup-boost-types --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- crates/flashblocks-rpc/Cargo.toml | 2 +- crates/flashblocks-rpc/src/cache.rs | 4 ++-- crates/flashblocks-rpc/src/flashblocks.rs | 2 +- crates/flashblocks-rpc/src/tests/mod.rs | 2 +- crates/{rollup-boost-core => rollup-boost-types}/Cargo.toml | 2 +- .../src/flashblocks.rs | 0 crates/{rollup-boost-core => rollup-boost-types}/src/lib.rs | 0 .../src/payload.rs | 0 crates/rollup-boost/Cargo.toml | 2 +- crates/rollup-boost/src/cli.rs | 2 +- crates/rollup-boost/src/client/http.rs | 2 +- crates/rollup-boost/src/client/rpc.rs | 4 ++-- crates/rollup-boost/src/engine_api.rs | 2 +- crates/rollup-boost/src/flashblocks/inbound.rs | 2 +- crates/rollup-boost/src/flashblocks/outbound.rs | 2 +- crates/rollup-boost/src/flashblocks/service.rs | 6 +++--- crates/rollup-boost/src/health.rs | 2 +- crates/rollup-boost/src/lib.rs | 6 +++--- crates/rollup-boost/src/proxy.rs | 2 +- crates/rollup-boost/src/selection.rs | 2 +- crates/rollup-boost/src/server.rs | 2 +- crates/rollup-boost/src/tests/common/mod.rs | 2 +- 24 files changed, 30 insertions(+), 30 deletions(-) rename crates/{rollup-boost-core => rollup-boost-types}/Cargo.toml (94%) rename crates/{rollup-boost-core => rollup-boost-types}/src/flashblocks.rs (100%) rename crates/{rollup-boost-core => rollup-boost-types}/src/lib.rs (100%) rename crates/{rollup-boost-core => rollup-boost-types}/src/payload.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 3b5ec992..15c6edd7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3348,7 +3348,7 @@ dependencies = [ "reth-tasks", "reth-tracing", "rollup-boost", - "rollup-boost-core", + "rollup-boost-types", "serde", "serde_json", "tokio", @@ -10232,7 +10232,7 @@ dependencies = [ "reqwest", "reth-optimism-payload-builder", "reth-rpc-layer 1.4.7", - "rollup-boost-core", + "rollup-boost-types", "rustls", "serde", "serde_json", @@ -10256,7 +10256,7 @@ dependencies = [ ] [[package]] -name = "rollup-boost-core" +name = "rollup-boost-types" version = "0.1.0" dependencies = [ "alloy-primitives", diff --git a/Cargo.toml b/Cargo.toml index 16329c94..a324228a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,12 +5,12 @@ members = [ "crates/rollup-boost", "crates/websocket-proxy", "crates/flashblocks-rpc", - "crates/rollup-boost-core", + "crates/rollup-boost-types", ] [workspace.dependencies] rollup-boost = { path = "crates/rollup-boost" } -rollup-boost-core = { path = "crates/rollup-boost-core" } +rollup-boost-types = { path = "crates/rollup-boost-types" } backoff = "0.4.0" clap = { version = "4", features = ["derive", "env"] } diff --git a/crates/flashblocks-rpc/Cargo.toml b/crates/flashblocks-rpc/Cargo.toml index 0b1c0e6a..72f9fc09 100644 --- a/crates/flashblocks-rpc/Cargo.toml +++ b/crates/flashblocks-rpc/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" [dependencies] rollup-boost.workspace = true -rollup-boost-core.workspace = true +rollup-boost-types.workspace = true reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } diff --git a/crates/flashblocks-rpc/src/cache.rs b/crates/flashblocks-rpc/src/cache.rs index 7ffaea93..8d76b2b0 100644 --- a/crates/flashblocks-rpc/src/cache.rs +++ b/crates/flashblocks-rpc/src/cache.rs @@ -22,8 +22,8 @@ use reth_primitives_traits::block::body::BlockBody; use reth_rpc_eth_api::transaction::ConvertReceiptInput; use reth_rpc_eth_api::{RpcBlock, RpcReceipt}; use rollup_boost::FlashblockBuilder; -use rollup_boost_core::flashblocks::FlashblocksPayloadV1; -use rollup_boost_core::payload::{OpExecutionPayloadEnvelope, PayloadVersion}; +use rollup_boost_types::flashblocks::FlashblocksPayloadV1; +use rollup_boost_types::payload::{OpExecutionPayloadEnvelope, PayloadVersion}; use serde::{Deserialize, Serialize}; use std::{collections::HashMap, str::FromStr, sync::Arc}; diff --git a/crates/flashblocks-rpc/src/flashblocks.rs b/crates/flashblocks-rpc/src/flashblocks.rs index 55f21223..b1591461 100644 --- a/crates/flashblocks-rpc/src/flashblocks.rs +++ b/crates/flashblocks-rpc/src/flashblocks.rs @@ -5,7 +5,7 @@ use jsonrpsee::core::async_trait; use op_alloy_network::Optimism; use reth_optimism_chainspec::OpChainSpec; use reth_rpc_eth_api::{RpcBlock, RpcReceipt}; -use rollup_boost_core::flashblocks::FlashblocksPayloadV1; +use rollup_boost_types::flashblocks::FlashblocksPayloadV1; use std::{io::Read, sync::Arc}; use tokio::sync::mpsc; use tokio_tungstenite::{connect_async, tungstenite::Message}; diff --git a/crates/flashblocks-rpc/src/tests/mod.rs b/crates/flashblocks-rpc/src/tests/mod.rs index 2dcc54eb..9c056f66 100644 --- a/crates/flashblocks-rpc/src/tests/mod.rs +++ b/crates/flashblocks-rpc/src/tests/mod.rs @@ -17,7 +17,7 @@ mod tests { use reth_optimism_primitives::OpReceipt; use reth_provider::providers::BlockchainProvider; use reth_tasks::TaskManager; - use rollup_boost_core::flashblocks::{ + use rollup_boost_types::flashblocks::{ ExecutionPayloadBaseV1, ExecutionPayloadFlashblockDeltaV1, FlashblocksPayloadV1, }; use std::{any::Any, collections::HashMap, net::SocketAddr, str::FromStr, sync::Arc}; diff --git a/crates/rollup-boost-core/Cargo.toml b/crates/rollup-boost-types/Cargo.toml similarity index 94% rename from crates/rollup-boost-core/Cargo.toml rename to crates/rollup-boost-types/Cargo.toml index b109d9fb..483d4b0a 100644 --- a/crates/rollup-boost-core/Cargo.toml +++ b/crates/rollup-boost-types/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "rollup-boost-core" +name = "rollup-boost-types" version = "0.1.0" edition = "2024" license = "MIT" diff --git a/crates/rollup-boost-core/src/flashblocks.rs b/crates/rollup-boost-types/src/flashblocks.rs similarity index 100% rename from crates/rollup-boost-core/src/flashblocks.rs rename to crates/rollup-boost-types/src/flashblocks.rs diff --git a/crates/rollup-boost-core/src/lib.rs b/crates/rollup-boost-types/src/lib.rs similarity index 100% rename from crates/rollup-boost-core/src/lib.rs rename to crates/rollup-boost-types/src/lib.rs diff --git a/crates/rollup-boost-core/src/payload.rs b/crates/rollup-boost-types/src/payload.rs similarity index 100% rename from crates/rollup-boost-core/src/payload.rs rename to crates/rollup-boost-types/src/payload.rs diff --git a/crates/rollup-boost/Cargo.toml b/crates/rollup-boost/Cargo.toml index 0dc022f8..17831371 100644 --- a/crates/rollup-boost/Cargo.toml +++ b/crates/rollup-boost/Cargo.toml @@ -5,7 +5,7 @@ edition = "2024" license = "MIT" [dependencies] -rollup-boost-core.workspace = true +rollup-boost-types.workspace = true tracing.workspace = true tracing-subscriber.workspace = true clap.workspace = true diff --git a/crates/rollup-boost/src/cli.rs b/crates/rollup-boost/src/cli.rs index ef823c16..f0f50ccf 100644 --- a/crates/rollup-boost/src/cli.rs +++ b/crates/rollup-boost/src/cli.rs @@ -12,7 +12,7 @@ use crate::{ probe::ProbeLayer, }; use crate::{FlashblocksService, RpcClient}; -use rollup_boost_core::payload::PayloadSource; +use rollup_boost_types::payload::PayloadSource; #[derive(Clone, Debug, clap::Args)] pub struct RollupBoostLibArgs { diff --git a/crates/rollup-boost/src/client/http.rs b/crates/rollup-boost/src/client/http.rs index 8bb8216a..15f17330 100644 --- a/crates/rollup-boost/src/client/http.rs +++ b/crates/rollup-boost/src/client/http.rs @@ -13,7 +13,7 @@ use hyper_util::rt::TokioExecutor; use jsonrpsee::core::BoxError; use jsonrpsee::server::HttpBody; use opentelemetry::trace::SpanKind; -use rollup_boost_core::payload::PayloadSource; +use rollup_boost_types::payload::PayloadSource; use tower::{ Service as _, ServiceBuilder, ServiceExt, timeout::{Timeout, TimeoutLayer}, diff --git a/crates/rollup-boost/src/client/rpc.rs b/crates/rollup-boost/src/client/rpc.rs index c40ccaa6..a5121ae0 100644 --- a/crates/rollup-boost/src/client/rpc.rs +++ b/crates/rollup-boost/src/client/rpc.rs @@ -23,7 +23,7 @@ use op_alloy_rpc_types_engine::{ }; use opentelemetry::trace::SpanKind; use paste::paste; -use rollup_boost_core::payload::{ +use rollup_boost_types::payload::{ NewPayload, OpExecutionPayloadEnvelope, PayloadSource, PayloadVersion, }; use std::path::PathBuf; @@ -483,7 +483,7 @@ pub mod tests { use jsonrpsee::server::{ServerBuilder, ServerHandle}; use jsonrpsee::{RpcModule, rpc_params}; use predicates::prelude::*; - use rollup_boost_core::payload::PayloadSource; + use rollup_boost_types::payload::PayloadSource; use std::collections::HashSet; use std::net::SocketAddr; use std::net::TcpListener; diff --git a/crates/rollup-boost/src/engine_api.rs b/crates/rollup-boost/src/engine_api.rs index 8fe48ab9..4b05552e 100644 --- a/crates/rollup-boost/src/engine_api.rs +++ b/crates/rollup-boost/src/engine_api.rs @@ -4,7 +4,7 @@ use jsonrpsee::core::async_trait; use op_alloy_rpc_types_engine::OpPayloadAttributes; use crate::ClientResult; -use rollup_boost_core::payload::{NewPayload, OpExecutionPayloadEnvelope, PayloadVersion}; +use rollup_boost_types::payload::{NewPayload, OpExecutionPayloadEnvelope, PayloadVersion}; #[async_trait] pub trait EngineApiExt: Send + Sync + 'static { diff --git a/crates/rollup-boost/src/flashblocks/inbound.rs b/crates/rollup-boost/src/flashblocks/inbound.rs index 477eb5ee..3aaaac2d 100644 --- a/crates/rollup-boost/src/flashblocks/inbound.rs +++ b/crates/rollup-boost/src/flashblocks/inbound.rs @@ -5,7 +5,7 @@ use backoff::backoff::Backoff; use bytes::Bytes; use futures::{SinkExt, StreamExt}; use lru::LruCache; -use rollup_boost_core::flashblocks::FlashblocksPayloadV1; +use rollup_boost_types::flashblocks::FlashblocksPayloadV1; use std::io::ErrorKind::TimedOut; use std::num::NonZeroUsize; use std::sync::Arc; diff --git a/crates/rollup-boost/src/flashblocks/outbound.rs b/crates/rollup-boost/src/flashblocks/outbound.rs index a0ca04bc..a083ed30 100644 --- a/crates/rollup-boost/src/flashblocks/outbound.rs +++ b/crates/rollup-boost/src/flashblocks/outbound.rs @@ -6,7 +6,7 @@ use core::{ task::{Context, Poll}, }; use futures::{Sink, SinkExt, StreamExt}; -use rollup_boost_core::flashblocks::FlashblocksPayloadV1; +use rollup_boost_types::flashblocks::FlashblocksPayloadV1; use std::{io, net::TcpListener, sync::Arc}; use tokio::{ net::TcpStream, diff --git a/crates/rollup-boost/src/flashblocks/service.rs b/crates/rollup-boost/src/flashblocks/service.rs index 04581e4b..29f45432 100644 --- a/crates/rollup-boost/src/flashblocks/service.rs +++ b/crates/rollup-boost/src/flashblocks/service.rs @@ -14,10 +14,10 @@ use op_alloy_rpc_types_engine::{ OpPayloadAttributes, }; use reth_optimism_payload_builder::payload_id_optimism; -use rollup_boost_core::flashblocks::{ +use rollup_boost_types::flashblocks::{ ExecutionPayloadBaseV1, ExecutionPayloadFlashblockDeltaV1, FlashblocksPayloadV1, }; -use rollup_boost_core::payload::{NewPayload, OpExecutionPayloadEnvelope, PayloadVersion}; +use rollup_boost_types::payload::{NewPayload, OpExecutionPayloadEnvelope, PayloadVersion}; use std::io; use std::sync::Arc; use std::sync::atomic::{AtomicU64, Ordering}; @@ -392,7 +392,7 @@ mod tests { use crate::server::tests::{MockEngineServer, spawn_server}; use http::Uri; use reth_rpc_layer::JwtSecret; - use rollup_boost_core::payload::PayloadSource; + use rollup_boost_types::payload::PayloadSource; use std::str::FromStr; /// Test that we fallback to the getPayload method if the flashblocks payload is not available diff --git a/crates/rollup-boost/src/health.rs b/crates/rollup-boost/src/health.rs index 1b0cb132..d8403a29 100644 --- a/crates/rollup-boost/src/health.rs +++ b/crates/rollup-boost/src/health.rs @@ -173,7 +173,7 @@ mod tests { use super::*; use crate::Probes; - use rollup_boost_core::payload::PayloadSource; + use rollup_boost_types::payload::PayloadSource; use serial_test::serial; pub struct MockHttpServer { diff --git a/crates/rollup-boost/src/lib.rs b/crates/rollup-boost/src/lib.rs index ac18f119..81f6d427 100644 --- a/crates/rollup-boost/src/lib.rs +++ b/crates/rollup-boost/src/lib.rs @@ -42,6 +42,6 @@ pub use engine_api::*; mod version; pub use version::*; -// re-export rollup-boost-core flashblocks types -// this can be removed once dependent crates migrate to using rollup-boost-core directly -pub use rollup_boost_core::flashblocks::*; +// re-export rollup-boost-types flashblocks types +// this can be removed once dependent crates migrate to using rollup-boost-types directly +pub use rollup_boost_types::flashblocks::*; diff --git a/crates/rollup-boost/src/proxy.rs b/crates/rollup-boost/src/proxy.rs index 7588bb02..0606dd16 100644 --- a/crates/rollup-boost/src/proxy.rs +++ b/crates/rollup-boost/src/proxy.rs @@ -131,7 +131,7 @@ where mod tests { use crate::ClientArgs; use crate::probe::ProbeLayer; - use rollup_boost_core::payload::PayloadSource; + use rollup_boost_types::payload::PayloadSource; use super::*; use alloy_primitives::{B256, Bytes, U64, U128, hex}; diff --git a/crates/rollup-boost/src/selection.rs b/crates/rollup-boost/src/selection.rs index 3933739c..76eb5cf4 100644 --- a/crates/rollup-boost/src/selection.rs +++ b/crates/rollup-boost/src/selection.rs @@ -1,4 +1,4 @@ -use rollup_boost_core::payload::{OpExecutionPayloadEnvelope, PayloadSource}; +use rollup_boost_types::payload::{OpExecutionPayloadEnvelope, PayloadSource}; use serde::{Deserialize, Serialize}; /// Defines the strategy for choosing between the builder block and the L2 client block diff --git a/crates/rollup-boost/src/server.rs b/crates/rollup-boost/src/server.rs index 5ba4aa97..8bd583ee 100644 --- a/crates/rollup-boost/src/server.rs +++ b/crates/rollup-boost/src/server.rs @@ -32,7 +32,7 @@ use op_alloy_rpc_types_engine::{ }; use opentelemetry::trace::SpanKind; use parking_lot::Mutex; -use rollup_boost_core::payload::{ +use rollup_boost_types::payload::{ NewPayload, NewPayloadV3, NewPayloadV4, OpExecutionPayloadEnvelope, PayloadSource, PayloadTraceContext, PayloadVersion, }; diff --git a/crates/rollup-boost/src/tests/common/mod.rs b/crates/rollup-boost/src/tests/common/mod.rs index ed3acfe8..5b6f7793 100644 --- a/crates/rollup-boost/src/tests/common/mod.rs +++ b/crates/rollup-boost/src/tests/common/mod.rs @@ -22,7 +22,7 @@ use op_alloy_consensus::TxDeposit; use op_alloy_rpc_types_engine::OpPayloadAttributes; use parking_lot::Mutex; use proxy::{BuilderProxyHandler, start_proxy_server}; -use rollup_boost_core::payload::{ +use rollup_boost_types::payload::{ NewPayload, OpExecutionPayloadEnvelope, PayloadSource, PayloadVersion, }; use serde_json::Value;