@aztec/stdlib 3.0.0-nightly.20250918 → 3.0.0-nightly.20250920

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';
@@ -16,5 +16,6 @@ export declare class ProofData<T extends Bufferable, PROOF_LENGTH extends number
     }): 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,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,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/proving_request_type.d.ts

@@ -1,9 +1,9 @@
 export declare enum ProvingRequestType {
     PUBLIC_VM = 0,
     PUBLIC_TUBE = 1,
-    PRIVATE_BASE_ROLLUP = 2,
-    PUBLIC_BASE_ROLLUP = 3,
-    MERGE_ROLLUP = 4,
+    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,
@@ -15,7 +15,7 @@ export declare enum ProvingRequestType {
     CHECKPOINT_PADDING_ROLLUP = 13,
     CHECKPOINT_MERGE_ROLLUP = 14,
     ROOT_ROLLUP = 15,
-    BASE_PARITY = 16,
-    ROOT_PARITY = 17
+    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,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"}
+{"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,9 +1,9 @@
 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["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";
@@ -15,7 +15,7 @@ export var ProvingRequestType = /*#__PURE__*/ function(ProvingRequestType) {
     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["BASE_PARITY"] = 16] = "BASE_PARITY";
-    ProvingRequestType[ProvingRequestType["ROOT_PARITY"] = 17] = "ROOT_PARITY";
+    ProvingRequestType[ProvingRequestType["PARITY_BASE"] = 16] = "PARITY_BASE";
+    ProvingRequestType[ProvingRequestType["PARITY_ROOT"] = 17] = "PARITY_ROOT";
     return ProvingRequestType;
 }({});

package/dest/rollup/{block_merge_rollup.d.ts → block_merge_rollup_private_inputs.d.ts}

@@ -1,6 +1,6 @@
 import { BufferReader } from '@aztec/foundation/serialize';
+import { type RollupHonkProofData } from '../proofs/proof_data.js';
 import { BlockRollupPublicInputs } from './block_rollup_public_inputs.js';
-import type { RollupProofData } from './rollup_proof_data.js';
 /**
  * Represents inputs of the block merge rollup circuit.
  */
@@ -8,12 +8,18 @@ export declare class BlockMergeRollupPrivateInputs {
     /**
      * Previous rollup data from the 2 block merge or block root rollup circuits that preceded this merge rollup circuit.
      */
-    previousRollups: [RollupProofData<BlockRollupPublicInputs>, RollupProofData<BlockRollupPublicInputs>];
+    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: [RollupProofData<BlockRollupPublicInputs>, RollupProofData<BlockRollupPublicInputs>]);
+    previousRollups: [
+        RollupHonkProofData<BlockRollupPublicInputs>,
+        RollupHonkProofData<BlockRollupPublicInputs>
+    ]);
     /**
      * Serializes the inputs to a buffer.
      * @returns The inputs serialized to a buffer.
@@ -41,4 +47,4 @@ export declare class BlockMergeRollupPrivateInputs {
     /** Creates an instance from a hex 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,7 +1,7 @@
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { ProofData } from '../proofs/index.js';
+import { ProofData } from '../proofs/proof_data.js';
 import { BlockRollupPublicInputs } from './block_rollup_public_inputs.js';
 /**
  * Represents inputs of the block merge rollup circuit.

package/dest/rollup/{block_root_rollup.d.ts → block_root_rollup_private_inputs.d.ts}

@@ -3,24 +3,22 @@ import { ARCHIVE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH } from '@aztec
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
+import { ParityPublicInputs } from '../parity/parity_public_inputs.js';
+import { type RollupHonkProofData, type UltraHonkProofData } from '../proofs/proof_data.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { StateReference } from '../tx/state_reference.js';
 import type { UInt64 } from '../types/shared.js';
-import { BaseOrMergeRollupPublicInputs } from './base_or_merge_rollup_public_inputs.js';
 import { CheckpointConstantData } from './checkpoint_constant_data.js';
-import type { RollupProofData, RootParityProofData } from './rollup_proof_data.js';
+import { TxRollupPublicInputs } from './tx_rollup_public_inputs.js';
 export declare class BlockRootFirstRollupPrivateInputs {
     /**
      * The original and converted roots of the L1 to L2 messages subtrees.
      */
-    l1ToL2Roots: RootParityProofData;
+    l1ToL2Roots: UltraHonkProofData<ParityPublicInputs>;
     /**
      * The previous rollup proof data from base or merge rollup circuits.
      */
-    previousRollups: [
-        RollupProofData<BaseOrMergeRollupPublicInputs>,
-        RollupProofData<BaseOrMergeRollupPublicInputs>
-    ];
+    previousRollups: [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>];
     /**
      * The l1 to l2 message tree snapshot immediately before this block.
      */
@@ -37,14 +35,11 @@ export declare class BlockRootFirstRollupPrivateInputs {
     /**
      * The original and converted roots of the L1 to L2 messages subtrees.
      */
-    l1ToL2Roots: RootParityProofData, 
+    l1ToL2Roots: UltraHonkProofData<ParityPublicInputs>, 
     /**
      * The previous rollup proof data from base or merge rollup circuits.
      */
-    previousRollups: [
-        RollupProofData<BaseOrMergeRollupPublicInputs>,
-        RollupProofData<BaseOrMergeRollupPublicInputs>
-    ], 
+    previousRollups: [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>], 
     /**
      * The l1 to l2 message tree snapshot immediately before this block.
      */
@@ -58,7 +53,7 @@ export declare class BlockRootFirstRollupPrivateInputs {
      */
     newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>);
     static from(fields: FieldsOf<BlockRootFirstRollupPrivateInputs>): BlockRootFirstRollupPrivateInputs;
-    static getFields(fields: FieldsOf<BlockRootFirstRollupPrivateInputs>): readonly [RootParityProofData, [RollupProofData<BaseOrMergeRollupPublicInputs>, RollupProofData<BaseOrMergeRollupPublicInputs>], 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, 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, Fr, Fr, Fr, Fr]];
+    static getFields(fields: FieldsOf<BlockRootFirstRollupPrivateInputs>): readonly [UltraHonkProofData<ParityPublicInputs>, [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>], 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, 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, Fr, Fr, Fr, Fr]];
     toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): BlockRootFirstRollupPrivateInputs;
     toJSON(): Buffer<ArrayBufferLike>;
@@ -68,11 +63,11 @@ export declare class BlockRootSingleTxFirstRollupPrivateInputs {
     /**
      * The original and converted roots of the L1 to L2 messages subtrees.
      */
-    l1ToL2Roots: RootParityProofData;
+    l1ToL2Roots: UltraHonkProofData<ParityPublicInputs>;
     /**
      * The previous rollup proof data from base or merge rollup circuits.
      */
-    previousRollup: RollupProofData<BaseOrMergeRollupPublicInputs>;
+    previousRollup: RollupHonkProofData<TxRollupPublicInputs>;
     /**
      * The l1 to l2 message tree snapshot immediately before this block.
      */
@@ -89,11 +84,11 @@ export declare class BlockRootSingleTxFirstRollupPrivateInputs {
     /**
      * The original and converted roots of the L1 to L2 messages subtrees.
      */
-    l1ToL2Roots: RootParityProofData, 
+    l1ToL2Roots: UltraHonkProofData<ParityPublicInputs>, 
     /**
      * The previous rollup proof data from base or merge rollup circuits.
      */
-    previousRollup: RollupProofData<BaseOrMergeRollupPublicInputs>, 
+    previousRollup: RollupHonkProofData<TxRollupPublicInputs>, 
     /**
      * The l1 to l2 message tree snapshot immediately before this block.
      */
@@ -107,7 +102,7 @@ export declare class BlockRootSingleTxFirstRollupPrivateInputs {
      */
     newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>);
     static from(fields: FieldsOf<BlockRootSingleTxFirstRollupPrivateInputs>): BlockRootSingleTxFirstRollupPrivateInputs;
-    static getFields(fields: FieldsOf<BlockRootSingleTxFirstRollupPrivateInputs>): readonly [RootParityProofData, RollupProofData<BaseOrMergeRollupPublicInputs>, 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, 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, Fr, Fr, Fr, Fr]];
+    static getFields(fields: FieldsOf<BlockRootSingleTxFirstRollupPrivateInputs>): readonly [UltraHonkProofData<ParityPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>, 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, 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, Fr, Fr, Fr, Fr]];
     toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): BlockRootSingleTxFirstRollupPrivateInputs;
     toJSON(): Buffer<ArrayBufferLike>;
@@ -117,7 +112,7 @@ export declare class BlockRootEmptyTxFirstRollupPrivateInputs {
     /**
      * The original and converted roots of the L1 to L2 messages subtrees.
      */
-    l1ToL2Roots: RootParityProofData;
+    l1ToL2Roots: UltraHonkProofData<ParityPublicInputs>;
     /**
      * The archive after applying the previous block.
      */
@@ -151,7 +146,7 @@ export declare class BlockRootEmptyTxFirstRollupPrivateInputs {
     /**
      * The original and converted roots of the L1 to L2 messages subtrees.
      */
-    l1ToL2Roots: RootParityProofData, 
+    l1ToL2Roots: UltraHonkProofData<ParityPublicInputs>, 
     /**
      * The archive after applying the previous block.
      */
@@ -182,7 +177,7 @@ export declare class BlockRootEmptyTxFirstRollupPrivateInputs {
      */
     newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>);
     static from(fields: FieldsOf<BlockRootEmptyTxFirstRollupPrivateInputs>): BlockRootEmptyTxFirstRollupPrivateInputs;
-    static getFields(fields: FieldsOf<BlockRootEmptyTxFirstRollupPrivateInputs>): readonly [RootParityProofData, AppendOnlyTreeSnapshot, StateReference, CheckpointConstantData, SpongeBlob, bigint, [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, 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, Fr, Fr, Fr, Fr]];
+    static getFields(fields: FieldsOf<BlockRootEmptyTxFirstRollupPrivateInputs>): readonly [UltraHonkProofData<ParityPublicInputs>, AppendOnlyTreeSnapshot, StateReference, CheckpointConstantData, SpongeBlob, bigint, [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, 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, Fr, Fr, Fr, Fr]];
     toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): BlockRootEmptyTxFirstRollupPrivateInputs;
     toJSON(): Buffer<ArrayBufferLike>;
@@ -192,10 +187,7 @@ export declare class BlockRootRollupPrivateInputs {
     /**
      * The previous rollup proof data from base or merge rollup circuits.
      */
-    previousRollups: [
-        RollupProofData<BaseOrMergeRollupPublicInputs>,
-        RollupProofData<BaseOrMergeRollupPublicInputs>
-    ];
+    previousRollups: [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>];
     /**
      * Hint for inserting the new block hash to the last archive.
      */
@@ -204,16 +196,13 @@ export declare class BlockRootRollupPrivateInputs {
     /**
      * The previous rollup proof data from base or merge rollup circuits.
      */
-    previousRollups: [
-        RollupProofData<BaseOrMergeRollupPublicInputs>,
-        RollupProofData<BaseOrMergeRollupPublicInputs>
-    ], 
+    previousRollups: [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>], 
     /**
      * Hint for inserting the new block hash to the last archive.
      */
     newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>);
     static from(fields: FieldsOf<BlockRootRollupPrivateInputs>): BlockRootRollupPrivateInputs;
-    static getFields(fields: FieldsOf<BlockRootRollupPrivateInputs>): readonly [[RollupProofData<BaseOrMergeRollupPublicInputs>, RollupProofData<BaseOrMergeRollupPublicInputs>], [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]];
+    static getFields(fields: FieldsOf<BlockRootRollupPrivateInputs>): readonly [[RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>], [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]];
     toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): BlockRootRollupPrivateInputs;
     toJSON(): Buffer<ArrayBufferLike>;
@@ -223,7 +212,7 @@ export declare class BlockRootSingleTxRollupPrivateInputs {
     /**
      * The previous rollup proof data from base or merge rollup circuits.
      */
-    previousRollup: RollupProofData<BaseOrMergeRollupPublicInputs>;
+    previousRollup: RollupHonkProofData<TxRollupPublicInputs>;
     /**
      * Hint for inserting the new block hash to the last archive.
      */
@@ -232,16 +221,16 @@ export declare class BlockRootSingleTxRollupPrivateInputs {
     /**
      * The previous rollup proof data from base or merge rollup circuits.
      */
-    previousRollup: RollupProofData<BaseOrMergeRollupPublicInputs>, 
+    previousRollup: RollupHonkProofData<TxRollupPublicInputs>, 
     /**
      * Hint for inserting the new block hash to the last archive.
      */
     newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>);
     static from(fields: FieldsOf<BlockRootSingleTxRollupPrivateInputs>): BlockRootSingleTxRollupPrivateInputs;
-    static getFields(fields: FieldsOf<BlockRootSingleTxRollupPrivateInputs>): readonly [RollupProofData<BaseOrMergeRollupPublicInputs>, [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]];
+    static getFields(fields: FieldsOf<BlockRootSingleTxRollupPrivateInputs>): readonly [RollupHonkProofData<TxRollupPublicInputs>, [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]];
     toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): BlockRootSingleTxRollupPrivateInputs;
     toJSON(): Buffer<ArrayBufferLike>;
     static get schema(): import("zod").ZodType<BlockRootSingleTxRollupPrivateInputs, any, string>;
 }
-//# sourceMappingURL=block_root_rollup.d.ts.map
+//# sourceMappingURL=block_root_rollup_private_inputs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"block_root_rollup_private_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/block_root_rollup_private_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,wCAAwC,EAAE,MAAM,kBAAkB,CAAC;AAC5F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAuC,MAAM,6BAA6B,CAAC;AAC5G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAa,KAAK,mBAAmB,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AACvG,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,qBAAa,iCAAiC;IAE1C;;OAEG;IACI,WAAW,EAAE,kBAAkB,CAAC,kBAAkB,CAAC;IAC1D;;OAEG;IACI,eAAe,EAAE,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAC9G;;OAEG;IACI,cAAc,EAAE,sBAAsB;IAC7C;;OAEG;IACI,kCAAkC,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wCAAwC,CAAC;IACrG;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;;IAnB9D;;OAEG;IACI,WAAW,EAAE,kBAAkB,CAAC,kBAAkB,CAAC;IAC1D;;OAEG;IACI,eAAe,EAAE,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAC9G;;OAEG;IACI,cAAc,EAAE,sBAAsB;IAC7C;;OAEG;IACI,kCAAkC,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wCAAwC,CAAC;IACrG;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IAGhE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iCAAiC,CAAC;IAI/D,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,iCAAiC,CAAC;IAUpE,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAW/C,MAAM;IAIN,MAAM,KAAK,MAAM,0EAEhB;CACF;AAED,qBAAa,yCAAyC;IAElD;;OAEG;IACI,WAAW,EAAE,kBAAkB,CAAC,kBAAkB,CAAC;IAC1D;;OAEG;IACI,cAAc,EAAE,mBAAmB,CAAC,oBAAoB,CAAC;IAChE;;OAEG;IACI,cAAc,EAAE,sBAAsB;IAC7C;;OAEG;IACI,kCAAkC,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wCAAwC,CAAC;IACrG;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;;IAnB9D;;OAEG;IACI,WAAW,EAAE,kBAAkB,CAAC,kBAAkB,CAAC;IAC1D;;OAEG;IACI,cAAc,EAAE,mBAAmB,CAAC,oBAAoB,CAAC;IAChE;;OAEG;IACI,cAAc,EAAE,sBAAsB;IAC7C;;OAEG;IACI,kCAAkC,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wCAAwC,CAAC;IACrG;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IAGhE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,yCAAyC,CAAC;IAMvE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,yCAAyC,CAAC;IAU5E,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAW/C,MAAM;IAIN,MAAM,KAAK,MAAM,kFAEhB;CACF;AAED,qBAAa,wCAAwC;IAEjD;;OAEG;IACI,WAAW,EAAE,kBAAkB,CAAC,kBAAkB,CAAC;IAC1D;;OAEG;IACI,eAAe,EAAE,sBAAsB;IAC9C;;OAEG;IACI,aAAa,EAAE,cAAc;IACpC;;OAEG;IACI,SAAS,EAAE,sBAAsB;IACxC;;;OAGG;IACI,eAAe,EAAE,UAAU;IAClC;;OAEG;IACI,SAAS,EAAE,MAAM;IACxB;;OAEG;IACI,kCAAkC,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wCAAwC,CAAC;IACrG;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;;IAhC9D;;OAEG;IACI,WAAW,EAAE,kBAAkB,CAAC,kBAAkB,CAAC;IAC1D;;OAEG;IACI,eAAe,EAAE,sBAAsB;IAC9C;;OAEG;IACI,aAAa,EAAE,cAAc;IACpC;;OAEG;IACI,SAAS,EAAE,sBAAsB;IACxC;;;OAGG;IACI,eAAe,EAAE,UAAU;IAClC;;OAEG;IACI,SAAS,EAAE,MAAM;IACxB;;OAEG;IACI,kCAAkC,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wCAAwC,CAAC;IACrG;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IAGhE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,wCAAwC,CAAC;IAItE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,wCAAwC,CAAC;IAa3E,QAAQ;IAaR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAc/C,MAAM;IAIN,MAAM,KAAK,MAAM,iFAEhB;CACF;AAED,qBAAa,4BAA4B;IAErC;;OAEG;IACI,eAAe,EAAE,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAC9G;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;;IAP9D;;OAEG;IACI,eAAe,EAAE,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAC9G;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IAGhE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,4BAA4B,CAAC;IAI1D,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,4BAA4B,CAAC;IAI/D,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAQ/C,MAAM;IAIN,MAAM,KAAK,MAAM,qEAEhB;CACF;AAED,qBAAa,oCAAoC;IAE7C;;OAEG;IACI,cAAc,EAAE,mBAAmB,CAAC,oBAAoB,CAAC;IAChE;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;;IAP9D;;OAEG;IACI,cAAc,EAAE,mBAAmB,CAAC,oBAAoB,CAAC;IAChE;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IAGhE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,oCAAoC,CAAC;IAIlE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,oCAAoC,CAAC;IAIvE,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAQ/C,MAAM;IAIN,MAAM,KAAK,MAAM,6EAEhB;CACF"}

package/dest/rollup/{block_root_rollup.js → block_root_rollup_private_inputs.js}

@@ -7,8 +7,8 @@ import { ParityPublicInputs } from '../parity/parity_public_inputs.js';
 import { ProofData } from '../proofs/proof_data.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { StateReference } from '../tx/state_reference.js';
-import { BaseOrMergeRollupPublicInputs } from './base_or_merge_rollup_public_inputs.js';
 import { CheckpointConstantData } from './checkpoint_constant_data.js';
+import { TxRollupPublicInputs } from './tx_rollup_public_inputs.js';
 export class BlockRootFirstRollupPrivateInputs {
     l1ToL2Roots;
     previousRollups;
@@ -50,8 +50,8 @@ export class BlockRootFirstRollupPrivateInputs {
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         return new BlockRootFirstRollupPrivateInputs(ProofData.fromBuffer(reader, ParityPublicInputs), [
-            ProofData.fromBuffer(reader, BaseOrMergeRollupPublicInputs),
-            ProofData.fromBuffer(reader, BaseOrMergeRollupPublicInputs)
+            ProofData.fromBuffer(reader, TxRollupPublicInputs),
+            ProofData.fromBuffer(reader, TxRollupPublicInputs)
         ], AppendOnlyTreeSnapshot.fromBuffer(reader), reader.readArray(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, Fr), reader.readArray(ARCHIVE_HEIGHT, Fr));
     }
     toJSON() {
@@ -101,7 +101,7 @@ export class BlockRootSingleTxFirstRollupPrivateInputs {
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new BlockRootSingleTxFirstRollupPrivateInputs(ProofData.fromBuffer(reader, ParityPublicInputs), ProofData.fromBuffer(reader, BaseOrMergeRollupPublicInputs), AppendOnlyTreeSnapshot.fromBuffer(reader), reader.readArray(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, Fr), reader.readArray(ARCHIVE_HEIGHT, Fr));
+        return new BlockRootSingleTxFirstRollupPrivateInputs(ProofData.fromBuffer(reader, ParityPublicInputs), ProofData.fromBuffer(reader, TxRollupPublicInputs), AppendOnlyTreeSnapshot.fromBuffer(reader), reader.readArray(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, Fr), reader.readArray(ARCHIVE_HEIGHT, Fr));
     }
     toJSON() {
         return this.toBuffer();
@@ -210,8 +210,8 @@ export class BlockRootRollupPrivateInputs {
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         return new BlockRootRollupPrivateInputs([
-            ProofData.fromBuffer(reader, BaseOrMergeRollupPublicInputs),
-            ProofData.fromBuffer(reader, BaseOrMergeRollupPublicInputs)
+            ProofData.fromBuffer(reader, TxRollupPublicInputs),
+            ProofData.fromBuffer(reader, TxRollupPublicInputs)
         ], reader.readArray(ARCHIVE_HEIGHT, Fr));
     }
     toJSON() {
@@ -246,7 +246,7 @@ export class BlockRootSingleTxRollupPrivateInputs {
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new BlockRootSingleTxRollupPrivateInputs(ProofData.fromBuffer(reader, BaseOrMergeRollupPublicInputs), reader.readArray(ARCHIVE_HEIGHT, Fr));
+        return new BlockRootSingleTxRollupPrivateInputs(ProofData.fromBuffer(reader, TxRollupPublicInputs), reader.readArray(ARCHIVE_HEIGHT, Fr));
     }
     toJSON() {
         return this.toBuffer();

package/dest/rollup/{checkpoint_merge_rollup.d.ts → checkpoint_merge_rollup_private_inputs.d.ts}

@@ -1,6 +1,6 @@
 import { BufferReader } from '@aztec/foundation/serialize';
+import { type RollupHonkProofData } from '../proofs/proof_data.js';
 import { CheckpointRollupPublicInputs } from './checkpoint_rollup_public_inputs.js';
-import type { RollupProofData } from './rollup_proof_data.js';
 /**
  * Represents inputs of the checkpoint merge rollup circuit.
  */
@@ -9,16 +9,16 @@ export declare class CheckpointMergeRollupPrivateInputs {
      * Previous rollup data from the 2 checkpoint root or merge rollup circuits that preceded this checkpoint merge rollup circuit.
      */
     previousRollups: [
-        RollupProofData<CheckpointRollupPublicInputs>,
-        RollupProofData<CheckpointRollupPublicInputs>
+        RollupHonkProofData<CheckpointRollupPublicInputs>,
+        RollupHonkProofData<CheckpointRollupPublicInputs>
     ];
     constructor(
     /**
      * Previous rollup data from the 2 checkpoint root or merge rollup circuits that preceded this checkpoint merge rollup circuit.
      */
     previousRollups: [
-        RollupProofData<CheckpointRollupPublicInputs>,
-        RollupProofData<CheckpointRollupPublicInputs>
+        RollupHonkProofData<CheckpointRollupPublicInputs>,
+        RollupHonkProofData<CheckpointRollupPublicInputs>
     ]);
     toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): CheckpointMergeRollupPrivateInputs;
@@ -27,4 +27,4 @@ export declare class CheckpointMergeRollupPrivateInputs {
     toJSON(): Buffer<ArrayBufferLike>;
     static get schema(): import("zod").ZodType<CheckpointMergeRollupPrivateInputs, any, string>;
 }
-//# sourceMappingURL=checkpoint_merge_rollup.d.ts.map
+//# sourceMappingURL=checkpoint_merge_rollup_private_inputs.d.ts.map

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

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

package/dest/rollup/{checkpoint_root_rollup.d.ts → checkpoint_root_rollup_private_inputs.d.ts}

@@ -3,9 +3,9 @@ import { ARCHIVE_HEIGHT, BLOBS_PER_BLOCK } from '@aztec/constants';
 import { BLS12Point, Fr } from '@aztec/foundation/fields';
 import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
+import { type RollupHonkProofData } from '../proofs/proof_data.js';
 import { BlockHeader } from '../tx/block_header.js';
 import { BlockRollupPublicInputs } from './block_rollup_public_inputs.js';
-import type { RollupProofData } from './rollup_proof_data.js';
 export declare class CheckpointRootRollupHints {
     /**
      * The header of the previous block before this checkpoint.
@@ -80,11 +80,17 @@ export declare class CheckpointRootRollupHints {
     static get schema(): import("zod").ZodType<CheckpointRootRollupHints, any, string>;
 }
 export declare class CheckpointRootRollupPrivateInputs {
-    previousRollups: [RollupProofData<BlockRollupPublicInputs>, RollupProofData<BlockRollupPublicInputs>];
+    previousRollups: [
+        RollupHonkProofData<BlockRollupPublicInputs>,
+        RollupHonkProofData<BlockRollupPublicInputs>
+    ];
     hints: CheckpointRootRollupHints;
-    constructor(previousRollups: [RollupProofData<BlockRollupPublicInputs>, RollupProofData<BlockRollupPublicInputs>], hints: CheckpointRootRollupHints);
+    constructor(previousRollups: [
+        RollupHonkProofData<BlockRollupPublicInputs>,
+        RollupHonkProofData<BlockRollupPublicInputs>
+    ], hints: CheckpointRootRollupHints);
     static from(fields: FieldsOf<CheckpointRootRollupPrivateInputs>): CheckpointRootRollupPrivateInputs;
-    static getFields(fields: FieldsOf<CheckpointRootRollupPrivateInputs>): readonly [[RollupProofData<BlockRollupPublicInputs>, RollupProofData<BlockRollupPublicInputs>], CheckpointRootRollupHints];
+    static getFields(fields: FieldsOf<CheckpointRootRollupPrivateInputs>): readonly [[RollupHonkProofData<BlockRollupPublicInputs>, RollupHonkProofData<BlockRollupPublicInputs>], CheckpointRootRollupHints];
     toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): CheckpointRootRollupPrivateInputs;
     toString(): `0x${string}`;
@@ -93,11 +99,11 @@ export declare class CheckpointRootRollupPrivateInputs {
     static get schema(): import("zod").ZodType<CheckpointRootRollupPrivateInputs, any, string>;
 }
 export declare class CheckpointRootSingleBlockRollupPrivateInputs {
-    previousRollup: RollupProofData<BlockRollupPublicInputs>;
+    previousRollup: RollupHonkProofData<BlockRollupPublicInputs>;
     hints: CheckpointRootRollupHints;
-    constructor(previousRollup: RollupProofData<BlockRollupPublicInputs>, hints: CheckpointRootRollupHints);
+    constructor(previousRollup: RollupHonkProofData<BlockRollupPublicInputs>, hints: CheckpointRootRollupHints);
     static from(fields: FieldsOf<CheckpointRootSingleBlockRollupPrivateInputs>): CheckpointRootSingleBlockRollupPrivateInputs;
-    static getFields(fields: FieldsOf<CheckpointRootSingleBlockRollupPrivateInputs>): readonly [RollupProofData<BlockRollupPublicInputs>, CheckpointRootRollupHints];
+    static getFields(fields: FieldsOf<CheckpointRootSingleBlockRollupPrivateInputs>): readonly [RollupHonkProofData<BlockRollupPublicInputs>, CheckpointRootRollupHints];
     toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): CheckpointRootSingleBlockRollupPrivateInputs;
     toString(): `0x${string}`;
@@ -114,4 +120,4 @@ export declare class CheckpointPaddingRollupPrivateInputs {
     toJSON(): Buffer<ArrayBuffer>;
     static get schema(): import("zod").ZodType<CheckpointPaddingRollupPrivateInputs, any, string>;
 }
-//# sourceMappingURL=checkpoint_root_rollup.d.ts.map
+//# sourceMappingURL=checkpoint_root_rollup_private_inputs.d.ts.map

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

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