@aztec/archiver 0.0.1-commit.993d240 → 0.0.1-commit.9a89641

package/src/test/mock_l2_block_source.ts

@@ -38,16 +38,11 @@ import {
   PublishedCheckpoint,
 } from '@aztec/stdlib/checkpoint';
 import type { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import {
-  EmptyL1RollupConstants,
-  type L1RollupConstants,
-  getEpochAtSlot,
-  getSlotRangeForEpoch,
-} from '@aztec/stdlib/epoch-helpers';
+import { EmptyL1RollupConstants, type L1RollupConstants, getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 import { computeCheckpointOutHash } from '@aztec/stdlib/messaging';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
-import { BlockHeader, TxExecutionResult, TxHash, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
+import { BlockHeader, TxHash } from '@aztec/stdlib/tx';
 import type { UInt64 } from '@aztec/stdlib/types';
 
 /**
@@ -60,7 +55,6 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
   private provenBlockNumber: number = 0;
   private finalizedBlockNumber: number = 0;
   private checkpointedBlockNumber: number = 0;
-  private proposedCheckpointBlockNumber: number = 0;
 
   private initialHeader: BlockHeader = BlockHeader.empty();
   private initialHeaderHash: BlockHash = GENESIS_BLOCK_HEADER_HASH;
@@ -169,7 +163,6 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
     });
     // Keep tip numbers consistent with remaining blocks.
     this.checkpointedBlockNumber = Math.min(this.checkpointedBlockNumber, maxBlockNum);
-    this.proposedCheckpointBlockNumber = Math.min(this.proposedCheckpointBlockNumber, maxBlockNum);
     this.provenBlockNumber = Math.min(this.provenBlockNumber, maxBlockNum);
     this.finalizedBlockNumber = Math.min(this.finalizedBlockNumber, maxBlockNum);
     this.log.verbose(`Removed ${numBlocks} blocks from the mock L2 block source`);
@@ -186,17 +179,9 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
     this.finalizedBlockNumber = finalizedBlockNumber;
   }
 
-  public setProposedCheckpointBlockNumber(blockNumber: number) {
-    this.proposedCheckpointBlockNumber = blockNumber;
-  }
-
   public setCheckpointedBlockNumber(checkpointedBlockNumber: number) {
     const prevCheckpointed = this.checkpointedBlockNumber;
     this.checkpointedBlockNumber = checkpointedBlockNumber;
-    // Proposed checkpoint is always at least as advanced as checkpointed
-    if (this.proposedCheckpointBlockNumber < checkpointedBlockNumber) {
-      this.proposedCheckpointBlockNumber = checkpointedBlockNumber;
-    }
     // Auto-create single-block checkpoints for newly checkpointed blocks that don't have one yet.
     // This handles blocks added via addProposedBlocks that are now being marked as checkpointed.
     const newCheckpoints: Checkpoint[] = [];
@@ -260,10 +245,6 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
     return block ? block.header.globalVariables.blockNumber : undefined;
   }
 
-  public getProposedCheckpointL2BlockNumber() {
-    return Promise.resolve(BlockNumber(this.proposedCheckpointBlockNumber));
-  }
-
   public getCheckpoint(query: CheckpointQuery): Promise<PublishedCheckpoint | undefined> {
     const checkpoint = this.resolveCheckpointQuery(query);
     if (!checkpoint) {
@@ -342,6 +323,13 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
     if ('from' in query) {
       return this.checkpointList.slice(query.from - 1, query.from - 1 + query.limit);
     }
+    if ('fromSlot' in query) {
+      const matching = this.checkpointList.filter(c =>
+        query.reverse ? c.header.slotNumber <= query.fromSlot : c.header.slotNumber >= query.fromSlot,
+      );
+      const nearestFirst = query.reverse ? matching.reverse() : matching;
+      return nearestFirst.slice(0, query.limit);
+    }
     return this.getCheckpointsInEpoch(query.epoch);
   }
 
@@ -368,49 +356,27 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
       l2BlockNumber: block.number,
       l2BlockHash: await block.hash(),
       txIndexInBlock: block.body.txEffects.findIndex(t => t.txHash.equals(txHash)),
+      slotNumber: block.header.globalVariables.slotNumber,
     };
   }
 
-  /**
-   * Gets a receipt of a settled tx.
-   * @param txHash - The hash of a tx we try to get the receipt for.
-   * @returns The requested tx receipt (or undefined if not found).
-   */
-  public async getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined> {
-    for (const block of this.l2Blocks) {
-      for (const txEffect of block.body.txEffects) {
-        if (txEffect.txHash.equals(txHash)) {
-          // In mock, assume all txs are checkpointed with successful execution
-          return new TxReceipt(
-            txHash,
-            TxStatus.CHECKPOINTED,
-            TxExecutionResult.SUCCESS,
-            undefined,
-            txEffect.transactionFee.toBigInt(),
-            await block.hash(),
-            block.number,
-            getEpochAtSlot(block.slot, EmptyL1RollupConstants),
-          );
-        }
-      }
-    }
-    return undefined;
+  public getL2ToL1MembershipWitness(): Promise<undefined> {
+    // Mock does not back the L2-to-L1 message witness flow.
+    return Promise.resolve(undefined);
   }
 
   async getL2Tips(): Promise<L2Tips> {
-    const [latest, proven, finalized, checkpointed, proposedCheckpoint] = [
+    const [latest, proven, finalized, checkpointed] = [
       await this.getBlockNumber(),
       this.provenBlockNumber,
       this.finalizedBlockNumber,
       this.checkpointedBlockNumber,
-      await this.getProposedCheckpointL2BlockNumber(),
     ] as const;
 
     const latestBlock = this.l2Blocks[latest - 1];
     const provenBlock = this.l2Blocks[proven - 1];
     const finalizedBlock = this.l2Blocks[finalized - 1];
     const checkpointedBlock = this.l2Blocks[checkpointed - 1];
-    const proposedCheckpointBlock = this.l2Blocks[proposedCheckpoint - 1];
 
     // For genesis tips (block number 0) report the dynamic initial header hash so consumers
     // running L2BlockStream against this mock agree at block 0 with their local tip store.
@@ -438,10 +404,6 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
       number: BlockNumber(checkpointed),
       hash: await tipHash(checkpointedBlock, checkpointed),
     };
-    const proposedCheckpointBlockId = {
-      number: BlockNumber(proposedCheckpoint),
-      hash: await tipHash(proposedCheckpointBlock, proposedCheckpoint),
-    };
 
     const makeTipId = (blockId: typeof latestBlockId) => {
       const checkpointNumber = this.findCheckpointNumberForBlock(blockId.number) ?? CheckpointNumber(0);
@@ -460,7 +422,6 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
       checkpointed: makeTipId(checkpointedBlockId),
       proven: makeTipId(provenBlockId),
       finalized: makeTipId(finalizedBlockId),
-      proposedCheckpoint: makeTipId(proposedCheckpointBlockId),
     };
   }
 

package/src/test/mock_structs.ts

@@ -269,7 +269,10 @@ export function makePublicLogTag(blockNumber: number, txIndex: number, logIndex:
 }
 
 /** Creates a PublicLog with fields derived from the tag. */
-export function makePublicLog(tag: Tag, contractAddress: AztecAddress = AztecAddress.fromNumber(543254)): PublicLog {
+export function makePublicLog(
+  tag: Tag,
+  contractAddress: AztecAddress = AztecAddress.fromNumberUnsafe(543254),
+): PublicLog {
   return PublicLog.from({
     contractAddress,
     fields: new Array(10).fill(null).map((_, i) => (!i ? tag.value : new Fr(tag.value.toBigInt() + BigInt(i)))),
@@ -281,7 +284,7 @@ export function makePublicLogs(
   blockNumber: number,
   txIndex: number,
   numLogsPerTx: number,
-  contractAddress: AztecAddress = AztecAddress.fromNumber(543254),
+  contractAddress: AztecAddress = AztecAddress.fromNumberUnsafe(543254),
 ): PublicLog[] {
   return times(numLogsPerTx, logIndex => {
     const tag = makePublicLogTag(blockNumber, txIndex, logIndex);

package/src/test/noop_l1_archiver.ts

@@ -1,6 +1,5 @@
 import type { BlobClientInterface } from '@aztec/blob-client/client';
-import { EpochCache } from '@aztec/epoch-cache';
-import type { RollupContract } from '@aztec/ethereum/contracts';
+import type { OutboxContract, RollupContract } from '@aztec/ethereum/contracts';
 import type { ViemPublicClient, ViemPublicDebugClient } from '@aztec/ethereum/types';
 import { SlotNumber } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
@@ -8,7 +7,7 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { FunctionsOf } from '@aztec/foundation/types';
-import type { ArchiverEmitter, BlockHash } from '@aztec/stdlib/block';
+import type { ArchiverEmitter, BlockHash, L2Block } from '@aztec/stdlib/block';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import type { BlockHeader } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Tracer, getTelemetryClient } from '@aztec/telemetry-client';
@@ -22,6 +21,10 @@ import type { ArchiverL1Synchronizer } from '../modules/l1_synchronizer.js';
 import type { ArchiverDataStores } from '../store/data_stores.js';
 import { L2TipsCache } from '../store/l2_tips_cache.js';
 
+type NoopL1ArchiverConfigOverrides = Partial<{
+  skipOrphanProposedBlockPruning: boolean;
+}>;
+
 /** Noop L1 synchronizer for testing without L1 connectivity. */
 class NoopL1Synchronizer implements FunctionsOf<ArchiverL1Synchronizer> {
   public readonly tracer: Tracer;
@@ -40,8 +43,8 @@ class NoopL1Synchronizer implements FunctionsOf<ArchiverL1Synchronizer> {
   testEthereumNodeSynced(): Promise<void> {
     return Promise.resolve();
   }
-  syncFromL1(_initialSyncComplete: boolean): Promise<void> {
-    return Promise.resolve();
+  syncFromL1(_initialSyncComplete: boolean): Promise<L2Block[]> {
+    return Promise.resolve([]);
   }
 }
 
@@ -58,11 +61,14 @@ export class NoopL1Archiver extends Archiver {
     initialHeader: BlockHeader,
     initialBlockHash: BlockHash,
     l2TipsCache: L2TipsCache,
+    dateProvider: DateProvider = new DateProvider(),
+    configOverrides: NoopL1ArchiverConfigOverrides = {},
   ) {
     // Create mocks for L1 clients
     const publicClient = mock<ViemPublicClient>();
     const debugClient = mock<ViemPublicDebugClient>();
     const rollup = mock<RollupContract>();
+    const outbox = mock<OutboxContract>();
     const blobClient = mock<BlobClientInterface>();
 
     // Mock methods called during start()
@@ -71,13 +77,12 @@ export class NoopL1Archiver extends Archiver {
 
     const events = new EventEmitter() as ArchiverEmitter;
     const synchronizer = new NoopL1Synchronizer(instrumentation.tracer);
-    const epochCache = mock<EpochCache>();
-    epochCache.pipeliningOffset.mockReturnValue(0);
 
     super(
       publicClient,
       debugClient,
       rollup,
+      outbox,
       {
         rollupAddress: EthAddress.ZERO,
         registryAddress: EthAddress.ZERO,
@@ -93,7 +98,11 @@ export class NoopL1Archiver extends Archiver {
         maxAllowedEthClientDriftSeconds: 300,
         ethereumAllowNoDebugHosts: true, // Skip trace validation
         skipHistoricalLogsCheck: true, // Skip historical logs validation
-        orphanProposedBlockPruneGraceSeconds: 2,
+        checkpointProposalSyncGrace: 4,
+        orphanPruneNoProposalTolerance: 1,
+        skipOrphanProposedBlockPruning: true,
+        blockDuration: 2,
+        ...configOverrides,
       },
       blobClient,
       instrumentation,
@@ -103,8 +112,7 @@ export class NoopL1Archiver extends Archiver {
       initialHeader,
       initialBlockHash,
       l2TipsCache,
-      epochCache,
-      new DateProvider(),
+      dateProvider,
     );
   }
 
@@ -127,6 +135,8 @@ export async function createNoopL1Archiver(
   l1Constants: L1RollupConstants & { genesisArchiveRoot: Fr },
   telemetry: TelemetryClient = getTelemetryClient(),
   initialHeader: BlockHeader,
+  dateProvider?: DateProvider,
+  configOverrides?: NoopL1ArchiverConfigOverrides,
 ): Promise<NoopL1Archiver> {
   const instrumentation = await ArchiverInstrumentation.new(telemetry, () => dataStores.db.estimateSize());
   // Mirror the production factory: precompute the dynamic genesis block hash from the injected
@@ -135,5 +145,14 @@ export async function createNoopL1Archiver(
   // with default empty genesis.
   const initialBlockHash = await initialHeader.hash();
   const l2TipsCache = new L2TipsCache(dataStores.blocks, initialBlockHash);
-  return new NoopL1Archiver(dataStores, l1Constants, instrumentation, initialHeader, initialBlockHash, l2TipsCache);
+  return new NoopL1Archiver(
+    dataStores,
+    l1Constants,
+    instrumentation,
+    initialHeader,
+    initialBlockHash,
+    l2TipsCache,
+    dateProvider,
+    configOverrides,
+  );
 }