@aztec/stdlib 3.0.0-canary.a9708bd → 3.0.0-manual.20251030

package/dest/proofs/proof_data.d.ts

@@ -0,0 +1,21 @@
+import type { CHONK_PROOF_LENGTH, RECURSIVE_PROOF_LENGTH, RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
+import { BufferReader, type Bufferable } from '@aztec/foundation/serialize';
+import { RecursiveProof } from '../proofs/recursive_proof.js';
+import { VkData } from '../vks/index.js';
+/**
+ * Represents the data of a recursive proof.
+ */
+export declare class ProofData<T extends Bufferable, PROOF_LENGTH extends number> {
+    publicInputs: T;
+    proof: RecursiveProof<PROOF_LENGTH>;
+    vkData: VkData;
+    constructor(publicInputs: T, proof: RecursiveProof<PROOF_LENGTH>, vkData: VkData);
+    toBuffer(): Buffer;
+    static fromBuffer<T extends Bufferable, PROOF_LENGTH extends number>(buffer: Buffer | BufferReader, publicInputs: {
+        fromBuffer: (reader: BufferReader) => T;
+    }): ProofData<T, PROOF_LENGTH>;
+}
+export type ChonkProofData<T extends Bufferable> = ProofData<T, typeof CHONK_PROOF_LENGTH>;
+export type UltraHonkProofData<T extends Bufferable> = ProofData<T, typeof RECURSIVE_PROOF_LENGTH>;
+export type RollupHonkProofData<T extends Bufferable> = ProofData<T, typeof RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+//# sourceMappingURL=proof_data.d.ts.map

package/dest/proofs/proof_data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proof_data.d.ts","sourceRoot":"","sources":["../../src/proofs/proof_data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,kCAAkC,EAAE,MAAM,kBAAkB,CAAC;AACvH,OAAO,EAAE,YAAY,EAAE,KAAK,UAAU,EAAqB,MAAM,6BAA6B,CAAC;AAE/F,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC;;GAEG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,YAAY,SAAS,MAAM;IAE7D,YAAY,EAAE,CAAC;IACf,KAAK,EAAE,cAAc,CAAC,YAAY,CAAC;IACnC,MAAM,EAAE,MAAM;gBAFd,YAAY,EAAE,CAAC,EACf,KAAK,EAAE,cAAc,CAAC,YAAY,CAAC,EACnC,MAAM,EAAE,MAAM;IAGhB,QAAQ,IAAI,MAAM;WAIX,UAAU,CAAC,CAAC,SAAS,UAAU,EAAE,YAAY,SAAS,MAAM,EACxE,MAAM,EAAE,MAAM,GAAG,YAAY,EAC7B,YAAY,EAAE;QACZ,UAAU,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,CAAC,CAAC;KACzC,GACA,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC;CAI9B;AAED,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,UAAU,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,kBAAkB,CAAC,CAAC;AAE3F,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,UAAU,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,sBAAsB,CAAC,CAAC;AAEnG,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,UAAU,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,kCAAkC,CAAC,CAAC"}

package/dest/proofs/proof_data.js

@@ -0,0 +1,22 @@
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { RecursiveProof } from '../proofs/recursive_proof.js';
+import { VkData } from '../vks/index.js';
+/**
+ * Represents the data of a recursive proof.
+ */ export class ProofData {
+    publicInputs;
+    proof;
+    vkData;
+    constructor(publicInputs, proof, vkData){
+        this.publicInputs = publicInputs;
+        this.proof = proof;
+        this.vkData = vkData;
+    }
+    toBuffer() {
+        return serializeToBuffer(this.publicInputs, this.proof, this.vkData);
+    }
+    static fromBuffer(buffer, publicInputs) {
+        const reader = BufferReader.asReader(buffer);
+        return new ProofData(reader.readObject(publicInputs), RecursiveProof.fromBuffer(reader), reader.readObject(VkData));
+    }
+}

package/dest/proofs/proving_request_type.d.ts

@@ -1,17 +1,21 @@
 export declare enum ProvingRequestType {
     PUBLIC_VM = 0,
-    PRIVATE_BASE_ROLLUP = 1,
-    PUBLIC_BASE_ROLLUP = 2,
-    MERGE_ROLLUP = 3,
-    EMPTY_BLOCK_ROOT_ROLLUP = 4,
-    PADDING_BLOCK_ROOT_ROLLUP = 5,
-    BLOCK_ROOT_ROLLUP = 6,
-    SINGLE_TX_BLOCK_ROOT_ROLLUP = 7,
-    BLOCK_MERGE_ROLLUP = 8,
-    ROOT_ROLLUP = 9,
-    BASE_PARITY = 10,
-    ROOT_PARITY = 11,
-    /** Recursive Client IVC verification to connect private to public or rollup */
-    TUBE_PROOF = 12
+    PUBLIC_CHONK_VERIFIER = 1,
+    PRIVATE_TX_BASE_ROLLUP = 2,
+    PUBLIC_TX_BASE_ROLLUP = 3,
+    TX_MERGE_ROLLUP = 4,
+    BLOCK_ROOT_FIRST_ROLLUP = 5,
+    BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP = 6,
+    BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP = 7,
+    BLOCK_ROOT_ROLLUP = 8,
+    BLOCK_ROOT_SINGLE_TX_ROLLUP = 9,
+    BLOCK_MERGE_ROLLUP = 10,
+    CHECKPOINT_ROOT_ROLLUP = 11,
+    CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP = 12,
+    CHECKPOINT_PADDING_ROLLUP = 13,
+    CHECKPOINT_MERGE_ROLLUP = 14,
+    ROOT_ROLLUP = 15,
+    PARITY_BASE = 16,
+    PARITY_ROOT = 17
 }
 //# sourceMappingURL=proving_request_type.d.ts.map

package/dest/proofs/proving_request_type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proving_request_type.d.ts","sourceRoot":"","sources":["../../src/proofs/proving_request_type.ts"],"names":[],"mappings":"AAAA,oBAAY,kBAAkB;IAC5B,SAAS,IAAA;IAET,mBAAmB,IAAA;IACnB,kBAAkB,IAAA;IAClB,YAAY,IAAA;IACZ,uBAAuB,IAAA;IACvB,yBAAyB,IAAA;IACzB,iBAAiB,IAAA;IACjB,2BAA2B,IAAA;IAC3B,kBAAkB,IAAA;IAClB,WAAW,IAAA;IAEX,WAAW,KAAA;IACX,WAAW,KAAA;IACX,+EAA+E;IAC/E,UAAU,KAAA;CACX"}
+{"version":3,"file":"proving_request_type.d.ts","sourceRoot":"","sources":["../../src/proofs/proving_request_type.ts"],"names":[],"mappings":"AAAA,oBAAY,kBAAkB;IAC5B,SAAS,IAAA;IACT,qBAAqB,IAAA;IAErB,sBAAsB,IAAA;IACtB,qBAAqB,IAAA;IACrB,eAAe,IAAA;IACf,uBAAuB,IAAA;IACvB,iCAAiC,IAAA;IACjC,gCAAgC,IAAA;IAChC,iBAAiB,IAAA;IACjB,2BAA2B,IAAA;IAC3B,kBAAkB,KAAA;IAClB,sBAAsB,KAAA;IACtB,mCAAmC,KAAA;IACnC,yBAAyB,KAAA;IACzB,uBAAuB,KAAA;IACvB,WAAW,KAAA;IAEX,WAAW,KAAA;IACX,WAAW,KAAA;CACZ"}

package/dest/proofs/proving_request_type.js

@@ -1,16 +1,21 @@
 export var ProvingRequestType = /*#__PURE__*/ function(ProvingRequestType) {
     ProvingRequestType[ProvingRequestType["PUBLIC_VM"] = 0] = "PUBLIC_VM";
-    ProvingRequestType[ProvingRequestType["PRIVATE_BASE_ROLLUP"] = 1] = "PRIVATE_BASE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["PUBLIC_BASE_ROLLUP"] = 2] = "PUBLIC_BASE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["MERGE_ROLLUP"] = 3] = "MERGE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["EMPTY_BLOCK_ROOT_ROLLUP"] = 4] = "EMPTY_BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["PADDING_BLOCK_ROOT_ROLLUP"] = 5] = "PADDING_BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_ROLLUP"] = 6] = "BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["SINGLE_TX_BLOCK_ROOT_ROLLUP"] = 7] = "SINGLE_TX_BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["BLOCK_MERGE_ROLLUP"] = 8] = "BLOCK_MERGE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["ROOT_ROLLUP"] = 9] = "ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["BASE_PARITY"] = 10] = "BASE_PARITY";
-    ProvingRequestType[ProvingRequestType["ROOT_PARITY"] = 11] = "ROOT_PARITY";
-    /** Recursive Client IVC verification to connect private to public or rollup */ ProvingRequestType[ProvingRequestType["TUBE_PROOF"] = 12] = "TUBE_PROOF";
+    ProvingRequestType[ProvingRequestType["PUBLIC_CHONK_VERIFIER"] = 1] = "PUBLIC_CHONK_VERIFIER";
+    ProvingRequestType[ProvingRequestType["PRIVATE_TX_BASE_ROLLUP"] = 2] = "PRIVATE_TX_BASE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["PUBLIC_TX_BASE_ROLLUP"] = 3] = "PUBLIC_TX_BASE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["TX_MERGE_ROLLUP"] = 4] = "TX_MERGE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_FIRST_ROLLUP"] = 5] = "BLOCK_ROOT_FIRST_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP"] = 6] = "BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP"] = 7] = "BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_ROLLUP"] = 8] = "BLOCK_ROOT_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_SINGLE_TX_ROLLUP"] = 9] = "BLOCK_ROOT_SINGLE_TX_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_MERGE_ROLLUP"] = 10] = "BLOCK_MERGE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["CHECKPOINT_ROOT_ROLLUP"] = 11] = "CHECKPOINT_ROOT_ROLLUP";
+    ProvingRequestType[ProvingRequestType["CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP"] = 12] = "CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP";
+    ProvingRequestType[ProvingRequestType["CHECKPOINT_PADDING_ROLLUP"] = 13] = "CHECKPOINT_PADDING_ROLLUP";
+    ProvingRequestType[ProvingRequestType["CHECKPOINT_MERGE_ROLLUP"] = 14] = "CHECKPOINT_MERGE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["ROOT_ROLLUP"] = 15] = "ROOT_ROLLUP";
+    ProvingRequestType[ProvingRequestType["PARITY_BASE"] = 16] = "PARITY_BASE";
+    ProvingRequestType[ProvingRequestType["PARITY_ROOT"] = 17] = "PARITY_ROOT";
     return ProvingRequestType;
 }({});

package/dest/rollup/avm_proof_data.d.ts

@@ -1,17 +1,7 @@
 import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
 import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
-import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VkData } from '../vks/vk_data.js';
-export declare class AvmProofData {
-    publicInputs: AvmCircuitPublicInputs;
-    proof: RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>;
-    vkData: VkData;
-    constructor(publicInputs: AvmCircuitPublicInputs, proof: RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>, vkData: VkData);
-    static fromBuffer(buffer: Buffer | BufferReader): AvmProofData;
-    toBuffer(): Buffer<ArrayBufferLike>;
-    static empty(): AvmProofData;
-}
+import type { ProofData } from '../proofs/proof_data.js';
+export type AvmProofData = ProofData<AvmCircuitPublicInputs, typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>;
 export declare function enhanceProofWithPiValidationFlag(proof: Fr[], skipPublicInputsValidation: boolean): Fr[];
 //# sourceMappingURL=avm_proof_data.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"avm_proof_data.d.ts","sourceRoot":"","sources":["../../src/rollup/avm_proof_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oCAAoC,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,qBAAa,YAAY;IAEd,YAAY,EAAE,sBAAsB;IACpC,KAAK,EAAE,cAAc,CAAC,OAAO,oCAAoC,CAAC;IAClE,MAAM,EAAE,MAAM;gBAFd,YAAY,EAAE,sBAAsB,EACpC,KAAK,EAAE,cAAc,CAAC,OAAO,oCAAoC,CAAC,EAClE,MAAM,EAAE,MAAM;IAGvB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;IAIR,MAAM,CAAC,KAAK;CAOb;AAGD,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,0BAA0B,EAAE,OAAO,GAAG,EAAE,EAAE,CAGvG"}
+{"version":3,"file":"avm_proof_data.d.ts","sourceRoot":"","sources":["../../src/rollup/avm_proof_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oCAAoC,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,MAAM,MAAM,YAAY,GAAG,SAAS,CAAC,sBAAsB,EAAE,OAAO,oCAAoC,CAAC,CAAC;AAG1G,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,0BAA0B,EAAE,OAAO,GAAG,EAAE,EAAE,CAGvG"}

package/dest/rollup/avm_proof_data.js

@@ -1,29 +1,5 @@
 import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
-import { RecursiveProof, makeEmptyRecursiveProof } from '../proofs/recursive_proof.js';
-import { VkData } from '../vks/vk_data.js';
-export class AvmProofData {
-    publicInputs;
-    proof;
-    vkData;
-    constructor(publicInputs, proof, vkData){
-        this.publicInputs = publicInputs;
-        this.proof = proof;
-        this.vkData = vkData;
-    }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new AvmProofData(reader.readObject(AvmCircuitPublicInputs), RecursiveProof.fromBuffer(reader), reader.readObject(VkData));
-    }
-    toBuffer() {
-        return serializeToBuffer(this.publicInputs, this.proof, this.vkData);
-    }
-    static empty() {
-        return new AvmProofData(AvmCircuitPublicInputs.empty(), makeEmptyRecursiveProof(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED), VkData.empty());
-    }
-}
 // TODO(#14234)[Unconditional PIs validation]: remove this function.
 export function enhanceProofWithPiValidationFlag(proof, skipPublicInputsValidation) {
     const skipPublicInputsField = skipPublicInputsValidation ? new Fr(1) : new Fr(0);

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/fields';
 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.

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":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAElF,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAE1F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,MAAM,MAAM,eAAe,GAAG,sBAAsB,GAAG,qBAAqB,CAAC;AAE7E,qBAAa,sBAAsB;IAE/B;;OAEG;IACI,KAAK,EAAE,qBAAqB;IACnC;;OAEG;IACI,eAAe,EAAE,UAAU;IAClC;;OAEG;IACI,qBAAqB,EAAE,qBAAqB;IACnD;;OAEG;IACI,2BAA2B,EAAE,0BAA0B;IAC9D;;OAEG;IACI,6BAA6B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IACtE;;OAEG;IACI,uBAAuB,EAAE,KAAK,CAAC,sBAAsB,EAAE,OAAO,8BAA8B,CAAC;IACpG;;OAEG;IACI,SAAS,EAAE,iBAAiB;;IA3BnC;;OAEG;IACI,KAAK,EAAE,qBAAqB;IACnC;;OAEG;IACI,eAAe,EAAE,UAAU;IAClC;;OAEG;IACI,qBAAqB,EAAE,qBAAqB;IACnD;;OAEG;IACI,2BAA2B,EAAE,0BAA0B;IAC9D;;OAEG;IACI,6BAA6B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IACtE;;OAEG;IACI,uBAAuB,EAAE,KAAK,CAAC,sBAAsB,EAAE,OAAO,8BAA8B,CAAC;IACpG;;OAEG;IACI,SAAS,EAAE,iBAAiB;IAGrC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,sBAAsB,CAAC,GAAG,sBAAsB;IAI7E,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,sBAAsB,CAAC;IAYzD;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,sBAAsB;IAaxE,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,KAAK;CAWb;AAED,qBAAa,qBAAqB;IAE9B;;OAEG;IACI,eAAe,EAAE,UAAU;IAClC;;OAEG;IACI,WAAW,EAAE,sBAAsB;IAC1C;;OAEG;IACI,6BAA6B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IACtE;;OAEG;IACI,uBAAuB,EAAE,KAAK,CAAC,sBAAsB,EAAE,OAAO,8BAA8B,CAAC;;IAfpG;;OAEG;IACI,eAAe,EAAE,UAAU;IAClC;;OAEG;IACI,WAAW,EAAE,sBAAsB;IAC1C;;OAEG;IACI,6BAA6B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IACtE;;OAEG;IACI,uBAAuB,EAAE,KAAK,CAAC,sBAAsB,EAAE,OAAO,8BAA8B,CAAC;IAGtG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,GAAG,qBAAqB;IAI3E,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC;IASxD;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB;IAUvE,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,KAAK;CAQb"}

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/fields';
 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

@@ -9,28 +9,42 @@ 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>;
 }

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,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;;;;;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;;IAhBnB,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;IAGrB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,iBAAiB;IAInE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB;IAYnE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC;IAWpD,MAAM,CAAC,KAAK;IAWZ,QAAQ;CAGT"}

package/dest/rollup/block_constant_data.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_merge_rollup.d.ts → block_merge_rollup_private_inputs.d.ts}

@@ -1,18 +1,25 @@
 import { BufferReader } from '@aztec/foundation/serialize';
-import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
+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 BlockMergeRollupInputs {
+export declare class BlockMergeRollupPrivateInputs {
     /**
      * Previous rollup data from the 2 block merge or block root rollup circuits that preceded this merge rollup circuit.
      */
-    previousRollupData: [PreviousRollupBlockData, PreviousRollupBlockData];
+    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.
      */
-    previousRollupData: [PreviousRollupBlockData, PreviousRollupBlockData]);
+    previousRollups: [
+        RollupHonkProofData<BlockRollupPublicInputs>,
+        RollupHonkProofData<BlockRollupPublicInputs>
+    ]);
     /**
      * Serializes the inputs to a buffer.
      * @returns The inputs serialized to a buffer.
@@ -26,18 +33,18 @@ export declare class BlockMergeRollupInputs {
     /**
      * 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: Buffer | BufferReader): BlockMergeRollupInputs;
+    static fromBuffer(buffer: Buffer | BufferReader): BlockMergeRollupPrivateInputs;
     /**
      * 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: string): BlockMergeRollupInputs;
+    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<BlockMergeRollupInputs, any, string>;
+    static get schema(): import("zod").ZodType<BlockMergeRollupPrivateInputs, any, string>;
 }
-//# sourceMappingURL=block_merge_rollup.d.ts.map
+//# sourceMappingURL=block_merge_rollup_private_inputs.d.ts.map

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;;IAND;;OAEG;IACI,eAAe,EAAE;QACtB,mBAAmB,CAAC,uBAAuB,CAAC;QAC5C,mBAAmB,CAAC,uBAAuB,CAAC;KAC7C;IAGH;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAQ/C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,2DAA2D;IAC3D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,sEAEhB;CACF"}