@aztec/stdlib 0.0.0-test.1 → 0.0.1-commit.1142ef1

package/dest/kernel/log_hash.js

@@ -1,50 +1,83 @@
-import { Fr } from '@aztec/foundation/fields';
+var _computedKey;
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { AztecAddress } from '../aztec-address/index.js';
+_computedKey = inspect.custom;
 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);
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         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 +85,6 @@ export class ScopedLogHash {
         this.logHash = logHash;
         this.contractAddress = contractAddress;
     }
-    get counter() {
-        return this.logHash.counter;
-    }
     get value() {
         return this.logHash.value;
     }
@@ -85,3 +115,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/note_hash.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '../aztec-address/index.js';
 import type { Ordered } from './utils/interfaces.js';
@@ -31,4 +29,4 @@ export declare class ScopedNoteHash implements Ordered {
     static fromBuffer(buffer: Buffer | BufferReader): ScopedNoteHash;
     toString(): string;
 }
-//# sourceMappingURL=note_hash.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9oYXNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2VybmVsL25vdGVfaGFzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFM0YsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXJELHFCQUFhLFFBQVE7SUFFVixLQUFLLEVBQUUsRUFBRTtJQUNULE9BQU8sRUFBRSxNQUFNO0lBRnhCLFlBQ1MsS0FBSyxFQUFFLEVBQUUsRUFDVCxPQUFPLEVBQUUsTUFBTSxFQUNwQjtJQUVKLFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsWUFHM0M7SUFFRCxPQUFPLFlBRU47SUFFRCxNQUFNLENBQUMsS0FBSyxhQUVYO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxZQUc5QztJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsS0FBSyxDQUFDLGVBQWUsRUFBRSxZQUFZLGtCQUVsQztDQUNGO0FBRUQscUJBQWEsY0FBZSxZQUFXLE9BQU87SUFFbkMsUUFBUSxFQUFFLFFBQVE7SUFDbEIsZUFBZSxFQUFFLFlBQVk7SUFGdEMsWUFDUyxRQUFRLEVBQUUsUUFBUSxFQUNsQixlQUFlLEVBQUUsWUFBWSxFQUNsQztJQUVKLElBQUksT0FBTyxXQUVWO0lBRUQsSUFBSSxLQUFLLE9BRVI7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLGtCQUczQztJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLG1CQUVYO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxrQkFHOUM7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"note_hash.d.ts","sourceRoot":"","sources":["../../src/kernel/note_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,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,QAAQ;IACA,KAAK,EAAE,EAAE;IAAS,OAAO,EAAE,MAAM;gBAAjC,KAAK,EAAE,EAAE,EAAS,OAAO,EAAE,MAAM;IAEpD,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;CAGpC;AAED,qBAAa,cAAe,YAAW,OAAO;IACzB,QAAQ,EAAE,QAAQ;IAAS,eAAe,EAAE,YAAY;gBAAxD,QAAQ,EAAE,QAAQ,EAAS,eAAe,EAAE,YAAY;IAE3E,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":"note_hash.d.ts","sourceRoot":"","sources":["../../src/kernel/note_hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,QAAQ;IAEV,KAAK,EAAE,EAAE;IACT,OAAO,EAAE,MAAM;IAFxB,YACS,KAAK,EAAE,EAAE,EACT,OAAO,EAAE,MAAM,EACpB;IAEJ,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,YAG3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,aAEX;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,YAG9C;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,KAAK,CAAC,eAAe,EAAE,YAAY,kBAElC;CACF;AAED,qBAAa,cAAe,YAAW,OAAO;IAEnC,QAAQ,EAAE,QAAQ;IAClB,eAAe,EAAE,YAAY;IAFtC,YACS,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,YAAY,EAClC;IAEJ,IAAI,OAAO,WAEV;IAED,IAAI,KAAK,OAER;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,kBAG3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,mBAEX;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,kBAG9C;IAED,QAAQ,IAAI,MAAM,CAEjB;CACF"}

package/dest/kernel/note_hash.js

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { AztecAddress } from '../aztec-address/index.js';
 export class NoteHash {

package/dest/kernel/nullifier.d.ts

@@ -1,14 +1,12 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '../aztec-address/index.js';
 import type { Ordered } from './utils/interfaces.js';
 export declare class Nullifier implements Ordered {
     value: Fr;
-    counter: number;
     noteHash: Fr;
-    constructor(value: Fr, counter: number, noteHash: Fr);
+    counter: number;
+    constructor(value: Fr, noteHash: Fr, counter: number);
     toFields(): Fr[];
     static fromFields(fields: Fr[] | FieldReader): Nullifier;
     isEmpty(): boolean;
@@ -33,4 +31,4 @@ export declare class ScopedNullifier implements Ordered {
     static fromBuffer(buffer: Buffer | BufferReader): ScopedNullifier;
     toString(): string;
 }
-//# sourceMappingURL=nullifier.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnVsbGlmaWVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2VybmVsL251bGxpZmllci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFM0YsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXJELHFCQUFhLFNBQVUsWUFBVyxPQUFPO0lBRTlCLEtBQUssRUFBRSxFQUFFO0lBQ1QsUUFBUSxFQUFFLEVBQUU7SUFDWixPQUFPLEVBQUUsTUFBTTtJQUh4QixZQUNTLEtBQUssRUFBRSxFQUFFLEVBQ1QsUUFBUSxFQUFFLEVBQUUsRUFDWixPQUFPLEVBQUUsTUFBTSxFQUNwQjtJQUVKLFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsYUFHM0M7SUFFRCxPQUFPLFlBRU47SUFFRCxNQUFNLENBQUMsS0FBSyxjQUVYO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxhQUc5QztJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsS0FBSyxDQUFDLGVBQWUsRUFBRSxZQUFZLG1CQUVsQztDQUNGO0FBRUQscUJBQWEsZUFBZ0IsWUFBVyxPQUFPO0lBRXBDLFNBQVMsRUFBRSxTQUFTO0lBQ3BCLGVBQWUsRUFBRSxZQUFZO0lBRnRDLFlBQ1MsU0FBUyxFQUFFLFNBQVMsRUFDcEIsZUFBZSxFQUFFLFlBQVksRUFDbEM7SUFFSixJQUFJLE9BQU8sV0FFVjtJQUVELElBQUksS0FBSyxPQUVSO0lBRUQsSUFBSSxpQkFBaUIsT0FFcEI7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLG1CQUczQztJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxLQUFLLG9CQUVYO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxtQkFHOUM7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"nullifier.d.ts","sourceRoot":"","sources":["../../src/kernel/nullifier.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,SAAU,YAAW,OAAO;IACpB,KAAK,EAAE,EAAE;IAAS,OAAO,EAAE,MAAM;IAAS,QAAQ,EAAE,EAAE;gBAAtD,KAAK,EAAE,EAAE,EAAS,OAAO,EAAE,MAAM,EAAS,QAAQ,EAAE,EAAE;IAEzE,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;CAGpC;AAED,qBAAa,eAAgB,YAAW,OAAO;IAC1B,SAAS,EAAE,SAAS;IAAS,eAAe,EAAE,YAAY;gBAA1D,SAAS,EAAE,SAAS,EAAS,eAAe,EAAE,YAAY;IAE7E,IAAI,OAAO,WAEV;IAED,IAAI,KAAK,OAER;IAED,IAAI,iBAAiB,OAEpB;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":"nullifier.d.ts","sourceRoot":"","sources":["../../src/kernel/nullifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,SAAU,YAAW,OAAO;IAE9B,KAAK,EAAE,EAAE;IACT,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,MAAM;IAHxB,YACS,KAAK,EAAE,EAAE,EACT,QAAQ,EAAE,EAAE,EACZ,OAAO,EAAE,MAAM,EACpB;IAEJ,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,aAG3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,cAEX;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,aAG9C;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,KAAK,CAAC,eAAe,EAAE,YAAY,mBAElC;CACF;AAED,qBAAa,eAAgB,YAAW,OAAO;IAEpC,SAAS,EAAE,SAAS;IACpB,eAAe,EAAE,YAAY;IAFtC,YACS,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,YAAY,EAClC;IAEJ,IAAI,OAAO,WAEV;IAED,IAAI,KAAK,OAER;IAED,IAAI,iBAAiB,OAEpB;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,mBAG3C;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,oBAEX;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,mBAG9C;IAED,QAAQ,IAAI,MAAM,CAEjB;CACF"}

package/dest/kernel/nullifier.js

@@ -1,41 +1,41 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { AztecAddress } from '../aztec-address/index.js';
 export class Nullifier {
     value;
-    counter;
     noteHash;
-    constructor(value, counter, noteHash){
+    counter;
+    constructor(value, noteHash, counter){
         this.value = value;
-        this.counter = counter;
         this.noteHash = noteHash;
+        this.counter = counter;
     }
     toFields() {
         return [
             this.value,
-            new Fr(this.counter),
-            this.noteHash
+            this.noteHash,
+            new Fr(this.counter)
         ];
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new Nullifier(reader.readField(), reader.readU32(), reader.readField());
+        return new Nullifier(reader.readField(), reader.readField(), reader.readU32());
     }
     isEmpty() {
-        return this.value.isZero() && !this.counter && this.noteHash.isZero();
+        return this.value.isZero() && this.noteHash.isZero() && !this.counter;
     }
     static empty() {
-        return new Nullifier(Fr.zero(), 0, Fr.zero());
+        return new Nullifier(Fr.zero(), Fr.zero(), 0);
     }
     toBuffer() {
-        return serializeToBuffer(this.value, this.counter, this.noteHash);
+        return serializeToBuffer(this.value, this.noteHash, this.counter);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new Nullifier(Fr.fromBuffer(reader), reader.readNumber(), Fr.fromBuffer(reader));
+        return new Nullifier(Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readNumber());
     }
     toString() {
-        return `value=${this.value} counter=${this.counter} noteHash=${this.noteHash}`;
+        return `value=${this.value} noteHash=${this.noteHash} counter=${this.counter}`;
     }
     scope(contractAddress) {
         return new ScopedNullifier(this, contractAddress);

package/dest/kernel/padded_side_effects.d.ts

@@ -0,0 +1,26 @@
+import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
+import { PrivateLog } from '../logs/index.js';
+export declare class PaddedSideEffects {
+    noteHashes: Tuple<Fr, typeof MAX_NOTE_HASHES_PER_TX>;
+    nullifiers: Tuple<Fr, typeof MAX_NULLIFIERS_PER_TX>;
+    privateLogs: Tuple<PrivateLog, typeof MAX_PRIVATE_LOGS_PER_TX>;
+    constructor(noteHashes: Tuple<Fr, typeof MAX_NOTE_HASHES_PER_TX>, nullifiers: Tuple<Fr, typeof MAX_NULLIFIERS_PER_TX>, privateLogs: Tuple<PrivateLog, typeof MAX_PRIVATE_LOGS_PER_TX>);
+    toBuffer(): Buffer<ArrayBufferLike>;
+    static fromBuffer(buffer: Buffer | BufferReader): PaddedSideEffects;
+    static empty(): PaddedSideEffects;
+}
+export declare class PaddedSideEffectAmounts {
+    nonRevertibleNoteHashes: number;
+    revertibleNoteHashes: number;
+    nonRevertibleNullifiers: number;
+    revertibleNullifiers: number;
+    nonRevertiblePrivateLogs: number;
+    revertiblePrivateLogs: number;
+    constructor(nonRevertibleNoteHashes: number, revertibleNoteHashes: number, nonRevertibleNullifiers: number, revertibleNullifiers: number, nonRevertiblePrivateLogs: number, revertiblePrivateLogs: number);
+    toBuffer(): Buffer<ArrayBufferLike>;
+    static fromBuffer(buffer: Buffer | BufferReader): PaddedSideEffectAmounts;
+    static empty(): PaddedSideEffectAmounts;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFkZGVkX3NpZGVfZWZmZWN0cy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2tlcm5lbC9wYWRkZWRfc2lkZV9lZmZlY3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxxQkFBcUIsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTFHLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLEtBQUssS0FBSyxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTFGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU5QyxxQkFBYSxpQkFBaUI7SUFFbkIsVUFBVSxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsT0FBTyxzQkFBc0IsQ0FBQztJQUNwRCxVQUFVLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxPQUFPLHFCQUFxQixDQUFDO0lBQ25ELFdBQVcsRUFBRSxLQUFLLENBQUMsVUFBVSxFQUFFLE9BQU8sdUJBQXVCLENBQUM7SUFIdkUsWUFDUyxVQUFVLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxPQUFPLHNCQUFzQixDQUFDLEVBQ3BELFVBQVUsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLE9BQU8scUJBQXFCLENBQUMsRUFDbkQsV0FBVyxFQUFFLEtBQUssQ0FBQyxVQUFVLEVBQUUsT0FBTyx1QkFBdUIsQ0FBQyxFQUNuRTtJQUVKLFFBQVEsNEJBRVA7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxxQkFPOUM7SUFFRCxNQUFNLENBQUMsS0FBSyxzQkFNWDtDQUNGO0FBRUQscUJBQWEsdUJBQXVCO0lBRXpCLHVCQUF1QixFQUFFLE1BQU07SUFDL0Isb0JBQW9CLEVBQUUsTUFBTTtJQUM1Qix1QkFBdUIsRUFBRSxNQUFNO0lBQy9CLG9CQUFvQixFQUFFLE1BQU07SUFDNUIsd0JBQXdCLEVBQUUsTUFBTTtJQUNoQyxxQkFBcUIsRUFBRSxNQUFNO0lBTnRDLFlBQ1MsdUJBQXVCLEVBQUUsTUFBTSxFQUMvQixvQkFBb0IsRUFBRSxNQUFNLEVBQzVCLHVCQUF1QixFQUFFLE1BQU0sRUFDL0Isb0JBQW9CLEVBQUUsTUFBTSxFQUM1Qix3QkFBd0IsRUFBRSxNQUFNLEVBQ2hDLHFCQUFxQixFQUFFLE1BQU0sRUFDbEM7SUFFSixRQUFRLDRCQVNQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksMkJBVTlDO0lBRUQsTUFBTSxDQUFDLEtBQUssNEJBRVg7Q0FDRiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"padded_side_effects.d.ts","sourceRoot":"","sources":["../../src/kernel/padded_side_effects.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE1G,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAE1F,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,qBAAa,iBAAiB;IAEnB,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,sBAAsB,CAAC;IACpD,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC;IACnD,WAAW,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,uBAAuB,CAAC;IAHvE,YACS,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,sBAAsB,CAAC,EACpD,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,qBAAqB,CAAC,EACnD,WAAW,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,uBAAuB,CAAC,EACnE;IAEJ,QAAQ,4BAEP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,qBAO9C;IAED,MAAM,CAAC,KAAK,sBAMX;CACF;AAED,qBAAa,uBAAuB;IAEzB,uBAAuB,EAAE,MAAM;IAC/B,oBAAoB,EAAE,MAAM;IAC5B,uBAAuB,EAAE,MAAM;IAC/B,oBAAoB,EAAE,MAAM;IAC5B,wBAAwB,EAAE,MAAM;IAChC,qBAAqB,EAAE,MAAM;IANtC,YACS,uBAAuB,EAAE,MAAM,EAC/B,oBAAoB,EAAE,MAAM,EAC5B,uBAAuB,EAAE,MAAM,EAC/B,oBAAoB,EAAE,MAAM,EAC5B,wBAAwB,EAAE,MAAM,EAChC,qBAAqB,EAAE,MAAM,EAClC;IAEJ,QAAQ,4BASP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,2BAU9C;IAED,MAAM,CAAC,KAAK,4BAEX;CACF"}

package/dest/kernel/padded_side_effects.js

@@ -0,0 +1,51 @@
+import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX } from '@aztec/constants';
+import { makeTuple } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { PrivateLog } from '../logs/index.js';
+export class PaddedSideEffects {
+    noteHashes;
+    nullifiers;
+    privateLogs;
+    constructor(noteHashes, nullifiers, privateLogs){
+        this.noteHashes = noteHashes;
+        this.nullifiers = nullifiers;
+        this.privateLogs = privateLogs;
+    }
+    toBuffer() {
+        return serializeToBuffer(this.noteHashes, this.nullifiers, this.privateLogs);
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new PaddedSideEffects(reader.readArray(MAX_NOTE_HASHES_PER_TX, Fr), reader.readArray(MAX_NULLIFIERS_PER_TX, Fr), reader.readArray(MAX_PRIVATE_LOGS_PER_TX, PrivateLog));
+    }
+    static empty() {
+        return new PaddedSideEffects(makeTuple(MAX_NOTE_HASHES_PER_TX, Fr.zero), makeTuple(MAX_NULLIFIERS_PER_TX, Fr.zero), makeTuple(MAX_PRIVATE_LOGS_PER_TX, PrivateLog.empty));
+    }
+}
+export class PaddedSideEffectAmounts {
+    nonRevertibleNoteHashes;
+    revertibleNoteHashes;
+    nonRevertibleNullifiers;
+    revertibleNullifiers;
+    nonRevertiblePrivateLogs;
+    revertiblePrivateLogs;
+    constructor(nonRevertibleNoteHashes, revertibleNoteHashes, nonRevertibleNullifiers, revertibleNullifiers, nonRevertiblePrivateLogs, revertiblePrivateLogs){
+        this.nonRevertibleNoteHashes = nonRevertibleNoteHashes;
+        this.revertibleNoteHashes = revertibleNoteHashes;
+        this.nonRevertibleNullifiers = nonRevertibleNullifiers;
+        this.revertibleNullifiers = revertibleNullifiers;
+        this.nonRevertiblePrivateLogs = nonRevertiblePrivateLogs;
+        this.revertiblePrivateLogs = revertiblePrivateLogs;
+    }
+    toBuffer() {
+        return serializeToBuffer(this.nonRevertibleNoteHashes, this.revertibleNoteHashes, this.nonRevertibleNullifiers, this.revertibleNullifiers, this.nonRevertiblePrivateLogs, this.revertiblePrivateLogs);
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new PaddedSideEffectAmounts(reader.readNumber(), reader.readNumber(), reader.readNumber(), reader.readNumber(), reader.readNumber(), reader.readNumber());
+    }
+    static empty() {
+        return new PaddedSideEffectAmounts(0, 0, 0, 0, 0, 0);
+    }
+}

package/dest/kernel/private_accumulated_data.d.ts

@@ -1,9 +1,8 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 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 { BufferReader } from '@aztec/foundation/serialize';
+import { ScopedCountedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
+import { ClaimedLengthArray } from './claimed_length_array.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';
@@ -14,66 +13,44 @@ import { CountedPublicCallRequest } from './public_call_request.js';
  *  in the final public inputs of private kernel circuit.
  */
 export declare class PrivateAccumulatedData {
-    /**
-     * The new note hashes made in this transaction.
-     */
-    noteHashes: Tuple<ScopedNoteHash, typeof MAX_NOTE_HASHES_PER_TX>;
-    /**
-     * The new nullifiers made in this transaction.
-     */
-    nullifiers: Tuple<ScopedNullifier, typeof MAX_NULLIFIERS_PER_TX>;
-    /**
-     * All the new L2 to L1 messages created in this transaction.
-     */
-    l2ToL1Msgs: Tuple<ScopedL2ToL1Message, typeof MAX_L2_TO_L1_MSGS_PER_TX>;
-    /**
-     * Accumulated logs from all the previous kernel iterations.
-     */
-    privateLogs: Tuple<ScopedPrivateLogData, typeof MAX_PRIVATE_LOGS_PER_TX>;
-    /**
-     * 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>;
-    /**
-     * Accumulated public call requests from all the previous kernel iterations.
-     */
-    publicCallRequests: Tuple<CountedPublicCallRequest, typeof MAX_ENQUEUED_CALLS_PER_TX>;
-    /**
-     * Current private call stack.
-     */
-    privateCallStack: Tuple<PrivateCallRequest, typeof MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX>;
+    noteHashes: ClaimedLengthArray<ScopedNoteHash, typeof MAX_NOTE_HASHES_PER_TX>;
+    nullifiers: ClaimedLengthArray<ScopedNullifier, typeof MAX_NULLIFIERS_PER_TX>;
+    l2ToL1Msgs: ClaimedLengthArray<ScopedCountedL2ToL1Message, typeof MAX_L2_TO_L1_MSGS_PER_TX>;
+    privateLogs: ClaimedLengthArray<ScopedPrivateLogData, typeof MAX_PRIVATE_LOGS_PER_TX>;
+    contractClassLogsHashes: ClaimedLengthArray<ScopedCountedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
+    publicCallRequests: ClaimedLengthArray<CountedPublicCallRequest, typeof MAX_ENQUEUED_CALLS_PER_TX>;
+    privateCallStack: ClaimedLengthArray<PrivateCallRequest, typeof MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX>;
     constructor(
     /**
      * The new note hashes made in this transaction.
      */
-    noteHashes: Tuple<ScopedNoteHash, typeof MAX_NOTE_HASHES_PER_TX>, 
+    noteHashes: ClaimedLengthArray<ScopedNoteHash, typeof MAX_NOTE_HASHES_PER_TX>, 
     /**
      * The new nullifiers made in this transaction.
      */
-    nullifiers: Tuple<ScopedNullifier, typeof MAX_NULLIFIERS_PER_TX>, 
+    nullifiers: ClaimedLengthArray<ScopedNullifier, typeof MAX_NULLIFIERS_PER_TX>, 
     /**
      * All the new L2 to L1 messages created in this transaction.
      */
-    l2ToL1Msgs: Tuple<ScopedL2ToL1Message, typeof MAX_L2_TO_L1_MSGS_PER_TX>, 
+    l2ToL1Msgs: ClaimedLengthArray<ScopedCountedL2ToL1Message, typeof MAX_L2_TO_L1_MSGS_PER_TX>, 
     /**
      * Accumulated logs from all the previous kernel iterations.
      */
-    privateLogs: Tuple<ScopedPrivateLogData, typeof MAX_PRIVATE_LOGS_PER_TX>, 
+    privateLogs: ClaimedLengthArray<ScopedPrivateLogData, typeof MAX_PRIVATE_LOGS_PER_TX>, 
     /**
      * 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: ClaimedLengthArray<ScopedCountedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
     /**
      * Accumulated public call requests from all the previous kernel iterations.
      */
-    publicCallRequests: Tuple<CountedPublicCallRequest, typeof MAX_ENQUEUED_CALLS_PER_TX>, 
+    publicCallRequests: ClaimedLengthArray<CountedPublicCallRequest, typeof MAX_ENQUEUED_CALLS_PER_TX>, 
     /**
      * Current private call stack.
      */
-    privateCallStack: Tuple<PrivateCallRequest, typeof MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX>);
-    toBuffer(): Buffer;
+    privateCallStack: ClaimedLengthArray<PrivateCallRequest, typeof MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX>);
+    toBuffer(): Buffer<ArrayBufferLike>;
     toString(): `0x${string}`;
     /**
      * Deserializes from a buffer or reader, corresponding to a write in cpp.
@@ -89,4 +66,4 @@ export declare class PrivateAccumulatedData {
     static fromString(str: string): PrivateAccumulatedData;
     static empty(): PrivateAccumulatedData;
 }
-//# sourceMappingURL=private_accumulated_data.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9hY2N1bXVsYXRlZF9kYXRhLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2VybmVsL3ByaXZhdGVfYWNjdW11bGF0ZWRfZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsOEJBQThCLEVBQzlCLHlCQUF5QixFQUN6Qix3QkFBd0IsRUFDeEIsc0JBQXNCLEVBQ3RCLHFCQUFxQixFQUNyQixvQ0FBb0MsRUFDcEMsdUJBQXVCLEVBQ3hCLE1BQU0sa0JBQWtCLENBQUM7QUFDMUIsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUc5RSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUM5RSxPQUFPLEVBQUUsa0JBQWtCLEVBQWdDLE1BQU0sMkJBQTJCLENBQUM7QUFDN0YsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3JELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDakQsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDL0QsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDN0QsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFcEU7OztHQUdHO0FBQ0gscUJBQWEsc0JBQXNCO0lBS3hCLFVBQVUsRUFBRSxrQkFBa0IsQ0FBQyxjQUFjLEVBQUUsT0FBTyxzQkFBc0IsQ0FBQztJQUk3RSxVQUFVLEVBQUUsa0JBQWtCLENBQUMsZUFBZSxFQUFFLE9BQU8scUJBQXFCLENBQUM7SUFJN0UsVUFBVSxFQUFFLGtCQUFrQixDQUFDLDBCQUEwQixFQUFFLE9BQU8sd0JBQXdCLENBQUM7SUFJM0YsV0FBVyxFQUFFLGtCQUFrQixDQUFDLG9CQUFvQixFQUFFLE9BQU8sdUJBQXVCLENBQUM7SUFLckYsdUJBQXVCLEVBQUUsa0JBQWtCLENBQUMsb0JBQW9CLEVBQUUsT0FBTyw4QkFBOEIsQ0FBQztJQUl4RyxrQkFBa0IsRUFBRSxrQkFBa0IsQ0FBQyx3QkFBd0IsRUFBRSxPQUFPLHlCQUF5QixDQUFDO0lBSWxHLGdCQUFnQixFQUFFLGtCQUFrQixDQUFDLGtCQUFrQixFQUFFLE9BQU8sb0NBQW9DLENBQUM7SUE3QjlHO0lBQ0U7O09BRUc7SUFDSSxVQUFVLEVBQUUsa0JBQWtCLENBQUMsY0FBYyxFQUFFLE9BQU8sc0JBQXNCLENBQUM7SUFDcEY7O09BRUc7SUFDSSxVQUFVLEVBQUUsa0JBQWtCLENBQUMsZUFBZSxFQUFFLE9BQU8scUJBQXFCLENBQUM7SUFDcEY7O09BRUc7SUFDSSxVQUFVLEVBQUUsa0JBQWtCLENBQUMsMEJBQTBCLEVBQUUsT0FBTyx3QkFBd0IsQ0FBQztJQUNsRzs7T0FFRztJQUNJLFdBQVcsRUFBRSxrQkFBa0IsQ0FBQyxvQkFBb0IsRUFBRSxPQUFPLHVCQUF1QixDQUFDO0lBQzVGOzs7T0FHRztJQUNJLHVCQUF1QixFQUFFLGtCQUFrQixDQUFDLG9CQUFvQixFQUFFLE9BQU8sOEJBQThCLENBQUM7SUFDL0c7O09BRUc7SUFDSSxrQkFBa0IsRUFBRSxrQkFBa0IsQ0FBQyx3QkFBd0IsRUFBRSxPQUFPLHlCQUF5QixDQUFDO0lBQ3pHOztPQUVHO0lBQ0ksZ0JBQWdCLEVBQUUsa0JBQWtCLENBQUMsa0JBQWtCLEVBQUUsT0FBTyxvQ0FBb0MsQ0FBQyxFQUMxRztJQUVKLFFBQVEsNEJBVVA7SUFFRCxRQUFRLGtCQUVQO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsc0JBQXNCLENBV3ZFO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sMEJBRTVCO0lBRUQsTUFBTSxDQUFDLEtBQUssMkJBVVg7Q0FDRiJ9

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;AAC1B,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAgC,MAAM,2BAA2B,CAAC;AAC7F,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;IAKxB,UAAU,EAAE,kBAAkB,CAAC,cAAc,EAAE,OAAO,sBAAsB,CAAC;IAI7E,UAAU,EAAE,kBAAkB,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC;IAI7E,UAAU,EAAE,kBAAkB,CAAC,0BAA0B,EAAE,OAAO,wBAAwB,CAAC;IAI3F,WAAW,EAAE,kBAAkB,CAAC,oBAAoB,EAAE,OAAO,uBAAuB,CAAC;IAKrF,uBAAuB,EAAE,kBAAkB,CAAC,oBAAoB,EAAE,OAAO,8BAA8B,CAAC;IAIxG,kBAAkB,EAAE,kBAAkB,CAAC,wBAAwB,EAAE,OAAO,yBAAyB,CAAC;IAIlG,gBAAgB,EAAE,kBAAkB,CAAC,kBAAkB,EAAE,OAAO,oCAAoC,CAAC;IA7B9G;IACE;;OAEG;IACI,UAAU,EAAE,kBAAkB,CAAC,cAAc,EAAE,OAAO,sBAAsB,CAAC;IACpF;;OAEG;IACI,UAAU,EAAE,kBAAkB,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC;IACpF;;OAEG;IACI,UAAU,EAAE,kBAAkB,CAAC,0BAA0B,EAAE,OAAO,wBAAwB,CAAC;IAClG;;OAEG;IACI,WAAW,EAAE,kBAAkB,CAAC,oBAAoB,EAAE,OAAO,uBAAuB,CAAC;IAC5F;;;OAGG;IACI,uBAAuB,EAAE,kBAAkB,CAAC,oBAAoB,EAAE,OAAO,8BAA8B,CAAC;IAC/G;;OAEG;IACI,kBAAkB,EAAE,kBAAkB,CAAC,wBAAwB,EAAE,OAAO,yBAAyB,CAAC;IACzG;;OAEG;IACI,gBAAgB,EAAE,kBAAkB,CAAC,kBAAkB,EAAE,OAAO,oCAAoC,CAAC,EAC1G;IAEJ,QAAQ,4BAUP;IAED,QAAQ,kBAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,sBAAsB,CAWvE;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,0BAE5B;IAED,MAAM,CAAC,KAAK,2BAUX;CACF"}

package/dest/kernel/private_accumulated_data.js

@@ -1,9 +1,9 @@
 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 { 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 { ScopedCountedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
+import { ClaimedLengthArray, ClaimedLengthArrayFromBuffer } from './claimed_length_array.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.readObject(ClaimedLengthArrayFromBuffer(ScopedNoteHash, MAX_NOTE_HASHES_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(ScopedNullifier, MAX_NULLIFIERS_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(ScopedCountedL2ToL1Message, MAX_L2_TO_L1_MSGS_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(ScopedPrivateLogData, MAX_PRIVATE_LOGS_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(ScopedCountedLogHash, MAX_CONTRACT_CLASS_LOGS_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(CountedPublicCallRequest, MAX_ENQUEUED_CALLS_PER_TX)), reader.readObject(ClaimedLengthArrayFromBuffer(PrivateCallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX)));
     }
     /**
    * 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(ClaimedLengthArray.empty(ScopedNoteHash, MAX_NOTE_HASHES_PER_TX), ClaimedLengthArray.empty(ScopedNullifier, MAX_NULLIFIERS_PER_TX), ClaimedLengthArray.empty(ScopedCountedL2ToL1Message, MAX_L2_TO_L1_MSGS_PER_TX), ClaimedLengthArray.empty(ScopedPrivateLogData, MAX_PRIVATE_LOGS_PER_TX), ClaimedLengthArray.empty(ScopedCountedLogHash, MAX_CONTRACT_CLASS_LOGS_PER_TX), ClaimedLengthArray.empty(CountedPublicCallRequest, MAX_ENQUEUED_CALLS_PER_TX), ClaimedLengthArray.empty(PrivateCallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX));
     }
 }

package/dest/kernel/private_call_data.d.ts

@@ -1,30 +1,19 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { FUNCTION_TREE_HEIGHT, PROTOCOL_CONTRACT_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { FUNCTION_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { MembershipWitness } from '@aztec/foundation/trees';
 import type { FieldsOf } from '@aztec/foundation/types';
+import { DelayedPublicMutableValues } from '../delayed_public_mutable/delayed_public_mutable_values.js';
 import { PublicKeys } from '../keys/public_keys.js';
-import { SharedMutableValues } from '../shared_mutable/shared_mutable_values.js';
-import { ProtocolContractLeafPreimage, PublicDataTreeLeafPreimage } from '../trees/index.js';
+import { PublicDataTreeLeafPreimage } from '../trees/index.js';
 import { VerificationKeyAsFields } from '../vks/verification_key.js';
 import { PrivateCircuitPublicInputs } from './private_circuit_public_inputs.js';
 /**
  * Private call data.
  */
 export declare class PrivateCallData {
-    /**
-     * Public inputs of the private function circuit.
-     */
     publicInputs: PrivateCircuitPublicInputs;
-    /**
-     * The verification key for the function being invoked.
-     */
     vk: VerificationKeyAsFields;
-    /**
-     * Hints for the validation of the vk
-     */
     verificationKeyHints: PrivateVerificationKeyHints;
     constructor(
     /**
@@ -59,36 +48,11 @@ export declare class PrivateCallData {
     static fromBuffer(buffer: Buffer | BufferReader): PrivateCallData;
 }
 export declare class PrivateVerificationKeyHints {
-    /**
-     * Artifact hash of the contract class for this private call.
-     */
     contractClassArtifactHash: Fr;
-    /**
-     * Public bytecode commitment for the contract class for this private call.
-     */
     contractClassPublicBytecodeCommitment: Fr;
-    /**
-     * Public keys hash of the contract instance.
-     */
     publicKeys: PublicKeys;
-    /**
-     * Salted initialization hash of the contract instance.
-     */
     saltedInitializationHash: Fr;
-    /**
-     * The membership witness for the function leaf corresponding to the function being invoked.
-     */
     functionLeafMembershipWitness: MembershipWitness<typeof FUNCTION_TREE_HEIGHT>;
-    /**
-     * The membership witness for the protocolContractLeaf.
-     */
-    protocolContractMembershipWitness: MembershipWitness<typeof PROTOCOL_CONTRACT_TREE_HEIGHT>;
-    /**
-     * The leaf of the protocol contract tree, of either:
-     *  The protocol contract being called.
-     *  The low leaf showing that the address of the contract being called is not in the tree.
-     */
-    protocolContractLeaf: ProtocolContractLeafPreimage;
     updatedClassIdHints: UpdatedClassIdHints;
     constructor(
     /**
@@ -110,23 +74,13 @@ export declare class PrivateVerificationKeyHints {
     /**
      * The membership witness for the function leaf corresponding to the function being invoked.
      */
-    functionLeafMembershipWitness: MembershipWitness<typeof FUNCTION_TREE_HEIGHT>, 
-    /**
-     * The membership witness for the protocolContractLeaf.
-     */
-    protocolContractMembershipWitness: MembershipWitness<typeof PROTOCOL_CONTRACT_TREE_HEIGHT>, 
-    /**
-     * The leaf of the protocol contract tree, of either:
-     *  The protocol contract being called.
-     *  The low leaf showing that the address of the contract being called is not in the tree.
-     */
-    protocolContractLeaf: ProtocolContractLeafPreimage, updatedClassIdHints: UpdatedClassIdHints);
+    functionLeafMembershipWitness: MembershipWitness<typeof FUNCTION_TREE_HEIGHT>, updatedClassIdHints: UpdatedClassIdHints);
     /**
      * Serialize into a field array. Low-level utility.
      * @param fields - Object with fields.
      * @returns The array.
      */
-    static getFields(fields: FieldsOf<PrivateVerificationKeyHints>): readonly [Fr, Fr, PublicKeys, Fr, MembershipWitness<5>, MembershipWitness<3>, ProtocolContractLeafPreimage, UpdatedClassIdHints];
+    static getFields(fields: FieldsOf<PrivateVerificationKeyHints>): readonly [Fr, Fr, PublicKeys, Fr, MembershipWitness<7>, UpdatedClassIdHints];
     static from(fields: FieldsOf<PrivateVerificationKeyHints>): PrivateVerificationKeyHints;
     /**
      * Serialize this as a buffer.
@@ -143,9 +97,9 @@ export declare class PrivateVerificationKeyHints {
 export declare class UpdatedClassIdHints {
     updatedClassIdWitness: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>;
     updatedClassIdLeaf: PublicDataTreeLeafPreimage;
-    updatedClassIdValues: SharedMutableValues;
-    constructor(updatedClassIdWitness: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>, updatedClassIdLeaf: PublicDataTreeLeafPreimage, updatedClassIdValues: SharedMutableValues);
-    static getFields(fields: FieldsOf<UpdatedClassIdHints>): readonly [MembershipWitness<40>, PublicDataTreeLeafPreimage, SharedMutableValues];
+    updatedClassIdValues: DelayedPublicMutableValues;
+    constructor(updatedClassIdWitness: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>, updatedClassIdLeaf: PublicDataTreeLeafPreimage, updatedClassIdValues: DelayedPublicMutableValues);
+    static getFields(fields: FieldsOf<UpdatedClassIdHints>): readonly [MembershipWitness<40>, PublicDataTreeLeafPreimage, DelayedPublicMutableValues];
     static from(fields: FieldsOf<UpdatedClassIdHints>): UpdatedClassIdHints;
     /**
      * Serialize this as a buffer.
@@ -159,4 +113,4 @@ export declare class UpdatedClassIdHints {
      */
     static fromBuffer(buffer: Buffer | BufferReader): UpdatedClassIdHints;
 }
-//# sourceMappingURL=private_call_data.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9jYWxsX2RhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXJuZWwvcHJpdmF0ZV9jYWxsX2RhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLHVCQUF1QixFQUFzQixNQUFNLGtCQUFrQixDQUFDO0FBQ3JHLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLDREQUE0RCxDQUFDO0FBQ3hHLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUVoRjs7R0FFRztBQUNILHFCQUFhLGVBQWU7SUFLakIsWUFBWSxFQUFFLDBCQUEwQjtJQUt4QyxFQUFFLEVBQUUsdUJBQXVCO0lBSzNCLG9CQUFvQixFQUFFLDJCQUEyQjtJQWQxRDtJQUNFOztPQUVHO0lBQ0ksWUFBWSxFQUFFLDBCQUEwQjtJQUUvQzs7T0FFRztJQUNJLEVBQUUsRUFBRSx1QkFBdUI7SUFFbEM7O09BRUc7SUFDSSxvQkFBb0IsRUFBRSwyQkFBMkIsRUFDdEQ7SUFFSjs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLGVBQWUsQ0FBQywrRkFFakQ7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsZUFBZSxDQUFDLEdBQUcsZUFBZSxDQUU5RDtJQUVEOzs7T0FHRztJQUNILFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsZUFBZSxDQU9oRTtDQUNGO0FBRUQscUJBQWEsMkJBQTJCO0lBSzdCLHlCQUF5QixFQUFFLEVBQUU7SUFJN0IscUNBQXFDLEVBQUUsRUFBRTtJQUl6QyxVQUFVLEVBQUUsVUFBVTtJQUl0Qix3QkFBd0IsRUFBRSxFQUFFO0lBSTVCLDZCQUE2QixFQUFFLGlCQUFpQixDQUFDLE9BQU8sb0JBQW9CLENBQUM7SUFFN0UsbUJBQW1CLEVBQUUsbUJBQW1CO0lBdEJqRDtJQUNFOztPQUVHO0lBQ0kseUJBQXlCLEVBQUUsRUFBRTtJQUNwQzs7T0FFRztJQUNJLHFDQUFxQyxFQUFFLEVBQUU7SUFDaEQ7O09BRUc7SUFDSSxVQUFVLEVBQUUsVUFBVTtJQUM3Qjs7T0FFRztJQUNJLHdCQUF3QixFQUFFLEVBQUU7SUFDbkM7O09BRUc7SUFDSSw2QkFBNkIsRUFBRSxpQkFBaUIsQ0FBQyxPQUFPLG9CQUFvQixDQUFDLEVBRTdFLG1CQUFtQixFQUFFLG1CQUFtQixFQUM3QztJQUVKOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsMkJBQTJCLENBQUMsZ0ZBUzdEO0lBRUQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLDJCQUEyQixDQUFDLEdBQUcsMkJBQTJCLENBRXRGO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRywyQkFBMkIsQ0FVNUU7Q0FDRjtBQUVELHFCQUFhLG1CQUFtQjtJQUVyQixxQkFBcUIsRUFBRSxpQkFBaUIsQ0FBQyxPQUFPLHVCQUF1QixDQUFDO0lBQ3hFLGtCQUFrQixFQUFFLDBCQUEwQjtJQUM5QyxvQkFBb0IsRUFBRSwwQkFBMEI7SUFIekQsWUFDUyxxQkFBcUIsRUFBRSxpQkFBaUIsQ0FBQyxPQUFPLHVCQUF1QixDQUFDLEVBQ3hFLGtCQUFrQixFQUFFLDBCQUEwQixFQUM5QyxvQkFBb0IsRUFBRSwwQkFBMEIsRUFDckQ7SUFFSixNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsbUJBQW1CLENBQUMsNEZBRXJEO0lBRUQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsbUJBQW1CLENBRXRFO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxtQkFBbUIsQ0FXcEU7Q0FDRiJ9