@aztec/stdlib 3.0.0-nightly.20250917 → 3.0.0-nightly.20250919

package/dest/parity/parity_base_private_inputs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parity_base_private_inputs.d.ts","sourceRoot":"","sources":["../../src/parity/parity_base_private_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mCAAmC,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACtG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAG1F,qBAAa,uBAAuB;IAEhC,6DAA6D;aAC7C,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wBAAwB,CAAC;IAChE,0BAA0B;aACV,UAAU,EAAE,EAAE;;IAH9B,6DAA6D;IAC7C,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wBAAwB,CAAC;IAChE,0BAA0B;IACV,UAAU,EAAE,EAAE;WAGlB,SAAS,CACrB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,mCAAmC,CAAC,EAC5D,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,EAAE,GACb,uBAAuB;IAO1B,yCAAyC;IACzC,QAAQ;IAIR,6CAA6C;IAC7C,QAAQ;IAIR;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,8DAA8D;IAC9D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,gEAEhB;CACF"}

package/dest/parity/{base_parity_inputs.js → parity_base_private_inputs.js}

@@ -3,7 +3,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-export class BaseParityInputs {
+export class ParityBasePrivateInputs {
     msgs;
     vkTreeRoot;
     constructor(/** Aggregated proof of all the parity circuit iterations. */ msgs, /** Root of the VK tree */ vkTreeRoot){
@@ -14,7 +14,7 @@ export class BaseParityInputs {
         const start = index * NUM_MSGS_PER_BASE_PARITY;
         const end = start + NUM_MSGS_PER_BASE_PARITY;
         const msgs = array.slice(start, end);
-        return new BaseParityInputs(msgs, vkTreeRoot);
+        return new ParityBasePrivateInputs(msgs, vkTreeRoot);
     }
     /** Serializes the inputs to a buffer. */ toBuffer() {
         return serializeToBuffer(this.msgs, this.vkTreeRoot);
@@ -27,19 +27,19 @@ export class BaseParityInputs {
    * @param buffer - The buffer to deserialize from.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new BaseParityInputs(reader.readArray(NUM_MSGS_PER_BASE_PARITY, Fr), Fr.fromBuffer(reader));
+        return new ParityBasePrivateInputs(reader.readArray(NUM_MSGS_PER_BASE_PARITY, Fr), Fr.fromBuffer(reader));
     }
     /**
    * Deserializes the inputs from a hex string.
    * @param str - The hex string to deserialize from.
    * @returns - The deserialized inputs.
    */ static fromString(str) {
-        return BaseParityInputs.fromBuffer(hexToBuffer(str));
+        return ParityBasePrivateInputs.fromBuffer(hexToBuffer(str));
     }
     /** Returns a buffer representation for JSON serialization. */ toJSON() {
         return this.toBuffer();
     }
     /** Creates an instance from a hex string. */ static get schema() {
-        return bufferSchemaFor(BaseParityInputs);
+        return bufferSchemaFor(ParityBasePrivateInputs);
     }
 }

package/dest/parity/parity_root_private_inputs.d.ts

@@ -0,0 +1,39 @@
+import { NUM_BASE_PARITY_PER_ROOT_PARITY } from '@aztec/constants';
+import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
+import { type UltraHonkProofData } from '../proofs/proof_data.js';
+import { ParityPublicInputs } from './parity_public_inputs.js';
+export type ParityBaseProofData = UltraHonkProofData<ParityPublicInputs>;
+export declare class ParityRootPrivateInputs {
+    /** Public inputs of the parity base circuits and their proofs and vk data. */
+    readonly children: Tuple<ParityBaseProofData, typeof NUM_BASE_PARITY_PER_ROOT_PARITY>;
+    constructor(
+    /** Public inputs of the parity base circuits and their proofs and vk data. */
+    children: Tuple<ParityBaseProofData, typeof NUM_BASE_PARITY_PER_ROOT_PARITY>);
+    /**
+     * 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 ParityRootPrivateInputs instance.
+     */
+    static fromBuffer(buffer: Buffer | BufferReader): ParityRootPrivateInputs;
+    /**
+     * Deserializes the inputs from a hex string.
+     * @param str - A hex string to deserialize from.
+     * @returns A new ParityRootPrivateInputs instance.
+     */
+    static fromString(str: string): ParityRootPrivateInputs;
+    /** Returns a buffer representation for JSON serialization. */
+    toJSON(): Buffer<ArrayBufferLike>;
+    /** Creates an instance from a hex string. */
+    static get schema(): import("zod").ZodType<ParityRootPrivateInputs, any, string>;
+}
+//# sourceMappingURL=parity_root_private_inputs.d.ts.map

package/dest/parity/parity_root_private_inputs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parity_root_private_inputs.d.ts","sourceRoot":"","sources":["../../src/parity/parity_root_private_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,kBAAkB,CAAC;AAGnE,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAG1F,OAAO,EAAa,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,MAAM,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;AAEzE,qBAAa,uBAAuB;IAEhC,8EAA8E;aAC9D,QAAQ,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,+BAA+B,CAAC;;IAD5F,8EAA8E;IAC9D,QAAQ,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,+BAA+B,CAAC;IAG9F;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAO/C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,8DAA8D;IAC9D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,gEAEhB;CACF"}

package/dest/parity/{root_parity_inputs.js → parity_root_private_inputs.js}

@@ -1,18 +1,20 @@
-import { NUM_BASE_PARITY_PER_ROOT_PARITY, RECURSIVE_PROOF_LENGTH } from '@aztec/constants';
+import { NUM_BASE_PARITY_PER_ROOT_PARITY } from '@aztec/constants';
+import { makeTuple } from '@aztec/foundation/array';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { RootParityInput } from './root_parity_input.js';
-export class RootParityInputs {
+import { ProofData } from '../proofs/proof_data.js';
+import { ParityPublicInputs } from './parity_public_inputs.js';
+export class ParityRootPrivateInputs {
     children;
-    constructor(/** Public inputs of children and their proofs. */ children){
+    constructor(/** Public inputs of the parity base circuits and their proofs and vk data. */ children){
         this.children = children;
     }
     /**
    * Serializes the inputs to a buffer.
    * @returns The inputs serialized to a buffer.
    */ toBuffer() {
-        return serializeToBuffer(...this.children);
+        return serializeToBuffer(this.children);
     }
     /**
    * Serializes the inputs to a hex string.
@@ -23,25 +25,22 @@ export class RootParityInputs {
     /**
    * Deserializes the inputs from a buffer.
    * @param buffer - The buffer to deserialize from.
-   * @returns A new RootParityInputs instance.
+   * @returns A new ParityRootPrivateInputs instance.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        const tuple = Array.from({
-            length: NUM_BASE_PARITY_PER_ROOT_PARITY
-        }, ()=>RootParityInput.fromBuffer(reader, RECURSIVE_PROOF_LENGTH));
-        return new RootParityInputs(tuple);
+        return new ParityRootPrivateInputs(makeTuple(NUM_BASE_PARITY_PER_ROOT_PARITY, ()=>ProofData.fromBuffer(reader, ParityPublicInputs)));
     }
     /**
    * Deserializes the inputs from a hex string.
    * @param str - A hex string to deserialize from.
-   * @returns A new RootParityInputs instance.
+   * @returns A new ParityRootPrivateInputs instance.
    */ static fromString(str) {
-        return RootParityInputs.fromBuffer(hexToBuffer(str));
+        return ParityRootPrivateInputs.fromBuffer(hexToBuffer(str));
     }
     /** Returns a buffer representation for JSON serialization. */ toJSON() {
         return this.toBuffer();
     }
     /** Creates an instance from a hex string. */ static get schema() {
-        return bufferSchemaFor(RootParityInputs);
+        return bufferSchemaFor(ParityRootPrivateInputs);
     }
 }

package/dest/proofs/proof_data.d.ts

@@ -1,4 +1,4 @@
-import type { CIVC_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
+import type { CIVC_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';
@@ -13,8 +13,9 @@ export declare class ProofData<T extends Bufferable, PROOF_LENGTH extends number
     toBuffer(): Buffer;
     static fromBuffer<T extends Bufferable, PROOF_LENGTH extends number>(buffer: Buffer | BufferReader, publicInputs: {
         fromBuffer: (reader: BufferReader) => T;
-    }, proofLength?: PROOF_LENGTH): ProofData<T, PROOF_LENGTH>;
+    }): ProofData<T, PROOF_LENGTH>;
 }
 export type CivcProofData<T extends Bufferable> = ProofData<T, typeof CIVC_PROOF_LENGTH>;
-export type RollupHonkProofData<T extends Bufferable> = ProofData<T, typeof NESTED_RECURSIVE_ROLLUP_HONK_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

@@ -1 +1 @@
-{"version":3,"file":"proof_data.d.ts","sourceRoot":"","sources":["../../src/proofs/proof_data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AACrG,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,EACD,WAAW,CAAC,EAAE,YAAY,GACzB,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC;CAQ9B;AAED,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,UAAU,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,iBAAiB,CAAC,CAAC;AAEzF,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,UAAU,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,yCAAyC,CAAC,CAAC"}
+{"version":3,"file":"proof_data.d.ts","sourceRoot":"","sources":["../../src/proofs/proof_data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,kCAAkC,EAAE,MAAM,kBAAkB,CAAC;AACtH,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,aAAa,CAAC,CAAC,SAAS,UAAU,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,iBAAiB,CAAC,CAAC;AAEzF,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

@@ -15,8 +15,8 @@ import { VkData } from '../vks/index.js';
     toBuffer() {
         return serializeToBuffer(this.publicInputs, this.proof, this.vkData);
     }
-    static fromBuffer(buffer, publicInputs, proofLength) {
+    static fromBuffer(buffer, publicInputs) {
         const reader = BufferReader.asReader(buffer);
-        return new ProofData(reader.readObject(publicInputs), RecursiveProof.fromBuffer(reader, proofLength), reader.readObject(VkData));
+        return new ProofData(reader.readObject(publicInputs), RecursiveProof.fromBuffer(reader), reader.readObject(VkData));
     }
 }

package/dest/proofs/proving_request_type.d.ts

@@ -1,16 +1,21 @@
 export declare enum ProvingRequestType {
     PUBLIC_VM = 0,
     PUBLIC_TUBE = 1,
-    PRIVATE_BASE_ROLLUP = 2,
-    PUBLIC_BASE_ROLLUP = 3,
-    MERGE_ROLLUP = 4,
-    EMPTY_BLOCK_ROOT_ROLLUP = 5,
-    PADDING_BLOCK_ROOT_ROLLUP = 6,
-    BLOCK_ROOT_ROLLUP = 7,
-    SINGLE_TX_BLOCK_ROOT_ROLLUP = 8,
-    BLOCK_MERGE_ROLLUP = 9,
-    ROOT_ROLLUP = 10,
-    BASE_PARITY = 11,
-    ROOT_PARITY = 12
+    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;IACT,WAAW,IAAA;IACX,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,KAAA;IAEX,WAAW,KAAA;IACX,WAAW,KAAA;CACZ"}
+{"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,WAAW,IAAA;IAEX,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["PUBLIC_TUBE"] = 1] = "PUBLIC_TUBE";
-    ProvingRequestType[ProvingRequestType["PRIVATE_BASE_ROLLUP"] = 2] = "PRIVATE_BASE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["PUBLIC_BASE_ROLLUP"] = 3] = "PUBLIC_BASE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["MERGE_ROLLUP"] = 4] = "MERGE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["EMPTY_BLOCK_ROOT_ROLLUP"] = 5] = "EMPTY_BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["PADDING_BLOCK_ROOT_ROLLUP"] = 6] = "PADDING_BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_ROLLUP"] = 7] = "BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["SINGLE_TX_BLOCK_ROOT_ROLLUP"] = 8] = "SINGLE_TX_BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["BLOCK_MERGE_ROLLUP"] = 9] = "BLOCK_MERGE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["ROOT_ROLLUP"] = 10] = "ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["BASE_PARITY"] = 11] = "BASE_PARITY";
-    ProvingRequestType[ProvingRequestType["ROOT_PARITY"] = 12] = "ROOT_PARITY";
+    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/base_rollup_hints.d.ts

@@ -1,5 +1,6 @@
-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';
@@ -101,6 +102,10 @@ export declare class PublicBaseRollupHints {
      * Preimages to the kernel's contractClassLogsHashes.
      */
     contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
+    /**
+     * Identifier of the prover.
+     */
+    proverId: Fr;
     constructor(
     /**
      * Sponge state to absorb blob inputs at the start of the rollup.
@@ -117,9 +122,13 @@ export declare class PublicBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>);
+    contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
+    /**
+     * Identifier of the prover.
+     */
+    proverId: Fr);
     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, MembershipWitness<29>, [ContractClassLogFields], Fr];
     /**
      * 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":"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"}

package/dest/rollup/base_rollup_hints.js

@@ -1,6 +1,7 @@
-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';
@@ -83,6 +84,7 @@ export class PublicBaseRollupHints {
     lastArchive;
     archiveRootMembershipWitness;
     contractClassLogsFields;
+    proverId;
     constructor(/**
      * Sponge state to absorb blob inputs at the start of the rollup.
      */ startSpongeBlob, /**
@@ -91,11 +93,14 @@ export class PublicBaseRollupHints {
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */ archiveRootMembershipWitness, /**
      * Preimages to the kernel's contractClassLogsHashes.
-     */ contractClassLogsFields){
+     */ contractClassLogsFields, /**
+     * Identifier of the prover.
+     */ proverId){
         this.startSpongeBlob = startSpongeBlob;
         this.lastArchive = lastArchive;
         this.archiveRootMembershipWitness = archiveRootMembershipWitness;
         this.contractClassLogsFields = contractClassLogsFields;
+        this.proverId = proverId;
     }
     static from(fields) {
         return new PublicBaseRollupHints(...PublicBaseRollupHints.getFields(fields));
@@ -105,7 +110,8 @@ export class PublicBaseRollupHints {
             fields.startSpongeBlob,
             fields.lastArchive,
             fields.archiveRootMembershipWitness,
-            fields.contractClassLogsFields
+            fields.contractClassLogsFields,
+            fields.proverId
         ];
     }
     /**
@@ -122,12 +128,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), MembershipWitness.fromBuffer(reader, ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ()=>reader.readObject(ContractClassLogFields)), reader.readObject(Fr));
     }
     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(), MembershipWitness.empty(ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty), Fr.ZERO);
     }
 }

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;
     /** 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, 
     /** 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,0CAA0C;IACnC,wBAAwB,EAAE,EAAE;IACnC,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,0CAA0C;IACnC,wBAAwB,EAAE,EAAE;IACnC,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;
     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, /** Root of the protocol contract tree. */ protocolContractTreeRoot, /** 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.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.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"}

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);
     }
 }