@aztec/pxe 0.0.1-commit.808bf7f90 → 0.0.1-commit.8227e42

package/dest/private_kernel/hints/test_utils.js

@@ -0,0 +1,203 @@
+import { MAX_KEY_VALIDATION_REQUESTS_PER_CALL, MAX_KEY_VALIDATION_REQUESTS_PER_TX, MAX_NOTE_HASHES_PER_CALL, MAX_NOTE_HASHES_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIERS_PER_CALL, MAX_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_PRIVATE_LOGS_PER_CALL, MAX_PRIVATE_LOGS_PER_TX } from '@aztec/constants';
+import { makeTuple } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { Point } from '@aztec/foundation/curves/grumpkin';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { ClaimedLengthArray, KeyValidationRequest, KeyValidationRequestAndSeparator, NoteHash, Nullifier, PrivateCircuitPublicInputs, PrivateKernelCircuitPublicInputs, ReadRequest, ScopedKeyValidationRequestAndSeparator, ScopedNoteHash, ScopedNullifier, ScopedReadRequest } from '@aztec/stdlib/kernel';
+import { PrivateLogData, ScopedPrivateLogData } from '@aztec/stdlib/kernel';
+import { PrivateLog } from '@aztec/stdlib/logs';
+import { PrivateCallExecutionResult } from '@aztec/stdlib/tx';
+import { VerificationKeyData } from '@aztec/stdlib/vks';
+const DEFAULT_CONTRACT_ADDRESS = AztecAddress.fromBigInt(987654n);
+/**
+ * Builds a ClaimedLengthArray from a list of items, padding to the required size.
+ */ function makeClaimed(items, emptyFactory, maxSize) {
+    const padded = makeTuple(maxSize, (i)=>items[i] ?? emptyFactory.empty());
+    return new ClaimedLengthArray(padded, items.length);
+}
+/** Builder for PrivateKernelCircuitPublicInputs with fluent API for adding side effects. */ export class PrivateKernelCircuitPublicInputsBuilder {
+    contractAddress;
+    noteHashes;
+    nullifiers;
+    noteHashReadRequests;
+    nullifierReadRequests;
+    keyValidationRequests;
+    privateLogs;
+    nextCounter;
+    constructor(contractAddress = DEFAULT_CONTRACT_ADDRESS, startCounter = 1){
+        this.contractAddress = contractAddress;
+        this.noteHashes = [];
+        this.nullifiers = [];
+        this.noteHashReadRequests = [];
+        this.nullifierReadRequests = [];
+        this.keyValidationRequests = [];
+        this.privateLogs = [];
+        this.nextCounter = startCounter;
+    }
+    getCounter(sideEffectCounter) {
+        if (sideEffectCounter !== undefined) {
+            this.nextCounter = sideEffectCounter + 1;
+            return sideEffectCounter;
+        }
+        return this.nextCounter++;
+    }
+    /** Adds a note hash to the accumulated data. Defaults are generated randomly. */ addNoteHash(opts) {
+        const value = opts?.value ?? Fr.random();
+        const counter = this.getCounter(opts?.counter);
+        const addr = opts?.contractAddress ?? this.contractAddress;
+        this.noteHashes.push(new NoteHash(value, counter).scope(addr));
+        return this;
+    }
+    /** Adds a nullifier to the accumulated data. Defaults are generated randomly. */ addNullifier(opts) {
+        const value = opts?.value ?? Fr.random();
+        const noteHash = opts?.noteHash ?? Fr.ZERO;
+        const counter = this.getCounter(opts?.counter);
+        const addr = opts?.contractAddress ?? this.contractAddress;
+        this.nullifiers.push(new Nullifier(value, noteHash, counter).scope(addr));
+        return this;
+    }
+    /** Adds a pending note hash read request (non-empty contract address, can match a pending note hash). */ addPendingNoteHashReadRequest(opts) {
+        const value = opts?.value ?? Fr.random();
+        const counter = this.getCounter(opts?.counter);
+        const addr = opts?.contractAddress ?? this.contractAddress;
+        this.noteHashReadRequests.push(new ScopedReadRequest(new ReadRequest(value, counter), addr));
+        return this;
+    }
+    /** Adds a settled note hash read request (empty contract address, resolved against the note hash tree). */ addSettledNoteHashReadRequest(opts) {
+        const value = opts?.value ?? Fr.random();
+        const counter = this.getCounter(opts?.counter);
+        this.noteHashReadRequests.push(new ScopedReadRequest(new ReadRequest(value, counter), AztecAddress.ZERO));
+        return this;
+    }
+    /** Adds a pending nullifier read request (non-empty contract address, can match a pending nullifier). */ addPendingNullifierReadRequest(opts) {
+        const value = opts?.value ?? Fr.random();
+        const counter = this.getCounter(opts?.counter);
+        const addr = opts?.contractAddress ?? this.contractAddress;
+        this.nullifierReadRequests.push(new ScopedReadRequest(new ReadRequest(value, counter), addr));
+        return this;
+    }
+    /** Adds a settled nullifier read request (empty contract address, resolved against the nullifier tree). */ addSettledNullifierReadRequest(opts) {
+        const value = opts?.value ?? Fr.random();
+        const counter = this.getCounter(opts?.counter);
+        this.nullifierReadRequests.push(new ScopedReadRequest(new ReadRequest(value, counter), AztecAddress.ZERO));
+        return this;
+    }
+    /** Adds a key validation request to validation requests. */ addKeyValidationRequest(opts) {
+        const addr = opts?.contractAddress ?? this.contractAddress;
+        this.keyValidationRequests.push(new ScopedKeyValidationRequestAndSeparator(new KeyValidationRequestAndSeparator(new KeyValidationRequest(new Point(Fr.random(), Fr.random(), false), Fr.random()), Fr.random()), addr));
+        return this;
+    }
+    /** Adds a private log to the accumulated data. Defaults are generated randomly. */ addPrivateLog(opts) {
+        const noteHashCounter = opts?.noteHashCounter ?? 0;
+        const counter = this.getCounter(opts?.counter);
+        const addr = opts?.contractAddress ?? this.contractAddress;
+        this.privateLogs.push(new ScopedPrivateLogData(new PrivateLogData(PrivateLog.empty(), noteHashCounter, counter), addr));
+        return this;
+    }
+    /** Builds the PrivateKernelCircuitPublicInputs with all added side effects. */ build() {
+        const publicInputs = PrivateKernelCircuitPublicInputs.empty();
+        publicInputs.end.noteHashes = makeClaimed(this.noteHashes, ScopedNoteHash, MAX_NOTE_HASHES_PER_TX);
+        publicInputs.end.nullifiers = makeClaimed(this.nullifiers, ScopedNullifier, MAX_NULLIFIERS_PER_TX);
+        publicInputs.end.privateLogs = makeClaimed(this.privateLogs, ScopedPrivateLogData, MAX_PRIVATE_LOGS_PER_TX);
+        publicInputs.validationRequests.noteHashReadRequests = makeClaimed(this.noteHashReadRequests, ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
+        publicInputs.validationRequests.nullifierReadRequests = makeClaimed(this.nullifierReadRequests, ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_TX);
+        publicInputs.validationRequests.scopedKeyValidationRequestsAndSeparators = makeClaimed(this.keyValidationRequests, ScopedKeyValidationRequestAndSeparator, MAX_KEY_VALIDATION_REQUESTS_PER_TX);
+        return publicInputs;
+    }
+}
+/** Builder for PrivateCircuitPublicInputs (call-level) with fluent API for adding side effects. */ export class PrivateCircuitPublicInputsBuilder {
+    contractAddress;
+    noteHashes;
+    nullifiers;
+    noteHashReadRequests;
+    nullifierReadRequests;
+    keyValidationRequests;
+    privateLogs;
+    nextCounter;
+    constructor(contractAddress = DEFAULT_CONTRACT_ADDRESS, startCounter = 1){
+        this.contractAddress = contractAddress;
+        this.noteHashes = [];
+        this.nullifiers = [];
+        this.noteHashReadRequests = [];
+        this.nullifierReadRequests = [];
+        this.keyValidationRequests = [];
+        this.privateLogs = [];
+        this.nextCounter = startCounter;
+    }
+    getCounter(sideEffectCounter) {
+        if (sideEffectCounter !== undefined) {
+            this.nextCounter = sideEffectCounter + 1;
+            return sideEffectCounter;
+        }
+        return this.nextCounter++;
+    }
+    /** Adds a note hash. Defaults are generated randomly. */ addNoteHash(opts) {
+        const value = opts?.value ?? Fr.random();
+        const counter = this.getCounter(opts?.counter);
+        this.noteHashes.push(new NoteHash(value, counter));
+        return this;
+    }
+    /** Adds a nullifier. Defaults are generated randomly. */ addNullifier(opts) {
+        const value = opts?.value ?? Fr.random();
+        const noteHash = opts?.noteHash ?? Fr.ZERO;
+        const counter = this.getCounter(opts?.counter);
+        this.nullifiers.push(new Nullifier(value, noteHash, counter));
+        return this;
+    }
+    /** Adds a pending note hash read request (non-empty contract address, can match a pending note hash). */ addPendingNoteHashReadRequest(opts) {
+        const value = opts?.value ?? Fr.random();
+        const counter = this.getCounter(opts?.counter);
+        this.noteHashReadRequests.push(new ScopedReadRequest(new ReadRequest(value, counter), this.contractAddress));
+        return this;
+    }
+    /** Adds a settled note hash read request (empty contract address, resolved against the note hash tree). */ addSettledNoteHashReadRequest(opts) {
+        const value = opts?.value ?? Fr.random();
+        const counter = this.getCounter(opts?.counter);
+        this.noteHashReadRequests.push(new ScopedReadRequest(new ReadRequest(value, counter), AztecAddress.ZERO));
+        return this;
+    }
+    /** Adds a pending nullifier read request (non-empty contract address, can match a pending nullifier). */ addPendingNullifierReadRequest(opts) {
+        const value = opts?.value ?? Fr.random();
+        const counter = this.getCounter(opts?.counter);
+        this.nullifierReadRequests.push(new ScopedReadRequest(new ReadRequest(value, counter), this.contractAddress));
+        return this;
+    }
+    /** Adds a settled nullifier read request (empty contract address, resolved against the nullifier tree). */ addSettledNullifierReadRequest(opts) {
+        const value = opts?.value ?? Fr.random();
+        const counter = this.getCounter(opts?.counter);
+        this.nullifierReadRequests.push(new ScopedReadRequest(new ReadRequest(value, counter), AztecAddress.ZERO));
+        return this;
+    }
+    /** Adds a key validation request. */ addKeyValidationRequest() {
+        this.keyValidationRequests.push(new KeyValidationRequestAndSeparator(new KeyValidationRequest(new Point(Fr.random(), Fr.random(), false), Fr.random()), Fr.random()));
+        return this;
+    }
+    /** Adds a private log. Defaults are generated randomly. */ addPrivateLog(opts) {
+        const noteHashCounter = opts?.noteHashCounter ?? 0;
+        const counter = this.getCounter(opts?.counter);
+        this.privateLogs.push(new PrivateLogData(PrivateLog.empty(), noteHashCounter, counter));
+        return this;
+    }
+    /** Builds the PrivateCircuitPublicInputs with all added side effects. */ build() {
+        const publicInputs = PrivateCircuitPublicInputs.empty();
+        publicInputs.callContext.contractAddress = this.contractAddress;
+        publicInputs.noteHashes = makeClaimed(this.noteHashes, NoteHash, MAX_NOTE_HASHES_PER_CALL);
+        publicInputs.nullifiers = makeClaimed(this.nullifiers, Nullifier, MAX_NULLIFIERS_PER_CALL);
+        publicInputs.privateLogs = makeClaimed(this.privateLogs, PrivateLogData, MAX_PRIVATE_LOGS_PER_CALL);
+        publicInputs.noteHashReadRequests = makeClaimed(this.noteHashReadRequests, ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL);
+        publicInputs.nullifierReadRequests = makeClaimed(this.nullifierReadRequests, ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL);
+        publicInputs.keyValidationRequestsAndSeparators = makeClaimed(this.keyValidationRequests, KeyValidationRequestAndSeparator, MAX_KEY_VALIDATION_REQUESTS_PER_CALL);
+        return publicInputs;
+    }
+}
+/** Wraps a PrivateKernelCircuitPublicInputs in a PrivateKernelSimulateOutput. */ export function makeKernelOutput(publicInputs) {
+    return {
+        publicInputs: publicInputs ?? PrivateKernelCircuitPublicInputs.empty(),
+        verificationKey: VerificationKeyData.empty(),
+        outputWitness: new Map(),
+        bytecode: Buffer.from([])
+    };
+}
+/** Wraps a PrivateCircuitPublicInputs in a PrivateCallExecutionResult. */ export function makeExecutionResult(publicInputs) {
+    return new PrivateCallExecutionResult(Buffer.alloc(0), Buffer.alloc(0), new Map(), publicInputs ?? PrivateCircuitPublicInputs.empty(), [], new Map(), [], [], [], [], []);
+}

package/dest/private_kernel/private_kernel_execution_prover.d.ts

@@ -42,4 +42,4 @@ export declare class PrivateKernelExecutionProver {
     private getVkData;
     private createPrivateCallData;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfZXhlY3V0aW9uX3Byb3Zlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3ByaXZhdGVfa2VybmVsL3ByaXZhdGVfa2VybmVsX2V4ZWN1dGlvbl9wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFlLEtBQUssY0FBYyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBTXZGLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDM0UsT0FBTyxFQVFMLEtBQUssaUNBQWlDLEVBS3RDLEtBQUssb0NBQW9DLEVBRTFDLE1BQU0sc0JBQXNCLENBQUM7QUFFOUIsT0FBTyxFQUVMLEtBQUssc0JBQXNCLEVBQzNCLFNBQVMsRUFHVixNQUFNLGtCQUFrQixDQUFDO0FBSTFCLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFTdEUsTUFBTSxXQUFXLGtDQUFrQztJQUNqRCxRQUFRLEVBQUUsT0FBTyxDQUFDO0lBQ2xCLGtCQUFrQixFQUFFLE9BQU8sQ0FBQztJQUM1QixXQUFXLEVBQUUsT0FBTyxHQUFHLGlCQUFpQixHQUFHLE1BQU0sR0FBRyxNQUFNLENBQUM7Q0FDNUQ7QUFFRDs7Ozs7R0FLRztBQUNILHFCQUFhLDRCQUE0QjtJQUlyQyxPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxVQUFVO0lBTHBCLE9BQU8sQ0FBQyxHQUFHLENBQVM7SUFFcEIsWUFDVSxNQUFNLEVBQUUsbUJBQW1CLEVBQzNCLFlBQVksRUFBRSxtQkFBbUIsRUFDakMsVUFBVSxVQUFRLEVBQzFCLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFHMUI7SUFFRDs7Ozs7Ozs7OztPQVVHO0lBQ0csZ0JBQWdCLENBQ3BCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGVBQWUsRUFBRSxzQkFBc0IsRUFDdkMsRUFBRSxRQUFRLEVBQUUsa0JBQWtCLEVBQUUsV0FBVyxFQUFFLEdBQUUsa0NBSTlDLEdBQ0EsT0FBTyxDQUFDLGlDQUFpQyxDQUFDLG9DQUFvQyxDQUFDLENBQUMsQ0FvUmxGO0lBRUQ7Ozs7O09BS0c7SUFDSCxPQUFPLENBQUMsdUJBQXVCO1lBb0JqQixTQUFTO1lBU1QscUJBQXFCO0NBK0JwQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfZXhlY3V0aW9uX3Byb3Zlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3ByaXZhdGVfa2VybmVsL3ByaXZhdGVfa2VybmVsX2V4ZWN1dGlvbl9wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFlLEtBQUssY0FBYyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBTXZGLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDM0UsT0FBTyxFQVFMLEtBQUssaUNBQWlDLEVBS3RDLEtBQUssb0NBQW9DLEVBRTFDLE1BQU0sc0JBQXNCLENBQUM7QUFFOUIsT0FBTyxFQUVMLEtBQUssc0JBQXNCLEVBQzNCLFNBQVMsRUFHVixNQUFNLGtCQUFrQixDQUFDO0FBSTFCLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFTdEUsTUFBTSxXQUFXLGtDQUFrQztJQUNqRCxRQUFRLEVBQUUsT0FBTyxDQUFDO0lBQ2xCLGtCQUFrQixFQUFFLE9BQU8sQ0FBQztJQUM1QixXQUFXLEVBQUUsT0FBTyxHQUFHLGlCQUFpQixHQUFHLE1BQU0sR0FBRyxNQUFNLENBQUM7Q0FDNUQ7QUFFRDs7Ozs7R0FLRztBQUNILHFCQUFhLDRCQUE0QjtJQUlyQyxPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxVQUFVO0lBTHBCLE9BQU8sQ0FBQyxHQUFHLENBQVM7SUFFcEIsWUFDVSxNQUFNLEVBQUUsbUJBQW1CLEVBQzNCLFlBQVksRUFBRSxtQkFBbUIsRUFDakMsVUFBVSxVQUFRLEVBQzFCLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFHMUI7SUFFRDs7Ozs7Ozs7OztPQVVHO0lBQ0csZ0JBQWdCLENBQ3BCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGVBQWUsRUFBRSxzQkFBc0IsRUFDdkMsRUFBRSxRQUFRLEVBQUUsa0JBQWtCLEVBQUUsV0FBVyxFQUFFLEdBQUUsa0NBSTlDLEdBQ0EsT0FBTyxDQUFDLGlDQUFpQyxDQUFDLG9DQUFvQyxDQUFDLENBQUMsQ0EyUmxGO0lBRUQ7Ozs7O09BS0c7SUFDSCxPQUFPLENBQUMsdUJBQXVCO1lBb0JqQixTQUFTO1lBU1QscUJBQXFCO0NBK0JwQyJ9

package/dest/private_kernel/private_kernel_execution_prover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_kernel_execution_prover.d.ts","sourceRoot":"","sources":["../../src/private_kernel/private_kernel_execution_prover.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAMvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAQL,KAAK,iCAAiC,EAKtC,KAAK,oCAAoC,EAE1C,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,KAAK,sBAAsB,EAC3B,SAAS,EAGV,MAAM,kBAAkB,CAAC;AAI1B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAStE,MAAM,WAAW,kCAAkC;IACjD,QAAQ,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,EAAE,OAAO,GAAG,iBAAiB,GAAG,MAAM,GAAG,MAAM,CAAC;CAC5D;AAED;;;;;GAKG;AACH,qBAAa,4BAA4B;IAIrC,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,UAAU;IALpB,OAAO,CAAC,GAAG,CAAS;IAEpB,YACU,MAAM,EAAE,mBAAmB,EAC3B,YAAY,EAAE,mBAAmB,EACjC,UAAU,UAAQ,EAC1B,QAAQ,CAAC,EAAE,cAAc,EAG1B;IAED;;;;;;;;;;OAUG;IACG,gBAAgB,CACpB,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,sBAAsB,EACvC,EAAE,QAAQ,EAAE,kBAAkB,EAAE,WAAW,EAAE,GAAE,kCAI9C,GACA,OAAO,CAAC,iCAAiC,CAAC,oCAAoC,CAAC,CAAC,CAoRlF;IAED;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;YAoBjB,SAAS;YAST,qBAAqB;CA+BpC"}
+{"version":3,"file":"private_kernel_execution_prover.d.ts","sourceRoot":"","sources":["../../src/private_kernel/private_kernel_execution_prover.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAMvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAQL,KAAK,iCAAiC,EAKtC,KAAK,oCAAoC,EAE1C,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,KAAK,sBAAsB,EAC3B,SAAS,EAGV,MAAM,kBAAkB,CAAC;AAI1B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAStE,MAAM,WAAW,kCAAkC;IACjD,QAAQ,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,EAAE,OAAO,GAAG,iBAAiB,GAAG,MAAM,GAAG,MAAM,CAAC;CAC5D;AAED;;;;;GAKG;AACH,qBAAa,4BAA4B;IAIrC,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,UAAU;IALpB,OAAO,CAAC,GAAG,CAAS;IAEpB,YACU,MAAM,EAAE,mBAAmB,EAC3B,YAAY,EAAE,mBAAmB,EACjC,UAAU,UAAQ,EAC1B,QAAQ,CAAC,EAAE,cAAc,EAG1B;IAED;;;;;;;;;;OAUG;IACG,gBAAgB,CACpB,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,sBAAsB,EACvC,EAAE,QAAQ,EAAE,kBAAkB,EAAE,WAAW,EAAE,GAAE,kCAI9C,GACA,OAAO,CAAC,iCAAiC,CAAC,oCAAoC,CAAC,CAAC,CA2RlF;IAED;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;YAoBjB,SAAS;YAST,qBAAqB;CA+BpC"}

package/dest/private_kernel/private_kernel_execution_prover.js

@@ -67,6 +67,7 @@ const NULL_SIMULATE_OUTPUT = {
             if (!firstIteration) {
                 let resetBuilder = new PrivateKernelResetPrivateInputsBuilder(output, executionStack, noteHashNullifierCounterMap, splitCounter);
                 while(resetBuilder.needsReset()){
+                    // Inner reset: without siloing.
                     const witgenTimer = new Timer();
                     const privateInputs = await resetBuilder.build(this.oracle);
                     output = generateWitnesses ? await this.proofCreator.generateResetOutput(privateInputs) : await this.proofCreator.simulateReset(privateInputs);
@@ -132,11 +133,19 @@ const NULL_SIMULATE_OUTPUT = {
             }
             firstIteration = false;
         }
-        // Reset.
-        let resetBuilder = new PrivateKernelResetPrivateInputsBuilder(output, [], noteHashNullifierCounterMap, splitCounter);
-        while(resetBuilder.needsReset()){
+        // Final reset: include siloing of note hashes, nullifiers and private logs.
+        const finalResetBuilder = new PrivateKernelResetPrivateInputsBuilder(output, [], noteHashNullifierCounterMap, splitCounter);
+        if (!finalResetBuilder.needsReset()) {
+            // The final reset must be performed exactly once, because each tx has at least one nullifier that requires
+            // siloing, and siloing cannot be done multiple times.
+            // While, in theory, it might be possible to silo note hashes first and then run another reset to silo nullifiers
+            // and/or private logs, we currently don't have standalone dimensions for the arrays that require siloing. As a
+            // result, all necessary siloing must be done together in a single reset.
+            // Refer to the possible combinations of dimensions in private_kernel_reset_config.json.
+            throw new Error('Nothing to reset for the final reset.');
+        } else {
             const witgenTimer = new Timer();
-            const privateInputs = await resetBuilder.build(this.oracle);
+            const privateInputs = await finalResetBuilder.build(this.oracle);
             output = generateWitnesses ? await this.proofCreator.generateResetOutput(privateInputs) : await this.proofCreator.simulateReset(privateInputs);
             executionSteps.push({
                 functionName: 'private_kernel_reset',
@@ -147,7 +156,6 @@ const NULL_SIMULATE_OUTPUT = {
                     witgen: witgenTimer.ms()
                 }
             });
-            resetBuilder = new PrivateKernelResetPrivateInputsBuilder(output, [], noteHashNullifierCounterMap, splitCounter);
         }
         if (output.publicInputs.feePayer.isZero() && skipFeeEnforcement) {
             if (!skipProofGeneration) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.0.1-commit.808bf7f90",
+  "version": "0.0.1-commit.8227e42",
   "type": "module",
   "typedocOptions": {
     "entryPoints": [
@@ -70,19 +70,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.0.1-commit.808bf7f90",
-    "@aztec/bb.js": "0.0.1-commit.808bf7f90",
-    "@aztec/builder": "0.0.1-commit.808bf7f90",
-    "@aztec/constants": "0.0.1-commit.808bf7f90",
-    "@aztec/ethereum": "0.0.1-commit.808bf7f90",
-    "@aztec/foundation": "0.0.1-commit.808bf7f90",
-    "@aztec/key-store": "0.0.1-commit.808bf7f90",
-    "@aztec/kv-store": "0.0.1-commit.808bf7f90",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.808bf7f90",
-    "@aztec/noir-types": "0.0.1-commit.808bf7f90",
-    "@aztec/protocol-contracts": "0.0.1-commit.808bf7f90",
-    "@aztec/simulator": "0.0.1-commit.808bf7f90",
-    "@aztec/stdlib": "0.0.1-commit.808bf7f90",
+    "@aztec/bb-prover": "0.0.1-commit.8227e42",
+    "@aztec/bb.js": "0.0.1-commit.8227e42",
+    "@aztec/builder": "0.0.1-commit.8227e42",
+    "@aztec/constants": "0.0.1-commit.8227e42",
+    "@aztec/ethereum": "0.0.1-commit.8227e42",
+    "@aztec/foundation": "0.0.1-commit.8227e42",
+    "@aztec/key-store": "0.0.1-commit.8227e42",
+    "@aztec/kv-store": "0.0.1-commit.8227e42",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.8227e42",
+    "@aztec/noir-types": "0.0.1-commit.8227e42",
+    "@aztec/protocol-contracts": "0.0.1-commit.8227e42",
+    "@aztec/simulator": "0.0.1-commit.8227e42",
+    "@aztec/stdlib": "0.0.1-commit.8227e42",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "lodash.omit": "^4.5.0",
@@ -91,8 +91,8 @@
     "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
-    "@aztec/merkle-tree": "0.0.1-commit.808bf7f90",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.808bf7f90",
+    "@aztec/merkle-tree": "0.0.1-commit.8227e42",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.8227e42",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.omit": "^4.5.7",

package/src/contract_function_simulator/contract_function_simulator.ts

@@ -689,6 +689,7 @@ function squashTransientSideEffects(
     scopedNullifiersCLA,
     /*futureNoteHashReads=*/ [],
     /*futureNullifierReads=*/ [],
+    /*futureLogs=*/ [],
     noteHashNullifierCounterMap,
     minRevertibleSideEffectCounter,
   );
@@ -731,16 +732,8 @@ async function verifyReadRequests(
     nullifierReadRequests.length,
   );
 
-  const noteHashResetActions = getNoteHashReadRequestResetActions(
-    noteHashReadRequestsCLA,
-    scopedNoteHashesCLA,
-    /*futureNoteHashes=*/ [],
-  );
-  const nullifierResetActions = getNullifierReadRequestResetActions(
-    nullifierReadRequestsCLA,
-    scopedNullifiersCLA,
-    /*futureNullifiers=*/ [],
-  );
+  const noteHashResetActions = getNoteHashReadRequestResetActions(noteHashReadRequestsCLA, scopedNoteHashesCLA);
+  const nullifierResetActions = getNullifierReadRequestResetActions(nullifierReadRequestsCLA, scopedNullifiersCLA);
 
   const settledNoteHashReads: { index: number; value: Fr }[] = [];
   for (let i = 0; i < noteHashResetActions.actions.length; i++) {