@aztec/stdlib 0.86.0-starknet.1 → 0.87.0

package/dest/keys/public_keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_keys.d.ts","sourceRoot":"","sources":["../../src/keys/public_keys.ts"],"names":[],"mappings":";;AAYA,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,qBAAa,UAAU;IAEnB,kCAAkC;IAC3B,wBAAwB,EAAE,SAAS;IAC1C,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,wCAAwC;IACjC,sBAAsB,EAAE,SAAS;;IAPxC,kCAAkC;IAC3B,wBAAwB,EAAE,SAAS;IAC1C,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,wCAAwC;IACjC,sBAAsB,EAAE,SAAS;IAG1C,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC;IASxC,IAAI;IAcJ,OAAO;IASP,MAAM,CAAC,OAAO,IAAI,UAAU;WASf,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC;IAI1C;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO;IASlC;;;;;OAKG;IACH,QAAQ,IAAI,MAAM;IASlB;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU;IAc5D,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAcZ;;;OAGG;IACH,QAAQ,IAAI,EAAE,EAAE;IAWhB,YAAY,IAAI,EAAE,EAAE;IAIpB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,UAAU;IAUzD,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM;CAG/B"}
+{"version":3,"file":"public_keys.d.ts","sourceRoot":"","sources":["../../src/keys/public_keys.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,qBAAa,UAAU;IAEnB,kCAAkC;IAC3B,wBAAwB,EAAE,SAAS;IAC1C,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,wCAAwC;IACjC,sBAAsB,EAAE,SAAS;;IAPxC,kCAAkC;IAC3B,wBAAwB,EAAE,SAAS;IAC1C,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,yCAAyC;IAClC,8BAA8B,EAAE,SAAS;IAChD,wCAAwC;IACjC,sBAAsB,EAAE,SAAS;IAG1C,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC;IASxC,IAAI;IAcJ,OAAO;IASP,MAAM,CAAC,OAAO,IAAI,UAAU;WASf,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC;IAI1C;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO;IASlC;;;;;OAKG;IACH,QAAQ,IAAI,MAAM;IASlB;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU;IAc5D,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAcZ;;;OAGG;IACH,QAAQ,IAAI,EAAE,EAAE;IAWhB,YAAY,IAAI,EAAE,EAAE;IAIpB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,UAAU;IAUzD,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM;CAG/B"}

package/dest/keys/public_keys.js

@@ -83,7 +83,6 @@ export class PublicKeys {
     }
     toNoirStruct() {
         // We need to use lowercase identifiers as those are what the noir interface expects
-        // eslint-disable-next-line camelcase
         return {
             // TODO(#6337): Directly dump account.publicKeys here
             /* eslint-disable camelcase */ npk_m: this.masterNullifierPublicKey.toWrappedNoirStruct(),

package/dest/logs/contract_class_log.d.ts

@@ -1,43 +1,84 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
 import { inspect } from 'util';
 import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
+export declare class ContractClassLogFields {
+    fields: Fr[];
+    constructor(fields: Fr[]);
+    static get schema(): z.ZodEffects<z.ZodObject<{
+        fields: z.ZodEffects<z.ZodArray<z.ZodType<Fr, any, string>, "many">, Fr[], string[]>;
+    }, "strip", z.ZodTypeAny, {
+        fields: Fr[];
+    }, {
+        fields: string[];
+    }>, ContractClassLogFields, {
+        fields: string[];
+    }>;
+    toFields(): Fr[];
+    static fromFields(fields: Fr[] | FieldReader): ContractClassLogFields;
+    toBuffer(): Buffer<ArrayBufferLike>;
+    static fromBuffer(buffer: Buffer | BufferReader): ContractClassLogFields;
+    equals(other: ContractClassLogFields): boolean;
+    getEmittedFields(emittedLength: number): Fr[];
+    static fromEmittedFields(emittedFields: Fr[]): ContractClassLogFields;
+    isEmpty(): boolean;
+    static empty(): ContractClassLogFields;
+    static random(emittedLength?: number): ContractClassLogFields;
+    hash(): Promise<Fr>;
+    clone(): ContractClassLogFields;
+}
 export declare class ContractClassLog {
     contractAddress: AztecAddress;
-    fields: Fr[];
+    fields: ContractClassLogFields;
+    emittedLength: number;
     static SIZE_IN_BYTES: number;
     unsiloedFirstField?: Fr | undefined;
-    constructor(contractAddress: AztecAddress, fields: Fr[]);
+    constructor(contractAddress: AztecAddress, fields: ContractClassLogFields, emittedLength: number);
+    static from(fields: FieldsOf<ContractClassLog>): ContractClassLog;
     toFields(): Fr[];
     equals(other: ContractClassLog): boolean;
     static fromFields(fields: Fr[] | FieldReader): ContractClassLog;
+    getEmittedFields(): Fr[];
+    toBlobFields(): Fr[];
+    static fromBlobFields(fields: Fr[] | FieldReader): ContractClassLog;
     isEmpty(): boolean;
     static empty(): ContractClassLog;
     toBuffer(): Buffer;
     static fromBuffer(buffer: Buffer | BufferReader): ContractClassLog;
-    clone(): ContractClassLog;
     static random(): Promise<ContractClassLog>;
-    getEmittedLength(): number;
-    getEmittedFields(): Fr[];
     setUnsiloedFirstField(field: Fr): void;
     toUnsiloed(): ContractClassLog;
     silo(): Promise<ContractClassLog>;
     hash(): Promise<Fr>;
     static get schema(): z.ZodEffects<z.ZodObject<{
         contractAddress: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
-        fields: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
+        fields: z.ZodEffects<z.ZodObject<{
+            fields: z.ZodEffects<z.ZodArray<z.ZodType<Fr, any, string>, "many">, Fr[], string[]>;
+        }, "strip", z.ZodTypeAny, {
+            fields: Fr[];
+        }, {
+            fields: string[];
+        }>, ContractClassLogFields, {
+            fields: string[];
+        }>;
+        emittedLength: z.ZodNumber;
     }, "strip", z.ZodTypeAny, {
-        fields: Fr[];
+        fields: ContractClassLogFields;
         contractAddress: AztecAddress;
+        emittedLength: number;
     }, {
-        fields: string[];
+        fields: {
+            fields: string[];
+        };
+        emittedLength: number;
         contractAddress?: any;
     }>, ContractClassLog, {
-        fields: string[];
+        fields: {
+            fields: string[];
+        };
+        emittedLength: number;
         contractAddress?: any;
     }>;
     [inspect.custom](): string;

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

@@ -1 +1 @@
-{"version":3,"file":"contract_class_log.d.ts","sourceRoot":"","sources":["../../src/logs/contract_class_log.ts"],"names":[],"mappings":";;;AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,qBAAa,gBAAgB;IAOR,eAAe,EAAE,YAAY;IAAS,MAAM,EAAE,EAAE,EAAE;IANrE,MAAM,CAAC,aAAa,SAAwD;IAErE,kBAAkB,CAAC,EAAE,EAAE,GAAG,SAAS,CAAC;gBAIxB,eAAe,EAAE,YAAY,EAAS,MAAM,EAAE,EAAE,EAAE;IAQrE,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,KAAK,EAAE,gBAAgB;IAQ9B,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAU5C,OAAO;IAIP,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAW/C,KAAK;WAIQ,MAAM;IAWnB,gBAAgB;IAOhB,gBAAgB;IAKhB,qBAAqB,CAAC,KAAK,EAAE,EAAE;IAI/B,UAAU;IAQJ,IAAI;IAUJ,IAAI;IAIV,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;CAK3B"}
+{"version":3,"file":"contract_class_log.d.ts","sourceRoot":"","sources":["../../src/logs/contract_class_log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,qBAAa,sBAAsB;IAGd,MAAM,EAAE,EAAE,EAAE;gBAAZ,MAAM,EAAE,EAAE,EAAE;IAQ/B,MAAM,KAAK,MAAM;;;;;;;;OAMhB;IAED,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAS5C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,MAAM,CAAC,KAAK,EAAE,sBAAsB;IAIpC,gBAAgB,CAAC,aAAa,EAAE,MAAM;IAItC,MAAM,CAAC,iBAAiB,CAAC,aAAa,EAAE,EAAE,EAAE;IAM5C,OAAO;IAIP,MAAM,CAAC,KAAK;IAIZ,MAAM,CAAC,MAAM,CAAC,aAAa,SAAoC;IAQzD,IAAI;IAIV,KAAK;CAGN;AAED,qBAAa,gBAAgB;IAMlB,eAAe,EAAE,YAAY;IAC7B,MAAM,EAAE,sBAAsB;IAC9B,aAAa,EAAE,MAAM;IAP9B,MAAM,CAAC,aAAa,SAAgD;IAE7D,kBAAkB,CAAC,EAAE,EAAE,GAAG,SAAS,CAAC;gBAGlC,eAAe,EAAE,YAAY,EAC7B,MAAM,EAAE,sBAAsB,EAC9B,aAAa,EAAE,MAAM;IAG9B,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAI9C,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,KAAK,EAAE,gBAAgB;IAQ9B,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAS5C,gBAAgB;IAIhB,YAAY,IAAI,EAAE,EAAE;IAIpB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAYhD,OAAO;IAIP,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;WAQlC,MAAM;IAUnB,qBAAqB,CAAC,KAAK,EAAE,EAAE;IAI/B,UAAU;IAgBJ,IAAI;IAcJ,IAAI;IAIV,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;CAO3B"}

package/dest/logs/contract_class_log.js

@@ -1,128 +1,191 @@
-import { CONTRACT_CLASS_LOG_DATA_SIZE_IN_FIELDS, CONTRACT_CLASS_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
+import { CONTRACT_CLASS_LOG_LENGTH, CONTRACT_CLASS_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 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';
 import { AztecAddress } from '../aztec-address/index.js';
+export class ContractClassLogFields {
+    fields;
+    // Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
+    // public fields: Tuple<Fr, typeof CONTRACT_CLASS_LOG_SIZE_IN_FIELDS>
+    constructor(fields){
+        this.fields = fields;
+        if (fields.length !== CONTRACT_CLASS_LOG_SIZE_IN_FIELDS) {
+            throw new Error(`Invalid number of fields for ContractClassLog. Expected ${CONTRACT_CLASS_LOG_SIZE_IN_FIELDS}, got ${fields.length}`);
+        }
+    }
+    static get schema() {
+        return z.object({
+            fields: z.array(schemas.Fr).refine((arr)=>arr.length === CONTRACT_CLASS_LOG_SIZE_IN_FIELDS)
+        }).transform(({ fields })=>new ContractClassLogFields(fields));
+    }
+    toFields() {
+        return this.fields;
+    }
+    static fromFields(fields) {
+        const reader = FieldReader.asReader(fields);
+        // Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
+        // reader.readFieldArray(CONTRACT_CLASS_LOG_LENGTH);
+        return new ContractClassLogFields(Array.from({
+            length: CONTRACT_CLASS_LOG_SIZE_IN_FIELDS
+        }, ()=>reader.readField()));
+    }
+    toBuffer() {
+        return serializeToBuffer(this.fields);
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        // Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
+        // reader.readArray(CONTRACT_CLASS_LOG_SIZE_IN_FIELDS, Fr)
+        return new ContractClassLogFields(Array.from({
+            length: CONTRACT_CLASS_LOG_SIZE_IN_FIELDS
+        }, ()=>reader.readObject(Fr)));
+    }
+    equals(other) {
+        return this.fields.every((f, i)=>f.equals(other.fields[i]));
+    }
+    getEmittedFields(emittedLength) {
+        return this.fields.slice(0, emittedLength);
+    }
+    static fromEmittedFields(emittedFields) {
+        return new ContractClassLogFields(emittedFields.concat(Array(CONTRACT_CLASS_LOG_SIZE_IN_FIELDS - emittedFields.length).fill(Fr.ZERO)));
+    }
+    isEmpty() {
+        return this.fields.every((f)=>f.isZero());
+    }
+    static empty() {
+        return new ContractClassLogFields(Array(CONTRACT_CLASS_LOG_SIZE_IN_FIELDS).fill(Fr.ZERO));
+    }
+    static random(emittedLength = CONTRACT_CLASS_LOG_SIZE_IN_FIELDS) {
+        return new ContractClassLogFields(Array.from({
+            length: emittedLength
+        }, ()=>Fr.random()).concat(Array(CONTRACT_CLASS_LOG_SIZE_IN_FIELDS - emittedLength).fill(Fr.ZERO)));
+    }
+    async hash() {
+        return await poseidon2Hash(this.fields);
+    }
+    clone() {
+        return ContractClassLogFields.fromBuffer(this.toBuffer());
+    }
+}
 export class ContractClassLog {
     contractAddress;
     fields;
-    static SIZE_IN_BYTES = Fr.SIZE_IN_BYTES * CONTRACT_CLASS_LOG_SIZE_IN_FIELDS;
+    emittedLength;
+    static SIZE_IN_BYTES = Fr.SIZE_IN_BYTES * CONTRACT_CLASS_LOG_LENGTH;
     // Keeps original first field pre-siloing. Only set by silo().
     unsiloedFirstField;
-    // Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
-    // public fields: Tuple<Fr, typeof CONTRACT_CLASS_LOG_DATA_SIZE_IN_FIELDS>
-    constructor(contractAddress, fields){
+    constructor(contractAddress, fields, emittedLength){
         this.contractAddress = contractAddress;
         this.fields = fields;
-        if (fields.length !== CONTRACT_CLASS_LOG_DATA_SIZE_IN_FIELDS) {
-            throw new Error(`Invalid number of fields for ContractClassLog. Expected ${CONTRACT_CLASS_LOG_DATA_SIZE_IN_FIELDS}, got ${fields.length}`);
-        }
+        this.emittedLength = emittedLength;
+    }
+    static from(fields) {
+        return new ContractClassLog(fields.contractAddress, fields.fields, fields.emittedLength);
     }
     toFields() {
-        return [
-            this.contractAddress.toField(),
-            ...this.fields
-        ];
+        return serializeToFields([
+            this.contractAddress,
+            this.fields,
+            this.emittedLength
+        ]);
     }
     equals(other) {
-        return this.contractAddress.equals(other.contractAddress) && this.fields.length === other.fields.length && this.fields.every((f, i)=>f.equals(other.fields[i]));
+        return this.contractAddress.equals(other.contractAddress) && this.fields.equals(other.fields) && this.emittedLength === other.emittedLength;
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        // Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
-        // return new ContractClassLog(reader.readFieldArray(CONTRACT_CLASS_LOG_SIZE_IN_FIELDS));
-        return new ContractClassLog(reader.readObject(AztecAddress), Array.from({
-            length: CONTRACT_CLASS_LOG_DATA_SIZE_IN_FIELDS
-        }, ()=>reader.readField()));
+        return new ContractClassLog(reader.readObject(AztecAddress), reader.readObject(ContractClassLogFields), reader.readU32());
+    }
+    getEmittedFields() {
+        return this.fields.getEmittedFields(this.emittedLength);
+    }
+    toBlobFields() {
+        return [
+            new Fr(this.emittedLength),
+            this.contractAddress.toField()
+        ].concat(this.getEmittedFields());
+    }
+    static fromBlobFields(fields) {
+        const reader = FieldReader.asReader(fields);
+        const emittedLength = reader.readU32();
+        const contractAddress = reader.readObject(AztecAddress);
+        const emittedFields = reader.readFieldArray(emittedLength);
+        return new ContractClassLog(contractAddress, ContractClassLogFields.fromEmittedFields(emittedFields), emittedLength);
     }
     isEmpty() {
-        return this.fields.every((f)=>f.isZero());
+        return this.contractAddress.isZero() && this.fields.isEmpty() && this.emittedLength === 0;
     }
     static empty() {
-        return new ContractClassLog(AztecAddress.ZERO, new Array(CONTRACT_CLASS_LOG_DATA_SIZE_IN_FIELDS).fill(Fr.ZERO));
+        return new ContractClassLog(AztecAddress.ZERO, ContractClassLogFields.empty(), 0);
     }
     toBuffer() {
         return serializeToBuffer([
             this.contractAddress,
-            this.fields
+            this.fields,
+            this.emittedLength
         ]);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        // Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
-        // reader.readArray(CONTRACT_CLASS_LOG_SIZE_IN_FIELDS, Fr);
         const address = reader.readObject(AztecAddress);
-        const fields = Array.from({
-            length: CONTRACT_CLASS_LOG_DATA_SIZE_IN_FIELDS
-        }, ()=>reader.remainingBytes() == 0 ? Fr.ZERO : Fr.fromBuffer(reader));
-        return new ContractClassLog(address, fields);
-    }
-    clone() {
-        return ContractClassLog.fromBuffer(this.toBuffer());
+        const fields = ContractClassLogFields.fromBuffer(reader);
+        const emittedLength = reader.readNumber();
+        return new ContractClassLog(address, fields, emittedLength);
     }
     static async random() {
         // NB: Using half the maximum number of fields per log because max fields keeps overfilling blobs in tests.
-        // Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
-        // makeTuple(CONTRACT_CLASS_LOG_DATA_SIZE_IN_FIELDS, Fr.random);
-        const fields = Array.from({
-            length: Math.ceil(CONTRACT_CLASS_LOG_DATA_SIZE_IN_FIELDS / 2)
-        }, ()=>Fr.random());
-        return new ContractClassLog(await AztecAddress.random(), fields.concat(Array.from({
-            length: Math.floor(CONTRACT_CLASS_LOG_DATA_SIZE_IN_FIELDS / 2)
-        }, ()=>Fr.ZERO)));
-    }
-    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 address or length prefix.
-        // Note: Unlike public logs, address is not included here because it is not included in the log itself.
-        return this.getEmittedFields().length;
-    }
-    getEmittedFields() {
-        const lastNonZeroIndex = this.fields.findLastIndex((f)=>!f.isZero());
-        return this.fields.slice(0, lastNonZeroIndex + 1);
+        const emittedLength = Math.ceil(CONTRACT_CLASS_LOG_SIZE_IN_FIELDS / 2);
+        return new ContractClassLog(await AztecAddress.random(), ContractClassLogFields.random(emittedLength), emittedLength);
     }
     setUnsiloedFirstField(field) {
         this.unsiloedFirstField = field;
     }
     toUnsiloed() {
+        if (this.contractAddress.isZero()) {
+            return this;
+        }
         if (this.unsiloedFirstField) {
-            return new ContractClassLog(this.contractAddress, [
+            return new ContractClassLog(this.contractAddress, new ContractClassLogFields([
                 this.unsiloedFirstField
-            ].concat(this.fields.slice(1)));
+            ].concat(this.fields.fields.slice(1))), this.emittedLength);
         } else {
             return this;
         }
     }
+    // TODO(#13914): Don't need to silo the contract class logs.
     async silo() {
-        const innerLog = this.clone();
-        if (innerLog.contractAddress.isZero()) {
-            return innerLog;
+        if (this.contractAddress.isZero()) {
+            return this;
         }
-        innerLog.setUnsiloedFirstField(innerLog.fields[0]);
-        innerLog.fields[0] = await poseidon2Hash([
-            innerLog.contractAddress,
-            innerLog.fields[0]
+        const fields = this.fields.clone();
+        const unsiloedField = fields.fields[0];
+        const siloedField = await poseidon2Hash([
+            this.contractAddress,
+            unsiloedField
         ]);
-        return innerLog;
+        fields.fields[0] = siloedField;
+        const cloned = new ContractClassLog(this.contractAddress, fields, this.emittedLength);
+        cloned.setUnsiloedFirstField(unsiloedField);
+        return cloned;
     }
     async hash() {
-        return await poseidon2Hash(this.fields);
+        return await this.fields.hash();
     }
     static get schema() {
         return z.object({
             contractAddress: AztecAddress.schema,
-            fields: z.array(schemas.Fr)
-        }).transform(({ contractAddress, fields })=>ContractClassLog.fromFields([
-                contractAddress.toField(),
-                ...fields
-            ]));
+            fields: ContractClassLogFields.schema,
+            emittedLength: z.number()
+        }).transform(ContractClassLog.from);
     }
     [inspect.custom]() {
         return `ContractClassLog {
-      fields: [${this.fields.map((x)=>inspect(x)).join(', ')}],
+      contractAddress: ${this.contractAddress.toString()},
+      emittedLength: ${this.emittedLength},
+      fields: [${this.fields.fields.map((x)=>inspect(x)).join(', ')}],
     }`;
     }
 }

package/dest/logs/extended_contract_class_log.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import type { ZodFor } from '@aztec/foundation/schemas';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';

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

@@ -1 +1 @@
-{"version":3,"file":"extended_contract_class_log.d.ts","sourceRoot":"","sources":["../../src/logs/extended_contract_class_log.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAKxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC;;GAEG;AACH,qBAAa,wBAAwB;IAEjC,qCAAqC;aACrB,EAAE,EAAE,KAAK;IACzB,oCAAoC;aACpB,GAAG,EAAE,gBAAgB;;IAHrC,qCAAqC;IACrB,EAAE,EAAE,KAAK;IACzB,oCAAoC;IACpB,GAAG,EAAE,gBAAgB;WAG1B,MAAM;IAInB,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAOpD;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,wBAAwB,CAAC;IAItD;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;;OAIG;IACI,MAAM,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO;IAIvD;;;;OAIG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,wBAAwB;IASjF;;;;OAIG;WACW,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,wBAAwB;CAGjE"}
+{"version":3,"file":"extended_contract_class_log.d.ts","sourceRoot":"","sources":["../../src/logs/extended_contract_class_log.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAKxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC;;GAEG;AACH,qBAAa,wBAAwB;IAEjC,qCAAqC;aACrB,EAAE,EAAE,KAAK;IACzB,oCAAoC;aACpB,GAAG,EAAE,gBAAgB;;IAHrC,qCAAqC;IACrB,EAAE,EAAE,KAAK;IACzB,oCAAoC;IACpB,GAAG,EAAE,gBAAgB;WAG1B,MAAM;IAInB,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAOpD;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,wBAAwB,CAAC;IAItD;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;;OAIG;IACI,MAAM,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO;IAIvD;;;;OAIG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,wBAAwB;IASjF;;;;OAIG;WACW,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,wBAAwB;CAGjE"}

package/dest/logs/extended_public_log.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';

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

@@ -1 +1 @@
-{"version":3,"file":"extended_public_log.d.ts","sourceRoot":"","sources":["../../src/logs/extended_public_log.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,iBAAiB;IAE1B,qCAAqC;aACrB,EAAE,EAAE,KAAK;IACzB,oCAAoC;aACpB,GAAG,EAAE,SAAS;;IAH9B,qCAAqC;IACrB,EAAE,EAAE,KAAK;IACzB,oCAAoC;IACpB,GAAG,EAAE,SAAS;WAGnB,MAAM;IAInB,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAOhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC;IAI/C;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;OAGG;IACI,eAAe,IAAI,MAAM;IAIhC;;;;OAIG;IACI,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO;IAIhD;;;;OAIG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB;IAS1E;;;;OAIG;WACW,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB;CAG1D"}
+{"version":3,"file":"extended_public_log.d.ts","sourceRoot":"","sources":["../../src/logs/extended_public_log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,iBAAiB;IAE1B,qCAAqC;aACrB,EAAE,EAAE,KAAK;IACzB,oCAAoC;aACpB,GAAG,EAAE,SAAS;;IAH9B,qCAAqC;IACrB,EAAE,EAAE,KAAK;IACzB,oCAAoC;IACpB,GAAG,EAAE,SAAS;WAGnB,MAAM;IAInB,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAOhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC;IAI/C;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;OAGG;IACI,eAAe,IAAI,MAAM;IAIhC;;;;OAIG;IACI,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO;IAIhD;;;;OAIG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB;IAS1E;;;;OAIG;WACW,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB;CAG1D"}

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

@@ -1 +1 @@
-{"version":3,"file":"indexed_tagging_secret.d.ts","sourceRoot":"","sources":["../../src/logs/indexed_tagging_secret.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,qBAAa,oBAAoB;IACZ,gBAAgB,EAAE,EAAE;IAAS,KAAK,EAAE,MAAM;gBAA1C,gBAAgB,EAAE,EAAE,EAAS,KAAK,EAAE,MAAM;IAM7D,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,EAAE;IAIlC;;;;;;OAMG;IACH,UAAU,CAAC,SAAS,EAAE,YAAY;IAIlC;;;;;;;;OAQG;IACG,gBAAgB,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY;CAIlE"}
+{"version":3,"file":"indexed_tagging_secret.d.ts","sourceRoot":"","sources":["../../src/logs/indexed_tagging_secret.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,qBAAa,oBAAoB;IAEtB,gBAAgB,EAAE,EAAE;IACpB,KAAK,EAAE,MAAM;gBADb,gBAAgB,EAAE,EAAE,EACpB,KAAK,EAAE,MAAM;IAOtB,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,EAAE;IAIlC;;;;;;OAMG;IACH,UAAU,CAAC,SAAS,EAAE,YAAY;IAIlC;;;;;;;;OAQG;IACG,gBAAgB,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY;CAIlE"}

package/dest/logs/log_id.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { BufferReader } from '@aztec/foundation/serialize';
 import { z } from 'zod';
 /** A globally unique log id. */

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

@@ -1 +1 @@
-{"version":3,"file":"log_id.d.ts","sourceRoot":"","sources":["../../src/logs/log_id.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,gCAAgC;AAChC,qBAAa,KAAK;IAQd,+CAA+C;aAC/B,WAAW,EAAE,MAAM;IACnC,2DAA2D;aAC3C,OAAO,EAAE,MAAM;IAC/B,gDAAgD;aAChC,QAAQ,EAAE,MAAM;IAZlC;;;;;OAKG;;IAED,+CAA+C;IAC/B,WAAW,EAAE,MAAM;IACnC,2DAA2D;IAC3C,OAAO,EAAE,MAAM;IAC/B,gDAAgD;IAChC,QAAQ,EAAE,MAAM;IAalC,MAAM,CAAC,MAAM;IAQb,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAQzB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,KAAK;IAUvD;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK;IAStC;;;OAGG;IACI,eAAe,IAAI,MAAM;CAGjC"}
+{"version":3,"file":"log_id.d.ts","sourceRoot":"","sources":["../../src/logs/log_id.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,gCAAgC;AAChC,qBAAa,KAAK;IAQd,+CAA+C;aAC/B,WAAW,EAAE,MAAM;IACnC,2DAA2D;aAC3C,OAAO,EAAE,MAAM;IAC/B,gDAAgD;aAChC,QAAQ,EAAE,MAAM;IAZlC;;;;;OAKG;;IAED,+CAA+C;IAC/B,WAAW,EAAE,MAAM;IACnC,2DAA2D;IAC3C,OAAO,EAAE,MAAM;IAC/B,gDAAgD;IAChC,QAAQ,EAAE,MAAM;IAalC,MAAM,CAAC,MAAM;IAQb,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAQzB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,KAAK;IAUvD;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK;IAStC;;;OAGG;IACI,eAAe,IAAI,MAAM;CAGjC"}

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

@@ -1 +1 @@
-{"version":3,"file":"log_with_tx_data.d.ts","sourceRoot":"","sources":["../../src/logs/log_with_tx_data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI1C,qBAAa,aAAa;IAEf,UAAU,EAAE,EAAE,EAAE;IAChB,MAAM,EAAE,MAAM;IACd,oBAAoB,EAAE,EAAE,EAAE;IAC1B,kBAAkB,EAAE,EAAE;gBAHtB,UAAU,EAAE,EAAE,EAAE,EAChB,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,EAAE,EAAE,EAC1B,kBAAkB,EAAE,EAAE;IAG/B,mBAAmB,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE;IASpC,MAAM,CAAC,wBAAwB,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE;CAGjD"}
+{"version":3,"file":"log_with_tx_data.d.ts","sourceRoot":"","sources":["../../src/logs/log_with_tx_data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI1C,qBAAa,aAAa;IAIf,UAAU,EAAE,EAAE,EAAE;IAChB,MAAM,EAAE,MAAM;IACd,oBAAoB,EAAE,EAAE,EAAE;IAC1B,kBAAkB,EAAE,EAAE;gBAHtB,UAAU,EAAE,EAAE,EAAE,EAChB,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,EAAE,EAAE,EAC1B,kBAAkB,EAAE,EAAE;IAG/B,mBAAmB,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE;IAYpC,MAAM,CAAC,wBAAwB,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE;CAGjD"}

package/dest/logs/log_with_tx_data.js

@@ -1,4 +1,4 @@
-import { MAX_NOTE_HASHES_PER_TX, PUBLIC_LOG_DATA_SIZE_IN_FIELDS } from '@aztec/constants';
+import { MAX_NOTE_HASHES_PER_TX, PUBLIC_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { TxHash } from '@aztec/stdlib/tx';
 // TypeScript representation of the Noir aztec::oracle::message_discovery::LogWithTxData struct. This is used as a
@@ -8,7 +8,9 @@ export class LogWithTxData {
     txHash;
     uniqueNoteHashesInTx;
     firstNullifierInTx;
-    constructor(logContent, txHash, uniqueNoteHashesInTx, firstNullifierInTx){
+    constructor(// The emitted fields of a log.
+    // For public logs, the contract address is prepended to the content.
+    logContent, txHash, uniqueNoteHashesInTx, firstNullifierInTx){
         this.logContent = logContent;
         this.txHash = txHash;
         this.uniqueNoteHashesInTx = uniqueNoteHashesInTx;
@@ -16,7 +18,10 @@ export class LogWithTxData {
     }
     toNoirSerialization() {
         return [
-            ...toBoundedVecSerialization(this.logContent, PUBLIC_LOG_DATA_SIZE_IN_FIELDS),
+            // The log fields length is PUBLIC_LOG_SIZE_IN_FIELDS. + 1 because the contract address is prepended to the content.
+            // This is only used for public logs currently, so the maxLength is PUBLIC_LOG_SIZE_IN_FIELDS + 1.
+            // TODO(#11639): this could also be used for private logs.
+            ...toBoundedVecSerialization(this.logContent, PUBLIC_LOG_SIZE_IN_FIELDS + 1),
             this.txHash.hash,
             ...toBoundedVecSerialization(this.uniqueNoteHashesInTx, MAX_NOTE_HASHES_PER_TX),
             this.firstNullifierInTx

package/dest/logs/private_log.d.ts

@@ -1,32 +1,38 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { PRIVATE_LOG_SIZE_IN_FIELDS } 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 { inspect } from 'util';
 import { z } from 'zod';
 export declare class PrivateLog {
     fields: Tuple<Fr, typeof PRIVATE_LOG_SIZE_IN_FIELDS>;
+    emittedLength: number;
     static SIZE_IN_BYTES: number;
-    constructor(fields: Tuple<Fr, typeof PRIVATE_LOG_SIZE_IN_FIELDS>);
+    constructor(fields: Tuple<Fr, typeof PRIVATE_LOG_SIZE_IN_FIELDS>, emittedLength: number);
+    static from(fields: FieldsOf<PrivateLog>): PrivateLog;
+    static getFields(fields: FieldsOf<PrivateLog>): readonly [[Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], number];
     toFields(): Fr[];
     static fromFields(fields: Fr[] | FieldReader): PrivateLog;
+    getEmittedFields(): Fr[];
+    toBlobFields(): Fr[];
+    static fromBlobFields(fields: Fr[] | FieldReader): PrivateLog;
     isEmpty(): boolean;
     static empty(): PrivateLog;
     toBuffer(): Buffer;
     static fromBuffer(buffer: Buffer | BufferReader): PrivateLog;
     static random(tag?: Fr): PrivateLog;
-    getEmittedLength(): number;
-    getEmittedFields(): Fr[];
     static get schema(): z.ZodEffects<z.ZodObject<{
         fields: z.ZodArray<z.ZodType<Fr, any, string>, "many">;
-    }, "strip", z.ZodTypeAny, {
+        emittedLength: z.ZodNumber;
+    }, "strict", z.ZodTypeAny, {
         fields: Fr[];
+        emittedLength: number;
     }, {
         fields: string[];
+        emittedLength: number;
     }>, PrivateLog, {
         fields: string[];
+        emittedLength: number;
     }>;
     equals(other: PrivateLog): boolean;
     [inspect.custom](): string;

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

@@ -1 +1 @@
-{"version":3,"file":"private_log.d.ts","sourceRoot":"","sources":["../../src/logs/private_log.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,0BAA0B,EAAkC,MAAM,kBAAkB,CAAC;AAE9F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAEvG,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,qBAAa,UAAU;IAGF,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,0BAA0B,CAAC;IAFvE,MAAM,CAAC,aAAa,SAAiD;gBAElD,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,0BAA0B,CAAC;IAEvE,QAAQ,IAAI,EAAE,EAAE;IAIhB,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;IAK/C,MAAM,CAAC,MAAM,CAAC,GAAG,KAAc;IAI/B,gBAAgB;IAMhB,gBAAgB;IAKhB,MAAM,KAAK,MAAM;;;;;;;;OAYhB;IAED,MAAM,CAAC,KAAK,EAAE,UAAU;IAIxB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;CAK3B"}
+{"version":3,"file":"private_log.d.ts","sourceRoot":"","sources":["../../src/logs/private_log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EACL,YAAY,EACZ,WAAW,EACX,KAAK,KAAK,EAGX,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,qBAAa,UAAU;IAIZ,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,0BAA0B,CAAC;IAEpD,aAAa,EAAE,MAAM;IAL9B,MAAM,CAAC,aAAa,SAAyC;gBAGpD,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,0BAA0B,CAAC,EAEpD,aAAa,EAAE,MAAM;IAG9B,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC;IAIxC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC;IAI7C,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAK5C,gBAAgB;IAIhB,YAAY,IAAI,EAAE,EAAE;IAIpB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAOhD,OAAO;IAIP,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,MAAM,CAAC,MAAM,CAAC,GAAG,KAAc;IAM/B,MAAM,KAAK,MAAM;;;;;;;;;;;;OAQhB;IAED,MAAM,CAAC,KAAK,EAAE,UAAU;IAIxB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;CAM3B"}

package/dest/logs/private_log.js

@@ -1,67 +1,81 @@
-import { PRIVATE_LOG_SIZE_IN_FIELDS, PUBLIC_LOG_DATA_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);
+    }
+    toBlobFields() {
+        return [
+            new Fr(this.emittedLength)
+        ].concat(this.getEmittedFields());
+    }
+    static fromBlobFields(fields) {
+        const reader = FieldReader.asReader(fields);
+        const emittedLength = reader.readU32();
+        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));
+        return new PrivateLog(reader.readArray(PRIVATE_LOG_SIZE_IN_FIELDS, Fr), reader.readNumber());
     }
     static random(tag = Fr.random()) {
-        return PrivateLog.fromFields([
-            tag,
-            ...Array.from({
-                length: PRIVATE_LOG_SIZE_IN_FIELDS - 1
-            }, ()=>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 lastNonZeroIndex = this.fields.findLastIndex((f)=>!f.isZero());
-        return this.fields.slice(0, lastNonZeroIndex + 1);
+        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() {
-        if (PUBLIC_LOG_DATA_SIZE_IN_FIELDS + 1 == PRIVATE_LOG_SIZE_IN_FIELDS) {
-            throw new Error('Constants got updated and schema for PublicLog matches that of PrivateLog. This needs to be updated now as Zod is no longer able to differentiate the 2 in TxScopedL2Log.');
-        }
         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))));
     }
     equals(other) {
-        return this.fields.every((field, i)=>field.equals(other.fields[i]));
+        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},
     }`;
     }
 }