@aztec/stdlib 5.0.0-nightly.20260428 → 5.0.0-nightly.20260430

package/dest/timetable/index.js

@@ -88,28 +88,42 @@
 /**
  * Checkpoint timing model for proposer pipelining.
  *
- * In this mode, the build work still starts in the current slot, but checkpoint
- * assembly and attestation collection can extend into the target slot. The extra
- * target-slot window getters are intended for consumers such as P2P validators
- * that need to validate pipelined messages against wallclock time.
+ * In this mode, the build work starts at the wall-clock slot boundary and the
+ * checkpoint proposal is broadcast early enough that attestations complete by
+ * the end of the build slot. L1 submission can then be sent at the boundary of
+ * the target slot. The extra target-slot window getters are intended for
+ * consumers such as P2P validators that need to validate pipelined messages
+ * against wallclock time.
  */ class PipelinedCheckpointTimingModel extends BaseCheckpointTiming {
     get proposalWindowIntoTargetSlot() {
-        // Allow the p2p propagation time to receive a checkpoint proposal from leader
-        return this.p2pPropagationTime;
+        // Proposals no longer spill into the target slot: they are broadcast early
+        // enough in the build slot that attestations complete before the boundary.
+        // Any residual tolerance into the target slot is covered by clock disparity.
+        return 0;
     }
     get attestationWindowIntoTargetSlot() {
-        return this.aztecSlotDuration - this.l1PublishingTime;
+        // Straggler grace: attestations aim to complete by build-slot end. Allow a
+        // small window into the target slot for late arrivals (round-trip p2p).
+        return 2 * this.p2pPropagationTime;
+    }
+    get pipeliningAttestationGracePeriod() {
+        // Under the early-pipelining regime attestations complete inside the build
+        // slot itself, so there is no extra grace into the target slot.
+        return 0;
     }
     get timeReservedAtEnd() {
-        return this.checkpointAssembleTime + this.p2pPropagationTime;
+        // Reserve enough time at the end of the build slot for:
+        // - assembling and broadcasting the checkpoint proposal
+        // - round-trip p2p propagation (proposal out, attestations back)
+        // - validators re-executing the last block
+        return this.checkpointAssembleTime + 2 * this.p2pPropagationTime + (this.blockDuration ?? 0);
     }
     get minimumBuildSlotWork() {
         return this.checkpointInitializationTime + this.minExecutionTime * 2;
     }
     get checkpointAssemblyDeadline() {
-        // Allow enough time to
-        // - build all blocks
-        // - receive attestations
+        // Allow enough time to build all blocks and receive attestations. With
+        // `pipeliningAttestationGracePeriod = 0` this equals `aztecSlotDuration`.
         return this.aztecSlotDuration + this.pipeliningAttestationGracePeriod;
     }
     get checkpointAttestationDeadline() {

package/dest/tx/profiling.js

@@ -78,7 +78,7 @@ export class TxProfileResult {
         ], {
             nodeRPCCalls: {
                 perMethod: {
-                    getBlockHeader: {
+                    getBlock: {
                         times: [
                             1
                         ]
@@ -92,7 +92,7 @@ export class TxProfileResult {
                     ],
                     roundTripMethods: [
                         [
-                            'getBlockHeader'
+                            'getBlock'
                         ]
                     ]
                 }
@@ -140,7 +140,7 @@ export class UtilityExecutionResult {
         ], [], 0n, {
             nodeRPCCalls: {
                 perMethod: {
-                    getBlockHeader: {
+                    getBlock: {
                         times: [
                             1
                         ]
@@ -154,7 +154,7 @@ export class UtilityExecutionResult {
                     ],
                     roundTripMethods: [
                         [
-                            'getBlockHeader'
+                            'getBlock'
                         ]
                     ]
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "5.0.0-nightly.20260428",
+  "version": "5.0.0-nightly.20260430",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -92,13 +92,13 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.892.0",
-    "@aztec/bb.js": "5.0.0-nightly.20260428",
-    "@aztec/blob-lib": "5.0.0-nightly.20260428",
-    "@aztec/constants": "5.0.0-nightly.20260428",
-    "@aztec/ethereum": "5.0.0-nightly.20260428",
-    "@aztec/foundation": "5.0.0-nightly.20260428",
-    "@aztec/l1-artifacts": "5.0.0-nightly.20260428",
-    "@aztec/noir-noirc_abi": "5.0.0-nightly.20260428",
+    "@aztec/bb.js": "5.0.0-nightly.20260430",
+    "@aztec/blob-lib": "5.0.0-nightly.20260430",
+    "@aztec/constants": "5.0.0-nightly.20260430",
+    "@aztec/ethereum": "5.0.0-nightly.20260430",
+    "@aztec/foundation": "5.0.0-nightly.20260430",
+    "@aztec/l1-artifacts": "5.0.0-nightly.20260430",
+    "@aztec/noir-noirc_abi": "5.0.0-nightly.20260430",
     "@google-cloud/storage": "^7.15.0",
     "axios": "^1.13.5",
     "json-stringify-deterministic": "1.0.12",

package/src/block/attestation_info.ts

@@ -3,7 +3,7 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 
 import { Checkpoint } from '../checkpoint/checkpoint.js';
 import { ConsensusPayload } from '../p2p/consensus_payload.js';
-import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '../p2p/signature_utils.js';
+import { type CoordinationSignatureContext, getHashedSignaturePayloadTypedData } from '../p2p/signature_utils.js';
 import type { CommitteeAttestation } from './proposal/committee_attestation.js';
 
 /**
@@ -32,11 +32,14 @@ export type AttestationInfo =
  * Extracts attestation information from a published checkpoint.
  * Returns info for each attestation, preserving array indices.
  */
-export function getAttestationInfoFromPublishedCheckpoint(block: {
-  attestations: CommitteeAttestation[];
-  checkpoint: Checkpoint;
-}): AttestationInfo[] {
-  const payload = ConsensusPayload.fromCheckpoint(block.checkpoint);
+export function getAttestationInfoFromPublishedCheckpoint(
+  block: {
+    attestations: CommitteeAttestation[];
+    checkpoint: Checkpoint;
+  },
+  signatureContext: CoordinationSignatureContext,
+): AttestationInfo[] {
+  const payload = ConsensusPayload.fromCheckpoint(block.checkpoint, signatureContext);
   return getAttestationInfoFromPayload(payload, block.attestations);
 }
 
@@ -44,10 +47,7 @@ export function getAttestationInfoFromPayload(
   payload: ConsensusPayload,
   attestations: CommitteeAttestation[],
 ): AttestationInfo[] {
-  const hashedPayload = getHashedSignaturePayloadEthSignedMessage(
-    payload,
-    SignatureDomainSeparator.checkpointAttestation,
-  );
+  const hashedPayload = getHashedSignaturePayloadTypedData(payload);
 
   return attestations.map(attestation => {
     // If signature is empty, check if we have an address directly
@@ -62,7 +62,7 @@ export function getAttestationInfoFromPayload(
 
     // Try to recover address from signature
     try {
-      const recoveredAddress = recoverAddress(hashedPayload, attestation.signature);
+      const recoveredAddress = recoverAddress(hashedPayload, attestation.signature, { allowYParityAsV: true });
       return { address: recoveredAddress, status: 'recovered-from-signature' as const };
     } catch {
       // Signature present but recovery failed

package/src/block/block_data.ts

@@ -3,9 +3,12 @@ import type { CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/
 
 import { z } from 'zod';
 
+import { CheckpointDataSchema } from '../checkpoint/checkpoint_data.js';
+import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { BlockHeader } from '../tx/block_header.js';
 import { BlockHash } from './block_hash.js';
+import { CommitteeAttestation } from './proposal/committee_attestation.js';
 
 /** L2Block metadata. Equivalent to L2Block but without block body containing tx data. */
 export type BlockData = {
@@ -23,3 +26,17 @@ export const BlockDataSchema = z.object({
   checkpointNumber: CheckpointNumberSchema,
   indexWithinCheckpoint: IndexWithinCheckpointSchema,
 });
+
+export const BlockDataWithCheckpointContextSchema = z
+  .object({
+    data: BlockDataSchema,
+    checkpoint: CheckpointDataSchema.optional(),
+    l1: L1PublishedData.schema.optional(),
+    attestations: z.array(CommitteeAttestation.schema),
+  })
+  .transform(obj => ({
+    data: obj.data,
+    checkpoint: obj.checkpoint,
+    l1: obj.l1,
+    attestations: obj.attestations,
+  }));

package/src/block/block_parameter.ts

@@ -1,10 +1,43 @@
 import { BlockNumberSchema } from '@aztec/foundation/branded-types';
+import { jsonStringify } from '@aztec/foundation/json-rpc';
+import { schemas } from '@aztec/foundation/schemas';
 
 import { z } from 'zod';
 
+import { ChainTipSchema } from '../interfaces/chain_tips.js';
 import { BlockHash } from './block_hash.js';
 
-export const BlockParameterSchema = z.union([BlockHash.schema, BlockNumberSchema, z.literal('latest')]);
+/**
+ * Selector for a block in RPC calls.
+ *
+ * Accepts a block number, a {@link BlockHash}, a chain-tip name (e.g. `'proven'`, `'checkpointed'`),
+ * `'latest'` (alias for `'proposed'`), or the explicit object variants `{ number }`, `{ hash }`,
+ * and `{ archive }`.
+ */
+export const BlockParameterSchema = z.union([
+  BlockHash.schema,
+  BlockNumberSchema,
+  ChainTipSchema,
+  z.literal('latest'),
+  z.object({ number: BlockNumberSchema }),
+  z.object({ hash: BlockHash.schema }),
+  z.object({ archive: schemas.Fr }),
+]);
 
-/** Block parameter - either a specific BlockNumber, block hash (BlockHash), or 'latest' */
 export type BlockParameter = z.infer<typeof BlockParameterSchema>;
+
+export function inspectBlockParameter(param: BlockParameter) {
+  if (typeof param === 'number') {
+    return param.toString();
+  } else if (typeof param === 'string') {
+    return param;
+  } else if ('number' in param) {
+    return `number=${param.number.toString()}`;
+  } else if ('hash' in param) {
+    return `hash=${param.hash.toString()}`;
+  } else if ('archive' in param) {
+    return `archive=${param.archive.toString()}`;
+  } else {
+    return jsonStringify(param);
+  }
+}

package/src/block/l2_block_source.ts

@@ -14,7 +14,7 @@ import { z } from 'zod';
 
 import type { Checkpoint } from '../checkpoint/checkpoint.js';
 import type { CheckpointData, CommonCheckpointData, ProposedCheckpointData } from '../checkpoint/checkpoint_data.js';
-import type { PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
+import type { L1PublishedData, PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
 import type { L1RollupConstants } from '../epoch-helpers/index.js';
 import { CheckpointHeader } from '../rollup/checkpoint_header.js';
 import type { BlockHeader } from '../tx/block_header.js';
@@ -25,8 +25,17 @@ import type { BlockData } from './block_data.js';
 import type { BlockHash } from './block_hash.js';
 import type { CheckpointedL2Block } from './checkpointed_l2_block.js';
 import type { L2Block } from './l2_block.js';
+import type { CommitteeAttestation } from './proposal/committee_attestation.js';
 import type { ValidateCheckpointNegativeResult, ValidateCheckpointResult } from './validate_block_result.js';
 
+/** Block metadata plus checkpoint-derived context (L1 publish info, attestations). */
+export type BlockDataWithCheckpointContext = {
+  data: BlockData;
+  checkpoint?: CheckpointData;
+  l1?: L1PublishedData;
+  attestations: CommitteeAttestation[];
+};
+
 /**
  * Interface of classes allowing for the retrieval of L2 blocks.
  */
@@ -111,6 +120,37 @@ export interface L2BlockSource {
    */
   getCheckpointsDataForEpoch(epochNumber: EpochNumber): Promise<CheckpointData[]>;
 
+  /**
+   * Gets lightweight checkpoint metadata for a single checkpoint.
+   * Cheap passthrough for metadata-only queries (no block body reads).
+   * @param checkpointNumber - The checkpoint number to retrieve.
+   * @returns The requested checkpoint data (or undefined if not found).
+   */
+  getCheckpointData(checkpointNumber: CheckpointNumber): Promise<CheckpointData | undefined>;
+
+  /**
+   * Gets up to `limit` amount of checkpoint metadata entries starting from `from`.
+   * Cheap passthrough for metadata-only queries (no block body reads).
+   * @param from - The first checkpoint number to return (inclusive).
+   * @param limit - The maximum number of checkpoints to return.
+   */
+  getCheckpointDataRange(from: CheckpointNumber, limit: number): Promise<CheckpointData[]>;
+
+  /**
+   * Looks up the checkpoint number that contains the given slot.
+   * @param slot - The slot number to look up.
+   * @returns The checkpoint number (or undefined if not found).
+   */
+  getCheckpointNumberBySlot(slot: SlotNumber): Promise<CheckpointNumber | undefined>;
+
+  /**
+   * Gets block metadata plus checkpoint-derived context (L1 publish info, attestations)
+   * without deserializing tx bodies. Uses checkpoint-level values when the block is
+   * checkpointed; otherwise returns `l1: undefined` and empty attestations.
+   * @param number - The block number to retrieve.
+   */
+  getBlockDataWithCheckpointContext(number: BlockNumber): Promise<BlockDataWithCheckpointContext | undefined>;
+
   /**
    * Gets a block header by its hash.
    * @param blockHash - The block hash to retrieve.
@@ -230,10 +270,10 @@ export interface L2BlockSource {
   getPendingChainValidationStatus(): Promise<ValidateCheckpointResult>;
 
   /** Returns the checkpoint at the proposed chain tip. */
-  getProposedCheckpoint(): Promise<CommonCheckpointData | undefined>;
+  getLastCheckpoint(): Promise<CommonCheckpointData | undefined>;
 
   /** Returns proposed checkpoint, if set, undefined if not*/
-  getProposedCheckpointOnly(): Promise<ProposedCheckpointData | undefined>;
+  getLastProposedCheckpoint(): Promise<ProposedCheckpointData | undefined>;
 
   /** Force a sync. */
   syncImmediate(): Promise<void>;

package/src/block/proposal/attestations_and_signers.ts

@@ -4,26 +4,37 @@ import { hexToBuffer } from '@aztec/foundation/string';
 import { encodeAbiParameters, parseAbiParameters } from 'viem';
 import { z } from 'zod';
 
-import type { Signable, SignatureDomainSeparator } from '../../p2p/signature_utils.js';
+import {
+  type CoordinationSignatureContext,
+  type CoordinationSignatureType,
+  type Signable,
+  coordinationSignatureContextSchema,
+} from '../../p2p/signature_utils.js';
 import { CommitteeAttestation, EthAddress } from './committee_attestation.js';
 
 export class CommitteeAttestationsAndSigners implements Signable {
-  constructor(public attestations: CommitteeAttestation[]) {}
+  readonly primaryType: CoordinationSignatureType = 'AttestationsAndSigners';
+
+  constructor(
+    public attestations: CommitteeAttestation[],
+    public readonly signatureContext: CoordinationSignatureContext,
+  ) {}
 
   static get schema() {
     return z
       .object({
         attestations: CommitteeAttestation.schema.array(),
+        signatureContext: coordinationSignatureContextSchema,
       })
-      .transform(obj => new CommitteeAttestationsAndSigners(obj.attestations));
+      .transform(obj => new CommitteeAttestationsAndSigners(obj.attestations, obj.signatureContext));
   }
 
-  getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer {
-    const abi = parseAbiParameters('uint8,(bytes,bytes),address[]');
+  getPayloadToSign(): Buffer {
+    // Matches the L1 abi.encode(attestations, signers) in AttestationLib.sol#getAttestationsAndSignersDigest.
+    const abi = parseAbiParameters('(bytes,bytes),address[]');
     const packed = this.getPackedAttestations();
 
     const encodedData = encodeAbiParameters(abi, [
-      domainSeparator,
       [packed.signatureIndices, packed.signaturesOrAddresses],
       this.getSigners().map(s => s.toString()),
     ]);
@@ -31,8 +42,8 @@ export class CommitteeAttestationsAndSigners implements Signable {
     return hexToBuffer(encodedData);
   }
 
-  static empty(): CommitteeAttestationsAndSigners {
-    return new CommitteeAttestationsAndSigners([]);
+  static empty(signatureContext: CoordinationSignatureContext): CommitteeAttestationsAndSigners {
+    return new CommitteeAttestationsAndSigners([], signatureContext);
   }
 
   toString() {
@@ -53,9 +64,9 @@ export class CommitteeAttestationsAndSigners implements Signable {
    * @param attestations - Array of committee attestations with addresses and signatures
    * @returns Packed attestations with bitmap and tightly packed signature/address data
    */
-  getPackedAttestations(): ViemCommitteeAttestations {
-    const length = this.attestations.length;
-    const attestations = this.attestations.map(a => a.toViem());
+  static packAttestations(attestations: CommitteeAttestation[]): ViemCommitteeAttestations {
+    const length = attestations.length;
+    const viemAttestations = attestations.map(a => a.toViem());
 
     // Calculate bitmap size (1 bit per attestation, rounded up to nearest byte)
     const bitmapSize = Math.ceil(length / 8);
@@ -63,8 +74,8 @@ export class CommitteeAttestationsAndSigners implements Signable {
 
     // Calculate total data size needed
     let totalDataSize = 0;
-    for (let i = 0; i < length; i++) {
-      const signature = attestations[i].signature;
+    for (const attestation of viemAttestations) {
+      const signature = attestation.signature;
       // Check if signature is empty (v = 0)
       const isEmpty = signature.v === 0;
 
@@ -79,8 +90,7 @@ export class CommitteeAttestationsAndSigners implements Signable {
     let dataIndex = 0;
 
     // Pack the data
-    for (let i = 0; i < length; i++) {
-      const attestation = attestations[i];
+    for (const [i, attestation] of viemAttestations.entries()) {
       const signature = attestation.signature;
 
       // Check if signature is empty
@@ -90,7 +100,7 @@ export class CommitteeAttestationsAndSigners implements Signable {
         // Set bit in bitmap (bit 7-0 in each byte, left to right)
         const byteIndex = Math.floor(i / 8);
         const bitIndex = 7 - (i % 8);
-        signatureIndices[byteIndex] |= 1 << bitIndex;
+        signatureIndices[byteIndex] = (signatureIndices[byteIndex] ?? 0) | (1 << bitIndex);
 
         // Pack signature: v + r + s
         signaturesOrAddresses[dataIndex] = signature.v;
@@ -118,6 +128,10 @@ export class CommitteeAttestationsAndSigners implements Signable {
       signaturesOrAddresses: `0x${Buffer.from(signaturesOrAddresses).toString('hex')}`,
     };
   }
+
+  getPackedAttestations(): ViemCommitteeAttestations {
+    return CommitteeAttestationsAndSigners.packAttestations(this.attestations);
+  }
 }
 
 /**
@@ -130,8 +144,9 @@ export class MaliciousCommitteeAttestationsAndSigners extends CommitteeAttestati
   constructor(
     attestations: CommitteeAttestation[],
     private signers: EthAddress[],
+    signatureContext: CoordinationSignatureContext,
   ) {
-    super(attestations);
+    super(attestations, signatureContext);
   }
 
   override getSigners(): EthAddress[] {

package/src/checkpoint/checkpoint_data.ts

@@ -32,6 +32,8 @@ export type L1EnrichedCheckpointData = {
 export type StorageEnrichedCheckpointData = {
   archive: AppendOnlyTreeSnapshot;
   checkpointOutHash: Fr;
+  /** Fee asset price modifier in basis points. Defaults to 0 (no change) when not explicitly set. */
+  feeAssetPriceModifier: bigint;
 };
 
 /** Data stored only with proposed checkpoint data  */
@@ -70,6 +72,7 @@ export const CheckpointDataSchema = z
     checkpointOutHash: schemas.Fr,
     startBlock: BlockNumberSchema,
     blockCount: schemas.Integer,
+    feeAssetPriceModifier: schemas.BigInt,
     attestations: z.array(CommitteeAttestation.schema),
     l1: L1PublishedData.schema,
   })
@@ -81,6 +84,7 @@ export const CheckpointDataSchema = z
       checkpointOutHash: obj.checkpointOutHash,
       startBlock: obj.startBlock,
       blockCount: obj.blockCount,
+      feeAssetPriceModifier: obj.feeAssetPriceModifier,
       attestations: obj.attestations,
       l1: obj.l1,
     }),

package/src/config/chain-config.ts

@@ -1,5 +1,5 @@
 import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
-import type { ConfigMappingsType } from '@aztec/foundation/config';
+import { type ConfigMappingsType, numberConfigHelper } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
 export { type SequencerConfig, SequencerConfigSchema } from '../interfaces/configs.js';
@@ -14,8 +14,7 @@ export const emptyChainConfig: ChainConfig = {
 export const chainConfigMappings: ConfigMappingsType<ChainConfig> = {
   l1ChainId: {
     env: 'L1_CHAIN_ID',
-    parseEnv: (val: string) => +val,
-    defaultValue: 31337,
+    ...numberConfigHelper(31337),
     description: 'The chain ID of the ethereum host.',
   },
   rollupVersion: {

package/src/config/sequencer-config.ts

@@ -1,4 +1,9 @@
-import type { ConfigMappingsType } from '@aztec/foundation/config';
+import {
+  type ConfigMappingsType,
+  floatConfigHelper,
+  numberConfigHelper,
+  optionalNumberConfigHelper,
+} from '@aztec/foundation/config';
 
 import type { SequencerConfig } from '../interfaces/configs.js';
 import { DEFAULT_P2P_PROPAGATION_TIME } from '../timetable/index.js';
@@ -23,25 +28,24 @@ export const sharedSequencerConfigMappings: ConfigMappingsType<
     description:
       'Duration per block in milliseconds when building multiple blocks per slot. ' +
       'If undefined (default), builds a single block per slot using the full slot duration.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   expectedBlockProposalsPerSlot: {
     env: 'SEQ_EXPECTED_BLOCK_PROPOSALS_PER_SLOT',
     description:
       'Expected number of block proposals per slot for P2P peer scoring. ' +
       '0 (default) disables block proposal scoring. Set to a positive value to enable.',
-    parseEnv: (val: string) => parseInt(val, 10),
-    defaultValue: 0,
+    ...numberConfigHelper(0),
   },
   maxTxsPerBlock: {
     env: 'SEQ_MAX_TX_PER_BLOCK',
     description: 'The maximum number of txs to include in a block.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   attestationPropagationTime: {
     env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
     description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way).',
-    parseEnv: (val: string) => parseFloat(val),
     defaultValue: DEFAULT_P2P_PROPAGATION_TIME,
+    ...floatConfigHelper(DEFAULT_P2P_PROPAGATION_TIME),
   },
 };

package/src/ha-signing/local_config.ts

@@ -1,4 +1,4 @@
-import { type ConfigMappingsType, getConfigFromMappings } from '@aztec/foundation/config';
+import { type ConfigMappingsType, getConfigFromMappings, optionalNumberConfigHelper } from '@aztec/foundation/config';
 import { zodFor } from '@aztec/foundation/schemas';
 import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
 
@@ -26,7 +26,7 @@ export const localSignerConfigMappings: ConfigMappingsType<LocalSignerConfig> =
     env: 'SIGNING_PROTECTION_MAP_SIZE_KB',
     description:
       'Maximum size of the local signing-protection LMDB store in KB. Overwrites the general dataStoreMapSizeKb.',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
   },
 };
 

package/src/interfaces/archiver.ts

@@ -4,7 +4,7 @@ import type { ApiSchemaFor } from '@aztec/foundation/schemas';
 
 import { z } from 'zod';
 
-import { BlockDataSchema } from '../block/block_data.js';
+import { BlockDataSchema, BlockDataWithCheckpointContextSchema } from '../block/block_data.js';
 import { BlockHash } from '../block/block_hash.js';
 import { CheckpointedL2Block } from '../block/checkpointed_l2_block.js';
 import { L2Block } from '../block/l2_block.js';
@@ -117,6 +117,16 @@ export const ArchiverApiSchema: ApiSchemaFor<ArchiverApi> = {
   getBlockHeaderByArchive: z.function().args(schemas.Fr).returns(BlockHeader.schema.optional()),
   getBlockData: z.function().args(BlockNumberSchema).returns(BlockDataSchema.optional()),
   getBlockDataByArchive: z.function().args(schemas.Fr).returns(BlockDataSchema.optional()),
+  getBlockDataWithCheckpointContext: z
+    .function()
+    .args(BlockNumberSchema)
+    .returns(BlockDataWithCheckpointContextSchema.optional()),
+  getCheckpointData: z.function().args(CheckpointNumberSchema).returns(CheckpointDataSchema.optional()),
+  getCheckpointDataRange: z
+    .function()
+    .args(CheckpointNumberSchema, schemas.Integer)
+    .returns(z.array(CheckpointDataSchema)),
+  getCheckpointNumberBySlot: z.function().args(schemas.SlotNumber).returns(CheckpointNumberSchema.optional()),
   getL2Block: z.function().args(BlockNumberSchema).returns(L2Block.schema.optional()),
   getL2BlockByHash: z.function().args(BlockHash.schema).returns(L2Block.schema.optional()),
   getL2BlockByArchive: z.function().args(schemas.Fr).returns(L2Block.schema.optional()),
@@ -158,8 +168,8 @@ export const ArchiverApiSchema: ApiSchemaFor<ArchiverApi> = {
     .args()
     .returns(z.object({ genesisArchiveRoot: schemas.Fr })),
   getL1Timestamp: z.function().args().returns(schemas.BigInt.optional()),
-  getProposedCheckpoint: z.function().args().returns(ProposedCheckpointDataSchema.optional()),
-  getProposedCheckpointOnly: z.function().args().returns(ProposedCheckpointDataSchema.optional()),
+  getLastCheckpoint: z.function().args().returns(ProposedCheckpointDataSchema.optional()),
+  getLastProposedCheckpoint: z.function().args().returns(ProposedCheckpointDataSchema.optional()),
   syncImmediate: z.function().args().returns(z.void()),
   isPendingChainInvalid: z.function().args().returns(z.boolean()),
   getPendingChainValidationStatus: z.function().args().returns(ValidateCheckpointResultSchema),

package/src/interfaces/aztec-node-admin.ts

@@ -81,6 +81,8 @@ export type AztecNodeAdminConfig = Omit<ValidatorClientFullConfig, 'l1Contracts'
     'archiverPollingIntervalMS' | 'archiverBatchSize' | 'skipValidateCheckpointAttestations'
   > & {
     maxPendingTxCount: number;
+    // Keep in sync with P2PConfig.skipIncomingProposals (circular dep prevents Pick<P2PConfig, ...> here)
+    skipIncomingProposals?: boolean;
   };
 
 export const AztecNodeAdminConfigSchema = SequencerConfigSchema.merge(ProverConfigSchema)
@@ -93,7 +95,7 @@ export const AztecNodeAdminConfigSchema = SequencerConfigSchema.merge(ProverConf
       skipValidateCheckpointAttestations: true,
     }),
   )
-  .merge(z.object({ maxPendingTxCount: z.number() }));
+  .merge(z.object({ maxPendingTxCount: z.number(), skipIncomingProposals: z.boolean().optional() }));
 
 export const AztecNodeAdminApiSchema: ApiSchemaFor<AztecNodeAdmin> = {
   getConfig: z.function().returns(AztecNodeAdminConfigSchema),