@aztec/stdlib 0.87.3-nightly.20250529 → 0.87.4

package/src/logs/contract_class_log.ts

@@ -96,6 +96,8 @@ export class ContractClassLogFields {
 
 export class ContractClassLog {
   static SIZE_IN_BYTES = Fr.SIZE_IN_BYTES * CONTRACT_CLASS_LOG_LENGTH;
+  // Keeps original first field pre-siloing. Only set by silo().
+  public unsiloedFirstField?: Fr | undefined;
 
   constructor(
     public contractAddress: AztecAddress,
@@ -178,6 +180,40 @@ export class ContractClassLog {
     );
   }
 
+  setUnsiloedFirstField(field: Fr) {
+    this.unsiloedFirstField = field;
+  }
+
+  toUnsiloed() {
+    if (this.contractAddress.isZero()) {
+      return this;
+    }
+    if (this.unsiloedFirstField) {
+      return new ContractClassLog(
+        this.contractAddress,
+        new ContractClassLogFields([this.unsiloedFirstField].concat(this.fields.fields.slice(1))),
+        this.emittedLength,
+      );
+    } else {
+      return this;
+    }
+  }
+
+  // TODO(#13914): Don't need to silo the contract class logs.
+  async silo() {
+    if (this.contractAddress.isZero()) {
+      return this;
+    }
+
+    const fields = this.fields.clone();
+    const unsiloedField = fields.fields[0];
+    const siloedField = await poseidon2Hash([this.contractAddress, unsiloedField]);
+    fields.fields[0] = siloedField;
+    const cloned = new ContractClassLog(this.contractAddress, fields, this.emittedLength);
+    cloned.setUnsiloedFirstField(unsiloedField);
+    return cloned;
+  }
+
   async hash() {
     return await this.fields.hash();
   }

package/src/logs/log_with_tx_data.ts

@@ -1,13 +1,14 @@
-import { MAX_NOTE_HASHES_PER_TX, PUBLIC_LOG_PLAINTEXT_LEN } from '@aztec/constants';
+import { MAX_NOTE_HASHES_PER_TX, PUBLIC_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { TxHash } from '@aztec/stdlib/tx';
 
-// TypeScript representation of the Noir aztec::oracle::message_discovery::PublicLogWithTxData struct. This is used as a
-// response for PXE's custom getPublicLogByTag oracle.
-export class PublicLogWithTxData {
+// TypeScript representation of the Noir aztec::oracle::message_discovery::LogWithTxData struct. This is used as a
+// response for PXE's custom getLogByTag oracle.
+export class LogWithTxData {
   constructor(
     // The emitted fields of a log.
-    public logPlaintext: Fr[],
+    // For public logs, the contract address is prepended to the content.
+    public logContent: Fr[],
     public txHash: TxHash,
     public uniqueNoteHashesInTx: Fr[],
     public firstNullifierInTx: Fr,
@@ -15,7 +16,10 @@ export class PublicLogWithTxData {
 
   toNoirSerialization(): (Fr | Fr[])[] {
     return [
-      ...toBoundedVecSerialization(this.logPlaintext, PUBLIC_LOG_PLAINTEXT_LEN),
+      // The log fields length is PUBLIC_LOG_SIZE_IN_FIELDS. + 1 because the contract address is prepended to the content.
+      // This is only used for public logs currently, so the maxLength is PUBLIC_LOG_SIZE_IN_FIELDS + 1.
+      // TODO(#11639): this could also be used for private logs.
+      ...toBoundedVecSerialization(this.logContent, PUBLIC_LOG_SIZE_IN_FIELDS + 1),
       this.txHash.hash,
       ...toBoundedVecSerialization(this.uniqueNoteHashesInTx, MAX_NOTE_HASHES_PER_TX),
       this.firstNullifierInTx,
@@ -23,7 +27,7 @@ export class PublicLogWithTxData {
   }
 
   static noirSerializationOfEmpty(): (Fr | Fr[])[] {
-    return new PublicLogWithTxData([], TxHash.zero(), [], new Fr(0)).toNoirSerialization();
+    return new LogWithTxData([], TxHash.zero(), [], new Fr(0)).toNoirSerialization();
   }
 }
 

package/src/logs/private_log.ts

@@ -44,10 +44,6 @@ export class PrivateLog {
     return this.fields.slice(0, this.emittedLength);
   }
 
-  getEmittedFieldsWithoutTag() {
-    return this.fields.slice(1, this.emittedLength);
-  }
-
   toBlobFields(): Fr[] {
     return [new Fr(this.emittedLength)].concat(this.getEmittedFields());
   }

package/src/logs/public_log.ts

@@ -50,10 +50,6 @@ export class PublicLog {
     return this.fields.slice(0, this.emittedLength);
   }
 
-  getEmittedFieldsWithoutTag() {
-    return this.fields.slice(1, this.emittedLength);
-  }
-
   toBlobFields(): Fr[] {
     return [new Fr(this.emittedLength), this.contractAddress.toField()].concat(this.getEmittedFields());
   }

package/src/logs/tx_scoped_l2_log.ts

@@ -6,7 +6,6 @@ import { TxHash } from '../tx/tx_hash.js';
 import { PrivateLog } from './private_log.js';
 import { PublicLog } from './public_log.js';
 
-// TODO(#14460): Split to private and public versions instead of having this weird mix.
 export class TxScopedL2Log {
   constructor(
     /*

package/src/rollup/avm_proof_data.ts

@@ -1,16 +1,15 @@
-import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { AVM_PROOF_LENGTH_IN_FIELDS } from '@aztec/constants';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
 import { RecursiveProof, makeEmptyRecursiveProof } from '../proofs/recursive_proof.js';
-import { VkData } from '../vks/vk_data.js';
+import { VkWitnessData } from '../vks/vk_witness_data.js';
 
 export class AvmProofData {
   constructor(
     public publicInputs: AvmCircuitPublicInputs,
-    public proof: RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>,
-    public vkData: VkData,
+    public proof: RecursiveProof<typeof AVM_PROOF_LENGTH_IN_FIELDS>,
+    public vkData: VkWitnessData,
   ) {}
 
   static fromBuffer(buffer: Buffer | BufferReader) {
@@ -18,7 +17,7 @@ export class AvmProofData {
     return new AvmProofData(
       reader.readObject(AvmCircuitPublicInputs),
       RecursiveProof.fromBuffer(reader),
-      reader.readObject(VkData),
+      reader.readObject(VkWitnessData),
     );
   }
 
@@ -29,14 +28,8 @@ export class AvmProofData {
   static empty() {
     return new AvmProofData(
       AvmCircuitPublicInputs.empty(),
-      makeEmptyRecursiveProof(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED),
-      VkData.empty(),
+      makeEmptyRecursiveProof(AVM_PROOF_LENGTH_IN_FIELDS),
+      VkWitnessData.empty(),
     );
   }
 }
-
-// TODO(#14234)[Unconditional PIs validation]: remove this function.
-export function enhanceProofWithPiValidationFlag(proof: Fr[], skipPublicInputsValidation: boolean): Fr[] {
-  const skipPublicInputsField = skipPublicInputsValidation ? new Fr(1) : new Fr(0);
-  return [skipPublicInputsField].concat(proof).slice(0, AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED);
-}

package/src/rollup/base_rollup_hints.ts

@@ -39,7 +39,7 @@ export class PrivateBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    public contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>,
+    public contractClassLogsPreimages: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>,
     /**
      * Data which is not modified by the base rollup circuit.
      */
@@ -57,7 +57,7 @@ export class PrivateBaseRollupHints {
       fields.stateDiffHints,
       fields.feePayerFeeJuiceBalanceReadHint,
       fields.archiveRootMembershipWitness,
-      fields.contractClassLogsFields,
+      fields.contractClassLogsPreimages,
       fields.constants,
     ] as const;
   }
@@ -121,7 +121,7 @@ export class PublicBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    public contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>,
+    public contractClassLogsPreimages: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>,
     /**
      * Data which is not modified by the base rollup circuit.
      */
@@ -136,7 +136,7 @@ export class PublicBaseRollupHints {
     return [
       fields.startSpongeBlob,
       fields.archiveRootMembershipWitness,
-      fields.contractClassLogsFields,
+      fields.contractClassLogsPreimages,
       fields.constants,
     ] as const;
   }

package/src/rollup/previous_rollup_block_data.ts

@@ -1,8 +1,9 @@
-import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
+import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, VK_TREE_HEIGHT } from '@aztec/constants';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { MembershipWitness } from '@aztec/foundation/trees';
 
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VkData } from '../vks/index.js';
+import { VerificationKeyAsFields } from '../vks/verification_key.js';
 import { BlockRootOrBlockMergePublicInputs } from './block_root_or_block_merge_public_inputs.js';
 
 /**
@@ -19,9 +20,13 @@ export class PreviousRollupBlockData {
      */
     public proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>,
     /**
-     * The verification key and the witness of the vk in the vk tree.
+     * The verification key of the block merge or block root rollup circuit.
      */
-    public vkData: VkData,
+    public vk: VerificationKeyAsFields,
+    /**
+     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
+     */
+    public vkWitness: MembershipWitness<typeof VK_TREE_HEIGHT>,
   ) {}
 
   /**
@@ -29,7 +34,7 @@ export class PreviousRollupBlockData {
    * @returns The buffer of the serialized previous rollup data.
    */
   public toBuffer(): Buffer {
-    return serializeToBuffer(this.blockRootOrBlockMergePublicInputs, this.proof, this.vkData);
+    return serializeToBuffer(this.blockRootOrBlockMergePublicInputs, this.proof, this.vk, this.vkWitness);
   }
 
   /**
@@ -42,7 +47,8 @@ export class PreviousRollupBlockData {
     return new PreviousRollupBlockData(
       reader.readObject(BlockRootOrBlockMergePublicInputs),
       RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH),
-      reader.readObject(VkData),
+      reader.readObject(VerificationKeyAsFields),
+      MembershipWitness.fromBuffer(reader, VK_TREE_HEIGHT),
     );
   }
 }

package/src/rollup/previous_rollup_data.ts

@@ -1,8 +1,9 @@
-import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
+import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, VK_TREE_HEIGHT } from '@aztec/constants';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { MembershipWitness } from '@aztec/foundation/trees';
 
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VkData } from '../vks/index.js';
+import { VerificationKeyAsFields } from '../vks/verification_key.js';
 import { BaseOrMergeRollupPublicInputs } from './base_or_merge_rollup_public_inputs.js';
 
 /**
@@ -19,9 +20,13 @@ export class PreviousRollupData {
      */
     public proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>,
     /**
-     * The verification key and the witness of the vk in the vk tree.
+     * The verification key of the base or merge rollup circuit.
      */
-    public vkData: VkData,
+    public vk: VerificationKeyAsFields,
+    /**
+     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
+     */
+    public vkWitness: MembershipWitness<typeof VK_TREE_HEIGHT>,
   ) {}
 
   /**
@@ -29,7 +34,7 @@ export class PreviousRollupData {
    * @returns The buffer of the serialized previous rollup data.
    */
   public toBuffer(): Buffer {
-    return serializeToBuffer(this.baseOrMergeRollupPublicInputs, this.proof, this.vkData);
+    return serializeToBuffer(this.baseOrMergeRollupPublicInputs, this.proof, this.vk, this.vkWitness);
   }
 
   /**
@@ -42,7 +47,8 @@ export class PreviousRollupData {
     return new PreviousRollupData(
       reader.readObject(BaseOrMergeRollupPublicInputs),
       RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH),
-      reader.readObject(VkData),
+      reader.readObject(VerificationKeyAsFields),
+      MembershipWitness.fromBuffer(reader, VK_TREE_HEIGHT),
     );
   }
 }

package/src/rollup/private_tube_data.ts

@@ -3,20 +3,20 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { PrivateToRollupKernelCircuitPublicInputs } from '../kernel/private_to_rollup_kernel_circuit_public_inputs.js';
 import { RecursiveProof, makeEmptyRecursiveProof } from '../proofs/recursive_proof.js';
-import { VkData } from '../vks/index.js';
+import { VkWitnessData } from '../vks/vk_witness_data.js';
 
 export class PrivateTubeData {
   constructor(
     public publicInputs: PrivateToRollupKernelCircuitPublicInputs,
     public proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>,
-    public vkData: VkData,
+    public vkData: VkWitnessData,
   ) {}
 
   static empty() {
     return new PrivateTubeData(
       PrivateToRollupKernelCircuitPublicInputs.empty(),
       makeEmptyRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH),
-      VkData.empty(),
+      VkWitnessData.empty(),
     );
   }
 
@@ -25,7 +25,7 @@ export class PrivateTubeData {
     return new PrivateTubeData(
       reader.readObject(PrivateToRollupKernelCircuitPublicInputs),
       RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH),
-      reader.readObject(VkData),
+      reader.readObject(VkWitnessData),
     );
   }
 

package/src/rollup/public_tube_data.ts

@@ -3,20 +3,20 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { PrivateToPublicKernelCircuitPublicInputs } from '../kernel/private_to_public_kernel_circuit_public_inputs.js';
 import { RecursiveProof, makeEmptyRecursiveProof } from '../proofs/recursive_proof.js';
-import { VkData } from '../vks/index.js';
+import { VkWitnessData } from '../vks/vk_witness_data.js';
 
 export class PublicTubeData {
   constructor(
     public publicInputs: PrivateToPublicKernelCircuitPublicInputs,
     public proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>,
-    public vkData: VkData,
+    public vkData: VkWitnessData,
   ) {}
 
   static empty() {
     return new PublicTubeData(
       PrivateToPublicKernelCircuitPublicInputs.empty(),
       makeEmptyRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH),
-      VkData.empty(),
+      VkWitnessData.empty(),
     );
   }
 
@@ -25,7 +25,7 @@ export class PublicTubeData {
     return new PublicTubeData(
       reader.readObject(PrivateToPublicKernelCircuitPublicInputs),
       RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH),
-      reader.readObject(VkData),
+      reader.readObject(VkWitnessData),
     );
   }
 

package/src/rollup/root_rollup.ts

@@ -7,6 +7,7 @@ import { BufferReader, type Tuple, serializeToBuffer, serializeToFields } from '
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import type { FieldsOf } from '@aztec/foundation/types';
 
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { FeeRecipient } from './block_root_or_block_merge_public_inputs.js';
 import { PreviousRollupBlockData } from './previous_rollup_block_data.js';
 
@@ -99,10 +100,13 @@ export class RootRollupInputs {
  */
 export class RootRollupPublicInputs {
   constructor(
-    /** Root of the archive tree before this rollup is processed */
-    public previousArchiveRoot: Fr,
-    /** Root of the archive tree after this rollup is processed */
-    public endArchiveRoot: Fr,
+    /** Snapshot of archive tree before/after this rollup been processed */
+    public previousArchive: AppendOnlyTreeSnapshot,
+    public endArchive: AppendOnlyTreeSnapshot,
+    // This is a u64 in nr, but GlobalVariables contains this as a u64 and is mapped to ts as a field, so I'm doing the same here
+    public endTimestamp: Fr,
+    public endBlockNumber: Fr,
+    public outHash: Fr,
     public proposedBlockHeaderHashes: Tuple<Fr, typeof AZTEC_MAX_EPOCH_DURATION>,
     public fees: Tuple<FeeRecipient, typeof AZTEC_MAX_EPOCH_DURATION>,
     public chainId: Fr,
@@ -115,8 +119,11 @@ export class RootRollupPublicInputs {
 
   static getFields(fields: FieldsOf<RootRollupPublicInputs>) {
     return [
-      fields.previousArchiveRoot,
-      fields.endArchiveRoot,
+      fields.previousArchive,
+      fields.endArchive,
+      fields.endTimestamp,
+      fields.endBlockNumber,
+      fields.outHash,
       fields.proposedBlockHeaderHashes,
       fields.fees,
       fields.chainId,
@@ -148,6 +155,9 @@ export class RootRollupPublicInputs {
   public static fromBuffer(buffer: Buffer | BufferReader): RootRollupPublicInputs {
     const reader = BufferReader.asReader(buffer);
     return new RootRollupPublicInputs(
+      reader.readObject(AppendOnlyTreeSnapshot),
+      reader.readObject(AppendOnlyTreeSnapshot),
+      Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
       reader.readArray(AZTEC_MAX_EPOCH_DURATION, Fr),
@@ -182,6 +192,9 @@ export class RootRollupPublicInputs {
   /** Creates a random instance. */
   static random() {
     return new RootRollupPublicInputs(
+      AppendOnlyTreeSnapshot.random(),
+      AppendOnlyTreeSnapshot.random(),
+      Fr.random(),
       Fr.random(),
       Fr.random(),
       makeTuple(AZTEC_MAX_EPOCH_DURATION, Fr.random),

package/src/tests/factories.ts

@@ -1,7 +1,7 @@
 import { makeBlockBlobPublicInputs, makeSpongeBlob } from '@aztec/blob-lib/testing';
 import {
   ARCHIVE_HEIGHT,
-  AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED,
+  AVM_PROOF_LENGTH_IN_FIELDS,
   AZTEC_MAX_EPOCH_DURATION,
   BLOBS_PER_BLOCK,
   CONTRACT_CLASS_LOG_SIZE_IN_FIELDS,
@@ -55,7 +55,6 @@ import { ContractStorageRead } from '../avm/contract_storage_read.js';
 import { ContractStorageUpdateRequest } from '../avm/contract_storage_update_request.js';
 import {
   AvmAccumulatedData,
-  AvmAccumulatedDataArrayLengths,
   AvmAppendLeavesHint,
   AvmBytecodeCommitmentHint,
   AvmCircuitInputs,
@@ -116,11 +115,7 @@ import { PrivateCallRequest } from '../kernel/private_call_request.js';
 import { PrivateCircuitPublicInputs } from '../kernel/private_circuit_public_inputs.js';
 import { PrivateLogData } from '../kernel/private_log_data.js';
 import { PrivateToRollupKernelCircuitPublicInputs } from '../kernel/private_to_rollup_kernel_circuit_public_inputs.js';
-import {
-  CountedPublicCallRequest,
-  PublicCallRequest,
-  PublicCallRequestArrayLengths,
-} from '../kernel/public_call_request.js';
+import { CountedPublicCallRequest, PublicCallRequest } from '../kernel/public_call_request.js';
 import { PublicKeys, computeAddress } from '../keys/index.js';
 import { ContractClassLogFields } from '../logs/index.js';
 import { PrivateLog } from '../logs/private_log.js';
@@ -173,8 +168,8 @@ import { TxConstantData } from '../tx/tx_constant_data.js';
 import { TxContext } from '../tx/tx_context.js';
 import { TxRequest } from '../tx/tx_request.js';
 import { RollupTypes, Vector } from '../types/index.js';
-import { VkData } from '../vks/index.js';
 import { VerificationKey, VerificationKeyAsFields, VerificationKeyData } from '../vks/verification_key.js';
+import { VkWitnessData } from '../vks/vk_witness_data.js';
 import { mockTx } from './mocks.js';
 
 /**
@@ -373,10 +368,6 @@ function makeAvmAccumulatedData(seed = 1) {
   );
 }
 
-function makeAvmAccumulatedDataArrayLengths(seed = 1) {
-  return new AvmAccumulatedDataArrayLengths(seed, seed + 1, seed + 2, seed + 3, seed + 4);
-}
-
 export function makeGas(seed = 1) {
   return new Gas(seed, seed + 1);
 }
@@ -462,7 +453,6 @@ function makeAvmCircuitPublicInputs(seed = 1) {
     makeGas(seed + 0x20),
     makeGasSettings(),
     makeAztecAddress(seed + 0x40),
-    makePublicCallRequestArrayLengths(seed + 0x40),
     makeTuple(MAX_ENQUEUED_CALLS_PER_TX, makePublicCallRequest, seed + 0x100),
     makeTuple(MAX_ENQUEUED_CALLS_PER_TX, makePublicCallRequest, seed + 0x200),
     makePublicCallRequest(seed + 0x300),
@@ -472,7 +462,6 @@ function makeAvmCircuitPublicInputs(seed = 1) {
     makePrivateToAvmAccumulatedData(seed + 0x600),
     makeTreeSnapshots(seed + 0x700),
     makeGas(seed + 0x750),
-    makeAvmAccumulatedDataArrayLengths(seed + 0x800),
     makeAvmAccumulatedData(seed + 0x800),
     fr(seed + 0x900),
     false,
@@ -544,10 +533,6 @@ export function makePublicCallRequest(seed = 1) {
   return new PublicCallRequest(makeAztecAddress(seed), makeAztecAddress(seed + 1), false, fr(seed + 0x3));
 }
 
-export function makePublicCallRequestArrayLengths(seed = 1) {
-  return new PublicCallRequestArrayLengths(seed, seed + 1, seed % 2 === 0);
-}
-
 function makeCountedPublicCallRequest(seed = 1) {
   return new CountedPublicCallRequest(makePublicCallRequest(seed), seed + 0x100);
 }
@@ -757,7 +742,8 @@ export function makePreviousRollupData(
       NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
       seed + 0x50,
     ),
-    makeVkData(seed + 0x100),
+    VerificationKeyAsFields.makeFakeHonk(),
+    makeMembershipWitness(VK_TREE_HEIGHT, seed + 0x120),
   );
 }
 
@@ -777,7 +763,8 @@ export function makePreviousRollupBlockData(
       NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
       seed + 0x50,
     ),
-    makeVkData(seed + 0x100),
+    VerificationKeyAsFields.makeFakeHonk(),
+    makeMembershipWitness(VK_TREE_HEIGHT, seed + 0x120),
   );
 }
 
@@ -894,10 +881,13 @@ export function makeRootParityInputs(seed = 0): RootParityInputs {
  */
 export function makeRootRollupPublicInputs(seed = 0): RootRollupPublicInputs {
   return new RootRollupPublicInputs(
-    fr(seed + 0x100),
-    fr(seed + 0x200),
-    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => fr(seed), 0x300),
-    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeFeeRecipient(seed), 0x500),
+    makeAppendOnlyTreeSnapshot(seed + 0x100),
+    makeAppendOnlyTreeSnapshot(seed + 0x200),
+    fr(seed + 0x300),
+    fr(seed + 0x400),
+    fr(seed + 0x500),
+    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => fr(seed), 0x650),
+    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeFeeRecipient(seed), 0x600),
     fr(seed + 0x700),
     fr(seed + 0x701),
     fr(seed + 0x702),
@@ -1080,15 +1070,15 @@ export function makePrivateBaseStateDiffHints(seed = 1): PrivateBaseStateDiffHin
   );
 }
 
-function makeVkData(seed = 1) {
-  return new VkData(VerificationKeyData.makeFakeHonk(), seed, makeTuple(VK_TREE_HEIGHT, fr, seed + 0x100));
+function makeVkWitnessData(seed = 1) {
+  return new VkWitnessData(VerificationKeyData.makeFakeHonk(), seed, makeTuple(VK_TREE_HEIGHT, fr, seed + 0x100));
 }
 
 function makePrivateTubeData(seed = 1, kernelPublicInputs?: PrivateToRollupKernelCircuitPublicInputs) {
   return new PrivateTubeData(
     kernelPublicInputs ?? makePrivateToRollupKernelCircuitPublicInputs(seed, true),
     makeRecursiveProof<typeof TUBE_PROOF_LENGTH>(TUBE_PROOF_LENGTH, seed + 0x100),
-    makeVkData(seed + 0x200),
+    makeVkWitnessData(seed + 0x200),
   );
 }
 
@@ -1105,7 +1095,11 @@ function makePrivateBaseRollupHints(seed = 1) {
 
   const archiveRootMembershipWitness = makeMembershipWitness(ARCHIVE_HEIGHT, seed + 0x9000);
 
-  const contractClassLogsFields = makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeContractClassLogFields, seed + 0x800);
+  const contractClassLogsPreimages = makeTuple(
+    MAX_CONTRACT_CLASS_LOGS_PER_TX,
+    makeContractClassLogFields,
+    seed + 0x800,
+  );
 
   const constants = makeConstantRollupData(0x100);
 
@@ -1117,7 +1111,7 @@ function makePrivateBaseRollupHints(seed = 1) {
     stateDiffHints,
     feePayerFeeJuiceBalanceReadHint,
     archiveRootMembershipWitness,
-    contractClassLogsFields,
+    contractClassLogsPreimages,
     constants,
   });
 }
@@ -1127,14 +1121,18 @@ function makePublicBaseRollupHints(seed = 1) {
 
   const archiveRootMembershipWitness = makeMembershipWitness(ARCHIVE_HEIGHT, seed + 0x9000);
 
-  const contractClassLogsFields = makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeContractClassLogFields, seed + 0x800);
+  const contractClassLogsPreimages = makeTuple(
+    MAX_CONTRACT_CLASS_LOGS_PER_TX,
+    makeContractClassLogFields,
+    seed + 0x800,
+  );
 
   const constants = makeConstantRollupData(0x100);
 
   return PublicBaseRollupHints.from({
     startSpongeBlob,
     archiveRootMembershipWitness,
-    contractClassLogsFields,
+    contractClassLogsPreimages,
     constants,
   });
 }
@@ -1153,15 +1151,15 @@ function makePublicTubeData(seed = 1) {
   return new PublicTubeData(
     makePrivateToPublicKernelCircuitPublicInputs(seed),
     makeRecursiveProof<typeof TUBE_PROOF_LENGTH>(TUBE_PROOF_LENGTH, seed + 0x100),
-    makeVkData(seed + 0x200),
+    makeVkWitnessData(seed + 0x200),
   );
 }
 
 function makeAvmProofData(seed = 1) {
   return new AvmProofData(
     makeAvmCircuitPublicInputs(seed),
-    makeRecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED, seed + 0x100),
-    makeVkData(seed + 0x200),
+    makeRecursiveProof<typeof AVM_PROOF_LENGTH_IN_FIELDS>(AVM_PROOF_LENGTH_IN_FIELDS, seed + 0x100),
+    makeVkWitnessData(seed + 0x200),
   );
 }
 
@@ -1488,7 +1486,6 @@ export function makeAvmTxHint(seed = 0): AvmTxHint {
   return new AvmTxHint(
     `txhash-${seed}`,
     makeGlobalVariables(seed),
-    makeGasSettings(),
     {
       noteHashes: makeArray((seed % 20) + 4, i => new Fr(i), seed + 0x1000),
       nullifiers: makeArray((seed % 20) + 4, i => new Fr(i), seed + 0x2000),
@@ -1500,7 +1497,6 @@ export function makeAvmTxHint(seed = 0): AvmTxHint {
     makeArray((seed % 20) + 4, i => makeAvmEnqueuedCallHint(i), seed + 0x5000), // setupEnqueuedCalls
     makeArray((seed % 20) + 4, i => makeAvmEnqueuedCallHint(i), seed + 0x6000), // appLogicEnqueuedCalls
     makeAvmEnqueuedCallHint(seed + 0x7000), // teardownEnqueuedCall
-    makeGas(seed + 0x8000), // gasUsedByPrivate
   );
 }
 

package/src/tests/mocks.ts

@@ -6,7 +6,6 @@ import { Fr } from '@aztec/foundation/fields';
 
 import type { ContractArtifact } from '../abi/abi.js';
 import { AztecAddress } from '../aztec-address/index.js';
-import { CommitteeAttestation } from '../block/index.js';
 import { L2Block } from '../block/l2_block.js';
 import type { PublishedL2Block } from '../block/published_l2_block.js';
 import { computeContractAddressFromInstance } from '../contract/contract_address.js';
@@ -300,7 +299,7 @@ export async function randomPublishedL2Block(
   };
 
   const signers = opts.signers ?? times(3, () => Secp256k1Signer.random());
-  const atts = await Promise.all(
+  const attestations = await Promise.all(
     signers.map(signer =>
       makeBlockAttestation({
         signer,
@@ -311,8 +310,6 @@ export async function randomPublishedL2Block(
       }),
     ),
   );
-  const attestations = atts.map(
-    (attestation, i) => new CommitteeAttestation(signers[i].address, attestation.signature),
-  );
-  return { block, l1, attestations };
+  const signatures = attestations.map(attestation => attestation.signature);
+  return { block, l1, signatures };
 }