@aztec/pxe 0.0.1-commit.24de95ac → 0.0.1-commit.2606882

package/dest/private_kernel/hints/test_utils.js

@@ -0,0 +1,202 @@
+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 { 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(Fr.random(), 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(Fr.random(), 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/index.d.ts

@@ -1,3 +1,3 @@
 export * from './private_kernel_execution_prover.js';
 export * from './private_kernel_oracle.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcml2YXRlX2tlcm5lbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHNDQUFzQyxDQUFDO0FBQ3JELGNBQWMsNEJBQTRCLENBQUMifQ==

package/dest/private_kernel/private_kernel_execution_prover.d.ts

@@ -1,3 +1,4 @@
+import { type LoggerBindings } from '@aztec/foundation/log';
 import type { PrivateKernelProver } from '@aztec/stdlib/interfaces/client';
 import { type PrivateKernelExecutionProofOutput, type PrivateKernelTailCircuitPublicInputs } from '@aztec/stdlib/kernel';
 import { type PrivateExecutionResult, TxRequest } from '@aztec/stdlib/tx';
@@ -17,8 +18,9 @@ export declare class PrivateKernelExecutionProver {
     private oracle;
     private proofCreator;
     private fakeProofs;
+    private maxBatchSize;
     private log;
-    constructor(oracle: PrivateKernelOracle, proofCreator: PrivateKernelProver, fakeProofs?: boolean);
+    constructor(oracle: PrivateKernelOracle, proofCreator: PrivateKernelProver, fakeProofs?: boolean, bindings?: LoggerBindings, maxBatchSize?: number);
     /**
      * Generate a proof for a given transaction request and execution result.
      * The function iterates through the nested executions in the execution result, creates private call data,
@@ -39,6 +41,9 @@ export declare class PrivateKernelExecutionProver {
      */
     private ensurePublicInputsMatch;
     private getVkData;
+    private consumeNextApp;
+    private prefetchUpdatedClassIdHints;
     private createPrivateCallData;
+    private runBatchedKernel;
 }
-//# sourceMappingURL=private_kernel_execution_prover.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfZXhlY3V0aW9uX3Byb3Zlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3ByaXZhdGVfa2VybmVsL3ByaXZhdGVfa2VybmVsX2V4ZWN1dGlvbl9wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxFQUFlLEtBQUssY0FBYyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBTXZGLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDM0UsT0FBTyxFQVFMLEtBQUssaUNBQWlDLEVBU3RDLEtBQUssb0NBQW9DLEVBRzFDLE1BQU0sc0JBQXNCLENBQUM7QUFFOUIsT0FBTyxFQUVMLEtBQUssc0JBQXNCLEVBQzNCLFNBQVMsRUFJVixNQUFNLGtCQUFrQixDQUFDO0FBTTFCLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFTdEUsTUFBTSxXQUFXLGtDQUFrQztJQUNqRCxRQUFRLEVBQUUsT0FBTyxDQUFDO0lBQ2xCLGtCQUFrQixFQUFFLE9BQU8sQ0FBQztJQUM1QixXQUFXLEVBQUUsT0FBTyxHQUFHLGlCQUFpQixHQUFHLE1BQU0sR0FBRyxNQUFNLENBQUM7Q0FDNUQ7QUFFRDs7Ozs7R0FLRztBQUNILHFCQUFhLDRCQUE0QjtJQUlyQyxPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxVQUFVO0lBRWxCLE9BQU8sQ0FBQyxZQUFZO0lBUHRCLE9BQU8sQ0FBQyxHQUFHLENBQVM7SUFFcEIsWUFDVSxNQUFNLEVBQUUsbUJBQW1CLEVBQzNCLFlBQVksRUFBRSxtQkFBbUIsRUFDakMsVUFBVSxVQUFRLEVBQzFCLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFDakIsWUFBWSxHQUFFLE1BQTRCLEVBR25EO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNHLGdCQUFnQixDQUNwQixTQUFTLEVBQUUsU0FBUyxFQUNwQixlQUFlLEVBQUUsc0JBQXNCLEVBQ3ZDLEVBQUUsUUFBUSxFQUFFLGtCQUFrQixFQUFFLFdBQVcsRUFBRSxHQUFFLGtDQUk5QyxHQUNBLE9BQU8sQ0FBQyxpQ0FBaUMsQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDLENBb09sRjtJQUVEOzs7OztPQUtHO0lBQ0gsT0FBTyxDQUFDLHVCQUF1QjtZQW9CakIsU0FBUztZQWNULGNBQWM7WUE0QmQsMkJBQTJCO1lBaUIzQixxQkFBcUI7WUF1Q3JCLGdCQUFnQjtDQWdKL0IifQ==

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":"AAQA,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,EAIV,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,CAAuD;gBAGxD,MAAM,EAAE,mBAAmB,EAC3B,YAAY,EAAE,mBAAmB,EACjC,UAAU,UAAQ;IAG5B;;;;;;;;;;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;IA4RnF;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;YAoBjB,SAAS;YAST,qBAAqB;CA8BpC"}
+{"version":3,"file":"private_kernel_execution_prover.d.ts","sourceRoot":"","sources":["../../src/private_kernel/private_kernel_execution_prover.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAMvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAQL,KAAK,iCAAiC,EAStC,KAAK,oCAAoC,EAG1C,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,KAAK,sBAAsB,EAC3B,SAAS,EAIV,MAAM,kBAAkB,CAAC;AAM1B,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;IAElB,OAAO,CAAC,YAAY;IAPtB,OAAO,CAAC,GAAG,CAAS;IAEpB,YACU,MAAM,EAAE,mBAAmB,EAC3B,YAAY,EAAE,mBAAmB,EACjC,UAAU,UAAQ,EAC1B,QAAQ,CAAC,EAAE,cAAc,EACjB,YAAY,GAAE,MAA4B,EAGnD;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,CAoOlF;IAED;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;YAoBjB,SAAS;YAcT,cAAc;YA4Bd,2BAA2B;YAiB3B,qBAAqB;YAuCrB,gBAAgB;CAgJ/B"}

package/dest/private_kernel/private_kernel_execution_prover.js

@@ -1,16 +1,20 @@
-import { vkAsFieldsMegaHonk } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { MAX_APPS_PER_KERNEL } from '@aztec/constants';
+import { uniqueBy } from '@aztec/foundation/collection';
+import { vkAsFieldsMegaHonk } from '@aztec/foundation/crypto/keys';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { pushTestData } from '@aztec/foundation/testing';
 import { Timer } from '@aztec/foundation/timer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { ProtocolContractsList } from '@aztec/protocol-contracts';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { HidingKernelToPublicPrivateInputs, HidingKernelToRollupPrivateInputs, PaddedSideEffectAmounts, PrivateCallData, PrivateKernelCircuitPublicInputs, PrivateKernelData, PrivateKernelInitCircuitPrivateInputs, PrivateKernelInnerCircuitPrivateInputs, PrivateKernelTailCircuitPrivateInputs, PrivateVerificationKeyHints } from '@aztec/stdlib/kernel';
+import { HidingKernelToPublicPrivateInputs, HidingKernelToRollupPrivateInputs, PaddedSideEffectAmounts, PrivateCallData, PrivateKernelCircuitPublicInputs, PrivateKernelData, PrivateKernelInit2CircuitPrivateInputs, PrivateKernelInit3CircuitPrivateInputs, PrivateKernelInitCircuitPrivateInputs, PrivateKernelInner2CircuitPrivateInputs, PrivateKernelInner3CircuitPrivateInputs, PrivateKernelInnerCircuitPrivateInputs, PrivateKernelTailCircuitPrivateInputs, PrivateVerificationKeyHints } from '@aztec/stdlib/kernel';
 import { ChonkProof } from '@aztec/stdlib/proofs';
-import { collectNoteHashLeafIndexMap, collectNoteHashNullifierCounterMap, getFinalMinRevertibleSideEffectCounter } from '@aztec/stdlib/tx';
+import { collectNested, collectNoteHashNullifierCounterMap, getFinalMinRevertibleSideEffectCounter } from '@aztec/stdlib/tx';
 import { VerificationKeyAsFields, VerificationKeyData, VkData } from '@aztec/stdlib/vks';
-import { PrivateKernelResetPrivateInputsBuilder } from './hints/build_private_kernel_reset_private_inputs.js';
+import { BatchPlanner } from './batch_planner.js';
+import { computeTxExpirationTimestamp } from './hints/compute_tx_expiration_timestamp.js';
+import { PrivateKernelResetPrivateInputsBuilder } from './hints/private_kernel_reset_private_inputs_builder.js';
 const NULL_SIMULATE_OUTPUT = {
     publicInputs: PrivateKernelCircuitPublicInputs.empty(),
     verificationKey: VerificationKeyData.empty(),
@@ -26,12 +30,14 @@ const NULL_SIMULATE_OUTPUT = {
     oracle;
     proofCreator;
     fakeProofs;
+    maxBatchSize;
     log;
-    constructor(oracle, proofCreator, fakeProofs = false){
+    constructor(oracle, proofCreator, fakeProofs = false, bindings, maxBatchSize = MAX_APPS_PER_KERNEL){
         this.oracle = oracle;
         this.proofCreator = proofCreator;
         this.fakeProofs = fakeProofs;
-        this.log = createLogger('pxe:private-kernel-execution-prover');
+        this.maxBatchSize = maxBatchSize;
+        this.log = createLogger('pxe:private-kernel-execution-prover', bindings);
     }
     /**
    * Generate a proof for a given transaction request and execution result.
@@ -60,15 +66,21 @@ const NULL_SIMULATE_OUTPUT = {
         let firstIteration = true;
         let output = NULL_SIMULATE_OUTPUT;
         const executionSteps = [];
-        const noteHashLeafIndexMap = collectNoteHashLeafIndexMap(executionResult);
         const noteHashNullifierCounterMap = collectNoteHashNullifierCounterMap(executionResult);
-        const validationRequestsSplitCounter = isPrivateOnlyTx ? 0 : getFinalMinRevertibleSideEffectCounter(executionResult);
+        const minRevertibleSideEffectCounter = getFinalMinRevertibleSideEffectCounter(executionResult);
+        const splitCounter = isPrivateOnlyTx ? 0 : minRevertibleSideEffectCounter;
+        // Each kernel iteration absorbs up to `maxBatchSize` apps. The planner walks the upcoming
+        // apps and decides where the next reset must fall by using an accumulator and
+        // reusing the existing single-app `needsReset()` check.
+        const planner = new BatchPlanner(noteHashNullifierCounterMap, splitCounter, this.maxBatchSize);
+        const updatedClassIdHintsMap = await this.prefetchUpdatedClassIdHints(executionResult);
         while(executionStack.length){
             if (!firstIteration) {
-                let resetBuilder = new PrivateKernelResetPrivateInputsBuilder(output, executionStack, noteHashNullifierCounterMap, validationRequestsSplitCounter);
+                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, noteHashLeafIndexMap);
+                    const privateInputs = await resetBuilder.build(this.oracle);
                     output = generateWitnesses ? await this.proofCreator.generateResetOutput(privateInputs) : await this.proofCreator.simulateReset(privateInputs);
                     executionSteps.push({
                         functionName: 'private_kernel_reset',
@@ -79,64 +91,40 @@ const NULL_SIMULATE_OUTPUT = {
                             witgen: witgenTimer.ms()
                         }
                     });
-                    resetBuilder = new PrivateKernelResetPrivateInputsBuilder(output, executionStack, noteHashNullifierCounterMap, validationRequestsSplitCounter);
+                    resetBuilder = new PrivateKernelResetPrivateInputsBuilder(output, executionStack, noteHashNullifierCounterMap, splitCounter);
                 }
             }
-            const currentExecution = executionStack.pop();
-            executionStack.push(...[
-                ...currentExecution.nestedExecutionResults
-            ].reverse());
-            const functionName = await this.oracle.getDebugFunctionName(currentExecution.publicInputs.callContext.contractAddress, currentExecution.publicInputs.callContext.functionSelector);
-            executionSteps.push({
-                functionName: functionName,
-                bytecode: currentExecution.acir,
-                witness: currentExecution.partialWitness,
-                vk: currentExecution.vk,
-                timings: {
-                    witgen: currentExecution.profileResult?.timings.witgen ?? 0,
-                    oracles: currentExecution.profileResult?.timings.oracles
-                }
-            });
-            const privateCallData = await this.createPrivateCallData(currentExecution);
-            if (firstIteration) {
-                const witgenTimer = new Timer();
-                const proofInput = new PrivateKernelInitCircuitPrivateInputs(txRequest, getVKTreeRoot(), ProtocolContractsList, privateCallData, isPrivateOnlyTx, executionResult.firstNullifier);
-                this.log.debug(`Calling private kernel init with isPrivateOnly ${isPrivateOnlyTx} and firstNullifierHint ${proofInput.firstNullifierHint}`);
-                pushTestData('private-kernel-inputs-init', proofInput);
-                output = generateWitnesses ? await this.proofCreator.generateInitOutput(proofInput) : await this.proofCreator.simulateInit(proofInput);
-                executionSteps.push({
-                    functionName: 'private_kernel_init',
-                    bytecode: output.bytecode,
-                    witness: output.outputWitness,
-                    vk: output.verificationKey.keyAsBytes,
-                    timings: {
-                        witgen: witgenTimer.ms()
-                    }
-                });
-            } else {
-                const witgenTimer = new Timer();
-                const vkData = await this.getVkData(output.verificationKey);
-                const previousKernelData = new PrivateKernelData(output.publicInputs, vkData);
-                const proofInput = new PrivateKernelInnerCircuitPrivateInputs(previousKernelData, privateCallData);
-                pushTestData('private-kernel-inputs-inner', proofInput);
-                output = generateWitnesses ? await this.proofCreator.generateInnerOutput(proofInput) : await this.proofCreator.simulateInner(proofInput);
-                executionSteps.push({
-                    functionName: 'private_kernel_inner',
-                    bytecode: output.bytecode,
-                    witness: output.outputWitness,
-                    vk: output.verificationKey.keyAsBytes,
-                    timings: {
-                        witgen: witgenTimer.ms()
-                    }
-                });
+            const batchSize = planner.decideBatchSize(output.publicInputs, executionStack);
+            const apps = [];
+            for(let i = 0; i < batchSize; i++){
+                apps.push(await this.consumeNextApp(executionStack, executionSteps, updatedClassIdHintsMap));
             }
+            output = await this.runBatchedKernel({
+                apps,
+                firstIteration,
+                previousOutput: output,
+                txRequest,
+                isPrivateOnlyTx,
+                firstNullifierHint: executionResult.firstNullifier,
+                minRevertibleSideEffectCounter,
+                executionSteps,
+                generateWitnesses
+            });
             firstIteration = false;
         }
-        // Reset.
-        let resetBuilder = new PrivateKernelResetPrivateInputsBuilder(output, [], noteHashNullifierCounterMap, validationRequestsSplitCounter);
-        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, noteHashLeafIndexMap);
+            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 +135,6 @@ const NULL_SIMULATE_OUTPUT = {
                     witgen: witgenTimer.ms()
                 }
             });
-            resetBuilder = new PrivateKernelResetPrivateInputsBuilder(output, [], noteHashNullifierCounterMap, validationRequestsSplitCounter);
         }
         if (output.publicInputs.feePayer.isZero() && skipFeeEnforcement) {
             if (!skipProofGeneration) {
@@ -161,14 +148,10 @@ const NULL_SIMULATE_OUTPUT = {
         this.log.debug(`Calling private kernel tail with hwm ${previousKernelData.publicInputs.minRevertibleSideEffectCounter}`);
         // TODO: Enable padding once we better understand the final amounts to pad to.
         const paddedSideEffectAmounts = PaddedSideEffectAmounts.empty();
-        // Use the aggregated includeByTimestamp set throughout the tx execution.
-        // TODO: Call `computeTxIncludeByTimestamp` to round the value down and reduce precision, improving privacy.
-        const includeByTimestampUpperBound = previousKernelData.publicInputs.includeByTimestamp;
-        const anchorBlockTimestamp = previousKernelData.publicInputs.constants.anchorBlockHeader.globalVariables.timestamp;
-        if (includeByTimestampUpperBound <= anchorBlockTimestamp) {
-            throw new Error(`Include-by timestamp must be greater than the anchor block timestamp. Anchor block timestamp: ${anchorBlockTimestamp}. Include-by timestamp: ${includeByTimestampUpperBound}.`);
-        }
-        const privateInputs = new PrivateKernelTailCircuitPrivateInputs(previousKernelData, paddedSideEffectAmounts, includeByTimestampUpperBound);
+        // Round the aggregated expirationTimestamp down to reduce precision and avoid leaking which private
+        // functions were called via their exact expiration offsets.
+        const expirationTimestampUpperBound = computeTxExpirationTimestamp(previousKernelData.publicInputs);
+        const privateInputs = new PrivateKernelTailCircuitPrivateInputs(previousKernelData, paddedSideEffectAmounts, expirationTimestampUpperBound);
         const witgenTimer = new Timer();
         const tailOutput = generateWitnesses ? await this.proofCreator.generateTailOutput(privateInputs) : await this.proofCreator.simulateTail(privateInputs);
         executionSteps.push({
@@ -180,8 +163,8 @@ const NULL_SIMULATE_OUTPUT = {
                 witgen: witgenTimer.ms()
             }
         });
-        // Hiding circuit is only executed if we are generating witnesses.
-        // For simulation, we can end with the tail, since the hiding circuit will simply return the same tail output.
+        // Hiding kernel is only executed if we are generating witnesses.
+        // For simulation, we can end with the tail, since the Hiding kernel will simply return the same tail output.
         if (generateWitnesses) {
             const previousKernelVkData = await this.getVkData(tailOutput.verificationKey);
             const witgenTimer = new Timer();
@@ -261,14 +244,48 @@ const NULL_SIMULATE_OUTPUT = {
         const previousVkMembershipWitness = await this.oracle.getVkMembershipWitness(verificationKey.keyAsFields);
         return new VkData(verificationKey, Number(previousVkMembershipWitness.leafIndex), previousVkMembershipWitness.siblingPath);
     }
-    async createPrivateCallData({ publicInputs, vk: vkAsBuffer }) {
+    /**
+   * Pops the next app off the execution stack, pushes its nested calls back on (preserving DFS
+   * order), records the app's execution step, and returns its constructed `PrivateCallData`.
+   * Caller is responsible for ensuring the stack is non-empty.
+   */ async consumeNextApp(executionStack, executionSteps, updatedClassIdHintsMap) {
+        const next = executionStack.pop();
+        executionStack.push(...[
+            ...next.nestedExecutionResults
+        ].reverse());
+        const functionName = await this.oracle.getDebugFunctionName(next.publicInputs.callContext.contractAddress, next.publicInputs.callContext.functionSelector);
+        executionSteps.push({
+            functionName: functionName,
+            bytecode: next.acir,
+            witness: next.partialWitness,
+            vk: next.vk,
+            timings: {
+                witgen: next.profileResult?.timings.witgen ?? 0,
+                oracles: next.profileResult?.timings.oracles
+            }
+        });
+        return await this.createPrivateCallData(next, updatedClassIdHintsMap);
+    }
+    /** Prefetches updated class id hints for all unique contracts in the execution tree in parallel. */ async prefetchUpdatedClassIdHints(executionResult) {
+        const allAddresses = collectNested([
+            executionResult.entrypoint
+        ], (exec)=>[
+                exec.publicInputs.callContext.contractAddress
+            ]);
+        const uniqueAddresses = uniqueBy(allAddresses, (a)=>a.toString());
+        return new Map(await Promise.all(uniqueAddresses.map(async (addr)=>[
+                addr.toString(),
+                await this.oracle.getUpdatedClassIdHints(addr)
+            ])));
+    }
+    async createPrivateCallData({ publicInputs, vk: vkAsBuffer }, updatedClassIdHintsMap) {
         const { contractAddress, functionSelector } = publicInputs.callContext;
         const vkAsFields = await vkAsFieldsMegaHonk(vkAsBuffer);
         const vk = await VerificationKeyAsFields.fromKey(vkAsFields);
         const { currentContractClassId, publicKeys, saltedInitializationHash } = await this.oracle.getContractAddressPreimage(contractAddress);
         const functionLeafMembershipWitness = await this.oracle.getFunctionMembershipWitness(currentContractClassId, functionSelector);
         const { artifactHash: contractClassArtifactHash, publicBytecodeCommitment: contractClassPublicBytecodeCommitment } = await this.oracle.getContractClassIdPreimage(currentContractClassId);
-        const updatedClassIdHints = await this.oracle.getUpdatedClassIdHints(contractAddress);
+        const updatedClassIdHints = updatedClassIdHintsMap.get(contractAddress.toString());
         return PrivateCallData.from({
             publicInputs,
             vk,
@@ -282,4 +299,88 @@ const NULL_SIMULATE_OUTPUT = {
             })
         });
     }
+    /**
+   * Runs one batched kernel iteration. Picks the right circuit variant based on whether this is
+   * the first iteration or a later one and the size of the batch.
+   */ async runBatchedKernel(args) {
+        const { apps, firstIteration, previousOutput, txRequest, isPrivateOnlyTx, firstNullifierHint, minRevertibleSideEffectCounter, executionSteps, generateWitnesses } = args;
+        const witgenTimer = new Timer();
+        let output;
+        let functionName;
+        if (firstIteration) {
+            const vkTreeRoot = getVKTreeRoot();
+            switch(apps.length){
+                case 1:
+                    {
+                        const proofInput = new PrivateKernelInitCircuitPrivateInputs(txRequest, vkTreeRoot, ProtocolContractsList, apps[0], isPrivateOnlyTx, firstNullifierHint, minRevertibleSideEffectCounter);
+                        this.log.debug(`Calling private kernel init with isPrivateOnly ${isPrivateOnlyTx} and firstNullifierHint ${proofInput.firstNullifierHint}`);
+                        pushTestData('private-kernel-inputs-init', proofInput);
+                        output = generateWitnesses ? await this.proofCreator.generateInitOutput(proofInput) : await this.proofCreator.simulateInit(proofInput);
+                        functionName = 'private_kernel_init';
+                        break;
+                    }
+                case 2:
+                    {
+                        const proofInput = new PrivateKernelInit2CircuitPrivateInputs(txRequest, vkTreeRoot, ProtocolContractsList, apps[0], apps[1], isPrivateOnlyTx, firstNullifierHint, minRevertibleSideEffectCounter);
+                        this.log.debug(`Calling private kernel init_2 with isPrivateOnly ${isPrivateOnlyTx} and firstNullifierHint ${proofInput.firstNullifierHint}`);
+                        pushTestData('private-kernel-inputs-init-2', proofInput);
+                        output = generateWitnesses ? await this.proofCreator.generateInit2Output(proofInput) : await this.proofCreator.simulateInit2(proofInput);
+                        functionName = 'private_kernel_init_2';
+                        break;
+                    }
+                case 3:
+                    {
+                        const proofInput = new PrivateKernelInit3CircuitPrivateInputs(txRequest, vkTreeRoot, ProtocolContractsList, apps[0], apps[1], apps[2], isPrivateOnlyTx, firstNullifierHint, minRevertibleSideEffectCounter);
+                        this.log.debug(`Calling private kernel init_3 with isPrivateOnly ${isPrivateOnlyTx} and firstNullifierHint ${proofInput.firstNullifierHint}`);
+                        pushTestData('private-kernel-inputs-init-3', proofInput);
+                        output = generateWitnesses ? await this.proofCreator.generateInit3Output(proofInput) : await this.proofCreator.simulateInit3(proofInput);
+                        functionName = 'private_kernel_init_3';
+                        break;
+                    }
+                default:
+                    throw new Error(`Unsupported init kernel batch size: ${apps.length}`);
+            }
+        } else {
+            const vkData = await this.getVkData(previousOutput.verificationKey);
+            const previousKernelData = new PrivateKernelData(previousOutput.publicInputs, vkData);
+            switch(apps.length){
+                case 1:
+                    {
+                        const proofInput = new PrivateKernelInnerCircuitPrivateInputs(previousKernelData, apps[0]);
+                        pushTestData('private-kernel-inputs-inner', proofInput);
+                        output = generateWitnesses ? await this.proofCreator.generateInnerOutput(proofInput) : await this.proofCreator.simulateInner(proofInput);
+                        functionName = 'private_kernel_inner';
+                        break;
+                    }
+                case 2:
+                    {
+                        const proofInput = new PrivateKernelInner2CircuitPrivateInputs(previousKernelData, apps[0], apps[1]);
+                        pushTestData('private-kernel-inputs-inner-2', proofInput);
+                        output = generateWitnesses ? await this.proofCreator.generateInner2Output(proofInput) : await this.proofCreator.simulateInner2(proofInput);
+                        functionName = 'private_kernel_inner_2';
+                        break;
+                    }
+                case 3:
+                    {
+                        const proofInput = new PrivateKernelInner3CircuitPrivateInputs(previousKernelData, apps[0], apps[1], apps[2]);
+                        pushTestData('private-kernel-inputs-inner-3', proofInput);
+                        output = generateWitnesses ? await this.proofCreator.generateInner3Output(proofInput) : await this.proofCreator.simulateInner3(proofInput);
+                        functionName = 'private_kernel_inner_3';
+                        break;
+                    }
+                default:
+                    throw new Error(`Unsupported inner kernel batch size: ${apps.length}`);
+            }
+        }
+        executionSteps.push({
+            functionName,
+            bytecode: output.bytecode,
+            witness: output.outputWitness,
+            vk: output.verificationKey.keyAsBytes,
+            timings: {
+                witgen: witgenTimer.ms()
+            }
+        });
+        return output;
+    }
 }