@aztec/stdlib 0.0.1-commit.f504929 → 0.0.1-commit.f5a9928

package/src/block/l2_block_source.ts

@@ -4,29 +4,115 @@ import {
   CheckpointNumber,
   CheckpointNumberSchema,
   type EpochNumber,
+  EpochNumberSchema,
   type SlotNumber,
+  SlotNumberSchema,
 } from '@aztec/foundation/branded-types';
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
+import { schemas } from '@aztec/foundation/schemas';
 import type { TypedEventEmitter } from '@aztec/foundation/types';
 
 import { z } from 'zod';
 
-import type { Checkpoint } from '../checkpoint/checkpoint.js';
-import type { CheckpointData } from '../checkpoint/checkpoint_data.js';
+import type { CheckpointData, ProposedCheckpointData, ProposedCheckpointInput } from '../checkpoint/checkpoint_data.js';
+import type { CheckpointInfo } from '../checkpoint/checkpoint_info.js';
 import type { PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
 import type { L1RollupConstants } from '../epoch-helpers/index.js';
+import { MAX_RPC_CHECKPOINTS_DATA_LEN } from '../interfaces/api_limit.js';
+import type { L2ToL1MembershipWitness } from '../messaging/l2_to_l1_membership.js';
 import { CheckpointHeader } from '../rollup/checkpoint_header.js';
-import type { BlockHeader } from '../tx/block_header.js';
 import type { IndexedTxEffect } from '../tx/indexed_tx_effect.js';
 import type { TxHash } from '../tx/tx_hash.js';
-import type { TxReceipt } from '../tx/tx_receipt.js';
 import type { BlockData } from './block_data.js';
-import type { BlockHash } from './block_hash.js';
-import type { CheckpointedL2Block } from './checkpointed_l2_block.js';
+import { BlockHash } from './block_hash.js';
+import { BlockTagWithoutLatestSchema, type NormalizedBlockParameter } from './block_parameter.js';
 import type { L2Block } from './l2_block.js';
 import type { ValidateCheckpointNegativeResult, ValidateCheckpointResult } from './validate_block_result.js';
 
+/** Lookup a single block by block number, hash, archive root, or chain-tip tag. */
+export type BlockQuery = NormalizedBlockParameter;
+
+/**
+ * Query a range of blocks by start/limit or by epoch.
+ *
+ * The `epoch` variant requires `onlyCheckpointed: true` because epoch boundaries are only
+ * meaningful for the checkpointed chain — the proposed chain may include uncheckpointed
+ * blocks past the epoch boundary that callers should not receive.
+ */
+export type BlocksQuery =
+  | { from: BlockNumber; limit: number; onlyCheckpointed?: boolean }
+  | { epoch: EpochNumber; onlyCheckpointed: true };
+
+export const BlockQuerySchema: z.ZodType<BlockQuery, unknown> = z.union([
+  z.object({ number: BlockNumberSchema }).strict(),
+  z.object({ hash: BlockHash.schema }).strict(),
+  z.object({ archive: schemas.Fr }).strict(),
+  z.object({ tag: BlockTagWithoutLatestSchema }).strict(),
+]);
+
+export const BlocksQuerySchema: z.ZodType<BlocksQuery, unknown> = z.union([
+  z
+    .object({ from: BlockNumberSchema, limit: z.number().int().min(1), onlyCheckpointed: z.boolean().optional() })
+    .strict(),
+  z.object({ epoch: EpochNumberSchema, onlyCheckpointed: z.literal(true) }).strict(),
+]);
+
+/** Lookup a single confirmed checkpoint by checkpoint number, slot, or chain-tip tag. */
+export type CheckpointQuery =
+  | { number: CheckpointNumber }
+  | { slot: SlotNumber }
+  | { tag: 'checkpointed' | 'proven' | 'finalized' };
+
+/**
+ * Query a range of confirmed checkpoints by start/limit, by slot anchor, or by epoch.
+ *
+ * The `fromSlot` variant walks the slot index: it returns up to `limit` checkpoints anchored at
+ * `fromSlot`, ordered nearest-first. With `reverse` it takes the checkpoints at or before the slot
+ * (descending); otherwise the checkpoints at or after it (ascending). Use `limit: 1, reverse: true`
+ * to find the latest checkpoint at or before a slot in a single range scan.
+ */
+export type CheckpointsQuery =
+  | { from: CheckpointNumber; limit: number }
+  | { fromSlot: SlotNumber; limit: number; reverse?: boolean }
+  | { epoch: EpochNumber };
+
+/**
+ * Lookup a proposed (archiver-internal, not-yet-L1-confirmed) checkpoint.
+ * Distinct from CheckpointQuery because proposed checkpoints have a different shape
+ * (no l1, no attestations, but carries totalManaUsed) and live in their own LMDB map.
+ */
+export type ProposedCheckpointQuery = { number: CheckpointNumber } | { slot: SlotNumber } | { tag: 'proposed' };
+
+export const CheckpointQuerySchema: z.ZodType<CheckpointQuery, unknown> = z.union([
+  z.object({ number: CheckpointNumberSchema }).strict(),
+  z.object({ slot: SlotNumberSchema }).strict(),
+  z.object({ tag: z.union([z.literal('checkpointed'), z.literal('proven'), z.literal('finalized')]) }).strict(),
+]);
+
+const checkpointsQueryLimitSchema = () =>
+  z
+    .number()
+    .int()
+    .min(1)
+    .max(MAX_RPC_CHECKPOINTS_DATA_LEN, {
+      message: `limit must be at most ${MAX_RPC_CHECKPOINTS_DATA_LEN}`,
+    });
+
+export const CheckpointsQuerySchema: z.ZodType<CheckpointsQuery, unknown> = z.union([
+  z.object({ from: CheckpointNumberSchema, limit: checkpointsQueryLimitSchema() }).strict(),
+  z
+    .object({ fromSlot: SlotNumberSchema, limit: checkpointsQueryLimitSchema(), reverse: z.boolean().optional() })
+    .strict(),
+  z.object({ epoch: EpochNumberSchema }).strict(),
+]);
+
+export const ProposedCheckpointQuerySchema: z.ZodType<ProposedCheckpointQuery, unknown> = z.union([
+  z.object({ number: CheckpointNumberSchema }).strict(),
+  z.object({ slot: SlotNumberSchema }).strict(),
+  z.object({ tag: z.literal('proposed') }).strict(),
+]);
+
 /**
  * Interface of classes allowing for the retrieval of L2 blocks.
  */
@@ -50,110 +136,46 @@ export interface L2BlockSource {
   getBlockNumber(): Promise<BlockNumber>;
 
   /**
-   * Gets the number of the latest L2 block proven seen by the block source implementation.
-   * @returns The number of the latest L2 block proven seen by the block source implementation.
+   * Resolves a {@link BlockQuery} to its concrete L2 block number.
+   * @param query - Lookup by block number, hash, archive root, or chain-tip tag.
+   * @returns The block number, or undefined if no block matches the query.
    */
-  getProvenBlockNumber(): Promise<BlockNumber>;
-
-  /**
-   * Gets the number of the latest L2 block checkpointed seen by the block source implementation.
-   * @returns The number of the latest L2 block checkpointed seen by the block source implementation.
-   */
-  getCheckpointedL2BlockNumber(): Promise<BlockNumber>;
-
-  /**
-   * Computes the finalized block number based on the proven block number.
-   * A block is considered finalized when it's 2 epochs behind the proven block.
-   * TODO(#13569): Compute proper finalized block number based on L1 finalized block.
-   * @returns The finalized block number.
-   */
-  getFinalizedL2BlockNumber(): Promise<BlockNumber>;
-
-  /**
-   * Gets an l2 block header.
-   * @param number - The block number to return or 'latest' for the most recent one.
-   * @returns The requested L2 block header.
-   */
-  getBlockHeader(number: BlockNumber | 'latest'): Promise<BlockHeader | undefined>;
-
-  /**
-   * Gets a checkpointed L2 block by block number.
-   * Returns undefined if the block doesn't exist or hasn't been checkpointed yet.
-   * @param number - The block number to retrieve.
-   * @returns The requested checkpointed L2 block (or undefined if not found or not checkpointed).
-   */
-  getCheckpointedBlock(number: BlockNumber): Promise<CheckpointedL2Block | undefined>;
-
-  getCheckpointedBlocks(from: BlockNumber, limit: number): Promise<CheckpointedL2Block[]>;
+  getBlockNumber(query: BlockQuery): Promise<BlockNumber | undefined>;
+  getBlockNumber(query?: BlockQuery): Promise<BlockNumber | undefined>;
 
   /**
-   * Retrieves a collection of checkpoints.
-   * @param checkpointNumber The first checkpoint to be retrieved.
-   * @param limit The number of checkpoints to be retrieved.
-   * @returns The collection of complete checkpoints.
+   * Gets the number of the latest L2 checkpoint processed by the block source implementation.
+   * @returns The number of the latest L2 checkpoint processed by the block source implementation.
    */
-  getCheckpoints(checkpointNumber: CheckpointNumber, limit: number): Promise<PublishedCheckpoint[]>;
+  getCheckpointNumber(): Promise<CheckpointNumber>;
 
   /**
-   * Gets the checkpoints for a given epoch
-   * @param epochNumber - Epoch for which we want checkpoint data
+   * Gets a single confirmed checkpoint matching the given query.
+   * Heavy shape: includes nested full `L2Block`s with transaction bodies.
+   * @param query - Lookup by checkpoint number, slot, or chain-tip tag.
    */
-  getCheckpointsForEpoch(epochNumber: EpochNumber): Promise<Checkpoint[]>;
+  getCheckpoint(query: CheckpointQuery): Promise<PublishedCheckpoint | undefined>;
 
   /**
-   * Gets lightweight checkpoint metadata for a given epoch, without fetching full block data.
-   * @param epochNumber - Epoch for which we want checkpoint data
+   * Gets a collection of confirmed checkpoints matching the given query.
+   * Heavy shape: includes nested full `L2Block`s with transaction bodies.
+   * @param query - Range by start/limit or by epoch.
    */
-  getCheckpointsDataForEpoch(epochNumber: EpochNumber): Promise<CheckpointData[]>;
+  getCheckpoints(query: CheckpointsQuery): Promise<PublishedCheckpoint[]>;
 
   /**
-   * Gets a block header by its hash.
-   * @param blockHash - The block hash to retrieve.
-   * @returns The requested block header (or undefined if not found).
+   * Gets lightweight checkpoint metadata for a single checkpoint.
+   * Cheap passthrough for metadata-only queries (no block body reads).
+   * @param query - Lookup by checkpoint number, slot, or chain-tip tag.
    */
-  getBlockHeaderByHash(blockHash: BlockHash): Promise<BlockHeader | undefined>;
+  getCheckpointData(query: CheckpointQuery): Promise<CheckpointData | undefined>;
 
   /**
-   * Gets a block header by its archive root.
-   * @param archive - The archive root to retrieve.
-   * @returns The requested block header (or undefined if not found).
+   * Gets a collection of lightweight checkpoint metadata entries matching the given query.
+   * Cheap passthrough for metadata-only queries (no block body reads).
+   * @param query - Range by start/limit or by epoch.
    */
-  getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined>;
-
-  /**
-   * Gets block metadata (without tx data) by block number.
-   * @param number - The block number to retrieve.
-   * @returns The requested block data (or undefined if not found).
-   */
-  getBlockData(number: BlockNumber): Promise<BlockData | undefined>;
-
-  /**
-   * Gets block metadata (without tx data) by archive root.
-   * @param archive - The archive root to retrieve.
-   * @returns The requested block data (or undefined if not found).
-   */
-  getBlockDataByArchive(archive: Fr): Promise<BlockData | undefined>;
-
-  /**
-   * Gets an L2 block by block number.
-   * @param number - The block number to return.
-   * @returns The requested L2 block (or undefined if not found).
-   */
-  getL2Block(number: BlockNumber): Promise<L2Block | undefined>;
-
-  /**
-   * Gets an L2 block by its hash.
-   * @param blockHash - The block hash to retrieve.
-   * @returns The requested L2 block (or undefined if not found).
-   */
-  getL2BlockByHash(blockHash: BlockHash): Promise<L2Block | undefined>;
-
-  /**
-   * Gets an L2 block by its archive root.
-   * @param archive - The archive root to retrieve.
-   * @returns The requested L2 block (or undefined if not found).
-   */
-  getL2BlockByArchive(archive: Fr): Promise<L2Block | undefined>;
+  getCheckpointsData(query: CheckpointsQuery): Promise<CheckpointData[]>;
 
   /**
    * Gets a tx effect.
@@ -163,28 +185,35 @@ export interface L2BlockSource {
   getTxEffect(txHash: TxHash): Promise<IndexedTxEffect | undefined>;
 
   /**
-   * 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).
+   * Returns the L2-to-L1 membership witness for `message` emitted by tx `txHash`, built against the
+   * smallest partial-proof root on the Outbox that covers the tx's checkpoint.
+   *
+   * The Outbox roots are read lazily, pinned to the node's synced L1 block, so the witness reflects
+   * the node's synced view. Returns `undefined` if the tx isn't yet in a block/epoch or no covering
+   * root has landed on L1 as of the synced block.
+   *
+   * Caveat: cached roots that are sealed and L1-finalized are not re-validated. A reorg deeper than
+   * L1 finality could leave the node serving a witness against a no-longer-canonical root.
    */
-  getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined>;
+  getL2ToL1MembershipWitness(
+    txHash: TxHash,
+    message: Fr,
+    messageIndexInTx?: number,
+  ): Promise<L2ToL1MembershipWitness | undefined>;
 
   /**
-   * Returns the current L2 slot number based on the currently synced L1 timestamp.
+   * Returns the last L2 slot number for which we have all L1 data needed to build the next checkpoint.
+   * Determined by the max of two signals: L1 block sync progress and latest synced checkpoint slot.
+   * The checkpoint signal handles missed L1 blocks, since a published checkpoint seals the message tree
+   * for the next checkpoint via the inbox LAG mechanism.
    */
-  getL2SlotNumber(): Promise<SlotNumber | undefined>;
+  getSyncedL2SlotNumber(): Promise<SlotNumber | undefined>;
 
   /**
-   * Returns the current L2 epoch number based on the currently synced L1 timestamp.
+   * Returns the last L2 epoch number that has been fully synchronized from L1.
+   * An epoch is fully synced when all its L2 slots have been fully synced.
    */
-  getL2EpochNumber(): Promise<EpochNumber | undefined>;
-
-  /**
-   * Returns all checkpointed block headers for a given epoch.
-   * @dev Use this method only with recent epochs, since it walks the block list backwards.
-   * @param epochNumber - The epoch number to return headers for.
-   */
-  getCheckpointedBlockHeadersForEpoch(epochNumber: EpochNumber): Promise<BlockHeader[]>;
+  getSyncedL2EpochNumber(): Promise<EpochNumber | undefined>;
 
   /**
    * Returns whether the given epoch is completed on L1, based on the current L1 and L2 block numbers.
@@ -202,9 +231,22 @@ export interface L2BlockSource {
    */
   getL1Constants(): Promise<L1RollupConstants>;
 
+  /**
+   * Returns true iff `canPruneAtTime` would be true at the latest L1 timestamp inside
+   * the L2 slot's window. Computed entirely from local archiver state (no L1 RPC).
+   * @param slot - The L2 slot to check.
+   */
+  isPruneDueAtSlot(slot: SlotNumber): Promise<boolean>;
+
   /** Returns values for the genesis block */
   getGenesisValues(): Promise<{ genesisArchiveRoot: Fr }>;
 
+  /**
+   * Returns the precomputed hash of the genesis block header. Synchronous because the hash
+   * is derived from the initial block header at construction time and cached by implementers.
+   */
+  getGenesisBlockHash(): BlockHash;
+
   /** Latest synced L1 timestamp. */
   getL1Timestamp(): Promise<bigint | undefined>;
 
@@ -220,53 +262,50 @@ export interface L2BlockSource {
    */
   getPendingChainValidationStatus(): Promise<ValidateCheckpointResult>;
 
+  /**
+   * Looks up a proposed (archiver-internal, not-yet-L1-confirmed) checkpoint.
+   * Returns the latest proposed entry when called with no args or `{ tag: 'proposed' }`; since a
+   * proposed entry can only be stored with a checkpoint number beyond the confirmed frontier (and is
+   * deleted on confirmation), the latest entry is always the leading one. Callers derive the proposed
+   * tip from the payload (checkpoint number, and last block `startBlock + blockCount - 1`).
+   * With `{ number }` or `{ slot }`, returns the matching entry or undefined.
+   * Never falls back to confirmed checkpoints.
+   */
+  getProposedCheckpointData(query?: ProposedCheckpointQuery): Promise<ProposedCheckpointData | undefined>;
+
   /** Force a sync. */
   syncImmediate(): Promise<void>;
 
-  /* Legacy APIS */
-
   /**
-   * Gets an l2 block. If a negative number is passed, the block returned is the most recent.
-   * @param number - The block number to return (inclusive).
-   * @returns The requested L2 block.
+   * Gets an L2 block matching the given query.
+   * @param query - Lookup by block number, hash, or archive root.
    */
-  getBlock(number: BlockNumber): Promise<L2Block | undefined>;
+  getBlock(query: BlockQuery): Promise<L2Block | undefined>;
 
   /**
-   * Returns all checkpointed blocks for a given epoch.
-   * @dev Use this method only with recent epochs, since it walks the block list backwards.
-   * @param epochNumber - The epoch number to return blocks for.
+   * Gets a collection of L2 blocks matching the given query.
+   * @param query - Range by start/limit or by epoch; optionally restricted to checkpointed blocks.
    */
-  getCheckpointedBlocksForEpoch(epochNumber: EpochNumber): Promise<CheckpointedL2Block[]>;
+  getBlocks(query: BlocksQuery): Promise<L2Block[]>;
 
   /**
-   * Returns all blocks for a given slot.
-   * @dev Use this method only with recent slots, since it walks the block list backwards.
-   * @param slotNumber - The slot number to return blocks for.
+   * Gets block metadata (without tx data) matching the given query.
+   * @param query - Lookup by block number, hash, or archive root.
    */
-  getBlocksForSlot(slotNumber: SlotNumber): Promise<L2Block[]>;
+  getBlockData(query: BlockQuery): Promise<BlockData | undefined>;
 
   /**
-   * Gets a checkpointed block by its block hash.
-   * @param blockHash - The block hash to retrieve.
-   * @returns The requested block (or undefined if not found).
+   * Gets a collection of block metadata entries matching the given query.
+   * @param query - Range by start/limit or by epoch; optionally restricted to checkpointed blocks.
    */
-  getCheckpointedBlockByHash(blockHash: BlockHash): Promise<CheckpointedL2Block | undefined>;
+  getBlocksData(query: BlocksQuery): Promise<BlockData[]>;
 
   /**
-   * Gets a checkpointed block by its archive root.
-   * @param archive - The archive root to retrieve.
-   * @returns The requested block (or undefined if not found).
-   */
-  getCheckpointedBlockByArchive(archive: Fr): Promise<CheckpointedL2Block | undefined>;
-
-  /**
-   * Gets up to `limit` amount of L2 blocks starting from `from`.
-   * @param from - Number of the first block to return (inclusive).
-   * @param limit - The maximum number of blocks to return.
-   * @returns The requested L2 blocks.
+   * Returns all blocks for a given slot.
+   * @dev Use this method only with recent slots, since it walks the block list backwards.
+   * @param slotNumber - The slot number to return blocks for.
    */
-  getBlocks(from: BlockNumber, limit: number): Promise<L2Block[]>;
+  getBlocksForSlot(slotNumber: SlotNumber): Promise<L2Block[]>;
 }
 
 /**
@@ -281,6 +320,19 @@ export interface L2BlockSink {
   addBlock(block: L2Block): Promise<void>;
 }
 
+/**
+ * Interface for classes that can receive and store proposed (not-yet-L1-confirmed) checkpoints.
+ */
+export interface ProposedCheckpointSink {
+  /**
+   * Adds a proposed checkpoint to the store. The archive and checkpointOutHash are computed
+   * internally from the already-stored blocks, so every block in the checkpoint must be added
+   * (via {@link L2BlockSink.addBlock}) before calling this.
+   * @param checkpoint - The proposed checkpoint metadata.
+   */
+  addProposedCheckpoint(checkpoint: ProposedCheckpointInput): Promise<void>;
+}
+
 /**
  * L2BlockSource that emits events upon pending / proven chain changes.
  * see L2BlockSourceEvents for the events emitted.
@@ -291,17 +343,24 @@ export type ArchiverEmitter = TypedEventEmitter<{
   [L2BlockSourceEvents.L2BlockProven]: (args: L2BlockProvenEvent) => void;
   [L2BlockSourceEvents.InvalidAttestationsCheckpointDetected]: (args: InvalidCheckpointDetectedEvent) => void;
   [L2BlockSourceEvents.L2BlocksCheckpointed]: (args: L2CheckpointEvent) => void;
+  [L2BlockSourceEvents.CheckpointEquivocationDetected]: (args: CheckpointEquivocationDetectedEvent) => void;
+  [L2BlockSourceEvents.DescendentOfInvalidAttestationsCheckpointDetected]: (
+    args: DescendentOfInvalidAttestationsCheckpointEvent,
+  ) => void;
+  [L2BlockSourceEvents.L2BlockSourceUpdated]: (args: L2BlockSourceUpdatedEvent) => void;
 }>;
 export interface L2BlockSourceEventEmitter extends L2BlockSource {
   events: ArchiverEmitter;
 }
 
 /**
- * Identifier for L2 block tags.
+ * Identifier for L2 block tags. Internal counterpart to {@link BlockTag} that omits `latest`
+ * (which is an alias for `proposed` accepted only at the public RPC surface).
+ *
  * - proposed: Latest block proposed on L2.
- * - checkpointed: Checkpointed block on L1.
- * - proven: Proven block on L1.
- * - finalized: Proven block on a finalized L1 block (not implemented, set to proven for now).
+ * - checkpointed: Latest block whose enclosing checkpoint has been published on L1.
+ * - proven: Latest block whose enclosing checkpoint has been proven on L1.
+ * - finalized: Latest block whose proving L1 transaction has reached L1 finality.
  */
 export type L2BlockTag = 'proposed' | 'checkpointed' | 'proven' | 'finalized';
 
@@ -313,6 +372,12 @@ export type L2Tips = {
   finalized: L2TipId;
 };
 
+/**
+ * Tips of the L2 chain as tracked by a local provider (world-state, l2-tips-store). Identical to
+ * {@link L2Tips}; the alias is retained for call sites that document a local-only provenance.
+ */
+export type LocalL2Tips = L2Tips;
+
 export const GENESIS_CHECKPOINT_HEADER_HASH = CheckpointHeader.empty().hash();
 
 /** Identifies a block by number and hash. */
@@ -335,6 +400,28 @@ export function makeL2CheckpointId(number: CheckpointNumber, hash: string): Chec
   return { number, hash };
 }
 
+function l2BlockIdEquals(a: L2BlockId, b: L2BlockId): boolean {
+  return a.number === b.number && a.hash === b.hash;
+}
+
+function l2TipIdEquals(a: L2TipId, b: L2TipId): boolean {
+  return (
+    l2BlockIdEquals(a.block, b.block) &&
+    a.checkpoint.number === b.checkpoint.number &&
+    a.checkpoint.hash === b.checkpoint.hash
+  );
+}
+
+/** Returns whether two {@link L2Tips} snapshots agree on every tier (proposed, checkpointed, proven, finalized). */
+export function l2TipsEqual(a: L2Tips, b: L2Tips): boolean {
+  return (
+    l2BlockIdEquals(a.proposed, b.proposed) &&
+    l2TipIdEquals(a.checkpointed, b.checkpointed) &&
+    l2TipIdEquals(a.proven, b.proven) &&
+    l2TipIdEquals(a.finalized, b.finalized)
+  );
+}
+
 const L2BlockIdSchema = z.object({
   number: BlockNumberSchema,
   hash: z.string(),
@@ -363,8 +450,25 @@ export enum L2BlockSourceEvents {
   L2BlockProven = 'l2BlockProven',
   L2BlocksCheckpointed = 'l2BlocksCheckpointed',
   InvalidAttestationsCheckpointDetected = 'invalidCheckpointDetected',
+  CheckpointEquivocationDetected = 'checkpointEquivocationDetected',
+  DescendentOfInvalidAttestationsCheckpointDetected = 'descendentOfInvalidAttestationsCheckpointDetected',
+  L2BlockSourceUpdated = 'l2BlockSourceUpdated',
 }
 
+/**
+ * Aggregate event emitted once per committed archiver sync pass that mutated local state. Carries the chain tips
+ * before and after the pass; consumers compare `fromTips` and `toTips` to learn what moved, and read any data they
+ * need from the source itself.
+ *
+ * This is an optimization signal that lets a block stream reconcile immediately on an archiver update rather than
+ * waiting for its next poll. Polling remains the correctness fallback, so a missed event only affects latency.
+ */
+export type L2BlockSourceUpdatedEvent = {
+  type: 'l2BlockSourceUpdated';
+  fromTips: L2Tips;
+  toTips: L2Tips;
+};
+
 export type L2BlockProvenEvent = {
   type: 'l2BlockProven';
   blockNumber: BlockNumber;
@@ -393,3 +497,31 @@ export type InvalidCheckpointDetectedEvent = {
   type: 'invalidCheckpointDetected';
   validationResult: ValidateCheckpointNegativeResult;
 };
+
+/**
+ * Emitted when a local proposed checkpoint is found to disagree with the L1-confirmed
+ * checkpoint at the same slot. The slot proposer signed both — equivocation.
+ */
+export type CheckpointEquivocationDetectedEvent = {
+  type: 'checkpointEquivocationDetected';
+  slotNumber: SlotNumber;
+  checkpointNumber: CheckpointNumber;
+  l1ArchiveRoot: Fr;
+  proposedArchiveRoot: Fr;
+};
+
+/**
+ * Emitted when the archiver observes a checkpoint that builds on a previously-rejected
+ * ancestor (typically one with insufficient/invalid attestations). The descendant itself may
+ * have valid attestations, but it cannot be ingested because the chain it extends was
+ * skipped. The slasher uses this to slash the proposer of the descendant.
+ */
+export type DescendentOfInvalidAttestationsCheckpointEvent = {
+  type: 'descendentOfInvalidAttestationsCheckpointDetected';
+  /** The descendant checkpoint being rejected. */
+  checkpoint: CheckpointInfo;
+  /** Archive root of the rejected ancestor this descendant builds on. */
+  ancestorArchiveRoot: Fr;
+  /** Checkpoint number of the rejected ancestor. */
+  ancestorCheckpointNumber: CheckpointNumber;
+};

package/src/block/l2_block_stream/event_driven_l2_block_stream.ts

@@ -0,0 +1,81 @@
+import { createLogger } from '@aztec/foundation/log';
+import { RunningPromise } from '@aztec/foundation/running-promise';
+
+import {
+  type ArchiverEmitter,
+  type L2BlockSource,
+  type L2BlockSourceEventEmitter,
+  L2BlockSourceEvents,
+} from '../l2_block_source.js';
+import type { L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider } from './interfaces.js';
+import { L2BlockStream, type L2BlockStreamOptions } from './l2_block_stream.js';
+
+/** Returns the event emitter of a source that exposes one, or undefined for plain (e.g. RPC-backed) sources. */
+function getEmitter(source: L2BlockSource | L2BlockSourceEventEmitter): ArchiverEmitter | undefined {
+  return 'events' in source ? source.events : undefined;
+}
+
+/**
+ * Event-driven wrapper around {@link L2BlockStream}. Subscribes to the source's aggregate `l2BlockSourceUpdated`
+ * event (when the source exposes one) and uses it purely as a doorbell: each event triggers an immediate
+ * reconciliation pass instead of waiting for the next tick, while the periodic poll remains the correctness
+ * fallback. Every pass reads tips and blocks authoritatively from the source, so a missed, stale, or duplicated
+ * event only affects latency. Subsystems keep consuming the same {@link L2BlockStreamEvent}s; the archiver
+ * aggregate event is handled entirely here.
+ */
+export class EventDrivenL2BlockStream {
+  private readonly blockStream: L2BlockStream;
+  private readonly runningPromise: RunningPromise;
+  private readonly emitter: ArchiverEmitter | undefined;
+  private started = false;
+
+  private readonly onSourceUpdated = () => {
+    // Fire-and-forget: trigger coalesces with any in-flight or periodic pass (see RunningPromise.trigger), so a
+    // burst of events does not run passes concurrently. Errors are swallowed by the inner stream's own handler.
+    void this.runningPromise.trigger().catch(err => this.log.error(`Error in event-triggered block stream sync`, err));
+  };
+
+  constructor(
+    source: L2BlockSource | L2BlockSourceEventEmitter,
+    localData: L2BlockStreamLocalDataProvider,
+    handler: L2BlockStreamEventHandler,
+    private readonly log = createLogger('types:event_driven_block_stream'),
+    opts: L2BlockStreamOptions = {},
+  ) {
+    // The inner stream's own RunningPromise is never started; this wrapper owns the polling loop and drives the
+    // stream through `sync()` (which runs `work()` directly when the inner loop is stopped).
+    this.blockStream = new L2BlockStream(source, localData, handler, log, opts);
+    this.runningPromise = new RunningPromise(() => this.blockStream.sync(), log, opts.pollIntervalMS ?? 1000);
+    this.emitter = getEmitter(source);
+  }
+
+  public start(): void {
+    if (this.started) {
+      this.log.warn(`Attempted to start an already-started event-driven block stream`);
+      return;
+    }
+    this.started = true;
+    this.emitter?.on(L2BlockSourceEvents.L2BlockSourceUpdated, this.onSourceUpdated);
+    this.runningPromise.start();
+  }
+
+  public async stop(): Promise<void> {
+    this.started = false;
+    this.emitter?.off(L2BlockSourceEvents.L2BlockSourceUpdated, this.onSourceUpdated);
+    await this.runningPromise.stop();
+    await this.blockStream.stop();
+  }
+
+  public isRunning(): boolean {
+    return this.runningPromise.isRunning();
+  }
+
+  /**
+   * Runs a synchronization pass now, bypassing the poll interval. Resolves once a pass that started after this call
+   * completes, so the caller observes state at least as fresh as the moment it asked. Concurrent callers coalesce
+   * onto a single such pass. Rejects if the stream is stopped before that pass runs.
+   */
+  public sync(): Promise<void> {
+    return this.runningPromise.trigger();
+  }
+}

package/src/block/l2_block_stream/index.ts

@@ -1,3 +1,4 @@
+export * from './event_driven_l2_block_stream.js';
 export * from './interfaces.js';
 export * from './l2_block_stream.js';
 export * from './l2_tips_memory_store.js';