@aztec/archiver 0.28.1 → 0.30.0

package/src/archiver/data_retrieval.ts

@@ -1,30 +1,26 @@
-import { Body, L1ToL2Message, NewInboxLeaf } from '@aztec/circuit-types';
-import { AppendOnlyTreeSnapshot, Fr, Header } from '@aztec/circuits.js';
+import { Body, InboxLeaf } from '@aztec/circuit-types';
+import { AppendOnlyTreeSnapshot, Header } from '@aztec/circuits.js';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
 import { PublicClient } from 'viem';
 
 import {
-  getL1ToL2MessageCancelledLogs,
   getL2BlockProcessedLogs,
   getLeafInsertedLogs,
-  getPendingL1ToL2MessageLogs,
   getTxsPublishedLogs,
-  processCancelledL1ToL2MessagesLogs,
   processL2BlockProcessedLogs,
   processLeafInsertedLogs,
-  processPendingL1ToL2MessageAddedLogs,
   processTxsPublishedLogs,
 } from './eth_log_handlers.js';
 
 /**
  * Data retrieved from logs
  */
-type DataRetrieval<T> = {
+export type DataRetrieval<T> = {
   /**
-   * The next block number.
+   * Blocknumber of the last L1 block from which we obtained data.
    */
-  nextEthBlockNumber: bigint;
+  lastProcessedL1BlockNumber: bigint;
   /**
    * The data returned.
    */
@@ -39,7 +35,7 @@ type DataRetrieval<T> = {
  * @param searchStartBlock - The block number to use for starting the search.
  * @param searchEndBlock - The highest block number that we should search up to.
  * @param expectedNextL2BlockNum - The next L2 block number that we expect to find.
- * @returns An array of tuples representing block metadata including the header, archive tree snapshot, and associated l1 block number; as well as the next eth block to search from.
+ * @returns An array of tuples representing block metadata including the header, archive tree snapshot; as well as the next eth block to search from.
  */
 export async function retrieveBlockMetadataFromRollup(
   publicClient: PublicClient,
@@ -48,8 +44,8 @@ export async function retrieveBlockMetadataFromRollup(
   searchStartBlock: bigint,
   searchEndBlock: bigint,
   expectedNextL2BlockNum: bigint,
-): Promise<DataRetrieval<[Header, AppendOnlyTreeSnapshot, bigint]>> {
-  const retrievedBlockMetadata: [Header, AppendOnlyTreeSnapshot, bigint][] = [];
+): Promise<DataRetrieval<[Header, AppendOnlyTreeSnapshot]>> {
+  const retrievedBlockMetadata: [Header, AppendOnlyTreeSnapshot][] = [];
   do {
     if (searchStartBlock > searchEndBlock) {
       break;
@@ -73,7 +69,7 @@ export async function retrieveBlockMetadataFromRollup(
     searchStartBlock = l2BlockProcessedLogs[l2BlockProcessedLogs.length - 1].blockNumber! + 1n;
     expectedNextL2BlockNum += BigInt(newBlockMetadata.length);
   } while (blockUntilSynced && searchStartBlock <= searchEndBlock);
-  return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedBlockMetadata };
+  return { lastProcessedL1BlockNumber: searchStartBlock - 1n, retrievedData: retrievedBlockMetadata };
 }
 
 /**
@@ -112,116 +108,38 @@ export async function retrieveBlockBodiesFromAvailabilityOracle(
     retrievedBlockBodies.push(...newBlockBodies);
     searchStartBlock = l2TxsPublishedLogs[l2TxsPublishedLogs.length - 1].blockNumber! + 1n;
   } while (blockUntilSynced && searchStartBlock <= searchEndBlock);
-  return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedBlockBodies };
+  return { lastProcessedL1BlockNumber: searchStartBlock - 1n, retrievedData: retrievedBlockBodies };
 }
 
 /**
- * Fetch new pending L1 to L2 messages.
+ * Fetch L1 to L2 messages.
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param inboxAddress - The address of the inbox contract to fetch messages from.
  * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
  * @param searchStartBlock - The block number to use for starting the search.
  * @param searchEndBlock - The highest block number that we should search up to.
- * @returns An array of L1ToL2Message and next eth block to search from.
+ * @returns An array of InboxLeaf and next eth block to search from.
  */
-export async function retrieveNewPendingL1ToL2Messages(
+export async function retrieveL1ToL2Messages(
   publicClient: PublicClient,
   inboxAddress: EthAddress,
   blockUntilSynced: boolean,
   searchStartBlock: bigint,
   searchEndBlock: bigint,
-): Promise<DataRetrieval<[L1ToL2Message, bigint]>> {
-  const retrievedNewL1ToL2Messages: [L1ToL2Message, bigint][] = [];
+): Promise<DataRetrieval<InboxLeaf>> {
+  const retrievedL1ToL2Messages: InboxLeaf[] = [];
   do {
     if (searchStartBlock > searchEndBlock) {
       break;
     }
-    const newL1ToL2MessageLogs = await getPendingL1ToL2MessageLogs(
-      publicClient,
-      inboxAddress,
-      searchStartBlock,
-      searchEndBlock,
-    );
-    if (newL1ToL2MessageLogs.length === 0) {
-      break;
-    }
-    const newL1ToL2Messages = processPendingL1ToL2MessageAddedLogs(newL1ToL2MessageLogs);
-    retrievedNewL1ToL2Messages.push(...newL1ToL2Messages);
-    // handles the case when there are no new messages:
-    searchStartBlock = (newL1ToL2MessageLogs.findLast(msgLog => !!msgLog)?.blockNumber || searchStartBlock) + 1n;
-  } while (blockUntilSynced && searchStartBlock <= searchEndBlock);
-  return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedNewL1ToL2Messages };
-}
-
-/**
- * Fetch new L1 to L2 messages.
- * @param publicClient - The viem public client to use for transaction retrieval.
- * @param newInboxAddress - The address of the inbox contract to fetch messages from.
- * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
- * @param searchStartBlock - The block number to use for starting the search.
- * @param searchEndBlock - The highest block number that we should search up to.
- * @returns An array of NewInboxLeaf and next eth block to search from.
- */
-export async function retrieveNewL1ToL2Messages(
-  publicClient: PublicClient,
-  newInboxAddress: EthAddress,
-  blockUntilSynced: boolean,
-  searchStartBlock: bigint,
-  searchEndBlock: bigint,
-): Promise<DataRetrieval<NewInboxLeaf>> {
-  const retrievedNewL1ToL2Messages: NewInboxLeaf[] = [];
-  do {
-    if (searchStartBlock > searchEndBlock) {
-      break;
-    }
-    const leafInsertedLogs = await getLeafInsertedLogs(publicClient, newInboxAddress, searchStartBlock, searchEndBlock);
+    const leafInsertedLogs = await getLeafInsertedLogs(publicClient, inboxAddress, searchStartBlock, searchEndBlock);
     if (leafInsertedLogs.length === 0) {
       break;
     }
-    const newL1ToL2Messages = processLeafInsertedLogs(leafInsertedLogs);
-    retrievedNewL1ToL2Messages.push(...newL1ToL2Messages);
+    const l1ToL2Messages = processLeafInsertedLogs(leafInsertedLogs);
+    retrievedL1ToL2Messages.push(...l1ToL2Messages);
     // handles the case when there are no new messages:
     searchStartBlock = (leafInsertedLogs.findLast(msgLog => !!msgLog)?.blockNumber || searchStartBlock) + 1n;
   } while (blockUntilSynced && searchStartBlock <= searchEndBlock);
-  return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedNewL1ToL2Messages };
-}
-
-/**
- * Fetch newly cancelled L1 to L2 messages.
- * @param publicClient - The viem public client to use for transaction retrieval.
- * @param inboxAddress - The address of the inbox contract to fetch messages from.
- * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
- * @param searchStartBlock - The block number to use for starting the search.
- * @param searchEndBlock - The highest block number that we should search up to.
- * @returns An array of entry keys that were cancelled and next eth block to search from.
- * TODO(#4492): Nuke the following when purging the old inbox
- */
-export async function retrieveNewCancelledL1ToL2Messages(
-  publicClient: PublicClient,
-  inboxAddress: EthAddress,
-  blockUntilSynced: boolean,
-  searchStartBlock: bigint,
-  searchEndBlock: bigint,
-): Promise<DataRetrieval<[Fr, bigint]>> {
-  const retrievedNewCancelledL1ToL2Messages: [Fr, bigint][] = [];
-  do {
-    if (searchStartBlock > searchEndBlock) {
-      break;
-    }
-    const newL1ToL2MessageCancelledLogs = await getL1ToL2MessageCancelledLogs(
-      publicClient,
-      inboxAddress,
-      searchStartBlock,
-      searchEndBlock,
-    );
-    if (newL1ToL2MessageCancelledLogs.length === 0) {
-      break;
-    }
-    const newCancelledL1ToL2Messages = processCancelledL1ToL2MessagesLogs(newL1ToL2MessageCancelledLogs);
-    retrievedNewCancelledL1ToL2Messages.push(...newCancelledL1ToL2Messages);
-    // handles the case when there are no new messages:
-    searchStartBlock =
-      (newL1ToL2MessageCancelledLogs.findLast(msgLog => !!msgLog)?.blockNumber || searchStartBlock) + 1n;
-  } while (blockUntilSynced && searchStartBlock <= searchEndBlock);
-  return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedNewCancelledL1ToL2Messages };
+  return { lastProcessedL1BlockNumber: searchStartBlock - 1n, retrievedData: retrievedL1ToL2Messages };
 }

package/src/archiver/eth_log_handlers.ts

@@ -1,10 +1,9 @@
-import { Body, L1Actor, L1ToL2Message, L2Actor, NewInboxLeaf } from '@aztec/circuit-types';
+import { Body, InboxLeaf } from '@aztec/circuit-types';
 import { AppendOnlyTreeSnapshot, Header } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { numToUInt32BE } from '@aztec/foundation/serialize';
-import { AvailabilityOracleAbi, InboxAbi, NewInboxAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { AvailabilityOracleAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 
 import { Hex, Log, PublicClient, decodeFunctionData, getAbiItem, getAddress, hexToBytes } from 'viem';
 
@@ -14,72 +13,29 @@ import { Hex, Log, PublicClient, decodeFunctionData, getAbiItem, getAddress, hex
  * @returns Array of all processed LeafInserted logs
  */
 export function processLeafInsertedLogs(
-  logs: Log<bigint, number, false, undefined, true, typeof NewInboxAbi, 'LeafInserted'>[],
-): NewInboxLeaf[] {
-  const leaves: NewInboxLeaf[] = [];
+  logs: Log<bigint, number, false, undefined, true, typeof InboxAbi, 'LeafInserted'>[],
+): InboxLeaf[] {
+  const leaves: InboxLeaf[] = [];
   for (const log of logs) {
     const { blockNumber, index, value } = log.args;
-    leaves.push(new NewInboxLeaf(blockNumber, index, Fr.fromString(value)));
+    leaves.push(new InboxLeaf(blockNumber, index, Fr.fromString(value)));
   }
   return leaves;
 }
 
-/**
- * Processes newly received MessageAdded (L1 to L2) logs.
- * @param logs - MessageAdded logs.
- * @returns Array of all Pending L1 to L2 messages that were processed
- */
-export function processPendingL1ToL2MessageAddedLogs(
-  logs: Log<bigint, number, false, undefined, true, typeof InboxAbi, 'MessageAdded'>[],
-): [L1ToL2Message, bigint][] {
-  const l1ToL2Messages: [L1ToL2Message, bigint][] = [];
-  for (const log of logs) {
-    const { sender, senderChainId, recipient, recipientVersion, content, secretHash, deadline, fee, entryKey } =
-      log.args;
-    l1ToL2Messages.push([
-      new L1ToL2Message(
-        new L1Actor(EthAddress.fromString(sender), Number(senderChainId)),
-        new L2Actor(AztecAddress.fromString(recipient), Number(recipientVersion)),
-        Fr.fromString(content),
-        Fr.fromString(secretHash),
-        deadline,
-        Number(fee),
-        Fr.fromString(entryKey),
-      ),
-      log.blockNumber!,
-    ]);
-  }
-  return l1ToL2Messages;
-}
-
-/**
- * Process newly received L1ToL2MessageCancelled logs.
- * @param logs - L1ToL2MessageCancelled logs.
- * @returns Array of entry keys of the L1 to L2 messages that were cancelled
- */
-export function processCancelledL1ToL2MessagesLogs(
-  logs: Log<bigint, number, false, undefined, true, typeof InboxAbi, 'L1ToL2MessageCancelled'>[],
-): [Fr, bigint][] {
-  const cancelledL1ToL2Messages: [Fr, bigint][] = [];
-  for (const log of logs) {
-    cancelledL1ToL2Messages.push([Fr.fromString(log.args.entryKey), log.blockNumber!]);
-  }
-  return cancelledL1ToL2Messages;
-}
-
 /**
  * Processes newly received L2BlockProcessed logs.
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param expectedL2BlockNumber - The next expected L2 block number.
  * @param logs - L2BlockProcessed logs.
- * @returns - An array of tuples representing block metadata including the header, archive tree snapshot, and associated l1 block number.
+ * @returns - An array of tuples representing block metadata including the header, archive tree snapshot.
  */
 export async function processL2BlockProcessedLogs(
   publicClient: PublicClient,
   expectedL2BlockNumber: bigint,
   logs: Log<bigint, number, false, undefined, true, typeof RollupAbi, 'L2BlockProcessed'>[],
-): Promise<[Header, AppendOnlyTreeSnapshot, bigint][]> {
-  const retrievedBlockMetadata: [Header, AppendOnlyTreeSnapshot, bigint][] = [];
+): Promise<[Header, AppendOnlyTreeSnapshot][]> {
+  const retrievedBlockMetadata: [Header, AppendOnlyTreeSnapshot][] = [];
   for (const log of logs) {
     const blockNum = log.args.blockNumber;
     if (blockNum !== expectedL2BlockNumber) {
@@ -92,7 +48,7 @@ export async function processL2BlockProcessedLogs(
       log.args.blockNumber,
     );
 
-    retrievedBlockMetadata.push([header, archive, log.blockNumber!]);
+    retrievedBlockMetadata.push([header, archive]);
     expectedL2BlockNumber++;
   }
 
@@ -235,73 +191,23 @@ export function getTxsPublishedLogs(
 }
 
 /**
- * Get relevant `MessageAdded` logs emitted by Inbox on chain.
- * @param publicClient - The viem public client to use for transaction retrieval.
- * @param inboxAddress - The address of the inbox contract.
- * @param fromBlock - First block to get logs from (inclusive).
- * @param toBlock - Last block to get logs from (inclusive).
- * @returns An array of `MessageAdded` logs.
- */
-export function getPendingL1ToL2MessageLogs(
-  publicClient: PublicClient,
-  inboxAddress: EthAddress,
-  fromBlock: bigint,
-  toBlock: bigint,
-): Promise<Log<bigint, number, false, undefined, true, typeof InboxAbi, 'MessageAdded'>[]> {
-  return publicClient.getLogs({
-    address: getAddress(inboxAddress.toString()),
-    event: getAbiItem({
-      abi: InboxAbi,
-      name: 'MessageAdded',
-    }),
-    fromBlock,
-    toBlock: toBlock + 1n, // the toBlock argument in getLogs is exclusive
-  });
-}
-
-/**
- * Get relevant `L1ToL2MessageCancelled` logs emitted by Inbox on chain when pending messages are cancelled
+ * Get relevant `LeafInserted` logs emitted by Inbox on chain.
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param inboxAddress - The address of the inbox contract.
  * @param fromBlock - First block to get logs from (inclusive).
  * @param toBlock - Last block to get logs from (inclusive).
- * @returns An array of `L1ToL2MessageCancelled` logs.
+ * @returns An array of `LeafInserted` logs.
  */
-export function getL1ToL2MessageCancelledLogs(
+export function getLeafInsertedLogs(
   publicClient: PublicClient,
   inboxAddress: EthAddress,
   fromBlock: bigint,
   toBlock: bigint,
-): Promise<Log<bigint, number, false, undefined, true, typeof InboxAbi, 'L1ToL2MessageCancelled'>[]> {
+): Promise<Log<bigint, number, false, undefined, true, typeof InboxAbi, 'LeafInserted'>[]> {
   return publicClient.getLogs({
     address: getAddress(inboxAddress.toString()),
     event: getAbiItem({
       abi: InboxAbi,
-      name: 'L1ToL2MessageCancelled',
-    }),
-    fromBlock,
-    toBlock: toBlock + 1n, // the toBlock argument in getLogs is exclusive
-  });
-}
-
-/**
- * Get relevant `LeafInserted` logs emitted by NewInbox on chain.
- * @param publicClient - The viem public client to use for transaction retrieval.
- * @param newInboxAddress - The address of the new inbox contract.
- * @param fromBlock - First block to get logs from (inclusive).
- * @param toBlock - Last block to get logs from (inclusive).
- * @returns An array of `LeafInserted` logs.
- */
-export function getLeafInsertedLogs(
-  publicClient: PublicClient,
-  newInboxAddress: EthAddress,
-  fromBlock: bigint,
-  toBlock: bigint,
-): Promise<Log<bigint, number, false, undefined, true, typeof NewInboxAbi, 'LeafInserted'>[]> {
-  return publicClient.getLogs({
-    address: getAddress(newInboxAddress.toString()),
-    event: getAbiItem({
-      abi: NewInboxAbi,
       name: 'LeafInserted',
     }),
     fromBlock,

package/src/archiver/kv_archiver_store/block_store.ts

@@ -1,14 +1,14 @@
 import { L2Block, TxEffect, TxHash, TxReceipt, TxStatus } from '@aztec/circuit-types';
 import { AppendOnlyTreeSnapshot, AztecAddress, Header, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { AztecKVStore, AztecMap, Range } from '@aztec/kv-store';
+import { AztecKVStore, AztecMap, AztecSingleton, Range } from '@aztec/kv-store';
 
+import { DataRetrieval } from '../data_retrieval.js';
 import { BlockBodyStore } from './block_body_store.js';
 
 type BlockIndexValue = [blockNumber: number, index: number];
 
 type BlockStorage = {
-  l1BlockNumber: bigint;
   header: Buffer;
   archive: Buffer;
 };
@@ -19,6 +19,8 @@ type BlockStorage = {
 export class BlockStore {
   /** Map block number to block data */
   #blocks: AztecMap<number, BlockStorage>;
+  /** Stores L1 block number in which the last processed L2 block was included */
+  #lastSynchedL1Block: AztecSingleton<bigint>;
 
   /** Index mapping transaction hash (as a string) to its location in a block */
   #txIndex: AztecMap<string, BlockIndexValue>;
@@ -36,20 +38,20 @@ export class BlockStore {
     this.#blocks = db.openMap('archiver_blocks');
     this.#txIndex = db.openMap('archiver_tx_index');
     this.#contractIndex = db.openMap('archiver_contract_index');
+    this.#lastSynchedL1Block = db.openSingleton('archiver_last_synched_l1_block');
   }
 
   /**
    * Append new blocks to the store's list.
-   * @param blocks - The L2 blocks to be added to the store.
+   * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
    * @returns True if the operation is successful.
    */
-  addBlocks(blocks: L2Block[]): Promise<boolean> {
+  addBlocks(blocks: DataRetrieval<L2Block>): Promise<boolean> {
     return this.db.transaction(() => {
-      for (const block of blocks) {
+      for (const block of blocks.retrievedData) {
         void this.#blocks.set(block.number, {
           header: block.header.toBuffer(),
           archive: block.archive.toBuffer(),
-          l1BlockNumber: block.getL1BlockNumber(),
         });
 
         block.getTxs().forEach((tx, i) => {
@@ -57,6 +59,8 @@ export class BlockStore {
         });
       }
 
+      void this.#lastSynchedL1Block.set(blocks.lastProcessedL1BlockNumber);
+
       return true;
     });
   }
@@ -155,7 +159,7 @@ export class BlockStore {
    * Gets the number of the latest L2 block processed.
    * @returns The number of the latest L2 block processed.
    */
-  getBlockNumber(): number {
+  getSynchedL2BlockNumber(): number {
     const [lastBlockNumber] = this.#blocks.keys({ reverse: true, limit: 1 });
     return typeof lastBlockNumber === 'number' ? lastBlockNumber : INITIAL_L2_BLOCK_NUM - 1;
   }
@@ -164,13 +168,8 @@ export class BlockStore {
    * Gets the most recent L1 block processed.
    * @returns The L1 block that published the latest L2 block
    */
-  getL1BlockNumber(): bigint {
-    const [lastBlock] = this.#blocks.values({ reverse: true, limit: 1 });
-    if (!lastBlock) {
-      return 0n;
-    } else {
-      return lastBlock.l1BlockNumber;
-    }
+  getSynchedL1BlockNumber(): bigint {
+    return this.#lastSynchedL1Block.get() ?? 0n;
   }
 
   #computeBlockRange(start: number, limit: number): Required<Pick<Range<number>, 'start' | 'end'>> {

package/src/archiver/kv_archiver_store/kv_archiver_store.ts

@@ -1,13 +1,11 @@
 import {
   Body,
-  ExtendedContractData,
   GetUnencryptedLogsResponse,
-  L1ToL2Message,
+  InboxLeaf,
   L2Block,
   L2BlockL2Logs,
   LogFilter,
   LogType,
-  NewInboxLeaf,
   TxEffect,
   TxHash,
   TxReceipt,
@@ -19,11 +17,11 @@ import { AztecKVStore } from '@aztec/kv-store';
 import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
 
 import { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js';
+import { DataRetrieval } from '../data_retrieval.js';
 import { BlockBodyStore } from './block_body_store.js';
 import { BlockStore } from './block_store.js';
 import { ContractClassStore } from './contract_class_store.js';
 import { ContractInstanceStore } from './contract_instance_store.js';
-import { ContractStore } from './contract_store.js';
 import { LogStore } from './log_store.js';
 import { MessageStore } from './message_store.js';
 
@@ -34,7 +32,6 @@ export class KVArchiverDataStore implements ArchiverDataStore {
   #blockStore: BlockStore;
   #blockBodyStore: BlockBodyStore;
   #logStore: LogStore;
-  #contractStore: ContractStore;
   #messageStore: MessageStore;
   #contractClassStore: ContractClassStore;
   #contractInstanceStore: ContractInstanceStore;
@@ -45,7 +42,6 @@ export class KVArchiverDataStore implements ArchiverDataStore {
     this.#blockBodyStore = new BlockBodyStore(db);
     this.#blockStore = new BlockStore(db, this.#blockBodyStore);
     this.#logStore = new LogStore(db, this.#blockStore, logsMaxPageSize);
-    this.#contractStore = new ContractStore(db, this.#blockStore);
     this.#messageStore = new MessageStore(db);
     this.#contractClassStore = new ContractClassStore(db);
     this.#contractInstanceStore = new ContractInstanceStore(db);
@@ -92,10 +88,10 @@ export class KVArchiverDataStore implements ArchiverDataStore {
 
   /**
    * Append new blocks to the store's list.
-   * @param blocks - The L2 blocks to be added to the store.
+   * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
    * @returns True if the operation is successful.
    */
-  addBlocks(blocks: L2Block[]): Promise<boolean> {
+  addBlocks(blocks: DataRetrieval<L2Block>): Promise<boolean> {
     return this.#blockStore.addBlocks(blocks);
   }
 
@@ -149,76 +145,31 @@ export class KVArchiverDataStore implements ArchiverDataStore {
   }
 
   /**
-   * Append new L1 to L2 messages to the store.
-   * @param messages - The L1 to L2 messages to be added to the store.
-   * @param lastMessageL1BlockNumber - The L1 block number in which the last message was emitted.
+   * Append L1 to L2 messages to the store.
+   * @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
    * @returns True if the operation is successful.
    */
-  addNewL1ToL2Messages(messages: NewInboxLeaf[], lastMessageL1BlockNumber: bigint): Promise<boolean> {
-    return Promise.resolve(this.#messageStore.addNewL1ToL2Messages(messages, lastMessageL1BlockNumber));
+  addL1ToL2Messages(messages: DataRetrieval<InboxLeaf>): Promise<boolean> {
+    return Promise.resolve(this.#messageStore.addL1ToL2Messages(messages));
   }
 
   /**
-   * Append new pending L1 to L2 messages to the store.
-   * @param messages - The L1 to L2 messages to be added to the store.
-   * @param l1BlockNumber - The L1 block number for which to add the messages.
-   * @returns True if the operation is successful.
-   */
-  addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean> {
-    return Promise.resolve(this.#messageStore.addPendingMessages(messages, l1BlockNumber));
-  }
-
-  /**
-   * Remove pending L1 to L2 messages from the store (if they were cancelled).
-   * @param messages - The entry keys to be removed from the store.
-   * @param l1BlockNumber - The L1 block number for which to remove the messages.
-   * @returns True if the operation is successful.
-   */
-  cancelPendingL1ToL2EntryKeys(messages: Fr[], l1BlockNumber: bigint): Promise<boolean> {
-    return Promise.resolve(this.#messageStore.cancelPendingMessages(messages, l1BlockNumber));
-  }
-
-  /**
-   * Messages that have been published in an L2 block are confirmed.
-   * Add them to the confirmed store, also remove them from the pending store.
-   * @param entryKeys - The entry keys to be removed from the store.
-   * @param blockNumber - The block for which to add the messages.
-   * @returns True if the operation is successful.
-   */
-  confirmL1ToL2EntryKeys(entryKeys: Fr[]): Promise<boolean> {
-    return this.#messageStore.confirmPendingMessages(entryKeys);
-  }
-
-  /**
-   * Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
-   * @param limit - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
-   * @returns The requested L1 to L2 entry keys.
-   */
-  getPendingL1ToL2EntryKeys(limit: number): Promise<Fr[]> {
-    return Promise.resolve(this.#messageStore.getPendingEntryKeysByFee(limit));
-  }
-
-  /**
-   * Gets the confirmed L1 to L2 message corresponding to the given entry key.
-   * @param entryKey - The entry key to look up.
-   * @returns The requested L1 to L2 message or throws if not found.
+   * Gets the L1 to L2 message index in the L1 to L2 message tree.
+   * @param l1ToL2Message - The L1 to L2 message.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
    */
-  getConfirmedL1ToL2Message(entryKey: Fr): Promise<L1ToL2Message> {
-    try {
-      return Promise.resolve(this.#messageStore.getConfirmedMessage(entryKey));
-    } catch (err) {
-      return Promise.reject(err);
-    }
+  public getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined> {
+    return Promise.resolve(this.#messageStore.getL1ToL2MessageIndex(l1ToL2Message));
   }
 
   /**
-   * Gets new L1 to L2 message (to be) included in a given block.
+   * Gets L1 to L2 message (to be) included in a given block.
    * @param blockNumber - L2 block number to get messages for.
    * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
    */
-  getNewL1ToL2Messages(blockNumber: bigint): Promise<Fr[]> {
+  getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]> {
     try {
-      return Promise.resolve(this.#messageStore.getNewL1ToL2Messages(blockNumber));
+      return Promise.resolve(this.#messageStore.getL1ToL2Messages(blockNumber));
     } catch (err) {
       return Promise.reject(err);
     }
@@ -252,44 +203,23 @@ export class KVArchiverDataStore implements ArchiverDataStore {
     }
   }
 
-  /**
-   * Add new extended contract data from an L2 block to the store's list.
-   * @param data - List of contracts' data to be added.
-   * @param blockNum - Number of the L2 block the contract data was deployed in.
-   * @returns True if the operation is successful.
-   */
-  addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean> {
-    return this.#contractStore.addExtendedContractData(data, blockNum);
-  }
-
-  /**
-   * Get the extended contract data for this contract.
-   * @param contractAddress - The contract data address.
-   * @returns The extended contract data or undefined if not found.
-   */
-  getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
-    return Promise.resolve(this.#contractStore.getExtendedContractData(contractAddress));
-  }
-
   /**
    * Gets the number of the latest L2 block processed.
    * @returns The number of the latest L2 block processed.
    */
-  getBlockNumber(): Promise<number> {
-    return Promise.resolve(this.#blockStore.getBlockNumber());
+  getSynchedL2BlockNumber(): Promise<number> {
+    return Promise.resolve(this.#blockStore.getSynchedL2BlockNumber());
   }
 
   /**
    * Gets the last L1 block number processed by the archiver
    */
-  getL1BlockNumber(): Promise<ArchiverL1SynchPoint> {
-    const addedBlock = this.#blockStore.getL1BlockNumber();
-    const { addedMessages, cancelledMessages, newMessages } = this.#messageStore.getL1BlockNumber();
+  getSynchedL1BlockNumbers(): Promise<ArchiverL1SynchPoint> {
+    const blocks = this.#blockStore.getSynchedL1BlockNumber();
+    const messages = this.#messageStore.getSynchedL1BlockNumber();
     return Promise.resolve({
-      addedBlock,
-      addedMessages,
-      newMessages,
-      cancelledMessages,
+      blocks,
+      messages,
     });
   }
 }