@aztec/stdlib 2.1.0-rc.9 → 3.0.0-devnet.2

package/dest/rollup/public_tx_base_rollup_private_inputs.js

@@ -0,0 +1,46 @@
+import { bufferSchemaFor } from '@aztec/foundation/schemas';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
+import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
+import { ProofData } from '../proofs/proof_data.js';
+import { PublicBaseRollupHints } from './base_rollup_hints.js';
+import { PublicTubePublicInputs } from './public_tube_public_inputs.js';
+export class PublicTxBaseRollupPrivateInputs {
+    publicTubeProofData;
+    avmProofData;
+    hints;
+    constructor(publicTubeProofData, avmProofData, hints){
+        this.publicTubeProofData = publicTubeProofData;
+        this.avmProofData = avmProofData;
+        this.hints = hints;
+    }
+    static from(fields) {
+        return new PublicTxBaseRollupPrivateInputs(...PublicTxBaseRollupPrivateInputs.getFields(fields));
+    }
+    static getFields(fields) {
+        return [
+            fields.publicTubeProofData,
+            fields.avmProofData,
+            fields.hints
+        ];
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new PublicTxBaseRollupPrivateInputs(ProofData.fromBuffer(reader, PublicTubePublicInputs), ProofData.fromBuffer(reader, AvmCircuitPublicInputs), reader.readObject(PublicBaseRollupHints));
+    }
+    toBuffer() {
+        return serializeToBuffer(...PublicTxBaseRollupPrivateInputs.getFields(this));
+    }
+    static fromString(str) {
+        return PublicTxBaseRollupPrivateInputs.fromBuffer(hexToBuffer(str));
+    }
+    toString() {
+        return bufferToHex(this.toBuffer());
+    }
+    /** Returns a representation for JSON serialization. */ toJSON() {
+        return this.toBuffer();
+    }
+    /** Creates an instance from a string. */ static get schema() {
+        return bufferSchemaFor(PublicTxBaseRollupPrivateInputs);
+    }
+}

package/dest/rollup/root_rollup_private_inputs.d.ts

@@ -0,0 +1,67 @@
+import { BufferReader } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
+import { type RollupHonkProofData } from '../proofs/proof_data.js';
+import { CheckpointRollupPublicInputs } from './checkpoint_rollup_public_inputs.js';
+/**
+ * Represents inputs of the root rollup circuit.
+ */
+export declare class RootRollupPrivateInputs {
+    /**
+     * The previous rollup data.
+     * Note: Root rollup circuit is the latest circuit the chain of circuits and the previous rollup data is the data
+     * from 2 checkpoint root/merge/padding circuits.
+     */
+    previousRollups: [
+        RollupHonkProofData<CheckpointRollupPublicInputs>,
+        RollupHonkProofData<CheckpointRollupPublicInputs>
+    ];
+    constructor(
+    /**
+     * The previous rollup data.
+     * Note: Root rollup circuit is the latest circuit the chain of circuits and the previous rollup data is the data
+     * from 2 checkpoint root/merge/padding circuits.
+     */
+    previousRollups: [
+        RollupHonkProofData<CheckpointRollupPublicInputs>,
+        RollupHonkProofData<CheckpointRollupPublicInputs>
+    ]);
+    /**
+     * 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}`;
+    /**
+     * Creates a new instance from fields.
+     * @param fields - Fields to create the instance from.
+     * @returns A new RootRollupPrivateInputs instance.
+     */
+    static from(fields: FieldsOf<RootRollupPrivateInputs>): RootRollupPrivateInputs;
+    /**
+     * Extracts fields from an instance.
+     * @param fields - Fields to create the instance from.
+     * @returns An array of fields.
+     */
+    static getFields(fields: FieldsOf<RootRollupPrivateInputs>): readonly [[RollupHonkProofData<CheckpointRollupPublicInputs>, RollupHonkProofData<CheckpointRollupPublicInputs>]];
+    /**
+     * Deserializes the inputs from a buffer.
+     * @param buffer - A buffer to deserialize from.
+     * @returns A new RootRollupPrivateInputs instance.
+     */
+    static fromBuffer(buffer: Buffer | BufferReader): RootRollupPrivateInputs;
+    /**
+     * Deserializes the inputs from a hex string.
+     * @param str - A hex string to deserialize from.
+     * @returns A new RootRollupPrivateInputs instance.
+     */
+    static fromString(str: string): RootRollupPrivateInputs;
+    /** Returns a representation for JSON serialization. */
+    toJSON(): Buffer<ArrayBufferLike>;
+    /** Creates an instance from a string. */
+    static get schema(): import("zod").ZodType<RootRollupPrivateInputs, any, string>;
+}
+//# sourceMappingURL=root_rollup_private_inputs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"root_rollup_private_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/root_rollup_private_inputs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAa,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEpF;;GAEG;AACH,qBAAa,uBAAuB;IAEhC;;;;OAIG;IACI,eAAe,EAAE;QACtB,mBAAmB,CAAC,4BAA4B,CAAC;QACjD,mBAAmB,CAAC,4BAA4B,CAAC;KAClD;;IARD;;;;OAIG;IACI,eAAe,EAAE;QACtB,mBAAmB,CAAC,4BAA4B,CAAC;QACjD,mBAAmB,CAAC,4BAA4B,CAAC;KAClD;IAGH;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,uBAAuB,CAAC;IAIrD;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,uBAAuB,CAAC;IAI1D;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAQ/C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,uDAAuD;IACvD,MAAM;IAIN,yCAAyC;IACzC,MAAM,KAAK,MAAM,gEAEhB;CACF"}

package/dest/rollup/root_rollup_private_inputs.js

@@ -0,0 +1,69 @@
+import { bufferSchemaFor } from '@aztec/foundation/schemas';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
+import { ProofData } from '../proofs/proof_data.js';
+import { CheckpointRollupPublicInputs } from './checkpoint_rollup_public_inputs.js';
+/**
+ * Represents inputs of the root rollup circuit.
+ */ export class RootRollupPrivateInputs {
+    previousRollups;
+    constructor(/**
+     * The previous rollup data.
+     * Note: Root rollup circuit is the latest circuit the chain of circuits and the previous rollup data is the data
+     * from 2 checkpoint root/merge/padding circuits.
+     */ previousRollups){
+        this.previousRollups = previousRollups;
+    }
+    /**
+   * Serializes the inputs to a buffer.
+   * @returns - The inputs serialized to a buffer.
+   */ toBuffer() {
+        return serializeToBuffer(...RootRollupPrivateInputs.getFields(this));
+    }
+    /**
+   * Serializes the inputs to a hex string.
+   * @returns The instance serialized to a hex string.
+   */ toString() {
+        return bufferToHex(this.toBuffer());
+    }
+    /**
+   * Creates a new instance from fields.
+   * @param fields - Fields to create the instance from.
+   * @returns A new RootRollupPrivateInputs instance.
+   */ static from(fields) {
+        return new RootRollupPrivateInputs(...RootRollupPrivateInputs.getFields(fields));
+    }
+    /**
+   * Extracts fields from an instance.
+   * @param fields - Fields to create the instance from.
+   * @returns An array of fields.
+   */ static getFields(fields) {
+        return [
+            fields.previousRollups
+        ];
+    }
+    /**
+   * Deserializes the inputs from a buffer.
+   * @param buffer - A buffer to deserialize from.
+   * @returns A new RootRollupPrivateInputs instance.
+   */ static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new RootRollupPrivateInputs([
+            ProofData.fromBuffer(reader, CheckpointRollupPublicInputs),
+            ProofData.fromBuffer(reader, CheckpointRollupPublicInputs)
+        ]);
+    }
+    /**
+   * Deserializes the inputs from a hex string.
+   * @param str - A hex string to deserialize from.
+   * @returns A new RootRollupPrivateInputs instance.
+   */ static fromString(str) {
+        return RootRollupPrivateInputs.fromBuffer(hexToBuffer(str));
+    }
+    /** Returns a representation for JSON serialization. */ toJSON() {
+        return this.toBuffer();
+    }
+    /** Creates an instance from a string. */ static get schema() {
+        return bufferSchemaFor(RootRollupPrivateInputs);
+    }
+}

package/dest/rollup/root_rollup_public_inputs.d.ts

@@ -0,0 +1,46 @@
+import { FinalBlobAccumulator } from '@aztec/blob-lib/types';
+import { AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
+import { FeeRecipient } from './checkpoint_rollup_public_inputs.js';
+import { EpochConstantData } from './epoch_constant_data.js';
+/**
+ * Represents public inputs of the root rollup circuit.
+ *
+ * NOTE: in practice, we'll hash all of this up into a single public input, for cheap onchain verification.
+ */
+export declare class RootRollupPublicInputs {
+    /** Root of the archive tree before this rollup is processed */
+    previousArchiveRoot: Fr;
+    /** Root of the archive tree after this rollup is processed */
+    endArchiveRoot: Fr;
+    checkpointHeaderHashes: Tuple<Fr, typeof AZTEC_MAX_EPOCH_DURATION>;
+    fees: Tuple<FeeRecipient, typeof AZTEC_MAX_EPOCH_DURATION>;
+    constants: EpochConstantData;
+    blobPublicInputs: FinalBlobAccumulator;
+    constructor(
+    /** Root of the archive tree before this rollup is processed */
+    previousArchiveRoot: Fr, 
+    /** Root of the archive tree after this rollup is processed */
+    endArchiveRoot: Fr, checkpointHeaderHashes: Tuple<Fr, typeof AZTEC_MAX_EPOCH_DURATION>, fees: Tuple<FeeRecipient, typeof AZTEC_MAX_EPOCH_DURATION>, constants: EpochConstantData, blobPublicInputs: FinalBlobAccumulator);
+    static getFields(fields: FieldsOf<RootRollupPublicInputs>): readonly [Fr, Fr, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient, FeeRecipient], EpochConstantData, FinalBlobAccumulator];
+    toBuffer(): Buffer<ArrayBufferLike>;
+    toFields(): Fr[];
+    static from(fields: FieldsOf<RootRollupPublicInputs>): RootRollupPublicInputs;
+    /**
+     * Deserializes a buffer into a `RootRollupPublicInputs` object.
+     * @param buffer - The buffer to deserialize.
+     * @returns The deserialized `RootRollupPublicInputs` object.
+     */
+    static fromBuffer(buffer: Buffer | BufferReader): RootRollupPublicInputs;
+    toString(): `0x${string}`;
+    static fromString(str: string): RootRollupPublicInputs;
+    /** Returns a representation for JSON serialization. */
+    toJSON(): Buffer<ArrayBufferLike>;
+    /** Creates an instance from a string. */
+    static get schema(): import("zod").ZodType<RootRollupPublicInputs, any, string>;
+    /** Creates a random instance. Used for testing only - will not prove/verify. */
+    static random(): RootRollupPublicInputs;
+}
+//# sourceMappingURL=root_rollup_public_inputs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"root_rollup_public_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/root_rollup_public_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAwC,MAAM,6BAA6B,CAAC;AAE7G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;;GAIG;AACH,qBAAa,sBAAsB;IAE/B,+DAA+D;IACxD,mBAAmB,EAAE,EAAE;IAC9B,8DAA8D;IACvD,cAAc,EAAE,EAAE;IAClB,sBAAsB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wBAAwB,CAAC;IAClE,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,OAAO,wBAAwB,CAAC;IAC1D,SAAS,EAAE,iBAAiB;IAC5B,gBAAgB,EAAE,oBAAoB;;IAP7C,+DAA+D;IACxD,mBAAmB,EAAE,EAAE;IAC9B,8DAA8D;IACvD,cAAc,EAAE,EAAE,EAClB,sBAAsB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wBAAwB,CAAC,EAClE,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,OAAO,wBAAwB,CAAC,EAC1D,SAAS,EAAE,iBAAiB,EAC5B,gBAAgB,EAAE,oBAAoB;IAG/C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,sBAAsB,CAAC;IAWzD,QAAQ;IAIR,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,sBAAsB,CAAC,GAAG,sBAAsB;IAI7E;;;;OAIG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,sBAAsB;IAY/E,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,uDAAuD;IACvD,MAAM;IAIN,yCAAyC;IACzC,MAAM,KAAK,MAAM,+DAEhB;IAED,gFAAgF;IAChF,MAAM,CAAC,MAAM;CAUd"}

package/dest/rollup/root_rollup_public_inputs.js

@@ -0,0 +1,71 @@
+import { FinalBlobAccumulator } from '@aztec/blob-lib/types';
+import { AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
+import { makeTuple } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/fields';
+import { bufferSchemaFor } from '@aztec/foundation/schemas';
+import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
+import { FeeRecipient } from './checkpoint_rollup_public_inputs.js';
+import { EpochConstantData } from './epoch_constant_data.js';
+/**
+ * Represents public inputs of the root rollup circuit.
+ *
+ * NOTE: in practice, we'll hash all of this up into a single public input, for cheap onchain verification.
+ */ export class RootRollupPublicInputs {
+    previousArchiveRoot;
+    endArchiveRoot;
+    checkpointHeaderHashes;
+    fees;
+    constants;
+    blobPublicInputs;
+    constructor(/** Root of the archive tree before this rollup is processed */ previousArchiveRoot, /** Root of the archive tree after this rollup is processed */ endArchiveRoot, checkpointHeaderHashes, fees, constants, blobPublicInputs){
+        this.previousArchiveRoot = previousArchiveRoot;
+        this.endArchiveRoot = endArchiveRoot;
+        this.checkpointHeaderHashes = checkpointHeaderHashes;
+        this.fees = fees;
+        this.constants = constants;
+        this.blobPublicInputs = blobPublicInputs;
+    }
+    static getFields(fields) {
+        return [
+            fields.previousArchiveRoot,
+            fields.endArchiveRoot,
+            fields.checkpointHeaderHashes,
+            fields.fees,
+            fields.constants,
+            fields.blobPublicInputs
+        ];
+    }
+    toBuffer() {
+        return serializeToBuffer(...RootRollupPublicInputs.getFields(this));
+    }
+    toFields() {
+        return serializeToFields(...RootRollupPublicInputs.getFields(this));
+    }
+    static from(fields) {
+        return new RootRollupPublicInputs(...RootRollupPublicInputs.getFields(fields));
+    }
+    /**
+   * Deserializes a buffer into a `RootRollupPublicInputs` object.
+   * @param buffer - The buffer to deserialize.
+   * @returns The deserialized `RootRollupPublicInputs` object.
+   */ static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new RootRollupPublicInputs(Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readArray(AZTEC_MAX_EPOCH_DURATION, Fr), reader.readArray(AZTEC_MAX_EPOCH_DURATION, FeeRecipient), EpochConstantData.fromBuffer(reader), reader.readObject(FinalBlobAccumulator));
+    }
+    toString() {
+        return bufferToHex(this.toBuffer());
+    }
+    static fromString(str) {
+        return RootRollupPublicInputs.fromBuffer(hexToBuffer(str));
+    }
+    /** Returns a representation for JSON serialization. */ toJSON() {
+        return this.toBuffer();
+    }
+    /** Creates an instance from a string. */ static get schema() {
+        return bufferSchemaFor(RootRollupPublicInputs);
+    }
+    /** Creates a random instance. Used for testing only - will not prove/verify. */ static random() {
+        return new RootRollupPublicInputs(Fr.random(), Fr.random(), makeTuple(AZTEC_MAX_EPOCH_DURATION, Fr.random), makeTuple(AZTEC_MAX_EPOCH_DURATION, FeeRecipient.random), new EpochConstantData(Fr.random(), Fr.random(), Fr.random(), Fr.random(), Fr.random()), FinalBlobAccumulator.random());
+    }
+}

package/dest/rollup/{state_diff_hints.d.ts → tree_snapshot_diff_hints.d.ts}

@@ -1,13 +1,17 @@
-import { MAX_NULLIFIERS_PER_TX, NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
+import { MAX_NULLIFIERS_PER_TX, NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT } 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 { NullifierLeafPreimage, PublicDataTreeLeafPreimage } from '../trees/index.js';
+import { NullifierLeafPreimage } from '../trees/index.js';
 /**
  * Hints used while proving state diff validity for the private base rollup.
  */
-export declare class PrivateBaseStateDiffHints {
+export declare class TreeSnapshotDiffHints {
+    /**
+     * Sibling path "pointing to" where the new note hash subtree should be inserted into the note hash tree.
+     */
+    noteHashSubtreeRootSiblingPath: Tuple<Fr, typeof NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH>;
     /**
      * The nullifiers which need to be updated to perform the batch insertion of the new nullifiers.
      * See `StandardIndexedTree.batchInsert` function for more details.
@@ -26,27 +30,19 @@ export declare class PrivateBaseStateDiffHints {
      * The indexes of the sorted nullifiers to the original ones.
      */
     sortedNullifierIndexes: Tuple<number, typeof MAX_NULLIFIERS_PER_TX>;
-    /**
-     * Sibling path "pointing to" where the new note hash subtree should be inserted into the note hash tree.
-     */
-    noteHashSubtreeSiblingPath: Tuple<Fr, typeof NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH>;
     /**
      * Sibling path "pointing to" where the new nullifiers subtree should be inserted into the nullifier tree.
      */
-    nullifierSubtreeSiblingPath: Tuple<Fr, typeof NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH>;
-    /**
-     * Low leaf for the fee write in the public data tree.
-     */
-    feeWriteLowLeafPreimage: PublicDataTreeLeafPreimage;
+    nullifierSubtreeRootSiblingPath: Tuple<Fr, typeof NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH>;
     /**
-     * Membership witness for the low leaf for the fee write in the public data tree.
+     * Membership witness for the fee payer's balance leaf in the public data tree.
      */
-    feeWriteLowLeafMembershipWitness: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>;
+    feePayerBalanceMembershipWitness: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>;
+    constructor(
     /**
-     * Sibling path "pointing to" where the fee write should be inserted into the public data tree.
+     * Sibling path "pointing to" where the new note hash subtree should be inserted into the note hash tree.
      */
-    feeWriteSiblingPath: Tuple<Fr, typeof PUBLIC_DATA_TREE_HEIGHT>;
-    constructor(
+    noteHashSubtreeRootSiblingPath: Tuple<Fr, typeof NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH>, 
     /**
      * The nullifiers which need to be updated to perform the batch insertion of the new nullifiers.
      * See `StandardIndexedTree.batchInsert` function for more details.
@@ -65,28 +61,16 @@ export declare class PrivateBaseStateDiffHints {
      * The indexes of the sorted nullifiers to the original ones.
      */
     sortedNullifierIndexes: Tuple<number, typeof MAX_NULLIFIERS_PER_TX>, 
-    /**
-     * Sibling path "pointing to" where the new note hash subtree should be inserted into the note hash tree.
-     */
-    noteHashSubtreeSiblingPath: Tuple<Fr, typeof NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH>, 
     /**
      * Sibling path "pointing to" where the new nullifiers subtree should be inserted into the nullifier tree.
      */
-    nullifierSubtreeSiblingPath: Tuple<Fr, typeof NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH>, 
-    /**
-     * Low leaf for the fee write in the public data tree.
-     */
-    feeWriteLowLeafPreimage: PublicDataTreeLeafPreimage, 
-    /**
-     * Membership witness for the low leaf for the fee write in the public data tree.
-     */
-    feeWriteLowLeafMembershipWitness: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>, 
+    nullifierSubtreeRootSiblingPath: Tuple<Fr, typeof NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH>, 
     /**
-     * Sibling path "pointing to" where the fee write should be inserted into the public data tree.
+     * Membership witness for the fee payer's balance leaf in the public data tree.
      */
-    feeWriteSiblingPath: Tuple<Fr, typeof PUBLIC_DATA_TREE_HEIGHT>);
-    static from(fields: FieldsOf<PrivateBaseStateDiffHints>): PrivateBaseStateDiffHints;
-    static getFields(fields: FieldsOf<PrivateBaseStateDiffHints>): readonly [[NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage], [MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>, MembershipWitness<40>], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], PublicDataTreeLeafPreimage, MembershipWitness<40>, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr]];
+    feePayerBalanceMembershipWitness: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>);
+    static from(fields: FieldsOf<TreeSnapshotDiffHints>): TreeSnapshotDiffHints;
+    static getFields(fields: FieldsOf<TreeSnapshotDiffHints>): readonly [[Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage, NullifierLeafPreimage], [MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>, MembershipWitness<42>], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], MembershipWitness<40>];
     /**
      * Serializes the state diff hints to a buffer.
      * @returns A buffer of the serialized state diff hints.
@@ -95,9 +79,9 @@ export declare class PrivateBaseStateDiffHints {
     /**
      * Deserializes the state diff hints from a buffer.
      * @param buffer - A buffer to deserialize from.
-     * @returns A new PrivateBaseStateDiffHints instance.
+     * @returns A new TreeSnapshotDiffHints instance.
      */
-    static fromBuffer(buffer: Buffer | BufferReader): PrivateBaseStateDiffHints;
-    static empty(): PrivateBaseStateDiffHints;
+    static fromBuffer(buffer: Buffer | BufferReader): TreeSnapshotDiffHints;
+    static empty(): TreeSnapshotDiffHints;
 }
-//# sourceMappingURL=state_diff_hints.d.ts.map
+//# sourceMappingURL=tree_snapshot_diff_hints.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tree_snapshot_diff_hints.d.ts","sourceRoot":"","sources":["../../src/rollup/tree_snapshot_diff_hints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,0CAA0C,EAC1C,0CAA0C,EAC1C,qBAAqB,EACrB,uBAAuB,EACxB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D;;GAEG;AACH,qBAAa,qBAAqB;IAE9B;;OAEG;IACI,8BAA8B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,0CAA0C,CAAC;IACnG;;;OAGG;IACI,6BAA6B,EAAE,KAAK,CAAC,qBAAqB,EAAE,OAAO,qBAAqB,CAAC;IAChG;;;OAGG;IACI,uCAAuC,EAAE,KAAK,CACnD,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,EAC/C,OAAO,qBAAqB,CAC7B;IACD;;OAEG;IACI,gBAAgB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC;IAChE;;OAEG;IACI,sBAAsB,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,qBAAqB,CAAC;IAC1E;;OAEG;IACI,+BAA+B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,0CAA0C,CAAC;IACpG;;OAEG;IACI,gCAAgC,EAAE,iBAAiB,CAAC,OAAO,uBAAuB,CAAC;;IAhC1F;;OAEG;IACI,8BAA8B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,0CAA0C,CAAC;IACnG;;;OAGG;IACI,6BAA6B,EAAE,KAAK,CAAC,qBAAqB,EAAE,OAAO,qBAAqB,CAAC;IAChG;;;OAGG;IACI,uCAAuC,EAAE,KAAK,CACnD,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,EAC/C,OAAO,qBAAqB,CAC7B;IACD;;OAEG;IACI,gBAAgB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC;IAChE;;OAEG;IACI,sBAAsB,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,qBAAqB,CAAC;IAC1E;;OAEG;IACI,+BAA+B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,0CAA0C,CAAC;IACpG;;OAEG;IACI,gCAAgC,EAAE,iBAAiB,CAAC,OAAO,uBAAuB,CAAC;IAG5F,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,GAAG,qBAAqB;IAI3E,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC;IAYxD;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB;IAevE,MAAM,CAAC,KAAK;CAWb"}

package/dest/rollup/tree_snapshot_diff_hints.js

@@ -0,0 +1,75 @@
+import { MAX_NULLIFIERS_PER_TX, NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
+import { makeTuple } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { MembershipWitness } from '@aztec/foundation/trees';
+import { NullifierLeafPreimage } from '../trees/index.js';
+/**
+ * Hints used while proving state diff validity for the private base rollup.
+ */ export class TreeSnapshotDiffHints {
+    noteHashSubtreeRootSiblingPath;
+    nullifierPredecessorPreimages;
+    nullifierPredecessorMembershipWitnesses;
+    sortedNullifiers;
+    sortedNullifierIndexes;
+    nullifierSubtreeRootSiblingPath;
+    feePayerBalanceMembershipWitness;
+    constructor(/**
+     * Sibling path "pointing to" where the new note hash subtree should be inserted into the note hash tree.
+     */ noteHashSubtreeRootSiblingPath, /**
+     * The nullifiers which need to be updated to perform the batch insertion of the new nullifiers.
+     * See `StandardIndexedTree.batchInsert` function for more details.
+     */ nullifierPredecessorPreimages, /**
+     * Membership witnesses for the nullifiers which need to be updated to perform the batch insertion of the new
+     * nullifiers.
+     */ nullifierPredecessorMembershipWitnesses, /**
+     * The nullifiers to be inserted in the tree, sorted high to low.
+     */ sortedNullifiers, /**
+     * The indexes of the sorted nullifiers to the original ones.
+     */ sortedNullifierIndexes, /**
+     * Sibling path "pointing to" where the new nullifiers subtree should be inserted into the nullifier tree.
+     */ nullifierSubtreeRootSiblingPath, /**
+     * Membership witness for the fee payer's balance leaf in the public data tree.
+     */ feePayerBalanceMembershipWitness){
+        this.noteHashSubtreeRootSiblingPath = noteHashSubtreeRootSiblingPath;
+        this.nullifierPredecessorPreimages = nullifierPredecessorPreimages;
+        this.nullifierPredecessorMembershipWitnesses = nullifierPredecessorMembershipWitnesses;
+        this.sortedNullifiers = sortedNullifiers;
+        this.sortedNullifierIndexes = sortedNullifierIndexes;
+        this.nullifierSubtreeRootSiblingPath = nullifierSubtreeRootSiblingPath;
+        this.feePayerBalanceMembershipWitness = feePayerBalanceMembershipWitness;
+    }
+    static from(fields) {
+        return new TreeSnapshotDiffHints(...TreeSnapshotDiffHints.getFields(fields));
+    }
+    static getFields(fields) {
+        return [
+            fields.noteHashSubtreeRootSiblingPath,
+            fields.nullifierPredecessorPreimages,
+            fields.nullifierPredecessorMembershipWitnesses,
+            fields.sortedNullifiers,
+            fields.sortedNullifierIndexes,
+            fields.nullifierSubtreeRootSiblingPath,
+            fields.feePayerBalanceMembershipWitness
+        ];
+    }
+    /**
+   * Serializes the state diff hints to a buffer.
+   * @returns A buffer of the serialized state diff hints.
+   */ toBuffer() {
+        return serializeToBuffer(...TreeSnapshotDiffHints.getFields(this));
+    }
+    /**
+   * Deserializes the state diff hints from a buffer.
+   * @param buffer - A buffer to deserialize from.
+   * @returns A new TreeSnapshotDiffHints instance.
+   */ static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new TreeSnapshotDiffHints(reader.readArray(NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH, Fr), reader.readArray(MAX_NULLIFIERS_PER_TX, NullifierLeafPreimage), reader.readArray(MAX_NULLIFIERS_PER_TX, {
+            fromBuffer: (buffer)=>MembershipWitness.fromBuffer(buffer, NULLIFIER_TREE_HEIGHT)
+        }), reader.readArray(MAX_NULLIFIERS_PER_TX, Fr), reader.readNumbers(MAX_NULLIFIERS_PER_TX), reader.readArray(NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH, Fr), MembershipWitness.fromBuffer(reader, PUBLIC_DATA_TREE_HEIGHT));
+    }
+    static empty() {
+        return new TreeSnapshotDiffHints(makeTuple(NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH, Fr.zero), makeTuple(MAX_NULLIFIERS_PER_TX, NullifierLeafPreimage.empty), makeTuple(MAX_NULLIFIERS_PER_TX, ()=>MembershipWitness.empty(NULLIFIER_TREE_HEIGHT)), makeTuple(MAX_NULLIFIERS_PER_TX, Fr.zero), makeTuple(MAX_NULLIFIERS_PER_TX, ()=>0), makeTuple(NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH, Fr.zero), MembershipWitness.empty(PUBLIC_DATA_TREE_HEIGHT));
+    }
+}

package/dest/rollup/{merge_rollup.d.ts → tx_merge_rollup_private_inputs.d.ts}

@@ -1,18 +1,19 @@
 import { BufferReader } from '@aztec/foundation/serialize';
-import { PreviousRollupData } from './previous_rollup_data.js';
+import { type RollupHonkProofData } from '../proofs/proof_data.js';
+import { TxRollupPublicInputs } from './tx_rollup_public_inputs.js';
 /**
  * Represents inputs of the merge rollup circuit.
  */
-export declare class MergeRollupInputs {
+export declare class TxMergeRollupPrivateInputs {
     /**
      * Previous rollup data from the 2 merge or base rollup circuits that preceded this merge rollup circuit.
      */
-    previousRollupData: [PreviousRollupData, PreviousRollupData];
+    previousRollups: [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>];
     constructor(
     /**
      * Previous rollup data from the 2 merge or base rollup circuits that preceded this merge rollup circuit.
      */
-    previousRollupData: [PreviousRollupData, PreviousRollupData]);
+    previousRollups: [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>]);
     /**
      * Serializes the inputs to a buffer.
      * @returns The inputs serialized to a buffer.
@@ -26,18 +27,18 @@ export declare class MergeRollupInputs {
     /**
      * Deserializes the inputs from a buffer.
      * @param buffer - The buffer to deserialize from.
-     * @returns A new MergeRollupInputs instance.
+     * @returns A new TxMergeRollupPrivateInputs instance.
      */
-    static fromBuffer(buffer: Buffer | BufferReader): MergeRollupInputs;
+    static fromBuffer(buffer: Buffer | BufferReader): TxMergeRollupPrivateInputs;
     /**
      * Deserializes the inputs from a hex string.
      * @param str - A hex string to deserialize from.
-     * @returns A new MergeRollupInputs instance.
+     * @returns A new TxMergeRollupPrivateInputs instance.
      */
-    static fromString(str: string): MergeRollupInputs;
+    static fromString(str: string): TxMergeRollupPrivateInputs;
     /** Returns a buffer representation for JSON serialization. */
     toJSON(): Buffer<ArrayBufferLike>;
     /** Creates an instance from a string. */
-    static get schema(): import("zod").ZodType<MergeRollupInputs, any, string>;
+    static get schema(): import("zod").ZodType<TxMergeRollupPrivateInputs, any, string>;
 }
-//# sourceMappingURL=merge_rollup.d.ts.map
+//# sourceMappingURL=tx_merge_rollup_private_inputs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tx_merge_rollup_private_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/tx_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,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE;;GAEG;AACH,qBAAa,0BAA0B;IAEnC;;OAEG;IACI,eAAe,EAAE,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;;IAH9G;;OAEG;IACI,eAAe,EAAE,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAGhH;;;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,8DAA8D;IAC9D,MAAM;IAIN,yCAAyC;IACzC,MAAM,KAAK,MAAM,mEAEhB;CACF"}

package/dest/rollup/{merge_rollup.js → tx_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 { PreviousRollupData } from './previous_rollup_data.js';
+import { ProofData } from '../proofs/proof_data.js';
+import { TxRollupPublicInputs } from './tx_rollup_public_inputs.js';
 /**
  * Represents inputs of the merge rollup circuit.
- */ export class MergeRollupInputs {
-    previousRollupData;
+ */ export class TxMergeRollupPrivateInputs {
+    previousRollups;
     constructor(/**
      * Previous rollup data from the 2 merge or base 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 { PreviousRollupData } from './previous_rollup_data.js';
     /**
    * Deserializes the inputs from a buffer.
    * @param buffer - The buffer to deserialize from.
-   * @returns A new MergeRollupInputs instance.
+   * @returns A new TxMergeRollupPrivateInputs instance.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new MergeRollupInputs([
-            reader.readObject(PreviousRollupData),
-            reader.readObject(PreviousRollupData)
+        return new TxMergeRollupPrivateInputs([
+            ProofData.fromBuffer(reader, TxRollupPublicInputs),
+            ProofData.fromBuffer(reader, TxRollupPublicInputs)
         ]);
     }
     /**
    * Deserializes the inputs from a hex string.
    * @param str - A hex string to deserialize from.
-   * @returns A new MergeRollupInputs instance.
+   * @returns A new TxMergeRollupPrivateInputs instance.
    */ static fromString(str) {
-        return MergeRollupInputs.fromBuffer(hexToBuffer(str));
+        return TxMergeRollupPrivateInputs.fromBuffer(hexToBuffer(str));
     }
     /** Returns a buffer representation for JSON serialization. */ toJSON() {
         return this.toBuffer();
     }
     /** Creates an instance from a string. */ static get schema() {
-        return bufferSchemaFor(MergeRollupInputs);
+        return bufferSchemaFor(TxMergeRollupPrivateInputs);
     }
 }