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

package/dest/logs/private_log.js

@@ -1,56 +1,93 @@
-import { PRIVATE_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
+import { PRIVATE_LOG_LENGTH, PRIVATE_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
+import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { z } from 'zod';
 export class PrivateLog {
     fields;
-    static SIZE_IN_BYTES = Fr.SIZE_IN_BYTES * PRIVATE_LOG_SIZE_IN_FIELDS;
-    constructor(fields){
+    emittedLength;
+    static SIZE_IN_BYTES = Fr.SIZE_IN_BYTES * PRIVATE_LOG_LENGTH;
+    constructor(fields, // Named `emittedLength` instead of `length` to avoid being confused with fields.length.
+    emittedLength){
         this.fields = fields;
+        this.emittedLength = emittedLength;
+    }
+    static from(fields) {
+        return new PrivateLog(...PrivateLog.getFields(fields));
+    }
+    static getFields(fields) {
+        return [
+            fields.fields,
+            fields.emittedLength
+        ];
     }
     toFields() {
-        return this.fields;
+        return serializeToFields(...PrivateLog.getFields(this));
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new PrivateLog(reader.readFieldArray(PRIVATE_LOG_SIZE_IN_FIELDS));
+        return new PrivateLog(reader.readFieldArray(PRIVATE_LOG_SIZE_IN_FIELDS), reader.readU32());
+    }
+    getEmittedFields() {
+        return this.fields.slice(0, this.emittedLength);
+    }
+    getEmittedFieldsWithoutTag() {
+        return this.fields.slice(1, this.emittedLength);
+    }
+    toBlobFields() {
+        return this.getEmittedFields();
+    }
+    static fromBlobFields(emittedLength, fields) {
+        const reader = FieldReader.asReader(fields);
+        const emittedFields = reader.readFieldArray(emittedLength);
+        return new PrivateLog(padArrayEnd(emittedFields, Fr.ZERO, PRIVATE_LOG_SIZE_IN_FIELDS), emittedLength);
     }
     isEmpty() {
         return this.fields.every((f)=>f.isZero());
     }
     static empty() {
-        return new PrivateLog(makeTuple(PRIVATE_LOG_SIZE_IN_FIELDS, Fr.zero));
+        return new PrivateLog(makeTuple(PRIVATE_LOG_SIZE_IN_FIELDS, Fr.zero), 0);
     }
     toBuffer() {
-        return serializeToBuffer(this.fields);
+        return serializeToBuffer(this.fields, this.emittedLength);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateLog(reader.readArray(PRIVATE_LOG_SIZE_IN_FIELDS, Fr));
-    }
-    static random() {
-        return new PrivateLog(makeTuple(PRIVATE_LOG_SIZE_IN_FIELDS, Fr.random));
-    }
-    getEmittedLength() {
-        // This assumes that we cut trailing zeroes from the end of the log. In ts, these will always be added back.
-        // Does not include length prefix.
-        return this.getEmittedFields().length;
+        return new PrivateLog(reader.readArray(PRIVATE_LOG_SIZE_IN_FIELDS, Fr), reader.readNumber());
     }
-    getEmittedFields() {
-        const lastNonZeroIndex = this.fields.findLastIndex((f)=>!f.isZero());
-        return this.fields.slice(0, lastNonZeroIndex + 1);
+    static random(tag = Fr.random()) {
+        const fields = makeTuple(PRIVATE_LOG_SIZE_IN_FIELDS, Fr.random);
+        fields[0] = tag;
+        return new PrivateLog(fields, PRIVATE_LOG_SIZE_IN_FIELDS);
     }
     static get schema() {
         return z.object({
-            fields: z.array(schemas.Fr)
-        }).transform(({ fields })=>PrivateLog.fromFields(fields));
+            fields: z.array(schemas.Fr),
+            emittedLength: z.number()
+        }).strict().transform(({ fields, emittedLength })=>PrivateLog.fromFields(fields.concat(new Fr(emittedLength))));
+    }
+    /**
+   * Creates a PrivateLog 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 PrivateLog fields
+   * @returns A PrivateLog instance
+   */ static fromPlainObject(obj) {
+        if (obj instanceof PrivateLog) {
+            return obj;
+        }
+        return new PrivateLog(obj.fields.map((f)=>Fr.fromPlainObject(f)), obj.emittedLength);
+    }
+    equals(other) {
+        return this.fields.every((field, i)=>field.equals(other.fields[i])) && this.emittedLength === other.emittedLength;
     }
     [inspect.custom]() {
         return `PrivateLog {
       fields: [${this.fields.map((x)=>inspect(x)).join(', ')}],
+      emittedLength: ${this.emittedLength},
     }`;
     }
 }

package/dest/logs/public_log.d.ts

@@ -1,31 +1,53 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { PUBLIC_LOG_DATA_SIZE_IN_FIELDS } from '@aztec/constants';
-import { type FieldsOf } from '@aztec/foundation/array';
+import type { FieldsOf } from '@aztec/foundation/array';
 import { Fr } from '@aztec/foundation/fields';
 import { type ZodFor } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, type Tuple } from '@aztec/foundation/serialize';
+import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { AztecAddress } from '../aztec-address/index.js';
+export declare class FlatPublicLogs {
+    length: number;
+    payload: Fr[];
+    constructor(length: number, payload: Fr[]);
+    private static fromUnpaddedPayload;
+    static fromBlobFields(length: number, fields: Fr[] | FieldReader): FlatPublicLogs;
+    toBlobFields(): Fr[];
+    static fromLogs(logs: PublicLog[]): FlatPublicLogs;
+    toLogs(): PublicLog[];
+    static get schema(): ZodFor<FlatPublicLogs>;
+    toBuffer(): Buffer;
+    static fromBuffer(buffer: Buffer | BufferReader): FlatPublicLogs;
+    toFields(): Fr[];
+    static fromFields(fields: Fr[] | FieldReader): FlatPublicLogs;
+    static empty(): FlatPublicLogs;
+    /**
+     * Creates a FlatPublicLogs 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 FlatPublicLogs fields
+     * @returns A FlatPublicLogs instance
+     */
+    static fromPlainObject(obj: any): FlatPublicLogs;
+    isEmpty(): boolean;
+}
 export declare class PublicLog {
     contractAddress: AztecAddress;
-    log: Tuple<Fr, typeof PUBLIC_LOG_DATA_SIZE_IN_FIELDS>;
-    static SIZE_IN_BYTES: number;
-    constructor(contractAddress: AztecAddress, log: Tuple<Fr, typeof PUBLIC_LOG_DATA_SIZE_IN_FIELDS>);
+    fields: Fr[];
+    constructor(contractAddress: AztecAddress, fields: Fr[]);
+    static from(fields: FieldsOf<PublicLog>): PublicLog;
+    static getFields(fields: FieldsOf<PublicLog>): readonly [AztecAddress, Fr[]];
     toFields(): Fr[];
-    static getFields(fields: FieldsOf<PublicLog>): readonly [AztecAddress, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr]];
     static fromFields(fields: Fr[] | FieldReader): PublicLog;
+    sizeInFields(): number;
+    getEmittedFields(): Fr[];
+    getEmittedFieldsWithoutTag(): Fr[];
     isEmpty(): boolean;
     static empty(): PublicLog;
     toBuffer(): Buffer;
     static fromBuffer(buffer: Buffer | BufferReader): PublicLog;
     static random(): Promise<PublicLog>;
-    getEmittedLength(): number;
-    getEmittedFields(): Fr[];
     equals(other: this): boolean;
     toHumanReadable(): string;
     static get schema(): ZodFor<PublicLog>;
     [inspect.custom](): string;
 }
-//# sourceMappingURL=public_log.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2xvZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ3MvcHVibGljX2xvZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0sMkJBQTJCLENBQUM7QUFDakUsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFM0YsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUcvQixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFPekQscUJBQWEsY0FBYztJQUdoQixNQUFNLEVBQUUsTUFBTTtJQUNkLE9BQU8sRUFBRSxFQUFFLEVBQUU7SUFGdEIsWUFDUyxNQUFNLEVBQUUsTUFBTSxFQUNkLE9BQU8sRUFBRSxFQUFFLEVBQUUsRUFRckI7SUFFRCxPQUFPLENBQUMsTUFBTSxDQUFDLG1CQUFtQjtJQU1sQyxNQUFNLENBQUMsY0FBYyxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsa0JBSS9EO0lBRUQsWUFBWSxTQUVYO0lBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsU0FBUyxFQUFFLGtCQUVoQztJQUVELE1BQU0sZ0JBVUw7SUFFRCxNQUFNLEtBQUssTUFBTSxJQUFJLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FPMUM7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLGtCQUk5QztJQUdELFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsa0JBUzNDO0lBRUQsTUFBTSxDQUFDLEtBQUssbUJBRVg7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsZUFBZSxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsY0FBYyxDQUsvQztJQUVELE9BQU8sWUFFTjtDQUNGO0FBRUQscUJBQWEsU0FBUztJQUVYLGVBQWUsRUFBRSxZQUFZO0lBQzdCLE1BQU0sRUFBRSxFQUFFLEVBQUU7SUFGckIsWUFDUyxlQUFlLEVBQUUsWUFBWSxFQUM3QixNQUFNLEVBQUUsRUFBRSxFQUFFLEVBQ2pCO0lBRUosTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLFNBQVMsQ0FBQyxhQUV0QztJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxTQUFTLENBQUMsaUNBRTNDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxhQUkzQztJQUVELFlBQVksV0FFWDtJQUVELGdCQUFnQixTQUVmO0lBRUQsMEJBQTBCLFNBRXpCO0lBRUQsT0FBTyxZQUVOO0lBRUQsTUFBTSxDQUFDLEtBQUssY0FFWDtJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksYUFJOUM7SUFFRCxPQUFhLE1BQU0sdUJBS2xCO0lBRUQsTUFBTSxDQUFDLEtBQUssRUFBRSxJQUFJLFdBTWpCO0lBRUQsZUFBZSxJQUFJLE1BQU0sQ0FFeEI7SUFFRCxNQUFNLEtBQUssTUFBTSxJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FPckM7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxNQUFNLENBS3pCO0NBQ0YifQ==

package/dest/logs/public_log.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_log.d.ts","sourceRoot":"","sources":["../../src/logs/public_log.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,8BAA8B,EAA6B,MAAM,kBAAkB,CAAC;AAC7F,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AACjE,OAAO,EACL,YAAY,EACZ,WAAW,EACX,KAAK,KAAK,EAGX,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,qBAAa,SAAS;IAGD,eAAe,EAAE,YAAY;IAAS,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,8BAA8B,CAAC;IAF9G,MAAM,CAAC,aAAa,SAAgD;gBAEjD,eAAe,EAAE,YAAY,EAAS,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,8BAA8B,CAAC;IAE9G,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC;IAI5C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAK5C,OAAO;IAIP,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;WAKlC,MAAM;IAInB,gBAAgB;IAMhB,gBAAgB;IAMhB,MAAM,CAAC,KAAK,EAAE,IAAI;IAOlB,eAAe,IAAI,MAAM;IAIzB,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,CAOrC;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;CAM3B"}
+{"version":3,"file":"public_log.d.ts","sourceRoot":"","sources":["../../src/logs/public_log.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAOzD,qBAAa,cAAc;IAGhB,MAAM,EAAE,MAAM;IACd,OAAO,EAAE,EAAE,EAAE;IAFtB,YACS,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,EAAE,EAQrB;IAED,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAMlC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,kBAI/D;IAED,YAAY,SAEX;IAED,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,kBAEhC;IAED,MAAM,gBAUL;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,cAAc,CAAC,CAO1C;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,kBAI9C;IAGD,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,kBAS3C;IAED,MAAM,CAAC,KAAK,mBAEX;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,cAAc,CAK/C;IAED,OAAO,YAEN;CACF;AAED,qBAAa,SAAS;IAEX,eAAe,EAAE,YAAY;IAC7B,MAAM,EAAE,EAAE,EAAE;IAFrB,YACS,eAAe,EAAE,YAAY,EAC7B,MAAM,EAAE,EAAE,EAAE,EACjB;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,aAEtC;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,iCAE3C;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,aAI3C;IAED,YAAY,WAEX;IAED,gBAAgB,SAEf;IAED,0BAA0B,SAEzB;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,cAEX;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,aAI9C;IAED,OAAa,MAAM,uBAKlB;IAED,MAAM,CAAC,KAAK,EAAE,IAAI,WAMjB;IAED,eAAe,IAAI,MAAM,CAExB;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,CAOrC;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAKzB;CACF"}

package/dest/logs/public_log.js

@@ -1,77 +1,180 @@
-import { PUBLIC_LOG_DATA_SIZE_IN_FIELDS, PUBLIC_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
-import { makeTuple } from '@aztec/foundation/array';
+import { FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH, PUBLIC_LOG_HEADER_LENGTH } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
+function totalSizeInFields(logs) {
+    return logs.reduce((acc, log)=>acc + log.sizeInFields(), 0);
+}
+// This class represents logs in the same format as noir does, with a bounded maximum length.
+export class FlatPublicLogs {
+    length;
+    payload;
+    // We don't use tuple here because FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH is too large
+    constructor(length, payload){
+        this.length = length;
+        this.payload = payload;
+        if (payload.length !== FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH) {
+            throw new Error('Invalid payload given to FlatPublicLogs');
+        }
+        if (length > payload.length) {
+            throw new Error('Invalid length given to FlatPublicLogs');
+        }
+    }
+    static fromUnpaddedPayload(payload) {
+        const length = payload.length;
+        return new FlatPublicLogs(length, [
+            ...payload,
+            ...Array(FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH - length).fill(Fr.ZERO)
+        ]);
+    }
+    // In blobs, the actual nonempty length of the logs is encoded with the prefix, and then we have the non-padded payload.
+    static fromBlobFields(length, fields) {
+        const reader = FieldReader.asReader(fields);
+        const payload = reader.readFieldArray(length);
+        return this.fromUnpaddedPayload(payload);
+    }
+    toBlobFields() {
+        return this.payload.slice(0, this.length);
+    }
+    static fromLogs(logs) {
+        return this.fromUnpaddedPayload(logs.flatMap((log)=>log.toFields()));
+    }
+    toLogs() {
+        const reader = FieldReader.asReader(this.payload);
+        const logs = [];
+        while(totalSizeInFields(logs) < this.length){
+            logs.push(PublicLog.fromFields(reader));
+        }
+        if (totalSizeInFields(logs) !== this.length) {
+            throw new Error('Wrong length in FlatPublicLogs');
+        }
+        return logs;
+    }
+    static get schema() {
+        return z.object({
+            length: z.number(),
+            payload: z.array(schemas.Fr).min(FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH).max(FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH)
+        }).transform(({ length, payload })=>new FlatPublicLogs(length, payload));
+    }
+    toBuffer() {
+        return serializeToBuffer(this.length, this.payload.slice(0, this.length));
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        const length = reader.readNumber();
+        return this.fromUnpaddedPayload(reader.readArray(length, Fr));
+    }
+    // ToFields and fromFields expect the noir style representation, with constant length payload.
+    toFields() {
+        return [
+            new Fr(this.length),
+            ...this.payload
+        ];
+    }
+    static fromFields(fields) {
+        const reader = FieldReader.asReader(fields);
+        // We need to do this because field reader returns tuples, which break the type system on these sizes.
+        const length = reader.readU32();
+        const payload = [];
+        for(let i = 0; i < FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH; ++i){
+            payload.push(reader.readField());
+        }
+        return new FlatPublicLogs(length, payload);
+    }
+    static empty() {
+        return new FlatPublicLogs(0, Array(FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH).fill(Fr.ZERO));
+    }
+    /**
+   * Creates a FlatPublicLogs 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 FlatPublicLogs fields
+   * @returns A FlatPublicLogs instance
+   */ static fromPlainObject(obj) {
+        return new FlatPublicLogs(obj.length, obj.payload.map((p)=>Fr.fromPlainObject(p)));
+    }
+    isEmpty() {
+        return this.length === 0;
+    }
+}
 export class PublicLog {
     contractAddress;
-    log;
-    static SIZE_IN_BYTES = Fr.SIZE_IN_BYTES * PUBLIC_LOG_SIZE_IN_FIELDS;
-    constructor(contractAddress, log){
+    fields;
+    constructor(contractAddress, fields){
         this.contractAddress = contractAddress;
-        this.log = log;
+        this.fields = fields;
     }
-    toFields() {
-        return serializeToFields(...PublicLog.getFields(this));
+    static from(fields) {
+        return new PublicLog(...PublicLog.getFields(fields));
     }
     static getFields(fields) {
         return [
             fields.contractAddress,
-            fields.log
+            fields.fields
+        ];
+    }
+    toFields() {
+        return [
+            new Fr(this.fields.length),
+            this.contractAddress.toField(),
+            ...this.fields
         ];
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new PublicLog(reader.readObject(AztecAddress), reader.readFieldArray(PUBLIC_LOG_DATA_SIZE_IN_FIELDS));
+        const fieldsLength = reader.readU32();
+        return new PublicLog(reader.readObject(AztecAddress), reader.readFieldArray(fieldsLength));
+    }
+    sizeInFields() {
+        return this.fields.length + PUBLIC_LOG_HEADER_LENGTH;
+    }
+    getEmittedFields() {
+        return this.fields.slice(0);
+    }
+    getEmittedFieldsWithoutTag() {
+        return this.fields.slice(1);
     }
     isEmpty() {
-        return this.contractAddress.isZero() && this.log.every((f)=>f.isZero());
+        return this.contractAddress.isZero() && this.fields.length === 0;
     }
     static empty() {
-        return new PublicLog(AztecAddress.ZERO, makeTuple(PUBLIC_LOG_DATA_SIZE_IN_FIELDS, Fr.zero));
+        return new PublicLog(AztecAddress.ZERO, []);
     }
     toBuffer() {
-        return serializeToBuffer(...PublicLog.getFields(this));
+        return serializeToBuffer(this.fields.length, this.contractAddress, this.fields);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PublicLog(reader.readObject(AztecAddress), reader.readArray(PUBLIC_LOG_DATA_SIZE_IN_FIELDS, Fr));
+        const fieldsLength = reader.readNumber();
+        return new PublicLog(reader.readObject(AztecAddress), reader.readArray(fieldsLength, Fr));
     }
     static async random() {
-        return new PublicLog(await AztecAddress.random(), makeTuple(PUBLIC_LOG_DATA_SIZE_IN_FIELDS, Fr.random));
-    }
-    getEmittedLength() {
-        // This assumes that we cut trailing zeroes from the end of the log. In ts, these will always be added back.
-        // Does not include length prefix.
-        return this.getEmittedFields().length;
-    }
-    getEmittedFields() {
-        const fields = this.toFields();
-        const lastNonZeroIndex = fields.findLastIndex((f)=>!f.isZero());
-        return fields.slice(0, lastNonZeroIndex + 1);
+        return new PublicLog(await AztecAddress.random(), Array.from({
+            length: 10
+        }, ()=>Fr.random()));
     }
     equals(other) {
-        return this.contractAddress.equals(other.contractAddress) && this.log.reduce((acc, field, i)=>acc && field.equals(other.log[i]), true);
+        return this.fields.length === other.fields.length && this.contractAddress.equals(other.contractAddress) && this.fields.every((field, i)=>field.equals(other.fields[i]));
     }
     toHumanReadable() {
-        return `PublicLog: (contractAddress: ${this.contractAddress} log: ${this.log})`;
+        return `PublicLog: (contractAddress: ${this.contractAddress} fields: ${this.fields})`;
     }
     static get schema() {
         return z.object({
             contractAddress: AztecAddress.schema,
-            log: z.array(schemas.Fr)
-        }).transform(({ contractAddress, log })=>PublicLog.fromFields([
-                contractAddress.toField(),
-                ...log
-            ]));
+            fields: z.array(schemas.Fr)
+        }).transform(({ contractAddress, fields })=>PublicLog.from({
+                contractAddress,
+                fields
+            }));
     }
     [inspect.custom]() {
         return `PublicLog {
       contractAddress: ${inspect(this.contractAddress)},
-      log: [${this.log.map((x)=>inspect(x)).join(', ')}],
+      fields: [${this.fields.map((x)=>inspect(x)).join(', ')}],
     }`;
     }
 }

package/dest/logs/shared_secret_derivation.d.ts

@@ -0,0 +1,17 @@
+import type { GrumpkinScalar, Point } from '@aztec/foundation/fields';
+import type { PublicKey } from '../keys/public_key.js';
+/**
+ * Derive an Elliptic Curve Diffie-Hellman (ECDH) Shared Secret.
+ * The function takes in an ECDH public key, a private key, and a Grumpkin instance to compute
+ * the shared secret.
+ *
+ * @param secretKey - The secret key used to derive shared secret.
+ * @param publicKey - The public key used to derive shared secret.
+ * @returns A derived shared secret.
+ * @throws If the publicKey is zero.
+ *
+ * TODO(#12656): This function is kept around because of the utilityGetSharedSecret oracle. Nuke this once returning
+ * the app-siloed secret.
+ */
+export declare function deriveEcdhSharedSecret(secretKey: GrumpkinScalar, publicKey: PublicKey): Promise<Point>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkX3NlY3JldF9kZXJpdmF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9ncy9zaGFyZWRfc2VjcmV0X2Rlcml2YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLEtBQUssRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXRFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXZEOzs7Ozs7Ozs7Ozs7R0FZRztBQUNILHdCQUFnQixzQkFBc0IsQ0FBQyxTQUFTLEVBQUUsY0FBYyxFQUFFLFNBQVMsRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQU90RyJ9

package/dest/logs/shared_secret_derivation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared_secret_derivation.d.ts","sourceRoot":"","sources":["../../src/logs/shared_secret_derivation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,CAOtG"}

package/dest/logs/{l1_payload/shared_secret_derivation.js → shared_secret_derivation.js}

@@ -8,16 +8,12 @@ import { Grumpkin } from '@aztec/foundation/crypto';
  * @param publicKey - The public key used to derive shared secret.
  * @returns A derived shared secret.
  * @throws If the publicKey is zero.
- */ export async function deriveEcdhSharedSecret(secretKey, publicKey) {
+ *
+ * TODO(#12656): This function is kept around because of the utilityGetSharedSecret oracle. Nuke this once returning
+ * the app-siloed secret.
+ */ export function deriveEcdhSharedSecret(secretKey, publicKey) {
     if (publicKey.isZero()) {
         throw new Error(`Attempting to derive a shared secret with a zero public key. You have probably passed a zero public key in your Noir code somewhere thinking that the note won't be broadcast... but it was.`);
     }
-    const curve = new Grumpkin();
-    const sharedSecret = await curve.mul(publicKey, secretKey);
-    return sharedSecret;
-}
-export async function deriveEcdhSharedSecretUsingAztecAddress(secretKey, address) {
-    const addressPoint = await address.toAddressPoint();
-    const sharedSecret = await deriveEcdhSharedSecret(secretKey, addressPoint);
-    return sharedSecret;
+    return Grumpkin.mul(publicKey, secretKey);
 }

package/dest/logs/tx_scoped_l2_log.d.ts

@@ -1,60 +1,55 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { z } from 'zod';
 import { TxHash } from '../tx/tx_hash.js';
+import { PrivateLog } from './private_log.js';
+import { PublicLog } from './public_log.js';
 export declare class TxScopedL2Log {
     txHash: TxHash;
     dataStartIndexForTx: number;
+    logIndexInTx: number;
     blockNumber: number;
-    isFromPublic: boolean;
-    logData: Buffer;
-    constructor(txHash: TxHash, dataStartIndexForTx: number, blockNumber: number, isFromPublic: boolean, logData: Buffer);
+    log: PrivateLog | PublicLog;
+    constructor(txHash: TxHash, dataStartIndexForTx: number, logIndexInTx: number, blockNumber: number, log: PrivateLog | PublicLog);
+    get isFromPublic(): boolean;
     static get schema(): z.ZodEffects<z.ZodObject<{
-        txHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer, string>, TxHash, string>;
+        txHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, TxHash, string>;
         dataStartIndexForTx: z.ZodNumber;
+        logIndexInTx: z.ZodNumber;
         blockNumber: z.ZodNumber;
-        isFromPublic: z.ZodBoolean;
-        logData: z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer, string>, z.ZodEffects<z.ZodObject<{
-            type: z.ZodLiteral<"Buffer">;
-            data: z.ZodArray<z.ZodNumber, "many">;
-        }, "strip", z.ZodTypeAny, {
-            type: "Buffer";
-            data: number[];
+        log: z.ZodUnion<[z.ZodEffects<z.ZodObject<{
+            fields: z.ZodArray<z.ZodType<import("../../../foundation/dest/fields/fields.js").Fr, any, string>, "many">;
+            emittedLength: z.ZodNumber;
+        }, "strict", z.ZodTypeAny, {
+            fields: import("../../../foundation/dest/fields/fields.js").Fr[];
+            emittedLength: number;
         }, {
-            type: "Buffer";
-            data: number[];
-        }>, Buffer, {
-            type: "Buffer";
-            data: number[];
-        }>]>;
+            fields: string[];
+            emittedLength: number;
+        }>, PrivateLog, {
+            fields: string[];
+            emittedLength: number;
+        }>, import("../schemas/schemas.js").ZodFor<PublicLog>]>;
     }, "strip", z.ZodTypeAny, {
-        blockNumber: number;
         txHash: TxHash;
         dataStartIndexForTx: number;
-        isFromPublic: boolean;
-        logData: Buffer;
-    }, {
+        logIndexInTx: number;
         blockNumber: number;
+        log: PrivateLog | PublicLog;
+    }, {
         txHash: string;
         dataStartIndexForTx: number;
-        isFromPublic: boolean;
-        logData: string | {
-            type: "Buffer";
-            data: number[];
-        };
-    }>, TxScopedL2Log, {
+        logIndexInTx: number;
         blockNumber: number;
+        log?: any;
+    }>, TxScopedL2Log, {
         txHash: string;
         dataStartIndexForTx: number;
-        isFromPublic: boolean;
-        logData: string | {
-            type: "Buffer";
-            data: number[];
-        };
+        logIndexInTx: number;
+        blockNumber: number;
+        log?: any;
     }>;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBuffer>;
     static fromBuffer(buffer: Buffer): TxScopedL2Log;
-    static random(): TxScopedL2Log;
+    static random(isFromPublic?: boolean): Promise<TxScopedL2Log>;
     equals(other: TxScopedL2Log): boolean;
 }
-//# sourceMappingURL=tx_scoped_l2_log.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfc2NvcGVkX2wyX2xvZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ3MvdHhfc2NvcGVkX2wyX2xvZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRzVDLHFCQUFhLGFBQWE7SUFLZixNQUFNLEVBQUUsTUFBTTtJQUtkLG1CQUFtQixFQUFFLE1BQU07SUFLM0IsWUFBWSxFQUFFLE1BQU07SUFJcEIsV0FBVyxFQUFFLE1BQU07SUFJbkIsR0FBRyxFQUFFLFVBQVUsR0FBRyxTQUFTO0lBdEJwQyxZQUlTLE1BQU0sRUFBRSxNQUFNLEVBS2QsbUJBQW1CLEVBQUUsTUFBTSxFQUszQixZQUFZLEVBQUUsTUFBTSxFQUlwQixXQUFXLEVBQUUsTUFBTSxFQUluQixHQUFHLEVBQUUsVUFBVSxHQUFHLFNBQVMsRUFDaEM7SUFFSixJQUFJLFlBQVksWUFFZjtJQUVELE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FhaEI7SUFFRCxRQUFRLHdCQVVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxpQkFVL0I7SUFFRCxPQUFhLE1BQU0sQ0FBQyxZQUFZLFVBQXNCLDBCQUdyRDtJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsYUFBYSxXQVUxQjtDQUNGIn0=

package/dest/logs/tx_scoped_l2_log.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_scoped_l2_log.d.ts","sourceRoot":"","sources":["../../src/logs/tx_scoped_l2_log.ts"],"names":[],"mappings":";;AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,qBAAa,aAAa;IAKf,MAAM,EAAE,MAAM;IAKd,mBAAmB,EAAE,MAAM;IAI3B,WAAW,EAAE,MAAM;IAInB,YAAY,EAAE,OAAO;IAIrB,OAAO,EAAE,MAAM;gBAjBf,MAAM,EAAE,MAAM,EAKd,mBAAmB,EAAE,MAAM,EAI3B,WAAW,EAAE,MAAM,EAInB,YAAY,EAAE,OAAO,EAIrB,OAAO,EAAE,MAAM;IAGxB,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED,QAAQ;IAUR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;IAWhC,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,KAAK,EAAE,aAAa;CAS5B"}
+{"version":3,"file":"tx_scoped_l2_log.d.ts","sourceRoot":"","sources":["../../src/logs/tx_scoped_l2_log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,qBAAa,aAAa;IAKf,MAAM,EAAE,MAAM;IAKd,mBAAmB,EAAE,MAAM;IAK3B,YAAY,EAAE,MAAM;IAIpB,WAAW,EAAE,MAAM;IAInB,GAAG,EAAE,UAAU,GAAG,SAAS;IAtBpC,YAIS,MAAM,EAAE,MAAM,EAKd,mBAAmB,EAAE,MAAM,EAK3B,YAAY,EAAE,MAAM,EAIpB,WAAW,EAAE,MAAM,EAInB,GAAG,EAAE,UAAU,GAAG,SAAS,EAChC;IAEJ,IAAI,YAAY,YAEf;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED,QAAQ,wBAUP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,iBAU/B;IAED,OAAa,MAAM,CAAC,YAAY,UAAsB,0BAGrD;IAED,MAAM,CAAC,KAAK,EAAE,aAAa,WAU1B;CACF"}