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

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.

package/src/rollup/{merge_rollup.ts → tx_merge_rollup_private_inputs.ts}

@@ -2,17 +2,18 @@ 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, type RollupHonkProofData } from '../proofs/proof_data.js';
+import { TxRollupPublicInputs } from './tx_rollup_public_inputs.js';
 
 /**
  * Represents inputs of the merge rollup circuit.
  */
-export class MergeRollupInputs {
+export class TxMergeRollupPrivateInputs {
   constructor(
     /**
      * Previous rollup data from the 2 merge or base rollup circuits that preceded this merge rollup circuit.
      */
-    public previousRollupData: [PreviousRollupData, PreviousRollupData],
+    public previousRollups: [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>],
   ) {}
 
   /**
@@ -20,7 +21,7 @@ export class MergeRollupInputs {
    * @returns The inputs serialized to a buffer.
    */
   toBuffer() {
-    return serializeToBuffer(this.previousRollupData);
+    return serializeToBuffer(this.previousRollups);
   }
 
   /**
@@ -34,20 +35,23 @@ export 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) {
     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: string) {
-    return MergeRollupInputs.fromBuffer(hexToBuffer(str));
+    return TxMergeRollupPrivateInputs.fromBuffer(hexToBuffer(str));
   }
 
   /** Returns a buffer representation for JSON serialization. */
@@ -57,6 +61,6 @@ export class MergeRollupInputs {
 
   /** Creates an instance from a string. */
   static get schema() {
-    return bufferSchemaFor(MergeRollupInputs);
+    return bufferSchemaFor(TxMergeRollupPrivateInputs);
   }
 }

package/src/rollup/{base_or_merge_rollup_public_inputs.ts → tx_rollup_public_inputs.ts}

@@ -10,7 +10,7 @@ import { BlockConstantData } from './block_constant_data.js';
 /**
  * Output of the base and merge rollup circuits.
  */
-export class BaseOrMergeRollupPublicInputs {
+export class TxRollupPublicInputs {
   constructor(
     /**
      * Number of txs in this rollup.
@@ -23,11 +23,11 @@ export class BaseOrMergeRollupPublicInputs {
     /**
      * Partial state reference at the start of the rollup circuit.
      */
-    public start: PartialStateReference,
+    public startPartialState: PartialStateReference,
     /**
      * Partial state reference at the end of the rollup circuit.
      */
-    public end: PartialStateReference,
+    public endPartialState: PartialStateReference,
     /**
      * Sponge state to absorb blob inputs at the start of the rollup circuit.
      */
@@ -53,7 +53,7 @@ export class BaseOrMergeRollupPublicInputs {
 
   /** Returns an empty instance. */
   static empty() {
-    return new BaseOrMergeRollupPublicInputs(
+    return new TxRollupPublicInputs(
       0,
       BlockConstantData.empty(),
       PartialStateReference.empty(),
@@ -72,9 +72,9 @@ export class BaseOrMergeRollupPublicInputs {
    * @param buffer - Buffer or reader to read from.
    * @returns The deserialized public inputs.
    */
-  static fromBuffer(buffer: Buffer | BufferReader): BaseOrMergeRollupPublicInputs {
+  static fromBuffer(buffer: Buffer | BufferReader): TxRollupPublicInputs {
     const reader = BufferReader.asReader(buffer);
-    return new BaseOrMergeRollupPublicInputs(
+    return new TxRollupPublicInputs(
       reader.readNumber(),
       reader.readObject(BlockConstantData),
       reader.readObject(PartialStateReference),
@@ -96,8 +96,8 @@ export class BaseOrMergeRollupPublicInputs {
       this.numTxs,
       this.constants,
 
-      this.start,
-      this.end,
+      this.startPartialState,
+      this.endPartialState,
 
       this.startSpongeBlob,
       this.endSpongeBlob,
@@ -120,10 +120,10 @@ export class BaseOrMergeRollupPublicInputs {
   /**
    * Deserializes from a hex string.
    * @param str - A hex string to deserialize from.
-   * @returns A new BaseOrMergeRollupPublicInputs instance.
+   * @returns A new TxRollupPublicInputs instance.
    */
   static fromString(str: string) {
-    return BaseOrMergeRollupPublicInputs.fromBuffer(hexToBuffer(str));
+    return TxRollupPublicInputs.fromBuffer(hexToBuffer(str));
   }
 
   /** Returns a buffer representation for JSON serialization. */
@@ -133,6 +133,6 @@ export class BaseOrMergeRollupPublicInputs {
 
   /** Creates an instance from a hex string. */
   static get schema() {
-    return bufferSchemaFor(BaseOrMergeRollupPublicInputs);
+    return bufferSchemaFor(TxRollupPublicInputs);
   }
 }

package/src/stats/stats.ts

@@ -86,25 +86,26 @@ export type ClientCircuitName =
   | 'app-circuit';
 
 export type ServerCircuitName =
-  | 'base-parity'
-  | 'root-parity'
-  | 'public-tube'
-  | 'private-base-rollup'
-  | 'public-base-rollup'
-  | 'merge-rollup'
-  | 'block-root-first-rollup'
-  | 'block-root-single-tx-first-rollup'
-  | 'block-root-empty-tx-first-rollup'
-  | 'block-root-rollup'
-  | 'block-root-single-tx-rollup'
-  | 'block-merge-rollup'
-  | 'checkpoint-root-rollup'
-  | 'checkpoint-root-single-block-rollup'
-  | 'checkpoint-padding-rollup'
-  | 'checkpoint-merge-rollup'
-  | 'root-rollup'
+  | 'parity-base'
+  | 'parity-root'
+  | 'tube-public'
+  | 'rollup-tx-base-private'
+  | 'rollup-tx-base-public'
+  | 'rollup-tx-merge'
+  | 'rollup-block-root-first'
+  | 'rollup-block-root-first-single-tx'
+  | 'rollup-block-root-first-empty-tx'
+  | 'rollup-block-root'
+  | 'rollup-block-root-single-tx'
+  | 'rollup-block-merge'
+  | 'rollup-checkpoint-root'
+  | 'rollup-checkpoint-root-single-block'
+  | 'rollup-checkpoint-padding'
+  | 'rollup-checkpoint-merge'
+  | 'rollup-root'
   | 'avm-circuit';
 
+// Circuit names should match the corresponding names in noir-protocol-circuits.
 export type CircuitName = ClientCircuitName | ServerCircuitName;
 
 /** Stats for circuit simulation. */