@aztec/stdlib 0.86.0-nightly.20250509 → 0.86.0-nightly.20250511

package/dest/avm/avm.js

@@ -132,7 +132,7 @@ export class AvmGetPreviousValueIndexHint {
 // NOTE: I need this factory because in order to get hold of the schema, I need an actual instance of the class,
 // having the type doesn't suffice since TS does type erasure in the end.
 function AvmGetLeafPreimageHintFactory(klass) {
-    return class AvmGetLeafPreimageHint {
+    return class {
         hintKey;
         index;
         leafPreimage;
@@ -148,7 +148,7 @@ function AvmGetLeafPreimageHintFactory(klass) {
                 hintKey: AppendOnlyTreeSnapshot.schema,
                 index: schemas.BigInt,
                 leafPreimage: klass.schema
-            }).transform(({ hintKey, index, leafPreimage })=>new AvmGetLeafPreimageHint(hintKey, index, leafPreimage));
+            }).transform(({ hintKey, index, leafPreimage })=>new this(hintKey, index, leafPreimage));
         }
     };
 }
@@ -185,7 +185,7 @@ export class AvmGetLeafValueHint {
 // NOTE: I need this factory because in order to get hold of the schema, I need an actual instance of the class,
 // having the type doesn't suffice since TS does type erasure in the end.
 function AvmSequentialInsertHintFactory(klass) {
-    return class AvmSequentialInsertHint {
+    return class {
         hintKey;
         stateAfter;
         treeId;
@@ -218,7 +218,7 @@ function AvmSequentialInsertHintFactory(klass) {
                     index: schemas.BigInt,
                     path: schemas.Fr.array()
                 })
-            }).transform(({ hintKey, stateAfter, treeId, leaf, lowLeavesWitnessData, insertionWitnessData })=>new AvmSequentialInsertHint(hintKey, stateAfter, treeId, leaf, lowLeavesWitnessData, insertionWitnessData));
+            }).transform(({ hintKey, stateAfter, treeId, leaf, lowLeavesWitnessData, insertionWitnessData })=>new this(hintKey, stateAfter, treeId, leaf, lowLeavesWitnessData, insertionWitnessData));
         }
     };
 }
@@ -267,7 +267,7 @@ class AvmCheckpointActionNoStateChangeHint {
             actionCounter: z.number().int().nonnegative(),
             oldCheckpointId: z.number().int().nonnegative(),
             newCheckpointId: z.number().int().nonnegative()
-        }).transform(({ actionCounter, oldCheckpointId, newCheckpointId })=>new AvmCheckpointActionNoStateChangeHint(actionCounter, oldCheckpointId, newCheckpointId));
+        }).transform(({ actionCounter, oldCheckpointId, newCheckpointId })=>new this(actionCounter, oldCheckpointId, newCheckpointId));
     }
 }
 // Hint for MerkleTreeDB.createCheckpoint.

package/dest/avm/public_data_write.d.ts

@@ -43,6 +43,8 @@ export declare class PublicDataWrite {
     static getFields(fields: FieldsOf<PublicDataWrite>): readonly [Fr, Fr];
     static fromFields(fields: Fr[] | FieldReader): PublicDataWrite;
     toFields(): Fr[];
+    static fromBlobFields(fields: Fr[] | FieldReader): PublicDataWrite;
+    toBlobFields(): Fr[];
     static fromBuffer(buffer: Buffer | BufferReader): PublicDataWrite;
     toBuffer(): Buffer;
     static fromString(str: string): PublicDataWrite;

package/dest/avm/public_data_write.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_data_write.d.ts","sourceRoot":"","sources":["../../src/avm/public_data_write.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAE9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,qBAAa,eAAe;IAIxB;;OAEG;aACa,QAAQ,EAAE,EAAE;IAC5B;;OAEG;aACa,KAAK,EAAE,EAAE;IAV3B,MAAM,CAAC,aAAa,SAAwB;;IAG1C;;OAEG;IACa,QAAQ,EAAE,EAAE;IAC5B;;OAEG;IACa,KAAK,EAAE,EAAE;IAG3B,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAI7C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAIlD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,eAAe;IAK9D,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,QAAQ;IAIR,MAAM,CAAC,KAAK;IAIZ,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO;IAI9C,OAAO;IAIP,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO;CAGxC"}
+{"version":3,"file":"public_data_write.d.ts","sourceRoot":"","sources":["../../src/avm/public_data_write.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAE9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,qBAAa,eAAe;IAIxB;;OAEG;aACa,QAAQ,EAAE,EAAE;IAC5B;;OAEG;aACa,KAAK,EAAE,EAAE;IAV3B,MAAM,CAAC,aAAa,SAAwB;;IAG1C;;OAEG;IACa,QAAQ,EAAE,EAAE;IAC5B;;OAEG;IACa,KAAK,EAAE,EAAE;IAG3B,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAI7C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAIlD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,eAAe;IAK9D,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAKhD,YAAY,IAAI,EAAE,EAAE;IAIpB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,QAAQ;IAIR,MAAM,CAAC,KAAK;IAIZ,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO;IAI9C,OAAO;IAIP,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO;CAGxC"}

package/dest/avm/public_data_write.js

@@ -44,6 +44,16 @@ import { z } from 'zod';
         }
         return fields;
     }
+    static fromBlobFields(fields) {
+        const reader = FieldReader.asReader(fields);
+        return new PublicDataWrite(reader.readField(), reader.readField());
+    }
+    toBlobFields() {
+        return [
+            this.leafSlot,
+            this.value
+        ];
+    }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         return new PublicDataWrite(Fr.fromBuffer(reader), Fr.fromBuffer(reader));

package/dest/block/body.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../src/block/body.ts"],"names":[],"mappings":";;;AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,qBAAa,IAAI;IACI,SAAS,EAAE,QAAQ,EAAE;gBAArB,SAAS,EAAE,QAAQ,EAAE;IAQxC,MAAM,CAAC,KAAK,EAAE,IAAI;IAMlB,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAMhC;IAED;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAM5C;;OAEG;IACH,YAAY;IAgBZ;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE;IAelC,CAAC,OAAO,CAAC,MAAM,CAAC;WAMH,MAAM,CAAC,WAAW,SAAI,EAAE,mBAAmB,SAAI,EAAE,oBAAoB,SAAI;IAQtF,MAAM,CAAC,KAAK;CAGb"}
+{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../src/block/body.ts"],"names":[],"mappings":";;;AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAkC,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,qBAAa,IAAI;IACI,SAAS,EAAE,QAAQ,EAAE;gBAArB,SAAS,EAAE,QAAQ,EAAE;IAQxC,MAAM,CAAC,KAAK,EAAE,IAAI;IAMlB,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAMhC;IAED;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAM5C;;OAEG;IACH,YAAY;IAgBZ;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE;IASlC,CAAC,OAAO,CAAC,MAAM,CAAC;WAMH,MAAM,CAAC,WAAW,SAAI,EAAE,mBAAmB,SAAI,EAAE,oBAAoB,SAAI;IAQtF,MAAM,CAAC,KAAK;CAGb"}

package/dest/block/body.js

@@ -1,6 +1,6 @@
 import { BLOBS_PER_BLOCK, FIELDS_PER_BLOB } from '@aztec/constants';
 import { timesParallel } from '@aztec/foundation/collection';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { z } from 'zod';
 import { TxEffect } from '../tx/tx_effect.js';
@@ -50,17 +50,11 @@ export class Body {
     /**
    * Decodes a block from blob fields.
    */ static fromBlobFields(fields) {
-        const txEffectsFields = [];
-        let checkedFields = 0;
-        while(checkedFields !== fields.length){
-            if (!TxEffect.isFirstField(fields[checkedFields])) {
-                throw new Error('Invalid fields given to Body.fromBlobFields(): First field invalid.');
-            }
-            const len = TxEffect.decodeFirstField(fields[checkedFields]).length;
-            txEffectsFields.push(fields.slice(checkedFields, checkedFields + len));
-            checkedFields += len;
+        const txEffects = [];
+        const reader = new FieldReader(fields);
+        while(!reader.isFinished()){
+            txEffects.push(TxEffect.fromBlobFields(reader));
         }
-        const txEffects = txEffectsFields.filter((effect)=>effect.length).map((effect)=>TxEffect.fromBlobFields(effect));
         return new this(txEffects);
     }
     [inspect.custom]() {

package/dest/block/l2_block.js

@@ -87,7 +87,7 @@ import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge
             privateLogCount: this.body.txEffects.reduce((logCount, txEffect)=>logCount + txEffect.privateLogs.length, 0),
             publicLogCount: this.body.txEffects.reduce((logCount, txEffect)=>logCount + txEffect.publicLogs.length, 0),
             contractClassLogCount: this.body.txEffects.reduce((logCount, txEffect)=>logCount + txEffect.contractClassLogs.length, 0),
-            contractClassLogSize: this.body.txEffects.reduce((totalLogSize, txEffect)=>totalLogSize + txEffect.contractClassLogs.reduce((logSize, log)=>logSize + log.getEmittedLength(), 0), 0)
+            contractClassLogSize: this.body.txEffects.reduce((totalLogSize, txEffect)=>totalLogSize + txEffect.contractClassLogs.reduce((acc, log)=>acc + log.emittedLength, 0), 0)
         };
         return {
             txCount: this.body.txEffects.length,

package/dest/kernel/log_hash.d.ts

@@ -3,14 +3,14 @@
 /// <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 { AztecAddress } from '../aztec-address/index.js';
-import type { Ordered } from './utils/interfaces.js';
-export declare class LogHash implements Ordered {
+export declare class LogHash {
     value: Fr;
-    counter: number;
     length: number;
-    constructor(value: Fr, counter: number, length: number);
+    constructor(value: Fr, length: number);
+    static from(fields: FieldsOf<LogHash>): LogHash;
     toFields(): Fr[];
     static fromFields(fields: Fr[] | FieldReader): LogHash;
     isEmpty(): boolean;
@@ -21,11 +21,21 @@ export declare class LogHash implements Ordered {
     scope(contractAddress: AztecAddress): ScopedLogHash;
     [inspect.custom](): string;
 }
-export declare class ScopedLogHash implements Ordered {
+export declare class CountedLogHash {
+    logHash: LogHash;
+    counter: number;
+    constructor(logHash: LogHash, counter: number);
+    toFields(): Fr[];
+    static fromFields(fields: Fr[] | FieldReader): CountedLogHash;
+    isEmpty(): boolean;
+    static empty(): CountedLogHash;
+    toBuffer(): Buffer;
+    static fromBuffer(buffer: Buffer | BufferReader): CountedLogHash;
+}
+export declare class ScopedLogHash {
     logHash: LogHash;
     contractAddress: AztecAddress;
     constructor(logHash: LogHash, contractAddress: AztecAddress);
-    get counter(): number;
     get value(): Fr;
     toFields(): Fr[];
     static fromFields(fields: Fr[] | FieldReader): ScopedLogHash;
@@ -35,4 +45,15 @@ export declare class ScopedLogHash implements Ordered {
     static fromBuffer(buffer: Buffer | BufferReader): ScopedLogHash;
     toString(): string;
 }
+export declare class ScopedCountedLogHash {
+    inner: CountedLogHash;
+    contractAddress: AztecAddress;
+    constructor(inner: CountedLogHash, contractAddress: AztecAddress);
+    toFields(): Fr[];
+    static fromFields(fields: Fr[] | FieldReader): ScopedCountedLogHash;
+    toBuffer(): Buffer;
+    static fromBuffer(buffer: Buffer | BufferReader): ScopedCountedLogHash;
+    isEmpty(): boolean;
+    static empty(): ScopedCountedLogHash;
+}
 //# sourceMappingURL=log_hash.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"log_hash.d.ts","sourceRoot":"","sources":["../../src/kernel/log_hash.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,OAAQ,YAAW,OAAO;IAClB,KAAK,EAAE,EAAE;IAAS,OAAO,EAAE,MAAM;IAAS,MAAM,EAAE,MAAM;gBAAxD,KAAK,EAAE,EAAE,EAAS,OAAO,EAAE,MAAM,EAAS,MAAM,EAAE,MAAM;IAE3E,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,QAAQ,IAAI,MAAM;IAIlB,KAAK,CAAC,eAAe,EAAE,YAAY;IAInC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;CAG3B;AAED,qBAAa,aAAc,YAAW,OAAO;IACxB,OAAO,EAAE,OAAO;IAAS,eAAe,EAAE,YAAY;gBAAtD,OAAO,EAAE,OAAO,EAAS,eAAe,EAAE,YAAY;IAEzE,IAAI,OAAO,WAEV;IAED,IAAI,KAAK,OAER;IAED,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,QAAQ,IAAI,MAAM;CAGnB"}
+{"version":3,"file":"log_hash.d.ts","sourceRoot":"","sources":["../../src/kernel/log_hash.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAC3F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,qBAAa,OAAO;IACC,KAAK,EAAE,EAAE;IAAS,MAAM,EAAE,MAAM;gBAAhC,KAAK,EAAE,EAAE,EAAS,MAAM,EAAE,MAAM;IAEnD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC;IAIrC,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,QAAQ,IAAI,MAAM;IAIlB,KAAK,CAAC,eAAe,EAAE,YAAY;IAInC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;CAG3B;AAED,qBAAa,cAAc;IACN,OAAO,EAAE,OAAO;IAAS,OAAO,EAAE,MAAM;gBAAxC,OAAO,EAAE,OAAO,EAAS,OAAO,EAAE,MAAM;IAE3D,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;CAIhD;AAED,qBAAa,aAAa;IACL,OAAO,EAAE,OAAO;IAAS,eAAe,EAAE,YAAY;gBAAtD,OAAO,EAAE,OAAO,EAAS,eAAe,EAAE,YAAY;IAEzE,IAAI,KAAK,OAER;IAED,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,QAAQ,IAAI,MAAM;CAGnB;AAED,qBAAa,oBAAoB;IACZ,KAAK,EAAE,cAAc;IAAS,eAAe,EAAE,YAAY;gBAA3D,KAAK,EAAE,cAAc,EAAS,eAAe,EAAE,YAAY;IAE9E,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAK5C,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,OAAO;IAIP,MAAM,CAAC,KAAK;CAGb"}

package/dest/kernel/log_hash.js

@@ -4,39 +4,39 @@ import { inspect } from 'util';
 import { AztecAddress } from '../aztec-address/index.js';
 export class LogHash {
     value;
-    counter;
     length;
-    constructor(value, counter, length){
+    constructor(value, length){
         this.value = value;
-        this.counter = counter;
         this.length = length;
     }
+    static from(fields) {
+        return new LogHash(fields.value, fields.length);
+    }
     toFields() {
         return [
             this.value,
-            new Fr(this.counter),
             new Fr(this.length)
         ];
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new LogHash(reader.readField(), reader.readU32(), reader.readU32());
+        return new LogHash(reader.readField(), reader.readU32());
     }
     isEmpty() {
-        return this.value.isZero() && !this.length && !this.counter;
+        return this.value.isZero() && !this.length;
     }
     static empty() {
-        return new LogHash(Fr.zero(), 0, 0);
+        return new LogHash(Fr.zero(), 0);
     }
     toBuffer() {
-        return serializeToBuffer(this.value, this.counter, this.length);
+        return serializeToBuffer(this.value, this.length);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new LogHash(Fr.fromBuffer(reader), reader.readNumber(), reader.readNumber());
+        return new LogHash(Fr.fromBuffer(reader), reader.readNumber());
     }
     toString() {
-        return `value=${this.value} counter=${this.counter} length=${this.length}`;
+        return `value=${this.value} length=${this.length}`;
     }
     scope(contractAddress) {
         return new ScopedLogHash(this, contractAddress);
@@ -45,6 +45,37 @@ export class LogHash {
         return `LogHash { ${this.toString()} }`;
     }
 }
+export class CountedLogHash {
+    logHash;
+    counter;
+    constructor(logHash, counter){
+        this.logHash = logHash;
+        this.counter = counter;
+    }
+    toFields() {
+        return [
+            ...this.logHash.toFields(),
+            new Fr(this.counter)
+        ];
+    }
+    static fromFields(fields) {
+        const reader = FieldReader.asReader(fields);
+        return new CountedLogHash(reader.readObject(LogHash), reader.readU32());
+    }
+    isEmpty() {
+        return this.logHash.isEmpty() && !this.counter;
+    }
+    static empty() {
+        return new CountedLogHash(LogHash.empty(), 0);
+    }
+    toBuffer() {
+        return serializeToBuffer(this.logHash, this.counter);
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new CountedLogHash(LogHash.fromBuffer(reader), reader.readNumber());
+    }
+}
 export class ScopedLogHash {
     logHash;
     contractAddress;
@@ -52,9 +83,6 @@ export class ScopedLogHash {
         this.logHash = logHash;
         this.contractAddress = contractAddress;
     }
-    get counter() {
-        return this.logHash.counter;
-    }
     get value() {
         return this.logHash.value;
     }
@@ -85,3 +113,34 @@ export class ScopedLogHash {
         return `logHash=${this.logHash} contractAddress=${this.contractAddress}`;
     }
 }
+export class ScopedCountedLogHash {
+    inner;
+    contractAddress;
+    constructor(inner, contractAddress){
+        this.inner = inner;
+        this.contractAddress = contractAddress;
+    }
+    toFields() {
+        return [
+            ...this.inner.toFields(),
+            this.contractAddress.toField()
+        ];
+    }
+    static fromFields(fields) {
+        const reader = FieldReader.asReader(fields);
+        return new ScopedCountedLogHash(reader.readObject(CountedLogHash), AztecAddress.fromField(reader.readField()));
+    }
+    toBuffer() {
+        return serializeToBuffer(this.inner, this.contractAddress);
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new ScopedCountedLogHash(CountedLogHash.fromBuffer(reader), AztecAddress.fromBuffer(reader));
+    }
+    isEmpty() {
+        return this.inner.isEmpty() && this.contractAddress.isZero();
+    }
+    static empty() {
+        return new ScopedCountedLogHash(CountedLogHash.empty(), AztecAddress.ZERO);
+    }
+}

package/dest/kernel/private_accumulated_data.d.ts

@@ -3,7 +3,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_CALL_STACK_LENGTH_PER_TX, MAX_PRIVATE_LOGS_PER_TX } from '@aztec/constants';
 import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
-import { ScopedLogHash } from './log_hash.js';
+import { ScopedCountedLogHash } from './log_hash.js';
 import { ScopedNoteHash } from './note_hash.js';
 import { ScopedNullifier } from './nullifier.js';
 import { PrivateCallRequest } from './private_call_request.js';
@@ -34,7 +34,7 @@ export declare class PrivateAccumulatedData {
      * Accumulated contract class logs from all the previous kernel iterations.
      * Note: Truncated to 31 bytes to fit in Fr.
      */
-    contractClassLogsHashes: Tuple<ScopedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
+    contractClassLogsHashes: Tuple<ScopedCountedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
     /**
      * Accumulated public call requests from all the previous kernel iterations.
      */
@@ -64,7 +64,7 @@ export declare class PrivateAccumulatedData {
      * Accumulated contract class logs from all the previous kernel iterations.
      * Note: Truncated to 31 bytes to fit in Fr.
      */
-    contractClassLogsHashes: Tuple<ScopedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
+    contractClassLogsHashes: Tuple<ScopedCountedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
     /**
      * Accumulated public call requests from all the previous kernel iterations.
      */

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

@@ -1 +1 @@
-{"version":3,"file":"private_accumulated_data.d.ts","sourceRoot":"","sources":["../../src/kernel/private_accumulated_data.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,oCAAoC,EACpC,uBAAuB,EACxB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAG1F,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEpE;;;GAGG;AACH,qBAAa,sBAAsB;IAE/B;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,sBAAsB,CAAC;IACvE;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC;IACvE;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,wBAAwB,CAAC;IAC9E;;OAEG;IACI,WAAW,EAAE,KAAK,CAAC,oBAAoB,EAAE,OAAO,uBAAuB,CAAC;IAC/E;;;OAGG;IACI,uBAAuB,EAAE,KAAK,CAAC,aAAa,EAAE,OAAO,8BAA8B,CAAC;IAC3F;;OAEG;IACI,kBAAkB,EAAE,KAAK,CAAC,wBAAwB,EAAE,OAAO,yBAAyB,CAAC;IAC5F;;OAEG;IACI,gBAAgB,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,oCAAoC,CAAC;;IA5B/F;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,sBAAsB,CAAC;IACvE;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC;IACvE;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,wBAAwB,CAAC;IAC9E;;OAEG;IACI,WAAW,EAAE,KAAK,CAAC,oBAAoB,EAAE,OAAO,uBAAuB,CAAC;IAC/E;;;OAGG;IACI,uBAAuB,EAAE,KAAK,CAAC,aAAa,EAAE,OAAO,8BAA8B,CAAC;IAC3F;;OAEG;IACI,kBAAkB,EAAE,KAAK,CAAC,wBAAwB,EAAE,OAAO,yBAAyB,CAAC;IAC5F;;OAEG;IACI,gBAAgB,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,oCAAoC,CAAC;IAGjG,QAAQ;IAYR,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,sBAAsB;IAaxE;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,KAAK;CAWb"}
+{"version":3,"file":"private_accumulated_data.d.ts","sourceRoot":"","sources":["../../src/kernel/private_accumulated_data.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,oCAAoC,EACpC,uBAAuB,EACxB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAG1F,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEpE;;;GAGG;AACH,qBAAa,sBAAsB;IAE/B;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,sBAAsB,CAAC;IACvE;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC;IACvE;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,wBAAwB,CAAC;IAC9E;;OAEG;IACI,WAAW,EAAE,KAAK,CAAC,oBAAoB,EAAE,OAAO,uBAAuB,CAAC;IAC/E;;;OAGG;IACI,uBAAuB,EAAE,KAAK,CAAC,oBAAoB,EAAE,OAAO,8BAA8B,CAAC;IAClG;;OAEG;IACI,kBAAkB,EAAE,KAAK,CAAC,wBAAwB,EAAE,OAAO,yBAAyB,CAAC;IAC5F;;OAEG;IACI,gBAAgB,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,oCAAoC,CAAC;;IA5B/F;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,sBAAsB,CAAC;IACvE;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC;IACvE;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,wBAAwB,CAAC;IAC9E;;OAEG;IACI,WAAW,EAAE,KAAK,CAAC,oBAAoB,EAAE,OAAO,uBAAuB,CAAC;IAC/E;;;OAGG;IACI,uBAAuB,EAAE,KAAK,CAAC,oBAAoB,EAAE,OAAO,8BAA8B,CAAC;IAClG;;OAEG;IACI,kBAAkB,EAAE,KAAK,CAAC,wBAAwB,EAAE,OAAO,yBAAyB,CAAC;IAC5F;;OAEG;IACI,gBAAgB,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,oCAAoC,CAAC;IAGjG,QAAQ;IAYR,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,sBAAsB;IAaxE;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,KAAK;CAWb"}

package/dest/kernel/private_accumulated_data.js

@@ -3,7 +3,7 @@ import { makeTuple } from '@aztec/foundation/array';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
-import { ScopedLogHash } from './log_hash.js';
+import { ScopedCountedLogHash } from './log_hash.js';
 import { ScopedNoteHash } from './note_hash.js';
 import { ScopedNullifier } from './nullifier.js';
 import { PrivateCallRequest } from './private_call_request.js';
@@ -56,7 +56,7 @@ import { CountedPublicCallRequest } from './public_call_request.js';
    * @returns Deserialized object.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateAccumulatedData(reader.readArray(MAX_NOTE_HASHES_PER_TX, ScopedNoteHash), reader.readArray(MAX_NULLIFIERS_PER_TX, ScopedNullifier), reader.readArray(MAX_L2_TO_L1_MSGS_PER_TX, ScopedL2ToL1Message), reader.readArray(MAX_PRIVATE_LOGS_PER_TX, ScopedPrivateLogData), reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_TX, ScopedLogHash), reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, CountedPublicCallRequest), reader.readArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, PrivateCallRequest));
+        return new PrivateAccumulatedData(reader.readArray(MAX_NOTE_HASHES_PER_TX, ScopedNoteHash), reader.readArray(MAX_NULLIFIERS_PER_TX, ScopedNullifier), reader.readArray(MAX_L2_TO_L1_MSGS_PER_TX, ScopedL2ToL1Message), reader.readArray(MAX_PRIVATE_LOGS_PER_TX, ScopedPrivateLogData), reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_TX, ScopedCountedLogHash), reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, CountedPublicCallRequest), reader.readArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, PrivateCallRequest));
     }
     /**
    * Deserializes from a string, corresponding to a write in cpp.
@@ -66,6 +66,6 @@ import { CountedPublicCallRequest } from './public_call_request.js';
         return PrivateAccumulatedData.fromBuffer(hexToBuffer(str));
     }
     static empty() {
-        return new PrivateAccumulatedData(makeTuple(MAX_NOTE_HASHES_PER_TX, ScopedNoteHash.empty), makeTuple(MAX_NULLIFIERS_PER_TX, ScopedNullifier.empty), makeTuple(MAX_L2_TO_L1_MSGS_PER_TX, ScopedL2ToL1Message.empty), makeTuple(MAX_PRIVATE_LOGS_PER_TX, ScopedPrivateLogData.empty), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ScopedLogHash.empty), makeTuple(MAX_ENQUEUED_CALLS_PER_TX, CountedPublicCallRequest.empty), makeTuple(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, PrivateCallRequest.empty));
+        return new PrivateAccumulatedData(makeTuple(MAX_NOTE_HASHES_PER_TX, ScopedNoteHash.empty), makeTuple(MAX_NULLIFIERS_PER_TX, ScopedNullifier.empty), makeTuple(MAX_L2_TO_L1_MSGS_PER_TX, ScopedL2ToL1Message.empty), makeTuple(MAX_PRIVATE_LOGS_PER_TX, ScopedPrivateLogData.empty), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ScopedCountedLogHash.empty), makeTuple(MAX_ENQUEUED_CALLS_PER_TX, CountedPublicCallRequest.empty), makeTuple(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, PrivateCallRequest.empty));
     }
 }

package/dest/kernel/private_circuit_public_inputs.d.ts

@@ -5,7 +5,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader, type Tuple } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { KeyValidationRequestAndGenerator } from '../kernel/hints/key_validation_request_and_generator.js';
-import { LogHash } from '../kernel/log_hash.js';
+import { CountedLogHash } from '../kernel/log_hash.js';
 import { PrivateCallRequest } from '../kernel/private_call_request.js';
 import { PrivateLogData } from '../kernel/private_log_data.js';
 import { L2ToL1Message } from '../messaging/l2_to_l1_message.js';
@@ -88,7 +88,7 @@ export declare class PrivateCircuitPublicInputs {
     /**
      * Hash of the contract class logs emitted in this function call.
      */
-    contractClassLogsHashes: Tuple<LogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_CALL>;
+    contractClassLogsHashes: Tuple<CountedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_CALL>;
     /**
      * The side effect counter at the start of this call.
      */
@@ -177,7 +177,7 @@ export declare class PrivateCircuitPublicInputs {
     /**
      * Hash of the contract class logs emitted in this function call.
      */
-    contractClassLogsHashes: Tuple<LogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_CALL>, 
+    contractClassLogsHashes: Tuple<CountedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_CALL>, 
     /**
      * The side effect counter at the start of this call.
      */
@@ -222,7 +222,7 @@ export declare class PrivateCircuitPublicInputs {
      * @param fields - Object with fields.
      * @returns The array.
      */
-    static getFields(fields: FieldsOf<PrivateCircuitPublicInputs>): readonly [CallContext, Fr, Fr, Fr, boolean, MaxBlockNumber, [ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest], [ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest], [KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator], [NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash], [Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier], [PrivateCallRequest, PrivateCallRequest, PrivateCallRequest, PrivateCallRequest, PrivateCallRequest], [CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest], PublicCallRequest, [L2ToL1Message, L2ToL1Message], [PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData], [LogHash], Fr, Fr, BlockHeader, TxContext];
+    static getFields(fields: FieldsOf<PrivateCircuitPublicInputs>): readonly [CallContext, Fr, Fr, Fr, boolean, MaxBlockNumber, [ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest], [ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest, ReadRequest], [KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator, KeyValidationRequestAndGenerator], [NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash, NoteHash], [Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier, Nullifier], [PrivateCallRequest, PrivateCallRequest, PrivateCallRequest, PrivateCallRequest, PrivateCallRequest], [CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest, CountedPublicCallRequest], PublicCallRequest, [L2ToL1Message, L2ToL1Message], [PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData, PrivateLogData], [CountedLogHash], Fr, Fr, BlockHeader, TxContext];
     /**
      * Serialize this as a buffer.
      * @returns The buffer.

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

@@ -1 +1 @@
-{"version":3,"file":"private_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_circuit_public_inputs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"private_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_circuit_public_inputs.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,gCAAgC,EAChC,2BAA2B,EAC3B,oCAAoC,EACpC,0BAA0B,EAC1B,wBAAwB,EACxB,oCAAoC,EACpC,uBAAuB,EACvB,oCAAoC,EACpC,sCAAsC,EACtC,yBAAyB,EAE1B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EACL,YAAY,EACZ,WAAW,EACX,KAAK,KAAK,EAGX,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,gCAAgC,EAAE,MAAM,yDAAyD,CAAC;AAC3G,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAGvF;;GAEG;AACH,qBAAa,0BAA0B;IAEnC;;OAEG;IACI,WAAW,EAAE,WAAW;IAC/B;;OAEG;IACI,QAAQ,EAAE,EAAE;IACnB;;OAEG;IACI,WAAW,EAAE,EAAE;IACtB;;OAEG;IACI,8BAA8B,EAAE,EAAE;IACzC;;OAEG;IACI,UAAU,EAAE,OAAO;IAC1B;;OAEG;IACI,cAAc,EAAE,cAAc;IACrC;;OAEG;IACI,oBAAoB,EAAE,KAAK,CAAC,WAAW,EAAE,OAAO,oCAAoC,CAAC;IAC5F;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,WAAW,EAAE,OAAO,oCAAoC,CAAC;IAC7F;;OAEG;IACI,kCAAkC,EAAE,KAAK,CAC9C,gCAAgC,EAChC,OAAO,oCAAoC,CAC5C;IACD;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,OAAO,wBAAwB,CAAC;IACnE;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,uBAAuB,CAAC;IACnE;;OAEG;IACI,mBAAmB,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,sCAAsC,CAAC;IACpG;;OAEG;IACI,kBAAkB,EAAE,KAAK,CAAC,wBAAwB,EAAE,OAAO,2BAA2B,CAAC;IAC9F;;OAEG;IACI,yBAAyB,EAAE,iBAAiB;IACnD;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,aAAa,EAAE,OAAO,0BAA0B,CAAC;IAC1E;;OAEG;IACI,WAAW,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,yBAAyB,CAAC;IAC3E;;OAEG;IACI,uBAAuB,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,gCAAgC,CAAC;IAC9F;;OAEG;IACI,sBAAsB,EAAE,EAAE;IACjC;;OAEG;IACI,oBAAoB,EAAE,EAAE;IAC/B;;OAEG;IACI,gBAAgB,EAAE,WAAW;IACpC;;;;;;OAMG;IACI,SAAS,EAAE,SAAS;;IA1F3B;;OAEG;IACI,WAAW,EAAE,WAAW;IAC/B;;OAEG;IACI,QAAQ,EAAE,EAAE;IACnB;;OAEG;IACI,WAAW,EAAE,EAAE;IACtB;;OAEG;IACI,8BAA8B,EAAE,EAAE;IACzC;;OAEG;IACI,UAAU,EAAE,OAAO;IAC1B;;OAEG;IACI,cAAc,EAAE,cAAc;IACrC;;OAEG;IACI,oBAAoB,EAAE,KAAK,CAAC,WAAW,EAAE,OAAO,oCAAoC,CAAC;IAC5F;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,WAAW,EAAE,OAAO,oCAAoC,CAAC;IAC7F;;OAEG;IACI,kCAAkC,EAAE,KAAK,CAC9C,gCAAgC,EAChC,OAAO,oCAAoC,CAC5C;IACD;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,OAAO,wBAAwB,CAAC;IACnE;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,uBAAuB,CAAC;IACnE;;OAEG;IACI,mBAAmB,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,sCAAsC,CAAC;IACpG;;OAEG;IACI,kBAAkB,EAAE,KAAK,CAAC,wBAAwB,EAAE,OAAO,2BAA2B,CAAC;IAC9F;;OAEG;IACI,yBAAyB,EAAE,iBAAiB;IACnD;;OAEG;IACI,UAAU,EAAE,KAAK,CAAC,aAAa,EAAE,OAAO,0BAA0B,CAAC;IAC1E;;OAEG;IACI,WAAW,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,yBAAyB,CAAC;IAC3E;;OAEG;IACI,uBAAuB,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,gCAAgC,CAAC;IAC9F;;OAEG;IACI,sBAAsB,EAAE,EAAE;IACjC;;OAEG;IACI,oBAAoB,EAAE,EAAE;IAC/B;;OAEG;IACI,gBAAgB,EAAE,WAAW;IACpC;;;;;;OAMG;IACI,SAAS,EAAE,SAAS;IAG7B;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,0BAA0B,CAAC,GAAG,0BAA0B;IAIrF;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,0BAA0B;IA2B5E,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,0BAA0B;IA2BzE;;;OAGG;WACW,KAAK,IAAI,0BAA0B;IA0BjD,OAAO;IA0BP;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,0BAA0B,CAAC;IA0B7D;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB;;OAEG;IACH,QAAQ,IAAI,EAAE,EAAE;IAUT,MAAM;IAIb,MAAM,KAAK,MAAM,mEAEhB;CACF"}

package/dest/kernel/private_circuit_public_inputs.js

@@ -4,7 +4,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { KeyValidationRequestAndGenerator } from '../kernel/hints/key_validation_request_and_generator.js';
-import { LogHash } from '../kernel/log_hash.js';
+import { CountedLogHash } from '../kernel/log_hash.js';
 import { PrivateCallRequest } from '../kernel/private_call_request.js';
 import { PrivateLogData } from '../kernel/private_log_data.js';
 import { L2ToL1Message } from '../messaging/l2_to_l1_message.js';
@@ -123,17 +123,17 @@ import { isEmptyArray } from './utils/order_and_comparison.js';
    * @returns The deserialized instance.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateCircuitPublicInputs(reader.readObject(CallContext), reader.readObject(Fr), reader.readObject(Fr), reader.readObject(Fr), reader.readBoolean(), reader.readObject(MaxBlockNumber), reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, ReadRequest), reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest), reader.readArray(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, KeyValidationRequestAndGenerator), reader.readArray(MAX_NOTE_HASHES_PER_CALL, NoteHash), reader.readArray(MAX_NULLIFIERS_PER_CALL, Nullifier), reader.readArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, PrivateCallRequest), reader.readArray(MAX_ENQUEUED_CALLS_PER_CALL, CountedPublicCallRequest), reader.readObject(PublicCallRequest), reader.readArray(MAX_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message), reader.readArray(MAX_PRIVATE_LOGS_PER_CALL, PrivateLogData), reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_CALL, LogHash), reader.readObject(Fr), reader.readObject(Fr), reader.readObject(BlockHeader), reader.readObject(TxContext));
+        return new PrivateCircuitPublicInputs(reader.readObject(CallContext), reader.readObject(Fr), reader.readObject(Fr), reader.readObject(Fr), reader.readBoolean(), reader.readObject(MaxBlockNumber), reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, ReadRequest), reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest), reader.readArray(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, KeyValidationRequestAndGenerator), reader.readArray(MAX_NOTE_HASHES_PER_CALL, NoteHash), reader.readArray(MAX_NULLIFIERS_PER_CALL, Nullifier), reader.readArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, PrivateCallRequest), reader.readArray(MAX_ENQUEUED_CALLS_PER_CALL, CountedPublicCallRequest), reader.readObject(PublicCallRequest), reader.readArray(MAX_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message), reader.readArray(MAX_PRIVATE_LOGS_PER_CALL, PrivateLogData), reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_CALL, CountedLogHash), reader.readObject(Fr), reader.readObject(Fr), reader.readObject(BlockHeader), reader.readObject(TxContext));
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new PrivateCircuitPublicInputs(reader.readObject(CallContext), reader.readField(), reader.readField(), reader.readField(), reader.readBoolean(), reader.readObject(MaxBlockNumber), reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, ReadRequest), reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest), reader.readArray(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, KeyValidationRequestAndGenerator), reader.readArray(MAX_NOTE_HASHES_PER_CALL, NoteHash), reader.readArray(MAX_NULLIFIERS_PER_CALL, Nullifier), reader.readArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, PrivateCallRequest), reader.readArray(MAX_ENQUEUED_CALLS_PER_CALL, CountedPublicCallRequest), reader.readObject(PublicCallRequest), reader.readArray(MAX_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message), reader.readArray(MAX_PRIVATE_LOGS_PER_CALL, PrivateLogData), reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_CALL, LogHash), reader.readField(), reader.readField(), reader.readObject(BlockHeader), reader.readObject(TxContext));
+        return new PrivateCircuitPublicInputs(reader.readObject(CallContext), reader.readField(), reader.readField(), reader.readField(), reader.readBoolean(), reader.readObject(MaxBlockNumber), reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, ReadRequest), reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest), reader.readArray(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, KeyValidationRequestAndGenerator), reader.readArray(MAX_NOTE_HASHES_PER_CALL, NoteHash), reader.readArray(MAX_NULLIFIERS_PER_CALL, Nullifier), reader.readArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, PrivateCallRequest), reader.readArray(MAX_ENQUEUED_CALLS_PER_CALL, CountedPublicCallRequest), reader.readObject(PublicCallRequest), reader.readArray(MAX_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message), reader.readArray(MAX_PRIVATE_LOGS_PER_CALL, PrivateLogData), reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_CALL, CountedLogHash), reader.readField(), reader.readField(), reader.readObject(BlockHeader), reader.readObject(TxContext));
     }
     /**
    * Create an empty PrivateCircuitPublicInputs.
    * @returns An empty PrivateCircuitPublicInputs object.
    */ static empty() {
-        return new PrivateCircuitPublicInputs(CallContext.empty(), Fr.ZERO, Fr.ZERO, Fr.ZERO, false, MaxBlockNumber.empty(), makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, ReadRequest.empty), makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest.empty), makeTuple(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, KeyValidationRequestAndGenerator.empty), makeTuple(MAX_NOTE_HASHES_PER_CALL, NoteHash.empty), makeTuple(MAX_NULLIFIERS_PER_CALL, Nullifier.empty), makeTuple(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, PrivateCallRequest.empty), makeTuple(MAX_ENQUEUED_CALLS_PER_CALL, CountedPublicCallRequest.empty), PublicCallRequest.empty(), makeTuple(MAX_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message.empty), makeTuple(MAX_PRIVATE_LOGS_PER_CALL, PrivateLogData.empty), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_CALL, LogHash.empty), Fr.ZERO, Fr.ZERO, BlockHeader.empty(), TxContext.empty());
+        return new PrivateCircuitPublicInputs(CallContext.empty(), Fr.ZERO, Fr.ZERO, Fr.ZERO, false, MaxBlockNumber.empty(), makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, ReadRequest.empty), makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest.empty), makeTuple(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, KeyValidationRequestAndGenerator.empty), makeTuple(MAX_NOTE_HASHES_PER_CALL, NoteHash.empty), makeTuple(MAX_NULLIFIERS_PER_CALL, Nullifier.empty), makeTuple(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, PrivateCallRequest.empty), makeTuple(MAX_ENQUEUED_CALLS_PER_CALL, CountedPublicCallRequest.empty), PublicCallRequest.empty(), makeTuple(MAX_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message.empty), makeTuple(MAX_PRIVATE_LOGS_PER_CALL, PrivateLogData.empty), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_CALL, CountedLogHash.empty), Fr.ZERO, Fr.ZERO, BlockHeader.empty(), TxContext.empty());
     }
     isEmpty() {
         return this.callContext.isEmpty() && this.argsHash.isZero() && this.returnsHash.isZero() && this.minRevertibleSideEffectCounter.isZero() && !this.isFeePayer && this.maxBlockNumber.isEmpty() && isEmptyArray(this.noteHashReadRequests) && isEmptyArray(this.nullifierReadRequests) && isEmptyArray(this.keyValidationRequestsAndGenerators) && isEmptyArray(this.noteHashes) && isEmptyArray(this.nullifiers) && isEmptyArray(this.privateCallRequests) && isEmptyArray(this.publicCallRequests) && this.publicTeardownCallRequest.isEmpty() && isEmptyArray(this.l2ToL1Msgs) && isEmptyArray(this.privateLogs) && isEmptyArray(this.contractClassLogsHashes) && this.startSideEffectCounter.isZero() && this.endSideEffectCounter.isZero() && this.historicalHeader.isEmpty() && this.txContext.isEmpty();

package/dest/kernel/private_kernel_tail_circuit_public_inputs.d.ts

@@ -4,8 +4,10 @@ import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '../aztec-address/index.js';
 import { Gas } from '../gas/gas.js';
+import type { PrivateLog } from '../logs/index.js';
 import { TxConstantData } from '../tx/tx_constant_data.js';
 import { RollupValidationRequests } from './hints/rollup_validation_requests.js';
+import type { ScopedLogHash } from './log_hash.js';
 import { PrivateToPublicAccumulatedData } from './private_to_public_accumulated_data.js';
 import { PrivateToPublicKernelCircuitPublicInputs } from './private_to_public_kernel_circuit_public_inputs.js';
 import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_data.js';
@@ -98,8 +100,8 @@ export declare class PrivateKernelTailCircuitPublicInputs {
     getTeardownPublicCallRequest(): PublicCallRequest | undefined;
     getNonEmptyNoteHashes(): Fr[];
     getNonEmptyNullifiers(): Fr[];
-    getNonEmptyPrivateLogs(): import("../logs/private_log.js").PrivateLog[];
-    getNonEmptyContractClassLogsHashes(): import("./log_hash.js").ScopedLogHash[];
+    getNonEmptyPrivateLogs(): PrivateLog[];
+    getNonEmptyContractClassLogsHashes(): ScopedLogHash[];
     getEmittedContractClassLogsLength(): number;
     getEmittedPrivateLogsLength(): number;
     static fromBuffer(buffer: Buffer | BufferReader): PrivateKernelTailCircuitPublicInputs;

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

@@ -1 +1 @@
-{"version":3,"file":"private_kernel_tail_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_kernel_tail_circuit_public_inputs.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AACzF,OAAO,EAAE,wCAAwC,EAAE,MAAM,qDAAqD,CAAC;AAC/G,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AACzF,OAAO,EAAE,wCAAwC,EAAE,MAAM,qDAAqD,CAAC;AAC/G,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG7D,qBAAa,uCAAuC;IAEhD;;OAEG;IACI,4BAA4B,EAAE,8BAA8B;IACnE;;OAEG;IACI,yBAAyB,EAAE,8BAA8B;IAChE;;OAEG;IACI,yBAAyB,EAAE,iBAAiB;;IAXnD;;OAEG;IACI,4BAA4B,EAAE,8BAA8B;IACnE;;OAEG;IACI,yBAAyB,EAAE,8BAA8B;IAChE;;OAEG;IACI,yBAAyB,EAAE,iBAAiB;IAGrD,OAAO;IAQP,IAAI,UAAU,YAEb;IAED,IAAI,aAAa,YAEhB;IAED,IAAI,aAAa,YAEhB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,uCAAuC;IASzF,QAAQ;IAQR,MAAM,CAAC,KAAK;CAOb;AAED,qBAAa,uCAAuC;IAC/B,GAAG,EAAE,8BAA8B;gBAAnC,GAAG,EAAE,8BAA8B;IAEtD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,uCAAuC;IAKzF,OAAO;IAIP,QAAQ;IAIR,MAAM,CAAC,KAAK;CAGb;AAED,qBAAa,oCAAoC;IAE7C;;OAEG;IACI,SAAS,EAAE,cAAc;IACzB,wBAAwB,EAAE,wBAAwB;IACzD;;;OAGG;IACI,OAAO,EAAE,GAAG;IACnB;;OAEG;IACI,QAAQ,EAAE,YAAY;IAEtB,SAAS,CAAC;IACV,SAAS,CAAC;;IAhBjB;;OAEG;IACI,SAAS,EAAE,cAAc,EACzB,wBAAwB,EAAE,wBAAwB;IACzD;;;OAGG;IACI,OAAO,EAAE,GAAG;IACnB;;OAEG;IACI,QAAQ,EAAE,YAAY,EAEtB,SAAS,CAAC,qDAAyC,EACnD,SAAS,CAAC,qDAAyC;IAY5D,MAAM,KAAK,MAAM,6EAEhB;IAED,MAAM;IAIN,OAAO;IAUP,0CAA0C;IAe1C,0CAA0C;IAmB1C,0BAA0B;IAQ1B,uCAAuC;IAIvC,oCAAoC;IAIpC,4BAA4B;IAI5B,kCAAkC;IAMlC,+BAA+B;IAI/B,4BAA4B;IAK5B,qBAAqB;IAUrB,qBAAqB;IAUrB,sBAAsB;IAUtB,kCAAkC;IAUlC,iCAAiC;IAIjC,2BAA2B;IAI3B,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,oCAAoC;IAatF,QAAQ;IAYR,MAAM,CAAC,KAAK;IAWZ;;;;OAIG;IACH,MAAM,CAAC,kBAAkB;CAY1B"}
+{"version":3,"file":"private_kernel_tail_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_kernel_tail_circuit_public_inputs.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AACzF,OAAO,EAAE,wCAAwC,EAAE,MAAM,qDAAqD,CAAC;AAC/G,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AACzF,OAAO,EAAE,wCAAwC,EAAE,MAAM,qDAAqD,CAAC;AAC/G,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG7D,qBAAa,uCAAuC;IAEhD;;OAEG;IACI,4BAA4B,EAAE,8BAA8B;IACnE;;OAEG;IACI,yBAAyB,EAAE,8BAA8B;IAChE;;OAEG;IACI,yBAAyB,EAAE,iBAAiB;;IAXnD;;OAEG;IACI,4BAA4B,EAAE,8BAA8B;IACnE;;OAEG;IACI,yBAAyB,EAAE,8BAA8B;IAChE;;OAEG;IACI,yBAAyB,EAAE,iBAAiB;IAGrD,OAAO;IAQP,IAAI,UAAU,YAEb;IAED,IAAI,aAAa,YAEhB;IAED,IAAI,aAAa,YAEhB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,uCAAuC;IASzF,QAAQ;IAQR,MAAM,CAAC,KAAK;CAOb;AAED,qBAAa,uCAAuC;IAC/B,GAAG,EAAE,8BAA8B;gBAAnC,GAAG,EAAE,8BAA8B;IAEtD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,uCAAuC;IAKzF,OAAO;IAIP,QAAQ;IAIR,MAAM,CAAC,KAAK;CAGb;AAED,qBAAa,oCAAoC;IAE7C;;OAEG;IACI,SAAS,EAAE,cAAc;IACzB,wBAAwB,EAAE,wBAAwB;IACzD;;;OAGG;IACI,OAAO,EAAE,GAAG;IACnB;;OAEG;IACI,QAAQ,EAAE,YAAY;IAEtB,SAAS,CAAC;IACV,SAAS,CAAC;;IAhBjB;;OAEG;IACI,SAAS,EAAE,cAAc,EACzB,wBAAwB,EAAE,wBAAwB;IACzD;;;OAGG;IACI,OAAO,EAAE,GAAG;IACnB;;OAEG;IACI,QAAQ,EAAE,YAAY,EAEtB,SAAS,CAAC,qDAAyC,EACnD,SAAS,CAAC,qDAAyC;IAY5D,MAAM,KAAK,MAAM,6EAEhB;IAED,MAAM;IAIN,OAAO;IAUP,0CAA0C;IAe1C,0CAA0C;IAmB1C,0BAA0B;IAQ1B,uCAAuC;IAIvC,oCAAoC;IAIpC,4BAA4B;IAI5B,kCAAkC;IAMlC,+BAA+B;IAI/B,4BAA4B;IAK5B,qBAAqB;IAUrB,qBAAqB;IAUrB,sBAAsB;IAUtB,kCAAkC;IAUlC,iCAAiC;IASjC,2BAA2B;IAQ3B,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,oCAAoC;IAatF,QAAQ;IAYR,MAAM,CAAC,KAAK;IAWZ;;;;OAIG;IACH,MAAM,CAAC,kBAAkB;CAY1B"}

package/dest/kernel/private_kernel_tail_circuit_public_inputs.js

@@ -157,10 +157,12 @@ export class PrivateKernelTailCircuitPublicInputs {
         return contractClassLogsHashes.filter((h)=>!h.isEmpty());
     }
     getEmittedContractClassLogsLength() {
-        return this.getNonEmptyContractClassLogsHashes().reduce((total, log)=>total + log.logHash.length, 0);
+        const accumulateLengths = (logHashes)=>logHashes.reduce((acc, log)=>acc + log.logHash.length, 0);
+        return this.forPublic ? accumulateLengths(this.forPublic.nonRevertibleAccumulatedData.contractClassLogsHashes) + accumulateLengths(this.forPublic.revertibleAccumulatedData.contractClassLogsHashes) : accumulateLengths(this.forRollup.end.contractClassLogsHashes);
     }
     getEmittedPrivateLogsLength() {
-        return this.getNonEmptyPrivateLogs().reduce((total, log)=>total + log.getEmittedLength(), 0);
+        const accumulateLengths = (logs)=>logs.reduce((acc, log)=>acc + log.emittedLength, 0);
+        return this.forPublic ? accumulateLengths(this.forPublic.nonRevertibleAccumulatedData.privateLogs) + accumulateLengths(this.forPublic.revertibleAccumulatedData.privateLogs) : accumulateLengths(this.forRollup.end.privateLogs);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);