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

package/src/parity/{root_parity_inputs.ts → parity_root_private_inputs.ts}

@@ -1,17 +1,18 @@
-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, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 
-import { RootParityInput } from './root_parity_input.js';
+import { ProofData, type UltraHonkProofData } from '../proofs/proof_data.js';
+import { ParityPublicInputs } from './parity_public_inputs.js';
 
-export class RootParityInputs {
+export type ParityBaseProofData = UltraHonkProofData<ParityPublicInputs>;
+
+export class ParityRootPrivateInputs {
   constructor(
-    /** Public inputs of children and their proofs. */
-    public readonly children: Tuple<
-      RootParityInput<typeof RECURSIVE_PROOF_LENGTH>,
-      typeof NUM_BASE_PARITY_PER_ROOT_PARITY
-    >,
+    /** Public inputs of the parity base circuits and their proofs and vk data. */
+    public readonly children: Tuple<ParityBaseProofData, typeof NUM_BASE_PARITY_PER_ROOT_PARITY>,
   ) {}
 
   /**
@@ -19,7 +20,7 @@ export class RootParityInputs {
    * @returns The inputs serialized to a buffer.
    */
   toBuffer() {
-    return serializeToBuffer(...this.children);
+    return serializeToBuffer(this.children);
   }
 
   /**
@@ -33,25 +34,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: Buffer | BufferReader) {
     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 as Tuple<RootParityInput<typeof RECURSIVE_PROOF_LENGTH>, typeof NUM_BASE_PARITY_PER_ROOT_PARITY>,
+    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: string) {
-    return RootParityInputs.fromBuffer(hexToBuffer(str));
+    return ParityRootPrivateInputs.fromBuffer(hexToBuffer(str));
   }
 
   /** Returns a buffer representation for JSON serialization. */
@@ -61,6 +59,6 @@ export class RootParityInputs {
 
   /** Creates an instance from a hex string. */
   static get schema() {
-    return bufferSchemaFor(RootParityInputs);
+    return bufferSchemaFor(ParityRootPrivateInputs);
   }
 }

package/src/proofs/proof_data.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, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { RecursiveProof } from '../proofs/recursive_proof.js';
@@ -31,4 +31,6 @@ export class ProofData<T extends Bufferable, PROOF_LENGTH extends number> {
 
 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>;

package/src/proofs/proving_request_type.ts

@@ -1,9 +1,10 @@
 export enum ProvingRequestType {
   PUBLIC_VM,
   PUBLIC_TUBE,
-  PRIVATE_BASE_ROLLUP,
-  PUBLIC_BASE_ROLLUP,
-  MERGE_ROLLUP,
+
+  PRIVATE_TX_BASE_ROLLUP,
+  PUBLIC_TX_BASE_ROLLUP,
+  TX_MERGE_ROLLUP,
   BLOCK_ROOT_FIRST_ROLLUP,
   BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP,
   BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP,
@@ -16,6 +17,6 @@ export enum ProvingRequestType {
   CHECKPOINT_MERGE_ROLLUP,
   ROOT_ROLLUP,
 
-  BASE_PARITY,
-  ROOT_PARITY,
+  PARITY_BASE,
+  PARITY_ROOT,
 }

package/src/rollup/{block_merge_rollup.ts → block_merge_rollup_private_inputs.ts}

@@ -2,9 +2,8 @@ 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, 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.
@@ -14,7 +13,10 @@ export class BlockMergeRollupPrivateInputs {
     /**
      * Previous rollup data from the 2 block merge or block root rollup circuits that preceded this merge rollup circuit.
      */
-    public previousRollups: [RollupProofData<BlockRollupPublicInputs>, RollupProofData<BlockRollupPublicInputs>],
+    public previousRollups: [
+      RollupHonkProofData<BlockRollupPublicInputs>,
+      RollupHonkProofData<BlockRollupPublicInputs>,
+    ],
   ) {}
 
   /**

package/src/rollup/{block_root_rollup.ts → block_root_rollup_private_inputs.ts}

@@ -6,27 +6,23 @@ import { BufferReader, type Tuple, bigintToUInt64BE, serializeToBuffer } from '@
 import type { FieldsOf } from '@aztec/foundation/types';
 
 import { ParityPublicInputs } from '../parity/parity_public_inputs.js';
-import { ProofData } from '../proofs/proof_data.js';
+import { ProofData, 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 class BlockRootFirstRollupPrivateInputs {
   constructor(
     /**
      * The original and converted roots of the L1 to L2 messages subtrees.
      */
-    public l1ToL2Roots: RootParityProofData,
+    public l1ToL2Roots: UltraHonkProofData<ParityPublicInputs>,
     /**
      * The previous rollup proof data from base or merge rollup circuits.
      */
-    public previousRollups: [
-      RollupProofData<BaseOrMergeRollupPublicInputs>,
-      RollupProofData<BaseOrMergeRollupPublicInputs>,
-    ],
+    public previousRollups: [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>],
     /**
      * The l1 to l2 message tree snapshot immediately before this block.
      */
@@ -63,10 +59,7 @@ export class BlockRootFirstRollupPrivateInputs {
     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),
@@ -87,11 +80,11 @@ export class BlockRootSingleTxFirstRollupPrivateInputs {
     /**
      * The original and converted roots of the L1 to L2 messages subtrees.
      */
-    public l1ToL2Roots: RootParityProofData,
+    public l1ToL2Roots: UltraHonkProofData<ParityPublicInputs>,
     /**
      * The previous rollup proof data from base or merge rollup circuits.
      */
-    public previousRollup: RollupProofData<BaseOrMergeRollupPublicInputs>,
+    public previousRollup: RollupHonkProofData<TxRollupPublicInputs>,
     /**
      * The l1 to l2 message tree snapshot immediately before this block.
      */
@@ -130,7 +123,7 @@ export class BlockRootSingleTxFirstRollupPrivateInputs {
     const reader = BufferReader.asReader(buffer);
     return new BlockRootSingleTxFirstRollupPrivateInputs(
       ProofData.fromBuffer(reader, ParityPublicInputs),
-      ProofData.fromBuffer(reader, BaseOrMergeRollupPublicInputs),
+      ProofData.fromBuffer(reader, TxRollupPublicInputs),
       AppendOnlyTreeSnapshot.fromBuffer(reader),
       reader.readArray(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, Fr),
       reader.readArray(ARCHIVE_HEIGHT, Fr),
@@ -151,7 +144,7 @@ export class BlockRootEmptyTxFirstRollupPrivateInputs {
     /**
      * The original and converted roots of the L1 to L2 messages subtrees.
      */
-    public l1ToL2Roots: RootParityProofData,
+    public l1ToL2Roots: UltraHonkProofData<ParityPublicInputs>,
     /**
      * The archive after applying the previous block.
      */
@@ -241,10 +234,7 @@ export class BlockRootRollupPrivateInputs {
     /**
      * The previous rollup proof data from base or merge rollup circuits.
      */
-    public previousRollups: [
-      RollupProofData<BaseOrMergeRollupPublicInputs>,
-      RollupProofData<BaseOrMergeRollupPublicInputs>,
-    ],
+    public previousRollups: [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>],
     /**
      * Hint for inserting the new block hash to the last archive.
      */
@@ -266,10 +256,7 @@ export class BlockRootRollupPrivateInputs {
   static fromBuffer(buffer: Buffer | BufferReader) {
     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),
     );
   }
@@ -288,7 +275,7 @@ export class BlockRootSingleTxRollupPrivateInputs {
     /**
      * The previous rollup proof data from base or merge rollup circuits.
      */
-    public previousRollup: RollupProofData<BaseOrMergeRollupPublicInputs>,
+    public previousRollup: RollupHonkProofData<TxRollupPublicInputs>,
     /**
      * Hint for inserting the new block hash to the last archive.
      */
@@ -310,7 +297,7 @@ export class BlockRootSingleTxRollupPrivateInputs {
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
     return new BlockRootSingleTxRollupPrivateInputs(
-      ProofData.fromBuffer(reader, BaseOrMergeRollupPublicInputs),
+      ProofData.fromBuffer(reader, TxRollupPublicInputs),
       reader.readArray(ARCHIVE_HEIGHT, Fr),
     );
   }

package/src/rollup/{checkpoint_merge_rollup.ts → checkpoint_merge_rollup_private_inputs.ts}

@@ -2,9 +2,8 @@ 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 { ProofData, 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.
@@ -15,8 +14,8 @@ export class CheckpointMergeRollupPrivateInputs {
      * Previous rollup data from the 2 checkpoint root or merge rollup circuits that preceded this checkpoint merge rollup circuit.
      */
     public previousRollups: [
-      RollupProofData<CheckpointRollupPublicInputs>,
-      RollupProofData<CheckpointRollupPublicInputs>,
+      RollupHonkProofData<CheckpointRollupPublicInputs>,
+      RollupHonkProofData<CheckpointRollupPublicInputs>,
     ],
   ) {}
 

package/src/rollup/{checkpoint_root_rollup.ts → checkpoint_root_rollup_private_inputs.ts}

@@ -6,10 +6,9 @@ import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/s
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import type { FieldsOf } from '@aztec/foundation/types';
 
-import { ProofData } from '../proofs/proof_data.js';
+import { ProofData, 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 class CheckpointRootRollupHints {
   constructor(
@@ -100,7 +99,10 @@ export class CheckpointRootRollupHints {
 
 export class CheckpointRootRollupPrivateInputs {
   constructor(
-    public previousRollups: [RollupProofData<BlockRollupPublicInputs>, RollupProofData<BlockRollupPublicInputs>],
+    public previousRollups: [
+      RollupHonkProofData<BlockRollupPublicInputs>,
+      RollupHonkProofData<BlockRollupPublicInputs>,
+    ],
     public hints: CheckpointRootRollupHints,
   ) {}
 
@@ -143,7 +145,7 @@ export class CheckpointRootRollupPrivateInputs {
 
 export class CheckpointRootSingleBlockRollupPrivateInputs {
   constructor(
-    public previousRollup: RollupProofData<BlockRollupPublicInputs>,
+    public previousRollup: RollupHonkProofData<BlockRollupPublicInputs>,
     public hints: CheckpointRootRollupHints,
   ) {}
 

package/src/rollup/index.ts

@@ -1,21 +1,20 @@
 export * from './avm_proof_data.js';
-export * from './base_or_merge_rollup_public_inputs.js';
 export * from './base_rollup_hints.js';
 export * from './block_constant_data.js';
-export * from './block_merge_rollup.js';
+export * from './block_merge_rollup_private_inputs.js';
 export * from './block_rollup_public_inputs.js';
-export * from './block_root_rollup.js';
+export * from './block_root_rollup_private_inputs.js';
 export * from './checkpoint_constant_data.js';
 export * from './checkpoint_header.js';
-export * from './checkpoint_merge_rollup.js';
+export * from './checkpoint_merge_rollup_private_inputs.js';
 export * from './checkpoint_rollup_public_inputs.js';
-export * from './checkpoint_root_rollup.js';
+export * from './checkpoint_root_rollup_private_inputs.js';
 export * from './epoch_constant_data.js';
-export * from './merge_rollup.js';
-export * from './previous_rollup_data.js';
-export * from './private_base_rollup_inputs.js';
-export * from './public_base_rollup_inputs.js';
-export * from './rollup_proof_data.js';
+export * from './private_tx_base_rollup_private_inputs.js';
+export * from './public_tx_base_rollup_private_inputs.js';
 export * from './public_tube_private_inputs.js';
-export * from './root_rollup.js';
+export * from './root_rollup_private_inputs.js';
+export * from './root_rollup_public_inputs.js';
 export * from './state_diff_hints.js';
+export * from './tx_merge_rollup_private_inputs.js';
+export * from './tx_rollup_public_inputs.js';

package/src/rollup/{private_base_rollup_inputs.ts → private_tx_base_rollup_private_inputs.ts}

@@ -7,34 +7,34 @@ import { PrivateToRollupKernelCircuitPublicInputs } from '../kernel/private_to_r
 import { type CivcProofData, ProofData } from '../proofs/proof_data.js';
 import { PrivateBaseRollupHints } from './base_rollup_hints.js';
 
-export class PrivateBaseRollupInputs {
+export class PrivateTxBaseRollupPrivateInputs {
   constructor(
     public hidingKernelProofData: CivcProofData<PrivateToRollupKernelCircuitPublicInputs>,
     public hints: PrivateBaseRollupHints,
   ) {}
 
-  static from(fields: FieldsOf<PrivateBaseRollupInputs>): PrivateBaseRollupInputs {
-    return new PrivateBaseRollupInputs(...PrivateBaseRollupInputs.getFields(fields));
+  static from(fields: FieldsOf<PrivateTxBaseRollupPrivateInputs>): PrivateTxBaseRollupPrivateInputs {
+    return new PrivateTxBaseRollupPrivateInputs(...PrivateTxBaseRollupPrivateInputs.getFields(fields));
   }
 
-  static getFields(fields: FieldsOf<PrivateBaseRollupInputs>) {
+  static getFields(fields: FieldsOf<PrivateTxBaseRollupPrivateInputs>) {
     return [fields.hidingKernelProofData, fields.hints] as const;
   }
 
-  static fromBuffer(buffer: Buffer | BufferReader): PrivateBaseRollupInputs {
+  static fromBuffer(buffer: Buffer | BufferReader): PrivateTxBaseRollupPrivateInputs {
     const reader = BufferReader.asReader(buffer);
-    return new PrivateBaseRollupInputs(
+    return new PrivateTxBaseRollupPrivateInputs(
       ProofData.fromBuffer(reader, PrivateToRollupKernelCircuitPublicInputs),
       reader.readObject(PrivateBaseRollupHints),
     );
   }
 
   toBuffer() {
-    return serializeToBuffer(...PrivateBaseRollupInputs.getFields(this));
+    return serializeToBuffer(...PrivateTxBaseRollupPrivateInputs.getFields(this));
   }
 
   static fromString(str: string) {
-    return PrivateBaseRollupInputs.fromBuffer(hexToBuffer(str));
+    return PrivateTxBaseRollupPrivateInputs.fromBuffer(hexToBuffer(str));
   }
 
   toString() {
@@ -48,6 +48,6 @@ export class PrivateBaseRollupInputs {
 
   /** Creates an instance from a hex string. */
   static get schema() {
-    return bufferSchemaFor(PrivateBaseRollupInputs);
+    return bufferSchemaFor(PrivateTxBaseRollupPrivateInputs);
   }
 }

package/src/rollup/{public_base_rollup_inputs.ts → public_tx_base_rollup_private_inputs.ts}

@@ -8,24 +8,24 @@ import { ProofData, type RollupHonkProofData } from '../proofs/proof_data.js';
 import { AvmProofData } from './avm_proof_data.js';
 import { PublicBaseRollupHints } from './base_rollup_hints.js';
 
-export class PublicBaseRollupInputs {
+export class PublicTxBaseRollupPrivateInputs {
   constructor(
     public publicTubeProofData: RollupHonkProofData<PrivateToPublicKernelCircuitPublicInputs>,
     public avmProofData: AvmProofData,
     public hints: PublicBaseRollupHints,
   ) {}
 
-  static from(fields: FieldsOf<PublicBaseRollupInputs>): PublicBaseRollupInputs {
-    return new PublicBaseRollupInputs(...PublicBaseRollupInputs.getFields(fields));
+  static from(fields: FieldsOf<PublicTxBaseRollupPrivateInputs>): PublicTxBaseRollupPrivateInputs {
+    return new PublicTxBaseRollupPrivateInputs(...PublicTxBaseRollupPrivateInputs.getFields(fields));
   }
 
-  static getFields(fields: FieldsOf<PublicBaseRollupInputs>) {
+  static getFields(fields: FieldsOf<PublicTxBaseRollupPrivateInputs>) {
     return [fields.publicTubeProofData, fields.avmProofData, fields.hints] as const;
   }
 
-  static fromBuffer(buffer: Buffer | BufferReader): PublicBaseRollupInputs {
+  static fromBuffer(buffer: Buffer | BufferReader): PublicTxBaseRollupPrivateInputs {
     const reader = BufferReader.asReader(buffer);
-    return new PublicBaseRollupInputs(
+    return new PublicTxBaseRollupPrivateInputs(
       ProofData.fromBuffer(reader, PrivateToPublicKernelCircuitPublicInputs),
       reader.readObject(AvmProofData),
       reader.readObject(PublicBaseRollupHints),
@@ -33,11 +33,11 @@ export class PublicBaseRollupInputs {
   }
 
   toBuffer() {
-    return serializeToBuffer(...PublicBaseRollupInputs.getFields(this));
+    return serializeToBuffer(...PublicTxBaseRollupPrivateInputs.getFields(this));
   }
 
   static fromString(str: string) {
-    return PublicBaseRollupInputs.fromBuffer(hexToBuffer(str));
+    return PublicTxBaseRollupPrivateInputs.fromBuffer(hexToBuffer(str));
   }
 
   toString() {
@@ -51,6 +51,6 @@ export class PublicBaseRollupInputs {
 
   /** Creates an instance from a string. */
   static get schema() {
-    return bufferSchemaFor(PublicBaseRollupInputs);
+    return bufferSchemaFor(PublicTxBaseRollupPrivateInputs);
   }
 }

package/src/rollup/root_rollup_private_inputs.ts

@@ -0,0 +1,90 @@
+import { bufferSchemaFor } from '@aztec/foundation/schemas';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
+import type { FieldsOf } from '@aztec/foundation/types';
+
+import { ProofData, type RollupHonkProofData } from '../proofs/proof_data.js';
+import { CheckpointRollupPublicInputs } from './checkpoint_rollup_public_inputs.js';
+
+/**
+ * Represents inputs of the root rollup circuit.
+ */
+export class RootRollupPrivateInputs {
+  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.
+     */
+    public previousRollups: [
+      RollupHonkProofData<CheckpointRollupPublicInputs>,
+      RollupHonkProofData<CheckpointRollupPublicInputs>,
+    ],
+  ) {}
+
+  /**
+   * 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: FieldsOf<RootRollupPrivateInputs>) {
+    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: FieldsOf<RootRollupPrivateInputs>) {
+    return [fields.previousRollups] as const;
+  }
+
+  /**
+   * Deserializes the inputs from a buffer.
+   * @param buffer - A buffer to deserialize from.
+   * @returns A new RootRollupPrivateInputs instance.
+   */
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    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: string) {
+    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/src/rollup/{root_rollup.ts → root_rollup_public_inputs.ts}

@@ -7,93 +7,8 @@ import { BufferReader, type Tuple, serializeToBuffer, serializeToFields } from '
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import type { FieldsOf } from '@aztec/foundation/types';
 
-import { ProofData } from '../proofs/proof_data.js';
-import { CheckpointRollupPublicInputs, FeeRecipient } from './checkpoint_rollup_public_inputs.js';
+import { FeeRecipient } from './checkpoint_rollup_public_inputs.js';
 import { EpochConstantData } from './epoch_constant_data.js';
-import type { RollupProofData } from './rollup_proof_data.js';
-
-/**
- * Represents inputs of the root rollup circuit.
- */
-export class RootRollupPrivateInputs {
-  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.
-     */
-    public previousRollups: [
-      RollupProofData<CheckpointRollupPublicInputs>,
-      RollupProofData<CheckpointRollupPublicInputs>,
-    ],
-  ) {}
-
-  /**
-   * 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: FieldsOf<RootRollupPrivateInputs>) {
-    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: FieldsOf<RootRollupPrivateInputs>) {
-    return [fields.previousRollups] as const;
-  }
-
-  /**
-   * Deserializes the inputs from a buffer.
-   * @param buffer - A buffer to deserialize from.
-   * @returns A new RootRollupPrivateInputs instance.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader) {
-    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: string) {
-    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);
-  }
-}
 
 /**
  * Represents public inputs of the root rollup circuit.