@aztec/stdlib 4.0.0-nightly.20250907 → 4.0.0-nightly.20260107

package/src/rollup/base_rollup_hints.ts

@@ -1,17 +1,17 @@
-import { SpongeBlob } from '@aztec/blob-lib';
+import { SpongeBlob } from '@aztec/blob-lib/types';
 import { ARCHIVE_HEIGHT, MAX_CONTRACT_CLASS_LOGS_PER_TX } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { MembershipWitness } from '@aztec/foundation/trees';
 import type { FieldsOf } from '@aztec/foundation/types';
 
-import { PublicDataHint } from '../avm/public_data_hint.js';
 import { ContractClassLogFields } from '../logs/index.js';
-import { AppendOnlyTreeSnapshot } from '../trees/index.js';
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { PublicDataTreeLeafPreimage } from '../trees/public_data_leaf.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
 import { BlockConstantData } from './block_constant_data.js';
-import { PrivateBaseStateDiffHints } from './state_diff_hints.js';
+import { TreeSnapshotDiffHints } from './tree_snapshot_diff_hints.js';
 
 export type BaseRollupHints = PrivateBaseRollupHints | PublicBaseRollupHints;
 
@@ -28,15 +28,15 @@ export class PrivateBaseRollupHints {
     /**
      * Hints used while proving state diff validity.
      */
-    public stateDiffHints: PrivateBaseStateDiffHints,
+    public treeSnapshotDiffHints: TreeSnapshotDiffHints,
     /**
-     * Public data read hint for accessing the balance of the fee payer.
+     * Public data tree leaf preimage for accessing the balance of the fee payer.
      */
-    public feePayerFeeJuiceBalanceReadHint: PublicDataHint,
+    public feePayerBalanceLeafPreimage: PublicDataTreeLeafPreimage,
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    public archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>,
+    public anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>,
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
@@ -55,9 +55,9 @@ export class PrivateBaseRollupHints {
     return [
       fields.start,
       fields.startSpongeBlob,
-      fields.stateDiffHints,
-      fields.feePayerFeeJuiceBalanceReadHint,
-      fields.archiveRootMembershipWitness,
+      fields.treeSnapshotDiffHints,
+      fields.feePayerBalanceLeafPreimage,
+      fields.anchorBlockArchiveSiblingPath,
       fields.contractClassLogsFields,
       fields.constants,
     ] as const;
@@ -84,9 +84,9 @@ export class PrivateBaseRollupHints {
     return new PrivateBaseRollupHints(
       reader.readObject(PartialStateReference),
       reader.readObject(SpongeBlob),
-      reader.readObject(PrivateBaseStateDiffHints),
-      reader.readObject(PublicDataHint),
-      MembershipWitness.fromBuffer(reader, ARCHIVE_HEIGHT),
+      reader.readObject(TreeSnapshotDiffHints),
+      reader.readObject(PublicDataTreeLeafPreimage),
+      reader.readArray(ARCHIVE_HEIGHT, Fr),
       makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, () => reader.readObject(ContractClassLogFields)),
       reader.readObject(BlockConstantData),
     );
@@ -100,9 +100,9 @@ export class PrivateBaseRollupHints {
     return new PrivateBaseRollupHints(
       PartialStateReference.empty(),
       SpongeBlob.empty(),
-      PrivateBaseStateDiffHints.empty(),
-      PublicDataHint.empty(),
-      MembershipWitness.empty(ARCHIVE_HEIGHT),
+      TreeSnapshotDiffHints.empty(),
+      PublicDataTreeLeafPreimage.empty(),
+      makeTuple(ARCHIVE_HEIGHT, Fr.zero),
       makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty),
       BlockConstantData.empty(),
     );
@@ -122,7 +122,7 @@ export class PublicBaseRollupHints {
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    public archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>,
+    public anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>,
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
@@ -137,7 +137,7 @@ export class PublicBaseRollupHints {
     return [
       fields.startSpongeBlob,
       fields.lastArchive,
-      fields.archiveRootMembershipWitness,
+      fields.anchorBlockArchiveSiblingPath,
       fields.contractClassLogsFields,
     ] as const;
   }
@@ -163,7 +163,7 @@ export class PublicBaseRollupHints {
     return new PublicBaseRollupHints(
       reader.readObject(SpongeBlob),
       reader.readObject(AppendOnlyTreeSnapshot),
-      MembershipWitness.fromBuffer(reader, ARCHIVE_HEIGHT),
+      reader.readArray(ARCHIVE_HEIGHT, Fr),
       makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, () => reader.readObject(ContractClassLogFields)),
     );
   }
@@ -176,7 +176,7 @@ export class PublicBaseRollupHints {
     return new PublicBaseRollupHints(
       SpongeBlob.empty(),
       AppendOnlyTreeSnapshot.empty(),
-      MembershipWitness.empty(ARCHIVE_HEIGHT),
+      makeTuple(ARCHIVE_HEIGHT, Fr.zero),
       makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty),
     );
   }

package/src/rollup/block_constant_data.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 
@@ -12,14 +12,21 @@ export class BlockConstantData {
   constructor(
     /** Archive tree snapshot at the very beginning of the entire rollup. */
     public lastArchive: AppendOnlyTreeSnapshot,
-    /** L1 to L2 message tree snapshot after this block lands. */
-    public newL1ToL2: AppendOnlyTreeSnapshot,
+    /**
+     * L1-to-L2 message tree snapshot after this block lands.
+     * For the first block in a checkpoint, this should be the snapshot after inserting the new l1-to-l2 message subtree
+     * into the last l1-to-l2 tree snapshot in `last_archive`.
+     * For subsequent blocks, this should match the snapshot of the previous block.
+     */
+    public l1ToL2TreeSnapshot: AppendOnlyTreeSnapshot,
     /** Root of the verification key tree. */
     public vkTreeRoot: Fr,
-    /** Root of the protocol contract tree. */
-    public protocolContractTreeRoot: Fr,
+    /** Hash of the protocol contracts list. */
+    public protocolContractsHash: Fr,
     /** Global variables for the block. */
     public globalVariables: GlobalVariables,
+    /** Identifier of the prover. */
+    public proverId: Fr,
   ) {}
 
   static from(fields: FieldsOf<BlockConstantData>): BlockConstantData {
@@ -34,16 +41,18 @@ export class BlockConstantData {
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
       reader.readObject(GlobalVariables),
+      Fr.fromBuffer(reader),
     );
   }
 
   static getFields(fields: FieldsOf<BlockConstantData>) {
     return [
       fields.lastArchive,
-      fields.newL1ToL2,
+      fields.l1ToL2TreeSnapshot,
       fields.vkTreeRoot,
-      fields.protocolContractTreeRoot,
+      fields.protocolContractsHash,
       fields.globalVariables,
+      fields.proverId,
     ] as const;
   }
 
@@ -54,6 +63,7 @@ export class BlockConstantData {
       Fr.ZERO,
       Fr.ZERO,
       GlobalVariables.empty(),
+      Fr.ZERO,
     );
   }
 

package/src/rollup/block_headers_hash.ts

@@ -0,0 +1,12 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { computeUnbalancedPoseidonRoot } from '@aztec/foundation/trees';
+
+import type { BlockHeader } from '../tx/block_header.js';
+
+export async function computeBlockHeadersHash(blockHeaders: BlockHeader[]): Promise<Fr> {
+  const blockHeaderHashes = await Promise.all(blockHeaders.map(header => header.hash()));
+  // Must match the implementation in merge_block_rollups.nr, with the **wonky** rollup structure
+  // (see validate_consecutive_block_rollups.nr > assert_rollups_filled_greedily.nr).
+  const blockHeadersHash = await computeUnbalancedPoseidonRoot(blockHeaderHashes.map(hash => hash.toBuffer()));
+  return Fr.fromBuffer(blockHeadersHash);
+}

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

@@ -2,17 +2,21 @@ import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 
-import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
+import { ProofData, type RollupHonkProofData } from '../proofs/proof_data.js';
+import { BlockRollupPublicInputs } from './block_rollup_public_inputs.js';
 
 /**
  * Represents inputs of the block merge rollup circuit.
  */
-export class BlockMergeRollupInputs {
+export class BlockMergeRollupPrivateInputs {
   constructor(
     /**
      * Previous rollup data from the 2 block merge or block root rollup circuits that preceded this merge rollup circuit.
      */
-    public previousRollupData: [PreviousRollupBlockData, PreviousRollupBlockData],
+    public previousRollups: [
+      RollupHonkProofData<BlockRollupPublicInputs>,
+      RollupHonkProofData<BlockRollupPublicInputs>,
+    ],
   ) {}
 
   /**
@@ -20,7 +24,7 @@ export class BlockMergeRollupInputs {
    * @returns The inputs serialized to a buffer.
    */
   toBuffer() {
-    return serializeToBuffer(this.previousRollupData);
+    return serializeToBuffer(this.previousRollups);
   }
 
   /**
@@ -34,23 +38,23 @@ export class BlockMergeRollupInputs {
   /**
    * Deserializes the inputs from a buffer.
    * @param buffer - The buffer to deserialize from.
-   * @returns A new BlockMergeRollupInputs instance.
+   * @returns A new BlockMergeRollupPrivateInputs instance.
    */
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
-    return new BlockMergeRollupInputs([
-      reader.readObject(PreviousRollupBlockData),
-      reader.readObject(PreviousRollupBlockData),
+    return new BlockMergeRollupPrivateInputs([
+      ProofData.fromBuffer(reader, BlockRollupPublicInputs),
+      ProofData.fromBuffer(reader, BlockRollupPublicInputs),
     ]);
   }
 
   /**
    * Deserializes the inputs from a hex string.
    * @param str - A hex string to deserialize from.
-   * @returns A new BlockMergeRollupInputs instance.
+   * @returns A new BlockMergeRollupPrivateInputs instance.
    */
   static fromString(str: string) {
-    return BlockMergeRollupInputs.fromBuffer(hexToBuffer(str));
+    return BlockMergeRollupPrivateInputs.fromBuffer(hexToBuffer(str));
   }
 
   /** Returns a hex representation for JSON serialization. */
@@ -60,6 +64,6 @@ export class BlockMergeRollupInputs {
 
   /** Creates an instance from a hex string. */
   static get schema() {
-    return bufferSchemaFor(BlockMergeRollupInputs);
+    return bufferSchemaFor(BlockMergeRollupPrivateInputs);
   }
 }

package/src/rollup/block_rollup_public_inputs.ts

@@ -0,0 +1,125 @@
+import { SpongeBlob } from '@aztec/blob-lib/types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { bufferSchemaFor } from '@aztec/foundation/schemas';
+import { BufferReader, bigintToUInt64BE, serializeToBuffer } from '@aztec/foundation/serialize';
+import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
+
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { StateReference } from '../tx/state_reference.js';
+import type { UInt64 } from '../types/shared.js';
+import { CheckpointConstantData } from './checkpoint_constant_data.js';
+
+/**
+ * Output of the block root and block merge rollup circuits.
+ */
+export class BlockRollupPublicInputs {
+  constructor(
+    /**
+     * Constants for the entire checkpoint.
+     */
+    public constants: CheckpointConstantData,
+    /**
+     * Archive tree immediately before this block range.
+     */
+    public previousArchive: AppendOnlyTreeSnapshot,
+    /**
+     * Archive tree after applying this block range.
+     */
+    public newArchive: AppendOnlyTreeSnapshot,
+    /**
+     * State reference immediately before this block range.
+     */
+    public startState: StateReference,
+    /**
+     * State reference after applying this block range.
+     */
+    public endState: StateReference,
+    /**
+     * Sponge state to absorb blob inputs at the start of this block range.
+     */
+    public startSpongeBlob: SpongeBlob,
+    /**
+     * Sponge state to absorb blob inputs at the end of this block range.
+     */
+    public endSpongeBlob: SpongeBlob,
+    /**
+     * Timestamp of the blocks in this block range.
+     */
+    public timestamp: UInt64,
+    /**
+     * Hash of the headers of all blocks in this block range. It will be combined with the `blockHeadersHash` from
+     * other blocks in the same checkpoint to form a wonky tree. The root of that tree becomes the final hash stored in
+     * the checkpoint header, enabling validation of the blocks included in a checkpoint given their headers.
+     */
+    public blockHeadersHash: Fr,
+    /**
+     * SHA256 hash of l1 to l2 messages.
+     */
+    public inHash: Fr,
+    /**
+     * SHA256 hash of L2 to L1 messages created in this block range.
+     */
+    public outHash: Fr,
+    /**
+     * The summed transaction fees of all the txs in this block range.
+     */
+    public accumulatedFees: Fr,
+    /**
+     * The summed mana used of all the txs in this block range.
+     */
+    public accumulatedManaUsed: Fr,
+  ) {}
+
+  static fromBuffer(buffer: Buffer | BufferReader): BlockRollupPublicInputs {
+    const reader = BufferReader.asReader(buffer);
+    return new BlockRollupPublicInputs(
+      reader.readObject(CheckpointConstantData),
+      reader.readObject(AppendOnlyTreeSnapshot),
+      reader.readObject(AppendOnlyTreeSnapshot),
+      reader.readObject(StateReference),
+      reader.readObject(StateReference),
+      reader.readObject(SpongeBlob),
+      reader.readObject(SpongeBlob),
+      reader.readUInt64(),
+      Fr.fromBuffer(reader),
+      Fr.fromBuffer(reader),
+      Fr.fromBuffer(reader),
+      Fr.fromBuffer(reader),
+      Fr.fromBuffer(reader),
+    );
+  }
+
+  toBuffer() {
+    return serializeToBuffer(
+      this.constants,
+      this.previousArchive,
+      this.newArchive,
+      this.startState,
+      this.endState,
+      this.startSpongeBlob,
+      this.endSpongeBlob,
+      bigintToUInt64BE(this.timestamp),
+      this.blockHeadersHash,
+      this.inHash,
+      this.outHash,
+      this.accumulatedFees,
+      this.accumulatedManaUsed,
+    );
+  }
+
+  toString() {
+    return bufferToHex(this.toBuffer());
+  }
+
+  static fromString(str: string) {
+    return BlockRollupPublicInputs.fromBuffer(hexToBuffer(str));
+  }
+
+  toJSON() {
+    return this.toBuffer();
+  }
+
+  static get schema() {
+    return bufferSchemaFor(BlockRollupPublicInputs);
+  }
+}

package/src/rollup/block_root_rollup_private_inputs.ts

@@ -0,0 +1,303 @@
+import { ARCHIVE_HEIGHT, L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { bufferSchemaFor } from '@aztec/foundation/schemas';
+import { BufferReader, type Tuple, bigintToUInt64BE, serializeToBuffer } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
+
+import { ParityPublicInputs } from '../parity/parity_public_inputs.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 { CheckpointConstantData } from './checkpoint_constant_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: UltraHonkProofData<ParityPublicInputs>,
+    /**
+     * The previous rollup proof data from base or merge rollup circuits.
+     */
+    public previousRollups: [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>],
+    /**
+     * The l1 to l2 message tree snapshot immediately before this block.
+     */
+    public previousL1ToL2: AppendOnlyTreeSnapshot,
+    /**
+     * Hint for inserting the new l1 to l2 message subtree root into `previousL1ToL2`.
+     */
+    public newL1ToL2MessageSubtreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH>,
+    /**
+     * Hint for inserting the new block hash to the last archive.
+     */
+    public newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>,
+  ) {}
+
+  static from(fields: FieldsOf<BlockRootFirstRollupPrivateInputs>) {
+    return new BlockRootFirstRollupPrivateInputs(...BlockRootFirstRollupPrivateInputs.getFields(fields));
+  }
+
+  static getFields(fields: FieldsOf<BlockRootFirstRollupPrivateInputs>) {
+    return [
+      fields.l1ToL2Roots,
+      fields.previousRollups,
+      fields.previousL1ToL2,
+      fields.newL1ToL2MessageSubtreeRootSiblingPath,
+      fields.newArchiveSiblingPath,
+    ] as const;
+  }
+
+  toBuffer() {
+    return serializeToBuffer(...BlockRootFirstRollupPrivateInputs.getFields(this));
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new BlockRootFirstRollupPrivateInputs(
+      ProofData.fromBuffer(reader, ParityPublicInputs),
+      [ProofData.fromBuffer(reader, TxRollupPublicInputs), ProofData.fromBuffer(reader, TxRollupPublicInputs)],
+      AppendOnlyTreeSnapshot.fromBuffer(reader),
+      reader.readArray(L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH, Fr),
+      reader.readArray(ARCHIVE_HEIGHT, Fr),
+    );
+  }
+
+  toJSON() {
+    return this.toBuffer();
+  }
+
+  static get schema() {
+    return bufferSchemaFor(BlockRootFirstRollupPrivateInputs);
+  }
+}
+
+export class BlockRootSingleTxFirstRollupPrivateInputs {
+  constructor(
+    /**
+     * The original and converted roots of the L1 to L2 messages subtrees.
+     */
+    public l1ToL2Roots: UltraHonkProofData<ParityPublicInputs>,
+    /**
+     * The previous rollup proof data from base or merge rollup circuits.
+     */
+    public previousRollup: RollupHonkProofData<TxRollupPublicInputs>,
+    /**
+     * The l1 to l2 message tree snapshot immediately before this block.
+     */
+    public previousL1ToL2: AppendOnlyTreeSnapshot,
+    /**
+     * Hint for inserting the new l1 to l2 message subtree root.
+     */
+    public newL1ToL2MessageSubtreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH>,
+    /**
+     * Hint for inserting the new block hash to the last archive.
+     */
+    public newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>,
+  ) {}
+
+  static from(fields: FieldsOf<BlockRootSingleTxFirstRollupPrivateInputs>) {
+    return new BlockRootSingleTxFirstRollupPrivateInputs(
+      ...BlockRootSingleTxFirstRollupPrivateInputs.getFields(fields),
+    );
+  }
+
+  static getFields(fields: FieldsOf<BlockRootSingleTxFirstRollupPrivateInputs>) {
+    return [
+      fields.l1ToL2Roots,
+      fields.previousRollup,
+      fields.previousL1ToL2,
+      fields.newL1ToL2MessageSubtreeRootSiblingPath,
+      fields.newArchiveSiblingPath,
+    ] as const;
+  }
+
+  toBuffer() {
+    return serializeToBuffer(...BlockRootSingleTxFirstRollupPrivateInputs.getFields(this));
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new BlockRootSingleTxFirstRollupPrivateInputs(
+      ProofData.fromBuffer(reader, ParityPublicInputs),
+      ProofData.fromBuffer(reader, TxRollupPublicInputs),
+      AppendOnlyTreeSnapshot.fromBuffer(reader),
+      reader.readArray(L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH, Fr),
+      reader.readArray(ARCHIVE_HEIGHT, Fr),
+    );
+  }
+
+  toJSON() {
+    return this.toBuffer();
+  }
+
+  static get schema() {
+    return bufferSchemaFor(BlockRootSingleTxFirstRollupPrivateInputs);
+  }
+}
+
+export class BlockRootEmptyTxFirstRollupPrivateInputs {
+  constructor(
+    /**
+     * The original and converted roots of the L1 to L2 messages subtrees.
+     */
+    public l1ToL2Roots: UltraHonkProofData<ParityPublicInputs>,
+    /**
+     * The archive after applying the previous block.
+     */
+    public previousArchive: AppendOnlyTreeSnapshot,
+    /**
+     * The state reference of the previous block.
+     */
+    public previousState: StateReference,
+    /**
+     * The constants of the checkpoint.
+     */
+    public constants: CheckpointConstantData,
+    /**
+     * The timestamp of this block.
+     */
+    public timestamp: UInt64,
+    /**
+     * Hint for inserting the new l1 to l2 message subtree root.
+     */
+    public newL1ToL2MessageSubtreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH>,
+    /**
+     * Hint for inserting the new block hash to the last archive.
+     */
+    public newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>,
+  ) {}
+
+  static from(fields: FieldsOf<BlockRootEmptyTxFirstRollupPrivateInputs>) {
+    return new BlockRootEmptyTxFirstRollupPrivateInputs(...BlockRootEmptyTxFirstRollupPrivateInputs.getFields(fields));
+  }
+
+  static getFields(fields: FieldsOf<BlockRootEmptyTxFirstRollupPrivateInputs>) {
+    return [
+      fields.l1ToL2Roots,
+      fields.previousArchive,
+      fields.previousState,
+      fields.constants,
+      fields.timestamp,
+      fields.newL1ToL2MessageSubtreeRootSiblingPath,
+      fields.newArchiveSiblingPath,
+    ] as const;
+  }
+
+  toBuffer() {
+    return serializeToBuffer([
+      this.l1ToL2Roots,
+      this.previousArchive,
+      this.previousState,
+      this.constants,
+      bigintToUInt64BE(this.timestamp),
+      this.newL1ToL2MessageSubtreeRootSiblingPath,
+      this.newArchiveSiblingPath,
+    ]);
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new BlockRootEmptyTxFirstRollupPrivateInputs(
+      ProofData.fromBuffer(reader, ParityPublicInputs),
+      AppendOnlyTreeSnapshot.fromBuffer(reader),
+      StateReference.fromBuffer(reader),
+      CheckpointConstantData.fromBuffer(reader),
+      reader.readUInt64(),
+      reader.readArray(L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH, Fr),
+      reader.readArray(ARCHIVE_HEIGHT, Fr),
+    );
+  }
+
+  toJSON() {
+    return this.toBuffer();
+  }
+
+  static get schema() {
+    return bufferSchemaFor(BlockRootEmptyTxFirstRollupPrivateInputs);
+  }
+}
+
+export class BlockRootRollupPrivateInputs {
+  constructor(
+    /**
+     * The previous rollup proof data from base or merge rollup circuits.
+     */
+    public previousRollups: [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>],
+    /**
+     * Hint for inserting the new block hash to the last archive.
+     */
+    public newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>,
+  ) {}
+
+  static from(fields: FieldsOf<BlockRootRollupPrivateInputs>) {
+    return new BlockRootRollupPrivateInputs(...BlockRootRollupPrivateInputs.getFields(fields));
+  }
+
+  static getFields(fields: FieldsOf<BlockRootRollupPrivateInputs>) {
+    return [fields.previousRollups, fields.newArchiveSiblingPath] as const;
+  }
+
+  toBuffer() {
+    return serializeToBuffer(...BlockRootRollupPrivateInputs.getFields(this));
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new BlockRootRollupPrivateInputs(
+      [ProofData.fromBuffer(reader, TxRollupPublicInputs), ProofData.fromBuffer(reader, TxRollupPublicInputs)],
+      reader.readArray(ARCHIVE_HEIGHT, Fr),
+    );
+  }
+
+  toJSON() {
+    return this.toBuffer();
+  }
+
+  static get schema() {
+    return bufferSchemaFor(BlockRootRollupPrivateInputs);
+  }
+}
+
+export class BlockRootSingleTxRollupPrivateInputs {
+  constructor(
+    /**
+     * The previous rollup proof data from base or merge rollup circuits.
+     */
+    public previousRollup: RollupHonkProofData<TxRollupPublicInputs>,
+    /**
+     * Hint for inserting the new block hash to the last archive.
+     */
+    public newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>,
+  ) {}
+
+  static from(fields: FieldsOf<BlockRootSingleTxRollupPrivateInputs>) {
+    return new BlockRootSingleTxRollupPrivateInputs(...BlockRootSingleTxRollupPrivateInputs.getFields(fields));
+  }
+
+  static getFields(fields: FieldsOf<BlockRootSingleTxRollupPrivateInputs>) {
+    return [fields.previousRollup, fields.newArchiveSiblingPath] as const;
+  }
+
+  toBuffer() {
+    return serializeToBuffer(...BlockRootSingleTxRollupPrivateInputs.getFields(this));
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new BlockRootSingleTxRollupPrivateInputs(
+      ProofData.fromBuffer(reader, TxRollupPublicInputs),
+      reader.readArray(ARCHIVE_HEIGHT, Fr),
+    );
+  }
+
+  toJSON() {
+    return this.toBuffer();
+  }
+
+  static get schema() {
+    return bufferSchemaFor(BlockRootSingleTxRollupPrivateInputs);
+  }
+}