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

package/dest/kernel/private_to_public_kernel_circuit_public_inputs.js

@@ -1,50 +1,50 @@
 import { GeneratorIndex, PRIVATE_TO_PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-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 { 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 { PrivateToPublicAccumulatedData } from './private_to_public_accumulated_data.js';
 import { PublicCallRequest } from './public_call_request.js';
 export class PrivateToPublicKernelCircuitPublicInputs {
     constants;
-    rollupValidationRequests;
     nonRevertibleAccumulatedData;
     revertibleAccumulatedData;
     publicTeardownCallRequest;
     gasUsed;
     feePayer;
-    constructor(constants, rollupValidationRequests, nonRevertibleAccumulatedData, revertibleAccumulatedData, publicTeardownCallRequest, gasUsed, feePayer){
+    includeByTimestamp;
+    constructor(constants, nonRevertibleAccumulatedData, revertibleAccumulatedData, publicTeardownCallRequest, gasUsed, feePayer, includeByTimestamp){
         this.constants = constants;
-        this.rollupValidationRequests = rollupValidationRequests;
         this.nonRevertibleAccumulatedData = nonRevertibleAccumulatedData;
         this.revertibleAccumulatedData = revertibleAccumulatedData;
         this.publicTeardownCallRequest = publicTeardownCallRequest;
         this.gasUsed = gasUsed;
         this.feePayer = feePayer;
+        this.includeByTimestamp = includeByTimestamp;
     }
     toBuffer() {
-        return serializeToBuffer(this.constants, this.rollupValidationRequests, this.nonRevertibleAccumulatedData, this.revertibleAccumulatedData, this.publicTeardownCallRequest, this.gasUsed, this.feePayer);
+        return serializeToBuffer(this.constants, this.nonRevertibleAccumulatedData, this.revertibleAccumulatedData, this.publicTeardownCallRequest, this.gasUsed, this.feePayer, bigintToUInt64BE(this.includeByTimestamp));
     }
     static getFields(fields) {
         return [
             fields.constants,
-            fields.rollupValidationRequests,
             fields.nonRevertibleAccumulatedData,
             fields.revertibleAccumulatedData,
             fields.publicTeardownCallRequest,
             fields.gasUsed,
-            fields.feePayer
+            fields.feePayer,
+            fields.includeByTimestamp
         ];
     }
     static fromBuffer(buffer) {
         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));
+        return new PrivateToPublicKernelCircuitPublicInputs(reader.readObject(TxConstantData), 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);
+        return new PrivateToPublicKernelCircuitPublicInputs(TxConstantData.empty(), PrivateToPublicAccumulatedData.empty(), PrivateToPublicAccumulatedData.empty(), PublicCallRequest.empty(), Gas.empty(), AztecAddress.ZERO, 0n);
     }
     static fromString(str) {
         return PrivateToPublicKernelCircuitPublicInputs.fromBuffer(hexToBuffer(str));
@@ -62,4 +62,10 @@ export class PrivateToPublicKernelCircuitPublicInputs {
     hash() {
         return poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.PUBLIC_TX_HASH);
     }
+    toJSON() {
+        return this.toBuffer();
+    }
+    static get schema() {
+        return bufferSchemaFor(PrivateToPublicKernelCircuitPublicInputs);
+    }
 }

package/dest/kernel/private_to_rollup_accumulated_data.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX } from '@aztec/constants';
 import { type FieldsOf } from '@aztec/foundation/array';
 import { Fr } from '@aztec/foundation/fields';
@@ -57,11 +54,11 @@ export declare class PrivateToRollupAccumulatedData {
      */
     contractClassLogsHashes: Tuple<ScopedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>);
     getSize(): number;
-    static getFields(fields: FieldsOf<PrivateToRollupAccumulatedData>): readonly [[Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [ScopedL2ToL1Message, ScopedL2ToL1Message, ScopedL2ToL1Message, ScopedL2ToL1Message, ScopedL2ToL1Message, ScopedL2ToL1Message, ScopedL2ToL1Message, ScopedL2ToL1Message], [PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog], [ScopedLogHash]];
+    static getFields(fields: FieldsOf<PrivateToRollupAccumulatedData>): readonly [[Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [ScopedL2ToL1Message, ScopedL2ToL1Message, ScopedL2ToL1Message, ScopedL2ToL1Message, ScopedL2ToL1Message, ScopedL2ToL1Message, ScopedL2ToL1Message, ScopedL2ToL1Message], [PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog, PrivateLog], [ScopedLogHash]];
     static from(fields: FieldsOf<PrivateToRollupAccumulatedData>): PrivateToRollupAccumulatedData;
     static get schema(): import("zod").ZodType<PrivateToRollupAccumulatedData, any, string>;
-    toJSON(): Buffer;
-    toBuffer(): Buffer;
+    toJSON(): Buffer<ArrayBufferLike>;
+    toBuffer(): Buffer<ArrayBufferLike>;
     toString(): `0x${string}`;
     /**
      * Deserializes from a buffer or reader, corresponding to a write in cpp.

package/dest/kernel/private_to_rollup_accumulated_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_to_rollup_accumulated_data.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_rollup_accumulated_data.ts"],"names":[],"mappings":";;;AAAA,OAAO,EACL,8BAA8B,EAC9B,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EAExB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAwC,MAAM,6BAA6B,CAAC;AAG7G,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;GAEG;AACH,qBAAa,8BAA8B;IAEvC;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,sBAAsB,CAAC;IAC3D;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC;IAC1D;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,wBAAwB,CAAC;IAC9E;;OAEG;IACI,WAAW,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,uBAAuB,CAAC;IACrE;;;OAGG;IACI,uBAAuB,EAAE,KAAK,CAAC,aAAa,EAAE,OAAO,8BAA8B,CAAC;;IApB3F;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,sBAAsB,CAAC;IAC3D;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC;IAC1D;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,wBAAwB,CAAC;IAC9E;;OAEG;IACI,WAAW,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,uBAAuB,CAAC;IACrE;;;OAGG;IACI,uBAAuB,EAAE,KAAK,CAAC,aAAa,EAAE,OAAO,8BAA8B,CAAC;IAG7F,OAAO;IAUP,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,8BAA8B,CAAC;IAUjE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,8BAA8B,CAAC,GAAG,8BAA8B;IAI7F,MAAM,KAAK,MAAM,uEAEhB;IAED,MAAM;IAIN,QAAQ;IAIR,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,8BAA8B;IAWhF;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,KAAK;IAUZ,QAAQ,IAAI,EAAE,EAAE;IAUhB,CAAC,OAAO,CAAC,MAAM,CAAC;CAwBjB"}
+{"version":3,"file":"private_to_rollup_accumulated_data.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_rollup_accumulated_data.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EAExB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAwC,MAAM,6BAA6B,CAAC;AAG7G,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;GAEG;AACH,qBAAa,8BAA8B;IAEvC;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,sBAAsB,CAAC;IAC3D;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC;IAC1D;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,wBAAwB,CAAC;IAC9E;;OAEG;IACI,WAAW,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,uBAAuB,CAAC;IACrE;;;OAGG;IACI,uBAAuB,EAAE,KAAK,CAAC,aAAa,EAAE,OAAO,8BAA8B,CAAC;;IApB3F;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,sBAAsB,CAAC;IAC3D;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC;IAC1D;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,wBAAwB,CAAC;IAC9E;;OAEG;IACI,WAAW,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,uBAAuB,CAAC;IACrE;;;OAGG;IACI,uBAAuB,EAAE,KAAK,CAAC,aAAa,EAAE,OAAO,8BAA8B,CAAC;IAG7F,OAAO;IAUP,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,8BAA8B,CAAC;IAUjE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,8BAA8B,CAAC,GAAG,8BAA8B;IAI7F,MAAM,KAAK,MAAM,uEAEhB;IAED,MAAM;IAIN,QAAQ;IAIR,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,8BAA8B;IAWhF;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,KAAK;IAUZ,QAAQ,IAAI,EAAE,EAAE;IAUhB,CAAC,OAAO,CAAC,MAAM,CAAC;CAwBjB"}

package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.d.ts

@@ -1,12 +1,10 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import type { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 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';
 /**
  * Outputs from the public kernel circuits.
@@ -17,10 +15,6 @@ export declare class PrivateToRollupKernelCircuitPublicInputs {
      * Data which is not modified by the circuits.
      */
     constants: TxConstantData;
-    /**
-     * Validation requests accumulated from private and public execution to be completed by the rollup.
-     */
-    rollupValidationRequests: RollupValidationRequests;
     /**
      * Data accumulated from both public and private circuits.
      */
@@ -33,15 +27,15 @@ export declare class PrivateToRollupKernelCircuitPublicInputs {
      * The address of the fee payer for the transaction.
      */
     feePayer: AztecAddress;
+    /**
+     * The timestamp by which the transaction must be included in a block.
+     */
+    includeByTimestamp: UInt64;
     constructor(
     /**
      * Data which is not modified by the circuits.
      */
     constants: TxConstantData, 
-    /**
-     * Validation requests accumulated from private and public execution to be completed by the rollup.
-     */
-    rollupValidationRequests: RollupValidationRequests, 
     /**
      * Data accumulated from both public and private circuits.
      */
@@ -53,9 +47,13 @@ export declare class PrivateToRollupKernelCircuitPublicInputs {
     /**
      * The address of the fee payer for the transaction.
      */
-    feePayer: AztecAddress);
+    feePayer: AztecAddress, 
+    /**
+     * The timestamp by which the transaction must be included in a block.
+     */
+    includeByTimestamp: UInt64);
     getNonEmptyNullifiers(): Fr[];
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     /**
      * Deserializes from a buffer or reader, corresponding to a write in cpp.
      * @param buffer - Buffer or reader to read from.
@@ -66,8 +64,8 @@ export declare class PrivateToRollupKernelCircuitPublicInputs {
     toString(): `0x${string}`;
     static fromString(str: string): PrivateToRollupKernelCircuitPublicInputs;
     /** Returns a hex representation for JSON serialization. */
-    toJSON(): Buffer;
-    static getFields(fields: FieldsOf<PrivateToRollupKernelCircuitPublicInputs>): readonly [TxConstantData, RollupValidationRequests, PrivateToRollupAccumulatedData, Gas, AztecAddress];
+    toJSON(): Buffer<ArrayBufferLike>;
+    static getFields(fields: FieldsOf<PrivateToRollupKernelCircuitPublicInputs>): readonly [TxConstantData, PrivateToRollupAccumulatedData, Gas, AztecAddress, bigint];
     /** Creates an instance from a hex string. */
     static get schema(): import("zod").ZodType<PrivateToRollupKernelCircuitPublicInputs, any, string>;
     toFields(): Fr[];

package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_to_rollup_kernel_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_rollup_kernel_circuit_public_inputs.ts"],"names":[],"mappings":";;AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAwC,MAAM,6BAA6B,CAAC;AAEjG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAEzF;;;GAGG;AACH,qBAAa,wCAAwC;IAEjD;;OAEG;IACI,SAAS,EAAE,cAAc;IAChC;;OAEG;IACI,wBAAwB,EAAE,wBAAwB;IACzD;;OAEG;IACI,GAAG,EAAE,8BAA8B;IAC1C;;OAEG;IACI,OAAO,EAAE,GAAG;IACnB;;OAEG;IACI,QAAQ,EAAE,YAAY;;IAnB7B;;OAEG;IACI,SAAS,EAAE,cAAc;IAChC;;OAEG;IACI,wBAAwB,EAAE,wBAAwB;IACzD;;OAEG;IACI,GAAG,EAAE,8BAA8B;IAC1C;;OAEG;IACI,OAAO,EAAE,GAAG;IACnB;;OAEG;IACI,QAAQ,EAAE,YAAY;IAG/B,qBAAqB;IAIrB,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,wCAAwC;IAW1F,MAAM,CAAC,KAAK;IAUZ,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,2DAA2D;IAC3D,MAAM;IAIN,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,wCAAwC,CAAC;IAI3E,6CAA6C;IAC7C,MAAM,KAAK,MAAM,iFAEhB;IAED,QAAQ,IAAI,EAAE,EAAE;IAUhB,IAAI;CAGL"}
+{"version":3,"file":"private_to_rollup_kernel_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_rollup_kernel_circuit_public_inputs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,YAAY,EAA0D,MAAM,6BAA6B,CAAC;AAEnH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAEzF;;;GAGG;AACH,qBAAa,wCAAwC;IAEjD;;OAEG;IACI,SAAS,EAAE,cAAc;IAChC;;OAEG;IACI,GAAG,EAAE,8BAA8B;IAC1C;;OAEG;IACI,OAAO,EAAE,GAAG;IACnB;;OAEG;IACI,QAAQ,EAAE,YAAY;IAC7B;;OAEG;IACI,kBAAkB,EAAE,MAAM;;IAnBjC;;OAEG;IACI,SAAS,EAAE,cAAc;IAChC;;OAEG;IACI,GAAG,EAAE,8BAA8B;IAC1C;;OAEG;IACI,OAAO,EAAE,GAAG;IACnB;;OAEG;IACI,QAAQ,EAAE,YAAY;IAC7B;;OAEG;IACI,kBAAkB,EAAE,MAAM;IAGnC,qBAAqB;IAIrB,QAAQ;IAUR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,wCAAwC;IAW1F,MAAM,CAAC,KAAK;IAUZ,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,2DAA2D;IAC3D,MAAM;IAIN,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,wCAAwC,CAAC;IAI3E,6CAA6C;IAC7C,MAAM,KAAK,MAAM,iFAEhB;IAED,QAAQ,IAAI,EAAE,EAAE;IAUhB,IAAI;CAGL"}

package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.js

@@ -1,44 +1,43 @@
 import { GeneratorIndex, PRIVATE_TO_ROLLUP_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
 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 { 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 { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_data.js';
 /**
  * Outputs from the public kernel circuits.
  * All Public kernels use this shape for outputs.
  */ export class PrivateToRollupKernelCircuitPublicInputs {
     constants;
-    rollupValidationRequests;
     end;
     gasUsed;
     feePayer;
+    includeByTimestamp;
     constructor(/**
      * Data which is not modified by the circuits.
      */ constants, /**
-     * Validation requests accumulated from private and public execution to be completed by the rollup.
-     */ rollupValidationRequests, /**
      * Data accumulated from both public and private circuits.
      */ end, /**
      * Gas used during this transaction
      */ gasUsed, /**
      * The address of the fee payer for the transaction.
-     */ feePayer){
+     */ feePayer, /**
+     * The timestamp by which the transaction must be included in a block.
+     */ includeByTimestamp){
         this.constants = constants;
-        this.rollupValidationRequests = rollupValidationRequests;
         this.end = end;
         this.gasUsed = gasUsed;
         this.feePayer = feePayer;
+        this.includeByTimestamp = includeByTimestamp;
     }
     getNonEmptyNullifiers() {
         return this.end.nullifiers.filter((n)=>!n.isZero());
     }
     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));
     }
     /**
    * Deserializes from a buffer or reader, corresponding to a write in cpp.
@@ -46,10 +45,10 @@ import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_
    * @returns A new instance of PrivateToRollupKernelCircuitPublicInputs.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateToRollupKernelCircuitPublicInputs(reader.readObject(TxConstantData), reader.readObject(RollupValidationRequests), reader.readObject(PrivateToRollupAccumulatedData), reader.readObject(Gas), reader.readObject(AztecAddress));
+        return new PrivateToRollupKernelCircuitPublicInputs(reader.readObject(TxConstantData), 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);
+        return new PrivateToRollupKernelCircuitPublicInputs(TxConstantData.empty(), PrivateToRollupAccumulatedData.empty(), Gas.empty(), AztecAddress.ZERO, 0n);
     }
     toString() {
         return bufferToHex(this.toBuffer());
@@ -63,10 +62,10 @@ import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_
     static getFields(fields) {
         return [
             fields.constants,
-            fields.rollupValidationRequests,
             fields.end,
             fields.gasUsed,
-            fields.feePayer
+            fields.feePayer,
+            fields.includeByTimestamp
         ];
     }
     /** Creates an instance from a hex string. */ static get schema() {

package/dest/kernel/private_validation_requests.d.ts

@@ -1,35 +1,26 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { MAX_KEY_VALIDATION_REQUESTS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX } from '@aztec/constants';
-import type { Fr } from '@aztec/foundation/fields';
-import { BufferReader, FieldReader, type Tuple } from '@aztec/foundation/serialize';
+import { BufferReader } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { ScopedKeyValidationRequestAndGenerator } from '../kernel/hints/scoped_key_validation_request_and_generator.js';
+import { ClaimedLengthArray } 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';
 /**
  * Validation requests accumulated during the execution of the transaction.
  */
 export declare class PrivateValidationRequests {
-    /**
-     * 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.
-     */
-    forRollup: RollupValidationRequests;
     /**
      * All the read requests made in this transaction.
      */
-    noteHashReadRequests: Tuple<ScopedReadRequest, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX>;
+    noteHashReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX>;
     /**
      * All the nullifier read requests made in this transaction.
      */
-    nullifierReadRequests: Tuple<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>;
+    nullifierReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>;
     /**
      * All the key validation requests made in this transaction.
      */
-    scopedKeyValidationRequestsAndGenerators: Tuple<ScopedKeyValidationRequestAndGenerator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX>;
+    scopedKeyValidationRequestsAndGenerators: ClaimedLengthArray<ScopedKeyValidationRequestAndGenerator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX>;
     /**
      * The counter to split the data for squashing.
      * A revertible nullifier and a non-revertible note hash will not be squashed.
@@ -37,23 +28,18 @@ export declare class PrivateValidationRequests {
      */
     splitCounter: OptionalNumber;
     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.
-     */
-    forRollup: RollupValidationRequests, 
     /**
      * All the read requests made in this transaction.
      */
-    noteHashReadRequests: Tuple<ScopedReadRequest, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX>, 
+    noteHashReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX>, 
     /**
      * All the nullifier read requests made in this transaction.
      */
-    nullifierReadRequests: Tuple<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, 
+    nullifierReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, 
     /**
      * All the key validation requests made in this transaction.
      */
-    scopedKeyValidationRequestsAndGenerators: Tuple<ScopedKeyValidationRequestAndGenerator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX>, 
+    scopedKeyValidationRequestsAndGenerators: ClaimedLengthArray<ScopedKeyValidationRequestAndGenerator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX>, 
     /**
      * The counter to split the data for squashing.
      * A revertible nullifier and a non-revertible note hash will not be squashed.
@@ -61,9 +47,8 @@ export declare class PrivateValidationRequests {
      */
     splitCounter: OptionalNumber);
     getSize(): number;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     toString(): `0x${string}`;
-    static fromFields(fields: Fr[] | FieldReader): PrivateValidationRequests;
     /**
      * Deserializes from a buffer or reader, corresponding to a write in cpp.
      * @param buffer - Buffer or reader to read from.

package/dest/kernel/private_validation_requests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_validation_requests.d.ts","sourceRoot":"","sources":["../../src/kernel/private_validation_requests.ts"],"names":[],"mappings":";;;AAAA,OAAO,EACL,kCAAkC,EAClC,kCAAkC,EAClC,kCAAkC,EACnC,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAGvG,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,sCAAsC,EAAE,MAAM,gEAAgE,CAAC;AACxH,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D;;GAEG;AACH,qBAAa,yBAAyB;IAElC;;;OAGG;IACI,SAAS,EAAE,wBAAwB;IAC1C;;OAEG;IACI,oBAAoB,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC;IAChG;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC;IACjG;;OAEG;IACI,wCAAwC,EAAE,KAAK,CACpD,sCAAsC,EACtC,OAAO,kCAAkC,CAC1C;IACD;;;;OAIG;IACI,YAAY,EAAE,cAAc;;IAzBnC;;;OAGG;IACI,SAAS,EAAE,wBAAwB;IAC1C;;OAEG;IACI,oBAAoB,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC;IAChG;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC;IACjG;;OAEG;IACI,wCAAwC,EAAE,KAAK,CACpD,sCAAsC,EACtC,OAAO,kCAAkC,CAC1C;IACD;;;;OAIG;IACI,YAAY,EAAE,cAAc;IAGrC,OAAO;IAUP,QAAQ;IAUR,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAW5C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAW/C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,KAAK;IAUZ,CAAC,OAAO,CAAC,MAAM,CAAC;CAkBjB"}
+{"version":3,"file":"private_validation_requests.d.ts","sourceRoot":"","sources":["../../src/kernel/private_validation_requests.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kCAAkC,EAClC,kCAAkC,EAClC,kCAAkC,EACnC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,sCAAsC,EAAE,MAAM,gEAAgE,CAAC;AACxH,OAAO,EAAE,kBAAkB,EAAgC,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D;;GAEG;AACH,qBAAa,yBAAyB;IAElC;;OAEG;IACI,oBAAoB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC;IAC7G;;OAEG;IACI,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC;IAC9G;;OAEG;IACI,wCAAwC,EAAE,kBAAkB,CACjE,sCAAsC,EACtC,OAAO,kCAAkC,CAC1C;IACD;;;;OAIG;IACI,YAAY,EAAE,cAAc;;IApBnC;;OAEG;IACI,oBAAoB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC;IAC7G;;OAEG;IACI,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC;IAC9G;;OAEG;IACI,wCAAwC,EAAE,kBAAkB,CACjE,sCAAsC,EACtC,OAAO,kCAAkC,CAC1C;IACD;;;;OAIG;IACI,YAAY,EAAE,cAAc;IAGrC,OAAO;IASP,QAAQ;IASR,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAY/C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,KAAK;IASZ,CAAC,OAAO,CAAC,MAAM,CAAC;CAQjB"}

package/dest/kernel/private_validation_requests.js

@@ -1,25 +1,19 @@
 import { MAX_KEY_VALIDATION_REQUESTS_PER_TX, 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 { BufferReader, FieldReader, 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';
 /**
  * Validation requests accumulated during the execution of the transaction.
  */ export class PrivateValidationRequests {
-    forRollup;
     noteHashReadRequests;
     nullifierReadRequests;
     scopedKeyValidationRequestsAndGenerators;
     splitCounter;
     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.
-     */ forRollup, /**
      * All the read requests made in this transaction.
      */ noteHashReadRequests, /**
      * All the nullifier read requests made in this transaction.
@@ -30,32 +24,27 @@ import { OptionalNumber } from './utils/optional_number.js';
      * A revertible nullifier and a non-revertible note hash will not be squashed.
      * It should be the "final" minRevertibleSideEffectCounter of a tx.
      */ splitCounter){
-        this.forRollup = forRollup;
         this.noteHashReadRequests = noteHashReadRequests;
         this.nullifierReadRequests = nullifierReadRequests;
         this.scopedKeyValidationRequestsAndGenerators = scopedKeyValidationRequestsAndGenerators;
         this.splitCounter = splitCounter;
     }
     getSize() {
-        return this.forRollup.getSize() + arraySerializedSizeOfNonEmpty(this.noteHashReadRequests) + arraySerializedSizeOfNonEmpty(this.nullifierReadRequests) + arraySerializedSizeOfNonEmpty(this.scopedKeyValidationRequestsAndGenerators) + this.splitCounter.getSize();
+        return this.noteHashReadRequests.getSize() + this.nullifierReadRequests.getSize() + this.scopedKeyValidationRequestsAndGenerators.getSize() + this.splitCounter.getSize();
     }
     toBuffer() {
-        return serializeToBuffer(this.forRollup, this.noteHashReadRequests, this.nullifierReadRequests, this.scopedKeyValidationRequestsAndGenerators, this.splitCounter);
+        return serializeToBuffer(this.noteHashReadRequests, this.nullifierReadRequests, this.scopedKeyValidationRequestsAndGenerators, this.splitCounter);
     }
     toString() {
         return bufferToHex(this.toBuffer());
     }
-    static fromFields(fields) {
-        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.
    * @returns Deserialized object.
    */ static fromBuffer(buffer) {
         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(OptionalNumber));
+        return new PrivateValidationRequests(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));
     }
     /**
    * Deserializes from a string, corresponding to a write in cpp.
@@ -65,15 +54,14 @@ import { OptionalNumber } from './utils/optional_number.js';
         return PrivateValidationRequests.fromBuffer(hexToBuffer(str));
     }
     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), OptionalNumber.empty());
+        return new PrivateValidationRequests(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()}
   `;
     }
 }

package/dest/kernel/public_call_request.d.ts

@@ -1,12 +1,8 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { inspect } from 'util';
 import { z } from 'zod';
-import { FunctionSelector } from '../abi/index.js';
 import { AztecAddress } from '../aztec-address/index.js';
 import type { UInt32 } from '../types/shared.js';
 /**
@@ -21,15 +17,14 @@ export declare class PublicCallRequest {
      * The contract address being called.
      */
     contractAddress: AztecAddress;
-    /**
-     * Function selector of the function being called.
-     */
-    functionSelector: FunctionSelector;
     /**
      * Determines whether the call is modifying state.
      */
     isStaticCall: boolean;
-    argsHash: Fr;
+    /**
+     * Hash of the calldata of the function being called.
+     */
+    calldataHash: Fr;
     constructor(
     /**
      * Address of the account which represents the entity who invoked the call.
@@ -40,48 +35,99 @@ export declare class PublicCallRequest {
      */
     contractAddress: AztecAddress, 
     /**
-     * Function selector of the function being called.
+     * Determines whether the call is modifying state.
      */
-    functionSelector: FunctionSelector, 
+    isStaticCall: boolean, 
     /**
-     * Determines whether the call is modifying state.
+     * Hash of the calldata of the function being called.
      */
-    isStaticCall: boolean, argsHash: Fr);
+    calldataHash: Fr);
     static get schema(): z.ZodEffects<z.ZodObject<{
         msgSender: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
         contractAddress: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
-        functionSelector: import("@aztec/foundation/schemas").ZodFor<FunctionSelector>;
         isStaticCall: z.ZodBoolean;
-        argsHash: z.ZodType<Fr, any, string>;
+        calldataHash: z.ZodType<Fr, any, string>;
     }, "strip", z.ZodTypeAny, {
         contractAddress: AztecAddress;
         msgSender: AztecAddress;
-        functionSelector: FunctionSelector;
         isStaticCall: boolean;
-        argsHash: Fr;
+        calldataHash: Fr;
     }, {
         isStaticCall: boolean;
-        argsHash: string;
+        calldataHash: string;
         contractAddress?: any;
         msgSender?: any;
-        functionSelector?: any;
     }>, PublicCallRequest, {
         isStaticCall: boolean;
-        argsHash: string;
+        calldataHash: string;
         contractAddress?: any;
         msgSender?: any;
-        functionSelector?: any;
     }>;
     getSize(): number;
     static from(fields: FieldsOf<PublicCallRequest>): PublicCallRequest;
-    static getFields(fields: FieldsOf<PublicCallRequest>): readonly [AztecAddress, AztecAddress, FunctionSelector, boolean, Fr];
+    static getFields(fields: FieldsOf<PublicCallRequest>): readonly [AztecAddress, AztecAddress, boolean, Fr];
     static fromFields(fields: Fr[] | FieldReader): PublicCallRequest;
     toFields(): Fr[];
     static fromBuffer(buffer: Buffer | BufferReader): PublicCallRequest;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     static empty(): PublicCallRequest;
     isEmpty(): boolean;
     [inspect.custom](): string;
+    static fromCalldata(msgSender: AztecAddress, contractAddress: AztecAddress, isStaticCall: boolean, calldata: Fr[]): Promise<PublicCallRequest>;
+}
+/**
+ * Represents lengths of arrays of public call requests.
+ */
+export declare class PublicCallRequestArrayLengths {
+    /**
+     * Number of setup call requests
+     */
+    setupCalls: number;
+    /**
+     * Number of app logic call requests
+     */
+    appLogicCalls: number;
+    /**
+     * Whether there is a teardown call request
+     */
+    teardownCall: boolean;
+    constructor(
+    /**
+     * Number of setup call requests
+     */
+    setupCalls: number, 
+    /**
+     * Number of app logic call requests
+     */
+    appLogicCalls: number, 
+    /**
+     * Whether there is a teardown call request
+     */
+    teardownCall: boolean);
+    static get schema(): z.ZodEffects<z.ZodObject<{
+        setupCalls: z.ZodNumber;
+        appLogicCalls: z.ZodNumber;
+        teardownCall: z.ZodBoolean;
+    }, "strip", z.ZodTypeAny, {
+        setupCalls: number;
+        appLogicCalls: number;
+        teardownCall: boolean;
+    }, {
+        setupCalls: number;
+        appLogicCalls: number;
+        teardownCall: boolean;
+    }>, PublicCallRequestArrayLengths, {
+        setupCalls: number;
+        appLogicCalls: number;
+        teardownCall: boolean;
+    }>;
+    static getFields(fields: FieldsOf<PublicCallRequestArrayLengths>): readonly [number, number, boolean];
+    static fromFields(fields: Fr[] | FieldReader): PublicCallRequestArrayLengths;
+    toFields(): Fr[];
+    static fromBuffer(buffer: Buffer | BufferReader): PublicCallRequestArrayLengths;
+    toBuffer(): Buffer<ArrayBufferLike>;
+    static empty(): PublicCallRequestArrayLengths;
+    [inspect.custom](): string;
 }
 export declare class CountedPublicCallRequest {
     inner: PublicCallRequest;
@@ -92,7 +138,7 @@ export declare class CountedPublicCallRequest {
     static fromFields(fields: Fr[] | FieldReader): CountedPublicCallRequest;
     toFields(): Fr[];
     static fromBuffer(buffer: Buffer | BufferReader): CountedPublicCallRequest;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     static empty(): CountedPublicCallRequest;
     isEmpty(): boolean;
 }

package/dest/kernel/public_call_request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_call_request.d.ts","sourceRoot":"","sources":["../../src/kernel/public_call_request.ts"],"names":[],"mappings":";;;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;GAEG;AACH,qBAAa,iBAAiB;IAE1B;;OAEG;IACI,SAAS,EAAE,YAAY;IAC9B;;OAEG;IACI,eAAe,EAAE,YAAY;IACpC;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;OAEG;IACI,YAAY,EAAE,OAAO;IACrB,QAAQ,EAAE,EAAE;;IAhBnB;;OAEG;IACI,SAAS,EAAE,YAAY;IAC9B;;OAEG;IACI,eAAe,EAAE,YAAY;IACpC;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;OAEG;IACI,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,EAAE;IAGrB,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;OAYhB;IAED,OAAO;IAIP,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,iBAAiB;IAInE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC;IAUpD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,iBAAiB;IAWhE,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAW/C,QAAQ;IAIR,MAAM,CAAC,KAAK;IAIZ,OAAO,IAAI,OAAO;IAUlB,CAAC,OAAO,CAAC,MAAM,CAAC;CASjB;AAED,qBAAa,wBAAwB;IAChB,KAAK,EAAE,iBAAiB;IAAS,OAAO,EAAE,MAAM;gBAAhD,KAAK,EAAE,iBAAiB,EAAS,OAAO,EAAE,MAAM;IAEnE,OAAO;IAIP,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,wBAAwB,CAAC;IAI3D,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAK5C,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,QAAQ;IAIR,MAAM,CAAC,KAAK;IAIZ,OAAO,IAAI,OAAO;CAGnB"}
+{"version":3,"file":"public_call_request.d.ts","sourceRoot":"","sources":["../../src/kernel/public_call_request.ts"],"names":[],"mappings":"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"}