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

package/dest/kernel/private_call_request.js

@@ -54,6 +54,6 @@ export class PrivateCallRequest {
         return callRequest.callContext.equals(this.callContext) && callRequest.argsHash.equals(this.argsHash) && callRequest.returnsHash.equals(this.returnsHash) && callRequest.startSideEffectCounter === this.startSideEffectCounter && callRequest.endSideEffectCounter === this.endSideEffectCounter;
     }
     toString() {
-        return `PrivateCallRequest(callContext: ${this.callContext}, argsHash: ${this.argsHash}, returnsHash: ${this.returnsHash}, startSideEffectCounter: ${this.startSideEffectCounter}, endSideEffectCounter: ${this.endSideEffectCounter})`;
+        return `PrivateCallRequest(contractAddress: ${this.callContext.contractAddress}, selector: ${this.callContext.functionSelector}, msgSender: ${this.callContext.msgSender}, isStatic: ${this.callContext.isEmpty},  argsHash: ${this.argsHash}, returnsHash: ${this.returnsHash}, startSideEffectCounter: ${this.startSideEffectCounter}, endSideEffectCounter: ${this.endSideEffectCounter})`;
     }
 }

package/dest/kernel/private_circuit_public_inputs.d.ts

@@ -1,18 +1,17 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { MAX_CONTRACT_CLASS_LOGS_PER_CALL, MAX_ENQUEUED_CALLS_PER_CALL, MAX_KEY_VALIDATION_REQUESTS_PER_CALL, MAX_L2_TO_L1_MSGS_PER_CALL, MAX_NOTE_HASHES_PER_CALL, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NULLIFIERS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PRIVATE_LOGS_PER_CALL } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, FieldReader, type Tuple } from '@aztec/foundation/serialize';
+import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { KeyValidationRequestAndGenerator } from '../kernel/hints/key_validation_request_and_generator.js';
-import { LogHash } from '../kernel/log_hash.js';
+import { CountedLogHash } from '../kernel/log_hash.js';
 import { PrivateCallRequest } from '../kernel/private_call_request.js';
 import { PrivateLogData } from '../kernel/private_log_data.js';
-import { L2ToL1Message } from '../messaging/l2_to_l1_message.js';
+import { CountedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 import { BlockHeader } from '../tx/block_header.js';
 import { CallContext } from '../tx/call_context.js';
-import { MaxBlockNumber } from '../tx/max_block_number.js';
 import { TxContext } from '../tx/tx_context.js';
+import type { UInt64 } from '../types/shared.js';
+import { ClaimedLengthArray } from './claimed_length_array.js';
 import { ReadRequest } from './hints/read_request.js';
 import { NoteHash } from './note_hash.js';
 import { Nullifier } from './nullifier.js';
@@ -42,37 +41,37 @@ export declare class PrivateCircuitPublicInputs {
      */
     isFeePayer: boolean;
     /**
-     * The maximum block number in which this transaction can be included and be valid.
+     * The highest timestamp of a block in which the transaction can still be included.
      */
-    maxBlockNumber: MaxBlockNumber;
+    includeByTimestamp: UInt64;
     /**
      * Read requests created by the corresponding function call.
      */
-    noteHashReadRequests: Tuple<ReadRequest, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>;
+    noteHashReadRequests: ClaimedLengthArray<ReadRequest, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>;
     /**
      * Nullifier read requests created by the corresponding function call.
      */
-    nullifierReadRequests: Tuple<ReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_CALL>;
+    nullifierReadRequests: ClaimedLengthArray<ReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_CALL>;
     /**
      * Key validation requests and generators created by the corresponding function call.
      */
-    keyValidationRequestsAndGenerators: Tuple<KeyValidationRequestAndGenerator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_CALL>;
+    keyValidationRequestsAndGenerators: ClaimedLengthArray<KeyValidationRequestAndGenerator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_CALL>;
     /**
      * New note hashes created by the corresponding function call.
      */
-    noteHashes: Tuple<NoteHash, typeof MAX_NOTE_HASHES_PER_CALL>;
+    noteHashes: ClaimedLengthArray<NoteHash, typeof MAX_NOTE_HASHES_PER_CALL>;
     /**
      * New nullifiers created by the corresponding function call.
      */
-    nullifiers: Tuple<Nullifier, typeof MAX_NULLIFIERS_PER_CALL>;
+    nullifiers: ClaimedLengthArray<Nullifier, typeof MAX_NULLIFIERS_PER_CALL>;
     /**
      * Private call requests made within the current kernel iteration.
      */
-    privateCallRequests: Tuple<PrivateCallRequest, typeof MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL>;
+    privateCallRequests: ClaimedLengthArray<PrivateCallRequest, typeof MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL>;
     /**
      * Public call stack at the current kernel iteration.
      */
-    publicCallRequests: Tuple<CountedPublicCallRequest, typeof MAX_ENQUEUED_CALLS_PER_CALL>;
+    publicCallRequests: ClaimedLengthArray<CountedPublicCallRequest, typeof MAX_ENQUEUED_CALLS_PER_CALL>;
     /**
      * Hash of the public teardown function.
      */
@@ -80,15 +79,15 @@ export declare class PrivateCircuitPublicInputs {
     /**
      * New L2 to L1 messages created by the corresponding function call.
      */
-    l2ToL1Msgs: Tuple<L2ToL1Message, typeof MAX_L2_TO_L1_MSGS_PER_CALL>;
+    l2ToL1Msgs: ClaimedLengthArray<CountedL2ToL1Message, typeof MAX_L2_TO_L1_MSGS_PER_CALL>;
     /**
      * Logs emitted in this function call.
      */
-    privateLogs: Tuple<PrivateLogData, typeof MAX_PRIVATE_LOGS_PER_CALL>;
+    privateLogs: ClaimedLengthArray<PrivateLogData, typeof MAX_PRIVATE_LOGS_PER_CALL>;
     /**
      * Hash of the contract class logs emitted in this function call.
      */
-    contractClassLogsHashes: Tuple<LogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_CALL>;
+    contractClassLogsHashes: ClaimedLengthArray<CountedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_CALL>;
     /**
      * The side effect counter at the start of this call.
      */
@@ -100,11 +99,11 @@ export declare class PrivateCircuitPublicInputs {
     /**
      * Header of a block whose state is used during private execution (not the block the transaction is included in).
      */
-    historicalHeader: BlockHeader;
+    anchorBlockHeader: BlockHeader;
     /**
      * Transaction context.
      *
-     * Note: The chainId and version in the txContext are not redundant to the values in self.historical_header.global_variables because
+     * Note: The chainId and version in the txContext are not redundant to the values in self.anchor_block_header.global_variables because
      * they can be different in case of a protocol upgrade. In such a situation we could be using header from a block
      * before the upgrade took place but be using the updated protocol to execute and prove the transaction.
      */
@@ -131,37 +130,37 @@ export declare class PrivateCircuitPublicInputs {
      */
     isFeePayer: boolean, 
     /**
-     * The maximum block number in which this transaction can be included and be valid.
+     * The highest timestamp of a block in which the transaction can still be included.
      */
-    maxBlockNumber: MaxBlockNumber, 
+    includeByTimestamp: UInt64, 
     /**
      * Read requests created by the corresponding function call.
      */
-    noteHashReadRequests: Tuple<ReadRequest, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>, 
+    noteHashReadRequests: ClaimedLengthArray<ReadRequest, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>, 
     /**
      * Nullifier read requests created by the corresponding function call.
      */
-    nullifierReadRequests: Tuple<ReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_CALL>, 
+    nullifierReadRequests: ClaimedLengthArray<ReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_CALL>, 
     /**
      * Key validation requests and generators created by the corresponding function call.
      */
-    keyValidationRequestsAndGenerators: Tuple<KeyValidationRequestAndGenerator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_CALL>, 
+    keyValidationRequestsAndGenerators: ClaimedLengthArray<KeyValidationRequestAndGenerator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_CALL>, 
     /**
      * New note hashes created by the corresponding function call.
      */
-    noteHashes: Tuple<NoteHash, typeof MAX_NOTE_HASHES_PER_CALL>, 
+    noteHashes: ClaimedLengthArray<NoteHash, typeof MAX_NOTE_HASHES_PER_CALL>, 
     /**
      * New nullifiers created by the corresponding function call.
      */
-    nullifiers: Tuple<Nullifier, typeof MAX_NULLIFIERS_PER_CALL>, 
+    nullifiers: ClaimedLengthArray<Nullifier, typeof MAX_NULLIFIERS_PER_CALL>, 
     /**
      * Private call requests made within the current kernel iteration.
      */
-    privateCallRequests: Tuple<PrivateCallRequest, typeof MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL>, 
+    privateCallRequests: ClaimedLengthArray<PrivateCallRequest, typeof MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL>, 
     /**
      * Public call stack at the current kernel iteration.
      */
-    publicCallRequests: Tuple<CountedPublicCallRequest, typeof MAX_ENQUEUED_CALLS_PER_CALL>, 
+    publicCallRequests: ClaimedLengthArray<CountedPublicCallRequest, typeof MAX_ENQUEUED_CALLS_PER_CALL>, 
     /**
      * Hash of the public teardown function.
      */
@@ -169,15 +168,15 @@ export declare class PrivateCircuitPublicInputs {
     /**
      * New L2 to L1 messages created by the corresponding function call.
      */
-    l2ToL1Msgs: Tuple<L2ToL1Message, typeof MAX_L2_TO_L1_MSGS_PER_CALL>, 
+    l2ToL1Msgs: ClaimedLengthArray<CountedL2ToL1Message, typeof MAX_L2_TO_L1_MSGS_PER_CALL>, 
     /**
      * Logs emitted in this function call.
      */
-    privateLogs: Tuple<PrivateLogData, typeof MAX_PRIVATE_LOGS_PER_CALL>, 
+    privateLogs: ClaimedLengthArray<PrivateLogData, typeof MAX_PRIVATE_LOGS_PER_CALL>, 
     /**
      * Hash of the contract class logs emitted in this function call.
      */
-    contractClassLogsHashes: Tuple<LogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_CALL>, 
+    contractClassLogsHashes: ClaimedLengthArray<CountedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_CALL>, 
     /**
      * The side effect counter at the start of this call.
      */
@@ -189,11 +188,11 @@ export declare class PrivateCircuitPublicInputs {
     /**
      * Header of a block whose state is used during private execution (not the block the transaction is included in).
      */
-    historicalHeader: BlockHeader, 
+    anchorBlockHeader: BlockHeader, 
     /**
      * Transaction context.
      *
-     * Note: The chainId and version in the txContext are not redundant to the values in self.historical_header.global_variables because
+     * Note: The chainId and version in the txContext are not redundant to the values in self.anchor_block_header.global_variables because
      * they can be different in case of a protocol upgrade. In such a situation we could be using header from a block
      * before the upgrade took place but be using the updated protocol to execute and prove the transaction.
      */
@@ -222,7 +221,7 @@ export declare class PrivateCircuitPublicInputs {
      * @param fields - Object with fields.
      * @returns The array.
      */
-    static getFields(fields: FieldsOf<PrivateCircuitPublicInputs>): readonly [CallContext, Fr, Fr, Fr, boolean, MaxBlockNumber, [ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest], [ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest], [KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator], [NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash], [Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier], [PrivateCallRequest, PrivateCallRequest, PrivateCallRequest, PrivateCallRequest, PrivateCallRequest], [CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest], PublicCallRequest, [L2ToL1Message, L2ToL1Message], [PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData], [LogHash], Fr, Fr, BlockHeader, TxContext];
+    static getFields(fields: FieldsOf<PrivateCircuitPublicInputs>): readonly [CallContext, Fr, Fr, Fr, boolean, bigint, ClaimedLengthArray<ReadRequest, 16>, ClaimedLengthArray<ReadRequest, 16>, ClaimedLengthArray<KeyValidationRequestAndGenerator, 16>, ClaimedLengthArray<NoteHash, 16>, ClaimedLengthArray<Nullifier, 16>, ClaimedLengthArray<PrivateCallRequest, 8>, ClaimedLengthArray<CountedPublicCallRequest, 32>, PublicCallRequest, ClaimedLengthArray<CountedL2ToL1Message, 8>, ClaimedLengthArray<PrivateLogData, 16>, ClaimedLengthArray<CountedLogHash, 1>, Fr, Fr, BlockHeader, TxContext];
     /**
      * Serialize this as a buffer.
      * @returns The buffer.
@@ -232,7 +231,7 @@ export declare class PrivateCircuitPublicInputs {
      * Serialize this as a field array.
      */
     toFields(): Fr[];
-    toJSON(): Buffer;
+    toJSON(): Buffer<ArrayBufferLike>;
     static get schema(): import("zod").ZodType<PrivateCircuitPublicInputs, any, string>;
 }
 //# sourceMappingURL=private_circuit_public_inputs.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"private_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_circuit_public_inputs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"private_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_circuit_public_inputs.ts"],"names":[],"mappings":"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"}

package/dest/kernel/private_circuit_public_inputs.js

@@ -1,22 +1,20 @@
-import { MAX_CONTRACT_CLASS_LOGS_PER_CALL, MAX_ENQUEUED_CALLS_PER_CALL, MAX_KEY_VALIDATION_REQUESTS_PER_CALL, MAX_L2_TO_L1_MSGS_PER_CALL, MAX_NOTE_HASHES_PER_CALL, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NULLIFIERS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PRIVATE_LOGS_PER_CALL, PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants';
-import { makeTuple } from '@aztec/foundation/array';
+import { MAX_CONTRACT_CLASS_LOGS_PER_CALL, MAX_ENQUEUED_CALLS_PER_CALL, MAX_KEY_VALIDATION_REQUESTS_PER_CALL, MAX_L2_TO_L1_MSGS_PER_CALL, MAX_NOTE_HASHES_PER_CALL, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NULLIFIERS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PRIVATE_LOGS_PER_CALL } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { BufferReader, FieldReader, bigintToUInt64BE, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { KeyValidationRequestAndGenerator } from '../kernel/hints/key_validation_request_and_generator.js';
-import { LogHash } from '../kernel/log_hash.js';
+import { CountedLogHash } from '../kernel/log_hash.js';
 import { PrivateCallRequest } from '../kernel/private_call_request.js';
 import { PrivateLogData } from '../kernel/private_log_data.js';
-import { L2ToL1Message } from '../messaging/l2_to_l1_message.js';
+import { CountedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 import { BlockHeader } from '../tx/block_header.js';
 import { CallContext } from '../tx/call_context.js';
-import { MaxBlockNumber } from '../tx/max_block_number.js';
 import { TxContext } from '../tx/tx_context.js';
+import { ClaimedLengthArray, ClaimedLengthArrayFromBuffer, ClaimedLengthArrayFromFields } from './claimed_length_array.js';
 import { ReadRequest } from './hints/read_request.js';
 import { NoteHash } from './note_hash.js';
 import { Nullifier } from './nullifier.js';
 import { CountedPublicCallRequest, PublicCallRequest } from './public_call_request.js';
-import { isEmptyArray } from './utils/order_and_comparison.js';
 /**
  * Public inputs to a private circuit.
  */ export class PrivateCircuitPublicInputs {
@@ -25,7 +23,7 @@ import { isEmptyArray } from './utils/order_and_comparison.js';
     returnsHash;
     minRevertibleSideEffectCounter;
     isFeePayer;
-    maxBlockNumber;
+    includeByTimestamp;
     noteHashReadRequests;
     nullifierReadRequests;
     keyValidationRequestsAndGenerators;
@@ -39,7 +37,7 @@ import { isEmptyArray } from './utils/order_and_comparison.js';
     contractClassLogsHashes;
     startSideEffectCounter;
     endSideEffectCounter;
-    historicalHeader;
+    anchorBlockHeader;
     txContext;
     constructor(/**
      * Context of the call corresponding to this private circuit execution.
@@ -52,8 +50,8 @@ import { isEmptyArray } from './utils/order_and_comparison.js';
      */ minRevertibleSideEffectCounter, /**
      * Whether the caller of the function is the fee payer.
      */ isFeePayer, /**
-     * The maximum block number in which this transaction can be included and be valid.
-     */ maxBlockNumber, /**
+     * The highest timestamp of a block in which the transaction can still be included.
+     */ includeByTimestamp, /**
      * Read requests created by the corresponding function call.
      */ noteHashReadRequests, /**
      * Nullifier read requests created by the corresponding function call.
@@ -81,10 +79,10 @@ import { isEmptyArray } from './utils/order_and_comparison.js';
      * The end side effect counter for this call.
      */ endSideEffectCounter, /**
      * Header of a block whose state is used during private execution (not the block the transaction is included in).
-     */ historicalHeader, /**
+     */ anchorBlockHeader, /**
      * Transaction context.
      *
-     * Note: The chainId and version in the txContext are not redundant to the values in self.historical_header.global_variables because
+     * Note: The chainId and version in the txContext are not redundant to the values in self.anchor_block_header.global_variables because
      * they can be different in case of a protocol upgrade. In such a situation we could be using header from a block
      * before the upgrade took place but be using the updated protocol to execute and prove the transaction.
      */ txContext){
@@ -93,7 +91,7 @@ import { isEmptyArray } from './utils/order_and_comparison.js';
         this.returnsHash = returnsHash;
         this.minRevertibleSideEffectCounter = minRevertibleSideEffectCounter;
         this.isFeePayer = isFeePayer;
-        this.maxBlockNumber = maxBlockNumber;
+        this.includeByTimestamp = includeByTimestamp;
         this.noteHashReadRequests = noteHashReadRequests;
         this.nullifierReadRequests = nullifierReadRequests;
         this.keyValidationRequestsAndGenerators = keyValidationRequestsAndGenerators;
@@ -107,7 +105,7 @@ import { isEmptyArray } from './utils/order_and_comparison.js';
         this.contractClassLogsHashes = contractClassLogsHashes;
         this.startSideEffectCounter = startSideEffectCounter;
         this.endSideEffectCounter = endSideEffectCounter;
-        this.historicalHeader = historicalHeader;
+        this.anchorBlockHeader = anchorBlockHeader;
         this.txContext = txContext;
     }
     /**
@@ -123,20 +121,20 @@ import { isEmptyArray } from './utils/order_and_comparison.js';
    * @returns The deserialized instance.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateCircuitPublicInputs(reader.readObject(CallContext), reader.readObject(Fr), reader.readObject(Fr), reader.readObject(Fr), reader.readBoolean(), reader.readObject(MaxBlockNumber), reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, ReadRequest), reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest), reader.readArray(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, KeyValidationRequestAndGenerator), reader.readArray(MAX_NOTE_HASHES_PER_CALL, NoteHash), reader.readArray(MAX_NULLIFIERS_PER_CALL, Nullifier), reader.readArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, PrivateCallRequest), reader.readArray(MAX_ENQUEUED_CALLS_PER_CALL, CountedPublicCallRequest), reader.readObject(PublicCallRequest), reader.readArray(MAX_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message), reader.readArray(MAX_PRIVATE_LOGS_PER_CALL, PrivateLogData), reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_CALL, LogHash), reader.readObject(Fr), reader.readObject(Fr), reader.readObject(BlockHeader), reader.readObject(TxContext));
+        return new PrivateCircuitPublicInputs(reader.readObject(CallContext), reader.readObject(Fr), reader.readObject(Fr), reader.readObject(Fr), reader.readBoolean(), reader.readUInt64(), reader.readObject(ClaimedLengthArrayFromBuffer(ReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL)), reader.readObject(ClaimedLengthArrayFromBuffer(ReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL)), reader.readObject(ClaimedLengthArrayFromBuffer(KeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_CALL)), reader.readObject(ClaimedLengthArrayFromBuffer(NoteHash, MAX_NOTE_HASHES_PER_CALL)), reader.readObject(ClaimedLengthArrayFromBuffer(Nullifier, MAX_NULLIFIERS_PER_CALL)), reader.readObject(ClaimedLengthArrayFromBuffer(PrivateCallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL)), reader.readObject(ClaimedLengthArrayFromBuffer(CountedPublicCallRequest, MAX_ENQUEUED_CALLS_PER_CALL)), reader.readObject(PublicCallRequest), reader.readObject(ClaimedLengthArrayFromBuffer(CountedL2ToL1Message, MAX_L2_TO_L1_MSGS_PER_CALL)), reader.readObject(ClaimedLengthArrayFromBuffer(PrivateLogData, MAX_PRIVATE_LOGS_PER_CALL)), reader.readObject(ClaimedLengthArrayFromBuffer(CountedLogHash, MAX_CONTRACT_CLASS_LOGS_PER_CALL)), reader.readObject(Fr), reader.readObject(Fr), reader.readObject(BlockHeader), reader.readObject(TxContext));
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new PrivateCircuitPublicInputs(reader.readObject(CallContext), reader.readField(), reader.readField(), reader.readField(), reader.readBoolean(), reader.readObject(MaxBlockNumber), reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, ReadRequest), reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest), reader.readArray(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, KeyValidationRequestAndGenerator), reader.readArray(MAX_NOTE_HASHES_PER_CALL, NoteHash), reader.readArray(MAX_NULLIFIERS_PER_CALL, Nullifier), reader.readArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, PrivateCallRequest), reader.readArray(MAX_ENQUEUED_CALLS_PER_CALL, CountedPublicCallRequest), reader.readObject(PublicCallRequest), reader.readArray(MAX_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message), reader.readArray(MAX_PRIVATE_LOGS_PER_CALL, PrivateLogData), reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_CALL, LogHash), reader.readField(), reader.readField(), reader.readObject(BlockHeader), reader.readObject(TxContext));
+        return new PrivateCircuitPublicInputs(reader.readObject(CallContext), reader.readField(), reader.readField(), reader.readField(), reader.readBoolean(), reader.readU64(), reader.readObject(ClaimedLengthArrayFromFields(ReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL)), reader.readObject(ClaimedLengthArrayFromFields(ReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL)), reader.readObject(ClaimedLengthArrayFromFields(KeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_CALL)), reader.readObject(ClaimedLengthArrayFromFields(NoteHash, MAX_NOTE_HASHES_PER_CALL)), reader.readObject(ClaimedLengthArrayFromFields(Nullifier, MAX_NULLIFIERS_PER_CALL)), reader.readObject(ClaimedLengthArrayFromFields(PrivateCallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL)), reader.readObject(ClaimedLengthArrayFromFields(CountedPublicCallRequest, MAX_ENQUEUED_CALLS_PER_CALL)), reader.readObject(PublicCallRequest), reader.readObject(ClaimedLengthArrayFromFields(CountedL2ToL1Message, MAX_L2_TO_L1_MSGS_PER_CALL)), reader.readObject(ClaimedLengthArrayFromFields(PrivateLogData, MAX_PRIVATE_LOGS_PER_CALL)), reader.readObject(ClaimedLengthArrayFromFields(CountedLogHash, MAX_CONTRACT_CLASS_LOGS_PER_CALL)), reader.readField(), reader.readField(), reader.readObject(BlockHeader), reader.readObject(TxContext));
     }
     /**
    * Create an empty PrivateCircuitPublicInputs.
    * @returns An empty PrivateCircuitPublicInputs object.
    */ static empty() {
-        return new PrivateCircuitPublicInputs(CallContext.empty(), Fr.ZERO, Fr.ZERO, Fr.ZERO, false, MaxBlockNumber.empty(), makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, ReadRequest.empty), makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest.empty), makeTuple(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, KeyValidationRequestAndGenerator.empty), makeTuple(MAX_NOTE_HASHES_PER_CALL, NoteHash.empty), makeTuple(MAX_NULLIFIERS_PER_CALL, Nullifier.empty), makeTuple(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, PrivateCallRequest.empty), makeTuple(MAX_ENQUEUED_CALLS_PER_CALL, CountedPublicCallRequest.empty), PublicCallRequest.empty(), makeTuple(MAX_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message.empty), makeTuple(MAX_PRIVATE_LOGS_PER_CALL, PrivateLogData.empty), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_CALL, LogHash.empty), Fr.ZERO, Fr.ZERO, BlockHeader.empty(), TxContext.empty());
+        return new PrivateCircuitPublicInputs(CallContext.empty(), Fr.ZERO, Fr.ZERO, Fr.ZERO, false, 0n, ClaimedLengthArray.empty(ReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL), ClaimedLengthArray.empty(ReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL), ClaimedLengthArray.empty(KeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_CALL), ClaimedLengthArray.empty(NoteHash, MAX_NOTE_HASHES_PER_CALL), ClaimedLengthArray.empty(Nullifier, MAX_NULLIFIERS_PER_CALL), ClaimedLengthArray.empty(PrivateCallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL), ClaimedLengthArray.empty(CountedPublicCallRequest, MAX_ENQUEUED_CALLS_PER_CALL), PublicCallRequest.empty(), ClaimedLengthArray.empty(CountedL2ToL1Message, MAX_L2_TO_L1_MSGS_PER_CALL), ClaimedLengthArray.empty(PrivateLogData, MAX_PRIVATE_LOGS_PER_CALL), ClaimedLengthArray.empty(CountedLogHash, MAX_CONTRACT_CLASS_LOGS_PER_CALL), Fr.ZERO, Fr.ZERO, BlockHeader.empty(), TxContext.empty());
     }
     isEmpty() {
-        return this.callContext.isEmpty() && this.argsHash.isZero() && this.returnsHash.isZero() && this.minRevertibleSideEffectCounter.isZero() && !this.isFeePayer && this.maxBlockNumber.isEmpty() && isEmptyArray(this.noteHashReadRequests) && isEmptyArray(this.nullifierReadRequests) && isEmptyArray(this.keyValidationRequestsAndGenerators) && isEmptyArray(this.noteHashes) && isEmptyArray(this.nullifiers) && isEmptyArray(this.privateCallRequests) && isEmptyArray(this.publicCallRequests) && this.publicTeardownCallRequest.isEmpty() && isEmptyArray(this.l2ToL1Msgs) && isEmptyArray(this.privateLogs) && isEmptyArray(this.contractClassLogsHashes) && this.startSideEffectCounter.isZero() && this.endSideEffectCounter.isZero() && this.historicalHeader.isEmpty() && this.txContext.isEmpty();
+        return this.callContext.isEmpty() && this.argsHash.isZero() && this.returnsHash.isZero() && this.minRevertibleSideEffectCounter.isZero() && !this.isFeePayer && !this.includeByTimestamp && this.noteHashReadRequests.isEmpty() && this.nullifierReadRequests.isEmpty() && this.keyValidationRequestsAndGenerators.isEmpty() && this.noteHashes.isEmpty() && this.nullifiers.isEmpty() && this.privateCallRequests.isEmpty() && this.publicCallRequests.isEmpty() && this.publicTeardownCallRequest.isEmpty() && this.l2ToL1Msgs.isEmpty() && this.privateLogs.isEmpty() && this.contractClassLogsHashes.isEmpty() && this.startSideEffectCounter.isZero() && this.endSideEffectCounter.isZero() && this.anchorBlockHeader.isEmpty() && this.txContext.isEmpty();
     }
     /**
    * Serialize into a field array. Low-level utility.
@@ -149,7 +147,7 @@ import { isEmptyArray } from './utils/order_and_comparison.js';
             fields.returnsHash,
             fields.minRevertibleSideEffectCounter,
             fields.isFeePayer,
-            fields.maxBlockNumber,
+            fields.includeByTimestamp,
             fields.noteHashReadRequests,
             fields.nullifierReadRequests,
             fields.keyValidationRequestsAndGenerators,
@@ -163,7 +161,7 @@ import { isEmptyArray } from './utils/order_and_comparison.js';
             fields.contractClassLogsHashes,
             fields.startSideEffectCounter,
             fields.endSideEffectCounter,
-            fields.historicalHeader,
+            fields.anchorBlockHeader,
             fields.txContext
         ];
     }
@@ -171,16 +169,36 @@ import { isEmptyArray } from './utils/order_and_comparison.js';
    * Serialize this as a buffer.
    * @returns The buffer.
    */ toBuffer() {
-        return serializeToBuffer(...PrivateCircuitPublicInputs.getFields(this));
+        // TODO(#15525): Use the line below once UInt64 can be serialized correctly.
+        // return serializeToBuffer(...PrivateCircuitPublicInputs.getFields(this));
+        return serializeToBuffer([
+            this.callContext,
+            this.argsHash,
+            this.returnsHash,
+            this.minRevertibleSideEffectCounter,
+            this.isFeePayer,
+            bigintToUInt64BE(this.includeByTimestamp),
+            this.noteHashReadRequests,
+            this.nullifierReadRequests,
+            this.keyValidationRequestsAndGenerators,
+            this.noteHashes,
+            this.nullifiers,
+            this.privateCallRequests,
+            this.publicCallRequests,
+            this.publicTeardownCallRequest,
+            this.l2ToL1Msgs,
+            this.privateLogs,
+            this.contractClassLogsHashes,
+            this.startSideEffectCounter,
+            this.endSideEffectCounter,
+            this.anchorBlockHeader,
+            this.txContext
+        ]);
     }
     /**
    * Serialize this as a field array.
    */ toFields() {
-        const fields = serializeToFields(...PrivateCircuitPublicInputs.getFields(this));
-        if (fields.length !== PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH) {
-            throw new Error(`Invalid number of fields for PrivateCircuitPublicInputs. Expected ${PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH}, got ${fields.length}`);
-        }
-        return fields;
+        return serializeToFields(...PrivateCircuitPublicInputs.getFields(this));
     }
     toJSON() {
         return this.toBuffer();

package/dest/kernel/private_context_inputs.d.ts

@@ -4,10 +4,10 @@ import { CallContext } from '../tx/call_context.js';
 import { TxContext } from '../tx/tx_context.js';
 export declare class PrivateContextInputs {
     callContext: CallContext;
-    historicalHeader: BlockHeader;
+    anchorBlockHeader: BlockHeader;
     txContext: TxContext;
     startSideEffectCounter: number;
-    constructor(callContext: CallContext, historicalHeader: BlockHeader, txContext: TxContext, startSideEffectCounter: number);
+    constructor(callContext: CallContext, anchorBlockHeader: BlockHeader, txContext: TxContext, startSideEffectCounter: number);
     static empty(): PrivateContextInputs;
     toFields(): Fr[];
 }

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

@@ -1 +1 @@
-{"version":3,"file":"private_context_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_context_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAGnD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,qBAAa,oBAAoB;IAEtB,WAAW,EAAE,WAAW;IACxB,gBAAgB,EAAE,WAAW;IAC7B,SAAS,EAAE,SAAS;IACpB,sBAAsB,EAAE,MAAM;gBAH9B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,WAAW,EAC7B,SAAS,EAAE,SAAS,EACpB,sBAAsB,EAAE,MAAM;WAGzB,KAAK,IAAI,oBAAoB;IAIpC,QAAQ,IAAI,EAAE,EAAE;CAGxB"}
+{"version":3,"file":"private_context_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_context_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAGnD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,qBAAa,oBAAoB;IAEtB,WAAW,EAAE,WAAW;IACxB,iBAAiB,EAAE,WAAW;IAC9B,SAAS,EAAE,SAAS;IACpB,sBAAsB,EAAE,MAAM;gBAH9B,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,WAAW,EAC9B,SAAS,EAAE,SAAS,EACpB,sBAAsB,EAAE,MAAM;WAGzB,KAAK,IAAI,oBAAoB;IAIpC,QAAQ,IAAI,EAAE,EAAE;CAGxB"}

package/dest/kernel/private_context_inputs.js

@@ -4,12 +4,12 @@ import { CallContext } from '../tx/call_context.js';
 import { TxContext } from '../tx/tx_context.js';
 export class PrivateContextInputs {
     callContext;
-    historicalHeader;
+    anchorBlockHeader;
     txContext;
     startSideEffectCounter;
-    constructor(callContext, historicalHeader, txContext, startSideEffectCounter){
+    constructor(callContext, anchorBlockHeader, txContext, startSideEffectCounter){
         this.callContext = callContext;
-        this.historicalHeader = historicalHeader;
+        this.anchorBlockHeader = anchorBlockHeader;
         this.txContext = txContext;
         this.startSideEffectCounter = startSideEffectCounter;
     }
@@ -19,7 +19,7 @@ export class PrivateContextInputs {
     toFields() {
         return serializeToFields([
             this.callContext,
-            this.historicalHeader,
+            this.anchorBlockHeader,
             this.txContext,
             this.startSideEffectCounter
         ]);

package/dest/kernel/private_kernel_circuit_public_inputs.d.ts

@@ -1,9 +1,8 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '../aztec-address/index.js';
-import { TxConstantData } from '../tx/tx_constant_data.js';
+import { PrivateTxConstantData } from '../tx/private_tx_constant_data.js';
+import type { UInt64 } from '../types/shared.js';
 import { PrivateAccumulatedData } from './private_accumulated_data.js';
 import { PrivateValidationRequests } from './private_validation_requests.js';
 import { PublicCallRequest } from './public_call_request.js';
@@ -14,7 +13,7 @@ export declare class PrivateKernelCircuitPublicInputs {
     /**
      * Data which is not modified by the circuits.
      */
-    constants: TxConstantData;
+    constants: PrivateTxConstantData;
     /**
      * The side effect counter that non-revertible side effects are all beneath.
      */
@@ -35,6 +34,10 @@ export declare class PrivateKernelCircuitPublicInputs {
      * 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;
     /**
      * Wether this is a private only tx or not
      */
@@ -47,7 +50,7 @@ export declare class PrivateKernelCircuitPublicInputs {
     /**
      * Data which is not modified by the circuits.
      */
-    constants: TxConstantData, 
+    constants: PrivateTxConstantData, 
     /**
      * The side effect counter that non-revertible side effects are all beneath.
      */
@@ -68,6 +71,10 @@ export declare class PrivateKernelCircuitPublicInputs {
      * 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, 
     /**
      * Wether this is a private only tx or not
      */
@@ -77,8 +84,8 @@ export declare class PrivateKernelCircuitPublicInputs {
      */
     claimedFirstNullifier: Fr);
     static get schema(): import("zod").ZodType<PrivateKernelCircuitPublicInputs, any, string>;
-    toJSON(): Buffer;
-    toBuffer(): Buffer;
+    toJSON(): Buffer<ArrayBufferLike>;
+    toBuffer(): Buffer<ArrayBufferLike>;
     /**
      * Deserializes from a buffer or reader, corresponding to a write in cpp.
      * @param buffer - Buffer or reader to read from.

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

@@ -1 +1 @@
-{"version":3,"file":"private_kernel_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_kernel_circuit_public_inputs.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;GAEG;AACH,qBAAa,gCAAgC;IAEzC;;OAEG;IACI,SAAS,EAAE,cAAc;IAChC;;OAEG;IACI,8BAA8B,EAAE,EAAE;IACzC;;OAEG;IACI,kBAAkB,EAAE,yBAAyB;IACpD;;OAEG;IACI,GAAG,EAAE,sBAAsB;IAClC;;OAEG;IACI,yBAAyB,EAAE,iBAAiB;IACnD;;OAEG;IACI,QAAQ,EAAE,YAAY;IAC7B;;OAEG;IACI,aAAa,EAAE,OAAO;IAC7B;;OAEG;IACI,qBAAqB,EAAE,EAAE;;IA/BhC;;OAEG;IACI,SAAS,EAAE,cAAc;IAChC;;OAEG;IACI,8BAA8B,EAAE,EAAE;IACzC;;OAEG;IACI,kBAAkB,EAAE,yBAAyB;IACpD;;OAEG;IACI,GAAG,EAAE,sBAAsB;IAClC;;OAEG;IACI,yBAAyB,EAAE,iBAAiB;IACnD;;OAEG;IACI,QAAQ,EAAE,YAAY;IAC7B;;OAEG;IACI,aAAa,EAAE,OAAO;IAC7B;;OAEG;IACI,qBAAqB,EAAE,EAAE;IAGlC,MAAM,KAAK,MAAM,yEAEhB;IAED,MAAM;IAIN,QAAQ;IAaR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,gCAAgC;IAclF,MAAM,CAAC,KAAK;CAYb"}
+{"version":3,"file":"private_kernel_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_kernel_circuit_public_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAuC,MAAM,6BAA6B,CAAC;AAEhG,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;GAEG;AACH,qBAAa,gCAAgC;IAEzC;;OAEG;IACI,SAAS,EAAE,qBAAqB;IACvC;;OAEG;IACI,8BAA8B,EAAE,EAAE;IACzC;;OAEG;IACI,kBAAkB,EAAE,yBAAyB;IACpD;;OAEG;IACI,GAAG,EAAE,sBAAsB;IAClC;;OAEG;IACI,yBAAyB,EAAE,iBAAiB;IACnD;;OAEG;IACI,QAAQ,EAAE,YAAY;IAC7B;;OAEG;IACI,kBAAkB,EAAE,MAAM;IACjC;;OAEG;IACI,aAAa,EAAE,OAAO;IAC7B;;OAEG;IACI,qBAAqB,EAAE,EAAE;;IAnChC;;OAEG;IACI,SAAS,EAAE,qBAAqB;IACvC;;OAEG;IACI,8BAA8B,EAAE,EAAE;IACzC;;OAEG;IACI,kBAAkB,EAAE,yBAAyB;IACpD;;OAEG;IACI,GAAG,EAAE,sBAAsB;IAClC;;OAEG;IACI,yBAAyB,EAAE,iBAAiB;IACnD;;OAEG;IACI,QAAQ,EAAE,YAAY;IAC7B;;OAEG;IACI,kBAAkB,EAAE,MAAM;IACjC;;OAEG;IACI,aAAa,EAAE,OAAO;IAC7B;;OAEG;IACI,qBAAqB,EAAE,EAAE;IAGlC,MAAM,KAAK,MAAM,yEAEhB;IAED,MAAM;IAIN,QAAQ;IAcR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,gCAAgC;IAelF,MAAM,CAAC,KAAK;CAab"}

package/dest/kernel/private_kernel_circuit_public_inputs.js

@@ -1,8 +1,8 @@
 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 { TxConstantData } from '../tx/tx_constant_data.js';
+import { PrivateTxConstantData } from '../tx/private_tx_constant_data.js';
 import { PrivateAccumulatedData } from './private_accumulated_data.js';
 import { PrivateValidationRequests } from './private_validation_requests.js';
 import { PublicCallRequest } from './public_call_request.js';
@@ -15,6 +15,7 @@ import { PublicCallRequest } from './public_call_request.js';
     end;
     publicTeardownCallRequest;
     feePayer;
+    includeByTimestamp;
     isPrivateOnly;
     claimedFirstNullifier;
     constructor(/**
@@ -30,6 +31,8 @@ import { PublicCallRequest } from './public_call_request.js';
      */ publicTeardownCallRequest, /**
      * The address of the fee payer for the transaction
      */ feePayer, /**
+     * The timestamp by which the transaction must be included in a block.
+     */ includeByTimestamp, /**
      * Wether this is a private only tx or not
      */ isPrivateOnly, /**
      * The nullifier that will be used for nonce generation
@@ -40,6 +43,7 @@ import { PublicCallRequest } from './public_call_request.js';
         this.end = end;
         this.publicTeardownCallRequest = publicTeardownCallRequest;
         this.feePayer = feePayer;
+        this.includeByTimestamp = includeByTimestamp;
         this.isPrivateOnly = isPrivateOnly;
         this.claimedFirstNullifier = claimedFirstNullifier;
     }
@@ -50,7 +54,7 @@ import { PublicCallRequest } from './public_call_request.js';
         return this.toBuffer();
     }
     toBuffer() {
-        return serializeToBuffer(this.constants, this.minRevertibleSideEffectCounter, this.validationRequests, this.end, this.publicTeardownCallRequest, this.feePayer, this.isPrivateOnly, this.claimedFirstNullifier);
+        return serializeToBuffer(this.constants, this.minRevertibleSideEffectCounter, this.validationRequests, this.end, this.publicTeardownCallRequest, this.feePayer, bigintToUInt64BE(this.includeByTimestamp), this.isPrivateOnly, this.claimedFirstNullifier);
     }
     /**
    * Deserializes from a buffer or reader, corresponding to a write in cpp.
@@ -58,9 +62,9 @@ import { PublicCallRequest } from './public_call_request.js';
    * @returns A new instance of PrivateKernelInnerCircuitPublicInputs.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateKernelCircuitPublicInputs(reader.readObject(TxConstantData), reader.readObject(Fr), reader.readObject(PrivateValidationRequests), reader.readObject(PrivateAccumulatedData), reader.readObject(PublicCallRequest), reader.readObject(AztecAddress), reader.readBoolean(), reader.readObject(Fr));
+        return new PrivateKernelCircuitPublicInputs(reader.readObject(PrivateTxConstantData), reader.readObject(Fr), reader.readObject(PrivateValidationRequests), reader.readObject(PrivateAccumulatedData), reader.readObject(PublicCallRequest), reader.readObject(AztecAddress), reader.readUInt64(), reader.readBoolean(), reader.readObject(Fr));
     }
     static empty() {
-        return new PrivateKernelCircuitPublicInputs(TxConstantData.empty(), Fr.zero(), PrivateValidationRequests.empty(), PrivateAccumulatedData.empty(), PublicCallRequest.empty(), AztecAddress.ZERO, false, Fr.zero());
+        return new PrivateKernelCircuitPublicInputs(PrivateTxConstantData.empty(), Fr.zero(), PrivateValidationRequests.empty(), PrivateAccumulatedData.empty(), PublicCallRequest.empty(), AztecAddress.ZERO, 0n, false, Fr.zero());
     }
 }