@aztec/stdlib 0.0.0-test.1 → 0.0.1-commit.b655e406

package/src/kernel/private_kernel_tail_circuit_public_inputs.ts

@@ -1,17 +1,19 @@
 import { Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BufferReader, bigintToUInt64BE, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { AztecAddress } from '../aztec-address/index.js';
 import { Gas } from '../gas/gas.js';
+import type { PrivateLog } from '../logs/index.js';
 import { TxConstantData } from '../tx/tx_constant_data.js';
-import { RollupValidationRequests } from './hints/rollup_validation_requests.js';
+import type { UInt64 } from '../types/shared.js';
+import type { ScopedLogHash } from './log_hash.js';
 import { PrivateToPublicAccumulatedData } from './private_to_public_accumulated_data.js';
 import { PrivateToPublicKernelCircuitPublicInputs } from './private_to_public_kernel_circuit_public_inputs.js';
 import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_data.js';
 import { PrivateToRollupKernelCircuitPublicInputs } from './private_to_rollup_kernel_circuit_public_inputs.js';
 import { PublicCallRequest } from './public_call_request.js';
-import { countAccumulatedItems, mergeAccumulatedData } from './utils/order_and_comparison.js';
+import { countAccumulatedItems } from './utils/order_and_comparison.js';
 
 export class PartialPrivateTailPublicInputsForPublic {
   constructor(
@@ -102,7 +104,6 @@ export class PrivateKernelTailCircuitPublicInputs {
      * Data which is not modified by the circuits.
      */
     public constants: TxConstantData,
-    public rollupValidationRequests: RollupValidationRequests,
     /**
      * The accumulated gas used after private execution.
      * If the tx has a teardown call request, the teardown gas limits will also be included.
@@ -112,6 +113,10 @@ export class PrivateKernelTailCircuitPublicInputs {
      * The address of the fee payer for the transaction.
      */
     public feePayer: AztecAddress,
+    /**
+     * The timestamp by which the transaction must be included in a block.
+     */
+    public includeByTimestamp: UInt64,
 
     public forPublic?: PartialPrivateTailPublicInputsForPublic,
     public forRollup?: PartialPrivateTailPublicInputsForRollup,
@@ -139,8 +144,9 @@ export class PrivateKernelTailCircuitPublicInputs {
       (this.forPublic?.getSize() ?? 0) +
       (this.forRollup?.getSize() ?? 0) +
       this.constants.getSize() +
-      this.rollupValidationRequests.getSize() +
-      this.feePayer.size
+      this.gasUsed.getSize() +
+      this.feePayer.size +
+      8 // includeByTimestamp
     );
   }
 
@@ -150,12 +156,12 @@ export class PrivateKernelTailCircuitPublicInputs {
     }
     return new PrivateToPublicKernelCircuitPublicInputs(
       this.constants,
-      this.rollupValidationRequests,
       this.forPublic.nonRevertibleAccumulatedData,
       this.forPublic.revertibleAccumulatedData,
       this.forPublic.publicTeardownCallRequest,
       this.gasUsed,
       this.feePayer,
+      this.includeByTimestamp,
     );
   }
 
@@ -164,20 +170,26 @@ export class PrivateKernelTailCircuitPublicInputs {
       throw new Error('Private tail public inputs is not for rollup circuit.');
     }
     const constants = new TxConstantData(
-      this.constants.historicalHeader,
+      this.constants.anchorBlockHeader,
       this.constants.txContext,
       this.constants.vkTreeRoot,
-      this.constants.protocolContractTreeRoot,
+      this.constants.protocolContractsHash,
     );
     return new PrivateToRollupKernelCircuitPublicInputs(
       constants,
-      this.rollupValidationRequests,
       this.forRollup.end,
       this.gasUsed,
       this.feePayer,
+      this.includeByTimestamp,
     );
   }
 
+  publicInputs(): PrivateToPublicKernelCircuitPublicInputs | PrivateToRollupKernelCircuitPublicInputs {
+    return this.forPublic
+      ? this.toPrivateToPublicKernelCircuitPublicInputs()
+      : this.toPrivateToRollupKernelCircuitPublicInputs();
+  }
+
   numberOfPublicCallRequests() {
     return (
       this.numberOfNonRevertiblePublicCallRequests() +
@@ -215,8 +227,7 @@ export class PrivateKernelTailCircuitPublicInputs {
 
   getNonEmptyNoteHashes() {
     const noteHashes = this.forPublic
-      ? mergeAccumulatedData(
-          this.forPublic.nonRevertibleAccumulatedData.noteHashes,
+      ? this.forPublic.nonRevertibleAccumulatedData.noteHashes.concat(
           this.forPublic.revertibleAccumulatedData.noteHashes,
         )
       : this.forRollup!.end.noteHashes;
@@ -225,8 +236,7 @@ export class PrivateKernelTailCircuitPublicInputs {
 
   getNonEmptyNullifiers() {
     const nullifiers = this.forPublic
-      ? mergeAccumulatedData(
-          this.forPublic.nonRevertibleAccumulatedData.nullifiers,
+      ? this.forPublic.nonRevertibleAccumulatedData.nullifiers.concat(
           this.forPublic.revertibleAccumulatedData.nullifiers,
         )
       : this.forRollup!.end.nullifiers;
@@ -235,8 +245,7 @@ export class PrivateKernelTailCircuitPublicInputs {
 
   getNonEmptyPrivateLogs() {
     const privateLogs = this.forPublic
-      ? mergeAccumulatedData(
-          this.forPublic.nonRevertibleAccumulatedData.privateLogs,
+      ? this.forPublic.nonRevertibleAccumulatedData.privateLogs.concat(
           this.forPublic.revertibleAccumulatedData.privateLogs,
         )
       : this.forRollup!.end.privateLogs;
@@ -245,8 +254,7 @@ export class PrivateKernelTailCircuitPublicInputs {
 
   getNonEmptyContractClassLogsHashes() {
     const contractClassLogsHashes = this.forPublic
-      ? mergeAccumulatedData(
-          this.forPublic.nonRevertibleAccumulatedData.contractClassLogsHashes,
+      ? this.forPublic.nonRevertibleAccumulatedData.contractClassLogsHashes.concat(
           this.forPublic.revertibleAccumulatedData.contractClassLogsHashes,
         )
       : this.forRollup!.end.contractClassLogsHashes;
@@ -254,11 +262,20 @@ export class PrivateKernelTailCircuitPublicInputs {
   }
 
   getEmittedContractClassLogsLength() {
-    return this.getNonEmptyContractClassLogsHashes().reduce((total, log) => total + log.logHash.length, 0);
+    const accumulateLengths = (logHashes: ScopedLogHash[]) =>
+      logHashes.reduce((acc, log) => acc + log.logHash.length, 0);
+    return this.forPublic
+      ? accumulateLengths(this.forPublic.nonRevertibleAccumulatedData.contractClassLogsHashes) +
+          accumulateLengths(this.forPublic.revertibleAccumulatedData.contractClassLogsHashes)
+      : accumulateLengths(this.forRollup!.end.contractClassLogsHashes);
   }
 
   getEmittedPrivateLogsLength() {
-    return this.getNonEmptyPrivateLogs().reduce((total, log) => total + log.getEmittedLength(), 0);
+    const accumulateLengths = (logs: PrivateLog[]) => logs.reduce((acc, log) => acc + log.emittedLength, 0);
+    return this.forPublic
+      ? accumulateLengths(this.forPublic.nonRevertibleAccumulatedData.privateLogs) +
+          accumulateLengths(this.forPublic.revertibleAccumulatedData.privateLogs)
+      : accumulateLengths(this.forRollup!.end.privateLogs);
   }
 
   static fromBuffer(buffer: Buffer | BufferReader): PrivateKernelTailCircuitPublicInputs {
@@ -266,9 +283,9 @@ export class PrivateKernelTailCircuitPublicInputs {
     const isForPublic = reader.readBoolean();
     return new PrivateKernelTailCircuitPublicInputs(
       reader.readObject(TxConstantData),
-      reader.readObject(RollupValidationRequests),
       reader.readObject(Gas),
       reader.readObject(AztecAddress),
+      reader.readUInt64(),
       isForPublic ? reader.readObject(PartialPrivateTailPublicInputsForPublic) : undefined,
       !isForPublic ? reader.readObject(PartialPrivateTailPublicInputsForRollup) : undefined,
     );
@@ -279,9 +296,9 @@ export class PrivateKernelTailCircuitPublicInputs {
     return serializeToBuffer(
       isForPublic,
       this.constants,
-      this.rollupValidationRequests,
       this.gasUsed,
       this.feePayer,
+      bigintToUInt64BE(this.includeByTimestamp),
       isForPublic ? this.forPublic!.toBuffer() : this.forRollup!.toBuffer(),
     );
   }
@@ -289,9 +306,9 @@ export class PrivateKernelTailCircuitPublicInputs {
   static empty() {
     return new PrivateKernelTailCircuitPublicInputs(
       TxConstantData.empty(),
-      RollupValidationRequests.empty(),
       Gas.empty(),
       AztecAddress.ZERO,
+      0n,
       undefined,
       PartialPrivateTailPublicInputsForRollup.empty(),
     );
@@ -307,9 +324,9 @@ export class PrivateKernelTailCircuitPublicInputs {
     data.nullifiers[0] = Fr.random();
     return new PrivateKernelTailCircuitPublicInputs(
       TxConstantData.empty(),
-      RollupValidationRequests.empty(),
       Gas.empty(),
       AztecAddress.ZERO,
+      0n,
       undefined,
       new PartialPrivateTailPublicInputsForRollup(data),
     );

package/src/kernel/private_log_data.ts

@@ -10,7 +10,11 @@ import { PrivateLog } from '../logs/private_log.js';
 import type { UInt32 } from '../types/shared.js';
 
 export class PrivateLogData {
-  constructor(public log: PrivateLog, public noteHashCounter: UInt32, public counter: UInt32) {}
+  constructor(
+    public log: PrivateLog,
+    public noteHashCounter: UInt32,
+    public counter: UInt32,
+  ) {}
 
   static from(fields: FieldsOf<PrivateLogData>): PrivateLogData {
     return new PrivateLogData(...PrivateLogData.getFields(fields));
@@ -54,7 +58,7 @@ export class PrivateLogData {
 
   [inspect.custom]() {
     return `PrivateLogData {
-      log: ${this.log}
+      log: ${this.log.fields}
       noteHashCounter: ${this.noteHashCounter}
       counter: ${this.counter}
     }`;
@@ -62,7 +66,10 @@ export class PrivateLogData {
 }
 
 export class ScopedPrivateLogData {
-  constructor(public inner: PrivateLogData, public contractAddress: AztecAddress) {}
+  constructor(
+    public inner: PrivateLogData,
+    public contractAddress: AztecAddress,
+  ) {}
 
   static from(fields: FieldsOf<ScopedPrivateLogData>): ScopedPrivateLogData {
     return new ScopedPrivateLogData(...ScopedPrivateLogData.getFields(fields));
@@ -100,7 +107,9 @@ export class ScopedPrivateLogData {
 
   [inspect.custom]() {
     return `ScopedPrivateLogData {
-      inner: ${this.inner}
+      inner.counter: ${this.inner.counter}
+      inner.noteHashCounter: ${this.inner.noteHashCounter}
+      inner.log: ${this.inner.log.fields}
       contractAddress: ${this.contractAddress}
     }`;
   }

package/src/kernel/private_to_avm_accumulated_data.ts

@@ -22,6 +22,7 @@ import { z } from 'zod';
 
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 import type { UInt32 } from '../types/shared.js';
+import { countAccumulatedItems } from './utils/index.js';
 
 export class PrivateToAvmAccumulatedData {
   constructor(
@@ -55,6 +56,14 @@ export class PrivateToAvmAccumulatedData {
     );
   }
 
+  getArrayLengths() {
+    return new PrivateToAvmAccumulatedDataArrayLengths(
+      countAccumulatedItems(this.noteHashes),
+      countAccumulatedItems(this.nullifiers),
+      countAccumulatedItems(this.l2ToL1Msgs),
+    );
+  }
+
   static getFields(fields: FieldsOf<PrivateToAvmAccumulatedData>) {
     return [fields.noteHashes, fields.nullifiers, fields.l2ToL1Msgs] as const;
   }
@@ -122,7 +131,11 @@ export class PrivateToAvmAccumulatedData {
 }
 
 export class PrivateToAvmAccumulatedDataArrayLengths {
-  constructor(public noteHashes: UInt32, public nullifiers: UInt32, public l2ToL1Msgs: UInt32) {}
+  constructor(
+    public noteHashes: UInt32,
+    public nullifiers: UInt32,
+    public l2ToL1Msgs: UInt32,
+  ) {}
 
   static get schema() {
     return z
@@ -150,6 +163,10 @@ export class PrivateToAvmAccumulatedDataArrayLengths {
     return new this(reader.readU32(), reader.readU32(), reader.readU32());
   }
 
+  toFields() {
+    return [this.noteHashes, this.nullifiers, this.l2ToL1Msgs];
+  }
+
   static from(fields: FieldsOf<PrivateToAvmAccumulatedDataArrayLengths>) {
     return new PrivateToAvmAccumulatedDataArrayLengths(...PrivateToAvmAccumulatedDataArrayLengths.getFields(fields));
   }

package/src/kernel/private_to_public_kernel_circuit_public_inputs.ts

@@ -1,49 +1,50 @@
 import { GeneratorIndex, PRIVATE_TO_PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
 import type { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { bufferSchemaFor } from '@aztec/foundation/schemas';
+import { BufferReader, bigintToUInt64BE, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import type { FieldsOf } from '@aztec/foundation/types';
 
 import { AztecAddress } from '../aztec-address/index.js';
 import { Gas } from '../gas/gas.js';
 import { TxConstantData } from '../tx/tx_constant_data.js';
-import { RollupValidationRequests } from './hints/rollup_validation_requests.js';
+import type { UInt64 } from '../types/index.js';
 import { PrivateToPublicAccumulatedData } from './private_to_public_accumulated_data.js';
 import { PublicCallRequest } from './public_call_request.js';
 
 export class PrivateToPublicKernelCircuitPublicInputs {
   constructor(
     public constants: TxConstantData,
-    public rollupValidationRequests: RollupValidationRequests,
     public nonRevertibleAccumulatedData: PrivateToPublicAccumulatedData,
     public revertibleAccumulatedData: PrivateToPublicAccumulatedData,
     public publicTeardownCallRequest: PublicCallRequest,
     public gasUsed: Gas,
     public feePayer: AztecAddress,
+    public includeByTimestamp: UInt64,
   ) {}
 
   toBuffer() {
     return serializeToBuffer(
       this.constants,
-      this.rollupValidationRequests,
       this.nonRevertibleAccumulatedData,
       this.revertibleAccumulatedData,
       this.publicTeardownCallRequest,
       this.gasUsed,
       this.feePayer,
+      bigintToUInt64BE(this.includeByTimestamp),
     );
   }
 
   static getFields(fields: FieldsOf<PrivateToPublicKernelCircuitPublicInputs>) {
     return [
       fields.constants,
-      fields.rollupValidationRequests,
       fields.nonRevertibleAccumulatedData,
       fields.revertibleAccumulatedData,
       fields.publicTeardownCallRequest,
       fields.gasUsed,
       fields.feePayer,
+      fields.includeByTimestamp,
     ] as const;
   }
 
@@ -51,24 +52,24 @@ export class PrivateToPublicKernelCircuitPublicInputs {
     const reader = BufferReader.asReader(buffer);
     return new PrivateToPublicKernelCircuitPublicInputs(
       reader.readObject(TxConstantData),
-      reader.readObject(RollupValidationRequests),
       reader.readObject(PrivateToPublicAccumulatedData),
       reader.readObject(PrivateToPublicAccumulatedData),
       reader.readObject(PublicCallRequest),
       reader.readObject(Gas),
       reader.readObject(AztecAddress),
+      reader.readUInt64(),
     );
   }
 
   static empty() {
     return new PrivateToPublicKernelCircuitPublicInputs(
       TxConstantData.empty(),
-      RollupValidationRequests.empty(),
       PrivateToPublicAccumulatedData.empty(),
       PrivateToPublicAccumulatedData.empty(),
       PublicCallRequest.empty(),
       Gas.empty(),
       AztecAddress.ZERO,
+      0n,
     );
   }
 
@@ -93,4 +94,12 @@ export class PrivateToPublicKernelCircuitPublicInputs {
   hash() {
     return poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.PUBLIC_TX_HASH);
   }
+
+  toJSON() {
+    return this.toBuffer();
+  }
+
+  static get schema() {
+    return bufferSchemaFor(PrivateToPublicKernelCircuitPublicInputs);
+  }
 }

package/src/kernel/private_to_rollup_kernel_circuit_public_inputs.ts

@@ -2,14 +2,14 @@ import { GeneratorIndex, PRIVATE_TO_ROLLUP_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH }
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
 import type { Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
-import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { BufferReader, bigintToUInt64BE, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import type { FieldsOf } from '@aztec/foundation/types';
 
 import { AztecAddress } from '../aztec-address/index.js';
 import { Gas } from '../gas/gas.js';
 import { TxConstantData } from '../tx/tx_constant_data.js';
-import { RollupValidationRequests } from './hints/rollup_validation_requests.js';
+import type { UInt64 } from '../types/index.js';
 import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_data.js';
 
 /**
@@ -22,10 +22,6 @@ export class PrivateToRollupKernelCircuitPublicInputs {
      * Data which is not modified by the circuits.
      */
     public constants: TxConstantData,
-    /**
-     * Validation requests accumulated from private and public execution to be completed by the rollup.
-     */
-    public rollupValidationRequests: RollupValidationRequests,
     /**
      * Data accumulated from both public and private circuits.
      */
@@ -38,6 +34,10 @@ export class PrivateToRollupKernelCircuitPublicInputs {
      * The address of the fee payer for the transaction.
      */
     public feePayer: AztecAddress,
+    /**
+     * The timestamp by which the transaction must be included in a block.
+     */
+    public includeByTimestamp: UInt64,
   ) {}
 
   getNonEmptyNullifiers() {
@@ -45,7 +45,13 @@ export class PrivateToRollupKernelCircuitPublicInputs {
   }
 
   toBuffer() {
-    return serializeToBuffer(this.constants, this.rollupValidationRequests, this.end, this.gasUsed, this.feePayer);
+    return serializeToBuffer(
+      this.constants,
+      this.end,
+      this.gasUsed,
+      this.feePayer,
+      bigintToUInt64BE(this.includeByTimestamp),
+    );
   }
 
   /**
@@ -57,20 +63,20 @@ export class PrivateToRollupKernelCircuitPublicInputs {
     const reader = BufferReader.asReader(buffer);
     return new PrivateToRollupKernelCircuitPublicInputs(
       reader.readObject(TxConstantData),
-      reader.readObject(RollupValidationRequests),
       reader.readObject(PrivateToRollupAccumulatedData),
       reader.readObject(Gas),
       reader.readObject(AztecAddress),
+      reader.readUInt64(),
     );
   }
 
   static empty() {
     return new PrivateToRollupKernelCircuitPublicInputs(
       TxConstantData.empty(),
-      RollupValidationRequests.empty(),
       PrivateToRollupAccumulatedData.empty(),
       Gas.empty(),
       AztecAddress.ZERO,
+      0n,
     );
   }
 
@@ -88,7 +94,7 @@ export class PrivateToRollupKernelCircuitPublicInputs {
   }
 
   static getFields(fields: FieldsOf<PrivateToRollupKernelCircuitPublicInputs>) {
-    return [fields.constants, fields.rollupValidationRequests, fields.end, fields.gasUsed, fields.feePayer] as const;
+    return [fields.constants, fields.end, fields.gasUsed, fields.feePayer, fields.includeByTimestamp] as const;
   }
 
   /** Creates an instance from a hex string. */

package/src/kernel/private_validation_requests.ts

@@ -3,17 +3,14 @@ import {
   MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
   MAX_NULLIFIER_READ_REQUESTS_PER_TX,
 } from '@aztec/constants';
-import { makeTuple } from '@aztec/foundation/array';
-import { arraySerializedSizeOfNonEmpty } from '@aztec/foundation/collection';
-import type { Fr } from '@aztec/foundation/fields';
-import { BufferReader, FieldReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 
 import { inspect } from 'util';
 
 import { ScopedKeyValidationRequestAndGenerator } from '../kernel/hints/scoped_key_validation_request_and_generator.js';
+import { ClaimedLengthArray, ClaimedLengthArrayFromBuffer } from './claimed_length_array.js';
 import { ScopedReadRequest } from './hints/read_request.js';
-import { RollupValidationRequests } from './hints/rollup_validation_requests.js';
 import { OptionalNumber } from './utils/optional_number.js';
 
 /**
@@ -21,23 +18,18 @@ import { OptionalNumber } from './utils/optional_number.js';
  */
 export class PrivateValidationRequests {
   constructor(
-    /**
-     * Validation requests that cannot be fulfilled in the current context (private or public), and must be instead be
-     * forwarded to the rollup for it to take care of them.
-     */
-    public forRollup: RollupValidationRequests,
     /**
      * All the read requests made in this transaction.
      */
-    public noteHashReadRequests: Tuple<ScopedReadRequest, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX>,
+    public noteHashReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX>,
     /**
      * All the nullifier read requests made in this transaction.
      */
-    public nullifierReadRequests: Tuple<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
+    public nullifierReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
     /**
      * All the key validation requests made in this transaction.
      */
-    public scopedKeyValidationRequestsAndGenerators: Tuple<
+    public scopedKeyValidationRequestsAndGenerators: ClaimedLengthArray<
       ScopedKeyValidationRequestAndGenerator,
       typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX
     >,
@@ -51,17 +43,15 @@ export class PrivateValidationRequests {
 
   getSize() {
     return (
-      this.forRollup.getSize() +
-      arraySerializedSizeOfNonEmpty(this.noteHashReadRequests) +
-      arraySerializedSizeOfNonEmpty(this.nullifierReadRequests) +
-      arraySerializedSizeOfNonEmpty(this.scopedKeyValidationRequestsAndGenerators) +
+      this.noteHashReadRequests.getSize() +
+      this.nullifierReadRequests.getSize() +
+      this.scopedKeyValidationRequestsAndGenerators.getSize() +
       this.splitCounter.getSize()
     );
   }
 
   toBuffer() {
     return serializeToBuffer(
-      this.forRollup,
       this.noteHashReadRequests,
       this.nullifierReadRequests,
       this.scopedKeyValidationRequestsAndGenerators,
@@ -73,17 +63,6 @@ export class PrivateValidationRequests {
     return bufferToHex(this.toBuffer());
   }
 
-  static fromFields(fields: Fr[] | FieldReader) {
-    const reader = FieldReader.asReader(fields);
-    return new PrivateValidationRequests(
-      reader.readObject(RollupValidationRequests),
-      reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, ScopedReadRequest),
-      reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_TX, ScopedReadRequest),
-      reader.readArray(MAX_KEY_VALIDATION_REQUESTS_PER_TX, ScopedKeyValidationRequestAndGenerator),
-      reader.readObject(OptionalNumber),
-    );
-  }
-
   /**
    * Deserializes from a buffer or reader, corresponding to a write in cpp.
    * @param buffer - Buffer or reader to read from.
@@ -92,10 +71,11 @@ export class PrivateValidationRequests {
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
     return new PrivateValidationRequests(
-      reader.readObject(RollupValidationRequests),
-      reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, ScopedReadRequest),
-      reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_TX, ScopedReadRequest),
-      reader.readArray(MAX_KEY_VALIDATION_REQUESTS_PER_TX, ScopedKeyValidationRequestAndGenerator),
+      reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_TX)),
+      reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_TX)),
+      reader.readObject(
+        ClaimedLengthArrayFromBuffer(ScopedKeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_TX),
+      ),
       reader.readObject(OptionalNumber),
     );
   }
@@ -111,30 +91,19 @@ export class PrivateValidationRequests {
 
   static empty() {
     return new PrivateValidationRequests(
-      RollupValidationRequests.empty(),
-      makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, ScopedReadRequest.empty),
-      makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_TX, ScopedReadRequest.empty),
-      makeTuple(MAX_KEY_VALIDATION_REQUESTS_PER_TX, ScopedKeyValidationRequestAndGenerator.empty),
+      ClaimedLengthArray.empty(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_TX),
+      ClaimedLengthArray.empty(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_TX),
+      ClaimedLengthArray.empty(ScopedKeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_TX),
       OptionalNumber.empty(),
     );
   }
 
   [inspect.custom]() {
     return `PrivateValidationRequests {
-  forRollup: ${inspect(this.forRollup)},
-  noteHashReadRequests: [${this.noteHashReadRequests
-    .filter(x => !x.isEmpty())
-    .map(h => inspect(h))
-    .join(', ')}],
-  nullifierReadRequests: [${this.nullifierReadRequests
-    .filter(x => !x.isEmpty())
-    .map(h => inspect(h))
-    .join(', ')}],
-  scopedKeyValidationRequestsAndGenerators: [${this.scopedKeyValidationRequestsAndGenerators
-    .filter(x => !x.isEmpty())
-    .map(h => inspect(h))
-    .join(', ')}],
-  splitCounter: ${this.splitCounter}
+  noteHashReadRequests: ${inspect(this.noteHashReadRequests)},
+  nullifierReadRequests: ${inspect(this.nullifierReadRequests)},
+  scopedKeyValidationRequestsAndGenerators: ${inspect(this.scopedKeyValidationRequestsAndGenerators)},
+  splitCounter: ${this.splitCounter.getSize()}
   `;
   }
 }