@aztec/world-state 0.0.1-commit.d3ec352c → 0.0.1-commit.fcb71a6

package/src/test/utils.ts

@@ -4,81 +4,89 @@ import {
   NULLIFIER_SUBTREE_HEIGHT,
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
 } from '@aztec/constants';
-import { BlockNumber, type CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { asyncMap } from '@aztec/foundation/async-map';
+import { BlockNumber, type CheckpointNumber } from '@aztec/foundation/branded-types';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { L2BlockNew } from '@aztec/stdlib/block';
-import { Checkpoint } from '@aztec/stdlib/checkpoint';
 import type {
   IndexedTreeId,
   MerkleTreeReadOperations,
   MerkleTreeWriteOperations,
 } from '@aztec/stdlib/interfaces/server';
-import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
+import { mockCheckpointAndMessages, mockL1ToL2Messages } from '@aztec/stdlib/testing';
 import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
+import { BlockHeader } from '@aztec/stdlib/tx';
 
 import type { NativeWorldStateService } from '../native/native_world_state.js';
 
-export async function mockBlock(
-  blockNum: BlockNumber,
-  size: number,
-  fork: MerkleTreeWriteOperations,
-  maxEffects: number | undefined = 1000, // Defaults to the maximum tx effects.
-  numL1ToL2Messages: number = NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-  isFirstBlock: boolean = true,
-) {
-  const l2Block = await L2BlockNew.random(blockNum, { txsPerBlock: size, txOptions: { maxEffects } });
-  const l1ToL2Messages = mockL1ToL2Messages(numL1ToL2Messages);
+export async function updateBlockState(block: L2BlockNew, l1ToL2Messages: Fr[], fork: MerkleTreeWriteOperations) {
+  const insertData = async (
+    treeId: IndexedTreeId,
+    data: Buffer[][],
+    subTreeHeight: number,
+    fork: MerkleTreeWriteOperations,
+  ) => {
+    for (const dataBatch of data) {
+      await fork.batchInsert(treeId, dataBatch, subTreeHeight);
+    }
+  };
 
-  {
-    const insertData = async (
-      treeId: IndexedTreeId,
-      data: Buffer[][],
-      subTreeHeight: number,
-      fork: MerkleTreeWriteOperations,
-    ) => {
-      for (const dataBatch of data) {
-        await fork.batchInsert(treeId, dataBatch, subTreeHeight);
-      }
-    };
-
-    const publicDataInsert = insertData(
-      MerkleTreeId.PUBLIC_DATA_TREE,
-      l2Block.body.txEffects.map(txEffect => txEffect.publicDataWrites.map(write => write.toBuffer())),
-      0,
-      fork,
-    );
-    const nullifierInsert = insertData(
-      MerkleTreeId.NULLIFIER_TREE,
-      l2Block.body.txEffects.map(txEffect =>
-        padArrayEnd(txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX).map(nullifier => nullifier.toBuffer()),
-      ),
-      NULLIFIER_SUBTREE_HEIGHT,
-      fork,
-    );
-    const noteHashesPadded = l2Block.body.txEffects.flatMap(txEffect =>
-      padArrayEnd(txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX),
-    );
-
-    const l1ToL2MessagesPadded = isFirstBlock
+  const publicDataInsert = insertData(
+    MerkleTreeId.PUBLIC_DATA_TREE,
+    block.body.txEffects.map(txEffect => txEffect.publicDataWrites.map(write => write.toBuffer())),
+    0,
+    fork,
+  );
+  const nullifierInsert = insertData(
+    MerkleTreeId.NULLIFIER_TREE,
+    block.body.txEffects.map(txEffect =>
+      padArrayEnd(txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX).map(nullifier => nullifier.toBuffer()),
+    ),
+    NULLIFIER_SUBTREE_HEIGHT,
+    fork,
+  );
+  const noteHashesPadded = block.body.txEffects.flatMap(txEffect =>
+    padArrayEnd(txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX),
+  );
+
+  const l1ToL2MessagesPadded =
+    block.indexWithinCheckpoint === 0
       ? padArrayEnd<Fr, number>(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP)
       : l1ToL2Messages;
 
-    const noteHashInsert = fork.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, noteHashesPadded);
-    const messageInsert = fork.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
-    await Promise.all([publicDataInsert, nullifierInsert, noteHashInsert, messageInsert]);
-  }
+  const noteHashInsert = fork.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, noteHashesPadded);
+  const messageInsert = fork.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
+  await Promise.all([publicDataInsert, nullifierInsert, noteHashInsert, messageInsert]);
 
   const state = await fork.getStateReference();
-  l2Block.header.state = state;
-  await fork.updateArchive(l2Block.header);
+  block.header = BlockHeader.from({ ...block.header, state });
+  await fork.updateArchive(block.header);
 
   const archiveState = await fork.getTreeInfo(MerkleTreeId.ARCHIVE);
 
-  l2Block.archive = new AppendOnlyTreeSnapshot(Fr.fromBuffer(archiveState.root), Number(archiveState.size));
+  block.archive = new AppendOnlyTreeSnapshot(Fr.fromBuffer(archiveState.root), Number(archiveState.size));
+}
+
+export async function mockBlock(
+  blockNum: BlockNumber,
+  size: number,
+  fork: MerkleTreeWriteOperations,
+  maxEffects: number | undefined = 1000, // Defaults to the maximum tx effects.
+  numL1ToL2Messages: number = NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+  isFirstBlockInCheckpoint: boolean = true,
+) {
+  const block = await L2BlockNew.random(blockNum, {
+    indexWithinCheckpoint: isFirstBlockInCheckpoint ? 0 : 1,
+    txsPerBlock: size,
+    txOptions: { maxEffects },
+  });
+  const l1ToL2Messages = mockL1ToL2Messages(numL1ToL2Messages);
+
+  await updateBlockState(block, l1ToL2Messages, fork);
 
   return {
-    block: l2Block,
+    block,
     messages: l1ToL2Messages,
   };
 }
@@ -89,44 +97,7 @@ export async function mockEmptyBlock(blockNum: BlockNumber, fork: MerkleTreeWrit
 
   l2Block.header.globalVariables.blockNumber = blockNum;
 
-  // Sync the append only trees
-  {
-    const noteHashesPadded = l2Block.body.txEffects.flatMap(txEffect =>
-      padArrayEnd(txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX),
-    );
-    await fork.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, noteHashesPadded);
-
-    const l1ToL2MessagesPadded = padArrayEnd<Fr, number>(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-    await fork.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
-  }
-
-  // Sync the indexed trees
-  {
-    // We insert the public data tree leaves with one batch per tx to avoid updating the same key twice
-    for (const txEffect of l2Block.body.txEffects) {
-      await fork.batchInsert(
-        MerkleTreeId.PUBLIC_DATA_TREE,
-        txEffect.publicDataWrites.map(write => write.toBuffer()),
-        0,
-      );
-
-      const nullifiersPadded = padArrayEnd(txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX);
-
-      await fork.batchInsert(
-        MerkleTreeId.NULLIFIER_TREE,
-        nullifiersPadded.map(nullifier => nullifier.toBuffer()),
-        NULLIFIER_SUBTREE_HEIGHT,
-      );
-    }
-  }
-
-  const state = await fork.getStateReference();
-  l2Block.header.state = state;
-  await fork.updateArchive(l2Block.header);
-
-  const archiveState = await fork.getTreeInfo(MerkleTreeId.ARCHIVE);
-
-  l2Block.archive = new AppendOnlyTreeSnapshot(Fr.fromBuffer(archiveState.root), Number(archiveState.size));
+  await updateBlockState(l2Block, l1ToL2Messages, fork);
 
   return {
     block: l2Block,
@@ -155,44 +126,15 @@ export async function mockBlocks(
   return { blocks, messages: messagesArray };
 }
 
-export function mockL1ToL2Messages(numL1ToL2Messages: number) {
-  return Array(numL1ToL2Messages).fill(0).map(Fr.random);
-}
-
 export async function mockCheckpoint(
   checkpointNumber: CheckpointNumber,
-  {
-    startBlockNumber = BlockNumber(1),
-    numBlocks = 1,
-    numTxsPerBlock = 1,
-    numL1ToL2Messages = 1,
-    fork,
-  }: {
-    startBlockNumber?: BlockNumber;
-    numBlocks?: number;
-    numTxsPerBlock?: number;
-    numL1ToL2Messages?: number;
-    fork?: MerkleTreeWriteOperations;
-  } = {},
+  fork: MerkleTreeWriteOperations,
+  options: Partial<Parameters<typeof mockCheckpointAndMessages>[1]> = {},
 ) {
-  const slotNumber = SlotNumber(checkpointNumber * 10);
-  const blocksAndMessages = [];
-  for (let i = 0; i < numBlocks; i++) {
-    const blockNumber = BlockNumber(startBlockNumber + i);
-    const { block, messages } = fork
-      ? await mockBlock(blockNumber, numTxsPerBlock, fork, blockNumber === startBlockNumber ? numL1ToL2Messages : 0)
-      : {
-          block: await L2BlockNew.random(blockNumber, { txsPerBlock: numTxsPerBlock, slotNumber }),
-          messages: mockL1ToL2Messages(numL1ToL2Messages),
-        };
-    blocksAndMessages.push({ block, messages });
-  }
-
-  const messages = blocksAndMessages[0].messages;
-  const inHash = computeInHashFromL1ToL2Messages(messages);
-  const checkpoint = await Checkpoint.random(checkpointNumber, { numBlocks: 0, slotNumber, inHash });
-  checkpoint.blocks = blocksAndMessages.map(({ block }) => block);
-
+  const { checkpoint, messages } = await mockCheckpointAndMessages(checkpointNumber, options);
+  await asyncMap(checkpoint.blocks, async (block, i) => {
+    await updateBlockState(block, i === 0 ? messages : [], fork);
+  });
   return { checkpoint, messages };
 }
 

package/src/testing.ts

@@ -1,5 +1,5 @@
 import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-juice';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { MerkleTreeId, PublicDataTreeLeaf } from '@aztec/stdlib/trees';

package/src/world-state-db/merkle_tree_db.ts

@@ -1,9 +1,13 @@
 import { MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX } from '@aztec/constants';
-import { BlockNumber } from '@aztec/foundation/branded-types';
-import type { Fr } from '@aztec/foundation/fields';
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { IndexedTreeSnapshot, TreeSnapshot } from '@aztec/merkle-tree';
 import type { L2BlockNew } from '@aztec/stdlib/block';
-import type { ForkMerkleTreeOperations, MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
+import type {
+  ForkMerkleTreeOperations,
+  MerkleTreeReadOperations,
+  ReadonlyWorldStateAccess,
+} from '@aztec/stdlib/interfaces/server';
 import type { MerkleTreeId } from '@aztec/stdlib/trees';
 
 import type { WorldStateStatusFull, WorldStateStatusSummary } from '../native/message.js';
@@ -35,19 +39,13 @@ export type TreeSnapshots = {
   [MerkleTreeId.ARCHIVE]: TreeSnapshot<Fr>;
 };
 
-export interface MerkleTreeAdminDatabase extends ForkMerkleTreeOperations {
+export interface MerkleTreeAdminDatabase extends ForkMerkleTreeOperations, ReadonlyWorldStateAccess {
   /**
    * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
    * @param block - The L2 block to handle.
    * @param l1ToL2Messages - The L1 to L2 messages for the block.
-   * @param isFirstBlock - Whether the block is the first block in a checkpoint. The messages are padded and inserted
-   * to the tree for the first block in a checkpoint.
    */
-  handleL2BlockAndMessages(
-    block: L2BlockNew,
-    l1ToL2Messages: Fr[],
-    isFirstBlock: boolean,
-  ): Promise<WorldStateStatusFull>;
+  handleL2BlockAndMessages(block: L2BlockNew, l1ToL2Messages: Fr[]): Promise<WorldStateStatusFull>;
 
   /**
    * Gets a handle that allows reading the latest committed state

package/dest/synchronizer/utils.d.ts

@@ -1,11 +0,0 @@
-import type { Fr } from '@aztec/foundation/fields';
-import type { L2BlockNew, L2BlockSource } from '@aztec/stdlib/block';
-import { type L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-/**
- * Determine which blocks in the given array are the first block in a checkpoint.
- * @param blocks - The candidate blocks, sorted by block number in ascending order.
- * @param l2BlockSource - The L2 block source to use to fetch the checkpoints, block headers and L1->L2 messages.
- * @returns A map of block numbers that begin a checkpoint to the L1->L2 messages for that checkpoint.
- */
-export declare function findFirstBlocksInCheckpoints(blocks: L2BlockNew[], l2BlockSource: L2BlockSource & L1ToL2MessageSource): Promise<Map<number, Fr[]>>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zeW5jaHJvbml6ZXIvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXJFLE9BQU8sRUFBRSxLQUFLLG1CQUFtQixFQUFtQyxNQUFNLHlCQUF5QixDQUFDO0FBRXBHOzs7OztHQUtHO0FBQ0gsd0JBQXNCLDRCQUE0QixDQUNoRCxNQUFNLEVBQUUsVUFBVSxFQUFFLEVBQ3BCLGFBQWEsRUFBRSxhQUFhLEdBQUcsbUJBQW1CLEdBQ2pELE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FtRTVCIn0=

package/dest/synchronizer/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/synchronizer/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAErE,OAAO,EAAE,KAAK,mBAAmB,EAAmC,MAAM,yBAAyB,CAAC;AAEpG;;;;;GAKG;AACH,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,UAAU,EAAE,EACpB,aAAa,EAAE,aAAa,GAAG,mBAAmB,GACjD,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,CAmE5B"}

package/dest/synchronizer/utils.js

@@ -1,59 +0,0 @@
-import { BlockNumber } from '@aztec/foundation/branded-types';
-import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
-/**
- * Determine which blocks in the given array are the first block in a checkpoint.
- * @param blocks - The candidate blocks, sorted by block number in ascending order.
- * @param l2BlockSource - The L2 block source to use to fetch the checkpoints, block headers and L1->L2 messages.
- * @returns A map of block numbers that begin a checkpoint to the L1->L2 messages for that checkpoint.
- */ export async function findFirstBlocksInCheckpoints(blocks, l2BlockSource) {
-    // Select the blocks that are the final block within each group of identical slot numbers.
-    let seenSlot;
-    const maybeLastBlocks = [
-        ...blocks
-    ].reverse().filter((b)=>{
-        if (b.header.globalVariables.slotNumber !== seenSlot) {
-            seenSlot = b.header.globalVariables.slotNumber;
-            return true;
-        }
-        return false;
-    }).reverse();
-    // Try to fetch the checkpoints for those blocks. If undefined (which should only occur for blocks.at(-1)),
-    // then the block is not the last one in a checkpoint.
-    // If we are not checking the inHashes below, only blocks.at(-1) would need its checkpoint header fetched.
-    const checkpointedBlocks = (await Promise.all(maybeLastBlocks.map(async (b)=>({
-            blockNumber: b.number,
-            // A checkpoint's archive root is the archive root of its last block.
-            checkpoint: await l2BlockSource.getCheckpointByArchive(b.archive.root)
-        })))).filter((b)=>b.checkpoint !== undefined);
-    // Verify that the L1->L2 messages hash to the checkpoint's inHash.
-    const checkpointedL1ToL2Messages = await Promise.all(checkpointedBlocks.map((b)=>l2BlockSource.getL1ToL2MessagesForCheckpoint(b.checkpoint.number)));
-    checkpointedBlocks.forEach((b, i)=>{
-        const computedInHash = computeInHashFromL1ToL2Messages(checkpointedL1ToL2Messages[i]);
-        const inHash = b.checkpoint.header.contentCommitment.inHash;
-        if (!computedInHash.equals(inHash)) {
-            throw new Error('Obtained L1 to L2 messages failed to be hashed to the checkpoint inHash');
-        }
-    });
-    // Compute the first block numbers, which should be right after each checkpointed block. Exclude blocks that haven't
-    // been added yet.
-    const firstBlockNumbers = checkpointedBlocks.map((b)=>BlockNumber(b.blockNumber + 1)).filter((n)=>n <= blocks.at(-1).number);
-    // Check if blocks[0] is the first block in a checkpoint.
-    if (blocks[0].number === 1) {
-        firstBlockNumbers.push(blocks[0].number);
-    } else {
-        const lastBlockHeader = await l2BlockSource.getBlockHeader(BlockNumber(blocks[0].number - 1));
-        if (!lastBlockHeader) {
-            throw new Error(`Failed to get block ${blocks[0].number - 1}`);
-        }
-        if (lastBlockHeader.globalVariables.slotNumber !== blocks[0].header.globalVariables.slotNumber) {
-            firstBlockNumbers.push(blocks[0].number);
-        }
-    }
-    // Fetch the L1->L2 messages for the first blocks and assign them to the map.
-    const messagesByBlockNumber = new Map();
-    await Promise.all(firstBlockNumbers.map(async (blockNumber)=>{
-        const l1ToL2Messages = await l2BlockSource.getL1ToL2Messages(blockNumber);
-        messagesByBlockNumber.set(blockNumber, l1ToL2Messages);
-    }));
-    return messagesByBlockNumber;
-}

package/src/synchronizer/utils.ts

@@ -1,83 +0,0 @@
-import { BlockNumber, type SlotNumber } from '@aztec/foundation/branded-types';
-import type { Fr } from '@aztec/foundation/fields';
-import type { L2BlockNew, L2BlockSource } from '@aztec/stdlib/block';
-import type { Checkpoint } from '@aztec/stdlib/checkpoint';
-import { type L1ToL2MessageSource, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
-
-/**
- * Determine which blocks in the given array are the first block in a checkpoint.
- * @param blocks - The candidate blocks, sorted by block number in ascending order.
- * @param l2BlockSource - The L2 block source to use to fetch the checkpoints, block headers and L1->L2 messages.
- * @returns A map of block numbers that begin a checkpoint to the L1->L2 messages for that checkpoint.
- */
-export async function findFirstBlocksInCheckpoints(
-  blocks: L2BlockNew[],
-  l2BlockSource: L2BlockSource & L1ToL2MessageSource,
-): Promise<Map<number, Fr[]>> {
-  // Select the blocks that are the final block within each group of identical slot numbers.
-  let seenSlot: SlotNumber | undefined;
-  const maybeLastBlocks = [...blocks]
-    .reverse()
-    .filter(b => {
-      if (b.header.globalVariables.slotNumber !== seenSlot) {
-        seenSlot = b.header.globalVariables.slotNumber;
-        return true;
-      }
-      return false;
-    })
-    .reverse();
-
-  // Try to fetch the checkpoints for those blocks. If undefined (which should only occur for blocks.at(-1)),
-  // then the block is not the last one in a checkpoint.
-  // If we are not checking the inHashes below, only blocks.at(-1) would need its checkpoint header fetched.
-  const checkpointedBlocks = (
-    await Promise.all(
-      maybeLastBlocks.map(async b => ({
-        blockNumber: b.number,
-        // A checkpoint's archive root is the archive root of its last block.
-        checkpoint: await l2BlockSource.getCheckpointByArchive(b.archive.root),
-      })),
-    )
-  ).filter(b => b.checkpoint !== undefined) as { blockNumber: BlockNumber; checkpoint: Checkpoint }[];
-
-  // Verify that the L1->L2 messages hash to the checkpoint's inHash.
-  const checkpointedL1ToL2Messages: Fr[][] = await Promise.all(
-    checkpointedBlocks.map(b => l2BlockSource.getL1ToL2MessagesForCheckpoint(b.checkpoint!.number)),
-  );
-  checkpointedBlocks.forEach((b, i) => {
-    const computedInHash = computeInHashFromL1ToL2Messages(checkpointedL1ToL2Messages[i]);
-    const inHash = b.checkpoint.header.contentCommitment.inHash;
-    if (!computedInHash.equals(inHash)) {
-      throw new Error('Obtained L1 to L2 messages failed to be hashed to the checkpoint inHash');
-    }
-  });
-
-  // Compute the first block numbers, which should be right after each checkpointed block. Exclude blocks that haven't
-  // been added yet.
-  const firstBlockNumbers = checkpointedBlocks
-    .map(b => BlockNumber(b.blockNumber + 1))
-    .filter(n => n <= blocks.at(-1)!.number);
-  // Check if blocks[0] is the first block in a checkpoint.
-  if (blocks[0].number === 1) {
-    firstBlockNumbers.push(blocks[0].number);
-  } else {
-    const lastBlockHeader = await l2BlockSource.getBlockHeader(BlockNumber(blocks[0].number - 1));
-    if (!lastBlockHeader) {
-      throw new Error(`Failed to get block ${blocks[0].number - 1}`);
-    }
-    if (lastBlockHeader.globalVariables.slotNumber !== blocks[0].header.globalVariables.slotNumber) {
-      firstBlockNumbers.push(blocks[0].number);
-    }
-  }
-
-  // Fetch the L1->L2 messages for the first blocks and assign them to the map.
-  const messagesByBlockNumber = new Map<BlockNumber, Fr[]>();
-  await Promise.all(
-    firstBlockNumbers.map(async blockNumber => {
-      const l1ToL2Messages = await l2BlockSource.getL1ToL2Messages(blockNumber);
-      messagesByBlockNumber.set(blockNumber, l1ToL2Messages);
-    }),
-  );
-
-  return messagesByBlockNumber;
-}