feat: get_n_l2_block_data_hint

Author: greged93

crates/database/db/src/db.rs

@@ -339,11 +339,12 @@ impl DatabaseReadOperations for Database {
         .await
     }
 
-    async fn get_l2_block_data_hint(
+    async fn get_n_l2_block_data_hint(
         &self,
         block_number: u64,
-    ) -> Result<Option<BlockDataHint>, DatabaseError> {
-        self.tx(move |tx| async move { tx.get_l2_block_data_hint(block_number).await }).await
+        n: usize,
+    ) -> Result<Vec<BlockDataHint>, DatabaseError> {
+        self.tx(move |tx| async move { tx.get_n_l2_block_data_hint(block_number, n).await }).await
     }
 
     async fn get_l2_block_and_batch_info_by_hash(
@@ -658,9 +659,9 @@ mod test {
         let db = setup_test_db().await;
 
         // db should contain the seeded data after migration.
-        let data = db.get_l2_block_data_hint(0).await.unwrap();
+        let data = db.get_n_l2_block_data_hint(0, 1).await.unwrap();
 
-        assert!(data.is_some());
+        assert_eq!(data.len(), 1);
     }
 
     #[tokio::test]

crates/database/db/src/operations.rs

@@ -641,11 +641,12 @@ pub trait DatabaseReadOperations {
         n: usize,
     ) -> Result<Vec<L1MessageEnvelope>, DatabaseError>;
 
-    /// Get the extra data for the provided block number.
-    async fn get_l2_block_data_hint(
+    /// Get the extra data for n block, starting at the provided block number.
+    async fn get_n_l2_block_data_hint(
         &self,
         block_number: u64,
-    ) -> Result<Option<BlockDataHint>, DatabaseError>;
+        n: usize,
+    ) -> Result<Vec<BlockDataHint>, DatabaseError>;
 
     /// Get the [`BlockInfo`] and optional [`BatchInfo`] for the provided block hash.
     async fn get_l2_block_and_batch_info_by_hash(
@@ -921,15 +922,19 @@ impl<T: ReadConnectionProvider + Sync + ?Sized> DatabaseReadOperations for T {
         }
     }
 
-    async fn get_l2_block_data_hint(
+    async fn get_n_l2_block_data_hint(
         &self,
         block_number: u64,
-    ) -> Result<Option<BlockDataHint>, DatabaseError> {
+        n: usize,
+    ) -> Result<Vec<BlockDataHint>, DatabaseError> {
         Ok(models::block_data::Entity::find()
             .filter(models::block_data::Column::Number.eq(block_number as i64))
-            .one(self.get_connection())
-            .await
-            .map(|x| x.map(Into::into))?)
+            .limit(Some(n as u64))
+            .all(self.get_connection())
+            .await?
+            .into_iter()
+            .map(Into::into)
+            .collect())
     }
 
     async fn get_l2_block_and_batch_info_by_hash(

crates/derivation-pipeline/src/lib.rs

@@ -292,7 +292,14 @@ pub async fn derive<L1P: L1Provider + Sync + Send, DB: DatabaseReadOperations>(
     let blocks = decoded.data.into_l2_blocks();
     let mut attributes = Vec::with_capacity(blocks.len());
 
-    for mut block in blocks {
+    let start = blocks.first().map(|b| b.context.number);
+    let block_data = if let Some(start) = start {
+        db.get_n_l2_block_data_hint(start, blocks.len()).await?
+    } else {
+        vec![]
+    };
+
+    for (i, mut block) in blocks.into_iter().enumerate() {
         // query the appropriate amount of l1 messages.
         let mut txs = Vec::with_capacity(block.context.num_transactions as usize);
         for _ in 0..block.context.num_l1_messages {
@@ -315,8 +322,6 @@ pub async fn derive<L1P: L1Provider + Sync + Send, DB: DatabaseReadOperations>(
 
         // get the block data for the l2 block.
         let number = block.context.number;
-        // TODO(performance): can this be improved by adding block_data_range.
-        let block_data = db.get_l2_block_data_hint(number).await?;
 
         // construct the payload attributes.
         let attribute = DerivedAttributes {
@@ -331,7 +336,7 @@ pub async fn derive<L1P: L1Provider + Sync + Send, DB: DatabaseReadOperations>(
                 },
                 transactions: Some(txs),
                 no_tx_pool: true,
-                block_data_hint: block_data.unwrap_or_else(BlockDataHint::none),
+                block_data_hint: block_data.get(i).cloned().unwrap_or_else(BlockDataHint::none),
                 gas_limit: Some(block.context.gas_limit),
             },
         };