@aztec/stdlib 0.0.1-commit.5476d83 → 0.0.1-commit.5914bae

package/src/kernel/private_call_data.ts

@@ -1,27 +1,12 @@
-import {
-  FUNCTION_TREE_HEIGHT,
-  MAX_CONTRACT_CLASS_LOGS_PER_CALL,
-  MAX_ENQUEUED_CALLS_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,
-  PUBLIC_DATA_TREE_HEIGHT,
-  TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL,
-  UPDATES_VALUE_SIZE,
-} from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
+import { FUNCTION_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, UPDATES_VALUE_SIZE } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { MembershipWitness } from '@aztec/foundation/trees';
 import type { FieldsOf } from '@aztec/foundation/types';
 
 import { DelayedPublicMutableValues } from '../delayed_public_mutable/delayed_public_mutable_values.js';
 import { PublicKeys } from '../keys/public_keys.js';
 import { PublicDataTreeLeafPreimage } from '../trees/index.js';
-import type { UInt32 } from '../types/shared.js';
 import { VerificationKeyAsFields } from '../vks/verification_key.js';
 import { PrivateCircuitPublicInputs } from './private_circuit_public_inputs.js';
 
@@ -44,11 +29,6 @@ export class PrivateCallData {
      * Hints for the validation of the vk
      */
     public verificationKeyHints: PrivateVerificationKeyHints,
-
-    /**
-     * Hints for validating the uniqueness of the side effects.
-     */
-    public sideEffectUniquenessHints: SideEffectUniquenessHints,
   ) {}
 
   /**
@@ -57,7 +37,7 @@ export class PrivateCallData {
    * @returns The array.
    */
   static getFields(fields: FieldsOf<PrivateCallData>) {
-    return [fields.publicInputs, fields.vk, fields.verificationKeyHints, fields.sideEffectUniquenessHints] as const;
+    return [fields.publicInputs, fields.vk, fields.verificationKeyHints] as const;
   }
 
   static from(fields: FieldsOf<PrivateCallData>): PrivateCallData {
@@ -83,7 +63,6 @@ export class PrivateCallData {
       reader.readObject(PrivateCircuitPublicInputs),
       reader.readObject(VerificationKeyAsFields),
       reader.readObject(PrivateVerificationKeyHints),
-      reader.readObject(SideEffectUniquenessHints),
     );
   }
 }
@@ -201,109 +180,3 @@ export class UpdatedClassIdHints {
     );
   }
 }
-
-export class SideEffectUniquenessHints {
-  constructor(
-    public sideEffectRanges: Tuple<SideEffectCounterRange, typeof TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL>,
-    public noteHashReadRequestIndices: Tuple<UInt32, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>,
-    public nullifierReadRequestIndices: Tuple<UInt32, typeof MAX_NULLIFIER_READ_REQUESTS_PER_CALL>,
-    public noteHashesIndices: Tuple<UInt32, typeof MAX_NOTE_HASHES_PER_CALL>,
-    public nullifiersIndices: Tuple<UInt32, typeof MAX_NULLIFIERS_PER_CALL>,
-    public privateCallRequestsIndices: Tuple<UInt32, typeof MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL>,
-    public publicCallRequestsIndices: Tuple<UInt32, typeof MAX_ENQUEUED_CALLS_PER_CALL>,
-    public l2ToL1MsgsIndices: Tuple<UInt32, typeof MAX_L2_TO_L1_MSGS_PER_CALL>,
-    public privateLogsIndices: Tuple<UInt32, typeof MAX_PRIVATE_LOGS_PER_CALL>,
-    public contractClassLogsHashesIndices: Tuple<UInt32, typeof MAX_CONTRACT_CLASS_LOGS_PER_CALL>,
-  ) {}
-
-  /**
-   * Serialize into a field array. Low-level utility.
-   * @param fields - Object with fields.
-   * @returns The array.
-   */
-  static getFields(fields: FieldsOf<SideEffectUniquenessHints>) {
-    return [
-      fields.sideEffectRanges,
-      fields.noteHashReadRequestIndices,
-      fields.nullifierReadRequestIndices,
-      fields.noteHashesIndices,
-      fields.nullifiersIndices,
-      fields.privateCallRequestsIndices,
-      fields.publicCallRequestsIndices,
-      fields.l2ToL1MsgsIndices,
-      fields.privateLogsIndices,
-      fields.contractClassLogsHashesIndices,
-    ] as const;
-  }
-
-  static from(fields: FieldsOf<SideEffectUniquenessHints>): SideEffectUniquenessHints {
-    return new SideEffectUniquenessHints(...SideEffectUniquenessHints.getFields(fields));
-  }
-
-  /**
-   * Serialize this as a buffer.
-   * @returns The buffer.
-   */
-  toBuffer(): Buffer {
-    return serializeToBuffer(...SideEffectUniquenessHints.getFields(this));
-  }
-
-  /**
-   * Deserializes from a buffer or reader.
-   * @param buffer - Buffer or reader to read from.
-   * @returns The deserialized instance.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): SideEffectUniquenessHints {
-    const reader = BufferReader.asReader(buffer);
-    return new SideEffectUniquenessHints(
-      reader.readArray(TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL, SideEffectCounterRange),
-      reader.readNumbers(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL),
-      reader.readNumbers(MAX_NULLIFIER_READ_REQUESTS_PER_CALL),
-      reader.readNumbers(MAX_NOTE_HASHES_PER_CALL),
-      reader.readNumbers(MAX_NULLIFIERS_PER_CALL),
-      reader.readNumbers(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL),
-      reader.readNumbers(MAX_ENQUEUED_CALLS_PER_CALL),
-      reader.readNumbers(MAX_L2_TO_L1_MSGS_PER_CALL),
-      reader.readNumbers(MAX_PRIVATE_LOGS_PER_CALL),
-      reader.readNumbers(MAX_CONTRACT_CLASS_LOGS_PER_CALL),
-    );
-  }
-}
-
-export class SideEffectCounterRange {
-  constructor(
-    public start: UInt32,
-    public end: UInt32,
-    public sideEffectGlobalIndex: UInt32,
-  ) {}
-
-  static getFields(fields: FieldsOf<SideEffectCounterRange>) {
-    return [fields.start, fields.end, fields.sideEffectGlobalIndex] as const;
-  }
-
-  static from(fields: FieldsOf<SideEffectCounterRange>): SideEffectCounterRange {
-    return new SideEffectCounterRange(...SideEffectCounterRange.getFields(fields));
-  }
-
-  static empty(): SideEffectCounterRange {
-    return new SideEffectCounterRange(0, 0, 0);
-  }
-
-  /**
-   * Serialize this as a buffer.
-   * @returns The buffer.
-   */
-  toBuffer(): Buffer {
-    return serializeToBuffer(...SideEffectCounterRange.getFields(this));
-  }
-
-  /**
-   * Deserializes from a buffer or reader.
-   * @param buffer - Buffer or reader to read from.
-   * @returns The deserialized instance.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): SideEffectCounterRange {
-    const reader = BufferReader.asReader(buffer);
-    return new SideEffectCounterRange(reader.readNumber(), reader.readNumber(), reader.readNumber());
-  }
-}

package/src/kernel/private_call_request.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 
 import { CallContext } from '../tx/call_context.js';

package/src/kernel/private_circuit_public_inputs.ts

@@ -10,7 +10,7 @@ import {
   MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
   MAX_PRIVATE_LOGS_PER_CALL,
 } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import {
   BufferReader,
@@ -21,7 +21,7 @@ import {
 } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 
-import { KeyValidationRequestAndGenerator } from '../kernel/hints/key_validation_request_and_generator.js';
+import { KeyValidationRequestAndSeparator } from '../kernel/hints/key_validation_request_and_separator.js';
 import { CountedLogHash } from '../kernel/log_hash.js';
 import { PrivateCallRequest } from '../kernel/private_call_request.js';
 import { PrivateLogData } from '../kernel/private_log_data.js';
@@ -57,6 +57,18 @@ export class PrivateCircuitPublicInputs {
      * Pedersen hash of the return values of the corresponding function call.
      */
     public returnsHash: Fr,
+    /**
+     * Header of a block whose state is used during private execution (not the block the transaction is included in).
+     */
+    public anchorBlockHeader: BlockHeader,
+    /**
+     * Transaction context.
+     *
+     * 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.
+     */
+    public txContext: TxContext,
     /**
      * The side-effect counter under which all side effects are non-revertible.
      */
@@ -68,7 +80,23 @@ export class PrivateCircuitPublicInputs {
     /**
      * The highest timestamp of a block in which the transaction can still be included.
      */
-    public includeByTimestamp: UInt64,
+    public expirationTimestamp: UInt64,
+    /**
+     * The side effect counter at the start of this call.
+     */
+    public startSideEffectCounter: Fr,
+    /**
+     * The end side effect counter for this call.
+     */
+    public endSideEffectCounter: Fr,
+    /**
+     * The expected non revertible side effect counter for this call.
+     */
+    public expectedNonRevertibleSideEffectCounter: Fr,
+    /**
+     * The expected revertible side effect counter for this call.
+     */
+    public expectedRevertibleSideEffectCounter: Fr,
     /**
      * Read requests created by the corresponding function call.
      */
@@ -78,20 +106,12 @@ export class PrivateCircuitPublicInputs {
      */
     public nullifierReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_CALL>,
     /**
-     * Key validation requests and generators created by the corresponding function call.
+     * Key validation requests and separators created by the corresponding function call.
      */
-    public keyValidationRequestsAndGenerators: ClaimedLengthArray<
-      KeyValidationRequestAndGenerator,
+    public keyValidationRequestsAndSeparators: ClaimedLengthArray<
+      KeyValidationRequestAndSeparator,
       typeof MAX_KEY_VALIDATION_REQUESTS_PER_CALL
     >,
-    /**
-     * New note hashes created by the corresponding function call.
-     */
-    public noteHashes: ClaimedLengthArray<NoteHash, typeof MAX_NOTE_HASHES_PER_CALL>,
-    /**
-     * New nullifiers created by the corresponding function call.
-     */
-    public nullifiers: ClaimedLengthArray<Nullifier, typeof MAX_NULLIFIERS_PER_CALL>,
     /**
      * Private call requests made within the current kernel iteration.
      */
@@ -104,6 +124,14 @@ export class PrivateCircuitPublicInputs {
      * Hash of the public teardown function.
      */
     public publicTeardownCallRequest: PublicCallRequest,
+    /**
+     * New note hashes created by the corresponding function call.
+     */
+    public noteHashes: ClaimedLengthArray<NoteHash, typeof MAX_NOTE_HASHES_PER_CALL>,
+    /**
+     * New nullifiers created by the corresponding function call.
+     */
+    public nullifiers: ClaimedLengthArray<Nullifier, typeof MAX_NULLIFIERS_PER_CALL>,
     /**
      * New L2 to L1 messages created by the corresponding function call.
      */
@@ -116,34 +144,6 @@ export class PrivateCircuitPublicInputs {
      * Hash of the contract class logs emitted in this function call.
      */
     public contractClassLogsHashes: ClaimedLengthArray<CountedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_CALL>,
-    /**
-     * The side effect counter at the start of this call.
-     */
-    public startSideEffectCounter: Fr,
-    /**
-     * The end side effect counter for this call.
-     */
-    public endSideEffectCounter: Fr,
-    /**
-     * The expected non revertible side effect counter for this call.
-     */
-    public expectedNonRevertibleSideEffectCounter: Fr,
-    /**
-     * The expected revertible side effect counter for this call.
-     */
-    public expectedRevertibleSideEffectCounter: Fr,
-    /**
-     * Header of a block whose state is used during private execution (not the block the transaction is included in).
-     */
-    public anchorBlockHeader: BlockHeader,
-    /**
-     * Transaction context.
-     *
-     * 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.
-     */
-    public txContext: TxContext,
   ) {}
 
   /**
@@ -166,28 +166,28 @@ export class PrivateCircuitPublicInputs {
       reader.readObject(CallContext),
       reader.readObject(Fr),
       reader.readObject(Fr),
+      reader.readObject(BlockHeader),
+      reader.readObject(TxContext),
       reader.readObject(Fr),
       reader.readBoolean(),
       reader.readUInt64(),
+      reader.readObject(Fr),
+      reader.readObject(Fr),
+      reader.readObject(Fr),
+      reader.readObject(Fr),
       reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL)),
       reader.readObject(ClaimedLengthArrayFromBuffer(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL)),
       reader.readObject(
-        ClaimedLengthArrayFromBuffer(KeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_CALL),
+        ClaimedLengthArrayFromBuffer(KeyValidationRequestAndSeparator, 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(NoteHash, MAX_NOTE_HASHES_PER_CALL)),
+      reader.readObject(ClaimedLengthArrayFromBuffer(Nullifier, MAX_NULLIFIERS_PER_CALL)),
       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(Fr),
-      reader.readObject(Fr),
-      reader.readObject(BlockHeader),
-      reader.readObject(TxContext),
     );
   }
 
@@ -197,28 +197,28 @@ export class PrivateCircuitPublicInputs {
       reader.readObject(CallContext),
       reader.readField(),
       reader.readField(),
+      reader.readObject(BlockHeader),
+      reader.readObject(TxContext),
       reader.readField(),
       reader.readBoolean(),
       reader.readU64(),
+      reader.readField(),
+      reader.readField(),
+      reader.readField(),
+      reader.readField(),
       reader.readObject(ClaimedLengthArrayFromFields(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL)),
       reader.readObject(ClaimedLengthArrayFromFields(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL)),
       reader.readObject(
-        ClaimedLengthArrayFromFields(KeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_CALL),
+        ClaimedLengthArrayFromFields(KeyValidationRequestAndSeparator, 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(NoteHash, MAX_NOTE_HASHES_PER_CALL)),
+      reader.readObject(ClaimedLengthArrayFromFields(Nullifier, MAX_NULLIFIERS_PER_CALL)),
       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.readField(),
-      reader.readField(),
-      reader.readObject(BlockHeader),
-      reader.readObject(TxContext),
     );
   }
 
@@ -231,26 +231,26 @@ export class PrivateCircuitPublicInputs {
       CallContext.empty(),
       Fr.ZERO,
       Fr.ZERO,
+      BlockHeader.empty(),
+      TxContext.empty(),
       Fr.ZERO,
       false,
       0n,
+      Fr.ZERO,
+      Fr.ZERO,
+      Fr.ZERO,
+      Fr.ZERO,
       ClaimedLengthArray.empty(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL),
       ClaimedLengthArray.empty(ScopedReadRequest, 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(KeyValidationRequestAndSeparator, MAX_KEY_VALIDATION_REQUESTS_PER_CALL),
       ClaimedLengthArray.empty(PrivateCallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL),
       ClaimedLengthArray.empty(CountedPublicCallRequest, MAX_ENQUEUED_CALLS_PER_CALL),
       PublicCallRequest.empty(),
+      ClaimedLengthArray.empty(NoteHash, MAX_NOTE_HASHES_PER_CALL),
+      ClaimedLengthArray.empty(Nullifier, MAX_NULLIFIERS_PER_CALL),
       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,
-      Fr.ZERO,
-      Fr.ZERO,
-      BlockHeader.empty(),
-      TxContext.empty(),
     );
   }
 
@@ -259,26 +259,26 @@ export class PrivateCircuitPublicInputs {
       this.callContext.isEmpty() &&
       this.argsHash.isZero() &&
       this.returnsHash.isZero() &&
+      this.anchorBlockHeader.isEmpty() &&
+      this.txContext.isEmpty() &&
       this.minRevertibleSideEffectCounter.isZero() &&
       !this.isFeePayer &&
-      !this.includeByTimestamp &&
+      !this.expirationTimestamp &&
+      this.startSideEffectCounter.isZero() &&
+      this.endSideEffectCounter.isZero() &&
+      this.expectedNonRevertibleSideEffectCounter.isZero() &&
+      this.expectedRevertibleSideEffectCounter.isZero() &&
       this.noteHashReadRequests.isEmpty() &&
       this.nullifierReadRequests.isEmpty() &&
-      this.keyValidationRequestsAndGenerators.isEmpty() &&
-      this.noteHashes.isEmpty() &&
-      this.nullifiers.isEmpty() &&
+      this.keyValidationRequestsAndSeparators.isEmpty() &&
       this.privateCallRequests.isEmpty() &&
       this.publicCallRequests.isEmpty() &&
       this.publicTeardownCallRequest.isEmpty() &&
+      this.noteHashes.isEmpty() &&
+      this.nullifiers.isEmpty() &&
       this.l2ToL1Msgs.isEmpty() &&
       this.privateLogs.isEmpty() &&
-      this.contractClassLogsHashes.isEmpty() &&
-      this.startSideEffectCounter.isZero() &&
-      this.endSideEffectCounter.isZero() &&
-      this.expectedNonRevertibleSideEffectCounter.isZero() &&
-      this.expectedRevertibleSideEffectCounter.isZero() &&
-      this.anchorBlockHeader.isEmpty() &&
-      this.txContext.isEmpty()
+      this.contractClassLogsHashes.isEmpty()
     );
   }
 
@@ -292,26 +292,26 @@ export class PrivateCircuitPublicInputs {
       fields.callContext,
       fields.argsHash,
       fields.returnsHash,
+      fields.anchorBlockHeader,
+      fields.txContext,
       fields.minRevertibleSideEffectCounter,
       fields.isFeePayer,
-      fields.includeByTimestamp,
+      fields.expirationTimestamp,
+      fields.startSideEffectCounter,
+      fields.endSideEffectCounter,
+      fields.expectedNonRevertibleSideEffectCounter,
+      fields.expectedRevertibleSideEffectCounter,
       fields.noteHashReadRequests,
       fields.nullifierReadRequests,
-      fields.keyValidationRequestsAndGenerators,
-      fields.noteHashes,
-      fields.nullifiers,
+      fields.keyValidationRequestsAndSeparators,
       fields.privateCallRequests,
       fields.publicCallRequests,
       fields.publicTeardownCallRequest,
+      fields.noteHashes,
+      fields.nullifiers,
       fields.l2ToL1Msgs,
       fields.privateLogs,
       fields.contractClassLogsHashes,
-      fields.startSideEffectCounter,
-      fields.endSideEffectCounter,
-      fields.expectedNonRevertibleSideEffectCounter,
-      fields.expectedRevertibleSideEffectCounter,
-      fields.anchorBlockHeader,
-      fields.txContext,
     ] as const;
   }
 
@@ -326,26 +326,26 @@ export class PrivateCircuitPublicInputs {
       this.callContext,
       this.argsHash,
       this.returnsHash,
+      this.anchorBlockHeader,
+      this.txContext,
       this.minRevertibleSideEffectCounter,
       this.isFeePayer,
-      bigintToUInt64BE(this.includeByTimestamp),
+      bigintToUInt64BE(this.expirationTimestamp),
+      this.startSideEffectCounter,
+      this.endSideEffectCounter,
+      this.expectedNonRevertibleSideEffectCounter,
+      this.expectedRevertibleSideEffectCounter,
       this.noteHashReadRequests,
       this.nullifierReadRequests,
-      this.keyValidationRequestsAndGenerators,
-      this.noteHashes,
-      this.nullifiers,
+      this.keyValidationRequestsAndSeparators,
       this.privateCallRequests,
       this.publicCallRequests,
       this.publicTeardownCallRequest,
+      this.noteHashes,
+      this.nullifiers,
       this.l2ToL1Msgs,
       this.privateLogs,
       this.contractClassLogsHashes,
-      this.startSideEffectCounter,
-      this.endSideEffectCounter,
-      this.expectedNonRevertibleSideEffectCounter,
-      this.expectedRevertibleSideEffectCounter,
-      this.anchorBlockHeader,
-      this.txContext,
     ]);
   }
 

package/src/kernel/private_context_inputs.ts

@@ -1,4 +1,4 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { serializeToFields } from '@aztec/foundation/serialize';
 
 import { BlockHeader } from '../tx/block_header.js';

package/src/kernel/private_kernel_circuit_public_inputs.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, bigintToUInt64BE, serializeToBuffer } from '@aztec/foundation/serialize';
 
@@ -41,7 +41,7 @@ export class PrivateKernelCircuitPublicInputs {
     /**
      * The timestamp by which the transaction must be included in a block.
      */
-    public includeByTimestamp: UInt64,
+    public expirationTimestamp: UInt64,
     /**
      * Wether this is a private only tx or not
      */
@@ -72,7 +72,7 @@ export class PrivateKernelCircuitPublicInputs {
       this.end,
       this.publicTeardownCallRequest,
       this.feePayer,
-      bigintToUInt64BE(this.includeByTimestamp),
+      bigintToUInt64BE(this.expirationTimestamp),
       this.isPrivateOnly,
       this.claimedFirstNullifier,
       this.claimedRevertibleCounter,

package/src/kernel/private_kernel_init_circuit_private_inputs.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { ProtocolContracts } from '../tx/protocol_contracts.js';

package/src/kernel/private_kernel_tail_circuit_private_inputs.ts

@@ -20,7 +20,7 @@ export class PrivateKernelTailCircuitPrivateInputs {
     /**
      * The timestamp by which the transaction must be included in a block.
      */
-    public includeByTimestampUpperBound: UInt64,
+    public expirationTimestampUpperBound: UInt64,
   ) {}
 
   isForPublic() {
@@ -38,7 +38,7 @@ export class PrivateKernelTailCircuitPrivateInputs {
     return serializeToBuffer(
       this.previousKernel,
       this.paddedSideEffectAmounts,
-      bigintToUInt64BE(this.includeByTimestampUpperBound),
+      bigintToUInt64BE(this.expirationTimestampUpperBound),
     );
   }
 

package/src/kernel/private_kernel_tail_circuit_public_inputs.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, bigintToUInt64BE, serializeToBuffer } from '@aztec/foundation/serialize';
 
@@ -116,7 +116,7 @@ export class PrivateKernelTailCircuitPublicInputs {
     /**
      * The timestamp by which the transaction must be included in a block.
      */
-    public includeByTimestamp: UInt64,
+    public expirationTimestamp: UInt64,
 
     public forPublic?: PartialPrivateTailPublicInputsForPublic,
     public forRollup?: PartialPrivateTailPublicInputsForRollup,
@@ -146,7 +146,7 @@ export class PrivateKernelTailCircuitPublicInputs {
       this.constants.getSize() +
       this.gasUsed.getSize() +
       this.feePayer.size +
-      8 // includeByTimestamp
+      8 // expirationTimestamp
     );
   }
 
@@ -161,7 +161,7 @@ export class PrivateKernelTailCircuitPublicInputs {
       this.forPublic.publicTeardownCallRequest,
       this.gasUsed,
       this.feePayer,
-      this.includeByTimestamp,
+      this.expirationTimestamp,
     );
   }
 
@@ -180,7 +180,7 @@ export class PrivateKernelTailCircuitPublicInputs {
       this.forRollup.end,
       this.gasUsed,
       this.feePayer,
-      this.includeByTimestamp,
+      this.expirationTimestamp,
     );
   }
 
@@ -234,6 +234,15 @@ export class PrivateKernelTailCircuitPublicInputs {
     return noteHashes.filter(n => !n.isZero());
   }
 
+  getNonEmptyL2ToL1Msgs() {
+    const l2ToL1Msgs = this.forPublic
+      ? this.forPublic.nonRevertibleAccumulatedData.l2ToL1Msgs.concat(
+          this.forPublic.revertibleAccumulatedData.l2ToL1Msgs,
+        )
+      : this.forRollup!.end.l2ToL1Msgs;
+    return l2ToL1Msgs.filter(m => !m.isEmpty());
+  }
+
   getNonEmptyNullifiers() {
     const nullifiers = this.forPublic
       ? this.forPublic.nonRevertibleAccumulatedData.nullifiers.concat(
@@ -298,7 +307,7 @@ export class PrivateKernelTailCircuitPublicInputs {
       this.constants,
       this.gasUsed,
       this.feePayer,
-      bigintToUInt64BE(this.includeByTimestamp),
+      bigintToUInt64BE(this.expirationTimestamp),
       isForPublic ? this.forPublic!.toBuffer() : this.forRollup!.toBuffer(),
     );
   }

package/src/kernel/private_log_data.ts

@@ -1,5 +1,5 @@
 import { PRIVATE_LOG_DATA_LENGTH } from '@aztec/constants';
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';