@aztec/stdlib 0.0.1-fake-ceab37513c → 0.0.6-commit.a2d1860fe9

package/dest/rollup/base_rollup_hints.d.ts

@@ -1,14 +1,14 @@
-import { SpongeBlob } from '@aztec/blob-lib';
+import { SpongeBlob } from '@aztec/blob-lib/types';
 import { ARCHIVE_HEIGHT, MAX_CONTRACT_CLASS_LOGS_PER_TX } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
 import type { FieldsOf } from '@aztec/foundation/types';
-import { PublicDataHint } from '../avm/public_data_hint.js';
 import { ContractClassLogFields } from '../logs/index.js';
-import { AppendOnlyTreeSnapshot } from '../trees/index.js';
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { PublicDataTreeLeafPreimage } from '../trees/public_data_leaf.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
 import { BlockConstantData } from './block_constant_data.js';
-import { PrivateBaseStateDiffHints } from './state_diff_hints.js';
+import { TreeSnapshotDiffHints } from './tree_snapshot_diff_hints.js';
 export type BaseRollupHints = PrivateBaseRollupHints | PublicBaseRollupHints;
 export declare class PrivateBaseRollupHints {
     /**
@@ -22,15 +22,15 @@ export declare class PrivateBaseRollupHints {
     /**
      * Hints used while proving state diff validity.
      */
-    stateDiffHints: PrivateBaseStateDiffHints;
+    treeSnapshotDiffHints: TreeSnapshotDiffHints;
     /**
-     * Public data read hint for accessing the balance of the fee payer.
+     * Public data tree leaf preimage for accessing the balance of the fee payer.
      */
-    feePayerFeeJuiceBalanceReadHint: PublicDataHint;
+    feePayerBalanceLeafPreimage: PublicDataTreeLeafPreimage;
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>;
+    anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>;
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
@@ -51,15 +51,15 @@ export declare class PrivateBaseRollupHints {
     /**
      * Hints used while proving state diff validity.
      */
-    stateDiffHints: PrivateBaseStateDiffHints, 
+    treeSnapshotDiffHints: TreeSnapshotDiffHints, 
     /**
-     * Public data read hint for accessing the balance of the fee payer.
+     * Public data tree leaf preimage for accessing the balance of the fee payer.
      */
-    feePayerFeeJuiceBalanceReadHint: PublicDataHint, 
+    feePayerBalanceLeafPreimage: PublicDataTreeLeafPreimage, 
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>, 
+    anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, 
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
@@ -69,7 +69,7 @@ export declare class PrivateBaseRollupHints {
      */
     constants: BlockConstantData);
     static from(fields: FieldsOf<PrivateBaseRollupHints>): PrivateBaseRollupHints;
-    static getFields(fields: FieldsOf<PrivateBaseRollupHints>): readonly [PartialStateReference, SpongeBlob, PrivateBaseStateDiffHints, PublicDataHint, MembershipWitness<29>, [ContractClassLogFields], BlockConstantData];
+    static getFields(fields: FieldsOf<PrivateBaseRollupHints>): readonly [PartialStateReference, SpongeBlob, TreeSnapshotDiffHints, PublicDataTreeLeafPreimage, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [ContractClassLogFields], BlockConstantData];
     /**
      * Serializes the inputs to a buffer.
      * @returns The inputs serialized to a buffer.
@@ -96,7 +96,7 @@ export declare class PublicBaseRollupHints {
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>;
+    anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>;
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
@@ -113,13 +113,13 @@ export declare class PublicBaseRollupHints {
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>, 
+    anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, 
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
     contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>);
     static from(fields: FieldsOf<PublicBaseRollupHints>): PublicBaseRollupHints;
-    static getFields(fields: FieldsOf<PublicBaseRollupHints>): readonly [SpongeBlob, AppendOnlyTreeSnapshot, MembershipWitness<29>, [ContractClassLogFields]];
+    static getFields(fields: FieldsOf<PublicBaseRollupHints>): readonly [SpongeBlob, AppendOnlyTreeSnapshot, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [ContractClassLogFields]];
     /**
      * Serializes the inputs to a buffer.
      * @returns The inputs serialized to a buffer.
@@ -134,4 +134,4 @@ export declare class PublicBaseRollupHints {
     static fromString(str: string): PublicBaseRollupHints;
     static empty(): PublicBaseRollupHints;
 }
-//# sourceMappingURL=base_rollup_hints.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV9yb2xsdXBfaGludHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9yb2xsdXAvYmFzZV9yb2xsdXBfaGludHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxjQUFjLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVsRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxLQUFLLEtBQUssRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUUxRixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMxRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMxRSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUN6RSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM3RCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUV0RSxNQUFNLE1BQU0sZUFBZSxHQUFHLHNCQUFzQixHQUFHLHFCQUFxQixDQUFDO0FBRTdFLHFCQUFhLHNCQUFzQjtJQUUvQjs7T0FFRztJQUNJLEtBQUssRUFBRSxxQkFBcUI7SUFDbkM7O09BRUc7SUFDSSxlQUFlLEVBQUUsVUFBVTtJQUNsQzs7T0FFRztJQUNJLHFCQUFxQixFQUFFLHFCQUFxQjtJQUNuRDs7T0FFRztJQUNJLDJCQUEyQixFQUFFLDBCQUEwQjtJQUM5RDs7T0FFRztJQUNJLDZCQUE2QixFQUFFLEtBQUssQ0FBQyxF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

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

@@ -1 +1 @@
-{"version":3,"file":"base_rollup_hints.d.ts","sourceRoot":"","sources":["../../src/rollup/base_rollup_hints.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base_rollup_hints.d.ts","sourceRoot":"","sources":["../../src/rollup/base_rollup_hints.ts"],"names":[],"mappings":"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"}

package/dest/rollup/base_rollup_hints.js

@@ -1,21 +1,21 @@
-import { SpongeBlob } from '@aztec/blob-lib';
+import { SpongeBlob } from '@aztec/blob-lib/types';
 import { ARCHIVE_HEIGHT, MAX_CONTRACT_CLASS_LOGS_PER_TX } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { MembershipWitness } from '@aztec/foundation/trees';
-import { PublicDataHint } from '../avm/public_data_hint.js';
 import { ContractClassLogFields } from '../logs/index.js';
-import { AppendOnlyTreeSnapshot } from '../trees/index.js';
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { PublicDataTreeLeafPreimage } from '../trees/public_data_leaf.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
 import { BlockConstantData } from './block_constant_data.js';
-import { PrivateBaseStateDiffHints } from './state_diff_hints.js';
+import { TreeSnapshotDiffHints } from './tree_snapshot_diff_hints.js';
 export class PrivateBaseRollupHints {
     start;
     startSpongeBlob;
-    stateDiffHints;
-    feePayerFeeJuiceBalanceReadHint;
-    archiveRootMembershipWitness;
+    treeSnapshotDiffHints;
+    feePayerBalanceLeafPreimage;
+    anchorBlockArchiveSiblingPath;
     contractClassLogsFields;
     constants;
     constructor(/**
@@ -24,20 +24,20 @@ export class PrivateBaseRollupHints {
      * Sponge state to absorb blob inputs at the start of the rollup.
      */ startSpongeBlob, /**
      * Hints used while proving state diff validity.
-     */ stateDiffHints, /**
-     * Public data read hint for accessing the balance of the fee payer.
-     */ feePayerFeeJuiceBalanceReadHint, /**
+     */ treeSnapshotDiffHints, /**
+     * Public data tree leaf preimage for accessing the balance of the fee payer.
+     */ feePayerBalanceLeafPreimage, /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
-     */ archiveRootMembershipWitness, /**
+     */ anchorBlockArchiveSiblingPath, /**
      * Preimages to the kernel's contractClassLogsHashes.
      */ contractClassLogsFields, /**
      * Data which is not modified by the base rollup circuit.
      */ constants){
         this.start = start;
         this.startSpongeBlob = startSpongeBlob;
-        this.stateDiffHints = stateDiffHints;
-        this.feePayerFeeJuiceBalanceReadHint = feePayerFeeJuiceBalanceReadHint;
-        this.archiveRootMembershipWitness = archiveRootMembershipWitness;
+        this.treeSnapshotDiffHints = treeSnapshotDiffHints;
+        this.feePayerBalanceLeafPreimage = feePayerBalanceLeafPreimage;
+        this.anchorBlockArchiveSiblingPath = anchorBlockArchiveSiblingPath;
         this.contractClassLogsFields = contractClassLogsFields;
         this.constants = constants;
     }
@@ -48,9 +48,9 @@ export class PrivateBaseRollupHints {
         return [
             fields.start,
             fields.startSpongeBlob,
-            fields.stateDiffHints,
-            fields.feePayerFeeJuiceBalanceReadHint,
-            fields.archiveRootMembershipWitness,
+            fields.treeSnapshotDiffHints,
+            fields.feePayerBalanceLeafPreimage,
+            fields.anchorBlockArchiveSiblingPath,
             fields.contractClassLogsFields,
             fields.constants
         ];
@@ -69,19 +69,19 @@ export class PrivateBaseRollupHints {
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateBaseRollupHints(reader.readObject(PartialStateReference), reader.readObject(SpongeBlob), reader.readObject(PrivateBaseStateDiffHints), reader.readObject(PublicDataHint), MembershipWitness.fromBuffer(reader, ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ()=>reader.readObject(ContractClassLogFields)), reader.readObject(BlockConstantData));
+        return new PrivateBaseRollupHints(reader.readObject(PartialStateReference), reader.readObject(SpongeBlob), reader.readObject(TreeSnapshotDiffHints), reader.readObject(PublicDataTreeLeafPreimage), reader.readArray(ARCHIVE_HEIGHT, Fr), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ()=>reader.readObject(ContractClassLogFields)), reader.readObject(BlockConstantData));
     }
     static fromString(str) {
         return PrivateBaseRollupHints.fromBuffer(hexToBuffer(str));
     }
     static empty() {
-        return new PrivateBaseRollupHints(PartialStateReference.empty(), SpongeBlob.empty(), PrivateBaseStateDiffHints.empty(), PublicDataHint.empty(), MembershipWitness.empty(ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty), BlockConstantData.empty());
+        return new PrivateBaseRollupHints(PartialStateReference.empty(), SpongeBlob.empty(), TreeSnapshotDiffHints.empty(), PublicDataTreeLeafPreimage.empty(), makeTuple(ARCHIVE_HEIGHT, Fr.zero), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty), BlockConstantData.empty());
     }
 }
 export class PublicBaseRollupHints {
     startSpongeBlob;
     lastArchive;
-    archiveRootMembershipWitness;
+    anchorBlockArchiveSiblingPath;
     contractClassLogsFields;
     constructor(/**
      * Sponge state to absorb blob inputs at the start of the rollup.
@@ -89,12 +89,12 @@ export class PublicBaseRollupHints {
      * Archive tree snapshot at the very beginning of the block containing this base rollup.
      */ lastArchive, /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
-     */ archiveRootMembershipWitness, /**
+     */ anchorBlockArchiveSiblingPath, /**
      * Preimages to the kernel's contractClassLogsHashes.
      */ contractClassLogsFields){
         this.startSpongeBlob = startSpongeBlob;
         this.lastArchive = lastArchive;
-        this.archiveRootMembershipWitness = archiveRootMembershipWitness;
+        this.anchorBlockArchiveSiblingPath = anchorBlockArchiveSiblingPath;
         this.contractClassLogsFields = contractClassLogsFields;
     }
     static from(fields) {
@@ -104,7 +104,7 @@ export class PublicBaseRollupHints {
         return [
             fields.startSpongeBlob,
             fields.lastArchive,
-            fields.archiveRootMembershipWitness,
+            fields.anchorBlockArchiveSiblingPath,
             fields.contractClassLogsFields
         ];
     }
@@ -122,12 +122,12 @@ export class PublicBaseRollupHints {
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PublicBaseRollupHints(reader.readObject(SpongeBlob), reader.readObject(AppendOnlyTreeSnapshot), MembershipWitness.fromBuffer(reader, ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ()=>reader.readObject(ContractClassLogFields)));
+        return new PublicBaseRollupHints(reader.readObject(SpongeBlob), reader.readObject(AppendOnlyTreeSnapshot), reader.readArray(ARCHIVE_HEIGHT, Fr), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ()=>reader.readObject(ContractClassLogFields)));
     }
     static fromString(str) {
         return PublicBaseRollupHints.fromBuffer(hexToBuffer(str));
     }
     static empty() {
-        return new PublicBaseRollupHints(SpongeBlob.empty(), AppendOnlyTreeSnapshot.empty(), MembershipWitness.empty(ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty));
+        return new PublicBaseRollupHints(SpongeBlob.empty(), AppendOnlyTreeSnapshot.empty(), makeTuple(ARCHIVE_HEIGHT, Fr.zero), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty));
     }
 }

package/dest/rollup/block_constant_data.d.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
@@ -9,29 +9,43 @@ import { GlobalVariables } from '../tx/global_variables.js';
 export declare class BlockConstantData {
     /** Archive tree snapshot at the very beginning of the entire rollup. */
     lastArchive: AppendOnlyTreeSnapshot;
-    /** L1 to L2 message tree snapshot after this block lands. */
-    newL1ToL2: AppendOnlyTreeSnapshot;
+    /**
+     * L1-to-L2 message tree snapshot after this block lands.
+     * For the first block in a checkpoint, this should be the snapshot after inserting the new l1-to-l2 message subtree
+     * into the last l1-to-l2 tree snapshot in `last_archive`.
+     * For subsequent blocks, this should match the snapshot of the previous block.
+     */
+    l1ToL2TreeSnapshot: AppendOnlyTreeSnapshot;
     /** Root of the verification key tree. */
     vkTreeRoot: Fr;
-    /** Root of the protocol contract tree. */
-    protocolContractTreeRoot: Fr;
+    /** Hash of the protocol contracts list. */
+    protocolContractsHash: Fr;
     /** Global variables for the block. */
     globalVariables: GlobalVariables;
+    /** Identifier of the prover. */
+    proverId: Fr;
     constructor(
     /** Archive tree snapshot at the very beginning of the entire rollup. */
     lastArchive: AppendOnlyTreeSnapshot, 
-    /** L1 to L2 message tree snapshot after this block lands. */
-    newL1ToL2: AppendOnlyTreeSnapshot, 
+    /**
+     * L1-to-L2 message tree snapshot after this block lands.
+     * For the first block in a checkpoint, this should be the snapshot after inserting the new l1-to-l2 message subtree
+     * into the last l1-to-l2 tree snapshot in `last_archive`.
+     * For subsequent blocks, this should match the snapshot of the previous block.
+     */
+    l1ToL2TreeSnapshot: AppendOnlyTreeSnapshot, 
     /** Root of the verification key tree. */
     vkTreeRoot: Fr, 
-    /** Root of the protocol contract tree. */
-    protocolContractTreeRoot: Fr, 
+    /** Hash of the protocol contracts list. */
+    protocolContractsHash: Fr, 
     /** Global variables for the block. */
-    globalVariables: GlobalVariables);
+    globalVariables: GlobalVariables, 
+    /** Identifier of the prover. */
+    proverId: Fr);
     static from(fields: FieldsOf<BlockConstantData>): BlockConstantData;
     static fromBuffer(buffer: Buffer | BufferReader): BlockConstantData;
-    static getFields(fields: FieldsOf<BlockConstantData>): readonly [AppendOnlyTreeSnapshot, AppendOnlyTreeSnapshot, Fr, Fr, GlobalVariables];
+    static getFields(fields: FieldsOf<BlockConstantData>): readonly [AppendOnlyTreeSnapshot, AppendOnlyTreeSnapshot, Fr, Fr, GlobalVariables, Fr];
     static empty(): BlockConstantData;
     toBuffer(): Buffer<ArrayBufferLike>;
 }
-//# sourceMappingURL=block_constant_data.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfY29uc3RhbnRfZGF0YS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3JvbGx1cC9ibG9ja19jb25zdGFudF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQy9FLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU1RDs7R0FFRztBQUNILHFCQUFhLGlCQUFpQjtJQUUxQix3RUFBd0U7SUFDakUsV0FBVyxFQUFFLHNCQUFzQjtJQUMxQzs7Ozs7T0FLRztJQUNJLGtCQUFrQixFQUFFLHNCQUFzQjtJQUNqRCx5Q0FBeUM7SUFDbEMsVUFBVSxFQUFFLEVBQUU7SUFDckIsMkNBQTJDO0lBQ3BDLHFCQUFxQixFQUFFLEVBQUU7SUFDaEMsc0NBQXNDO0lBQy9CLGVBQWUsRUFBRSxlQUFlO0lBQ3ZDLGdDQUFnQztJQUN6QixRQUFRLEVBQUUsRUFBRTtJQWpCckI7SUFDRSx3RUFBd0U7SUFDakUsV0FBVyxFQUFFLHNCQUFzQjtJQUMxQzs7Ozs7T0FLRztJQUNJLGtCQUFrQixFQUFFLHNCQUFzQjtJQUNqRCx5Q0FBeUM7SUFDbEMsVUFBVSxFQUFFLEVBQUU7SUFDckIsMkNBQTJDO0lBQ3BDLHFCQUFxQixFQUFFLEVBQUU7SUFDaEMsc0NBQXNDO0lBQy9CLGVBQWUsRUFBRSxlQUFlO0lBQ3ZDLGdDQUFnQztJQUN6QixRQUFRLEVBQUUsRUFBRSxFQUNqQjtJQUVKLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLGlCQUFpQixDQUVsRTtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsaUJBQWlCLENBVWxFO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLGlCQUFpQixDQUFDLDBGQVNuRDtJQUVELE1BQU0sQ0FBQyxLQUFLLHNCQVNYO0lBRUQsUUFBUSw0QkFFUDtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"block_constant_data.d.ts","sourceRoot":"","sources":["../../src/rollup/block_constant_data.ts"],"names":[],"mappings":"AAAA,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,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D;;GAEG;AACH,qBAAa,iBAAiB;IAE1B,wEAAwE;IACjE,WAAW,EAAE,sBAAsB;IAC1C,6DAA6D;IACtD,SAAS,EAAE,sBAAsB;IACxC,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,0CAA0C;IACnC,wBAAwB,EAAE,EAAE;IACnC,sCAAsC;IAC/B,eAAe,EAAE,eAAe;;IATvC,wEAAwE;IACjE,WAAW,EAAE,sBAAsB;IAC1C,6DAA6D;IACtD,SAAS,EAAE,sBAAsB;IACxC,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,0CAA0C;IACnC,wBAAwB,EAAE,EAAE;IACnC,sCAAsC;IAC/B,eAAe,EAAE,eAAe;IAGzC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,iBAAiB;IAInE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB;IAWnE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC;IAUpD,MAAM,CAAC,KAAK;IAUZ,QAAQ;CAGT"}
+{"version":3,"file":"block_constant_data.d.ts","sourceRoot":"","sources":["../../src/rollup/block_constant_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D;;GAEG;AACH,qBAAa,iBAAiB;IAE1B,wEAAwE;IACjE,WAAW,EAAE,sBAAsB;IAC1C;;;;;OAKG;IACI,kBAAkB,EAAE,sBAAsB;IACjD,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,2CAA2C;IACpC,qBAAqB,EAAE,EAAE;IAChC,sCAAsC;IAC/B,eAAe,EAAE,eAAe;IACvC,gCAAgC;IACzB,QAAQ,EAAE,EAAE;IAjBrB;IACE,wEAAwE;IACjE,WAAW,EAAE,sBAAsB;IAC1C;;;;;OAKG;IACI,kBAAkB,EAAE,sBAAsB;IACjD,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,2CAA2C;IACpC,qBAAqB,EAAE,EAAE;IAChC,sCAAsC;IAC/B,eAAe,EAAE,eAAe;IACvC,gCAAgC;IACzB,QAAQ,EAAE,EAAE,EACjB;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,iBAAiB,CAElE;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB,CAUlE;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,0FASnD;IAED,MAAM,CAAC,KAAK,sBASX;IAED,QAAQ,4BAEP;CACF"}

package/dest/rollup/block_constant_data.js

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { GlobalVariables } from '../tx/global_variables.js';
@@ -6,35 +6,43 @@ import { GlobalVariables } from '../tx/global_variables.js';
  * Constants that are the same for the entire block.
  */ export class BlockConstantData {
     lastArchive;
-    newL1ToL2;
+    l1ToL2TreeSnapshot;
     vkTreeRoot;
-    protocolContractTreeRoot;
+    protocolContractsHash;
     globalVariables;
-    constructor(/** Archive tree snapshot at the very beginning of the entire rollup. */ lastArchive, /** L1 to L2 message tree snapshot after this block lands. */ newL1ToL2, /** Root of the verification key tree. */ vkTreeRoot, /** Root of the protocol contract tree. */ protocolContractTreeRoot, /** Global variables for the block. */ globalVariables){
+    proverId;
+    constructor(/** Archive tree snapshot at the very beginning of the entire rollup. */ lastArchive, /**
+     * L1-to-L2 message tree snapshot after this block lands.
+     * For the first block in a checkpoint, this should be the snapshot after inserting the new l1-to-l2 message subtree
+     * into the last l1-to-l2 tree snapshot in `last_archive`.
+     * For subsequent blocks, this should match the snapshot of the previous block.
+     */ l1ToL2TreeSnapshot, /** Root of the verification key tree. */ vkTreeRoot, /** Hash of the protocol contracts list. */ protocolContractsHash, /** Global variables for the block. */ globalVariables, /** Identifier of the prover. */ proverId){
         this.lastArchive = lastArchive;
-        this.newL1ToL2 = newL1ToL2;
+        this.l1ToL2TreeSnapshot = l1ToL2TreeSnapshot;
         this.vkTreeRoot = vkTreeRoot;
-        this.protocolContractTreeRoot = protocolContractTreeRoot;
+        this.protocolContractsHash = protocolContractsHash;
         this.globalVariables = globalVariables;
+        this.proverId = proverId;
     }
     static from(fields) {
         return new BlockConstantData(...BlockConstantData.getFields(fields));
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new BlockConstantData(reader.readObject(AppendOnlyTreeSnapshot), reader.readObject(AppendOnlyTreeSnapshot), Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readObject(GlobalVariables));
+        return new BlockConstantData(reader.readObject(AppendOnlyTreeSnapshot), reader.readObject(AppendOnlyTreeSnapshot), Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readObject(GlobalVariables), Fr.fromBuffer(reader));
     }
     static getFields(fields) {
         return [
             fields.lastArchive,
-            fields.newL1ToL2,
+            fields.l1ToL2TreeSnapshot,
             fields.vkTreeRoot,
-            fields.protocolContractTreeRoot,
-            fields.globalVariables
+            fields.protocolContractsHash,
+            fields.globalVariables,
+            fields.proverId
         ];
     }
     static empty() {
-        return new BlockConstantData(AppendOnlyTreeSnapshot.empty(), AppendOnlyTreeSnapshot.empty(), Fr.ZERO, Fr.ZERO, GlobalVariables.empty());
+        return new BlockConstantData(AppendOnlyTreeSnapshot.empty(), AppendOnlyTreeSnapshot.empty(), Fr.ZERO, Fr.ZERO, GlobalVariables.empty(), Fr.ZERO);
     }
     toBuffer() {
         return serializeToBuffer(...BlockConstantData.getFields(this));

package/dest/rollup/block_headers_hash.d.ts

@@ -0,0 +1,4 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { BlockHeader } from '../tx/block_header.js';
+export declare function computeBlockHeadersHash(blockHeaders: BlockHeader[]): Promise<Fr>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfaGVhZGVyc19oYXNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcm9sbHVwL2Jsb2NrX2hlYWRlcnNfaGFzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHcEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFekQsd0JBQXNCLHVCQUF1QixDQUFDLFlBQVksRUFBRSxXQUFXLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBTXRGIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"block_headers_hash.d.ts","sourceRoot":"","sources":["../../src/rollup/block_headers_hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,wBAAsB,uBAAuB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAMtF"}

package/dest/rollup/block_headers_hash.js

@@ -0,0 +1,9 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { computeUnbalancedPoseidonRoot } from '@aztec/foundation/trees';
+export async function computeBlockHeadersHash(blockHeaders) {
+    const blockHeaderHashes = await Promise.all(blockHeaders.map((header)=>header.hash()));
+    // Must match the implementation in merge_block_rollups.nr, with the **unbalanced** rollup structure
+    // (see validate_consecutive_block_rollups.nr > assert_rollups_filled_greedily.nr).
+    const blockHeadersHash = await computeUnbalancedPoseidonRoot(blockHeaderHashes.map((hash)=>hash.toBuffer()));
+    return Fr.fromBuffer(blockHeadersHash);
+}

package/dest/rollup/block_merge_rollup_private_inputs.d.ts

@@ -0,0 +1,50 @@
+import { BufferReader } from '@aztec/foundation/serialize';
+import { type RollupHonkProofData } from '../proofs/proof_data.js';
+import { BlockRollupPublicInputs } from './block_rollup_public_inputs.js';
+/**
+ * Represents inputs of the block merge rollup circuit.
+ */
+export declare class BlockMergeRollupPrivateInputs {
+    /**
+     * Previous rollup data from the 2 block merge or block root rollup circuits that preceded this merge rollup circuit.
+     */
+    previousRollups: [
+        RollupHonkProofData<BlockRollupPublicInputs>,
+        RollupHonkProofData<BlockRollupPublicInputs>
+    ];
+    constructor(
+    /**
+     * Previous rollup data from the 2 block merge or block root rollup circuits that preceded this merge rollup circuit.
+     */
+    previousRollups: [
+        RollupHonkProofData<BlockRollupPublicInputs>,
+        RollupHonkProofData<BlockRollupPublicInputs>
+    ]);
+    /**
+     * Serializes the inputs to a buffer.
+     * @returns The inputs serialized to a buffer.
+     */
+    toBuffer(): Buffer<ArrayBufferLike>;
+    /**
+     * Serializes the inputs to a hex string.
+     * @returns The instance serialized to a hex string.
+     */
+    toString(): `0x${string}`;
+    /**
+     * Deserializes the inputs from a buffer.
+     * @param buffer - The buffer to deserialize from.
+     * @returns A new BlockMergeRollupPrivateInputs instance.
+     */
+    static fromBuffer(buffer: Buffer | BufferReader): BlockMergeRollupPrivateInputs;
+    /**
+     * Deserializes the inputs from a hex string.
+     * @param str - A hex string to deserialize from.
+     * @returns A new BlockMergeRollupPrivateInputs instance.
+     */
+    static fromString(str: string): BlockMergeRollupPrivateInputs;
+    /** Returns a hex representation for JSON serialization. */
+    toJSON(): Buffer<ArrayBufferLike>;
+    /** Creates an instance from a hex string. */
+    static get schema(): import("zod").ZodType<BlockMergeRollupPrivateInputs, any, string>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfbWVyZ2Vfcm9sbHVwX3ByaXZhdGVfaW5wdXRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcm9sbHVwL2Jsb2NrX21lcmdlX3JvbGx1cF9wcml2YXRlX2lucHV0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRzlFLE9BQU8sRUFBYSxLQUFLLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDOUUsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFMUU7O0dBRUc7QUFDSCxxQkFBYSw2QkFBNkI7SUFFdEM7O09BRUc7SUFDSSxlQUFlLEVBQUU7UUFDdEIsbUJBQW1CLENBQUMsdUJBQXVCLENBQUM7UUFDNUMsbUJBQW1CLENBQUMsdUJBQXVCLENBQUM7S0FDN0M7SUFQSDtJQUNFOztPQUVHO0lBQ0ksZUFBZSxFQUFFO1FBQ3RCLG1CQUFtQixDQUFDLHVCQUF1QixDQUFDO1FBQzVDLG1CQUFtQixDQUFDLHVCQUF1QixDQUFDO0tBQzdDLEVBQ0M7SUFFSjs7O09BR0c7SUFDSCxRQUFRLDRCQUVQO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxrQkFFUDtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxpQ0FNOUM7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxpQ0FFNUI7SUFFRCwyREFBMkQ7SUFDM0QsTUFBTSw0QkFFTDtJQUVELDZDQUE2QztJQUM3QyxNQUFNLEtBQUssTUFBTSxzRUFFaEI7Q0FDRiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"block_merge_rollup_private_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/block_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,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E;;GAEG;AACH,qBAAa,6BAA6B;IAEtC;;OAEG;IACI,eAAe,EAAE;QACtB,mBAAmB,CAAC,uBAAuB,CAAC;QAC5C,mBAAmB,CAAC,uBAAuB,CAAC;KAC7C;IAPH;IACE;;OAEG;IACI,eAAe,EAAE;QACtB,mBAAmB,CAAC,uBAAuB,CAAC;QAC5C,mBAAmB,CAAC,uBAAuB,CAAC;KAC7C,EACC;IAEJ;;;OAGG;IACH,QAAQ,4BAEP;IAED;;;OAGG;IACH,QAAQ,kBAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,iCAM9C;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,iCAE5B;IAED,2DAA2D;IAC3D,MAAM,4BAEL;IAED,6CAA6C;IAC7C,MAAM,KAAK,MAAM,sEAEhB;CACF"}

package/dest/rollup/{block_merge_rollup.js → block_merge_rollup_private_inputs.js}

@@ -1,21 +1,22 @@
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
+import { ProofData } from '../proofs/proof_data.js';
+import { BlockRollupPublicInputs } from './block_rollup_public_inputs.js';
 /**
  * Represents inputs of the block merge rollup circuit.
- */ export class BlockMergeRollupInputs {
-    previousRollupData;
+ */ export class BlockMergeRollupPrivateInputs {
+    previousRollups;
     constructor(/**
      * Previous rollup data from the 2 block merge or block root rollup circuits that preceded this merge rollup circuit.
-     */ previousRollupData){
-        this.previousRollupData = previousRollupData;
+     */ previousRollups){
+        this.previousRollups = previousRollups;
     }
     /**
    * Serializes the inputs to a buffer.
    * @returns The inputs serialized to a buffer.
    */ toBuffer() {
-        return serializeToBuffer(this.previousRollupData);
+        return serializeToBuffer(this.previousRollups);
     }
     /**
    * Serializes the inputs to a hex string.
@@ -26,25 +27,25 @@ import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
     /**
    * Deserializes the inputs from a buffer.
    * @param buffer - The buffer to deserialize from.
-   * @returns A new BlockMergeRollupInputs instance.
+   * @returns A new BlockMergeRollupPrivateInputs instance.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new BlockMergeRollupInputs([
-            reader.readObject(PreviousRollupBlockData),
-            reader.readObject(PreviousRollupBlockData)
+        return new BlockMergeRollupPrivateInputs([
+            ProofData.fromBuffer(reader, BlockRollupPublicInputs),
+            ProofData.fromBuffer(reader, BlockRollupPublicInputs)
         ]);
     }
     /**
    * Deserializes the inputs from a hex string.
    * @param str - A hex string to deserialize from.
-   * @returns A new BlockMergeRollupInputs instance.
+   * @returns A new BlockMergeRollupPrivateInputs instance.
    */ static fromString(str) {
-        return BlockMergeRollupInputs.fromBuffer(hexToBuffer(str));
+        return BlockMergeRollupPrivateInputs.fromBuffer(hexToBuffer(str));
     }
     /** Returns a hex representation for JSON serialization. */ toJSON() {
         return this.toBuffer();
     }
     /** Creates an instance from a hex string. */ static get schema() {
-        return bufferSchemaFor(BlockMergeRollupInputs);
+        return bufferSchemaFor(BlockMergeRollupPrivateInputs);
     }
 }