@aztec/archiver 0.29.0 → 0.30.0

package/src/archiver/eth_log_handlers.ts

@@ -28,14 +28,14 @@ export function processLeafInsertedLogs(
  * @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) {
@@ -48,7 +48,7 @@ export async function processL2BlockProcessedLogs(
       log.args.blockNumber,
     );
 
-    retrievedBlockMetadata.push([header, archive, log.blockNumber!]);
+    retrievedBlockMetadata.push([header, archive]);
     expectedL2BlockNumber++;
   }
 

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;
     });
   }
@@ -165,12 +169,7 @@ export class BlockStore {
    * @returns The L1 block that published the latest L2 block
    */
   getSynchedL1BlockNumber(): bigint {
-    const [lastBlock] = this.#blocks.values({ reverse: true, limit: 1 });
-    if (!lastBlock) {
-      return 0n;
-    } else {
-      return lastBlock.l1BlockNumber;
-    }
+    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

@@ -17,6 +17,7 @@ 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';
@@ -87,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);
   }
 
@@ -145,20 +146,19 @@ export class KVArchiverDataStore implements ArchiverDataStore {
 
   /**
    * Append 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.
+   * @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.
    */
-  addL1ToL2Messages(messages: InboxLeaf[], lastMessageL1BlockNumber: bigint): Promise<boolean> {
-    return Promise.resolve(this.#messageStore.addL1ToL2Messages(messages, lastMessageL1BlockNumber));
+  addL1ToL2Messages(messages: DataRetrieval<InboxLeaf>): Promise<boolean> {
+    return Promise.resolve(this.#messageStore.addL1ToL2Messages(messages));
   }
 
   /**
    * 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.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
    */
-  public getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint> {
+  public getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined> {
     return Promise.resolve(this.#messageStore.getL1ToL2MessageIndex(l1ToL2Message));
   }
 

package/src/archiver/kv_archiver_store/message_store.ts

@@ -8,6 +8,8 @@ import {
 import { createDebugLogger } from '@aztec/foundation/log';
 import { AztecKVStore, AztecMap, AztecSingleton } from '@aztec/kv-store';
 
+import { DataRetrieval } from '../data_retrieval.js';
+
 /**
  * LMDB implementation of the ArchiverDataStore interface.
  */
@@ -36,20 +38,19 @@ export class MessageStore {
 
   /**
    * Append 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.
+   * @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.
    */
-  addL1ToL2Messages(messages: InboxLeaf[], lastMessageL1BlockNumber: bigint): Promise<boolean> {
+  addL1ToL2Messages(messages: DataRetrieval<InboxLeaf>): Promise<boolean> {
     return this.db.transaction(() => {
       const lastL1BlockNumber = this.#lastL1BlockMessages.get() ?? 0n;
-      if (lastL1BlockNumber >= lastMessageL1BlockNumber) {
+      if (lastL1BlockNumber >= messages.lastProcessedL1BlockNumber) {
         return false;
       }
 
-      void this.#lastL1BlockMessages.set(lastMessageL1BlockNumber);
+      void this.#lastL1BlockMessages.set(messages.lastProcessedL1BlockNumber);
 
-      for (const message of messages) {
+      for (const message of messages.retrievedData) {
         if (message.index >= this.#l1ToL2MessagesSubtreeSize) {
           throw new Error(`Message index ${message.index} out of subtree range`);
         }
@@ -69,13 +70,10 @@ export class MessageStore {
   /**
    * 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.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
    */
-  public getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint> {
+  public getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined> {
     const index = this.#l1ToL2MessageIndices.get(l1ToL2Message.toString());
-    if (index === undefined) {
-      throw new Error(`L1 to L2 message index not found in the store for message ${l1ToL2Message.toString()}`);
-    }
     return Promise.resolve(index);
   }
 

package/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts

@@ -52,9 +52,9 @@ export class L1ToL2MessageStore {
   /**
    * 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.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
    */
-  getMessageIndex(l1ToL2Message: Fr): bigint {
+  getMessageIndex(l1ToL2Message: Fr): bigint | undefined {
     for (const [key, message] of this.store.entries()) {
       if (message.equals(l1ToL2Message)) {
         const [blockNumber, messageIndex] = key.split('-');
@@ -64,6 +64,6 @@ export class L1ToL2MessageStore {
         return indexInTheWholeTree;
       }
     }
-    throw new Error(`L1 to L2 message index not found in the store for message ${l1ToL2Message.toString()}`);
+    return undefined;
   }
 }

package/src/archiver/memory_archiver_store/memory_archiver_store.ts

@@ -20,6 +20,7 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
 
 import { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js';
+import { DataRetrieval } from '../data_retrieval.js';
 import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
 
 /**
@@ -62,6 +63,7 @@ export class MemoryArchiverStore implements ArchiverDataStore {
 
   private contractInstances: Map<string, ContractInstanceWithAddress> = new Map();
 
+  private lastL1BlockNewBlocks: bigint = 0n;
   private lastL1BlockNewMessages: bigint = 0n;
 
   constructor(
@@ -97,12 +99,13 @@ export class MemoryArchiverStore implements ArchiverDataStore {
 
   /**
    * Append new blocks to the store's list.
-   * @param blocks - The L2 blocks to be added to the store.
-   * @returns True if the operation is successful (always in this implementation).
+   * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
+   * @returns True if the operation is successful.
    */
-  public addBlocks(blocks: L2Block[]): Promise<boolean> {
-    this.l2BlockContexts.push(...blocks.map(block => new L2BlockContext(block)));
-    this.txEffects.push(...blocks.flatMap(b => b.getTxs()));
+  public addBlocks(blocks: DataRetrieval<L2Block>): Promise<boolean> {
+    this.lastL1BlockNewBlocks = blocks.lastProcessedL1BlockNumber;
+    this.l2BlockContexts.push(...blocks.retrievedData.map(block => new L2BlockContext(block)));
+    this.txEffects.push(...blocks.retrievedData.flatMap(b => b.getTxs()));
     return Promise.resolve(true);
   }
 
@@ -156,17 +159,16 @@ export class MemoryArchiverStore implements ArchiverDataStore {
 
   /**
    * Append 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.
+   * @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.
    */
-  public addL1ToL2Messages(messages: InboxLeaf[], lastMessageL1BlockNumber: bigint): Promise<boolean> {
-    if (lastMessageL1BlockNumber <= this.lastL1BlockNewMessages) {
+  public addL1ToL2Messages(messages: DataRetrieval<InboxLeaf>): Promise<boolean> {
+    if (messages.lastProcessedL1BlockNumber <= this.lastL1BlockNewMessages) {
       return Promise.resolve(false);
     }
 
-    this.lastL1BlockNewMessages = lastMessageL1BlockNumber;
-    for (const message of messages) {
+    this.lastL1BlockNewMessages = messages.lastProcessedL1BlockNumber;
+    for (const message of messages.retrievedData) {
       this.l1ToL2Messages.addMessage(message);
     }
     return Promise.resolve(true);
@@ -175,9 +177,9 @@ export class MemoryArchiverStore implements ArchiverDataStore {
   /**
    * 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.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
    */
-  public getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint> {
+  public getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined> {
     return Promise.resolve(this.l1ToL2Messages.getMessageIndex(l1ToL2Message));
   }
 
@@ -356,12 +358,9 @@ export class MemoryArchiverStore implements ArchiverDataStore {
   }
 
   public getSynchedL1BlockNumbers(): Promise<ArchiverL1SynchPoint> {
-    const blocks = this.l2BlockContexts[this.l2BlockContexts.length - 1]?.block?.getL1BlockNumber() ?? 0n;
-    const messages = this.lastL1BlockNewMessages;
-
     return Promise.resolve({
-      blocks,
-      messages,
+      blocks: this.lastL1BlockNewBlocks,
+      messages: this.lastL1BlockNewMessages,
     });
   }
 }