@aztec/stdlib 0.0.1-commit.d3ec352c → 0.0.1-commit.d58ff9d0

package/dest/block/validate_block_result.d.ts

@@ -1,50 +1,65 @@
+import type { ViemCommitteeAttestations } from '@aztec/ethereum/contracts';
 import { EpochNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type ZodFor } from '@aztec/foundation/schemas';
 import { BufferReader } from '@aztec/foundation/serialize';
-import { type L2BlockInfo } from './l2_block_info.js';
+import { type CheckpointInfo } from '../checkpoint/checkpoint_info.js';
 import { CommitteeAttestation } from './proposal/committee_attestation.js';
-/** Subtype for invalid block validation results */
-export type ValidateBlockNegativeResult = {
+/** Subtype for invalid checkpoint validation results */
+export type ValidateCheckpointNegativeResult = {
     valid: false;
-    /** Identifiers from the invalid block */
-    block: L2BlockInfo;
-    /** Committee members at the epoch this block was proposed */
+    /** Identifiers from the invalid checkpoint */
+    checkpoint: CheckpointInfo;
+    /** Committee members at the epoch this checkpoint was proposed */
     committee: EthAddress[];
-    /** Epoch in which this block was proposed */
+    /** Epoch in which this checkpoint was proposed */
     epoch: EpochNumber;
     /** Proposer selection seed for the epoch */
     seed: bigint;
-    /** List of committee members who signed this block proposal */
+    /** List of committee members who signed this checkpoint proposal */
     attestors: EthAddress[];
-    /** Committee attestations for this block as they were posted to L1 */
+    /** Committee attestations for this checkpoint as they were posted to L1 */
     attestations: CommitteeAttestation[];
-    /** Reason for the block being invalid: not enough attestations were posted */
+    /**
+     * The exact packed `CommitteeAttestations` tuple as posted to L1 calldata, carried verbatim so the
+     * invalidation evidence is byte-faithful to the stored `attestationsHash`. A repack via
+     * `packAttestations` is not a round-trip inverse of `fromPacked`, so it would diverge from the hash
+     * and revert `invalidateBadAttestation`/`invalidateInsufficientAttestations`. Always populated on the
+     * calldata validation path, the only production source of invalidation evidence.
+     */
+    verbatimAttestations: ViemCommitteeAttestations;
+    /** Reason for the checkpoint being invalid: not enough attestations were posted */
     reason: 'insufficient-attestations';
 } | {
     valid: false;
-    /** Identifiers from the invalid block */
-    block: L2BlockInfo;
-    /** Committee members at the epoch this block was proposed */
+    /** Identifiers from the invalid checkpoint */
+    checkpoint: CheckpointInfo;
+    /** Committee members at the epoch this checkpoint was proposed */
     committee: EthAddress[];
-    /** Epoch in which this block was proposed */
+    /** Epoch in which this checkpoint was proposed */
     epoch: EpochNumber;
     /** Proposer selection seed for the epoch */
     seed: bigint;
-    /** List of committee members who signed this block proposal */
+    /** List of committee members who signed this checkpoint proposal */
     attestors: EthAddress[];
-    /** Committee attestations for this block as they were posted to L1 */
+    /** Committee attestations for this checkpoint as they were posted to L1 */
     attestations: CommitteeAttestation[];
-    /** Reason for the block being invalid: an invalid attestation was posted */
+    /**
+     * The exact packed `CommitteeAttestations` tuple as posted to L1 calldata, carried verbatim so the
+     * invalidation evidence is byte-faithful to the stored `attestationsHash`. See the same field on the
+     * insufficient-attestations variant for why a repack cannot be used.
+     */
+    verbatimAttestations: ViemCommitteeAttestations;
+    /** Reason for the checkpoint being invalid: an invalid attestation was posted */
     reason: 'invalid-attestation';
     /** Index in the attestations array of the invalid attestation posted */
     invalidIndex: number;
 };
-/** Result type for validating a block attestations */
-export type ValidateBlockResult = {
+/** Result type for validating checkpoint attestations */
+export type ValidateCheckpointResult = {
     valid: true;
-} | ValidateBlockNegativeResult;
-export declare const ValidateBlockResultSchema: ZodFor<ValidateBlockResult>;
-export declare function serializeValidateBlockResult(result: ValidateBlockResult): Buffer;
-export declare function deserializeValidateBlockResult(bufferOrReader: Buffer | BufferReader): ValidateBlockResult;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGVfYmxvY2tfcmVzdWx0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svdmFsaWRhdGVfYmxvY2tfcmVzdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQXFCLE1BQU0saUNBQWlDLENBQUM7QUFDakYsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBVyxNQUFNLDJCQUEyQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFJOUUsT0FBTyxFQUFtQixLQUFLLFdBQVcsRUFBNEMsTUFBTSxvQkFBb0IsQ0FBQztBQUNqSCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUUzRSxtREFBbUQ7QUFDbkQsTUFBTSxNQUFNLDJCQUEyQixHQUNuQztJQUNFLEtBQUssRUFBRSxLQUFLLENBQUM7SUFDYix5Q0FBeUM7SUFDekMsS0FBSyxFQUFFLFdBQVcsQ0FBQztJQUNuQiw2REFBNkQ7SUFDN0QsU0FBUyxFQUFFLFVBQVUsRUFBRSxDQUFDO0lBQ3hCLDZDQUE2QztJQUM3QyxLQUFLLEVBQUUsV0FBVyxDQUFDO0lBQ25CLDRDQUE0QztJQUM1QyxJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsK0RBQStEO0lBQy9ELFNBQVMsRUFBRSxVQUFVLEVBQUUsQ0FBQztJQUN4QixzRUFBc0U7SUFDdEUsWUFBWSxFQUFFLG9CQUFvQixFQUFFLENBQUM7SUFDckMsOEVBQThFO0lBQzlFLE1BQU0sRUFBRSwyQkFBMkIsQ0FBQztDQUNyQyxHQUNEO0lBQ0UsS0FBSyxFQUFFLEtBQUssQ0FBQztJQUNiLHlDQUF5QztJQUN6QyxLQUFLLEVBQUUsV0FBVyxDQUFDO0lBQ25CLDZEQUE2RDtJQUM3RCxTQUFTLEVBQUUsVUFBVSxFQUFFLENBQUM7SUFDeEIsNkNBQTZDO0lBQzdDLEtBQUssRUFBRSxXQUFXLENBQUM7SUFDbkIsNENBQTRDO0lBQzVDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYiwrREFBK0Q7SUFDL0QsU0FBUyxFQUFFLFVBQVUsRUFBRSxDQUFDO0lBQ3hCLHNFQUFzRTtJQUN0RSxZQUFZLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQztJQUNyQyw0RUFBNEU7SUFDNUUsTUFBTSxFQUFFLHFCQUFxQixDQUFDO0lBQzlCLHdFQUF3RTtJQUN4RSxZQUFZLEVBQUUsTUFBTSxDQUFDO0NBQ3RCLENBQUM7QUFHTixzREFBc0Q7QUFDdEQsTUFBTSxNQUFNLG1CQUFtQixHQUFHO0lBQUUsS0FBSyxFQUFFLElBQUksQ0FBQTtDQUFFLEdBQUcsMkJBQTJCLENBQUM7QUFFaEYsZUFBTyxNQUFNLHlCQUF5QixFQUFFLE1BQU0sQ0FBQyxtQkFBbUIsQ0F1QmhFLENBQUM7QUFFSCx3QkFBZ0IsNEJBQTRCLENBQUMsTUFBTSxFQUFFLG1CQUFtQixHQUFHLE1BQU0sQ0FxQmhGO0FBRUQsd0JBQWdCLDhCQUE4QixDQUFDLGNBQWMsRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLG1CQUFtQixDQXNCekcifQ==
+} | ValidateCheckpointNegativeResult;
+export declare const ValidateCheckpointResultSchema: ZodFor<ValidateCheckpointResult>;
+export declare function serializeValidateCheckpointResult(result: ValidateCheckpointResult): Buffer;
+export declare function deserializeValidateCheckpointResult(bufferOrReader: Buffer | BufferReader): ValidateCheckpointResult;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGVfYmxvY2tfcmVzdWx0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svdmFsaWRhdGVfYmxvY2tfcmVzdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDM0UsT0FBTyxFQUFFLFdBQVcsRUFBcUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0sMkJBQTJCLENBQUM7QUFDakUsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUs5RSxPQUFPLEVBQ0wsS0FBSyxjQUFjLEVBSXBCLE1BQU0sa0NBQWtDLENBQUM7QUFFMUMsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFM0Usd0RBQXdEO0FBQ3hELE1BQU0sTUFBTSxnQ0FBZ0MsR0FDeEM7SUFDRSxLQUFLLEVBQUUsS0FBSyxDQUFDO0lBQ2IsOENBQThDO0lBQzlDLFVBQVUsRUFBRSxjQUFjLENBQUM7SUFDM0Isa0VBQWtFO0lBQ2xFLFNBQVMsRUFBRSxVQUFVLEVBQUUsQ0FBQztJQUN4QixrREFBa0Q7SUFDbEQsS0FBSyxFQUFFLFdBQVcsQ0FBQztJQUNuQiw0Q0FBNEM7SUFDNUMsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNiLG9FQUFvRTtJQUNwRSxTQUFTLEVBQUUsVUFBVSxFQUFFLENBQUM7SUFDeEIsMkVBQTJFO0lBQzNFLFlBQVksRUFBRSxvQkFBb0IsRUFBRSxDQUFDO0lBQ3JDOzs7Ozs7T0FNRztJQUNILG9CQUFvQixFQUFFLHlCQUF5QixDQUFDO0lBQ2hELG1GQUFtRjtJQUNuRixNQUFNLEVBQUUsMkJBQTJCLENBQUM7Q0FDckMsR0FDRDtJQUNFLEtBQUssRUFBRSxLQUFLLENBQUM7SUFDYiw4Q0FBOEM7SUFDOUMsVUFBVSxFQUFFLGNBQWMsQ0FBQztJQUMzQixrRUFBa0U7SUFDbEUsU0FBUyxFQUFFLFVBQVUsRUFBRSxDQUFDO0lBQ3hCLGtEQUFrRDtJQUNsRCxLQUFLLEVBQUUsV0FBVyxDQUFDO0lBQ25CLDRDQUE0QztJQUM1QyxJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2Isb0VBQW9FO0lBQ3BFLFNBQVMsRUFBRSxVQUFVLEVBQUUsQ0FBQztJQUN4QiwyRUFBMkU7SUFDM0UsWUFBWSxFQUFFLG9CQUFvQixFQUFFLENBQUM7SUFDckM7Ozs7T0FJRztJQUNILG9CQUFvQixFQUFFLHlCQUF5QixDQUFDO0lBQ2hELGlGQUFpRjtJQUNqRixNQUFNLEVBQUUscUJBQXFCLENBQUM7SUFDOUIsd0VBQXdFO0lBQ3hFLFlBQVksRUFBRSxNQUFNLENBQUM7Q0FDdEIsQ0FBQztBQUVOLHlEQUF5RDtBQUN6RCxNQUFNLE1BQU0sd0JBQXdCLEdBQUc7SUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFBO0NBQUUsR0FBRyxnQ0FBZ0MsQ0FBQztBQVExRixlQUFPLE1BQU0sOEJBQThCLEVBQUUsTUFBTSxDQUFDLHdCQUF3QixDQXlCMUUsQ0FBQztBQUVILHdCQUFnQixpQ0FBaUMsQ0FBQyxNQUFNLEVBQUUsd0JBQXdCLEdBQUcsTUFBTSxDQTJCMUY7QUFFRCx3QkFBZ0IsbUNBQW1DLENBQUMsY0FBYyxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsd0JBQXdCLENBc0NuSCJ9

package/dest/block/validate_block_result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate_block_result.d.ts","sourceRoot":"","sources":["../../src/block/validate_block_result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAI9E,OAAO,EAAmB,KAAK,WAAW,EAA4C,MAAM,oBAAoB,CAAC;AACjH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,mDAAmD;AACnD,MAAM,MAAM,2BAA2B,GACnC;IACE,KAAK,EAAE,KAAK,CAAC;IACb,yCAAyC;IACzC,KAAK,EAAE,WAAW,CAAC;IACnB,6DAA6D;IAC7D,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,6CAA6C;IAC7C,KAAK,EAAE,WAAW,CAAC;IACnB,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,+DAA+D;IAC/D,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,sEAAsE;IACtE,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,8EAA8E;IAC9E,MAAM,EAAE,2BAA2B,CAAC;CACrC,GACD;IACE,KAAK,EAAE,KAAK,CAAC;IACb,yCAAyC;IACzC,KAAK,EAAE,WAAW,CAAC;IACnB,6DAA6D;IAC7D,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,6CAA6C;IAC7C,KAAK,EAAE,WAAW,CAAC;IACnB,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,+DAA+D;IAC/D,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,sEAAsE;IACtE,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,4EAA4E;IAC5E,MAAM,EAAE,qBAAqB,CAAC;IAC9B,wEAAwE;IACxE,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAGN,sDAAsD;AACtD,MAAM,MAAM,mBAAmB,GAAG;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GAAG,2BAA2B,CAAC;AAEhF,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,mBAAmB,CAuBhE,CAAC;AAEH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAqBhF;AAED,wBAAgB,8BAA8B,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,mBAAmB,CAsBzG"}
+{"version":3,"file":"validate_block_result.d.ts","sourceRoot":"","sources":["../../src/block/validate_block_result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAK9E,OAAO,EACL,KAAK,cAAc,EAIpB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,wDAAwD;AACxD,MAAM,MAAM,gCAAgC,GACxC;IACE,KAAK,EAAE,KAAK,CAAC;IACb,8CAA8C;IAC9C,UAAU,EAAE,cAAc,CAAC;IAC3B,kEAAkE;IAClE,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,kDAAkD;IAClD,KAAK,EAAE,WAAW,CAAC;IACnB,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,oEAAoE;IACpE,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,2EAA2E;IAC3E,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC;;;;;;OAMG;IACH,oBAAoB,EAAE,yBAAyB,CAAC;IAChD,mFAAmF;IACnF,MAAM,EAAE,2BAA2B,CAAC;CACrC,GACD;IACE,KAAK,EAAE,KAAK,CAAC;IACb,8CAA8C;IAC9C,UAAU,EAAE,cAAc,CAAC;IAC3B,kEAAkE;IAClE,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,kDAAkD;IAClD,KAAK,EAAE,WAAW,CAAC;IACnB,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,oEAAoE;IACpE,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,2EAA2E;IAC3E,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC;;;;OAIG;IACH,oBAAoB,EAAE,yBAAyB,CAAC;IAChD,iFAAiF;IACjF,MAAM,EAAE,qBAAqB,CAAC;IAC9B,wEAAwE;IACxE,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEN,yDAAyD;AACzD,MAAM,MAAM,wBAAwB,GAAG;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GAAG,gCAAgC,CAAC;AAQ1F,eAAO,MAAM,8BAA8B,EAAE,MAAM,CAAC,wBAAwB,CAyB1E,CAAC;AAEH,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,wBAAwB,GAAG,MAAM,CA2B1F;AAED,wBAAgB,mCAAmC,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,wBAAwB,CAsCnH"}

package/dest/block/validate_block_result.js

@@ -2,43 +2,53 @@ import { EpochNumber, EpochNumberSchema } from '@aztec/foundation/branded-types'
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { z } from 'zod';
-import { BlockInfoSchema, deserializeBlockInfo, serializeBlockInfo } from './l2_block_info.js';
+import { CheckpointInfoSchema, deserializeCheckpointInfo, serializeCheckpointInfo } from '../checkpoint/checkpoint_info.js';
+import { MAX_COMMITTEE_SIZE } from '../deserialization/index.js';
 import { CommitteeAttestation } from './proposal/committee_attestation.js';
-export const ValidateBlockResultSchema = z.union([
+/** Zod schema for the raw packed `CommitteeAttestations` viem tuple (two 0x-prefixed hex strings). */ const ViemCommitteeAttestationsSchema = z.object({
+    signatureIndices: schemas.HexStringWith0x,
+    signaturesOrAddresses: schemas.HexStringWith0x
+});
+export const ValidateCheckpointResultSchema = z.union([
     z.object({
         valid: z.literal(true)
     }),
     z.object({
         valid: z.literal(false),
-        block: BlockInfoSchema,
+        checkpoint: CheckpointInfoSchema,
         committee: z.array(schemas.EthAddress),
         epoch: EpochNumberSchema,
         seed: schemas.BigInt,
         attestors: z.array(schemas.EthAddress),
         attestations: z.array(CommitteeAttestation.schema),
+        verbatimAttestations: ViemCommitteeAttestationsSchema,
         reason: z.literal('insufficient-attestations')
     }),
     z.object({
         valid: z.literal(false),
-        block: BlockInfoSchema,
+        checkpoint: CheckpointInfoSchema,
         committee: z.array(schemas.EthAddress),
         epoch: EpochNumberSchema,
         seed: schemas.BigInt,
         attestors: z.array(schemas.EthAddress),
         attestations: z.array(CommitteeAttestation.schema),
+        verbatimAttestations: ViemCommitteeAttestationsSchema,
         reason: z.literal('invalid-attestation'),
         invalidIndex: z.number()
     })
 ]);
-export function serializeValidateBlockResult(result) {
+export function serializeValidateCheckpointResult(result) {
     if (result.valid) {
         return serializeToBuffer(true);
     }
-    const l2Block = serializeBlockInfo(result.block);
-    return serializeToBuffer(result.valid, result.reason, l2Block.length, l2Block, result.committee.length, result.committee, result.epoch, result.seed ?? 0n, result.attestors.length, result.attestors, result.attestations.length, result.attestations, result.reason === 'invalid-attestation' ? result.invalidIndex : 0);
+    const checkpointBuffer = serializeCheckpointInfo(result.checkpoint);
+    const signatureIndices = hexToBuffer(result.verbatimAttestations.signatureIndices);
+    const signaturesOrAddresses = hexToBuffer(result.verbatimAttestations.signaturesOrAddresses);
+    return serializeToBuffer(result.valid, result.reason, checkpointBuffer.length, checkpointBuffer, result.committee.length, result.committee, result.epoch, result.seed ?? 0n, result.attestors.length, result.attestors, result.attestations.length, result.attestations, result.reason === 'invalid-attestation' ? result.invalidIndex : 0, signatureIndices.length, signatureIndices, signaturesOrAddresses.length, signaturesOrAddresses);
 }
-export function deserializeValidateBlockResult(bufferOrReader) {
+export function deserializeValidateCheckpointResult(bufferOrReader) {
     const reader = BufferReader.asReader(bufferOrReader);
     const valid = reader.readBoolean();
     if (valid) {
@@ -46,36 +56,42 @@ export function deserializeValidateBlockResult(bufferOrReader) {
             valid
         };
     }
-    const reason = reader.readString();
-    const block = deserializeBlockInfo(reader.readBuffer());
-    const committee = reader.readVector(EthAddress);
+    const reason = reader.readString(64);
+    const checkpoint = deserializeCheckpointInfo(reader.readBuffer());
+    const committee = reader.readVector(EthAddress, MAX_COMMITTEE_SIZE);
     const epoch = EpochNumber(reader.readNumber());
     const seed = reader.readBigInt();
-    const attestors = reader.readVector(EthAddress);
-    const attestations = reader.readVector(CommitteeAttestation);
+    const attestors = reader.readVector(EthAddress, MAX_COMMITTEE_SIZE);
+    const attestations = reader.readVector(CommitteeAttestation, MAX_COMMITTEE_SIZE);
     const invalidIndex = reader.readNumber();
+    const verbatimAttestations = {
+        signatureIndices: bufferToHex(reader.readBuffer()),
+        signaturesOrAddresses: bufferToHex(reader.readBuffer())
+    };
     if (reason === 'insufficient-attestations') {
         return {
             valid,
             reason,
-            block,
+            checkpoint,
             committee,
             epoch,
             seed,
             attestors,
-            attestations: attestations
+            attestations,
+            verbatimAttestations
         };
     } else if (reason === 'invalid-attestation') {
         return {
             valid,
             reason,
-            block,
+            checkpoint,
             committee,
             epoch,
             seed,
             attestors,
             invalidIndex,
-            attestations: attestations
+            attestations,
+            verbatimAttestations
         };
     } else {
         const _ = reason;

package/dest/checkpoint/checkpoint.d.ts

@@ -1,124 +1,112 @@
-import { CheckpointNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/fields';
+import { CheckpointNumber, IndexWithinCheckpoint, SlotNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
-import { L2BlockNew } from '../block/l2_block_new.js';
+import { L2Block } from '../block/l2_block.js';
 import { CheckpointHeader } from '../rollup/checkpoint_header.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import type { CheckpointInfo } from './checkpoint_info.js';
+type FieldsOfCheckpoint = Omit<FieldsOf<Checkpoint>, 'slot'>;
 export declare class Checkpoint {
+    /** Snapshot of archive tree after the checkpoint is added. */
     archive: AppendOnlyTreeSnapshot;
+    /** Header of the checkpoint. */
     header: CheckpointHeader;
-    blocks: L2BlockNew[];
+    /** L2 blocks in the checkpoint. */
+    blocks: L2Block[];
+    /** Number of the checkpoint. */
     number: CheckpointNumber;
+    /** Fee asset price modifier in basis points (from oracle). Defaults to 0 (no change). */
+    feeAssetPriceModifier: bigint;
     constructor(
     /** Snapshot of archive tree after the checkpoint is added. */
     archive: AppendOnlyTreeSnapshot, 
     /** Header of the checkpoint. */
     header: CheckpointHeader, 
     /** L2 blocks in the checkpoint. */
-    blocks: L2BlockNew[], 
+    blocks: L2Block[], 
     /** Number of the checkpoint. */
-    number: CheckpointNumber);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        archive: z.ZodEffects<z.ZodObject<{
-            root: z.ZodType<Fr, any, string>;
-            nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-        }, "strip", z.ZodTypeAny, {
+    number: CheckpointNumber, 
+    /** Fee asset price modifier in basis points (from oracle). Defaults to 0 (no change). */
+    feeAssetPriceModifier?: bigint);
+    get slot(): SlotNumber;
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        archive: z.ZodPipe<z.ZodObject<{
+            root: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+            nextAvailableLeafIndex: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>;
+        }, z.core.$strip>, z.ZodTransform<AppendOnlyTreeSnapshot, {
             root: Fr;
             nextAvailableLeafIndex: number;
-        }, {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        }>, AppendOnlyTreeSnapshot, {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        }>;
+        }>>;
         header: import("../schemas/schemas.js").ZodFor<CheckpointHeader>;
-        blocks: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            archive: z.ZodEffects<z.ZodObject<{
-                root: z.ZodType<Fr, any, string>;
-                nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-            }, "strip", z.ZodTypeAny, {
+        blocks: z.ZodArray<z.ZodPipe<z.ZodObject<{
+            archive: z.ZodPipe<z.ZodObject<{
+                root: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+                nextAvailableLeafIndex: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>;
+            }, z.core.$strip>, z.ZodTransform<AppendOnlyTreeSnapshot, {
                 root: Fr;
                 nextAvailableLeafIndex: number;
-            }, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>, AppendOnlyTreeSnapshot, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>;
+            }>>;
             header: import("../schemas/schemas.js").ZodFor<import("../tx/block_header.js").BlockHeader>;
             body: import("../schemas/schemas.js").ZodFor<import("../block/body.js").Body>;
-        }, "strip", z.ZodTypeAny, {
+            checkpointNumber: z.ZodPipe<z.ZodPipe<z.ZodUnion<readonly [z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>, z.ZodTransform<CheckpointNumber, number>>;
+            indexWithinCheckpoint: z.ZodPipe<z.ZodPipe<z.ZodUnion<readonly [z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>, z.ZodTransform<IndexWithinCheckpoint, number>>;
+        }, z.core.$strip>, z.ZodTransform<L2Block, {
             archive: AppendOnlyTreeSnapshot;
             header: import("../tx/block_header.js").BlockHeader;
             body: import("../block/body.js").Body;
-        }, {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        }>, L2BlockNew, {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        }>, "many">;
-        number: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, CheckpointNumber, string | number | bigint>;
-    }, "strip", z.ZodTypeAny, {
+            checkpointNumber: CheckpointNumber;
+            indexWithinCheckpoint: IndexWithinCheckpoint;
+        }>>>;
+        number: z.ZodPipe<z.ZodPipe<z.ZodUnion<readonly [z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>, z.ZodTransform<CheckpointNumber, number>>;
+        feeAssetPriceModifier: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
+    }, z.core.$strip>, z.ZodTransform<Checkpoint, {
         archive: AppendOnlyTreeSnapshot;
         header: CheckpointHeader;
-        blocks: L2BlockNew[];
-        number: number & {
-            _branding: "CheckpointNumber";
-        };
-    }, {
-        archive: {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        };
-        header?: any;
-        blocks: {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        }[];
-        number: string | number | bigint;
-    }>, Checkpoint, {
-        archive: {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        };
-        header?: any;
-        blocks: {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        }[];
-        number: string | number | bigint;
-    }>;
-    static from(fields: FieldsOf<Checkpoint>): Checkpoint;
-    static getFields(fields: FieldsOf<Checkpoint>): readonly [AppendOnlyTreeSnapshot, CheckpointHeader, L2BlockNew[], CheckpointNumber];
+        blocks: L2Block[];
+        number: CheckpointNumber;
+        feeAssetPriceModifier: bigint;
+    }>>;
+    static from(fields: FieldsOfCheckpoint): Checkpoint;
+    static getFields(fields: FieldsOfCheckpoint): readonly [AppendOnlyTreeSnapshot, CheckpointHeader, L2Block[], CheckpointNumber, bigint];
     static fromBuffer(buf: Buffer | BufferReader): Checkpoint;
     toBuffer(): Buffer<ArrayBufferLike>;
     toBlobFields(): Fr[];
     hash(): Fr;
+    /**
+     * Returns the out hash computed from all l2-to-l1 messages in this checkpoint.
+     * Note: This value is different from the out hash in the header, which is the **accumulated** out hash over all
+     * checkpoints up to and including this one in the epoch.
+     */
+    getCheckpointOutHash(): Fr;
+    /**
+     * Returns the out hash computed from all l2-to-l1 messages in this checkpoint.
+     * Note: This value is different from the out hash in the header, which is the **accumulated** out hash over all
+     * checkpoints up to and including this one in the epoch.
+     */
+    static getCheckpointOutHash(blocks: L2Block[]): Fr;
     getState(): import("../tx/state_reference.js").StateReference;
-    static random(checkpointNumber?: CheckpointNumber, { numBlocks, startBlockNumber, ...options }?: {
+    toCheckpointInfo(): CheckpointInfo;
+    /** Returns stats used for logging */
+    getStats(): {
+        privateLogCount: number;
+        publicLogCount: number;
+        contractClassLogCount: number;
+        contractClassLogSize: number;
+        txCount: number;
+        blockCount: number;
+        slotNumber: SlotNumber;
+        checkpointNumber: CheckpointNumber;
+        timestamp: bigint;
+    };
+    static random(checkpointNumber?: CheckpointNumber, { numBlocks, startBlockNumber, previousArchive, feeAssetPriceModifier, ...options }?: {
         numBlocks?: number;
         startBlockNumber?: number;
-    } & Partial<Parameters<typeof CheckpointHeader.random>[0]> & Partial<Parameters<typeof L2BlockNew.random>[1]>): Promise<Checkpoint>;
+        previousArchive?: AppendOnlyTreeSnapshot;
+        feeAssetPriceModifier?: bigint;
+        archive?: AppendOnlyTreeSnapshot;
+    } & Partial<Parameters<typeof CheckpointHeader.random>[0]> & Partial<Parameters<typeof L2Block.random>[1]>): Promise<Checkpoint>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NoZWNrcG9pbnQvY2hlY2twb2ludC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWUsZ0JBQWdCLEVBQTBCLE1BQU0saUNBQWlDLENBQUM7QUFDeEcsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFDOUUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDbEUsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFFL0UscUJBQWEsVUFBVTtJQUdaLE9BQU8sRUFBRSxzQkFBc0I7SUFFL0IsTUFBTSxFQUFFLGdCQUFnQjtJQUV4QixNQUFNLEVBQUUsVUFBVSxFQUFFO0lBRXBCLE1BQU0sRUFBRSxnQkFBZ0I7SUFSakM7SUFDRSw4REFBOEQ7SUFDdkQsT0FBTyxFQUFFLHNCQUFzQjtJQUN0QyxnQ0FBZ0M7SUFDekIsTUFBTSxFQUFFLGdCQUFnQjtJQUMvQixtQ0FBbUM7SUFDNUIsTUFBTSxFQUFFLFVBQVUsRUFBRTtJQUMzQixnQ0FBZ0M7SUFDekIsTUFBTSxFQUFFLGdCQUFnQixFQUM3QjtJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BU2hCO0lBRUQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLFVBQVUsQ0FBQyxjQUV2QztJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxVQUFVLENBQUMsdUZBRTVDO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFlBQVksY0FRM0M7SUFFTSxRQUFRLDRCQUVkO0lBRU0sWUFBWSxJQUFJLEVBQUUsRUFBRSxDQUcxQjtJQUVNLElBQUksSUFBSSxFQUFFLENBRWhCO0lBRU0sUUFBUSxzREFFZDtJQUVELE9BQWEsTUFBTSxDQUNqQixnQkFBZ0IsbUJBQXNCLEVBQ3RDLEVBQ0UsU0FBYSxFQUNiLGdCQUFvQixFQUNwQixHQUFHLE9BQU8sRUFDWCxHQUFFO1FBQUUsU0FBUyxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQUMsZ0JBQWdCLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBRSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUMzRyxPQUFPLENBQUMsVUFBVSxDQUFDLE9BQU8sVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFNLHVCQVN4RDtDQUNGIn0=
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NoZWNrcG9pbnQvY2hlY2twb2ludC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBRUwsZ0JBQWdCLEVBRWhCLHFCQUFxQixFQUNyQixVQUFVLEVBQ1gsTUFBTSxpQ0FBaUMsQ0FBQztBQUV6QyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBNEMsTUFBTSw2QkFBNkIsQ0FBQztBQUNyRyxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUcvQyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVsRSxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUMvRSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUUzRCxLQUFLLGtCQUFrQixHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUM7QUFFN0QscUJBQWEsVUFBVTtJQUVuQiw4REFBOEQ7SUFDdkQsT0FBTyxFQUFFLHNCQUFzQjtJQUN0QyxnQ0FBZ0M7SUFDekIsTUFBTSxFQUFFLGdCQUFnQjtJQUMvQixtQ0FBbUM7SUFDNUIsTUFBTSxFQUFFLE9BQU8sRUFBRTtJQUN4QixnQ0FBZ0M7SUFDekIsTUFBTSxFQUFFLGdCQUFnQjtJQUMvQix5RkFBeUY7SUFDbEYscUJBQXFCLEVBQUUsTUFBTTtJQVZ0QztJQUNFLDhEQUE4RDtJQUN2RCxPQUFPLEVBQUUsc0JBQXNCO0lBQ3RDLGdDQUFnQztJQUN6QixNQUFNLEVBQUUsZ0JBQWdCO0lBQy9CLG1DQUFtQztJQUM1QixNQUFNLEVBQUUsT0FBTyxFQUFFO0lBQ3hCLGdDQUFnQztJQUN6QixNQUFNLEVBQUUsZ0JBQWdCO0lBQy9CLHlGQUF5RjtJQUNsRixxQkFBcUIsR0FBRSxNQUFXLEVBQ3ZDO0lBRUosSUFBSSxJQUFJLElBQUksVUFBVSxDQUVyQjtJQUVELE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7UUFhaEI7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsY0FFckM7SUFFRCxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsNEZBRTFDO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFlBQVksY0FRM0M7SUFFTSxRQUFRLDRCQVNkO0lBRU0sWUFBWSxJQUFJLEVBQUUsRUFBRSxDQUcxQjtJQUVNLElBQUksSUFBSSxFQUFFLENBRWhCO0lBRUQ7Ozs7T0FJRztJQUNJLG9CQUFvQixJQUFJLEVBQUUsQ0FFaEM7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxFQUFFLENBR2pEO0lBRU0sUUFBUSxzREFFZDtJQUVNLGdCQUFnQixJQUFJLGNBQWMsQ0FReEM7SUFFRCxxQ0FBcUM7SUFDOUIsUUFBUTs7Ozs7Ozs7OztNQWtCZDtJQUVELE9BQWEsTUFBTSxDQUNqQixnQkFBZ0IsbUJBQXNCLEVBQ3RDLEVBQ0UsU0FBYSxFQUNiLGdCQUFvQixFQUNwQixlQUFlLEVBQ2YscUJBQTBCLEVBQzFCLEdBQUcsT0FBTyxFQUNYLEdBQUU7UUFDRCxTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDbkIsZ0JBQWdCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDMUIsZUFBZSxDQUFDLEVBQUUsc0JBQXNCLENBQUM7UUFDekMscUJBQXFCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDL0IsT0FBTyxDQUFDLEVBQUUsc0JBQXNCLENBQUM7S0FDbEMsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLE9BQU8sZ0JBQWdCLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FDeEQsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBTSx1QkE0QnJEO0NBQ0YifQ==

package/dest/checkpoint/checkpoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkpoint.d.ts","sourceRoot":"","sources":["../../src/checkpoint/checkpoint.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,gBAAgB,EAA0B,MAAM,iCAAiC,CAAC;AACxG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,qBAAa,UAAU;IAGZ,OAAO,EAAE,sBAAsB;IAE/B,MAAM,EAAE,gBAAgB;IAExB,MAAM,EAAE,UAAU,EAAE;IAEpB,MAAM,EAAE,gBAAgB;IARjC;IACE,8DAA8D;IACvD,OAAO,EAAE,sBAAsB;IACtC,gCAAgC;IACzB,MAAM,EAAE,gBAAgB;IAC/B,mCAAmC;IAC5B,MAAM,EAAE,UAAU,EAAE;IAC3B,gCAAgC;IACzB,MAAM,EAAE,gBAAgB,EAC7B;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,cAEvC;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,uFAE5C;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,cAQ3C;IAEM,QAAQ,4BAEd;IAEM,YAAY,IAAI,EAAE,EAAE,CAG1B;IAEM,IAAI,IAAI,EAAE,CAEhB;IAEM,QAAQ,sDAEd;IAED,OAAa,MAAM,CACjB,gBAAgB,mBAAsB,EACtC,EACE,SAAa,EACb,gBAAoB,EACpB,GAAG,OAAO,EACX,GAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAC3G,OAAO,CAAC,UAAU,CAAC,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAM,uBASxD;CACF"}
+{"version":3,"file":"checkpoint.d.ts","sourceRoot":"","sources":["../../src/checkpoint/checkpoint.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,gBAAgB,EAEhB,qBAAqB,EACrB,UAAU,EACX,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAA4C,MAAM,6BAA6B,CAAC;AACrG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAG/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAElE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,KAAK,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;AAE7D,qBAAa,UAAU;IAEnB,8DAA8D;IACvD,OAAO,EAAE,sBAAsB;IACtC,gCAAgC;IACzB,MAAM,EAAE,gBAAgB;IAC/B,mCAAmC;IAC5B,MAAM,EAAE,OAAO,EAAE;IACxB,gCAAgC;IACzB,MAAM,EAAE,gBAAgB;IAC/B,yFAAyF;IAClF,qBAAqB,EAAE,MAAM;IAVtC;IACE,8DAA8D;IACvD,OAAO,EAAE,sBAAsB;IACtC,gCAAgC;IACzB,MAAM,EAAE,gBAAgB;IAC/B,mCAAmC;IAC5B,MAAM,EAAE,OAAO,EAAE;IACxB,gCAAgC;IACzB,MAAM,EAAE,gBAAgB;IAC/B,yFAAyF;IAClF,qBAAqB,GAAE,MAAW,EACvC;IAEJ,IAAI,IAAI,IAAI,UAAU,CAErB;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAahB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,kBAAkB,cAErC;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,kBAAkB,4FAE1C;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,cAQ3C;IAEM,QAAQ,4BASd;IAEM,YAAY,IAAI,EAAE,EAAE,CAG1B;IAEM,IAAI,IAAI,EAAE,CAEhB;IAED;;;;OAIG;IACI,oBAAoB,IAAI,EAAE,CAEhC;IAED;;;;OAIG;IACH,MAAM,CAAC,oBAAoB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAGjD;IAEM,QAAQ,sDAEd;IAEM,gBAAgB,IAAI,cAAc,CAQxC;IAED,qCAAqC;IAC9B,QAAQ;;;;;;;;;;MAkBd;IAED,OAAa,MAAM,CACjB,gBAAgB,mBAAsB,EACtC,EACE,SAAa,EACb,gBAAoB,EACpB,eAAe,EACf,qBAA0B,EAC1B,GAAG,OAAO,EACX,GAAE;QACD,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,eAAe,CAAC,EAAE,sBAAsB,CAAC;QACzC,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B,OAAO,CAAC,EAAE,sBAAsB,CAAC;KAClC,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GACxD,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAM,uBA4BrD;CACF"}

package/dest/checkpoint/checkpoint.js

@@ -1,28 +1,38 @@
 import { encodeCheckpointBlobDataFromBlocks } from '@aztec/blob-lib/encoding';
-import { BlockNumber, CheckpointNumber, CheckpointNumberSchema } from '@aztec/foundation/branded-types';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BlockNumber, CheckpointNumber, CheckpointNumberSchema, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
+import { pick, sum } from '@aztec/foundation/collection';
+import { BufferReader, serializeSignedBigInt, serializeToBuffer } from '@aztec/foundation/serialize';
 import { z } from 'zod';
-import { L2BlockNew } from '../block/l2_block_new.js';
+import { L2Block } from '../block/l2_block.js';
+import { MAX_CAPACITY_BLOCKS_PER_CHECKPOINT } from '../deserialization/index.js';
+import { computeCheckpointOutHash } from '../messaging/out_hash.js';
 import { CheckpointHeader } from '../rollup/checkpoint_header.js';
+import { schemas } from '../schemas/schemas.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 export class Checkpoint {
     archive;
     header;
     blocks;
     number;
-    constructor(/** Snapshot of archive tree after the checkpoint is added. */ archive, /** Header of the checkpoint. */ header, /** L2 blocks in the checkpoint. */ blocks, /** Number of the checkpoint. */ number){
+    feeAssetPriceModifier;
+    constructor(/** Snapshot of archive tree after the checkpoint is added. */ archive, /** Header of the checkpoint. */ header, /** L2 blocks in the checkpoint. */ blocks, /** Number of the checkpoint. */ number, /** Fee asset price modifier in basis points (from oracle). Defaults to 0 (no change). */ feeAssetPriceModifier = 0n){
         this.archive = archive;
         this.header = header;
         this.blocks = blocks;
         this.number = number;
+        this.feeAssetPriceModifier = feeAssetPriceModifier;
+    }
+    get slot() {
+        return this.header.slotNumber;
     }
     static get schema() {
         return z.object({
             archive: AppendOnlyTreeSnapshot.schema,
             header: CheckpointHeader.schema,
-            blocks: z.array(L2BlockNew.schema),
-            number: CheckpointNumberSchema
-        }).transform(({ archive, header, blocks, number })=>new Checkpoint(archive, header, blocks, number));
+            blocks: z.array(L2Block.schema),
+            number: CheckpointNumberSchema,
+            feeAssetPriceModifier: schemas.BigInt
+        }).transform(({ archive, header, blocks, number, feeAssetPriceModifier })=>new Checkpoint(archive, header, blocks, number, feeAssetPriceModifier));
     }
     static from(fields) {
         return new Checkpoint(...Checkpoint.getFields(fields));
@@ -32,31 +42,96 @@ export class Checkpoint {
             fields.archive,
             fields.header,
             fields.blocks,
-            fields.number
+            fields.number,
+            fields.feeAssetPriceModifier
         ];
     }
     static fromBuffer(buf) {
         const reader = BufferReader.asReader(buf);
-        return new Checkpoint(reader.readObject(AppendOnlyTreeSnapshot), reader.readObject(CheckpointHeader), reader.readVector(L2BlockNew), CheckpointNumber(reader.readNumber()));
+        const archive = reader.readObject(AppendOnlyTreeSnapshot);
+        const header = reader.readObject(CheckpointHeader);
+        const blocks = reader.readVector(L2Block, MAX_CAPACITY_BLOCKS_PER_CHECKPOINT);
+        const number = CheckpointNumber(reader.readNumber());
+        const feeAssetPriceModifier = reader.readInt256();
+        return new Checkpoint(archive, header, blocks, number, feeAssetPriceModifier);
     }
     toBuffer() {
-        return serializeToBuffer(this.archive, this.header, this.blocks.length, this.blocks, this.number);
+        return serializeToBuffer(this.archive, this.header, this.blocks.length, this.blocks, this.number, serializeSignedBigInt(this.feeAssetPriceModifier));
     }
     toBlobFields() {
-        const blocks = this.blocks.map((block, i)=>block.toBlockBlobData(i === 0));
+        const blocks = this.blocks.map((block)=>block.toBlockBlobData());
         return encodeCheckpointBlobDataFromBlocks(blocks);
     }
     hash() {
         return this.header.hash();
     }
+    /**
+   * Returns the out hash computed from all l2-to-l1 messages in this checkpoint.
+   * Note: This value is different from the out hash in the header, which is the **accumulated** out hash over all
+   * checkpoints up to and including this one in the epoch.
+   */ getCheckpointOutHash() {
+        return Checkpoint.getCheckpointOutHash(this.blocks);
+    }
+    /**
+   * Returns the out hash computed from all l2-to-l1 messages in this checkpoint.
+   * Note: This value is different from the out hash in the header, which is the **accumulated** out hash over all
+   * checkpoints up to and including this one in the epoch.
+   */ static getCheckpointOutHash(blocks) {
+        const msgs = blocks.map((block)=>block.body.txEffects.map((txEffect)=>txEffect.l2ToL1Msgs));
+        return computeCheckpointOutHash(msgs);
+    }
     getState() {
         return this.blocks.at(-1).header.state;
     }
-    static async random(checkpointNumber = CheckpointNumber(1), { numBlocks = 1, startBlockNumber = 1, ...options } = {}) {
-        const header = CheckpointHeader.random(options);
-        const blocks = await Promise.all(Array.from({
-            length: numBlocks
-        }, (_, i)=>L2BlockNew.random(BlockNumber(startBlockNumber + i), options)));
-        return new Checkpoint(AppendOnlyTreeSnapshot.random(), header, blocks, checkpointNumber);
+    toCheckpointInfo() {
+        return {
+            archive: this.archive.root,
+            lastArchive: this.header.lastArchiveRoot,
+            slotNumber: this.header.slotNumber,
+            checkpointNumber: this.number,
+            timestamp: this.header.timestamp
+        };
+    }
+    /** Returns stats used for logging */ getStats() {
+        const txEffects = this.blocks.flatMap((block)=>block.body.txEffects);
+        const logsStats = {
+            privateLogCount: sum(txEffects.map((tx)=>tx.privateLogs.length)),
+            publicLogCount: sum(txEffects.map((tx)=>tx.publicLogs.length)),
+            contractClassLogCount: sum(txEffects.map((tx)=>tx.contractClassLogs.length)),
+            contractClassLogSize: sum(txEffects.map((tx)=>sum(tx.contractClassLogs.map((log)=>log.emittedLength))))
+        };
+        return {
+            txCount: txEffects.length,
+            blockCount: this.blocks.length,
+            slotNumber: this.header.slotNumber,
+            checkpointNumber: this.number,
+            timestamp: this.header.timestamp,
+            ...logsStats
+        };
+    }
+    static async random(checkpointNumber = CheckpointNumber(1), { numBlocks = 1, startBlockNumber = 1, previousArchive, feeAssetPriceModifier = 0n, ...options } = {}) {
+        const headerOptions = previousArchive ? {
+            lastArchiveRoot: previousArchive.root,
+            ...options
+        } : options;
+        const header = CheckpointHeader.random(headerOptions);
+        // Create blocks sequentially to chain archive roots properly.
+        // Each block's header.lastArchive must equal the previous block's archive.
+        const blocks = [];
+        let lastArchive = previousArchive;
+        for(let i = 0; i < numBlocks; i++){
+            const block = await L2Block.random(BlockNumber(startBlockNumber + i), {
+                checkpointNumber,
+                indexWithinCheckpoint: IndexWithinCheckpoint(i),
+                ...options,
+                ...lastArchive ? {
+                    lastArchive
+                } : {},
+                ...pick(header, 'slotNumber', 'timestamp', 'coinbase', 'feeRecipient', 'gasFees')
+            });
+            lastArchive = block.archive;
+            blocks.push(block);
+        }
+        return new Checkpoint(options.archive ?? AppendOnlyTreeSnapshot.random(), header, blocks, checkpointNumber, feeAssetPriceModifier);
     }
 }