@aztec/stdlib 1.0.0-nightly.20250607 → 1.0.0-nightly.20250610

package/src/hash/hash.ts

@@ -1,9 +1,9 @@
 import { GeneratorIndex } from '@aztec/constants';
-import { poseidon2Hash, poseidon2HashWithSeparator, sha256Trunc } from '@aztec/foundation/crypto';
+import { poseidon2Hash, poseidon2HashWithSeparator, sha256ToField } from '@aztec/foundation/crypto';
+import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 
 import type { AztecAddress } from '../aztec-address/index.js';
-import type { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 
 /**
  * Computes a hash of a given verification key.
@@ -126,21 +126,18 @@ export async function computeL1ToL2MessageNullifier(contract: AztecAddress, mess
  * Calculates a siloed hash of a scoped l2 to l1 message.
  * @returns Fr containing 248 bits of information of sha256 hash.
  */
-export function siloL2ToL1Message(l2ToL1Message: ScopedL2ToL1Message, version: Fr, chainId: Fr): Fr {
-  if (l2ToL1Message.contractAddress.isZero()) {
-    return Fr.ZERO;
-  }
-  // Left-pad recipient to 32 bytes to match what the circuit is doing
-  // TODO: Only hash 20 bytes for l2l1 recipient everywhere.
-  const paddedRecipient = Buffer.alloc(32);
-  l2ToL1Message.message.recipient.toBuffer().copy(paddedRecipient, 12);
-
-  const preimage = Buffer.concat([
-    l2ToL1Message.contractAddress.toBuffer(),
-    version.toBuffer(),
-    paddedRecipient,
-    chainId.toBuffer(),
-    l2ToL1Message.message.content.toBuffer(),
-  ]);
-  return Fr.fromBuffer(sha256Trunc(preimage));
+export function computeL2ToL1MessageHash({
+  l2Sender,
+  l1Recipient,
+  content,
+  rollupVersion,
+  chainId,
+}: {
+  l2Sender: AztecAddress;
+  l1Recipient: EthAddress;
+  content: Fr;
+  rollupVersion: Fr;
+  chainId: Fr;
+}) {
+  return sha256ToField([l2Sender, rollupVersion, l1Recipient, chainId, content]);
 }

package/src/interfaces/epoch-prover.ts

@@ -1,3 +1,4 @@
+import type { BatchedBlob, FinalBlobBatchingChallenges } from '@aztec/blob-lib';
 import type { Fr } from '@aztec/foundation/fields';
 
 import type { L2Block } from '../block/l2_block.js';
@@ -15,7 +16,12 @@ export interface EpochProver extends Omit<IBlockFactory, 'setBlockCompleted'> {
    * @param firstBlockNumber - The block number of the first block in the epoch.
    * @param totalNumBlocks - The total number of blocks expected in the epoch (must be at least one).
    **/
-  startNewEpoch(epochNumber: number, firstBlockNumber: number, totalNumBlocks: number): void;
+  startNewEpoch(
+    epochNumber: number,
+    firstBlockNumber: number,
+    totalNumBlocks: number,
+    finalBlobBatchingChallenges: FinalBlobBatchingChallenges,
+  ): void;
 
   /**
    * Kickstarts tube circuits for the specified txs. These will be used during epoch proving.
@@ -27,7 +33,7 @@ export interface EpochProver extends Omit<IBlockFactory, 'setBlockCompleted'> {
   setBlockCompleted(blockNumber: number, expectedBlockHeader?: BlockHeader): Promise<L2Block>;
 
   /** Pads the epoch with empty block roots if needed and blocks until proven. Throws if proving has failed. */
-  finaliseEpoch(): Promise<{ publicInputs: RootRollupPublicInputs; proof: Proof }>;
+  finaliseEpoch(): Promise<{ publicInputs: RootRollupPublicInputs; proof: Proof; batchedBlobInputs: BatchedBlob }>;
 
   /** Cancels all proving jobs. */
   cancel(): void;

package/src/interfaces/service.ts

@@ -16,7 +16,7 @@ export interface Service {
 }
 
 /** Tries to call stop on a given object and awaits it. Logs any errors and does not rethrow. */
-export async function tryStop(service?: Partial<Pick<Service, 'stop'>>, logger?: Logger): Promise<void> {
+export async function tryStop(service?: any, logger?: Logger): Promise<void> {
   try {
     return typeof service === 'object' && service && 'stop' in service && typeof service.stop === 'function'
       ? await service.stop()

package/src/kernel/index.ts

@@ -1,5 +1,4 @@
 export * from './private_to_rollup_accumulated_data.js';
-export * from './combined_constant_data.js';
 export * from './private_to_rollup_kernel_circuit_public_inputs.js';
 export * from './private_accumulated_data.js';
 export * from './private_call_data.js';

package/src/p2p/consensus_payload.ts

@@ -4,7 +4,7 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { hexToBuffer } from '@aztec/foundation/string';
 import type { FieldsOf } from '@aztec/foundation/types';
 
-import { encodeAbiParameters, parseAbiParameters, toHex } from 'viem';
+import { encodeAbiParameters, parseAbiParameters } from 'viem';
 import { z } from 'zod';
 
 import type { L2Block } from '../block/l2_block.js';
@@ -41,9 +41,19 @@ export class ConsensusPayload implements Signable {
   }
 
   getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer {
-    const abi = parseAbiParameters('uint8, (bytes32, bytes, (uint256), bytes32, bytes32[])');
+    const abi = parseAbiParameters(
+      'uint8, ' + //domainSeperator
+        '(' +
+        'bytes32, ' + // archive
+        '((bytes32,uint32),((bytes32,uint32),(bytes32,uint32),(bytes32,uint32))), ' + // stateReference
+        '(int256), ' + // oracleInput
+        'bytes32, ' + // headerHash
+        'bytes32[]' + // txHashes
+        ')',
+    );
     const archiveRoot = this.archive.toString();
-    const stateReference = toHex(this.stateReference.toBuffer());
+    const stateReference = this.stateReference.toAbi();
+
     const headerHash = this.header.hash().toString();
     const txArray = this.txHashes.map(tx => tx.toString());
     const encodedData = encodeAbiParameters(abi, [

package/src/rollup/base_or_merge_rollup_public_inputs.ts

@@ -6,7 +6,7 @@ import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 
 import { PartialStateReference } from '../tx/partial_state_reference.js';
 import { RollupTypes } from '../types/shared.js';
-import { ConstantRollupData } from './constant_rollup_data.js';
+import { BlockConstantData } from './block_constant_data.js';
 
 /**
  * Output of the base and merge rollup circuits.
@@ -24,7 +24,7 @@ export class BaseOrMergeRollupPublicInputs {
     /**
      * Data which is forwarded through the rollup circuits unchanged.
      */
-    public constants: ConstantRollupData,
+    public constants: BlockConstantData,
     /**
      * Partial state reference at the start of the rollup circuit.
      */
@@ -61,7 +61,7 @@ export class BaseOrMergeRollupPublicInputs {
     return new BaseOrMergeRollupPublicInputs(
       RollupTypes.Base,
       0,
-      ConstantRollupData.empty(),
+      BlockConstantData.empty(),
       PartialStateReference.empty(),
       PartialStateReference.empty(),
       SpongeBlob.empty(),
@@ -83,7 +83,7 @@ export class BaseOrMergeRollupPublicInputs {
     return new BaseOrMergeRollupPublicInputs(
       reader.readNumber(),
       reader.readNumber(),
-      reader.readObject(ConstantRollupData),
+      reader.readObject(BlockConstantData),
       reader.readObject(PartialStateReference),
       reader.readObject(PartialStateReference),
       reader.readObject(SpongeBlob),

package/src/rollup/base_rollup_hints.ts

@@ -8,8 +8,9 @@ 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 { PartialStateReference } from '../tx/partial_state_reference.js';
-import { ConstantRollupData } from './constant_rollup_data.js';
+import { BlockConstantData } from './block_constant_data.js';
 import { PrivateBaseStateDiffHints } from './state_diff_hints.js';
 
 export type BaseRollupHints = PrivateBaseRollupHints | PublicBaseRollupHints;
@@ -43,7 +44,7 @@ export class PrivateBaseRollupHints {
     /**
      * Data which is not modified by the base rollup circuit.
      */
-    public constants: ConstantRollupData,
+    public constants: BlockConstantData,
   ) {}
 
   static from(fields: FieldsOf<PrivateBaseRollupHints>): PrivateBaseRollupHints {
@@ -87,7 +88,7 @@ export class PrivateBaseRollupHints {
       reader.readObject(PublicDataHint),
       MembershipWitness.fromBuffer(reader, ARCHIVE_HEIGHT),
       makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, () => reader.readObject(ContractClassLogFields)),
-      reader.readObject(ConstantRollupData),
+      reader.readObject(BlockConstantData),
     );
   }
 
@@ -103,7 +104,7 @@ export class PrivateBaseRollupHints {
       PublicDataHint.empty(),
       MembershipWitness.empty(ARCHIVE_HEIGHT),
       makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty),
-      ConstantRollupData.empty(),
+      BlockConstantData.empty(),
     );
   }
 }
@@ -114,6 +115,10 @@ export class PublicBaseRollupHints {
      * Sponge state to absorb blob inputs at the start of the rollup.
      */
     public startSpongeBlob: SpongeBlob,
+    /**
+     * Archive tree snapshot at the very beginning of the block containing this base rollup.
+     */
+    public lastArchive: AppendOnlyTreeSnapshot,
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
@@ -122,10 +127,6 @@ export class PublicBaseRollupHints {
      * Preimages to the kernel's contractClassLogsHashes.
      */
     public contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>,
-    /**
-     * Data which is not modified by the base rollup circuit.
-     */
-    public constants: ConstantRollupData,
   ) {}
 
   static from(fields: FieldsOf<PublicBaseRollupHints>): PublicBaseRollupHints {
@@ -135,9 +136,9 @@ export class PublicBaseRollupHints {
   static getFields(fields: FieldsOf<PublicBaseRollupHints>) {
     return [
       fields.startSpongeBlob,
+      fields.lastArchive,
       fields.archiveRootMembershipWitness,
       fields.contractClassLogsFields,
-      fields.constants,
     ] as const;
   }
 
@@ -161,9 +162,9 @@ export class PublicBaseRollupHints {
     const reader = BufferReader.asReader(buffer);
     return new PublicBaseRollupHints(
       reader.readObject(SpongeBlob),
+      reader.readObject(AppendOnlyTreeSnapshot),
       MembershipWitness.fromBuffer(reader, ARCHIVE_HEIGHT),
       makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, () => reader.readObject(ContractClassLogFields)),
-      reader.readObject(ConstantRollupData),
     );
   }
 
@@ -174,9 +175,9 @@ export class PublicBaseRollupHints {
   static empty() {
     return new PublicBaseRollupHints(
       SpongeBlob.empty(),
+      AppendOnlyTreeSnapshot.empty(),
       MembershipWitness.empty(ARCHIVE_HEIGHT),
       makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty),
-      ConstantRollupData.empty(),
     );
   }
 }

package/src/rollup/block_constant_data.ts

@@ -0,0 +1,63 @@
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
+
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { GlobalVariables } from '../tx/global_variables.js';
+
+/**
+ * Constants that are the same for the entire block.
+ */
+export class BlockConstantData {
+  constructor(
+    /** Archive tree snapshot at the very beginning of the entire rollup. */
+    public lastArchive: AppendOnlyTreeSnapshot,
+    /** L1 to L2 message tree snapshot at the very beginning of the entire rollup. */
+    public lastL1ToL2: AppendOnlyTreeSnapshot,
+    /** Root of the verification key tree. */
+    public vkTreeRoot: Fr,
+    /** Root of the protocol contract tree. */
+    public protocolContractTreeRoot: Fr,
+    /** Global variables for the block. */
+    public globalVariables: GlobalVariables,
+  ) {}
+
+  static from(fields: FieldsOf<BlockConstantData>): BlockConstantData {
+    return new BlockConstantData(...BlockConstantData.getFields(fields));
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader): BlockConstantData {
+    const reader = BufferReader.asReader(buffer);
+    return new BlockConstantData(
+      reader.readObject(AppendOnlyTreeSnapshot),
+      reader.readObject(AppendOnlyTreeSnapshot),
+      Fr.fromBuffer(reader),
+      Fr.fromBuffer(reader),
+      reader.readObject(GlobalVariables),
+    );
+  }
+
+  static getFields(fields: FieldsOf<BlockConstantData>) {
+    return [
+      fields.lastArchive,
+      fields.lastL1ToL2,
+      fields.vkTreeRoot,
+      fields.protocolContractTreeRoot,
+      fields.globalVariables,
+    ] as const;
+  }
+
+  static empty() {
+    return new BlockConstantData(
+      AppendOnlyTreeSnapshot.empty(),
+      AppendOnlyTreeSnapshot.empty(),
+      Fr.ZERO,
+      Fr.ZERO,
+      GlobalVariables.empty(),
+    );
+  }
+
+  toBuffer() {
+    return serializeToBuffer(...BlockConstantData.getFields(this));
+  }
+}

package/src/rollup/block_root_or_block_merge_public_inputs.ts

@@ -9,12 +9,17 @@ import type { FieldsOf } from '@aztec/foundation/types';
 
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { GlobalVariables } from '../tx/global_variables.js';
+import { EpochConstantData } from './epoch_constant_data.js';
 
 /**
  * Output of the block root and block merge rollup circuits.
  */
 export class BlockRootOrBlockMergePublicInputs {
   constructor(
+    /**
+     * Constants for the entire epoch.
+     */
+    public constants: EpochConstantData,
     /**
      * Archive tree immediately before this block range.
      */
@@ -45,21 +50,9 @@ export class BlockRootOrBlockMergePublicInputs {
      */
     public fees: Tuple<FeeRecipient, typeof AZTEC_MAX_EPOCH_DURATION>,
     /**
-     * Root of the verification key tree.
-     */
-    public vkTreeRoot: Fr,
-    /**
-     * Root of the protocol contract tree.
-     */
-    public protocolContractTreeRoot: Fr,
-    /**
-     * TODO(#7346): Temporarily added prover_id while we verify block-root proofs on L1
+     * Public inputs required to verify a batch of blobs.
      */
-    public proverId: Fr,
-    /**
-     * Public inputs required to verify a blob (challenge point z, evaluation y = p(z), and the commitment to p() for each blob)
-     */
-    public blobPublicInputs: Tuple<BlockBlobPublicInputs, typeof AZTEC_MAX_EPOCH_DURATION>,
+    public blobPublicInputs: BlockBlobPublicInputs,
   ) {}
 
   /**
@@ -70,6 +63,7 @@ export class BlockRootOrBlockMergePublicInputs {
   static fromBuffer(buffer: Buffer | BufferReader): BlockRootOrBlockMergePublicInputs {
     const reader = BufferReader.asReader(buffer);
     return new BlockRootOrBlockMergePublicInputs(
+      reader.readObject(EpochConstantData),
       reader.readObject(AppendOnlyTreeSnapshot),
       reader.readObject(AppendOnlyTreeSnapshot),
       reader.readObject(GlobalVariables),
@@ -77,10 +71,7 @@ export class BlockRootOrBlockMergePublicInputs {
       Fr.fromBuffer(reader),
       reader.readArray(AZTEC_MAX_EPOCH_DURATION, Fr),
       reader.readArray(AZTEC_MAX_EPOCH_DURATION, FeeRecipient),
-      Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
-      reader.readArray(AZTEC_MAX_EPOCH_DURATION, BlockBlobPublicInputs),
+      reader.readObject(BlockBlobPublicInputs),
     );
   }
 
@@ -90,6 +81,7 @@ export class BlockRootOrBlockMergePublicInputs {
    */
   toBuffer() {
     return serializeToBuffer(
+      this.constants,
       this.previousArchive,
       this.newArchive,
       this.startGlobalVariables,
@@ -97,9 +89,6 @@ export class BlockRootOrBlockMergePublicInputs {
       this.outHash,
       this.proposedBlockHeaderHashes,
       this.fees,
-      this.vkTreeRoot,
-      this.protocolContractTreeRoot,
-      this.proverId,
       this.blobPublicInputs,
     );
   }

package/src/rollup/block_root_rollup.ts

@@ -1,3 +1,4 @@
+import { BlobAccumulatorPublicInputs, FinalBlobBatchingChallenges } from '@aztec/blob-lib';
 import {
   ARCHIVE_HEIGHT,
   BLOBS_PER_BLOCK,
@@ -5,7 +6,7 @@ import {
   L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
   NESTED_RECURSIVE_PROOF_LENGTH,
 } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { BLS12Point, Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
@@ -38,7 +39,15 @@ export class BlockRootRollupData {
      */
     public previousBlockHeader: BlockHeader,
     /**
-     * TODO(#7346): Temporarily added prover_id while we verify block-root proofs on L1
+     * The current blob accumulation state across the epoch.
+     */
+    public startBlobAccumulator: BlobAccumulatorPublicInputs,
+    /**
+     * Finalized challenges z and gamma for performing blob batching. Shared value across the epoch.
+     */
+    public finalBlobChallenges: FinalBlobBatchingChallenges,
+    /**
+     * Identifier of the prover.
      */
     public proverId: Fr,
   ) {}
@@ -80,6 +89,8 @@ export class BlockRootRollupData {
       fields.previousArchiveSiblingPath,
       fields.newArchiveSiblingPath,
       fields.previousBlockHeader,
+      fields.startBlobAccumulator,
+      fields.finalBlobChallenges,
       fields.proverId,
     ] as const;
   }
@@ -97,6 +108,8 @@ export class BlockRootRollupData {
       reader.readArray(ARCHIVE_HEIGHT, Fr),
       reader.readArray(ARCHIVE_HEIGHT, Fr),
       BlockHeader.fromBuffer(reader),
+      reader.readObject(BlobAccumulatorPublicInputs),
+      reader.readObject(FinalBlobBatchingChallenges),
       Fr.fromBuffer(reader),
     );
   }
@@ -131,9 +144,8 @@ export class BlockRootRollupBlobData {
     public blobFields: Fr[],
     /**
      * KZG commitments representing the blob (precomputed in ts, injected to use inside circuit).
-     * TODO(Miranda): Rename to kzg_commitment to match BlobPublicInputs?
      */
-    public blobCommitments: Tuple<Tuple<Fr, 2>, typeof BLOBS_PER_BLOCK>,
+    public blobCommitments: Tuple<BLS12Point, typeof BLOBS_PER_BLOCK>,
     /**
      * The hash of eth blob hashes for this block
      * See yarn-project/foundation/src/blob/index.ts or body.ts for calculation
@@ -186,7 +198,7 @@ export class BlockRootRollupBlobData {
       // Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
       // reader.readArray(FIELDS_PER_BLOB, Fr),
       Array.from({ length: FIELDS_PER_BLOB * BLOBS_PER_BLOCK }, () => Fr.fromBuffer(reader)),
-      reader.readArray(BLOBS_PER_BLOCK, { fromBuffer: () => reader.readArray(2, Fr) }),
+      reader.readArray(BLOBS_PER_BLOCK, BLS12Point),
       Fr.fromBuffer(reader),
     );
   }

package/src/rollup/empty_block_root_rollup_inputs.ts

@@ -3,8 +3,8 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import type { FieldsOf } from '@aztec/foundation/types';
 
+import { BlockConstantData } from './block_constant_data.js';
 import { BlockRootRollupData } from './block_root_rollup.js';
-import { ConstantRollupData } from './constant_rollup_data.js';
 
 /**
  * Represents inputs of the empty block root rollup circuit.
@@ -12,7 +12,7 @@ import { ConstantRollupData } from './constant_rollup_data.js';
 export class EmptyBlockRootRollupInputs {
   constructor(
     public readonly data: BlockRootRollupData,
-    public readonly constants: ConstantRollupData,
+    public readonly constants: BlockConstantData,
     public readonly isPadding: boolean,
   ) {}
 
@@ -59,7 +59,7 @@ export class EmptyBlockRootRollupInputs {
     const reader = BufferReader.asReader(buffer);
     return new EmptyBlockRootRollupInputs(
       reader.readObject(BlockRootRollupData),
-      reader.readObject(ConstantRollupData),
+      reader.readObject(BlockConstantData),
       reader.readBoolean(),
     );
   }

package/src/rollup/epoch_constant_data.ts

@@ -0,0 +1,44 @@
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
+
+/**
+ * Constants that are the same for the entire epoch.
+ */
+export class EpochConstantData {
+  constructor(
+    /**
+     * Root of the verification key tree.
+     */
+    public vkTreeRoot: Fr,
+    /**
+     * Root of the protocol contract tree.
+     */
+    public protocolContractTreeRoot: Fr,
+    /**
+     * Identifier of the prover of the epoch.
+     */
+    public proverId: Fr,
+  ) {}
+
+  static from(fields: FieldsOf<EpochConstantData>): EpochConstantData {
+    return new EpochConstantData(...EpochConstantData.getFields(fields));
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader): EpochConstantData {
+    const reader = BufferReader.asReader(buffer);
+    return new EpochConstantData(Fr.fromBuffer(reader), Fr.fromBuffer(reader), Fr.fromBuffer(reader));
+  }
+
+  static getFields(fields: FieldsOf<EpochConstantData>) {
+    return [fields.vkTreeRoot, fields.protocolContractTreeRoot, fields.proverId] as const;
+  }
+
+  static empty() {
+    return new EpochConstantData(Fr.ZERO, Fr.ZERO, Fr.ZERO);
+  }
+
+  toBuffer() {
+    return serializeToBuffer(...EpochConstantData.getFields(this));
+  }
+}

package/src/rollup/index.ts

@@ -1,10 +1,11 @@
 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_root_or_block_merge_public_inputs.js';
-export * from './constant_rollup_data.js';
 export * from './empty_block_root_rollup_inputs.js';
+export * from './epoch_constant_data.js';
 export * from './block_root_rollup.js';
 export * from './merge_rollup.js';
 export * from './previous_rollup_block_data.js';

package/src/rollup/root_rollup.ts

@@ -1,4 +1,4 @@
-import { BlockBlobPublicInputs } from '@aztec/blob-lib';
+import { FinalBlobAccumulatorPublicInputs } from '@aztec/blob-lib';
 import { AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
 import { Fr } from '@aztec/foundation/fields';
@@ -21,8 +21,6 @@ export class RootRollupInputs {
      * from 2 block merge circuits.
      */
     public previousRollupData: [PreviousRollupBlockData, PreviousRollupBlockData],
-    /** Identifier of the prover for this root rollup. */
-    public proverId: Fr,
   ) {}
 
   /**
@@ -56,7 +54,7 @@ export class RootRollupInputs {
    * @returns An array of fields.
    */
   static getFields(fields: FieldsOf<RootRollupInputs>) {
-    return [fields.previousRollupData, fields.proverId] as const;
+    return [fields.previousRollupData] as const;
   }
 
   /**
@@ -66,10 +64,10 @@ export class RootRollupInputs {
    */
   static fromBuffer(buffer: Buffer | BufferReader): RootRollupInputs {
     const reader = BufferReader.asReader(buffer);
-    return new RootRollupInputs(
-      [reader.readObject(PreviousRollupBlockData), reader.readObject(PreviousRollupBlockData)],
-      Fr.fromBuffer(reader),
-    );
+    return new RootRollupInputs([
+      reader.readObject(PreviousRollupBlockData),
+      reader.readObject(PreviousRollupBlockData),
+    ]);
   }
 
   /**
@@ -110,7 +108,7 @@ export class RootRollupPublicInputs {
     public vkTreeRoot: Fr,
     public protocolContractTreeRoot: Fr,
     public proverId: Fr,
-    public blobPublicInputs: Tuple<BlockBlobPublicInputs, typeof AZTEC_MAX_EPOCH_DURATION>,
+    public blobPublicInputs: FinalBlobAccumulatorPublicInputs,
   ) {}
 
   static getFields(fields: FieldsOf<RootRollupPublicInputs>) {
@@ -157,7 +155,7 @@ export class RootRollupPublicInputs {
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
-      reader.readArray(AZTEC_MAX_EPOCH_DURATION, BlockBlobPublicInputs),
+      reader.readObject(FinalBlobAccumulatorPublicInputs),
     );
   }
 
@@ -179,7 +177,7 @@ export class RootRollupPublicInputs {
     return bufferSchemaFor(RootRollupPublicInputs);
   }
 
-  /** Creates a random instance. */
+  /** Creates a random instance. Used for testing only - will not prove/verify. */
   static random() {
     return new RootRollupPublicInputs(
       Fr.random(),
@@ -191,7 +189,7 @@ export class RootRollupPublicInputs {
       Fr.random(),
       Fr.random(),
       Fr.random(),
-      makeTuple(AZTEC_MAX_EPOCH_DURATION, BlockBlobPublicInputs.empty),
+      FinalBlobAccumulatorPublicInputs.random(),
     );
   }
 }