Merge pull request #132 from chainbound/feat/blobs-bundle-in-local-pa…

…yload

feat(sidecar): populate blobs bundle when self-building

bolt-sidecar/bin/sidecar.rs

@@ -150,7 +150,7 @@ async fn main() -> eyre::Result<()> {
                 }
 
 
-                if let Err(e) = local_builder.build_new_local_payload(template.as_signed_transactions()).await {
+                if let Err(e) = local_builder.build_new_local_payload(&template).await {
                     tracing::error!(err = ?e, "CRITICAL: Error while building local payload at slot deadline for {slot}");
                 };
             },

bolt-sidecar/src/builder/mod.rs

@@ -6,7 +6,6 @@ use ethereum_consensus::{
     ssz::prelude::{List, MerkleizationError},
 };
 use payload_builder::FallbackPayloadBuilder;
-use reth_primitives::TransactionSigned;
 use signature::sign_builder_message;
 
 use crate::{
@@ -99,8 +98,11 @@ impl LocalBuilder {
     ///
     pub async fn build_new_local_payload(
         &mut self,
-        transactions: Vec<TransactionSigned>,
+        template: &BlockTemplate,
     ) -> Result<(), BuilderError> {
+        let transactions = template.as_signed_transactions();
+        let blobs_bundle = template.as_blobs_bundle();
+
         // 1. build a fallback payload with the given transactions, on top of
         // the current head of the chain
         let sealed_block = self
@@ -119,8 +121,7 @@ impl LocalBuilder {
         let eth_payload = compat::to_consensus_execution_payload(&sealed_block);
         let payload_and_blobs = PayloadAndBlobs {
             execution_payload: eth_payload,
-            // TODO: add included blobs here
-            blobs_bundle: Default::default(),
+            blobs_bundle,
         };
 
         // 2. create a signed builder bid with the sealed block header we just created

bolt-sidecar/src/builder/template.rs

@@ -7,11 +7,15 @@
 use std::collections::HashMap;
 
 use alloy_primitives::{Address, U256};
+use ethereum_consensus::{
+    crypto::{KzgCommitment, KzgProof},
+    deneb::mainnet::{Blob, BlobsBundle},
+};
 use reth_primitives::{PooledTransactionsElement, TransactionSigned};
 
 use crate::{
     common::max_transaction_cost,
-    primitives::{constraint::Constraint, AccountState, SignedConstraints},
+    primitives::{constraint::Constraint, AccountState, SignedConstraints, TransactionExt},
 };
 
 /// A block template that serves as a fallback block, but is also used
@@ -61,6 +65,44 @@ impl BlockTemplate {
             .collect()
     }
 
+    /// Converts the list of signed constraints into a list of all blobs in all transactions
+    /// in the constraints. Use this when building a local execution payload.
+    #[inline]
+    pub fn as_blobs_bundle(&self) -> BlobsBundle {
+        let (commitments, proofs, blobs) = self
+            .signed_constraints_list
+            .iter()
+            .flat_map(|sc| sc.message.constraints.iter())
+            .filter_map(|c| c.transaction.blob_sidecar())
+            .fold(
+                (Vec::new(), Vec::new(), Vec::new()),
+                |(mut commitments, mut proofs, mut blobs), bs| {
+                    commitments.extend(
+                        bs.commitments
+                            .iter()
+                            .map(|c| KzgCommitment::try_from(c.as_slice()).unwrap()),
+                    );
+                    proofs.extend(
+                        bs.proofs
+                            .iter()
+                            .map(|p| KzgProof::try_from(p.as_slice()).unwrap()),
+                    );
+                    blobs.extend(
+                        bs.blobs
+                            .iter()
+                            .map(|b| Blob::try_from(b.as_slice()).unwrap()),
+                    );
+                    (commitments, proofs, blobs)
+                },
+            );
+
+        BlobsBundle {
+            commitments,
+            proofs,
+            blobs,
+        }
+    }
+
     /// Returns the length of the transactions in the block template.
     #[inline]
     pub fn transactions_len(&self) -> usize {

bolt-sidecar/src/primitives/mod.rs

@@ -17,7 +17,7 @@ use ethereum_consensus::{
     types::mainnet::ExecutionPayload,
     Fork,
 };
-use reth_primitives::{PooledTransactionsElement, TxType};
+use reth_primitives::{BlobTransactionSidecar, PooledTransactionsElement, TxType};
 use tokio::sync::{mpsc, oneshot};
 
 /// Commitment types, received by users wishing to receive preconfirmations.
@@ -228,6 +228,7 @@ pub trait TransactionExt {
     fn value(&self) -> U256;
     fn tx_type(&self) -> TxType;
     fn chain_id(&self) -> Option<u64>;
+    fn blob_sidecar(&self) -> Option<&BlobTransactionSidecar>;
 }
 
 impl TransactionExt for PooledTransactionsElement {
@@ -268,4 +269,11 @@ impl TransactionExt for PooledTransactionsElement {
             }
         }
     }
+
+    fn blob_sidecar(&self) -> Option<&BlobTransactionSidecar> {
+        match self {
+            PooledTransactionsElement::BlobTransaction(blob_tx) => Some(&blob_tx.sidecar),
+            _ => None,
+        }
+    }
 }