Merge branch 'main' into feat-forward-txs-to-sequencer

Author: yiweichi

Cargo.lock

@@ -1,4 +1,4 @@
-FROM rust:1.86.0 AS chef
+FROM rust:1.88.0 AS chef
 
 RUN apt-get update -y && apt-get upgrade -y
 

Dockerfile

@@ -70,6 +70,16 @@ test:
 	--all-features \
 	--no-fail-fast
 
+# Used to update the mainnet-sample.sql data. Provide the path to the sqlite database that should be read from
+# using `DB_PATH`.
+.PHONY: test-data
+export-sample-test-data:
+	sqlite3 "$(DB_PATH)" <<EOF > mainnet-sample.sql
+	.headers on
+	.mode insert block_data
+	SELECT * FROM block_data LIMIT 2000;
+	EOF
+
 .PHONY: docs
 docs:
 	cargo docs --document-private-items

Makefile

@@ -20,7 +20,7 @@ impl<'a> Iterator for BlobSliceIter<'a> {
     type Item = &'a u8;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if self.count % 32 == 0 {
+        if self.count.is_multiple_of(32) {
             let _ = self.iterator.next();
             self.count += 1;
         }

crates/codec/src/decoding/blob.rs

@@ -11,6 +11,8 @@ pub struct PayloadData {
     pub blocks: Vec<L2Block>,
     /// Contains information about the current state of the L1 message queue.
     pub l1_message_queue_info: L1MessageQueueInfo,
+    /// Contains the skipped L1 message bitmap if present.
+    pub skipped_l1_message_bitmap: Option<Vec<u8>>,
 }
 
 /// Information about the state of the L1 message queue.

crates/codec/src/decoding/payload.rs

@@ -5,7 +5,7 @@ use crate::{
 
 use alloy_primitives::{
     bytes::{Buf, BufMut},
-    keccak256, B256, U256,
+    keccak256, B256,
 };
 
 /// The batch header for V0.
@@ -24,7 +24,7 @@ pub struct BatchHeaderV0 {
     /// The parent batch hash.
     pub parent_batch_hash: B256,
     /// A bitmap to indicate which L1 messages are skipped in the batch.
-    pub skipped_l1_message_bitmap: Vec<U256>,
+    pub skipped_l1_message_bitmap: Vec<u8>,
 }
 
 impl BatchHeaderV0 {
@@ -38,7 +38,7 @@ impl BatchHeaderV0 {
         total_l1_message_popped: u64,
         data_hash: B256,
         parent_batch_hash: B256,
-        skipped_l1_message_bitmap: Vec<U256>,
+        skipped_l1_message_bitmap: Vec<u8>,
     ) -> Self {
         Self {
             version,
@@ -69,7 +69,9 @@ impl BatchHeaderV0 {
 
         let skipped_l1_message_bitmap: Vec<_> = buf
             .chunks(SKIPPED_L1_MESSAGE_BITMAP_ITEM_BYTES_SIZE)
-            .map(|chunk| U256::from_be_slice(chunk))
+            .flatten()
+            .rev()
+            .copied()
             .collect();
 
         // check leftover bytes are correct.
@@ -78,7 +80,7 @@ impl BatchHeaderV0 {
         {
             return Err(DecodingError::Eof)
         }
-        buf.advance(skipped_l1_message_bitmap.len() * SKIPPED_L1_MESSAGE_BITMAP_ITEM_BYTES_SIZE);
+        buf.advance(skipped_l1_message_bitmap.len());
 
         Ok(Self {
             version,
@@ -104,12 +106,7 @@ impl BatchHeaderV0 {
         bytes.put_slice(&self.data_hash.0);
         bytes.put_slice(&self.parent_batch_hash.0);
 
-        let skipped_l1_message_flat_bitmap = self
-            .skipped_l1_message_bitmap
-            .iter()
-            .flat_map(|u| u.to_be_bytes::<32>())
-            .collect::<Vec<_>>();
-        bytes.put_slice(&skipped_l1_message_flat_bitmap);
+        bytes.put_slice(&self.skipped_l1_message_bitmap);
 
         keccak256(bytes)
     }
@@ -119,7 +116,7 @@ impl BatchHeaderV0 {
 mod tests {
     use crate::decoding::{test_utils::read_to_bytes, v0::BatchHeaderV0};
 
-    use alloy_primitives::{b256, U256};
+    use alloy_primitives::b256;
     use alloy_sol_types::SolCall;
     use scroll_l1::abi::calls::commitBatchCall;
 
@@ -139,7 +136,34 @@ mod tests {
             33,
             b256!("2aa3eeb5adebb96a49736583c744b89b0b3be45056e8e178106a42ab2cd1a063"),
             b256!("c0173d7e3561501cf57913763c7c34716216092a222a99fe8b85dcb466730f56"),
-            vec![U256::ZERO],
+            vec![0; 32],
+        );
+        assert_eq!(header, expected);
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_should_decode_header_with_skipped_l1_messages() -> eyre::Result<()> {
+        // <https://sepolia.etherscan.io/tx/0xacacfe48bed1944d6586ca8f0bec3ecd10ea0a99e104517f75845b8602dcab31>
+        let raw_commit_calldata =
+            read_to_bytes("./testdata/calldata_v0_with_skipped_l1_messages.bin")?;
+        let commit_calldata = commitBatchCall::abi_decode(&raw_commit_calldata)?;
+
+        let mut raw_batch_header = &*commit_calldata.parent_batch_header.to_vec();
+        let header = BatchHeaderV0::try_from_buf(&mut raw_batch_header)?;
+
+        let expected = BatchHeaderV0::new(
+            0,
+            100,
+            3,
+            22,
+            b256!("4867e8b3c751abf5f0f8cd8e3e91f78ff15011b48b981ad742cb42dfd746844c"),
+            b256!("b4d0a673c704d567eebcd758802ce87cf103b16acbae7c52b2807928fd8dc76e"),
+            vec![
+                1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ],
         );
         assert_eq!(header, expected);
 
@@ -156,7 +180,7 @@ mod tests {
             33,
             b256!("2aa3eeb5adebb96a49736583c744b89b0b3be45056e8e178106a42ab2cd1a063"),
             b256!("c0173d7e3561501cf57913763c7c34716216092a222a99fe8b85dcb466730f56"),
-            vec![U256::ZERO],
+            vec![0; 32],
         );
 
         let expected = b256!("A7F7C528E1827D3E64E406C76DE6C750D5FC3DE3DE4386E6C69958A89461D064");

crates/codec/src/decoding/v0/batch_header.rs

@@ -61,8 +61,11 @@ pub fn decode_v0(calldata: &[u8]) -> Result<Batch, DecodingError> {
     let parent_header = BatchHeaderV0::try_from_buf(&mut (&*raw_parent_header))?;
     let l1_message_start_index = parent_header.total_l1_message_popped;
 
-    let payload =
-        PayloadData { blocks: l2_blocks, l1_message_queue_info: l1_message_start_index.into() };
+    let payload = PayloadData {
+        blocks: l2_blocks,
+        l1_message_queue_info: l1_message_start_index.into(),
+        skipped_l1_message_bitmap: call.skipped_l1_message_bitmap(),
+    };
 
     Ok(Batch::new(call.version(), Some(chunks_block_count), payload))
 }

crates/codec/src/decoding/v0/mod.rs

@@ -5,7 +5,7 @@ use crate::{
 
 use alloy_primitives::{
     bytes::{Buf, BufMut},
-    keccak256, B256, U256,
+    keccak256, B256,
 };
 
 /// The batch header for V1.
@@ -26,7 +26,7 @@ pub struct BatchHeaderV1 {
     /// The parent batch hash.
     pub parent_batch_hash: B256,
     /// A bitmap to indicate which L1 messages are skipped in the batch.
-    pub skipped_l1_message_bitmap: Vec<U256>,
+    pub skipped_l1_message_bitmap: Vec<u8>,
 }
 
 impl BatchHeaderV1 {
@@ -42,7 +42,7 @@ impl BatchHeaderV1 {
         data_hash: B256,
         blob_versioned_hash: B256,
         parent_batch_hash: B256,
-        skipped_l1_message_bitmap: Vec<U256>,
+        skipped_l1_message_bitmap: Vec<u8>,
     ) -> Self {
         Self {
             version,
@@ -75,7 +75,9 @@ impl BatchHeaderV1 {
 
         let skipped_l1_message_bitmap: Vec<_> = buf
             .chunks(SKIPPED_L1_MESSAGE_BITMAP_ITEM_BYTES_SIZE)
-            .map(|chunk| U256::from_be_slice(chunk))
+            .flatten()
+            .rev()
+            .copied()
             .collect();
 
         // check leftover bytes are correct.
@@ -84,7 +86,7 @@ impl BatchHeaderV1 {
         {
             return Err(DecodingError::Eof)
         }
-        buf.advance(skipped_l1_message_bitmap.len() * SKIPPED_L1_MESSAGE_BITMAP_ITEM_BYTES_SIZE);
+        buf.advance(skipped_l1_message_bitmap.len());
 
         Ok(Self {
             version,
@@ -112,12 +114,7 @@ impl BatchHeaderV1 {
         bytes.put_slice(&self.blob_versioned_hash.0);
         bytes.put_slice(&self.parent_batch_hash.0);
 
-        let skipped_l1_message_flat_bitmap = self
-            .skipped_l1_message_bitmap
-            .iter()
-            .flat_map(|u| u.to_be_bytes::<32>())
-            .collect::<Vec<_>>();
-        bytes.put_slice(&skipped_l1_message_flat_bitmap);
+        bytes.put_slice(&self.skipped_l1_message_bitmap);
 
         keccak256(bytes)
     }

crates/codec/src/decoding/v1/batch_header.rs

@@ -52,12 +52,19 @@ pub fn decode_v1(calldata: &[u8], blob: &[u8]) -> Result<Batch, DecodingError> {
     // move pass chunk information.
     buf.advance(TRANSACTION_DATA_BLOB_INDEX_OFFSET);
 
-    decode_v1_chunk(call.version(), l1_message_start_index, chunks, buf)
+    decode_v1_chunk(
+        call.version(),
+        call.skipped_l1_message_bitmap(),
+        l1_message_start_index,
+        chunks,
+        buf,
+    )
 }
 
 /// Decode the provided chunks and blob data into [`L2Block`].
 pub(crate) fn decode_v1_chunk(
     version: u8,
+    skipped_l1_message_bitmap: Option<Vec<u8>>,
     l1_message_start_index: u64,
     chunks: Vec<&[u8]>,
     blob: &[u8],
@@ -98,8 +105,11 @@ pub(crate) fn decode_v1_chunk(
         }
     }
 
-    let payload =
-        PayloadData { blocks: l2_blocks, l1_message_queue_info: l1_message_start_index.into() };
+    let payload = PayloadData {
+        blocks: l2_blocks,
+        l1_message_queue_info: l1_message_start_index.into(),
+        skipped_l1_message_bitmap,
+    };
 
     Ok(Batch::new(version, Some(chunks_block_count), payload))
 }

crates/codec/src/decoding/v1/mod.rs

@@ -50,7 +50,13 @@ pub fn decode_v2(calldata: &[u8], blob: &[u8]) -> Result<Batch, DecodingError> {
     // clone buf and move pass chunk information.
     buf.advance(TRANSACTION_DATA_BLOB_INDEX_OFFSET);
 
-    decode_v1_chunk(call.version(), l1_message_start_index, chunks, buf)
+    decode_v1_chunk(
+        call.version(),
+        call.skipped_l1_message_bitmap(),
+        l1_message_start_index,
+        chunks,
+        buf,
+    )
 }
 
 #[cfg(test)]