From 07bda5d453749a513fdd5afc5ea48dd90a3ba5a0 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Fri, 25 Oct 2024 14:17:32 +0200
Subject: [PATCH] chore: EthBuiltPayload touchups (#12067)

---
 .../ethereum/engine-primitives/src/payload.rs   | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/crates/ethereum/engine-primitives/src/payload.rs b/crates/ethereum/engine-primitives/src/payload.rs
index 1ad9c5450e..50c4852545 100644
--- a/crates/ethereum/engine-primitives/src/payload.rs
+++ b/crates/ethereum/engine-primitives/src/payload.rs
@@ -38,7 +38,9 @@ pub struct EthBuiltPayload {
 // === impl BuiltPayload ===
 
 impl EthBuiltPayload {
-    /// Initializes the payload with the given initial block.
+    /// Initializes the payload with the given initial block
+    ///
+    /// Caution: This does not set any [`BlobTransactionSidecar`].
     pub const fn new(
         id: PayloadId,
         block: SealedBlock,
@@ -69,9 +71,18 @@ impl EthBuiltPayload {
     }
 
     /// Adds sidecars to the payload.
-    pub fn extend_sidecars(&mut self, sidecars: Vec<BlobTransactionSidecar>) {
+    pub fn extend_sidecars(&mut self, sidecars: impl IntoIterator<Item = BlobTransactionSidecar>) {
         self.sidecars.extend(sidecars)
     }
+
+    /// Same as [`Self::extend_sidecars`] but returns the type again.
+    pub fn with_sidecars(
+        mut self,
+        sidecars: impl IntoIterator<Item = BlobTransactionSidecar>,
+    ) -> Self {
+        self.extend_sidecars(sidecars);
+        self
+    }
 }
 
 impl BuiltPayload for EthBuiltPayload {
@@ -134,7 +145,7 @@ impl From<EthBuiltPayload> for ExecutionPayloadEnvelopeV3 {
             // Spec:
             // <https://github.com/ethereum/execution-apis/blob/fe8e13c288c592ec154ce25c534e26cb7ce0530d/src/engine/cancun.md#specification-2>
             should_override_builder: false,
-            blobs_bundle: sidecars.into_iter().map(Into::into).collect::<Vec<_>>().into(),
+            blobs_bundle: sidecars.into(),
         }
     }
 }