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

package/src/tests/factories.ts

@@ -99,6 +99,7 @@ import { KeyValidationRequestAndGenerator } from '../kernel/hints/key_validation
 import { ReadRequest } from '../kernel/hints/read_request.js';
 import { RollupValidationRequests } from '../kernel/hints/rollup_validation_requests.js';
 import {
+  CombinedConstantData,
   PartialPrivateTailPublicInputsForPublic,
   PartialPrivateTailPublicInputsForRollup,
   PrivateKernelTailCircuitPublicInputs,
@@ -144,9 +145,8 @@ import {
   BlockRootRollupInputs,
   SingleTxBlockRootRollupInputs,
 } from '../rollup/block_root_rollup.js';
+import { ConstantRollupData } from '../rollup/constant_rollup_data.js';
 import { EmptyBlockRootRollupInputs } from '../rollup/empty_block_root_rollup_inputs.js';
-import { EpochConstantData } from '../rollup/epoch_constant_data.js';
-import { BlockConstantData } from '../rollup/index.js';
 import { MergeRollupInputs } from '../rollup/merge_rollup.js';
 import { PreviousRollupBlockData } from '../rollup/previous_rollup_block_data.js';
 import { PreviousRollupData } from '../rollup/previous_rollup_data.js';
@@ -314,6 +314,16 @@ function makeTxConstantData(seed = 1) {
   return new TxConstantData(makeHeader(seed), makeTxContext(seed + 0x100), new Fr(seed + 0x200), new Fr(seed + 0x201));
 }
 
+export function makeCombinedConstantData(seed = 1): CombinedConstantData {
+  return new CombinedConstantData(
+    makeHeader(seed),
+    makeTxContext(seed + 0x100),
+    new Fr(seed + 0x200),
+    new Fr(seed + 0x201),
+    makeGlobalVariables(seed + 0x300),
+  );
+}
+
 /**
  * Creates arbitrary accumulated data.
  * @param seed - The seed to use for generating the accumulated data.
@@ -603,19 +613,37 @@ export function makeGlobalVariables(seed = 1, overrides: Partial<FieldsOf<Global
     timestamp: new Fr(seed + 4),
     coinbase: EthAddress.fromField(new Fr(seed + 5)),
     feeRecipient: AztecAddress.fromField(new Fr(seed + 6)),
-    gasFees: new GasFees(new Fr(seed + 7), new Fr(seed + 8)),
+    gasFees: new GasFees(seed + 7, seed + 8),
     ...compact(overrides),
   });
 }
 
 export function makeGasFees(seed = 1) {
-  return new GasFees(fr(seed), fr(seed + 1));
+  return new GasFees(seed, seed + 1);
 }
 
 export function makeFeeRecipient(seed = 1) {
   return new FeeRecipient(EthAddress.fromField(fr(seed)), fr(seed + 1));
 }
 
+/**
+ * Makes constant base rollup data.
+ * @param seed - The seed to use for generating the constant base rollup data.
+ * @param blockNumber - The block number to use for generating the global variables.
+ * @returns A constant base rollup data.
+ */
+export function makeConstantRollupData(
+  seed = 1,
+  globalVariables: GlobalVariables | undefined = undefined,
+): ConstantRollupData {
+  return ConstantRollupData.from({
+    lastArchive: makeAppendOnlyTreeSnapshot(seed + 0x300),
+    vkTreeRoot: fr(seed + 0x401),
+    protocolContractTreeRoot: fr(seed + 0x402),
+    globalVariables: globalVariables ?? makeGlobalVariables(seed + 0x500),
+  });
+}
+
 /**
  * Makes arbitrary append only tree snapshot.
  * @param seed - The seed to use for generating the append only tree snapshot.
@@ -662,16 +690,6 @@ export function makeSchnorrSignature(seed = 1): SchnorrSignature {
   return new SchnorrSignature(Buffer.alloc(SchnorrSignature.SIZE, seed));
 }
 
-function makeBlockConstantData(seed = 1, globalVariables?: GlobalVariables) {
-  return new BlockConstantData(
-    makeAppendOnlyTreeSnapshot(seed + 0x100),
-    makeAppendOnlyTreeSnapshot(seed + 0x200),
-    fr(seed + 0x300),
-    fr(seed + 0x400),
-    globalVariables ?? makeGlobalVariables(seed + 0x500),
-  );
-}
-
 /**
  * Makes arbitrary base or merge rollup circuit public inputs.
  * @param seed - The seed to use for generating the base rollup circuit public inputs.
@@ -685,7 +703,7 @@ export function makeBaseOrMergeRollupPublicInputs(
   return new BaseOrMergeRollupPublicInputs(
     RollupTypes.Base,
     1,
-    makeBlockConstantData(seed + 0x200, globalVariables),
+    makeConstantRollupData(seed + 0x200, globalVariables),
     makePartialStateReference(seed + 0x300),
     makePartialStateReference(seed + 0x400),
     makeSpongeBlob(seed + 0x500),
@@ -696,10 +714,6 @@ export function makeBaseOrMergeRollupPublicInputs(
   );
 }
 
-function makeEpochConstantData(seed = 1) {
-  return new EpochConstantData(fr(seed), fr(seed + 1), fr(seed + 2));
-}
-
 /**
  * Makes arbitrary block merge or block root rollup circuit public inputs.
  * @param seed - The seed to use for generating the block merge or block root rollup circuit public inputs.
@@ -711,7 +725,6 @@ export function makeBlockRootOrBlockMergeRollupPublicInputs(
   globalVariables: GlobalVariables | undefined = undefined,
 ): BlockRootOrBlockMergePublicInputs {
   return new BlockRootOrBlockMergePublicInputs(
-    makeEpochConstantData(seed + 0x100),
     makeAppendOnlyTreeSnapshot(seed + 0x200),
     makeAppendOnlyTreeSnapshot(seed + 0x300),
     globalVariables ?? makeGlobalVariables(seed + 0x400),
@@ -719,6 +732,9 @@ export function makeBlockRootOrBlockMergeRollupPublicInputs(
     fr(seed + 0x600),
     makeTuple(AZTEC_MAX_EPOCH_DURATION, () => fr(seed), 0x650),
     makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeFeeRecipient(seed), 0x700),
+    fr(seed + 0x800),
+    fr(seed + 0x801),
+    fr(seed + 0x900),
     makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeBlockBlobPublicInputs(seed), 0x100),
   );
 }
@@ -770,10 +786,10 @@ export function makePreviousRollupBlockData(
  * @returns A root rollup inputs.
  */
 export function makeRootRollupInputs(seed = 0, globalVariables?: GlobalVariables): RootRollupInputs {
-  return new RootRollupInputs([
-    makePreviousRollupBlockData(seed, globalVariables),
-    makePreviousRollupBlockData(seed + 0x1000, globalVariables),
-  ]);
+  return new RootRollupInputs(
+    [makePreviousRollupBlockData(seed, globalVariables), makePreviousRollupBlockData(seed + 0x1000, globalVariables)],
+    fr(seed + 0x2000),
+  );
 }
 
 function makeBlockRootRollupData(seed = 0) {
@@ -829,7 +845,7 @@ export function makeEmptyBlockRootRollupInputs(
 ): EmptyBlockRootRollupInputs {
   return new EmptyBlockRootRollupInputs(
     makeBlockRootRollupData(seed + 0x1000),
-    makeBlockConstantData(0x2500, globalVariables),
+    makeConstantRollupData(0x2500, globalVariables),
     true,
   );
 }
@@ -1097,7 +1113,7 @@ function makePrivateBaseRollupHints(seed = 1) {
 
   const contractClassLogsFields = makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeContractClassLogFields, seed + 0x800);
 
-  const constants = makeBlockConstantData(0x100);
+  const constants = makeConstantRollupData(0x100);
 
   const feePayerFeeJuiceBalanceReadHint = PublicDataHint.empty();
 
@@ -1113,11 +1129,19 @@ function makePrivateBaseRollupHints(seed = 1) {
 }
 
 function makePublicBaseRollupHints(seed = 1) {
+  const startSpongeBlob = makeSpongeBlob(seed + 0x200);
+
+  const archiveRootMembershipWitness = makeMembershipWitness(ARCHIVE_HEIGHT, seed + 0x9000);
+
+  const contractClassLogsFields = makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeContractClassLogFields, seed + 0x800);
+
+  const constants = makeConstantRollupData(0x100);
+
   return PublicBaseRollupHints.from({
-    startSpongeBlob: makeSpongeBlob(seed),
-    lastArchive: makeAppendOnlyTreeSnapshot(seed + 0x1000),
-    archiveRootMembershipWitness: makeMembershipWitness(ARCHIVE_HEIGHT, seed + 0x2000),
-    contractClassLogsFields: makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeContractClassLogFields, seed + 0x3000),
+    startSpongeBlob,
+    archiveRootMembershipWitness,
+    contractClassLogsFields,
+    constants,
   });
 }
 

package/src/tests/mocks.ts

@@ -41,7 +41,7 @@ import { PublicSimulationOutput } from '../tx/public_simulation_output.js';
 import { TxSimulationResult, accumulatePrivateReturnValues } from '../tx/simulated_tx.js';
 import { TxEffect } from '../tx/tx_effect.js';
 import { TxHash } from '../tx/tx_hash.js';
-import { makeGas, makeGlobalVariables, makeHeader, makePublicCallRequest } from './factories.js';
+import { makeCombinedConstantData, makeGas, makeHeader, makePublicCallRequest } from './factories.js';
 
 export const randomTxHash = (): TxHash => TxHash.random();
 
@@ -190,7 +190,7 @@ export const mockSimulatedTx = async (seed = 1) => {
   const tx = await mockTx(seed);
   const output = new PublicSimulationOutput(
     undefined,
-    makeGlobalVariables(),
+    makeCombinedConstantData(),
     await TxEffect.random(),
     [accumulatePrivateReturnValues(privateExecutionResult)],
     {

package/src/trees/append_only_tree_snapshot.ts

@@ -71,11 +71,11 @@ export class AppendOnlyTreeSnapshot {
     return new AppendOnlyTreeSnapshot(reader.readField(), Number(reader.readField().toBigInt()));
   }
 
-  static empty() {
+  static zero() {
     return new AppendOnlyTreeSnapshot(Fr.ZERO, 0);
   }
 
-  isEmpty(): boolean {
+  isZero(): boolean {
     return this.root.isZero() && this.nextAvailableLeafIndex === 0;
   }
 

package/src/tx/block_header.ts

@@ -124,7 +124,7 @@ export class BlockHeader {
 
   static empty(fields: Partial<FieldsOf<BlockHeader>> = {}): BlockHeader {
     return BlockHeader.from({
-      lastArchive: AppendOnlyTreeSnapshot.empty(),
+      lastArchive: AppendOnlyTreeSnapshot.zero(),
       contentCommitment: ContentCommitment.empty(),
       state: StateReference.empty(),
       globalVariables: GlobalVariables.empty(),
@@ -136,7 +136,7 @@ export class BlockHeader {
 
   isEmpty(): boolean {
     return (
-      this.lastArchive.isEmpty() &&
+      this.lastArchive.isZero() &&
       this.contentCommitment.isEmpty() &&
       this.state.isEmpty() &&
       this.globalVariables.isEmpty() &&

package/src/tx/global_variables.ts

@@ -169,8 +169,8 @@ export class GlobalVariables {
       timestamp: this.timestamp.toNumber(),
       coinbase: this.coinbase.toString(),
       feeRecipient: this.feeRecipient.toString(),
-      feePerDaGas: this.gasFees.feePerDaGas.toNumber(),
-      feePerL2Gas: this.gasFees.feePerL2Gas.toNumber(),
+      feePerDaGas: Number(this.gasFees.feePerDaGas),
+      feePerL2Gas: Number(this.gasFees.feePerL2Gas),
     };
   }
 

package/src/tx/partial_state_reference.ts

@@ -57,9 +57,9 @@ export class PartialStateReference {
 
   static empty(): PartialStateReference {
     return new PartialStateReference(
-      AppendOnlyTreeSnapshot.empty(),
-      AppendOnlyTreeSnapshot.empty(),
-      AppendOnlyTreeSnapshot.empty(),
+      AppendOnlyTreeSnapshot.zero(),
+      AppendOnlyTreeSnapshot.zero(),
+      AppendOnlyTreeSnapshot.zero(),
     );
   }
 
@@ -82,7 +82,7 @@ export class PartialStateReference {
   }
 
   isEmpty(): boolean {
-    return this.noteHashTree.isEmpty() && this.nullifierTree.isEmpty() && this.publicDataTree.isEmpty();
+    return this.noteHashTree.isZero() && this.nullifierTree.isZero() && this.publicDataTree.isZero();
   }
 
   public equals(other: this): boolean {

package/src/tx/processed_tx.ts

@@ -7,6 +7,7 @@ import type { SimulationError } from '../errors/simulation_error.js';
 import { Gas } from '../gas/gas.js';
 import type { GasUsed } from '../gas/gas_used.js';
 import { siloL2ToL1Message } from '../hash/hash.js';
+import { CombinedConstantData } from '../kernel/combined_constant_data.js';
 import type { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
 import type { ClientIvcProof } from '../proofs/client_ivc_proof.js';
 import type { GlobalVariables } from './global_variables.js';
@@ -42,9 +43,9 @@ export type ProcessedTx = {
    */
   avmProvingRequest: AvmProvingRequest | undefined;
   /**
-   * `GlobalVariables` injected by the sequencer. It's the same for all the txs in a block.
+   * Combining `TxConstantData` specified by the user, and `GlobalVariables` injected by the sequencer.
    */
-  globalVariables: GlobalVariables;
+  constants: CombinedConstantData;
   /**
    * Output data of the tx.
    */
@@ -83,6 +84,8 @@ export async function makeProcessedTxFromPrivateOnlyTx(
   feePaymentPublicDataWrite: PublicDataWrite,
   globalVariables: GlobalVariables,
 ): Promise<ProcessedTx> {
+  const constants = CombinedConstantData.combine(tx.data.constants, globalVariables);
+
   const data = tx.data.forRollup!;
   const txEffect = new TxEffect(
     RevertCode.OK,
@@ -91,7 +94,7 @@ export async function makeProcessedTxFromPrivateOnlyTx(
     data.end.noteHashes.filter(h => !h.isZero()),
     data.end.nullifiers.filter(h => !h.isZero()),
     data.end.l2ToL1Msgs
-      .map(message => siloL2ToL1Message(message, globalVariables.version, globalVariables.chainId))
+      .map(message => siloL2ToL1Message(message, constants.txContext.version, constants.txContext.chainId))
       .filter(h => !h.isZero()),
     [feePaymentPublicDataWrite],
     data.end.privateLogs.filter(l => !l.isEmpty()),
@@ -112,7 +115,7 @@ export async function makeProcessedTxFromPrivateOnlyTx(
     data: tx.data,
     clientIvcProof: tx.clientIvcProof,
     avmProvingRequest: undefined,
-    globalVariables,
+    constants,
     txEffect,
     gasUsed,
     revertCode: RevertCode.OK,
@@ -135,7 +138,7 @@ export async function makeProcessedTxFromTxWithPublicCalls(
 ): Promise<ProcessedTx> {
   const avmPublicInputs = avmProvingRequest.inputs.publicInputs;
 
-  const globalVariables = avmPublicInputs.globalVariables;
+  const constants = CombinedConstantData.combine(tx.data.constants, avmPublicInputs.globalVariables);
 
   const publicDataWrites = avmPublicInputs.accumulatedData.publicDataWrites.filter(w => !w.isEmpty());
 
@@ -155,7 +158,7 @@ export async function makeProcessedTxFromTxWithPublicCalls(
     avmPublicInputs.accumulatedData.noteHashes.filter(h => !h.isZero()),
     avmPublicInputs.accumulatedData.nullifiers.filter(h => !h.isZero()),
     avmPublicInputs.accumulatedData.l2ToL1Msgs
-      .map(message => siloL2ToL1Message(message, globalVariables.version, globalVariables.chainId))
+      .map(message => siloL2ToL1Message(message, constants.txContext.version, constants.txContext.chainId))
       .filter(h => !h.isZero()),
     publicDataWrites,
     privateLogs,
@@ -168,7 +171,7 @@ export async function makeProcessedTxFromTxWithPublicCalls(
     data: tx.data,
     clientIvcProof: tx.clientIvcProof,
     avmProvingRequest,
-    globalVariables,
+    constants,
     txEffect,
     gasUsed,
     revertCode,

package/src/tx/proposed_block_header.ts

@@ -154,7 +154,7 @@ export class ProposedBlockHeader {
   }
 
   [inspect.custom]() {
-    const gasfees = `da:${this.gasFees.feePerDaGas.toBigInt()}, l2:${this.gasFees.feePerL2Gas.toBigInt()}`;
+    const gasfees = `da:${this.gasFees.feePerDaGas}, l2:${this.gasFees.feePerL2Gas}`;
     return `Header {
   lastArchiveRoot: ${this.lastArchiveRoot.toString()},
   contentCommitment: ${inspect(this.contentCommitment)},

package/src/tx/public_simulation_output.ts

@@ -7,8 +7,8 @@ import { z } from 'zod';
 import { SimulationError } from '../errors/simulation_error.js';
 import { Gas } from '../gas/gas.js';
 import type { GasUsed } from '../gas/gas_used.js';
+import { CombinedConstantData } from '../kernel/combined_constant_data.js';
 import { TxEffect } from '../tx/tx_effect.js';
-import { GlobalVariables } from './global_variables.js';
 
 /** Return values of simulating a circuit. */
 export type ProcessReturnValues = Fr[] | undefined;
@@ -50,7 +50,7 @@ export class NestedProcessReturnValues {
 export class PublicSimulationOutput {
   constructor(
     public revertReason: SimulationError | undefined,
-    public globalVariables: GlobalVariables,
+    public constants: CombinedConstantData,
     public txEffect: TxEffect,
     public publicReturnValues: NestedProcessReturnValues[],
     public gasUsed: GasUsed,
@@ -60,7 +60,7 @@ export class PublicSimulationOutput {
     return z
       .object({
         revertReason: SimulationError.schema.optional(),
-        globalVariables: GlobalVariables.schema,
+        constants: CombinedConstantData.schema,
         txEffect: TxEffect.schema,
         publicReturnValues: z.array(NestedProcessReturnValues.schema),
         gasUsed: z.object({
@@ -74,7 +74,7 @@ export class PublicSimulationOutput {
         fields =>
           new PublicSimulationOutput(
             fields.revertReason,
-            fields.globalVariables,
+            fields.constants,
             fields.txEffect,
             fields.publicReturnValues,
             fields.gasUsed,
@@ -85,7 +85,7 @@ export class PublicSimulationOutput {
   static async random() {
     return new PublicSimulationOutput(
       await SimulationError.random(),
-      GlobalVariables.empty(),
+      CombinedConstantData.empty(),
       TxEffect.empty(),
       times(2, NestedProcessReturnValues.random),
       { teardownGas: Gas.random(), totalGas: Gas.random(), publicGas: Gas.random(), billedGas: Gas.random() },

package/src/tx/state_reference.ts

@@ -62,11 +62,11 @@ export class StateReference {
   }
 
   static empty(): StateReference {
-    return new StateReference(AppendOnlyTreeSnapshot.empty(), PartialStateReference.empty());
+    return new StateReference(AppendOnlyTreeSnapshot.zero(), PartialStateReference.empty());
   }
 
   isEmpty(): boolean {
-    return this.l1ToL2MessageTree.isEmpty() && this.partial.isEmpty();
+    return this.l1ToL2MessageTree.isZero() && this.partial.isEmpty();
   }
 
   toInspect() {

package/src/tx/tree_snapshots.ts

@@ -84,19 +84,19 @@ export class TreeSnapshots {
 
   static empty(): TreeSnapshots {
     return new TreeSnapshots(
-      AppendOnlyTreeSnapshot.empty(),
-      AppendOnlyTreeSnapshot.empty(),
-      AppendOnlyTreeSnapshot.empty(),
-      AppendOnlyTreeSnapshot.empty(),
+      AppendOnlyTreeSnapshot.zero(),
+      AppendOnlyTreeSnapshot.zero(),
+      AppendOnlyTreeSnapshot.zero(),
+      AppendOnlyTreeSnapshot.zero(),
     );
   }
 
   isEmpty(): boolean {
     return (
-      this.l1ToL2MessageTree.isEmpty() &&
-      this.noteHashTree.isEmpty() &&
-      this.nullifierTree.isEmpty() &&
-      this.publicDataTree.isEmpty()
+      this.l1ToL2MessageTree.isZero() &&
+      this.noteHashTree.isZero() &&
+      this.nullifierTree.isZero() &&
+      this.publicDataTree.isZero()
     );
   }
 

package/src/types/shared.ts

@@ -30,6 +30,11 @@ export type UInt32 = number;
  */
 export type UInt64 = bigint;
 
+/**
+ * A type alias for a 128-bit unsigned integer.
+ */
+export type UInt128 = bigint;
+
 /**
  * CircuitType replaces ComposerType for now. When using Plonk, CircuitType is equivalent to the information of the proving system that will be used
  * to construct a proof. In the future Aztec zk stack, more information must be specified (e.g., the curve over which circuits are  constructed;

package/src/zkpassport/index.ts

@@ -0,0 +1,115 @@
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { randomBytes } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { withoutHexPrefix } from '@aztec/foundation/string';
+
+export type ViemZkPassportProofParams = {
+  vkeyHash: `0x${string}`;
+  proof: `0x${string}`;
+  publicInputs: `0x${string}`[];
+  committedInputs: `0x${string}`;
+  committedInputCounts: bigint[];
+  validityPeriodInDays: bigint;
+  scope: string;
+  subscope: string;
+  devMode: boolean;
+};
+
+// NOTE: Must match the ZkPassportProofParams struct in the zkpassport verifier contract
+// find here: ROOT/l1-contracts/lib/circuits/src/solidity/src/ZKPassportVerifier.sol
+export class ZkPassportProofParams {
+  constructor(
+    public devMode: boolean,
+    public vkeyHash: Buffer32,
+    public proof: Buffer,
+    public publicInputs: Fr[],
+    public committedInputs: Buffer,
+    public committedInputCounts: bigint[],
+    public validityPeriodInDays: bigint,
+    public scope: string,
+    public subscope: string,
+  ) {}
+
+  toBuffer() {
+    return serializeToBuffer([
+      this.devMode,
+      this.vkeyHash,
+      this.proof.length,
+      this.proof,
+      this.publicInputs.length,
+      this.publicInputs,
+      this.committedInputs.length,
+      this.committedInputs,
+      this.committedInputCounts.length,
+      this.committedInputCounts,
+      this.validityPeriodInDays,
+      this.scope,
+      this.subscope,
+    ]);
+  }
+
+  static random() {
+    const committedInputCounts = [BigInt(1), BigInt(2), BigInt(3), BigInt(4)];
+    const numberOfCommittedInputs = committedInputCounts.reduce((acc, count) => acc + count, BigInt(0));
+    const committedInputs = randomBytes(Number(numberOfCommittedInputs) * 32);
+
+    const publicInputsCount = numberOfCommittedInputs + 16n;
+    const publicInputs = Array.from({ length: Number(publicInputsCount) }, () => Fr.random());
+
+    return new ZkPassportProofParams(
+      false,
+      Buffer32.random(),
+      randomBytes(1024),
+      publicInputs,
+      committedInputs,
+      committedInputCounts,
+      BigInt(100),
+      'sequencer.alpha-testnet.aztec.network',
+      'personhood',
+    );
+  }
+
+  static fromBuffer(buffer: Buffer) {
+    const reader = BufferReader.asReader(buffer);
+    return new ZkPassportProofParams(
+      reader.readBoolean(),
+      reader.readObject(Buffer32),
+      reader.readBuffer(),
+      reader.readVector(Fr),
+      reader.readBuffer(),
+      reader.readUint256Vector(),
+      reader.readUInt256(),
+      reader.readString(),
+      reader.readString(),
+    );
+  }
+
+  static fromViem(params: ViemZkPassportProofParams) {
+    return new ZkPassportProofParams(
+      params.devMode,
+      Buffer32.fromString(params.vkeyHash),
+      Buffer.from(withoutHexPrefix(params.proof), 'hex'),
+      params.publicInputs.map(input => Fr.fromString(input)),
+      Buffer.from(withoutHexPrefix(params.committedInputs), 'hex'),
+      params.committedInputCounts,
+      params.validityPeriodInDays,
+      params.scope,
+      params.subscope,
+    );
+  }
+
+  toViem(): ViemZkPassportProofParams {
+    return {
+      devMode: this.devMode,
+      vkeyHash: this.vkeyHash.toString(),
+      proof: `0x${this.proof.toString('hex')}`,
+      publicInputs: this.publicInputs.map(input => input.toString()),
+      committedInputs: `0x${this.committedInputs.toString('hex')}`,
+      committedInputCounts: this.committedInputCounts,
+      validityPeriodInDays: this.validityPeriodInDays,
+      scope: this.scope,
+      subscope: this.subscope,
+    };
+  }
+}

package/dest/rollup/block_constant_data.d.ts

@@ -1,37 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } 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 declare class BlockConstantData {
-    /** Archive tree snapshot at the very beginning of the entire rollup. */
-    lastArchive: AppendOnlyTreeSnapshot;
-    /** L1 to L2 message tree snapshot at the very beginning of the entire rollup. */
-    lastL1ToL2: AppendOnlyTreeSnapshot;
-    /** Root of the verification key tree. */
-    vkTreeRoot: Fr;
-    /** Root of the protocol contract tree. */
-    protocolContractTreeRoot: Fr;
-    /** Global variables for the block. */
-    globalVariables: GlobalVariables;
-    constructor(
-    /** Archive tree snapshot at the very beginning of the entire rollup. */
-    lastArchive: AppendOnlyTreeSnapshot, 
-    /** L1 to L2 message tree snapshot at the very beginning of the entire rollup. */
-    lastL1ToL2: AppendOnlyTreeSnapshot, 
-    /** Root of the verification key tree. */
-    vkTreeRoot: Fr, 
-    /** Root of the protocol contract tree. */
-    protocolContractTreeRoot: Fr, 
-    /** Global variables for the block. */
-    globalVariables: GlobalVariables);
-    static from(fields: FieldsOf<BlockConstantData>): BlockConstantData;
-    static fromBuffer(buffer: Buffer | BufferReader): BlockConstantData;
-    static getFields(fields: FieldsOf<BlockConstantData>): readonly [AppendOnlyTreeSnapshot, AppendOnlyTreeSnapshot, Fr, Fr, GlobalVariables];
-    static empty(): BlockConstantData;
-    toBuffer(): Buffer<ArrayBufferLike>;
-}
-//# sourceMappingURL=block_constant_data.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"block_constant_data.d.ts","sourceRoot":"","sources":["../../src/rollup/block_constant_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D;;GAEG;AACH,qBAAa,iBAAiB;IAE1B,wEAAwE;IACjE,WAAW,EAAE,sBAAsB;IAC1C,iFAAiF;IAC1E,UAAU,EAAE,sBAAsB;IACzC,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,0CAA0C;IACnC,wBAAwB,EAAE,EAAE;IACnC,sCAAsC;IAC/B,eAAe,EAAE,eAAe;;IATvC,wEAAwE;IACjE,WAAW,EAAE,sBAAsB;IAC1C,iFAAiF;IAC1E,UAAU,EAAE,sBAAsB;IACzC,yCAAyC;IAClC,UAAU,EAAE,EAAE;IACrB,0CAA0C;IACnC,wBAAwB,EAAE,EAAE;IACnC,sCAAsC;IAC/B,eAAe,EAAE,eAAe;IAGzC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,iBAAiB;IAInE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB;IAWnE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC;IAUpD,MAAM,CAAC,KAAK;IAUZ,QAAQ;CAGT"}

package/dest/rollup/epoch_constant_data.d.ts

@@ -1,39 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-/**
- * Constants that are the same for the entire epoch.
- */
-export declare class EpochConstantData {
-    /**
-     * Root of the verification key tree.
-     */
-    vkTreeRoot: Fr;
-    /**
-     * Root of the protocol contract tree.
-     */
-    protocolContractTreeRoot: Fr;
-    /**
-     * Identifier of the prover of the epoch.
-     */
-    proverId: Fr;
-    constructor(
-    /**
-     * Root of the verification key tree.
-     */
-    vkTreeRoot: Fr, 
-    /**
-     * Root of the protocol contract tree.
-     */
-    protocolContractTreeRoot: Fr, 
-    /**
-     * Identifier of the prover of the epoch.
-     */
-    proverId: Fr);
-    static from(fields: FieldsOf<EpochConstantData>): EpochConstantData;
-    static fromBuffer(buffer: Buffer | BufferReader): EpochConstantData;
-    static getFields(fields: FieldsOf<EpochConstantData>): readonly [Fr, Fr, Fr];
-    static empty(): EpochConstantData;
-    toBuffer(): Buffer<ArrayBufferLike>;
-}
-//# sourceMappingURL=epoch_constant_data.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"epoch_constant_data.d.ts","sourceRoot":"","sources":["../../src/rollup/epoch_constant_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD;;GAEG;AACH,qBAAa,iBAAiB;IAE1B;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,wBAAwB,EAAE,EAAE;IACnC;;OAEG;IACI,QAAQ,EAAE,EAAE;;IAXnB;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,wBAAwB,EAAE,EAAE;IACnC;;OAEG;IACI,QAAQ,EAAE,EAAE;IAGrB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,iBAAiB;IAInE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB;IAKnE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC;IAIpD,MAAM,CAAC,KAAK;IAIZ,QAAQ;CAGT"}