@aztec/stdlib 0.0.1-commit.b655e406 → 0.0.1-commit.b8a057fa

package/dest/kernel/private_to_avm_accumulated_data.js

@@ -1,13 +1,15 @@
+var _computedKey, _computedKey1;
 import { MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, PRIVATE_TO_AVM_ACCUMULATED_DATA_LENGTH } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
 import { arraySerializedSizeOfNonEmpty } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, assertLength, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { BufferReader, BufferSink, FieldReader, assertLength, serializeToFields, serializeToSink } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { z } from 'zod';
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 import { countAccumulatedItems } from './utils/index.js';
+_computedKey = inspect.custom;
 export class PrivateToAvmAccumulatedData {
     noteHashes;
     nullifiers;
@@ -55,13 +57,25 @@ export class PrivateToAvmAccumulatedData {
         const reader = BufferReader.asReader(buffer);
         return new PrivateToAvmAccumulatedData(reader.readArray(MAX_NOTE_HASHES_PER_TX, Fr), reader.readArray(MAX_NULLIFIERS_PER_TX, Fr), reader.readArray(MAX_L2_TO_L1_MSGS_PER_TX, ScopedL2ToL1Message));
     }
-    toBuffer() {
-        return serializeToBuffer(...PrivateToAvmAccumulatedData.getFields(this));
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, ...PrivateToAvmAccumulatedData.getFields(this));
     }
     static empty() {
         return new PrivateToAvmAccumulatedData(makeTuple(MAX_NOTE_HASHES_PER_TX, Fr.zero), makeTuple(MAX_NULLIFIERS_PER_TX, Fr.zero), makeTuple(MAX_L2_TO_L1_MSGS_PER_TX, ScopedL2ToL1Message.empty));
     }
-    [inspect.custom]() {
+    /**
+   * Creates a PrivateToAvmAccumulatedData instance from a plain object without Zod validation.
+   * This method is optimized for performance and skips validation, making it suitable
+   * for deserializing trusted data (e.g., from C++ via MessagePack).
+   * @param obj - Plain object containing PrivateToAvmAccumulatedData fields
+   * @returns A PrivateToAvmAccumulatedData instance
+   */ static fromPlainObject(obj) {
+        return new PrivateToAvmAccumulatedData(assertLength(obj.noteHashes.map((h)=>Fr.fromPlainObject(h)), MAX_NOTE_HASHES_PER_TX), assertLength(obj.nullifiers.map((n)=>Fr.fromPlainObject(n)), MAX_NULLIFIERS_PER_TX), assertLength(obj.l2ToL1Msgs.map((m)=>ScopedL2ToL1Message.fromPlainObject(m)), MAX_L2_TO_L1_MSGS_PER_TX));
+    }
+    [_computedKey]() {
         return `PrivateToAvmAccumulatedData {
       noteHashes: [${this.noteHashes.filter((x)=>!x.isZero()).map((x)=>inspect(x)).join(', ')}],
       nullifiers: [${this.nullifiers.filter((x)=>!x.isZero()).map((x)=>inspect(x)).join(', ')}],
@@ -69,6 +83,7 @@ export class PrivateToAvmAccumulatedData {
     }`;
     }
 }
+_computedKey1 = inspect.custom;
 export class PrivateToAvmAccumulatedDataArrayLengths {
     noteHashes;
     nullifiers;
@@ -113,13 +128,25 @@ export class PrivateToAvmAccumulatedDataArrayLengths {
         const reader = BufferReader.asReader(buffer);
         return new PrivateToAvmAccumulatedDataArrayLengths(reader.readNumber(), reader.readNumber(), reader.readNumber());
     }
-    toBuffer() {
-        return serializeToBuffer(...PrivateToAvmAccumulatedDataArrayLengths.getFields(this));
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, ...PrivateToAvmAccumulatedDataArrayLengths.getFields(this));
     }
     static empty() {
         return new PrivateToAvmAccumulatedDataArrayLengths(0, 0, 0);
     }
-    [inspect.custom]() {
+    /**
+   * Creates a PrivateToAvmAccumulatedDataArrayLengths instance from a plain object without Zod validation.
+   * This method is optimized for performance and skips validation, making it suitable
+   * for deserializing trusted data (e.g., from C++ via MessagePack).
+   * @param obj - Plain object containing PrivateToAvmAccumulatedDataArrayLengths fields
+   * @returns A PrivateToAvmAccumulatedDataArrayLengths instance
+   */ static fromPlainObject(obj) {
+        return new PrivateToAvmAccumulatedDataArrayLengths(obj.noteHashes, obj.nullifiers, obj.l2ToL1Msgs);
+    }
+    [_computedKey1]() {
         return `PrivateToAvmAccumulatedDataArrayLengths {
       noteHashes: ${this.noteHashes},
       nullifiers: ${this.nullifiers},

package/dest/kernel/private_to_public_accumulated_data.d.ts

@@ -1,7 +1,7 @@
 import { MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_ENQUEUED_CALLS_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';
-import { BufferReader, FieldReader, type Tuple } from '@aztec/foundation/serialize';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, BufferSink, FieldReader, type Tuple } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { PrivateLog } from '../logs/private_log.js';
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
@@ -20,9 +20,10 @@ export declare class PrivateToPublicAccumulatedData {
     static fromFields(fields: Fr[] | FieldReader): PrivateToPublicAccumulatedData;
     static from(fields: FieldsOf<PrivateToPublicAccumulatedData>): PrivateToPublicAccumulatedData;
     static fromBuffer(buffer: Buffer | BufferReader): PrivateToPublicAccumulatedData;
-    toBuffer(): Buffer<ArrayBufferLike>;
+    toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     toFields(): Fr[];
     static empty(): PrivateToPublicAccumulatedData;
     [inspect.custom](): string;
 }
-//# sourceMappingURL=private_to_public_accumulated_data.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90b19wdWJsaWNfYWNjdW11bGF0ZWRfZGF0YS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX3RvX3B1YmxpY19hY2N1bXVsYXRlZF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCw4QkFBOEIsRUFDOUIseUJBQXlCLEVBQ3pCLHdCQUF3QixFQUN4QixzQkFBc0IsRUFDdEIscUJBQXFCLEVBQ3JCLHVCQUF1QixFQUV4QixNQUFNLGtCQUFrQixDQUFDO0FBQzFCLE9BQU8sRUFBRSxLQUFLLFFBQVEsRUFBYSxNQUFNLHlCQUF5QixDQUFDO0FBRW5FLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQ0wsWUFBWSxFQUNaLFVBQVUsRUFDVixXQUFXLEVBQ1gsS0FBSyxLQUFLLEVBR1gsTUFBTSw2QkFBNkIsQ0FBQztBQUVyQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRS9CLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUN2RSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzlDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTdELHFCQUFhLDhCQUE4QjthQUV2QixVQUFVLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxPQUFPLHNCQUFzQixDQUFDO2FBQ3BELFVBQVUsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLE9BQU8scUJBQXFCLENBQUM7YUFDbkQsVUFBVSxFQUFFLEtBQUssQ0FBQyxtQkFBbUIsRUFBRSxPQUFPLHdCQUF3QixDQUFDO2FBQ3ZFLFdBQVcsRUFBRSxLQUFLLENBQUMsVUFBVSxFQUFFLE9BQU8sdUJBQXVCLENBQUM7YUFDOUQsdUJBQXVCLEVBQUUsS0FBSyxDQUFDLGFBQWEsRUFBRSxPQUFPLDhCQUE4QixDQUFDO2FBQ3BGLGtCQUFrQixFQUFFLEtBQUssQ0FBQyxpQkFBaUIsRUFBRSxPQUFPLHlCQUF5QixDQUFDO0lBTmhHLFlBQ2tCLFVBQVUsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLE9BQU8sc0JBQXNCLENBQUMsRUFDcEQsVUFBVSxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsT0FBTyxxQkFBcUIsQ0FBQyxFQUNuRCxVQUFVLEVBQUUsS0FBSyxDQUFDLG1CQUFtQixFQUFFLE9BQU8sd0JBQXdCLENBQUMsRUFDdkUsV0FBVyxFQUFFLEtBQUssQ0FBQyxVQUFVLEVBQUUsT0FBTyx1QkFBdUIsQ0FBQyxFQUM5RCx1QkFBdUIsRUFBRSxLQUFLLENBQUMsYUFBYSxFQUFFLE9BQU8sOEJBQThCLENBQUMsRUFDcEYsa0JBQWtCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQixFQUFFLE9BQU8seUJBQXlCLENBQUMsRUFDNUY7SUFFSixPQUFPLFdBU047SUFFRCxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsOEJBQThCLENBQUMsZ2pFQVNoRTtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsa0NBVTNDO0lBRUQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLDhCQUE4QixDQUFDLGtDQUUzRDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLGtDQVU5QztJQUVELFFBQVEsSUFBSSxNQUFNLENBQUM7SUFDbkIsUUFBUSxDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsSUFBSSxDQUFDO0lBUWpDLFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FRZjtJQUVELE1BQU0sQ0FBQyxLQUFLLG1DQVNYO0lBRUQsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLFdBMkJmO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"private_to_public_accumulated_data.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_public_accumulated_data.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,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;AAC9C,OAAO,EACL,YAAY,EACZ,WAAW,EACX,KAAK,KAAK,EAGX,MAAM,6BAA6B,CAAC;AAErC,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;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,qBAAa,8BAA8B;aAEvB,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,sBAAsB,CAAC;aACpD,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC;aACnD,UAAU,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,wBAAwB,CAAC;aACvE,WAAW,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,uBAAuB,CAAC;aAC9D,uBAAuB,EAAE,KAAK,CAAC,aAAa,EAAE,OAAO,8BAA8B,CAAC;aACpF,kBAAkB,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,yBAAyB,CAAC;gBAL9E,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,sBAAsB,CAAC,EACpD,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC,EACnD,UAAU,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,wBAAwB,CAAC,EACvE,WAAW,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,uBAAuB,CAAC,EAC9D,uBAAuB,EAAE,KAAK,CAAC,aAAa,EAAE,OAAO,8BAA8B,CAAC,EACpF,kBAAkB,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,yBAAyB,CAAC;IAGhG,OAAO;IAWP,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,8BAA8B,CAAC;IAWjE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAY5C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,8BAA8B,CAAC;IAI5D,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAY/C,QAAQ;IAIR,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,KAAK;IAWZ,CAAC,OAAO,CAAC,MAAM,CAAC;CA4BjB"}
+{"version":3,"file":"private_to_public_accumulated_data.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_public_accumulated_data.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,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,gCAAgC,CAAC;AACpD,OAAO,EACL,YAAY,EACZ,UAAU,EACV,WAAW,EACX,KAAK,KAAK,EAGX,MAAM,6BAA6B,CAAC;AAErC,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;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,qBAAa,8BAA8B;aAEvB,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,sBAAsB,CAAC;aACpD,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC;aACnD,UAAU,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,wBAAwB,CAAC;aACvE,WAAW,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,uBAAuB,CAAC;aAC9D,uBAAuB,EAAE,KAAK,CAAC,aAAa,EAAE,OAAO,8BAA8B,CAAC;aACpF,kBAAkB,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,yBAAyB,CAAC;IANhG,YACkB,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,sBAAsB,CAAC,EACpD,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC,EACnD,UAAU,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,wBAAwB,CAAC,EACvE,WAAW,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,uBAAuB,CAAC,EAC9D,uBAAuB,EAAE,KAAK,CAAC,aAAa,EAAE,OAAO,8BAA8B,CAAC,EACpF,kBAAkB,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,yBAAyB,CAAC,EAC5F;IAEJ,OAAO,WASN;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,8BAA8B,CAAC,gjEAShE;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,kCAU3C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,8BAA8B,CAAC,kCAE3D;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,kCAU9C;IAED,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAQjC,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,KAAK,mCASX;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WA2Bf;CACF"}

package/dest/kernel/private_to_public_accumulated_data.js

@@ -1,13 +1,15 @@
+var _computedKey;
 import { MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_ENQUEUED_CALLS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX, PRIVATE_TO_PUBLIC_ACCUMULATED_DATA_LENGTH } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
 import { arraySerializedSizeOfNonEmpty } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, BufferSink, FieldReader, serializeToFields, serializeToSink } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { PrivateLog } from '../logs/private_log.js';
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 import { ScopedLogHash } from './log_hash.js';
 import { PublicCallRequest } from './public_call_request.js';
+_computedKey = inspect.custom;
 export class PrivateToPublicAccumulatedData {
     noteHashes;
     nullifiers;
@@ -47,8 +49,11 @@ export class PrivateToPublicAccumulatedData {
         const reader = BufferReader.asReader(buffer);
         return new PrivateToPublicAccumulatedData(reader.readArray(MAX_NOTE_HASHES_PER_TX, Fr), reader.readArray(MAX_NULLIFIERS_PER_TX, Fr), reader.readArray(MAX_L2_TO_L1_MSGS_PER_TX, ScopedL2ToL1Message), reader.readArray(MAX_PRIVATE_LOGS_PER_TX, PrivateLog), reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_TX, ScopedLogHash), reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest));
     }
-    toBuffer() {
-        return serializeToBuffer(...PrivateToPublicAccumulatedData.getFields(this));
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, ...PrivateToPublicAccumulatedData.getFields(this));
     }
     toFields() {
         const fields = serializeToFields(...PrivateToPublicAccumulatedData.getFields(this));
@@ -60,7 +65,7 @@ export class PrivateToPublicAccumulatedData {
     static empty() {
         return new PrivateToPublicAccumulatedData(makeTuple(MAX_NOTE_HASHES_PER_TX, Fr.zero), makeTuple(MAX_NULLIFIERS_PER_TX, Fr.zero), makeTuple(MAX_L2_TO_L1_MSGS_PER_TX, ScopedL2ToL1Message.empty), makeTuple(MAX_PRIVATE_LOGS_PER_TX, PrivateLog.empty), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ScopedLogHash.empty), makeTuple(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest.empty));
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `PrivateToPublicAccumulatedData {
       noteHashes: [${this.noteHashes.filter((x)=>!x.isZero()).map((x)=>inspect(x)).join(', ')}],
       nullifiers: [${this.nullifiers.filter((x)=>!x.isZero()).map((x)=>inspect(x)).join(', ')}],

package/dest/kernel/private_to_public_accumulated_data_builder.d.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { PrivateLog } from '../logs/private_log.js';
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 import { ScopedLogHash } from './log_hash.js';
@@ -31,4 +31,4 @@ export declare class PrivateToPublicAccumulatedDataBuilder {
     withPublicCallRequests(publicCallRequests: PublicCallRequest[]): this;
     build(): PrivateToPublicAccumulatedData;
 }
-//# sourceMappingURL=private_to_public_accumulated_data_builder.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90b19wdWJsaWNfYWNjdW11bGF0ZWRfZGF0YV9idWlsZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2VybmVsL3ByaXZhdGVfdG9fcHVibGljX2FjY3VtdWxhdGVkX2RhdGFfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFTQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3BELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDOUMsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFDekYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFN0Q7Ozs7O0dBS0c7QUFDSCxxQkFBYSxxQ0FBcUM7SUFDaEQsT0FBTyxDQUFDLFVBQVUsQ0FBWTtJQUM5QixPQUFPLENBQUMsVUFBVSxDQUFZO0lBQzlCLE9BQU8sQ0FBQyxVQUFVLENBQTZCO0lBQy9DLE9BQU8sQ0FBQyxXQUFXLENBQW9CO0lBQ3ZDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBdUI7SUFDdEQsT0FBTyxDQUFDLGtCQUFrQixDQUEyQjtJQUVyRCxZQUFZLENBQUMsV0FBVyxFQUFFLEVBQUUsUUFHM0I7SUFFRCxjQUFjLENBQUMsVUFBVSxFQUFFLEVBQUUsRUFBRSxRQUc5QjtJQUVELGFBQWEsQ0FBQyxZQUFZLEVBQUUsRUFBRSxRQUc3QjtJQUVELGNBQWMsQ0FBQyxVQUFVLEVBQUUsRUFBRSxFQUFFLFFBRzlCO0lBRUQsYUFBYSxDQUFDLFlBQVksRUFBRSxtQkFBbUIsUUFHOUM7SUFFRCxjQUFjLENBQUMsVUFBVSxFQUFFLG1CQUFtQixFQUFFLFFBRy9DO0lBRUQsY0FBYyxDQUFDLFVBQVUsRUFBRSxVQUFVLFFBR3BDO0lBRUQsZUFBZSxDQUFDLFdBQVcsRUFBRSxVQUFVLEVBQUUsUUFHeEM7SUFFRCx5QkFBeUIsQ0FBQyxxQkFBcUIsRUFBRSxhQUFhLFFBRzdEO0lBRUQsMkJBQTJCLENBQUMsdUJBQXVCLEVBQUUsYUFBYSxFQUFFLFFBR25FO0lBRUQsY0FBYyxDQUFDLFVBQVUsRUFBRSxpQkFBaUIsUUFHM0M7SUFFRCxzQkFBc0IsQ0FBQyxrQkFBa0IsRUFBRSxpQkFBaUIsRUFBRSxRQUc3RDtJQUVELEtBQUssbUNBU0o7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"private_to_public_accumulated_data_builder.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_public_accumulated_data_builder.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;;;GAKG;AACH,qBAAa,qCAAqC;IAChD,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,uBAAuB,CAAuB;IACtD,OAAO,CAAC,kBAAkB,CAA2B;IAErD,YAAY,CAAC,WAAW,EAAE,EAAE;IAK5B,cAAc,CAAC,UAAU,EAAE,EAAE,EAAE;IAK/B,aAAa,CAAC,YAAY,EAAE,EAAE;IAK9B,cAAc,CAAC,UAAU,EAAE,EAAE,EAAE;IAK/B,aAAa,CAAC,YAAY,EAAE,mBAAmB;IAK/C,cAAc,CAAC,UAAU,EAAE,mBAAmB,EAAE;IAKhD,cAAc,CAAC,UAAU,EAAE,UAAU;IAKrC,eAAe,CAAC,WAAW,EAAE,UAAU,EAAE;IAKzC,yBAAyB,CAAC,qBAAqB,EAAE,aAAa;IAK9D,2BAA2B,CAAC,uBAAuB,EAAE,aAAa,EAAE;IAKpE,cAAc,CAAC,UAAU,EAAE,iBAAiB;IAK5C,sBAAsB,CAAC,kBAAkB,EAAE,iBAAiB,EAAE;IAK9D,KAAK;CAUN"}
+{"version":3,"file":"private_to_public_accumulated_data_builder.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_public_accumulated_data_builder.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;;;GAKG;AACH,qBAAa,qCAAqC;IAChD,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,uBAAuB,CAAuB;IACtD,OAAO,CAAC,kBAAkB,CAA2B;IAErD,YAAY,CAAC,WAAW,EAAE,EAAE,QAG3B;IAED,cAAc,CAAC,UAAU,EAAE,EAAE,EAAE,QAG9B;IAED,aAAa,CAAC,YAAY,EAAE,EAAE,QAG7B;IAED,cAAc,CAAC,UAAU,EAAE,EAAE,EAAE,QAG9B;IAED,aAAa,CAAC,YAAY,EAAE,mBAAmB,QAG9C;IAED,cAAc,CAAC,UAAU,EAAE,mBAAmB,EAAE,QAG/C;IAED,cAAc,CAAC,UAAU,EAAE,UAAU,QAGpC;IAED,eAAe,CAAC,WAAW,EAAE,UAAU,EAAE,QAGxC;IAED,yBAAyB,CAAC,qBAAqB,EAAE,aAAa,QAG7D;IAED,2BAA2B,CAAC,uBAAuB,EAAE,aAAa,EAAE,QAGnE;IAED,cAAc,CAAC,UAAU,EAAE,iBAAiB,QAG3C;IAED,sBAAsB,CAAC,kBAAkB,EAAE,iBAAiB,EAAE,QAG7D;IAED,KAAK,mCASJ;CACF"}

package/dest/kernel/private_to_public_accumulated_data_builder.js

@@ -1,6 +1,6 @@
 import { MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_ENQUEUED_CALLS_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 { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { PrivateLog } from '../logs/private_log.js';
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 import { ScopedLogHash } from './log_hash.js';

package/dest/kernel/private_to_public_kernel_circuit_public_inputs.d.ts

@@ -1,5 +1,5 @@
-import type { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, BufferSink } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { AztecAddress } from '../aztec-address/index.js';
 import { Gas } from '../gas/gas.js';
@@ -14,9 +14,10 @@ export declare class PrivateToPublicKernelCircuitPublicInputs {
     publicTeardownCallRequest: PublicCallRequest;
     gasUsed: Gas;
     feePayer: AztecAddress;
-    includeByTimestamp: UInt64;
-    constructor(constants: TxConstantData, nonRevertibleAccumulatedData: PrivateToPublicAccumulatedData, revertibleAccumulatedData: PrivateToPublicAccumulatedData, publicTeardownCallRequest: PublicCallRequest, gasUsed: Gas, feePayer: AztecAddress, includeByTimestamp: UInt64);
-    toBuffer(): Buffer<ArrayBufferLike>;
+    expirationTimestamp: UInt64;
+    constructor(constants: TxConstantData, nonRevertibleAccumulatedData: PrivateToPublicAccumulatedData, revertibleAccumulatedData: PrivateToPublicAccumulatedData, publicTeardownCallRequest: PublicCallRequest, gasUsed: Gas, feePayer: AztecAddress, expirationTimestamp: UInt64);
+    toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     static getFields(fields: FieldsOf<PrivateToPublicKernelCircuitPublicInputs>): readonly [TxConstantData, PrivateToPublicAccumulatedData, PrivateToPublicAccumulatedData, PublicCallRequest, Gas, AztecAddress, bigint];
     static fromBuffer(buffer: Buffer | BufferReader): PrivateToPublicKernelCircuitPublicInputs;
     static empty(): PrivateToPublicKernelCircuitPublicInputs;
@@ -25,6 +26,6 @@ export declare class PrivateToPublicKernelCircuitPublicInputs {
     toFields(): Fr[];
     hash(): Promise<Fr>;
     toJSON(): Buffer<ArrayBufferLike>;
-    static get schema(): import("zod").ZodType<PrivateToPublicKernelCircuitPublicInputs, any, string>;
+    static get schema(): import("zod").ZodType<PrivateToPublicKernelCircuitPublicInputs, string, import("zod/v4/core").$ZodTypeInternals<PrivateToPublicKernelCircuitPublicInputs, string>>;
 }
-//# sourceMappingURL=private_to_public_kernel_circuit_public_inputs.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90b19wdWJsaWNfa2VybmVsX2NpcmN1aXRfcHVibGljX2lucHV0cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX3RvX3B1YmxpY19rZXJuZWxfY2lyY3VpdF9wdWJsaWNfaW5wdXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFzQyxNQUFNLDZCQUE2QixDQUFDO0FBRTNHLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3BDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUN6RixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU3RCxxQkFBYSx3Q0FBd0M7SUFFMUMsU0FBUyxFQUFFLGNBQWM7SUFDekIsNEJBQTRCLEVBQUUsOEJBQThCO0lBQzVELHlCQUF5QixFQUFFLDhCQUE4QjtJQUN6RCx5QkFBeUIsRUFBRSxpQkFBaUI7SUFDNUMsT0FBTyxFQUFFLEdBQUc7SUFDWixRQUFRLEVBQUUsWUFBWTtJQUN0QixtQkFBbUIsRUFBRSxNQUFNO0lBUHBDLFlBQ1MsU0FBUyxFQUFFLGNBQWMsRUFDekIsNEJBQTRCLEVBQUUsOEJBQThCLEVBQzVELHlCQUF5QixFQUFFLDhCQUE4QixFQUN6RCx5QkFBeUIsRUFBRSxpQkFBaUIsRUFDNUMsT0FBTyxFQUFFLEdBQUcsRUFDWixRQUFRLEVBQUUsWUFBWSxFQUN0QixtQkFBbUIsRUFBRSxNQUFNLEVBQ2hDO0lBRUosUUFBUSxJQUFJLE1BQU0sQ0FBQztJQUNuQixRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxJQUFJLENBQUM7SUFpQmpDLE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyx3Q0FBd0MsQ0FBQywySUFVMUU7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSw0Q0FXOUM7SUFFRCxNQUFNLENBQUMsS0FBSyw2Q0FVWDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sNENBRTVCO0lBRUQsUUFBUSxrQkFFUDtJQUVELFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FRZjtJQUVELElBQUksZ0JBRUg7SUFFRCxNQUFNLDRCQUVMO0lBRUQsTUFBTSxLQUFLLE1BQU0sdUtBRWhCO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"private_to_public_kernel_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_public_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;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,qBAAa,wCAAwC;IAE1C,SAAS,EAAE,cAAc;IACzB,4BAA4B,EAAE,8BAA8B;IAC5D,yBAAyB,EAAE,8BAA8B;IACzD,yBAAyB,EAAE,iBAAiB;IAC5C,OAAO,EAAE,GAAG;IACZ,QAAQ,EAAE,YAAY;IACtB,kBAAkB,EAAE,MAAM;gBAN1B,SAAS,EAAE,cAAc,EACzB,4BAA4B,EAAE,8BAA8B,EAC5D,yBAAyB,EAAE,8BAA8B,EACzD,yBAAyB,EAAE,iBAAiB,EAC5C,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,YAAY,EACtB,kBAAkB,EAAE,MAAM;IAGnC,QAAQ;IAYR,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,wCAAwC,CAAC;IAY3E,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAa/C,MAAM,CAAC,KAAK;IAYZ,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,QAAQ;IAIR,QAAQ,IAAI,EAAE,EAAE;IAUhB,IAAI;IAIJ,MAAM;IAIN,MAAM,KAAK,MAAM,iFAEhB;CACF"}
+{"version":3,"file":"private_to_public_kernel_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_to_public_kernel_circuit_public_inputs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAsC,MAAM,6BAA6B,CAAC;AAE3G,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;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,qBAAa,wCAAwC;IAE1C,SAAS,EAAE,cAAc;IACzB,4BAA4B,EAAE,8BAA8B;IAC5D,yBAAyB,EAAE,8BAA8B;IACzD,yBAAyB,EAAE,iBAAiB;IAC5C,OAAO,EAAE,GAAG;IACZ,QAAQ,EAAE,YAAY;IACtB,mBAAmB,EAAE,MAAM;IAPpC,YACS,SAAS,EAAE,cAAc,EACzB,4BAA4B,EAAE,8BAA8B,EAC5D,yBAAyB,EAAE,8BAA8B,EACzD,yBAAyB,EAAE,iBAAiB,EAC5C,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,YAAY,EACtB,mBAAmB,EAAE,MAAM,EAChC;IAEJ,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAiBjC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,wCAAwC,CAAC,2IAU1E;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,4CAW9C;IAED,MAAM,CAAC,KAAK,6CAUX;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,4CAE5B;IAED,QAAQ,kBAEP;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,IAAI,gBAEH;IAED,MAAM,4BAEL;IAED,MAAM,KAAK,MAAM,uKAEhB;CACF"}

package/dest/kernel/private_to_public_kernel_circuit_public_inputs.js

@@ -1,7 +1,7 @@
-import { GeneratorIndex, PRIVATE_TO_PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants';
-import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
+import { DomainSeparator, PRIVATE_TO_PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
-import { BufferReader, bigintToUInt64BE, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { BufferReader, BufferSink, serializeToFields, serializeToSink } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { AztecAddress } from '../aztec-address/index.js';
 import { Gas } from '../gas/gas.js';
@@ -15,18 +15,22 @@ export class PrivateToPublicKernelCircuitPublicInputs {
     publicTeardownCallRequest;
     gasUsed;
     feePayer;
-    includeByTimestamp;
-    constructor(constants, nonRevertibleAccumulatedData, revertibleAccumulatedData, publicTeardownCallRequest, gasUsed, feePayer, includeByTimestamp){
+    expirationTimestamp;
+    constructor(constants, nonRevertibleAccumulatedData, revertibleAccumulatedData, publicTeardownCallRequest, gasUsed, feePayer, expirationTimestamp){
         this.constants = constants;
         this.nonRevertibleAccumulatedData = nonRevertibleAccumulatedData;
         this.revertibleAccumulatedData = revertibleAccumulatedData;
         this.publicTeardownCallRequest = publicTeardownCallRequest;
         this.gasUsed = gasUsed;
         this.feePayer = feePayer;
-        this.includeByTimestamp = includeByTimestamp;
+        this.expirationTimestamp = expirationTimestamp;
     }
-    toBuffer() {
-        return serializeToBuffer(this.constants, this.nonRevertibleAccumulatedData, this.revertibleAccumulatedData, this.publicTeardownCallRequest, this.gasUsed, this.feePayer, bigintToUInt64BE(this.includeByTimestamp));
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, this.constants, this.nonRevertibleAccumulatedData, this.revertibleAccumulatedData, this.publicTeardownCallRequest, this.gasUsed, this.feePayer);
+        sink.writeUInt64(this.expirationTimestamp);
     }
     static getFields(fields) {
         return [
@@ -36,7 +40,7 @@ export class PrivateToPublicKernelCircuitPublicInputs {
             fields.publicTeardownCallRequest,
             fields.gasUsed,
             fields.feePayer,
-            fields.includeByTimestamp
+            fields.expirationTimestamp
         ];
     }
     static fromBuffer(buffer) {
@@ -60,7 +64,7 @@ export class PrivateToPublicKernelCircuitPublicInputs {
         return fields;
     }
     hash() {
-        return poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.PUBLIC_TX_HASH);
+        return poseidon2HashWithSeparator(this.toFields(), DomainSeparator.PUBLIC_TX_HASH);
     }
     toJSON() {
         return this.toBuffer();

package/dest/kernel/private_to_rollup_accumulated_data.d.ts

@@ -1,7 +1,7 @@
 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';
-import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, BufferSink, type Tuple } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { PrivateLog } from '../logs/private_log.js';
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
@@ -56,9 +56,10 @@ export declare class PrivateToRollupAccumulatedData {
     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, 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>;
+    static get schema(): import("zod").ZodType<PrivateToRollupAccumulatedData, string, import("zod/v4/core").$ZodTypeInternals<PrivateToRollupAccumulatedData, string>>;
     toJSON(): Buffer<ArrayBufferLike>;
-    toBuffer(): Buffer<ArrayBufferLike>;
+    toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     toString(): `0x${string}`;
     /**
      * Deserializes from a buffer or reader, corresponding to a write in cpp.
@@ -76,4 +77,4 @@ export declare class PrivateToRollupAccumulatedData {
     toFields(): Fr[];
     [inspect.custom](): string;
 }
-//# sourceMappingURL=private_to_rollup_accumulated_data.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90b19yb2xsdXBfYWNjdW11bGF0ZWRfZGF0YS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX3RvX3JvbGx1cF9hY2N1bXVsYXRlZF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCw4QkFBOEIsRUFDOUIsd0JBQXdCLEVBQ3hCLHNCQUFzQixFQUN0QixxQkFBcUIsRUFDckIsdUJBQXVCLEVBRXhCLE1BQU0sa0JBQWtCLENBQUM7QUFDMUIsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFhLE1BQU0seUJBQXlCLENBQUM7QUFFbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLEtBQUssS0FBSyxFQUFzQyxNQUFNLDZCQUE2QixDQUFDO0FBR3ZILE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFL0IsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3BELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFOUM7O0dBRUc7QUFDSCxxQkFBYSw4QkFBOEI7SUFFdkM7O09BRUc7SUFDSSxVQUFVLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxPQUFPLHNCQUFzQixDQUFDO0lBQzNEOztPQUVHO0lBQ0ksVUFBVSxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsT0FBTyxxQkFBcUIsQ0FBQztJQUMxRDs7T0FFRztJQUNJLFVBQVUsRUFBRSxLQUFLLENBQUMsbUJBQW1CLEVBQUUsT0FBTyx3QkFBd0IsQ0FBQztJQUM5RTs7T0FFRztJQUNJLFdBQVcsRUFBRSxLQUFLLENBQUMsVUFBVSxFQUFFLE9BQU8sdUJBQXVCLENBQUM7SUFDckU7OztPQUdHO0lBQ0ksdUJBQXVCLEVBQUUsS0FBSyxDQUFDLGFBQWEsRUFBRSxPQUFPLDhCQUE4QixDQUFDO0lBckI3RjtJQUNFOztPQUVHO0lBQ0ksVUFBVSxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsT0FBTyxzQkFBc0IsQ0FBQztJQUMzRDs7T0FFRztJQUNJLFVBQVUsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLE9BQU8scUJBQXFCLENBQUM7SUFDMUQ7O09BRUc7SUFDSSxVQUFVLEVBQUUsS0FBSyxDQUFDLG1CQUFtQixFQUFFLE9BQU8sd0JBQXdCLENBQUM7SUFDOUU7O09BRUc7SUFDSSxXQUFXLEVBQUUsS0FBSyxDQUFDLFVBQVUsRUFBRSxPQUFPLHVCQUF1QixDQUFDO0lBQ3JFOzs7T0FHRztJQUNJLHVCQUF1QixFQUFFLEtBQUssQ0FBQyxhQUFhLEVBQUUsT0FBTyw4QkFBOEIsQ0FBQyxFQUN6RjtJQUVKLE9BQU8sV0FRTjtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyw4QkFBOEIsQ0FBQyw4OENBUWhFO0lBRUQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLDhCQUE4QixDQUFDLEdBQUcsOEJBQThCLENBRTVGO0lBRUQsTUFBTSxLQUFLLE1BQU0sbUpBRWhCO0lBRUQsTUFBTSw0QkFFTDtJQUVELFFBQVEsSUFBSSxNQUFNLENBQUM7SUFDbkIsUUFBUSxDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsSUFBSSxDQUFDO0lBUWpDLFFBQVEsa0JBRVA7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyw4QkFBOEIsQ0FTL0U7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxrQ0FFNUI7SUFFRCxNQUFNLENBQUMsS0FBSyxtQ0FRWDtJQUVELFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FRZjtJQUVELENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxXQXVCZjtDQUNGIn0=

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,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,KAAK,EAAsC,MAAM,6BAA6B,CAAC;AAGvH,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;IArB7F;IACE;;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,EACzF;IAEJ,OAAO,WAQN;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,8BAA8B,CAAC,88CAQhE;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,8BAA8B,CAAC,GAAG,8BAA8B,CAE5F;IAED,MAAM,KAAK,MAAM,mJAEhB;IAED,MAAM,4BAEL;IAED,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAQjC,QAAQ,kBAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,8BAA8B,CAS/E;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,kCAE5B;IAED,MAAM,CAAC,KAAK,mCAQX;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAuBf;CACF"}

package/dest/kernel/private_to_rollup_accumulated_data.js

@@ -1,14 +1,16 @@
+var _computedKey;
 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, PRIVATE_TO_ROLLUP_ACCUMULATED_DATA_LENGTH } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
 import { arraySerializedSizeOfNonEmpty } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
-import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { BufferReader, BufferSink, serializeToFields, serializeToSink } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { inspect } from 'util';
 import { PrivateLog } from '../logs/private_log.js';
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 import { ScopedLogHash } from './log_hash.js';
+_computedKey = inspect.custom;
 /**
  * Data that is accumulated during the execution of the transaction.
  */ export class PrivateToRollupAccumulatedData {
@@ -56,8 +58,11 @@ import { ScopedLogHash } from './log_hash.js';
     toJSON() {
         return this.toBuffer();
     }
-    toBuffer() {
-        return serializeToBuffer(...PrivateToRollupAccumulatedData.getFields(this));
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, ...PrivateToRollupAccumulatedData.getFields(this));
     }
     toString() {
         return bufferToHex(this.toBuffer());
@@ -87,7 +92,7 @@ import { ScopedLogHash } from './log_hash.js';
         }
         return fields;
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `PrivateToRollupAccumulatedData {
       noteHashes: [${this.noteHashes.filter((x)=>!x.isZero()).map((x)=>inspect(x)).join(', ')}],
       nullifiers: [${this.nullifiers.filter((x)=>!x.isZero()).map((x)=>inspect(x)).join(', ')}],

package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.d.ts

@@ -1,5 +1,5 @@
-import type { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, BufferSink } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { AztecAddress } from '../aztec-address/index.js';
 import { Gas } from '../gas/gas.js';
@@ -30,7 +30,7 @@ export declare class PrivateToRollupKernelCircuitPublicInputs {
     /**
      * The timestamp by which the transaction must be included in a block.
      */
-    includeByTimestamp: UInt64;
+    expirationTimestamp: UInt64;
     constructor(
     /**
      * Data which is not modified by the circuits.
@@ -51,9 +51,10 @@ export declare class PrivateToRollupKernelCircuitPublicInputs {
     /**
      * The timestamp by which the transaction must be included in a block.
      */
-    includeByTimestamp: UInt64);
+    expirationTimestamp: UInt64);
     getNonEmptyNullifiers(): Fr[];
-    toBuffer(): Buffer<ArrayBufferLike>;
+    toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     /**
      * Deserializes from a buffer or reader, corresponding to a write in cpp.
      * @param buffer - Buffer or reader to read from.
@@ -67,8 +68,8 @@ export declare class PrivateToRollupKernelCircuitPublicInputs {
     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>;
+    static get schema(): import("zod").ZodType<PrivateToRollupKernelCircuitPublicInputs, string, import("zod/v4/core").$ZodTypeInternals<PrivateToRollupKernelCircuitPublicInputs, string>>;
     toFields(): Fr[];
     hash(): Promise<Fr>;
 }
-//# sourceMappingURL=private_to_rollup_kernel_circuit_public_inputs.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90b19yb2xsdXBfa2VybmVsX2NpcmN1aXRfcHVibGljX2lucHV0cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wcml2YXRlX3RvX3JvbGx1cF9rZXJuZWxfY2lyY3VpdF9wdWJsaWNfaW5wdXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFzQyxNQUFNLDZCQUE2QixDQUFDO0FBRTNHLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3BDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUV6Rjs7O0dBR0c7QUFDSCxxQkFBYSx3Q0FBd0M7SUFFakQ7O09BRUc7SUFDSSxTQUFTLEVBQUUsY0FBYztJQUNoQzs7T0FFRztJQUNJLEdBQUcsRUFBRSw4QkFBOEI7SUFDMUM7O09BRUc7SUFDSSxPQUFPLEVBQUUsR0FBRztJQUNuQjs7T0FFRztJQUNJLFFBQVEsRUFBRSxZQUFZO0lBQzdCOztPQUVHO0lBQ0ksbUJBQW1CLEVBQUUsTUFBTTtJQXBCcEM7SUFDRTs7T0FFRztJQUNJLFNBQVMsRUFBRSxjQUFjO0lBQ2hDOztPQUVHO0lBQ0ksR0FBRyxFQUFFLDhCQUE4QjtJQUMxQzs7T0FFRztJQUNJLE9BQU8sRUFBRSxHQUFHO0lBQ25COztPQUVHO0lBQ0ksUUFBUSxFQUFFLFlBQVk7SUFDN0I7O09BRUc7SUFDSSxtQkFBbUIsRUFBRSxNQUFNLEVBQ2hDO0lBRUoscUJBQXFCLFNBRXBCO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FBQztJQUNuQixRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxJQUFJLENBQUM7SUFTakM7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsd0NBQXdDLENBU3pGO0lBRUQsTUFBTSxDQUFDLEtBQUssNkNBUVg7SUFFRCxRQUFRLGtCQUVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSw0Q0FFNUI7SUFFRCwyREFBMkQ7SUFDM0QsTUFBTSw0QkFFTDtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyx3Q0FBd0MsQ0FBQyx3RkFFMUU7SUFFRCw2Q0FBNkM7SUFDN0MsTUFBTSxLQUFLLE1BQU0sdUtBRWhCO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsSUFBSSxnQkFFSDtDQUNGIn0=

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,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"}
+{"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,gCAAgC,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAsC,MAAM,6BAA6B,CAAC;AAE3G,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,mBAAmB,EAAE,MAAM;IApBpC;IACE;;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,mBAAmB,EAAE,MAAM,EAChC;IAEJ,qBAAqB,SAEpB;IAED,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IASjC;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,wCAAwC,CASzF;IAED,MAAM,CAAC,KAAK,6CAQX;IAED,QAAQ,kBAEP;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,4CAE5B;IAED,2DAA2D;IAC3D,MAAM,4BAEL;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,wCAAwC,CAAC,wFAE1E;IAED,6CAA6C;IAC7C,MAAM,KAAK,MAAM,uKAEhB;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,IAAI,gBAEH;CACF"}

package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.js

@@ -1,7 +1,7 @@
-import { GeneratorIndex, PRIVATE_TO_ROLLUP_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants';
-import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
+import { DomainSeparator, PRIVATE_TO_ROLLUP_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
-import { BufferReader, bigintToUInt64BE, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { BufferReader, BufferSink, serializeToFields, serializeToSink } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { AztecAddress } from '../aztec-address/index.js';
 import { Gas } from '../gas/gas.js';
@@ -15,7 +15,7 @@ import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_
     end;
     gasUsed;
     feePayer;
-    includeByTimestamp;
+    expirationTimestamp;
     constructor(/**
      * Data which is not modified by the circuits.
      */ constants, /**
@@ -26,18 +26,22 @@ import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_
      * The address of the fee payer for the transaction.
      */ feePayer, /**
      * The timestamp by which the transaction must be included in a block.
-     */ includeByTimestamp){
+     */ expirationTimestamp){
         this.constants = constants;
         this.end = end;
         this.gasUsed = gasUsed;
         this.feePayer = feePayer;
-        this.includeByTimestamp = includeByTimestamp;
+        this.expirationTimestamp = expirationTimestamp;
     }
     getNonEmptyNullifiers() {
         return this.end.nullifiers.filter((n)=>!n.isZero());
     }
-    toBuffer() {
-        return serializeToBuffer(this.constants, this.end, this.gasUsed, this.feePayer, bigintToUInt64BE(this.includeByTimestamp));
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, this.constants, this.end, this.gasUsed, this.feePayer);
+        sink.writeUInt64(this.expirationTimestamp);
     }
     /**
    * Deserializes from a buffer or reader, corresponding to a write in cpp.
@@ -65,7 +69,7 @@ import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_
             fields.end,
             fields.gasUsed,
             fields.feePayer,
-            fields.includeByTimestamp
+            fields.expirationTimestamp
         ];
     }
     /** Creates an instance from a hex string. */ static get schema() {
@@ -79,6 +83,6 @@ import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_
         return fields;
     }
     hash() {
-        return poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.PRIVATE_TX_HASH);
+        return poseidon2HashWithSeparator(this.toFields(), DomainSeparator.PRIVATE_TX_HASH);
     }
 }

package/dest/kernel/private_validation_requests.d.ts

@@ -1,10 +1,9 @@
 import { MAX_KEY_VALIDATION_REQUESTS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX } from '@aztec/constants';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
-import { ScopedKeyValidationRequestAndGenerator } from '../kernel/hints/scoped_key_validation_request_and_generator.js';
+import { ScopedKeyValidationRequestAndSeparator } from '../kernel/hints/scoped_key_validation_request_and_separator.js';
 import { ClaimedLengthArray } from './claimed_length_array.js';
 import { ScopedReadRequest } from './hints/read_request.js';
-import { OptionalNumber } from './utils/optional_number.js';
 /**
  * Validation requests accumulated during the execution of the transaction.
  */
@@ -20,13 +19,7 @@ export declare class PrivateValidationRequests {
     /**
      * All the key validation requests made in this transaction.
      */
-    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.
-     * It should be the "final" minRevertibleSideEffectCounter of a tx.
-     */
-    splitCounter: OptionalNumber;
+    scopedKeyValidationRequestsAndSeparators: ClaimedLengthArray<ScopedKeyValidationRequestAndSeparator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX>;
     constructor(
     /**
      * All the read requests made in this transaction.
@@ -39,13 +32,7 @@ export declare class PrivateValidationRequests {
     /**
      * All the key validation requests made in this transaction.
      */
-    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.
-     * It should be the "final" minRevertibleSideEffectCounter of a tx.
-     */
-    splitCounter: OptionalNumber);
+    scopedKeyValidationRequestsAndSeparators: ClaimedLengthArray<ScopedKeyValidationRequestAndSeparator, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX>);
     getSize(): number;
     toBuffer(): Buffer<ArrayBufferLike>;
     toString(): `0x${string}`;
@@ -64,4 +51,4 @@ export declare class PrivateValidationRequests {
     static empty(): PrivateValidationRequests;
     [inspect.custom](): string;
 }
-//# sourceMappingURL=private_validation_requests.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV92YWxpZGF0aW9uX3JlcXVlc3RzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2VybmVsL3ByaXZhdGVfdmFsaWRhdGlvbl9yZXF1ZXN0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsa0NBQWtDLEVBQ2xDLGtDQUFrQyxFQUNsQyxrQ0FBa0MsRUFDbkMsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQixPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRzlFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFL0IsT0FBTyxFQUFFLHNDQUFzQyxFQUFFLE1BQU0sZ0VBQWdFLENBQUM7QUFDeEgsT0FBTyxFQUFFLGtCQUFrQixFQUFnQyxNQUFNLDJCQUEyQixDQUFDO0FBQzdGLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTVEOztHQUVHO0FBQ0gscUJBQWEseUJBQXlCO0lBRWxDOztPQUVHO0lBQ0ksb0JBQW9CLEVBQUUsa0JBQWtCLENBQUMsaUJBQWlCLEVBQUUsT0FBTyxrQ0FBa0MsQ0FBQztJQUM3Rzs7T0FFRztJQUNJLHFCQUFxQixFQUFFLGtCQUFrQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sa0NBQWtDLENBQUM7SUFDOUc7O09BRUc7SUFDSSx3Q0FBd0MsRUFBRSxrQkFBa0IsQ0FDakUsc0NBQXNDLEVBQ3RDLE9BQU8sa0NBQWtDLENBQzFDO0lBZkg7SUFDRTs7T0FFRztJQUNJLG9CQUFvQixFQUFFLGtCQUFrQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sa0NBQWtDLENBQUM7SUFDN0c7O09BRUc7SUFDSSxxQkFBcUIsRUFBRSxrQkFBa0IsQ0FBQyxpQkFBaUIsRUFBRSxPQUFPLGtDQUFrQyxDQUFDO0lBQzlHOztPQUVHO0lBQ0ksd0NBQXdDLEVBQUUsa0JBQWtCLENBQ2pFLHNDQUFzQyxFQUN0QyxPQUFPLGtDQUFrQyxDQUMxQyxFQUNDO0lBRUosT0FBTyxXQU1OO0lBRUQsUUFBUSw0QkFNUDtJQUVELFFBQVEsa0JBRVA7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksNkJBUzlDO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sNkJBRTVCO0lBRUQsTUFBTSxDQUFDLEtBQUssOEJBTVg7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FNZjtDQUNGIn0=

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;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"}
+{"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;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;IAfH;IACE;;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,EACC;IAEJ,OAAO,WAMN;IAED,QAAQ,4BAMP;IAED,QAAQ,kBAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,6BAS9C;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,6BAE5B;IAED,MAAM,CAAC,KAAK,8BAMX;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAMf;CACF"}