@aztec/stdlib 0.0.1-commit.b655e406 → 0.0.1-commit.c0b82b2

package/dest/rollup/checkpoint_constant_data.d.ts

@@ -1,11 +1,14 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
+import { inspect } from 'util';
 import { AztecAddress } from '../aztec-address/index.js';
 import { GasFees } from '../gas/gas_fees.js';
 /**
  * Constants that are the same for the entire checkpoint.
+ * Used in circuits during rollup proving.
  */
 export declare class CheckpointConstantData {
     /** ChainId of the rollup. */
@@ -19,7 +22,7 @@ export declare class CheckpointConstantData {
     /** Identifier of the prover. */
     proverId: Fr;
     /** Slot number of the checkpoint. */
-    slotNumber: Fr;
+    slotNumber: SlotNumber;
     /** Coinbase address of the rollup. */
     coinbase: EthAddress;
     /** Address to receive fees. */
@@ -38,7 +41,7 @@ export declare class CheckpointConstantData {
     /** Identifier of the prover. */
     proverId: Fr, 
     /** Slot number of the checkpoint. */
-    slotNumber: Fr, 
+    slotNumber: SlotNumber, 
     /** Coinbase address of the rollup. */
     coinbase: EthAddress, 
     /** Address to receive fees. */
@@ -46,9 +49,29 @@ export declare class CheckpointConstantData {
     /** Global gas fees for this checkpoint. */
     gasFees: GasFees);
     static from(fields: FieldsOf<CheckpointConstantData>): CheckpointConstantData;
-    static getFields(fields: FieldsOf<CheckpointConstantData>): readonly [Fr, Fr, Fr, Fr, Fr, Fr, EthAddress, AztecAddress, GasFees];
+    static getFields(fields: FieldsOf<CheckpointConstantData>): readonly [Fr, Fr, Fr, Fr, Fr, SlotNumber, EthAddress, AztecAddress, GasFees];
     static empty(): CheckpointConstantData;
     toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): CheckpointConstantData;
+    /**
+     * Returns the slot number as a SlotNumber branded type.
+     * @deprecated Use slotNumber directly instead.
+     */
+    getSlotNumber(): SlotNumber;
+    toInspect(): {
+        chainId: number;
+        version: number;
+        vkTreeRoot: `0x${string}`;
+        protocolContractsHash: `0x${string}`;
+        proverId: `0x${string}`;
+        slotNumber: SlotNumber;
+        coinbase: `0x${string}`;
+        feeRecipient: `0x${string}`;
+        gasFees: {
+            feePerDaGas: bigint;
+            feePerL2Gas: bigint;
+        };
+    };
+    [inspect.custom](): string;
 }
-//# sourceMappingURL=checkpoint_constant_data.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9jb25zdGFudF9kYXRhLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcm9sbHVwL2NoZWNrcG9pbnRfY29uc3RhbnRfZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDN0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFL0IsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU3Qzs7O0dBR0c7QUFDSCxxQkFBYSxzQkFBc0I7SUFFL0IsNkJBQTZCO0lBQ3RCLE9BQU8sRUFBRSxFQUFFO0lBQ2xCLDZCQUE2QjtJQUN0QixPQUFPLEVBQUUsRUFBRTtJQUNsQix5Q0FBeUM7SUFDbEMsVUFBVSxFQUFFLEVBQUU7SUFDckIsMkNBQTJDO0lBQ3BDLHFCQUFxQixFQUFFLEVBQUU7SUFDaEMsZ0NBQWdDO0lBQ3pCLFFBQVEsRUFBRSxFQUFFO0lBQ25CLHFDQUFxQztJQUM5QixVQUFVLEVBQUUsVUFBVTtJQUM3QixzQ0FBc0M7SUFDL0IsUUFBUSxFQUFFLFVBQVU7SUFDM0IsK0JBQStCO0lBQ3hCLFlBQVksRUFBRSxZQUFZO0lBQ2pDLDJDQUEyQztJQUNwQyxPQUFPLEVBQUUsT0FBTztJQWxCekI7SUFDRSw2QkFBNkI7SUFDdEIsT0FBTyxFQUFFLEVBQUU7SUFDbEIsNkJBQTZCO0lBQ3RCLE9BQU8sRUFBRSxFQUFFO0lBQ2xCLHlDQUF5QztJQUNsQyxVQUFVLEVBQUUsRUFBRTtJQUNyQiwyQ0FBMkM7SUFDcEMscUJBQXFCLEVBQUUsRUFBRTtJQUNoQyxnQ0FBZ0M7SUFDekIsUUFBUSxFQUFFLEVBQUU7SUFDbkIscUNBQXFDO0lBQzlCLFVBQVUsRUFBRSxVQUFVO0lBQzdCLHNDQUFzQztJQUMvQixRQUFRLEVBQUUsVUFBVTtJQUMzQiwrQkFBK0I7SUFDeEIsWUFBWSxFQUFFLFlBQVk7SUFDakMsMkNBQTJDO0lBQ3BDLE9BQU8sRUFBRSxPQUFPLEVBQ3JCO0lBRUosTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLHNCQUFzQixDQUFDLDBCQUVuRDtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxzQkFBc0IsQ0FBQyxnRkFZeEQ7SUFFRCxNQUFNLENBQUMsS0FBSywyQkFZWDtJQUVELFFBQVEsNEJBWVA7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSwwQkFhOUM7SUFFRDs7O09BR0c7SUFDSCxhQUFhLElBQUksVUFBVSxDQUUxQjtJQUVELFNBQVM7Ozs7Ozs7Ozs7Ozs7TUFZUjtJQUVELENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxXQUVmO0NBQ0YifQ==

package/dest/rollup/checkpoint_constant_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkpoint_constant_data.d.ts","sourceRoot":"","sources":["../../src/rollup/checkpoint_constant_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,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,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C;;GAEG;AACH,qBAAa,sBAAsB;IAE/B,6BAA6B;IACtB,OAAO,EAAE,EAAE;IAClB,6BAA6B;IACtB,OAAO,EAAE,EAAE;IAClB,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,2CAA2C;IACpC,qBAAqB,EAAE,EAAE;IAChC,gCAAgC;IACzB,QAAQ,EAAE,EAAE;IACnB,qCAAqC;IAC9B,UAAU,EAAE,EAAE;IACrB,sCAAsC;IAC/B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,2CAA2C;IACpC,OAAO,EAAE,OAAO;;IAjBvB,6BAA6B;IACtB,OAAO,EAAE,EAAE;IAClB,6BAA6B;IACtB,OAAO,EAAE,EAAE;IAClB,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,2CAA2C;IACpC,qBAAqB,EAAE,EAAE;IAChC,gCAAgC;IACzB,QAAQ,EAAE,EAAE;IACnB,qCAAqC;IAC9B,UAAU,EAAE,EAAE;IACrB,sCAAsC;IAC/B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,2CAA2C;IACpC,OAAO,EAAE,OAAO;IAGzB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,sBAAsB,CAAC;IAIpD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,sBAAsB,CAAC;IAczD,MAAM,CAAC,KAAK;IAcZ,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;CAchD"}
+{"version":3,"file":"checkpoint_constant_data.d.ts","sourceRoot":"","sources":["../../src/rollup/checkpoint_constant_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C;;;GAGG;AACH,qBAAa,sBAAsB;IAE/B,6BAA6B;IACtB,OAAO,EAAE,EAAE;IAClB,6BAA6B;IACtB,OAAO,EAAE,EAAE;IAClB,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,2CAA2C;IACpC,qBAAqB,EAAE,EAAE;IAChC,gCAAgC;IACzB,QAAQ,EAAE,EAAE;IACnB,qCAAqC;IAC9B,UAAU,EAAE,UAAU;IAC7B,sCAAsC;IAC/B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,2CAA2C;IACpC,OAAO,EAAE,OAAO;IAlBzB;IACE,6BAA6B;IACtB,OAAO,EAAE,EAAE;IAClB,6BAA6B;IACtB,OAAO,EAAE,EAAE;IAClB,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,2CAA2C;IACpC,qBAAqB,EAAE,EAAE;IAChC,gCAAgC;IACzB,QAAQ,EAAE,EAAE;IACnB,qCAAqC;IAC9B,UAAU,EAAE,UAAU;IAC7B,sCAAsC;IAC/B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,2CAA2C;IACpC,OAAO,EAAE,OAAO,EACrB;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,sBAAsB,CAAC,0BAEnD;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,sBAAsB,CAAC,gFAYxD;IAED,MAAM,CAAC,KAAK,2BAYX;IAED,QAAQ,4BAYP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,0BAa9C;IAED;;;OAGG;IACH,aAAa,IAAI,UAAU,CAE1B;IAED,SAAS;;;;;;;;;;;;;MAYR;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAEf;CACF"}

package/dest/rollup/checkpoint_constant_data.js

@@ -1,10 +1,15 @@
+var _computedKey;
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { inspect } from 'util';
 import { AztecAddress } from '../aztec-address/index.js';
 import { GasFees } from '../gas/gas_fees.js';
+_computedKey = inspect.custom;
 /**
  * Constants that are the same for the entire checkpoint.
+ * Used in circuits during rollup proving.
  */ export class CheckpointConstantData {
     chainId;
     version;
@@ -43,13 +48,35 @@ import { GasFees } from '../gas/gas_fees.js';
         ];
     }
     static empty() {
-        return new CheckpointConstantData(Fr.ZERO, Fr.ZERO, Fr.ZERO, Fr.ZERO, Fr.ZERO, Fr.ZERO, EthAddress.ZERO, AztecAddress.ZERO, GasFees.empty());
+        return new CheckpointConstantData(Fr.ZERO, Fr.ZERO, Fr.ZERO, Fr.ZERO, Fr.ZERO, SlotNumber.ZERO, EthAddress.ZERO, AztecAddress.ZERO, GasFees.empty());
     }
     toBuffer() {
-        return serializeToBuffer(...CheckpointConstantData.getFields(this));
+        return serializeToBuffer(this.chainId, this.version, this.vkTreeRoot, this.protocolContractsHash, this.proverId, new Fr(this.slotNumber), this.coinbase, this.feeRecipient, this.gasFees);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new CheckpointConstantData(Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readObject(EthAddress), reader.readObject(AztecAddress), reader.readObject(GasFees));
+        return new CheckpointConstantData(Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader), SlotNumber(Fr.fromBuffer(reader).toNumber()), reader.readObject(EthAddress), reader.readObject(AztecAddress), reader.readObject(GasFees));
+    }
+    /**
+   * Returns the slot number as a SlotNumber branded type.
+   * @deprecated Use slotNumber directly instead.
+   */ getSlotNumber() {
+        return this.slotNumber;
+    }
+    toInspect() {
+        return {
+            chainId: this.chainId.toNumber(),
+            version: this.version.toNumber(),
+            vkTreeRoot: this.vkTreeRoot.toString(),
+            protocolContractsHash: this.protocolContractsHash.toString(),
+            proverId: this.proverId.toString(),
+            slotNumber: this.slotNumber,
+            coinbase: this.coinbase.toString(),
+            feeRecipient: this.feeRecipient.toString(),
+            gasFees: this.gasFees.toInspect()
+        };
+    }
+    [_computedKey]() {
+        return `CheckpointConstantData ${inspect(this.toInspect())}`;
     }
 }

package/dest/rollup/checkpoint_header.d.ts

@@ -1,21 +1,39 @@
-import type { ViemHeader } from '@aztec/ethereum';
+import type { ViemHeader } from '@aztec/ethereum/contracts';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import type { ZodFor } from '@aztec/foundation/schemas';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { inspect } from 'util';
 import { AztecAddress } from '../aztec-address/index.js';
 import { GasFees } from '../gas/index.js';
-import { ContentCommitment } from '../tx/content_commitment.js';
+import type { GlobalVariables } from '../tx/global_variables.js';
 import type { UInt64 } from '../types/shared.js';
+/**
+ * Header of a checkpoint. A checkpoint is a collection of blocks submitted to L1 all within the same slot.
+ * This header is verified as-is in the rollup circuits, posted to the L1 rollup contract, stored in the archiver,
+ * and exposed via the Aztec Node API. See `CheckpointData` for a struct that includes the header plus extra metadata.
+ */
 export declare class CheckpointHeader {
     /** Root of the archive tree before this block is added. */
     lastArchiveRoot: Fr;
-    /** Content commitment of the L2 block. */
-    contentCommitment: ContentCommitment;
+    /** Hash of the headers of all blocks in this checkpoint. */
+    blockHeadersHash: Fr;
+    /** Hash of the blobs in the checkpoint. */
+    blobsHash: Fr;
+    /** Root of the l1 to l2 messages subtree. */
+    inHash: Fr;
+    /**
+     * The root of the epoch out hash balanced tree. The out hash of the first checkpoint in the epoch is inserted at
+     * index 0, the second at index 1, and so on.
+     * Note: This is not necessarily the final epoch out hash. It includes only the out hashes of checkpoints up to and
+     * including the current checkpoint. Any subsequent checkpoints added to the same epoch are not reflected in this
+     * value.
+     */
+    epochOutHash: Fr;
     /** Slot number of the L2 block */
-    slotNumber: Fr;
+    slotNumber: SlotNumber;
     /** Timestamp of the L2 block. */
     timestamp: UInt64;
     /** Recipient of block reward. */
@@ -29,10 +47,22 @@ export declare class CheckpointHeader {
     constructor(
     /** Root of the archive tree before this block is added. */
     lastArchiveRoot: Fr, 
-    /** Content commitment of the L2 block. */
-    contentCommitment: ContentCommitment, 
+    /** Hash of the headers of all blocks in this checkpoint. */
+    blockHeadersHash: Fr, 
+    /** Hash of the blobs in the checkpoint. */
+    blobsHash: Fr, 
+    /** Root of the l1 to l2 messages subtree. */
+    inHash: Fr, 
+    /**
+     * The root of the epoch out hash balanced tree. The out hash of the first checkpoint in the epoch is inserted at
+     * index 0, the second at index 1, and so on.
+     * Note: This is not necessarily the final epoch out hash. It includes only the out hashes of checkpoints up to and
+     * including the current checkpoint. Any subsequent checkpoints added to the same epoch are not reflected in this
+     * value.
+     */
+    epochOutHash: Fr, 
     /** Slot number of the L2 block */
-    slotNumber: Fr, 
+    slotNumber: SlotNumber, 
     /** Timestamp of the L2 block. */
     timestamp: UInt64, 
     /** Recipient of block reward. */
@@ -44,14 +74,16 @@ export declare class CheckpointHeader {
     /** Total mana used in the block, computed by the root rollup circuit */
     totalManaUsed: Fr);
     static get schema(): ZodFor<CheckpointHeader>;
-    static getFields(fields: FieldsOf<CheckpointHeader>): readonly [Fr, ContentCommitment, Fr, bigint, EthAddress, AztecAddress, GasFees, Fr];
+    static getFields(fields: FieldsOf<CheckpointHeader>): readonly [Fr, Fr, Fr, Fr, Fr, SlotNumber, bigint, EthAddress, AztecAddress, GasFees, Fr];
     static from(fields: FieldsOf<CheckpointHeader>): CheckpointHeader;
     static fromBuffer(buffer: Buffer | BufferReader): CheckpointHeader;
     equals(other: CheckpointHeader): boolean;
+    /** Returns true if the global variables match those in the checkpoint header. */
+    matchesGlobalVariables(other: GlobalVariables): boolean;
     toBuffer(): Buffer<ArrayBufferLike>;
     hash(): Fr;
     static empty(fields?: Partial<FieldsOf<CheckpointHeader>>): CheckpointHeader;
-    static random(): CheckpointHeader;
+    static random(overrides?: Partial<FieldsOf<CheckpointHeader>>): CheckpointHeader;
     isEmpty(): boolean;
     /**
      * Serializes this instance into a string.
@@ -60,15 +92,19 @@ export declare class CheckpointHeader {
     toString(): `0x${string}`;
     static fromString(str: string): CheckpointHeader;
     static fromViem(header: ViemHeader): CheckpointHeader;
+    /**
+     * Returns the slot number as a SlotNumber branded type.
+     * @deprecated Use slotNumber directly instead.
+     */
+    getSlotNumber(): SlotNumber;
     toViem(): ViemHeader;
     toInspect(): {
         lastArchive: `0x${string}`;
-        contentCommitment: {
-            blobsHash: `0x${string}`;
-            inHash: `0x${string}`;
-            outHash: `0x${string}`;
-        };
-        slotNumber: bigint;
+        blockHeadersHash: `0x${string}`;
+        blobsHash: `0x${string}`;
+        inHash: `0x${string}`;
+        epochOutHash: `0x${string}`;
+        slotNumber: SlotNumber;
         timestamp: bigint;
         coinbase: `0x${string}`;
         feeRecipient: `0x${string}`;
@@ -80,4 +116,4 @@ export declare class CheckpointHeader {
     };
     [inspect.custom](): string;
 }
-//# sourceMappingURL=checkpoint_header.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9oZWFkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9yb2xsdXAvY2hlY2twb2ludF9oZWFkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTdELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDeEQsT0FBTyxFQUFFLFlBQVksRUFBdUMsTUFBTSw2QkFBNkIsQ0FBQztBQUVoRyxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRy9CLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFMUMsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFakQ7Ozs7R0FJRztBQUNILHFCQUFhLGdCQUFnQjtJQUV6QiwyREFBMkQ7SUFDcEQsZUFBZSxFQUFFLEVBQUU7SUFDMUIsNERBQTREO0lBQ3JELGdCQUFnQixFQUFFLEVBQUU7SUFDM0IsMkNBQTJDO0lBQ3BDLFNBQVMsRUFBRSxFQUFFO0lBQ3BCLDZDQUE2QztJQUN0QyxNQUFNLEVBQUUsRUFBRTtJQUNqQjs7Ozs7O09BTUc7SUFDSSxZQUFZLEVBQUUsRUFBRTtJQUN2QixrQ0FBa0M7SUFDM0IsVUFBVSxFQUFFLFVBQVU7SUFDN0IsaUNBQWlDO0lBQzFCLFNBQVMsRUFBRSxNQUFNO0lBQ3hCLGlDQUFpQztJQUMxQixRQUFRLEVBQUUsVUFBVTtJQUMzQiwrQkFBK0I7SUFDeEIsWUFBWSxFQUFFLFlBQVk7SUFDakMsd0NBQXdDO0lBQ2pDLE9BQU8sRUFBRSxPQUFPO0lBQ3ZCLHdFQUF3RTtJQUNqRSxhQUFhLEVBQUUsRUFBRTtJQTVCMUI7SUFDRSwyREFBMkQ7SUFDcEQsZUFBZSxFQUFFLEVBQUU7SUFDMUIsNERBQTREO0lBQ3JELGdCQUFnQixFQUFFLEVBQUU7SUFDM0IsMkNBQTJDO0lBQ3BDLFNBQVMsRUFBRSxFQUFFO0lBQ3BCLDZDQUE2QztJQUN0QyxNQUFNLEVBQUUsRUFBRTtJQUNqQjs7Ozs7O09BTUc7SUFDSSxZQUFZLEVBQUUsRUFBRTtJQUN2QixrQ0FBa0M7SUFDM0IsVUFBVSxFQUFFLFVBQVU7SUFDN0IsaUNBQWlDO0lBQzFCLFNBQVMsRUFBRSxNQUFNO0lBQ3hCLGlDQUFpQztJQUMxQixRQUFRLEVBQUUsVUFBVTtJQUMzQiwrQkFBK0I7SUFDeEIsWUFBWSxFQUFFLFlBQVk7SUFDakMsd0NBQXdDO0lBQ2pDLE9BQU8sRUFBRSxPQUFPO0lBQ3ZCLHdFQUF3RTtJQUNqRSxhQUFhLEVBQUUsRUFBRSxFQUN0QjtJQUVKLE1BQU0sS0FBSyxNQUFNLElBQUksTUFBTSxDQUFDLGdCQUFnQixDQUFDLENBZ0I1QztJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyw0RkFjbEQ7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsZ0JBQWdCLENBQUMsb0JBRTdDO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksb0JBZ0I5QztJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsZ0JBQWdCLFdBYzdCO0lBRUQsaUZBQWlGO0lBQ2pGLHNCQUFzQixDQUFDLEtBQUssRUFBRSxlQUFlLFdBUTVDO0lBRUQsUUFBUSw0QkFlUDtJQUVELElBQUksSUFBSSxFQUFFLENBRVQ7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sR0FBRSxPQUFPLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDLENBQU0sb0JBZTVEO0lBRUQsTUFBTSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEdBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFNLEdBQUcsZ0JBQWdCLENBZW5GO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FjakI7SUFFRDs7O09BR0c7SUFDSSxRQUFRLGtCQUVkO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxvQkFFNUI7SUFFRCxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxVQUFVLG9CQWNqQztJQUVEOzs7T0FHRztJQUNILGFBQWEsSUFBSSxVQUFVLENBRTFCO0lBRUQsTUFBTSxJQUFJLFVBQVUsQ0FpQm5CO0lBRUQsU0FBUzs7Ozs7Ozs7Ozs7Ozs7O01BY1I7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FjZjtDQUNGIn0=

package/dest/rollup/checkpoint_header.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkpoint_header.d.ts","sourceRoot":"","sources":["../../src/rollup/checkpoint_header.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAuC,MAAM,6BAA6B,CAAC;AAEhG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,qBAAa,gBAAgB;IAEzB,2DAA2D;IACpD,eAAe,EAAE,EAAE;IAC1B,0CAA0C;IACnC,iBAAiB,EAAE,iBAAiB;IAC3C,kCAAkC;IAC3B,UAAU,EAAE,EAAE;IACrB,iCAAiC;IAC1B,SAAS,EAAE,MAAM;IACxB,iCAAiC;IAC1B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,wCAAwC;IACjC,OAAO,EAAE,OAAO;IACvB,wEAAwE;IACjE,aAAa,EAAE,EAAE;;IAfxB,2DAA2D;IACpD,eAAe,EAAE,EAAE;IAC1B,0CAA0C;IACnC,iBAAiB,EAAE,iBAAiB;IAC3C,kCAAkC;IAC3B,UAAU,EAAE,EAAE;IACrB,iCAAiC;IAC1B,SAAS,EAAE,MAAM;IACxB,iCAAiC;IAC1B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,wCAAwC;IACjC,OAAO,EAAE,OAAO;IACvB,wEAAwE;IACjE,aAAa,EAAE,EAAE;IAG1B,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAa5C;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAanD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAI9C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAe/C,MAAM,CAAC,KAAK,EAAE,gBAAgB;IAa9B,QAAQ;IAcR,IAAI,IAAI,EAAE;IAIV,MAAM,CAAC,KAAK,CAAC,MAAM,GAAE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAM;IAc7D,MAAM,CAAC,MAAM,IAAI,gBAAgB;IAajC,OAAO,IAAI,OAAO;IAalB;;;OAGG;IACI,QAAQ;IAIf,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU;IAalC,MAAM,IAAI,UAAU;IAgBpB,SAAS;;;;;;;;;;;;;;;;;IAaT,CAAC,OAAO,CAAC,MAAM,CAAC;CAajB"}
+{"version":3,"file":"checkpoint_header.d.ts","sourceRoot":"","sources":["../../src/rollup/checkpoint_header.ts"],"names":[],"mappings":"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"}

package/dest/rollup/checkpoint_header.js

@@ -1,6 +1,8 @@
-import { sha256ToField } from '@aztec/foundation/crypto';
+var _computedKey;
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { sha256ToField } from '@aztec/foundation/crypto/sha256';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, bigintToUInt64BE, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { inspect } from 'util';
@@ -8,19 +10,35 @@ import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
 import { GasFees } from '../gas/index.js';
 import { schemas } from '../schemas/index.js';
-import { ContentCommitment } from '../tx/content_commitment.js';
-export class CheckpointHeader {
+_computedKey = inspect.custom;
+/**
+ * Header of a checkpoint. A checkpoint is a collection of blocks submitted to L1 all within the same slot.
+ * This header is verified as-is in the rollup circuits, posted to the L1 rollup contract, stored in the archiver,
+ * and exposed via the Aztec Node API. See `CheckpointData` for a struct that includes the header plus extra metadata.
+ */ export class CheckpointHeader {
     lastArchiveRoot;
-    contentCommitment;
+    blockHeadersHash;
+    blobsHash;
+    inHash;
+    epochOutHash;
     slotNumber;
     timestamp;
     coinbase;
     feeRecipient;
     gasFees;
     totalManaUsed;
-    constructor(/** Root of the archive tree before this block is added. */ lastArchiveRoot, /** Content commitment of the L2 block. */ contentCommitment, /** Slot number of the L2 block */ slotNumber, /** Timestamp of the L2 block. */ timestamp, /** Recipient of block reward. */ coinbase, /** Address to receive fees. */ feeRecipient, /** Global gas prices for this block. */ gasFees, /** Total mana used in the block, computed by the root rollup circuit */ totalManaUsed){
+    constructor(/** Root of the archive tree before this block is added. */ lastArchiveRoot, /** Hash of the headers of all blocks in this checkpoint. */ blockHeadersHash, /** Hash of the blobs in the checkpoint. */ blobsHash, /** Root of the l1 to l2 messages subtree. */ inHash, /**
+     * The root of the epoch out hash balanced tree. The out hash of the first checkpoint in the epoch is inserted at
+     * index 0, the second at index 1, and so on.
+     * Note: This is not necessarily the final epoch out hash. It includes only the out hashes of checkpoints up to and
+     * including the current checkpoint. Any subsequent checkpoints added to the same epoch are not reflected in this
+     * value.
+     */ epochOutHash, /** Slot number of the L2 block */ slotNumber, /** Timestamp of the L2 block. */ timestamp, /** Recipient of block reward. */ coinbase, /** Address to receive fees. */ feeRecipient, /** Global gas prices for this block. */ gasFees, /** Total mana used in the block, computed by the root rollup circuit */ totalManaUsed){
         this.lastArchiveRoot = lastArchiveRoot;
-        this.contentCommitment = contentCommitment;
+        this.blockHeadersHash = blockHeadersHash;
+        this.blobsHash = blobsHash;
+        this.inHash = inHash;
+        this.epochOutHash = epochOutHash;
         this.slotNumber = slotNumber;
         this.timestamp = timestamp;
         this.coinbase = coinbase;
@@ -31,8 +49,11 @@ export class CheckpointHeader {
     static get schema() {
         return z.object({
             lastArchiveRoot: schemas.Fr,
-            contentCommitment: ContentCommitment.schema,
-            slotNumber: schemas.Fr,
+            blockHeadersHash: schemas.Fr,
+            blobsHash: schemas.Fr,
+            inHash: schemas.Fr,
+            epochOutHash: schemas.Fr,
+            slotNumber: schemas.SlotNumber,
             timestamp: schemas.BigInt,
             coinbase: schemas.EthAddress,
             feeRecipient: schemas.AztecAddress,
@@ -43,7 +64,10 @@ export class CheckpointHeader {
     static getFields(fields) {
         return [
             fields.lastArchiveRoot,
-            fields.contentCommitment,
+            fields.blockHeadersHash,
+            fields.blobsHash,
+            fields.inHash,
+            fields.epochOutHash,
             fields.slotNumber,
             fields.timestamp,
             fields.coinbase,
@@ -57,17 +81,23 @@ export class CheckpointHeader {
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new CheckpointHeader(reader.readObject(Fr), reader.readObject(ContentCommitment), Fr.fromBuffer(reader), reader.readUInt64(), reader.readObject(EthAddress), reader.readObject(AztecAddress), reader.readObject(GasFees), reader.readObject(Fr));
+        return new CheckpointHeader(reader.readObject(Fr), reader.readObject(Fr), reader.readObject(Fr), reader.readObject(Fr), reader.readObject(Fr), SlotNumber(Fr.fromBuffer(reader).toNumber()), reader.readUInt64(), reader.readObject(EthAddress), reader.readObject(AztecAddress), reader.readObject(GasFees), reader.readObject(Fr));
     }
     equals(other) {
-        return this.lastArchiveRoot.equals(other.lastArchiveRoot) && this.contentCommitment.equals(other.contentCommitment) && this.slotNumber.equals(other.slotNumber) && this.timestamp === other.timestamp && this.coinbase.equals(other.coinbase) && this.feeRecipient.equals(other.feeRecipient) && this.gasFees.equals(other.gasFees) && this.totalManaUsed.equals(other.totalManaUsed);
+        return this.lastArchiveRoot.equals(other.lastArchiveRoot) && this.blockHeadersHash.equals(other.blockHeadersHash) && this.blobsHash.equals(other.blobsHash) && this.inHash.equals(other.inHash) && this.epochOutHash.equals(other.epochOutHash) && this.slotNumber === other.slotNumber && this.timestamp === other.timestamp && this.coinbase.equals(other.coinbase) && this.feeRecipient.equals(other.feeRecipient) && this.gasFees.equals(other.gasFees) && this.totalManaUsed.equals(other.totalManaUsed);
+    }
+    /** Returns true if the global variables match those in the checkpoint header. */ matchesGlobalVariables(other) {
+        return this.coinbase.equals(other.coinbase) && this.feeRecipient.equals(other.feeRecipient) && this.gasFees.equals(other.gasFees) && this.slotNumber === other.slotNumber && this.timestamp === other.timestamp;
     }
     toBuffer() {
         // Note: The order here must match the order in the ProposedHeaderLib solidity library.
         return serializeToBuffer([
             this.lastArchiveRoot,
-            this.contentCommitment,
-            this.slotNumber,
+            this.blockHeadersHash,
+            this.blobsHash,
+            this.inHash,
+            this.epochOutHash,
+            new Fr(this.slotNumber),
             bigintToUInt64BE(this.timestamp),
             this.coinbase,
             this.feeRecipient,
@@ -83,8 +113,11 @@ export class CheckpointHeader {
     static empty(fields = {}) {
         return CheckpointHeader.from({
             lastArchiveRoot: Fr.ZERO,
-            contentCommitment: ContentCommitment.empty(),
-            slotNumber: Fr.ZERO,
+            blockHeadersHash: Fr.ZERO,
+            blobsHash: Fr.ZERO,
+            inHash: Fr.ZERO,
+            epochOutHash: Fr.ZERO,
+            slotNumber: SlotNumber.ZERO,
             timestamp: 0n,
             coinbase: EthAddress.ZERO,
             feeRecipient: AztecAddress.ZERO,
@@ -93,11 +126,24 @@ export class CheckpointHeader {
             ...fields
         });
     }
-    static random() {
-        return new CheckpointHeader(Fr.random(), ContentCommitment.random(), new Fr(BigInt(Math.floor(Math.random() * 1000) + 1)), BigInt(Math.floor(Date.now() / 1000)), EthAddress.random(), new AztecAddress(Fr.random()), GasFees.random(), new Fr(BigInt(Math.floor(Math.random() * 1000000))));
+    static random(overrides = {}) {
+        return CheckpointHeader.from({
+            lastArchiveRoot: Fr.random(),
+            blockHeadersHash: Fr.random(),
+            blobsHash: Fr.random(),
+            inHash: Fr.random(),
+            epochOutHash: Fr.random(),
+            slotNumber: SlotNumber(Math.floor(Math.random() * 1000) + 1),
+            timestamp: BigInt(Math.floor(Date.now() / 1000)),
+            coinbase: EthAddress.random(),
+            feeRecipient: new AztecAddress(Fr.random()),
+            gasFees: GasFees.random(),
+            totalManaUsed: new Fr(BigInt(Math.floor(Math.random() * 1000000))),
+            ...overrides
+        });
     }
     isEmpty() {
-        return this.lastArchiveRoot.isZero() && this.contentCommitment.isEmpty() && this.slotNumber.isZero() && this.timestamp === 0n && this.coinbase.isZero() && this.feeRecipient.isZero() && this.gasFees.isEmpty() && this.totalManaUsed.isZero();
+        return this.lastArchiveRoot.isZero() && this.blockHeadersHash.isZero() && this.blobsHash.isZero() && this.inHash.isZero() && this.epochOutHash.isZero() && this.slotNumber === 0 && this.timestamp === 0n && this.coinbase.isZero() && this.feeRecipient.isZero() && this.gasFees.isEmpty() && this.totalManaUsed.isZero();
     }
     /**
    * Serializes this instance into a string.
@@ -109,13 +155,22 @@ export class CheckpointHeader {
         return CheckpointHeader.fromBuffer(hexToBuffer(str));
     }
     static fromViem(header) {
-        return new CheckpointHeader(Fr.fromString(header.lastArchiveRoot), ContentCommitment.fromViem(header.contentCommitment), new Fr(header.slotNumber), header.timestamp, new EthAddress(hexToBuffer(header.coinbase)), new AztecAddress(hexToBuffer(header.feeRecipient)), new GasFees(header.gasFees.feePerDaGas, header.gasFees.feePerL2Gas), new Fr(header.totalManaUsed));
+        return new CheckpointHeader(Fr.fromString(header.lastArchiveRoot), Fr.fromString(header.blockHeadersHash), Fr.fromString(header.blobsHash), Fr.fromString(header.inHash), Fr.fromString(header.outHash), SlotNumber.fromBigInt(header.slotNumber), header.timestamp, new EthAddress(hexToBuffer(header.coinbase)), new AztecAddress(hexToBuffer(header.feeRecipient)), new GasFees(header.gasFees.feePerDaGas, header.gasFees.feePerL2Gas), new Fr(header.totalManaUsed));
+    }
+    /**
+   * Returns the slot number as a SlotNumber branded type.
+   * @deprecated Use slotNumber directly instead.
+   */ getSlotNumber() {
+        return this.slotNumber;
     }
     toViem() {
         return {
             lastArchiveRoot: this.lastArchiveRoot.toString(),
-            contentCommitment: this.contentCommitment.toViem(),
-            slotNumber: this.slotNumber.toBigInt(),
+            blockHeadersHash: this.blockHeadersHash.toString(),
+            blobsHash: this.blobsHash.toString(),
+            inHash: this.inHash.toString(),
+            outHash: this.epochOutHash.toString(),
+            slotNumber: BigInt(this.slotNumber),
             timestamp: this.timestamp,
             coinbase: this.coinbase.toString(),
             feeRecipient: `0x${this.feeRecipient.toBuffer().toString('hex').padStart(64, '0')}`,
@@ -129,8 +184,11 @@ export class CheckpointHeader {
     toInspect() {
         return {
             lastArchive: this.lastArchiveRoot.toString(),
-            contentCommitment: this.contentCommitment.toInspect(),
-            slotNumber: this.slotNumber.toBigInt(),
+            blockHeadersHash: this.blockHeadersHash.toString(),
+            blobsHash: this.blobsHash.toString(),
+            inHash: this.inHash.toString(),
+            epochOutHash: this.epochOutHash.toString(),
+            slotNumber: this.slotNumber,
             timestamp: this.timestamp,
             coinbase: this.coinbase.toString(),
             feeRecipient: this.feeRecipient.toString(),
@@ -138,16 +196,18 @@ export class CheckpointHeader {
             totalManaUsed: this.totalManaUsed.toBigInt()
         };
     }
-    [inspect.custom]() {
-        const gasfees = `da:${this.gasFees.feePerDaGas}, l2:${this.gasFees.feePerL2Gas}`;
+    [_computedKey]() {
         return `Header {
   lastArchiveRoot: ${this.lastArchiveRoot.toString()},
-  contentCommitment: ${inspect(this.contentCommitment)},
-  slotNumber: ${this.slotNumber.toBigInt()},
+  blockHeadersHash: ${this.blockHeadersHash.toString()},
+  blobsHash: ${inspect(this.blobsHash)},
+  inHash: ${inspect(this.inHash)},
+  epochOutHash: ${inspect(this.epochOutHash)},
+  slotNumber: ${this.slotNumber},
   timestamp: ${this.timestamp},
   coinbase: ${this.coinbase.toString()},
   feeRecipient: ${this.feeRecipient.toString()},
-  gasFees: ${gasfees},
+  gasFees: { da:${this.gasFees.feePerDaGas}, l2:${this.gasFees.feePerL2Gas} },
   totalManaUsed: ${this.totalManaUsed.toBigInt()},
 }`;
     }

package/dest/rollup/checkpoint_merge_rollup_private_inputs.d.ts

@@ -27,4 +27,4 @@ export declare class CheckpointMergeRollupPrivateInputs {
     toJSON(): Buffer<ArrayBufferLike>;
     static get schema(): import("zod").ZodType<CheckpointMergeRollupPrivateInputs, any, string>;
 }
-//# sourceMappingURL=checkpoint_merge_rollup_private_inputs.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9tZXJnZV9yb2xsdXBfcHJpdmF0ZV9pbnB1dHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9yb2xsdXAvY2hlY2twb2ludF9tZXJnZV9yb2xsdXBfcHJpdmF0ZV9pbnB1dHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUc5RSxPQUFPLEVBQWEsS0FBSyxtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzlFLE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBRXBGOztHQUVHO0FBQ0gscUJBQWEsa0NBQWtDO0lBRTNDOztPQUVHO0lBQ0ksZUFBZSxFQUFFO1FBQ3RCLG1CQUFtQixDQUFDLDRCQUE0QixDQUFDO1FBQ2pELG1CQUFtQixDQUFDLDRCQUE0QixDQUFDO0tBQ2xEO0lBUEg7SUFDRTs7T0FFRztJQUNJLGVBQWUsRUFBRTtRQUN0QixtQkFBbUIsQ0FBQyw0QkFBNEIsQ0FBQztRQUNqRCxtQkFBbUIsQ0FBQyw0QkFBNEIsQ0FBQztLQUNsRCxFQUNDO0lBRUosUUFBUSw0QkFFUDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLHNDQU05QztJQUVELFFBQVEsa0JBRVA7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLHNDQUU1QjtJQUVELE1BQU0sNEJBRUw7SUFFRCxNQUFNLEtBQUssTUFBTSwyRUFFaEI7Q0FDRiJ9

package/dest/rollup/checkpoint_merge_rollup_private_inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkpoint_merge_rollup_private_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/checkpoint_merge_rollup_private_inputs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAa,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEpF;;GAEG;AACH,qBAAa,kCAAkC;IAE3C;;OAEG;IACI,eAAe,EAAE;QACtB,mBAAmB,CAAC,4BAA4B,CAAC;QACjD,mBAAmB,CAAC,4BAA4B,CAAC;KAClD;;IAND;;OAEG;IACI,eAAe,EAAE;QACtB,mBAAmB,CAAC,4BAA4B,CAAC;QACjD,mBAAmB,CAAC,4BAA4B,CAAC;KAClD;IAGH,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAQ/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM;IAIN,MAAM,KAAK,MAAM,2EAEhB;CACF"}
+{"version":3,"file":"checkpoint_merge_rollup_private_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/checkpoint_merge_rollup_private_inputs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAa,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEpF;;GAEG;AACH,qBAAa,kCAAkC;IAE3C;;OAEG;IACI,eAAe,EAAE;QACtB,mBAAmB,CAAC,4BAA4B,CAAC;QACjD,mBAAmB,CAAC,4BAA4B,CAAC;KAClD;IAPH;IACE;;OAEG;IACI,eAAe,EAAE;QACtB,mBAAmB,CAAC,4BAA4B,CAAC;QACjD,mBAAmB,CAAC,4BAA4B,CAAC;KAClD,EACC;IAEJ,QAAQ,4BAEP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,sCAM9C;IAED,QAAQ,kBAEP;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,sCAE5B;IAED,MAAM,4BAEL;IAED,MAAM,KAAK,MAAM,2EAEhB;CACF"}

package/dest/rollup/checkpoint_rollup_public_inputs.d.ts

@@ -1,7 +1,7 @@
 import { BlobAccumulator, FinalBlobBatchingChallenges } from '@aztec/blob-lib/types';
-import { AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
+import { MAX_CHECKPOINTS_PER_EPOCH } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
@@ -22,14 +22,22 @@ export declare class CheckpointRollupPublicInputs {
      * Archive tree after adding this checkpoint range.
      */
     newArchive: AppendOnlyTreeSnapshot;
+    /**
+     * The out hash tree snapshot immediately before this checkpoint range.
+     */
+    previousOutHash: AppendOnlyTreeSnapshot;
+    /**
+     * The out hash tree snapshot after applying this checkpoint range.
+     */
+    newOutHash: AppendOnlyTreeSnapshot;
     /**
      * The hashes of the headers of the constituent checkpoints.
      */
-    checkpointHeaderHashes: Tuple<Fr, typeof AZTEC_MAX_EPOCH_DURATION>;
+    checkpointHeaderHashes: Tuple<Fr, typeof MAX_CHECKPOINTS_PER_EPOCH>;
     /**
      * The summed transaction fees and recipients of the constituent checkpoints.
      */
-    fees: Tuple<FeeRecipient, typeof AZTEC_MAX_EPOCH_DURATION>;
+    fees: Tuple<FeeRecipient, typeof MAX_CHECKPOINTS_PER_EPOCH>;
     /**
      * Accumulated opening proofs for all blobs before this checkpoint range.
      */
@@ -55,14 +63,22 @@ export declare class CheckpointRollupPublicInputs {
      * Archive tree after adding this checkpoint range.
      */
     newArchive: AppendOnlyTreeSnapshot, 
+    /**
+     * The out hash tree snapshot immediately before this checkpoint range.
+     */
+    previousOutHash: AppendOnlyTreeSnapshot, 
+    /**
+     * The out hash tree snapshot after applying this checkpoint range.
+     */
+    newOutHash: AppendOnlyTreeSnapshot, 
     /**
      * The hashes of the headers of the constituent checkpoints.
      */
-    checkpointHeaderHashes: Tuple<Fr, typeof AZTEC_MAX_EPOCH_DURATION>, 
+    checkpointHeaderHashes: Tuple<Fr, typeof MAX_CHECKPOINTS_PER_EPOCH>, 
     /**
      * The summed transaction fees and recipients of the constituent checkpoints.
      */
-    fees: Tuple<FeeRecipient, typeof AZTEC_MAX_EPOCH_DURATION>, 
+    fees: Tuple<FeeRecipient, typeof MAX_CHECKPOINTS_PER_EPOCH>, 
     /**
      * Accumulated opening proofs for all blobs before this checkpoint range.
      */
@@ -103,4 +119,4 @@ export declare class FeeRecipient {
     };
     static random(): FeeRecipient;
 }
-//# sourceMappingURL=checkpoint_rollup_public_inputs.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9yb2xsdXBfcHVibGljX2lucHV0cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3JvbGx1cC9jaGVja3BvaW50X3JvbGx1cF9wdWJsaWNfaW5wdXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxlQUFlLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRixPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM3RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNELE9BQU8sRUFBRSxZQUFZLEVBQUUsS0FBSyxLQUFLLEVBQXdDLE1BQU0sNkJBQTZCLENBQUM7QUFFN0csT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDL0UsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFN0Q7O0dBRUc7QUFDSCxxQkFBYSw0QkFBNEI7SUFFckM7O09BRUc7SUFDSSxTQUFTLEVBQUUsaUJBQWlCO0lBQ25DOztPQUVHO0lBQ0ksZUFBZSxFQUFFLHNCQUFzQjtJQUM5Qzs7T0FFRztJQUNJLFVBQVUsRUFBRSxzQkFBc0I7SUFDekM7O09BRUc7SUFDSSxlQUFlLEVBQUUsc0JBQXNCO0lBQzlDOztPQUVHO0lBQ0ksVUFBVSxFQUFFLHNCQUFzQjtJQUN6Qzs7T0FFRztJQUNJLHNCQUFzQixFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsT0FBTyx5QkFBeUIsQ0FBQztJQUMxRTs7T0FFRztJQUNJLElBQUksRUFBRSxLQUFLLENBQUMsWUFBWSxFQUFFLE9BQU8seUJBQXlCLENBQUM7SUFDbEU7O09BRUc7SUFDSSxvQkFBb0IsRUFBRSxlQUFlO0lBQzVDOztPQUVHO0lBQ0ksa0JBQWtCLEVBQUUsZUFBZTtJQUMxQzs7T0FFRztJQUNJLG1CQUFtQixFQUFFLDJCQUEyQjtJQXhDekQ7SUFDRTs7T0FFRztJQUNJLFNBQVMsRUFBRSxpQkFBaUI7SUFDbkM7O09BRUc7SUFDSSxlQUFlLEVBQUUsc0JBQXNCO0lBQzlDOztPQUVHO0lBQ0ksVUFBVSxFQUFFLHNCQUFzQjtJQUN6Qzs7T0FFRztJQUNJLGVBQWUsRUFBRSxzQkFBc0I7SUFDOUM7O09BRUc7SUFDSSxVQUFVLEVBQUUsc0JBQXNCO0lBQ3pDOztPQUVHO0lBQ0ksc0JBQXNCLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxPQUFPLHlCQUF5QixDQUFDO0lBQzFFOztPQUVHO0lBQ0ksSUFBSSxFQUFFLEtBQUssQ0FBQyxZQUFZLEVBQUUsT0FBTyx5QkFBeUIsQ0FBQztJQUNsRTs7T0FFRztJQUNJLG9CQUFvQixFQUFFLGVBQWU7SUFDNUM7O09BRUc7SUFDSSxrQkFBa0IsRUFBRSxlQUFlO0lBQzFDOztPQUVHO0lBQ0ksbUJBQW1CLEVBQUUsMkJBQTJCLEVBQ3JEO0lBRUosTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksZ0NBYzlDO0lBRUQsUUFBUSw0QkFhUDtJQUVELFFBQVEsa0JBRVA7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLGdDQUU1QjtJQUVELDhEQUE4RDtJQUM5RCxNQUFNLDRCQUVMO0lBRUQsNkNBQTZDO0lBQzdDLE1BQU0sS0FBSyxNQUFNLHFFQUVoQjtDQUNGO0FBRUQscUJBQWEsWUFBWTtJQUVkLFNBQVMsRUFBRSxVQUFVO0lBQ3JCLEtBQUssRUFBRSxFQUFFO0lBRmxCLFlBQ1MsU0FBUyxFQUFFLFVBQVUsRUFDckIsS0FBSyxFQUFFLEVBQUUsRUFDZDtJQUVKLE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsWUFBWSxDQUc3RDtJQUVELFFBQVEsNEJBRVA7SUFFRCxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsWUFBWSxDQUFDLDZCQUU5QztJQUVELFFBQVEsU0FFUDtJQUVELE1BQU0sQ0FBQyxLQUFLLGlCQUVYO0lBRUQsT0FBTyxZQUVOO0lBRUQsY0FBYzs7Ozs7O01BS2I7SUFFRCxNQUFNLENBQUMsTUFBTSxpQkFFWjtDQUNGIn0=

package/dest/rollup/checkpoint_rollup_public_inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkpoint_rollup_public_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/checkpoint_rollup_public_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAwC,MAAM,6BAA6B,CAAC;AAE7G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;GAEG;AACH,qBAAa,4BAA4B;IAErC;;OAEG;IACI,SAAS,EAAE,iBAAiB;IACnC;;OAEG;IACI,eAAe,EAAE,sBAAsB;IAC9C;;OAEG;IACI,UAAU,EAAE,sBAAsB;IACzC;;OAEG;IACI,sBAAsB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wBAAwB,CAAC;IACzE;;OAEG;IACI,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,OAAO,wBAAwB,CAAC;IACjE;;OAEG;IACI,oBAAoB,EAAE,eAAe;IAC5C;;OAEG;IACI,kBAAkB,EAAE,eAAe;IAC1C;;OAEG;IACI,mBAAmB,EAAE,2BAA2B;;IA/BvD;;OAEG;IACI,SAAS,EAAE,iBAAiB;IACnC;;OAEG;IACI,eAAe,EAAE,sBAAsB;IAC9C;;OAEG;IACI,UAAU,EAAE,sBAAsB;IACzC;;OAEG;IACI,sBAAsB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wBAAwB,CAAC;IACzE;;OAEG;IACI,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,OAAO,wBAAwB,CAAC;IACjE;;OAEG;IACI,oBAAoB,EAAE,eAAe;IAC5C;;OAEG;IACI,kBAAkB,EAAE,eAAe;IAC1C;;OAEG;IACI,mBAAmB,EAAE,2BAA2B;IAGzD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAc/C,QAAQ;IAaR,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,8DAA8D;IAC9D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,qEAEhB;CACF;AAED,qBAAa,YAAY;IAEd,SAAS,EAAE,UAAU;IACrB,KAAK,EAAE,EAAE;gBADT,SAAS,EAAE,UAAU,EACrB,KAAK,EAAE,EAAE;IAGlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY;IAK9D,QAAQ;IAIR,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC;IAI/C,QAAQ;IAIR,MAAM,CAAC,KAAK;IAIZ,OAAO;IAIP,cAAc;;;;;;;IAOd,MAAM,CAAC,MAAM;CAGd"}
+{"version":3,"file":"checkpoint_rollup_public_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/checkpoint_rollup_public_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAwC,MAAM,6BAA6B,CAAC;AAE7G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;GAEG;AACH,qBAAa,4BAA4B;IAErC;;OAEG;IACI,SAAS,EAAE,iBAAiB;IACnC;;OAEG;IACI,eAAe,EAAE,sBAAsB;IAC9C;;OAEG;IACI,UAAU,EAAE,sBAAsB;IACzC;;OAEG;IACI,eAAe,EAAE,sBAAsB;IAC9C;;OAEG;IACI,UAAU,EAAE,sBAAsB;IACzC;;OAEG;IACI,sBAAsB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,yBAAyB,CAAC;IAC1E;;OAEG;IACI,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,OAAO,yBAAyB,CAAC;IAClE;;OAEG;IACI,oBAAoB,EAAE,eAAe;IAC5C;;OAEG;IACI,kBAAkB,EAAE,eAAe;IAC1C;;OAEG;IACI,mBAAmB,EAAE,2BAA2B;IAxCzD;IACE;;OAEG;IACI,SAAS,EAAE,iBAAiB;IACnC;;OAEG;IACI,eAAe,EAAE,sBAAsB;IAC9C;;OAEG;IACI,UAAU,EAAE,sBAAsB;IACzC;;OAEG;IACI,eAAe,EAAE,sBAAsB;IAC9C;;OAEG;IACI,UAAU,EAAE,sBAAsB;IACzC;;OAEG;IACI,sBAAsB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,yBAAyB,CAAC;IAC1E;;OAEG;IACI,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,OAAO,yBAAyB,CAAC;IAClE;;OAEG;IACI,oBAAoB,EAAE,eAAe;IAC5C;;OAEG;IACI,kBAAkB,EAAE,eAAe;IAC1C;;OAEG;IACI,mBAAmB,EAAE,2BAA2B,EACrD;IAEJ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,gCAc9C;IAED,QAAQ,4BAaP;IAED,QAAQ,kBAEP;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,gCAE5B;IAED,8DAA8D;IAC9D,MAAM,4BAEL;IAED,6CAA6C;IAC7C,MAAM,KAAK,MAAM,qEAEhB;CACF;AAED,qBAAa,YAAY;IAEd,SAAS,EAAE,UAAU;IACrB,KAAK,EAAE,EAAE;IAFlB,YACS,SAAS,EAAE,UAAU,EACrB,KAAK,EAAE,EAAE,EACd;IAEJ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY,CAG7D;IAED,QAAQ,4BAEP;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,6BAE9C;IAED,QAAQ,SAEP;IAED,MAAM,CAAC,KAAK,iBAEX;IAED,OAAO,YAEN;IAED,cAAc;;;;;;MAKb;IAED,MAAM,CAAC,MAAM,iBAEZ;CACF"}