From d01ae035bc5c7db1224fabb03e4e13d39cd4ea17 Mon Sep 17 00:00:00 2001 From: refcell Date: Tue, 3 Dec 2024 11:01:09 -0500 Subject: [PATCH] fix: bump (#855) --- Cargo.lock | 229 +++++++------------ Cargo.toml | 34 +-- crates/derive/src/attributes/stateful.rs | 10 + crates/derive/src/pipeline/core.rs | 2 + crates/derive/src/stages/attributes_queue.rs | 2 + crates/executor/benches/execution.rs | 4 + crates/executor/src/executor/mod.rs | 13 ++ crates/executor/src/executor/util.rs | 2 + 8 files changed, 139 insertions(+), 157 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ff97f44c..8e9fdbd9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -73,14 +73,15 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae09ffd7c29062431dd86061deefe4e3c6f07fa0d674930095f8dcedb0baf02c" +checksum = "73dd0ab7003dfa3efd252e423873cd3bc241d1456147e752f995cc8aabd1d1f6" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", "alloy-serde", + "alloy-trie", "auto_impl", "c-kzg", "derive_more", @@ -88,6 +89,20 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-consensus-any" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08234c0eece0e08602db5095a16dc942cad91967cccfcfc2c6a42c25563964f" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "serde", +] + [[package]] name = "alloy-eip2930" version = "0.1.0" @@ -126,9 +141,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6aa3961694b30ba53d41006131a2fca3bdab22e4c344e46db2c639e7c2dfdd" +checksum = "50c242de43a1869bcb2fbce3b377130959d10dfd562b87ac7aa2f04d98baac51" dependencies = [ "alloy-eip2930", "alloy-eip7702 0.4.2", @@ -144,29 +159,31 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3694b7e480728c0b3e228384f223937f14c10caef5a4c766021190fc8f283d35" +checksum = "6c15c11661571a19a06896663c93e804ccf013159275a89a98e892014df514d8" dependencies = [ "alloy-primitives", "alloy-sol-types", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", ] [[package]] name = "alloy-network" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea94b8ceb5c75d7df0a93ba0acc53b55a22b47b532b600a800a87ef04eb5b0b4" +checksum = "60dd0b99eaa5e715dd90d42021f7f08a0a70976ea84f41a0ad233770e0c1962b" dependencies = [ "alloy-consensus", + "alloy-consensus-any", "alloy-eips", "alloy-json-rpc", "alloy-network-primitives", "alloy-primitives", + "alloy-rpc-types-any", "alloy-rpc-types-eth", "alloy-serde", "alloy-signer", @@ -176,14 +193,14 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.3", ] [[package]] name = "alloy-network-primitives" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df9f3e281005943944d15ee8491534a1c7b3cbf7a7de26f8c433b842b93eb5f9" +checksum = "18abfc73ce48f074c8bc6e05c1f08ef0b1ddc9b04f191a821d0beb9470a42a29" dependencies = [ "alloy-consensus", "alloy-eips", @@ -208,7 +225,7 @@ dependencies = [ "foldhash", "hashbrown 0.15.2", "hex-literal", - "indexmap 2.7.0", + "indexmap", "itoa", "k256", "keccak-asm", @@ -225,9 +242,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c1f9eede27bf4c13c099e8e64d54efd7ce80ef6ea47478aa75d5d74e2dba3b" +checksum = "4933c761f10e44d5e901804b56efb2ce6e0945e6c57d2fa1e5ace303fae6f74a" dependencies = [ "alloy-chains", "alloy-consensus", @@ -253,7 +270,7 @@ dependencies = [ "schnellru", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.3", "tokio", "tracing", "url", @@ -284,9 +301,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374dbe0dc3abdc2c964f36b3d3edf9cdb3db29d16bda34aa123f03d810bec1dd" +checksum = "6ce26c25efb8290b6ba559ae6c40bf6630d337e107ae242e5790501420dba7b7" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -307,9 +324,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74832aa474b670309c20fffc2a869fa141edab7c79ff7963fad0a08de60bae1" +checksum = "41080ce2640928f0df45c41d2af629b88db3cb31af3abbe614964ae10001ddac" dependencies = [ "alloy-primitives", "alloy-rpc-types-debug", @@ -318,25 +335,37 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-rpc-types-any" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abca110e59f760259e26d0c84912121468008aba48dd227af0f306cfd7bce9ae" +dependencies = [ + "alloy-consensus-any", + "alloy-rpc-types-eth", + "alloy-serde", +] + [[package]] name = "alloy-rpc-types-beacon" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fa76678d2f9f07ea1b19309b5cfbf244c6029dcba3515227b515fdd6ed4a7" +checksum = "45c8db5fb70d2fece7bc1cd5adf42e72fc8a23547adeff8f558d9063f1e7788c" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", + "alloy-serde", "serde", "serde_with", - "thiserror 1.0.69", + "thiserror 2.0.3", ] [[package]] name = "alloy-rpc-types-debug" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba2253bee958658ebd614c07a61c40580e09dd1fad3f017684314442332ab753" +checksum = "ea3a662ced0bfbe582d26ed85d6a0092310787331555c8f7a86f843c7ca272ef" dependencies = [ "alloy-primitives", "serde", @@ -344,9 +373,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56294dce86af23ad6ee8df46cf8b0d292eb5d1ff67dc88a0886051e32b1faf" +checksum = "d3b000c7f3469e7faa575ba70207294cf07e91dfd6ce4d04d5d5d8069f974a66" dependencies = [ "alloy-consensus", "alloy-eips", @@ -360,11 +389,12 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a477281940d82d29315846c7216db45b15e90bcd52309da9f54bcf7ad94a11" +checksum = "3468e7385fbb86b0fde5497d685c02f765ea09d36f7e07c5d1c9a52b077d38e2" dependencies = [ "alloy-consensus", + "alloy-consensus-any", "alloy-eips", "alloy-network-primitives", "alloy-primitives", @@ -379,9 +409,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dfa4a7ccf15b2492bb68088692481fd6b2604ccbee1d0d6c44c21427ae4df83" +checksum = "42de6002e2154b50b3568aea27e26bd9caf7b754658f43065f2e9b6ee0a8c839" dependencies = [ "alloy-primitives", "serde", @@ -390,16 +420,16 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e10aec39d60dc27edcac447302c7803d2371946fb737245320a05b78eb2fafd" +checksum = "f288a9a25e2578dab17845fd8d2be1d32de33565783ed185ded161a65f92381b" dependencies = [ "alloy-primitives", "async-trait", "auto_impl", "elliptic-curve", "k256", - "thiserror 1.0.69", + "thiserror 2.0.3", ] [[package]] @@ -425,7 +455,7 @@ dependencies = [ "alloy-sol-macro-input", "const-hex", "heck", - "indexmap 2.7.0", + "indexmap", "proc-macro-error2", "proc-macro2", "quote", @@ -462,9 +492,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f99acddb34000d104961897dbb0240298e8b775a7efffb9fda2a1a3efedd65b3" +checksum = "90352f4cf78017905c3244f48b38fadc345970bbc9095087c0f985a580550488" dependencies = [ "alloy-json-rpc", "base64", @@ -472,7 +502,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.3", "tokio", "tower", "tracing", @@ -482,9 +512,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.6.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc013132e34eeadaa0add7e74164c1503988bfba8bae885b32e0918ba85a8a6" +checksum = "7d26c94d51fa8b1aee3d15db113dd0773776c02bb36dbaa2590b900dadd7e7d0" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -511,21 +541,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - [[package]] name = "anes" version = "0.1.6" @@ -1058,11 +1073,8 @@ version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ - "android-tzdata", - "iana-time-zone", "num-traits", "serde", - "windows-targets", ] [[package]] @@ -1375,7 +1387,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", - "serde", ] [[package]] @@ -1806,7 +1817,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.7.0", + "indexmap", "slab", "tokio", "tokio-util", @@ -1823,12 +1834,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.13.2" @@ -2007,29 +2012,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "iana-time-zone" -version = "0.1.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - [[package]] name = "icu_collections" version = "1.5.0" @@ -2195,17 +2177,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - [[package]] name = "indexmap" version = "2.7.0" @@ -2225,7 +2196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88" dependencies = [ "ahash", - "indexmap 2.7.0", + "indexmap", "is-terminal", "itoa", "log", @@ -2943,9 +2914,9 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "op-alloy-consensus" -version = "0.6.8" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce158d886815d419222daa67fcdf949a34f7950653a4498ebeb4963331f70ed" +checksum = "77284451ec70602f148f4f3bc6d1106fdfefd57c11ff459c4b2985e400ed1a18" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2959,9 +2930,9 @@ dependencies = [ [[package]] name = "op-alloy-genesis" -version = "0.6.8" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2734e9a65efb90fe4520303f984c124766b7d2f2e5dd51cbe54d6269c85a3c91" +checksum = "c912ec93ec839076e8bbaaf7bd3d80aeedbe38cd5e8e3e76dfc67d217637e651" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2974,9 +2945,9 @@ dependencies = [ [[package]] name = "op-alloy-protocol" -version = "0.6.8" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c68a3e2770890da3ad2fd20d7fe0c8e15672707577b4168a60e388c8eceaca0" +checksum = "9ab24c1b9c21cedd691938b5667c951b04ae8b89429d7cb7a88f30afb79cbbf1" dependencies = [ "alloc-no-stdlib", "alloy-consensus", @@ -2986,6 +2957,7 @@ dependencies = [ "alloy-serde", "async-trait", "brotli", + "cfg-if", "miniz_oxide", "op-alloy-consensus", "op-alloy-genesis", @@ -2997,9 +2969,9 @@ dependencies = [ [[package]] name = "op-alloy-registry" -version = "0.6.8" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589e7906a7c8d71f06b130ee1d8a0a07b0b2cd0e0771157a770e6c20a34da953" +checksum = "6d00f7795114ff4d78cfa64f6cefc3502fd0aefeeac9044f25b6201e5db8d14d" dependencies = [ "alloy-primitives", "lazy_static", @@ -3010,9 +2982,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.6.8" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864dbd5511ef4ef00b6c2c980739259b25b24048007b7751ca0069b30b1e3fee" +checksum = "b07175fcfd9d03a587ece7ce79fc288331e6d9ae523464eb677c751d5737713b" dependencies = [ "alloy-eips", "alloy-primitives", @@ -3103,14 +3075,14 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.7.0" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.90", + "syn 1.0.109", ] [[package]] @@ -3695,7 +3667,7 @@ dependencies = [ "bytecheck", "bytes", "hashbrown 0.15.2", - "indexmap 2.7.0", + "indexmap", "munge", "ptr_meta", "rancor", @@ -4026,7 +3998,7 @@ version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ - "indexmap 2.7.0", + "indexmap", "itoa", "memchr", "ryu", @@ -4065,8 +4037,6 @@ dependencies = [ "base64", "chrono", "hex", - "indexmap 1.9.3", - "indexmap 2.7.0", "serde", "serde_derive", "serde_json", @@ -4467,12 +4437,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa", "num-conv", "powerfmt", "serde", "time-core", - "time-macros", ] [[package]] @@ -4481,16 +4449,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -4622,7 +4580,7 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.7.0", + "indexmap", "toml_datetime", "winnow", ] @@ -4980,15 +4938,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets", -] - [[package]] name = "windows-registry" version = "0.2.0" diff --git a/Cargo.toml b/Cargo.toml index 710ab3f1e..b667d3a60 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,25 +75,25 @@ kona-proof = { path = "crates/proof-sdk/proof", version = "0.1.0", default-featu # Alloy alloy-rlp = { version = "0.3.9", default-features = false } alloy-trie = { version = "0.7.4", default-features = false } -alloy-eips = { version = "0.6.4", default-features = false } -alloy-serde = { version = "0.6.4", default-features = false } -alloy-provider = { version = "0.6.4", default-features = false } -alloy-primitives = { version = "0.8.12", default-features = false } -alloy-consensus = { version = "0.6.4", default-features = false } -alloy-transport = { version = "0.6.4", default-features = false } -alloy-rpc-types = { version = "0.6.4", default-features = false, features = ["debug"] } -alloy-rpc-client = { version = "0.6.4", default-features = false } -alloy-node-bindings = { version = "0.6.4", default-features = false } -alloy-transport-http = { version = "0.6.4", default-features = false } -alloy-rpc-types-engine = { version = "0.6.4", default-features = false } -alloy-rpc-types-beacon = { version = "0.6.4", default-features = false } +alloy-eips = { version = "0.7.0", default-features = false } +alloy-serde = { version = "0.7.0", default-features = false } +alloy-provider = { version = "0.7.0", default-features = false } +alloy-primitives = { version = "0.8.13", default-features = false } +alloy-consensus = { version = "0.7.0", default-features = false } +alloy-transport = { version = "0.7.0", default-features = false } +alloy-rpc-types = { version = "0.7.0", default-features = false, features = ["debug"] } +alloy-rpc-client = { version = "0.7.0", default-features = false } +alloy-node-bindings = { version = "0.7.0", default-features = false } +alloy-transport-http = { version = "0.7.0", default-features = false } +alloy-rpc-types-engine = { version = "0.7.0", default-features = false } +alloy-rpc-types-beacon = { version = "0.7.0", default-features = false } # OP Alloy -op-alloy-genesis = { version = "0.6.8", default-features = false } -op-alloy-registry = { version = "0.6.8", default-features = false } -op-alloy-protocol = { version = "0.6.8", default-features = false } -op-alloy-consensus = { version = "0.6.8", default-features = false } -op-alloy-rpc-types-engine = { version = "0.6.8", default-features = false, features = ["serde"] } +op-alloy-genesis = { version = "0.7.1", default-features = false } +op-alloy-registry = { version = "0.7.1", default-features = false } +op-alloy-protocol = { version = "0.7.1", default-features = false } +op-alloy-consensus = { version = "0.7.1", default-features = false } +op-alloy-rpc-types-engine = { version = "0.7.1", default-features = false, features = ["serde"] } # General lru = "0.12.4" diff --git a/crates/derive/src/attributes/stateful.rs b/crates/derive/src/attributes/stateful.rs index f898c6eb1..3af01d213 100644 --- a/crates/derive/src/attributes/stateful.rs +++ b/crates/derive/src/attributes/stateful.rs @@ -178,6 +178,8 @@ where suggested_fee_recipient: SEQUENCER_FEE_VAULT_ADDRESS, parent_beacon_block_root: parent_beacon_root, withdrawals, + target_blobs_per_block: None, + max_blobs_per_block: None, }, transactions: Some(txs), no_tx_pool: Some(true), @@ -450,6 +452,8 @@ mod tests { suggested_fee_recipient: SEQUENCER_FEE_VAULT_ADDRESS, parent_beacon_block_root: None, withdrawals: None, + target_blobs_per_block: None, + max_blobs_per_block: None, }, transactions: payload.transactions.clone(), no_tx_pool: Some(true), @@ -496,6 +500,8 @@ mod tests { suggested_fee_recipient: SEQUENCER_FEE_VAULT_ADDRESS, parent_beacon_block_root: None, withdrawals: Some(Vec::default()), + target_blobs_per_block: None, + max_blobs_per_block: None, }, transactions: payload.transactions.clone(), no_tx_pool: Some(true), @@ -544,6 +550,8 @@ mod tests { suggested_fee_recipient: SEQUENCER_FEE_VAULT_ADDRESS, parent_beacon_block_root, withdrawals: Some(vec![]), + target_blobs_per_block: None, + max_blobs_per_block: None, }, transactions: payload.transactions.clone(), no_tx_pool: Some(true), @@ -591,6 +599,8 @@ mod tests { suggested_fee_recipient: SEQUENCER_FEE_VAULT_ADDRESS, parent_beacon_block_root: Some(B256::ZERO), withdrawals: Some(vec![]), + target_blobs_per_block: None, + max_blobs_per_block: None, }, transactions: payload.transactions.clone(), no_tx_pool: Some(true), diff --git a/crates/derive/src/pipeline/core.rs b/crates/derive/src/pipeline/core.rs index 2bb1cb46a..927f8cf1e 100644 --- a/crates/derive/src/pipeline/core.rs +++ b/crates/derive/src/pipeline/core.rs @@ -204,6 +204,8 @@ mod tests { suggested_fee_recipient: Default::default(), withdrawals: None, parent_beacon_block_root: None, + target_blobs_per_block: None, + max_blobs_per_block: None, }, transactions: None, no_tx_pool: None, diff --git a/crates/derive/src/stages/attributes_queue.rs b/crates/derive/src/stages/attributes_queue.rs index 48cc9905a..d872ea6a1 100644 --- a/crates/derive/src/stages/attributes_queue.rs +++ b/crates/derive/src/stages/attributes_queue.rs @@ -212,6 +212,8 @@ mod tests { prev_randao: B256::default(), withdrawals: None, parent_beacon_block_root: None, + target_blobs_per_block: None, + max_blobs_per_block: None, }, no_tx_pool: Some(false), transactions: None, diff --git a/crates/executor/benches/execution.rs b/crates/executor/benches/execution.rs index 21d64ea65..0ced84e0b 100644 --- a/crates/executor/benches/execution.rs +++ b/crates/executor/benches/execution.rs @@ -129,6 +129,8 @@ fn execution(c: &mut Criterion) { parent_beacon_block_root: Some(b256!( "a4414c4984ce7285b82bd9b21c642af30f0f648fb6f4929b67753e7345a06bab" )), + target_blobs_per_block: None, + max_blobs_per_block: None, }, gas_limit: Some(30_000_000), transactions: Some(raw_txs), @@ -171,6 +173,8 @@ fn execution(c: &mut Criterion) { parent_beacon_block_root: Some(b256!( "8ab0d68c0fc4fe40d31baf01bcf73de45ddf15ab58e66738ca6c60648676f9af" )), + target_blobs_per_block: None, + max_blobs_per_block: None, }, gas_limit: Some(30_000_000), transactions: Some(raw_txs), diff --git a/crates/executor/src/executor/mod.rs b/crates/executor/src/executor/mod.rs index d32668b6e..2a92d6dc0 100644 --- a/crates/executor/src/executor/mod.rs +++ b/crates/executor/src/executor/mod.rs @@ -322,6 +322,7 @@ where excess_blob_gas: excess_blob_gas.and_then(|x| x.try_into().ok()), parent_beacon_block_root: payload.payload_attributes.parent_beacon_block_root, extra_data: encoded_base_fee_params, + target_blobs_per_block: None, } .seal_slow(); @@ -556,6 +557,8 @@ mod test { "edba75784acf3165bffd96df8b78ffdb3781db91f886f22b4bee0a6f722df939" ), suggested_fee_recipient: FEE_RECIPIENT, + target_blobs_per_block: None, + max_blobs_per_block: None, }, gas_limit: Some(0x1c9c380), transactions: Some(alloc::vec![raw_tx.into()]), @@ -619,6 +622,8 @@ mod test { parent_beacon_block_root: Some(b256!( "5e7da14ac6b18e62306c84d9d555387d4b4a6c3d122df22a2af2b68bf219860d" )), + target_blobs_per_block: None, + max_blobs_per_block: None, }, gas_limit: Some(30000000), transactions: Some(raw_txs), @@ -689,6 +694,8 @@ mod test { parent_beacon_block_root: Some(b256!( "50f4a35e2f059621cba649e719d23a2a9d030189fd19172a689c76d3adf39fec" )), + target_blobs_per_block: None, + max_blobs_per_block: None, }, gas_limit: Some(0x1c9c380), transactions: Some(raw_txs), @@ -753,6 +760,8 @@ mod test { parent_beacon_block_root: Some(b256!( "fa918fbee01a47f475d70995e78b4505bd8714962012720cab27f7e66ec4ea5b" )), + target_blobs_per_block: None, + max_blobs_per_block: None, }, gas_limit: Some(30_000_000), transactions: Some(raw_txs), @@ -826,6 +835,8 @@ mod test { parent_beacon_block_root: Some(b256!( "a4414c4984ce7285b82bd9b21c642af30f0f648fb6f4929b67753e7345a06bab" )), + target_blobs_per_block: None, + max_blobs_per_block: None, }, gas_limit: Some(30_000_000), transactions: Some(raw_txs), @@ -904,6 +915,8 @@ mod test { parent_beacon_block_root: Some(b256!( "8ab0d68c0fc4fe40d31baf01bcf73de45ddf15ab58e66738ca6c60648676f9af" )), + target_blobs_per_block: None, + max_blobs_per_block: None, }, gas_limit: Some(30_000_000), transactions: Some(raw_txs), diff --git a/crates/executor/src/executor/util.rs b/crates/executor/src/executor/util.rs index 4939595bb..f48a1a3ca 100644 --- a/crates/executor/src/executor/util.rs +++ b/crates/executor/src/executor/util.rs @@ -101,6 +101,8 @@ mod test { suggested_fee_recipient: Default::default(), withdrawals: Default::default(), parent_beacon_block_root: Default::default(), + target_blobs_per_block: None, + max_blobs_per_block: None, }, transactions: None, no_tx_pool: None,