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

package/src/abi/contract_artifact.ts

@@ -13,7 +13,9 @@ import {
   type ABIParameter,
   type ABIParameterVisibility,
   ARTIFACT_VERSION_BEFORE_INJECTION,
+  type AbiNamedValue,
   type AbiType,
+  type AbiValue,
   type BasicValue,
   type ContractArtifact,
   ContractArtifactSchema,
@@ -166,9 +168,9 @@ function generateFunctionAbi(fn: NoirCompiledContractFunction, contract: NoirCom
     parameters = parameters.slice(1);
   }
 
-  let returnTypes: AbiType[] = [];
+  let returnType: AbiType | undefined;
   if (functionType === FunctionType.UTILITY) {
-    returnTypes = fn.abi.return_type ? [fn.abi.return_type.abi_type] : returnTypes;
+    returnType = fn.abi.return_type?.abi_type;
   } else {
     const pathToFind = `${contract.name}::${fn.name}_abi`;
     const abiStructs: AbiType[] = contract.outputs.structs['functions'];
@@ -180,10 +182,7 @@ function generateFunctionAbi(fn: NoirCompiledContractFunction, contract: NoirCom
         throw new Error('Could not generate contract function artifact');
       }
 
-      const returnTypeField = returnStruct.fields.find(field => field.name === 'return_type');
-      if (returnTypeField) {
-        returnTypes = [returnTypeField.type];
-      }
+      returnType = returnStruct.fields.find(field => field.name === 'return_type')?.type;
     }
   }
 
@@ -194,7 +193,10 @@ function generateFunctionAbi(fn: NoirCompiledContractFunction, contract: NoirCom
     isStatic,
     isInitializer: fn.custom_attributes.includes(AZTEC_INITIALIZER_ATTRIBUTE),
     parameters,
-    returnTypes,
+    returnType,
+    // Old consumers expect `returnTypes` property, not `returnType`. So we write both down for now, until we can
+    // safely remove the old version.
+    returnTypes: returnType ? [returnType] : [],
     errorTypes: fn.abi.error_types,
     ...(fn.assert_messages ? { assertMessages: fn.assert_messages } : undefined),
   };
@@ -246,20 +248,24 @@ function hasKernelFunctionInputs(params: ABIParameter[]): boolean {
 
 /**
  * Generates a storage layout for the contract artifact.
- * @param input - The compiled noir contract to get storage layout for
+ * @param contractName - The name of the compiled Noir contract.
+ * @param globals - The normalized globals exported by the contract.
  * @returns A storage layout for the contract.
  */
-function getStorageLayout(input: NoirCompiledContract) {
+function getStorageLayout(contractName: string, globals: Record<string, AbiValue[]>) {
   // If another contract is imported by the main contract, its storage layout its going to also show up here.
   // The layout export includes the contract name, so here we can find the one that belongs to the current one and
   // ignore the rest.
-  const storageExports = input.outputs.globals.storage ? (input.outputs.globals.storage as StructValue[]) : [];
-  const storageForContract = storageExports.find(storageExport => {
+  const storageExports = globals.storage ?? [];
+  const storageForContract = storageExports.find((storageExport): storageExport is StructValue => {
+    if (storageExport.kind !== 'struct') {
+      return false;
+    }
     const contractNameField = storageExport.fields.find(field => field.name === 'contract_name')?.value as BasicValue<
       'string',
       string
     >;
-    return contractNameField.value === input.name;
+    return contractNameField.value === contractName;
   });
   const storageFields = storageForContract
     ? ((storageForContract.fields.find(field => field.name == 'fields') as TypedStructFieldValue<StructValue>).value
@@ -280,6 +286,22 @@ function getStorageLayout(input: NoirCompiledContract) {
   }, {});
 }
 
+function isAbiNamedValue(value: AbiNamedValue | AbiValue): value is AbiNamedValue {
+  return 'name' in value;
+}
+
+function normalizeContractOutputs(outputs: NoirCompiledContract['outputs']): ContractArtifact['outputs'] {
+  return {
+    structs: outputs.structs,
+    globals: Object.fromEntries(
+      Object.entries(outputs.globals).map(([tag, values]) => [
+        tag,
+        values.map(value => (isAbiNamedValue(value) ? value.value : value)),
+      ]),
+    ),
+  };
+}
+
 /**
  * Given a post-processed Nargo output defined as `contract` generates an Aztec-compatible contract artifact.
  *
@@ -290,6 +312,7 @@ function generateContractArtifact(contract: NoirCompiledContract): ContractArtif
     if (!contract.transpiled) {
       throw new Error("Contract's public bytecode has not been transpiled");
     }
+    const outputs = normalizeContractOutputs(contract.outputs);
     return ContractArtifactSchema.parse({
       name: contract.name,
       aztecVersion: contract.aztec_version,
@@ -297,8 +320,8 @@ function generateContractArtifact(contract: NoirCompiledContract): ContractArtif
       nonDispatchPublicFunctions: contract.functions
         .filter(f => !retainBytecode(f))
         .map(f => generateFunctionAbi(f, contract)),
-      outputs: contract.outputs,
-      storageLayout: getStorageLayout(contract),
+      outputs,
+      storageLayout: getStorageLayout(contract.name, outputs.globals),
       fileMap: contract.file_map,
     });
   } catch (err) {
@@ -313,6 +336,7 @@ function generateContractArtifact(contract: NoirCompiledContract): ContractArtif
  */
 function generateContractArtifactForPublic(contract: NoirCompiledContract): ContractArtifact {
   try {
+    const outputs = normalizeContractOutputs(contract.outputs);
     return ContractArtifactSchema.parse({
       name: contract.name,
       aztecVersion: contract.aztec_version,
@@ -320,8 +344,8 @@ function generateContractArtifactForPublic(contract: NoirCompiledContract): Cont
       nonDispatchPublicFunctions: contract.functions
         .filter(f => !retainBytecode(f))
         .map(f => generateFunctionAbi(f, contract)),
-      outputs: contract.outputs,
-      storageLayout: getStorageLayout(contract),
+      outputs,
+      storageLayout: getStorageLayout(contract.name, outputs.globals),
       fileMap: contract.file_map,
     });
   } catch (err) {

package/src/abi/decoder.ts

@@ -32,17 +32,14 @@ export type AbiDecoded =
  * Decodes values using a provided ABI.
  */
 class AbiDecoder {
-  constructor(
-    private types: AbiType[],
-    private flattened: Fr[],
-  ) {}
+  constructor(private flattened: Fr[]) {}
 
   /**
-   * Decodes a single return value from field to the given type.
-   * @param abiType - The type of the return value.
-   * @returns The decoded return value.
+   * Decodes a single value from field to the given type.
+   * @param abiType - The type of the value.
+   * @returns The decoded value.
    */
-  private decodeNext(abiType: AbiType): AbiDecoded {
+  public decodeNext(abiType: AbiType): AbiDecoded {
     switch (abiType.kind) {
       case 'field':
         return this.getNextField().toBigInt();
@@ -121,26 +118,25 @@ class AbiDecoder {
     }
     return field;
   }
+}
 
-  /**
-   * Decodes all the values for the given ABI.
-   * The decided value can be simple types, structs or arrays
-   * @returns The decoded return values.
-   */
-  public decode(): AbiDecoded {
-    if (this.types.length === 1) {
-      return this.decodeNext(this.types[0]);
-    }
-    return this.types.map(type => this.decodeNext(type));
-  }
+/**
+ * Decodes the single value a function returns, or undefined if it returns nothing. Multiple return values are expressed
+ * as one `tuple` type, so they decode through here too.
+ * @param type - The type the function returns.
+ * @param buffer - The flattened Field array to decode.
+ */
+export function decodeFromAbi(type: AbiType | undefined, buffer: Fr[]): AbiDecoded {
+  return type === undefined ? undefined : new AbiDecoder(buffer.slice()).decodeNext(type);
 }
 
 /**
- * Decodes values in a flattened Field array using a provided ABI.
- * @param abi - The ABI to use as reference.
+ * Decodes one value per given type, consumed from the buffer in order. Always returns one decoded value per type, so
+ * callers can index the result positionally. A function's arguments are encoded this way.
+ * @param types - The type of each value, in order.
  * @param buffer - The flattened Field array to decode.
- * @returns
  */
-export function decodeFromAbi(typ: AbiType[], buffer: Fr[]) {
-  return new AbiDecoder(typ, buffer.slice()).decode();
+export function decodeEachFromAbi(types: AbiType[], buffer: Fr[]): AbiDecoded[] {
+  const decoder = new AbiDecoder(buffer.slice());
+  return types.map(type => decoder.decodeNext(type));
 }

package/src/abi/function_call.ts

@@ -5,7 +5,7 @@ import { z } from 'zod';
 
 import { AztecAddress } from '../aztec-address/index.js';
 import { schemas } from '../schemas/index.js';
-import { type AbiType, AbiTypeSchema, FunctionType } from './abi.js';
+import { type AbiType, AbiTypeSchema, FunctionType, getFunctionReturnType } from './abi.js';
 import { FunctionSelector } from './function_selector.js';
 
 /** A request to call a function on a contract. */
@@ -25,8 +25,8 @@ export class FunctionCall {
     public isStatic: boolean,
     /** The encoded args */
     public args: Fr[],
-    /** The return type for decoding */
-    public returnTypes: AbiType[],
+    /** The type the call returns, for decoding, or undefined if it returns nothing */
+    public returnType?: AbiType,
   ) {}
 
   static getFields(fields: FieldsOf<FunctionCall>) {
@@ -38,7 +38,7 @@ export class FunctionCall {
       fields.hideMsgSender,
       fields.isStatic,
       fields.args,
-      fields.returnTypes,
+      fields.returnType,
     ] as const;
   }
 
@@ -56,9 +56,22 @@ export class FunctionCall {
         isStatic: z.boolean(),
         hideMsgSender: z.boolean(),
         args: z.array(schemas.Fr),
-        returnTypes: z.array(AbiTypeSchema),
+        returnType: AbiTypeSchema.optional(),
+        // Old consumers send `returnTypes`, not `returnType`. So we accept both for now, until we can safely remove
+        // the old version.
+        returnTypes: z.array(AbiTypeSchema).optional(),
       })
-      .transform(FunctionCall.from);
+      .transform(({ returnType, returnTypes, ...fields }) =>
+        FunctionCall.from({ ...fields, returnType: getFunctionReturnType({ returnType, returnTypes }) }),
+      );
+  }
+
+  /**
+   * Serializes the deprecated `returnTypes` alongside `returnType`, so that peers that still require the old field can
+   * parse calls sent by this version.
+   */
+  public toJSON() {
+    return { ...this, returnTypes: this.returnType ? [this.returnType] : [] };
   }
 
   public isPublicStatic(): boolean {
@@ -78,7 +91,6 @@ export class FunctionCall {
       hideMsgSender: false,
       isStatic: false,
       args: [],
-      returnTypes: [],
     });
   }
 }

package/src/avm/avm.ts

@@ -1,4 +1,3 @@
-import { DEFAULT_MAX_DEBUG_LOG_MEMORY_READS } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 
@@ -1152,7 +1151,7 @@ export class CallStackMetadata {
 
     const { stack, leaf } = failingCall;
     const aztecCallStack = stack.map(call => ({
-      contractAddress: AztecAddress.fromField(call.contractAddress),
+      contractAddress: AztecAddress.fromFieldUnsafe(call.contractAddress),
       functionSelector: call.calldata.length > 0 ? FunctionSelector.fromFieldOrUndefined(call.calldata[0]) : undefined,
     }));
 
@@ -1384,6 +1383,10 @@ export class PublicTxResult {
   }
 }
 
+// Excessive memory reads due to debug logging can open a DOS vector to nodes that perform public tx simulation for users.
+// This default limit (4MB) can be configured further by node runners via the `RPC_SIMULATE_PUBLIC_MAX_DEBUG_LOG_MEMORY_READS` environment variable.
+export const DEFAULT_MAX_DEBUG_LOG_MEMORY_READS = 125000;
+
 export class CollectionLimitsConfig {
   constructor(
     public readonly maxDebugLogMemoryReads: number,

package/src/avm/index.ts

@@ -3,10 +3,5 @@ export * from './avm_accumulated_data.js';
 export * from './avm_circuit_public_inputs.js';
 export * from './revert_code.js';
 export * from './public_data_write.js';
-export * from './public_data_update_request.js';
-export * from './contract_storage_update_request.js';
-export * from './contract_storage_read.js';
-export * from './public_inner_call_request.js';
-export * from './public_call_stack_item_compressed.js';
 export * from './avm_proving_request.js';
 export * from './message_pack.js';

package/src/aztec-address/index.ts

@@ -43,34 +43,64 @@ export class AztecAddress {
   static ZERO = new AztecAddress(Buffer.alloc(32, 0));
 
   /** Null msg sender address. Not part of the protocol contracts tree. */
-  static NULL_MSG_SENDER = AztecAddress.fromBigInt(NULL_MSG_SENDER_CONTRACT_ADDRESS);
+  static NULL_MSG_SENDER = AztecAddress.fromBigIntUnsafe(NULL_MSG_SENDER_CONTRACT_ADDRESS);
 
   static zero(): AztecAddress {
     return AztecAddress.ZERO;
   }
 
-  static fromField(fr: Fr) {
+  /**
+   * Builds an `AztecAddress` from a field **without checking it is a valid address** (the x-coordinate of a point on
+   * the Grumpkin curve, which is what lets it be encrypted to). Use {@link AztecAddress.isValid} to validate an
+   * untrusted one, or {@link AztecAddress.random} for valid test addresses.
+   */
+  static fromFieldUnsafe(fr: Fr) {
     return new AztecAddress(fr);
   }
 
+  /**
+   * Deserializes an `AztecAddress` from a buffer. It does **not** check the value is a valid Grumpkin-curve address
+   * (see {@link AztecAddress.isValid}); it is meant for reading addresses from already-validated serialized data. Use
+   * {@link AztecAddress.random} for valid test addresses.
+   */
   static fromBuffer(buffer: Buffer | BufferReader) {
     return new AztecAddress(fromBuffer(buffer, Fr));
   }
 
+  /**
+   * Deserializes an `AztecAddress` from a field reader. It does **not** check the value is a valid Grumpkin-curve
+   * address (see {@link AztecAddress.isValid}); it is meant for reading addresses from already-validated serialized
+   * data. Use {@link AztecAddress.random} for valid test addresses.
+   */
   static fromFields(fields: Fr[] | FieldReader) {
     const reader = FieldReader.asReader(fields);
     return new AztecAddress(reader.readField());
   }
 
-  static fromBigInt(value: bigint) {
+  /**
+   * Builds an `AztecAddress` from a bigint **without checking it is a valid address** (the x-coordinate of a point on
+   * the Grumpkin curve, which is what lets it be encrypted to). Use {@link AztecAddress.isValid} to validate an
+   * untrusted one, or {@link AztecAddress.random} for valid test addresses.
+   */
+  static fromBigIntUnsafe(value: bigint) {
     return new AztecAddress(new Fr(value));
   }
 
-  static fromNumber(value: number) {
+  /**
+   * Builds an `AztecAddress` from a number **without checking it is a valid address** (the x-coordinate of a point on
+   * the Grumpkin curve, which is what lets it be encrypted to). Use {@link AztecAddress.isValid} to validate an
+   * untrusted one, or {@link AztecAddress.random} for valid test addresses.
+   */
+  static fromNumberUnsafe(value: number) {
     return new AztecAddress(new Fr(value));
   }
 
-  static fromString(buf: string) {
+  /**
+   * Builds an `AztecAddress` from a hex string **without checking it is a valid address** (the x-coordinate of a
+   * point on the Grumpkin curve, which is what lets it be encrypted to). Use {@link AztecAddress.isValid} to
+   * validate an untrusted one, or {@link AztecAddress.random} for valid test addresses.
+   */
+  static fromStringUnsafe(buf: string) {
     return new AztecAddress(hexToBuffer(buf));
   }
 
@@ -89,7 +119,7 @@ export class AztecAddress {
     if (obj instanceof Buffer || Buffer.isBuffer(obj)) {
       return new AztecAddress(obj);
     }
-    return AztecAddress.fromString(obj);
+    return AztecAddress.fromStringUnsafe(obj);
   }
 
   /**

package/src/block/attestation_info.ts

@@ -60,9 +60,14 @@ export function getAttestationInfoFromPayload(
       return { address: attestation.address, status: 'provided-as-address' as const };
     }
 
-    // Try to recover address from signature
+    // Try to recover address from signature. Recover with default opts (no allowYParityAsV): a slot
+    // whose recovery byte is in yParity form (v ∈ {0, 1}) is judged invalid here, matching L1 proving
+    // (ValidatorSelectionLib.verifyAttestations → ECDSA.recover only accepts v ∈ {27, 28}). A malicious
+    // proposer that lands such a slot cannot have it silently treated as valid off-chain; it is routed to
+    // invalid-attestation and invalidated. The gossip receipt path (recoverCoordinationSigner) stays
+    // lenient with allowYParityAsV; A-1351 normalizes on pool ingress and before the L1 bundle.
     try {
-      const recoveredAddress = recoverAddress(hashedPayload, attestation.signature, { allowYParityAsV: true });
+      const recoveredAddress = recoverAddress(hashedPayload, attestation.signature);
       return { address: recoveredAddress, status: 'recovered-from-signature' as const };
     } catch {
       // Signature present but recovery failed

package/src/block/l2_block_source.ts

@@ -19,10 +19,11 @@ import type { CheckpointData, ProposedCheckpointData, ProposedCheckpointInput }
 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 { 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 { BlockHash } from './block_hash.js';
 import { BlockTagWithoutLatestSchema, type NormalizedBlockParameter } from './block_parameter.js';
@@ -63,8 +64,18 @@ export type CheckpointQuery =
   | { slot: SlotNumber }
   | { tag: 'checkpointed' | 'proven' | 'finalized' };
 
-/** Query a range of confirmed checkpoints by start/limit or by epoch. */
-export type CheckpointsQuery = { from: CheckpointNumber; limit: number } | { epoch: EpochNumber };
+/**
+ * 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.
@@ -79,8 +90,20 @@ export const CheckpointQuerySchema: z.ZodType<CheckpointQuery, unknown> = z.unio
   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: z.number().int().min(1) }).strict(),
+  z.object({ from: CheckpointNumberSchema, limit: checkpointsQueryLimitSchema() }).strict(),
+  z
+    .object({ fromSlot: SlotNumberSchema, limit: checkpointsQueryLimitSchema(), reverse: z.boolean().optional() })
+    .strict(),
   z.object({ epoch: EpochNumberSchema }).strict(),
 ]);
 
@@ -162,11 +185,21 @@ 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 last L2 slot number for which we have all L1 data needed to build the next checkpoint.
@@ -231,7 +264,10 @@ export interface L2BlockSource {
 
   /**
    * Looks up a proposed (archiver-internal, not-yet-L1-confirmed) checkpoint.
-   * Returns the latest proposed entry when called with no args or `{ tag: 'proposed' }`.
+   * 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.
    */
@@ -311,36 +347,37 @@ export type ArchiverEmitter = TypedEventEmitter<{
   [L2BlockSourceEvents.DescendentOfInvalidAttestationsCheckpointDetected]: (
     args: DescendentOfInvalidAttestationsCheckpointEvent,
   ) => void;
+  [L2BlockSourceEvents.L2BlockSourceUpdated]: (args: L2BlockSourceUpdatedEvent) => void;
 }>;
 export interface L2BlockSourceEventEmitter extends L2BlockSource {
   events: ArchiverEmitter;
 }
 
 /**
- * Identifier for L2 block tags. Internal counterpart to {@link BlockTag} that exposes
- * the additional `proposedCheckpoint` value (used for the optimistic chain tip on the
- * archiver side) and omits `latest` (which is an alias for `proposed` accepted only at
- * the public RPC surface).
+ * 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.
- * - proposedCheckpoint: Latest block in the most recent proposed checkpoint (archiver-internal).
  * - 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.
- *
- * TODO(palla): Remove `proposedCheckpoint` and unify with `proposed`.
  */
-export type L2BlockTag = 'proposed' | 'proposedCheckpoint' | 'checkpointed' | 'proven' | 'finalized';
+export type L2BlockTag = 'proposed' | 'checkpointed' | 'proven' | 'finalized';
 
 /** Tips of the L2 chain. */
 export type L2Tips = {
   proposed: L2BlockId;
   checkpointed: L2TipId;
-  proposedCheckpoint: L2TipId;
   proven: L2TipId;
   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. */
@@ -363,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(),
@@ -381,7 +440,6 @@ const L2TipIdSchema = z.object({
 export const L2TipsSchema = z.object({
   proposed: L2BlockIdSchema,
   checkpointed: L2TipIdSchema,
-  proposedCheckpoint: L2TipIdSchema,
   proven: L2TipIdSchema,
   finalized: L2TipIdSchema,
 });
@@ -394,8 +452,26 @@ export enum L2BlockSourceEvents {
   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, and the blocks added during it. Consumers compare `fromTips` and `toTips` to learn what
+ * moved; there is no separate `changed` section.
+ *
+ * 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.
+ * `blocksAdded` are hydrated blocks already in hand from the sync pass, so a triggered sync that is caught up to
+ * `fromTips` can reuse them (and `toTips`) instead of re-reading the store.
+ */
+export type L2BlockSourceUpdatedEvent = {
+  type: 'l2BlockSourceUpdated';
+  fromTips: L2Tips;
+  toTips: L2Tips;
+  blocksAdded: readonly L2Block[];
+};
+
 export type L2BlockProvenEvent = {
   type: 'l2BlockProven';
   blockNumber: BlockNumber;