@aztec/archiver 3.0.0-nightly.20251208 → 3.0.0-nightly.20251210

package/src/archiver/kv_archiver_store/message_store.ts

@@ -1,6 +1,7 @@
 import type { L1BlockId } from '@aztec/ethereum';
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -113,20 +114,20 @@ export class MessageStore {
           );
         }
 
-        // Check index corresponds to the L2 block number.
-        const [expectedStart, expectedEnd] = InboxLeaf.indexRangeFromL2Block(message.l2BlockNumber);
+        // Check index corresponds to the checkpoint number.
+        const [expectedStart, expectedEnd] = InboxLeaf.indexRangeForCheckpoint(message.checkpointNumber);
         if (message.index < expectedStart || message.index >= expectedEnd) {
           throw new MessageStoreError(
             `Invalid index ${message.index} for incoming L1 to L2 message ${message.leaf.toString()} ` +
-              `at block ${message.l2BlockNumber} (expected value in range [${expectedStart}, ${expectedEnd}))`,
+              `at checkpoint ${message.checkpointNumber} (expected value in range [${expectedStart}, ${expectedEnd}))`,
             message,
           );
         }
 
-        // Check there are no gaps in the indices within the same block.
+        // Check there are no gaps in the indices within the same checkpoint.
         if (
           lastMessage &&
-          message.l2BlockNumber === lastMessage.l2BlockNumber &&
+          message.checkpointNumber === lastMessage.checkpointNumber &&
           message.index !== lastMessage.index + 1n
         ) {
           throw new MessageStoreError(
@@ -138,12 +139,12 @@ export class MessageStore {
 
         // Check the first message in a block has the correct index.
         if (
-          (!lastMessage || message.l2BlockNumber > lastMessage.l2BlockNumber) &&
-          message.index !== InboxLeaf.smallestIndexFromL2Block(message.l2BlockNumber)
+          (!lastMessage || message.checkpointNumber > lastMessage.checkpointNumber) &&
+          message.index !== expectedStart
         ) {
           throw new MessageStoreError(
-            `Message ${message.leaf.toString()} for L2 block ${message.l2BlockNumber} has wrong index ` +
-              `${message.index} (expected ${InboxLeaf.smallestIndexFromL2Block(message.l2BlockNumber)})`,
+            `Message ${message.leaf.toString()} for checkpoint ${message.checkpointNumber} has wrong index ` +
+              `${message.index} (expected ${expectedStart})`,
             message,
           );
         }
@@ -184,10 +185,10 @@ export class MessageStore {
     return msg ? deserializeInboxMessage(msg) : undefined;
   }
 
-  public async getL1ToL2Messages(blockNumber: number): Promise<Fr[]> {
+  public async getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]> {
     const messages: Fr[] = [];
 
-    const [startIndex, endIndex] = InboxLeaf.indexRangeFromL2Block(blockNumber);
+    const [startIndex, endIndex] = InboxLeaf.indexRangeForCheckpoint(checkpointNumber);
     let lastIndex = startIndex - 1n;
 
     for await (const msgBuffer of this.#l1ToL2Messages.valuesAsync({
@@ -195,8 +196,10 @@ export class MessageStore {
       end: this.indexToKey(endIndex),
     })) {
       const msg = deserializeInboxMessage(msgBuffer);
-      if (msg.l2BlockNumber !== blockNumber) {
-        throw new Error(`L1 to L2 message with index ${msg.index} has invalid block number ${msg.l2BlockNumber}`);
+      if (msg.checkpointNumber !== checkpointNumber) {
+        throw new Error(
+          `L1 to L2 message with index ${msg.index} has invalid checkpoint number ${msg.checkpointNumber}`,
+        );
       } else if (msg.index !== lastIndex + 1n) {
         throw new Error(`Expected L1 to L2 message with index ${lastIndex + 1n} but got ${msg.index}`);
       }
@@ -232,9 +235,9 @@ export class MessageStore {
     });
   }
 
-  public rollbackL1ToL2MessagesToL2Block(targetBlockNumber: number): Promise<void> {
-    this.#log.debug(`Deleting L1 to L2 messages up to target L2 block ${targetBlockNumber}`);
-    const startIndex = InboxLeaf.smallestIndexFromL2Block(targetBlockNumber + 1);
+  public rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber: CheckpointNumber): Promise<void> {
+    this.#log.debug(`Deleting L1 to L2 messages up to target checkpoint ${targetCheckpointNumber}`);
+    const startIndex = InboxLeaf.smallestIndexForCheckpoint(CheckpointNumber(targetCheckpointNumber + 1));
     return this.removeL1ToL2Messages(startIndex);
   }
 

package/src/archiver/structs/inbox_message.ts

@@ -1,14 +1,13 @@
-import { BlockNumber } from '@aztec/foundation/branded-types';
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
-import { keccak256 } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { keccak256 } from '@aztec/foundation/crypto/keccak';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, bigintToUInt64BE, numToUInt32BE, serializeToBuffer } from '@aztec/foundation/serialize';
 
 export type InboxMessage = {
   index: bigint;
   leaf: Fr;
-  // TODO: should be checkpointNumber
-  l2BlockNumber: BlockNumber;
+  checkpointNumber: CheckpointNumber;
   l1BlockNumber: bigint; // L1 block number - NOT Aztec L2
   l1BlockHash: Buffer32;
   rollingHash: Buffer16;
@@ -25,7 +24,7 @@ export function serializeInboxMessage(message: InboxMessage): Buffer {
     message.leaf,
     message.l1BlockHash,
     numToUInt32BE(Number(message.l1BlockNumber)),
-    numToUInt32BE(message.l2BlockNumber),
+    numToUInt32BE(message.checkpointNumber),
     message.rollingHash,
   ]);
 }
@@ -36,7 +35,7 @@ export function deserializeInboxMessage(buffer: Buffer): InboxMessage {
   const leaf = reader.readObject(Fr);
   const l1BlockHash = reader.readObject(Buffer32);
   const l1BlockNumber = BigInt(reader.readNumber());
-  const l2BlockNumber = BlockNumber(reader.readNumber());
+  const checkpointNumber = CheckpointNumber(reader.readNumber());
   const rollingHash = reader.readObject(Buffer16);
-  return { index, leaf, l1BlockHash, l1BlockNumber, l2BlockNumber, rollingHash };
+  return { index, leaf, l1BlockHash, l1BlockNumber, checkpointNumber, rollingHash };
 }

package/src/test/mock_archiver.ts

@@ -1,5 +1,5 @@
 import type { CheckpointNumber } from '@aztec/foundation/branded-types';
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { L2Block, type L2BlockSource } from '@aztec/stdlib/block';
 import type { Checkpoint } from '@aztec/stdlib/checkpoint';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
@@ -13,22 +13,17 @@ import { MockL2BlockSource } from './mock_l2_block_source.js';
 export class MockArchiver extends MockL2BlockSource implements L2BlockSource, L1ToL2MessageSource {
   private messageSource = new MockL1ToL2MessageSource(0);
 
-  public setL1ToL2Messages(blockNumber: number, msgs: Fr[]) {
-    this.messageSource.setL1ToL2Messages(blockNumber, msgs);
+  public setL1ToL2Messages(checkpointNumber: CheckpointNumber, msgs: Fr[]) {
+    this.messageSource.setL1ToL2Messages(checkpointNumber, msgs);
   }
 
-  getL1ToL2Messages(blockNumber: number): Promise<Fr[]> {
-    return this.messageSource.getL1ToL2Messages(blockNumber);
+  getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]> {
+    return this.messageSource.getL1ToL2Messages(checkpointNumber);
   }
 
   getL1ToL2MessageIndex(_l1ToL2Message: Fr): Promise<bigint | undefined> {
     return this.messageSource.getL1ToL2MessageIndex(_l1ToL2Message);
   }
-
-  getL1ToL2MessagesForCheckpoint(checkpointNumber: CheckpointNumber): Promise<Fr[]> {
-    // TODO: Implement this properly. This only works when we have one block per checkpoint.
-    return this.messageSource.getL1ToL2Messages(checkpointNumber);
-  }
 }
 
 /**
@@ -48,7 +43,7 @@ export class MockPrefilledArchiver extends MockArchiver {
       if (checkpoint.blocks.length !== 1) {
         throw new Error('Prefilled checkpoint must only have 1 block at the moment.');
       }
-      this.setL1ToL2Messages(checkpoint.blocks[0].number, messages);
+      this.setL1ToL2Messages(checkpoint.number, messages);
     }
   }
 

package/src/test/mock_l1_to_l2_message_source.ts

@@ -1,5 +1,5 @@
 import { BlockNumber, type CheckpointNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { L2Tips } from '@aztec/stdlib/block';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 
@@ -7,25 +7,20 @@ import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
  * A mocked implementation of L1ToL2MessageSource to be used in tests.
  */
 export class MockL1ToL2MessageSource implements L1ToL2MessageSource {
-  private messagesPerBlock = new Map<number, Fr[]>();
+  private messagesPerCheckpoint = new Map<CheckpointNumber, Fr[]>();
 
   constructor(private blockNumber: number) {}
 
-  public setL1ToL2Messages(blockNumber: number, msgs: Fr[]) {
-    this.messagesPerBlock.set(blockNumber, msgs);
+  public setL1ToL2Messages(checkpointNumber: CheckpointNumber, msgs: Fr[]) {
+    this.messagesPerCheckpoint.set(checkpointNumber, msgs);
   }
 
   public setBlockNumber(blockNumber: number) {
     this.blockNumber = blockNumber;
   }
 
-  getL1ToL2MessagesForCheckpoint(checkpointNumber: CheckpointNumber): Promise<Fr[]> {
-    // TODO: Implement this properly. This only works when we have one block per checkpoint.
-    return this.getL1ToL2Messages(checkpointNumber);
-  }
-
-  getL1ToL2Messages(blockNumber: number): Promise<Fr[]> {
-    return Promise.resolve(this.messagesPerBlock.get(blockNumber) ?? []);
+  getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]> {
+    return Promise.resolve(this.messagesPerCheckpoint.get(checkpointNumber) ?? []);
   }
 
   getL1ToL2MessageIndex(_l1ToL2Message: Fr): Promise<bigint | undefined> {

package/src/test/mock_l2_block_source.ts

@@ -2,8 +2,8 @@ import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
 import { DefaultL1ContractsConfig } from '@aztec/ethereum';
 import { BlockNumber, CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import type { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';

package/src/test/mock_structs.ts

@@ -1,7 +1,7 @@
-import { BlockNumber } from '@aztec/foundation/branded-types';
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
-import { randomBigInt, randomInt } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { randomBigInt, randomInt } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { InboxLeaf } from '@aztec/stdlib/messaging';
 
 import { type InboxMessage, updateRollingHash } from '../archiver/structs/inbox_message.js';
@@ -10,17 +10,17 @@ export function makeInboxMessage(
   previousRollingHash = Buffer16.ZERO,
   overrides: Partial<InboxMessage> = {},
 ): InboxMessage {
-  const { l2BlockNumber = randomInt(100) + 1 } = overrides;
+  const { checkpointNumber = CheckpointNumber(randomInt(100) + 1) } = overrides;
   const { l1BlockNumber = randomBigInt(100n) + 1n } = overrides;
   const { l1BlockHash = Buffer32.random() } = overrides;
   const { leaf = Fr.random() } = overrides;
   const { rollingHash = updateRollingHash(previousRollingHash, leaf) } = overrides;
-  const { index = InboxLeaf.smallestIndexFromL2Block(l2BlockNumber) } = overrides;
+  const { index = InboxLeaf.smallestIndexForCheckpoint(checkpointNumber) } = overrides;
 
   return {
     index,
     leaf,
-    l2BlockNumber: BlockNumber(l2BlockNumber),
+    checkpointNumber,
     l1BlockNumber,
     l1BlockHash,
     rollingHash,
@@ -31,17 +31,17 @@ export function makeInboxMessages(
   count: number,
   opts: {
     initialHash?: Buffer16;
-    initialL2BlockNumber?: number;
+    initialCheckpointNumber?: CheckpointNumber;
     overrideFn?: (msg: InboxMessage, index: number) => InboxMessage;
   } = {},
 ): InboxMessage[] {
-  const { initialHash = Buffer16.ZERO, overrideFn = msg => msg, initialL2BlockNumber = 1 } = opts;
+  const { initialHash = Buffer16.ZERO, overrideFn = msg => msg, initialCheckpointNumber = 1 } = opts;
   const messages: InboxMessage[] = [];
   let rollingHash = initialHash;
   for (let i = 0; i < count; i++) {
     const leaf = Fr.random();
-    const l2BlockNumber = BlockNumber(i + initialL2BlockNumber);
-    const message = overrideFn(makeInboxMessage(rollingHash, { leaf, l2BlockNumber }), i);
+    const checkpointNumber = CheckpointNumber(i + initialCheckpointNumber);
+    const message = overrideFn(makeInboxMessage(rollingHash, { leaf, checkpointNumber }), i);
     rollingHash = message.rollingHash;
     messages.push(message);
   }