@aztec/pxe 0.40.1 → 0.42.0

package/dest/synchronizer/synchronizer.js

@@ -1,6 +1,6 @@
 var _Synchronizer_instances, _Synchronizer_reprocessDeferredNotesForContract;
 import { __classPrivateFieldGet } from "tslib";
-import { L2BlockL2Logs, MerkleTreeId, } from '@aztec/circuit-types';
+import { L2BlockL2Logs, MerkleTreeId } from '@aztec/circuit-types';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
@@ -89,14 +89,15 @@ export class Synchronizer {
             if (blocks.length === 0) {
                 return false;
             }
-            const encryptedLogs = blocks.flatMap(block => block.body.encryptedLogs);
+            const noteEncryptedLogs = blocks.flatMap(block => block.body.noteEncryptedLogs);
             // Update latest tree roots from the most recent block
             const latestBlock = blocks[blocks.length - 1];
             await this.setHeaderFromBlock(latestBlock);
-            const logCount = L2BlockL2Logs.getTotalLogCount(encryptedLogs);
+            const logCount = L2BlockL2Logs.getTotalLogCount(noteEncryptedLogs);
             this.log.debug(`Forwarding ${logCount} encrypted logs and blocks to ${this.noteProcessors.length} note processors`);
             for (const noteProcessor of this.noteProcessors) {
-                await noteProcessor.process(blocks, encryptedLogs);
+                // TODO(#6830): pass in only the blocks
+                await noteProcessor.process(blocks, noteEncryptedLogs);
             }
             return true;
         }
@@ -154,8 +155,8 @@ export class Synchronizer {
                 // behind main sync.
                 throw new Error('No blocks in processor catch up mode');
             }
-            const encryptedLogs = blocks.flatMap(block => block.body.encryptedLogs);
-            const logCount = L2BlockL2Logs.getTotalLogCount(encryptedLogs);
+            const noteEncryptedLogs = blocks.flatMap(block => block.body.noteEncryptedLogs);
+            const logCount = L2BlockL2Logs.getTotalLogCount(noteEncryptedLogs);
             this.log.debug(`Forwarding ${logCount} encrypted logs and blocks to note processors in catch up mode`);
             for (const noteProcessor of catchUpGroup) {
                 // find the index of the first block that the note processor is not yet synced to
@@ -167,7 +168,7 @@ export class Synchronizer {
                     break;
                 }
                 this.log.debug(`Catching up note processor ${noteProcessor.masterIncomingViewingPublicKey.toString()} by processing ${blocks.length - index} blocks`);
-                await noteProcessor.process(blocks.slice(index), encryptedLogs.slice(index));
+                await noteProcessor.process(blocks.slice(index), noteEncryptedLogs.slice(index));
                 if (noteProcessor.status.syncedToBlock === toBlockNumber) {
                     // Note processor caught up, move it to `noteProcessors` from `noteProcessorsToCatchUp`.
                     this.log.debug(`Note processor for ${noteProcessor.masterIncomingViewingPublicKey.toString()} has caught up`, {
@@ -268,6 +269,13 @@ export class Synchronizer {
             notes: Object.fromEntries(this.noteProcessors.map(n => [n.masterIncomingViewingPublicKey.toString(), n.status.syncedToBlock])),
         };
     }
+    /**
+     * Returns the note processor stats.
+     * @returns The note processor stats for notes for each public key being tracked.
+     */
+    getSyncStats() {
+        return Object.fromEntries(this.noteProcessors.map(n => [n.masterIncomingViewingPublicKey.toString(), n.stats]));
+    }
     /**
      * Retry decoding any deferred notes for the specified contract address.
      * @param contractAddress - the contract address that has just been added
@@ -322,4 +330,4 @@ _Synchronizer_instances = new WeakSet(), _Synchronizer_reprocessDeferredNotesFor
         await this.db.removeNullifiedNotes(relevantNullifiers, publicKey);
     }
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.40.1",
+  "version": "0.42.0",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -48,19 +48,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.40.1",
-    "@aztec/bb.js": "0.40.1",
-    "@aztec/builder": "0.40.1",
-    "@aztec/circuit-types": "0.40.1",
-    "@aztec/circuits.js": "0.40.1",
-    "@aztec/ethereum": "0.40.1",
-    "@aztec/foundation": "0.40.1",
-    "@aztec/key-store": "0.40.1",
-    "@aztec/kv-store": "0.40.1",
-    "@aztec/noir-protocol-circuits-types": "0.40.1",
-    "@aztec/protocol-contracts": "0.40.1",
-    "@aztec/simulator": "0.40.1",
-    "@aztec/types": "0.40.1",
+    "@aztec/bb-prover": "0.42.0",
+    "@aztec/bb.js": "0.42.0",
+    "@aztec/builder": "0.42.0",
+    "@aztec/circuit-types": "0.42.0",
+    "@aztec/circuits.js": "0.42.0",
+    "@aztec/ethereum": "0.42.0",
+    "@aztec/foundation": "0.42.0",
+    "@aztec/key-store": "0.42.0",
+    "@aztec/kv-store": "0.42.0",
+    "@aztec/noir-protocol-circuits-types": "0.42.0",
+    "@aztec/protocol-contracts": "0.42.0",
+    "@aztec/simulator": "0.42.0",
+    "@aztec/types": "0.42.0",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "koa": "^2.14.2",
     "koa-router": "^12.0.0",

package/src/config/index.ts

@@ -37,12 +37,22 @@ export type PXEServiceConfig = PXEConfig & KernelProverConfig & BBProverConfig;
  * Creates an instance of PXEServiceConfig out of environment variables using sensible defaults for integration testing if not set.
  */
 export function getPXEServiceConfig(): PXEServiceConfig {
-  const { PXE_BLOCK_POLLING_INTERVAL_MS, PXE_L2_STARTING_BLOCK, PXE_DATA_DIRECTORY } = process.env;
+  const {
+    PXE_BLOCK_POLLING_INTERVAL_MS,
+    PXE_L2_STARTING_BLOCK,
+    PXE_DATA_DIRECTORY,
+    BB_BINARY_PATH,
+    BB_WORKING_DIRECTORY,
+    PXE_PROVER_ENABLED,
+  } = process.env;
 
   return {
     l2BlockPollingIntervalMS: PXE_BLOCK_POLLING_INTERVAL_MS ? +PXE_BLOCK_POLLING_INTERVAL_MS : 1000,
     l2StartingBlock: PXE_L2_STARTING_BLOCK ? +PXE_L2_STARTING_BLOCK : INITIAL_L2_BLOCK_NUM,
     dataDirectory: PXE_DATA_DIRECTORY,
+    bbBinaryPath: BB_BINARY_PATH,
+    bbWorkingDirectory: BB_WORKING_DIRECTORY,
+    proverEnabled: ['1', 'true'].includes(PXE_PROVER_ENABLED!),
   };
 }
 

package/src/contract_data_oracle/index.ts

@@ -145,6 +145,13 @@ export class ContractDataOracle {
     return await Promise.resolve(MembershipWitness.random(VK_TREE_HEIGHT));
   }
 
+  public async getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector) {
+    const tree = await this.getTreeForAddress(contractAddress);
+    const { name: contractName } = tree.getArtifact();
+    const { name: functionName } = tree.getFunctionArtifact(selector);
+    return `${contractName}:${functionName}`;
+  }
+
   /**
    * Retrieve or create a ContractTree instance based on the provided class id.
    * If an existing tree with the same class id is found in the cache, it will be returned.

package/src/contract_data_oracle/private_functions_tree.ts

@@ -37,7 +37,9 @@ export class PrivateFunctionsTree {
     const artifact = this.artifact.functions.find(f => selector.equals(f.name, f.parameters));
     if (!artifact) {
       throw new Error(
-        `Unknown function. Selector ${selector.toString()} not found in the artifact with class ${this.getContractClassId().toString()}.`,
+        `Unknown function. Selector ${selector.toString()} not found in the artifact ${
+          this.artifact.name
+        } with class ${this.getContractClassId().toString()}.`,
       );
     }
     return artifact;

package/src/database/kv_pxe_database.ts

@@ -385,8 +385,8 @@ export class KVPxeDatabase implements PxeDatabase {
     return value ? CompleteAddress.fromBuffer(value) : undefined;
   }
 
-  getCompleteAddress(address: AztecAddress): Promise<CompleteAddress | undefined> {
-    return Promise.resolve(this.#getCompleteAddress(address));
+  getCompleteAddress(account: AztecAddress): Promise<CompleteAddress | undefined> {
+    return Promise.resolve(this.#getCompleteAddress(account));
   }
 
   getCompleteAddresses(): Promise<CompleteAddress[]> {

package/src/database/pxe_database.ts

@@ -133,14 +133,14 @@ export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceD
   addCompleteAddress(address: CompleteAddress): Promise<boolean>;
 
   /**
-   * Retrieves the complete address corresponding to the provided aztec address.
-   * @param address - The aztec address of the complete address contract.
-   * @returns A promise that resolves to a CompleteAddress instance if the address is found, or undefined if not found.
+   * Retrieve the complete address associated to a given address.
+   * @param account - The account address.
+   * @returns A promise that resolves to a CompleteAddress instance if found, or undefined if not found.
    */
-  getCompleteAddress(address: AztecAddress): Promise<CompleteAddress | undefined>;
+  getCompleteAddress(account: AztecAddress): Promise<CompleteAddress | undefined>;
 
   /**
-   * Retrieves the list of complete address added to this database
+   * Retrieves the list of complete addresses added to this database
    * @returns A promise that resolves to an array of AztecAddress instances.
    */
   getCompleteAddresses(): Promise<CompleteAddress[]>;

package/src/kernel_oracle/index.ts

@@ -1,15 +1,18 @@
-import { type AztecNode, type KeyStore } from '@aztec/circuit-types';
+import { type AztecNode } from '@aztec/circuit-types';
 import {
   type AztecAddress,
   type Fr,
   type FunctionSelector,
+  type GrumpkinPrivateKey,
   MembershipWitness,
   type NOTE_HASH_TREE_HEIGHT,
   type Point,
   computeContractClassIdPreimage,
   computeSaltedInitializationHash,
 } from '@aztec/circuits.js';
+import { createDebugLogger } from '@aztec/foundation/log';
 import { type Tuple } from '@aztec/foundation/serialize';
+import { type KeyStore } from '@aztec/key-store';
 
 import { type ContractDataOracle } from '../contract_data_oracle/index.js';
 import { type ProvingDataOracle } from './../kernel_prover/proving_data_oracle.js';
@@ -20,7 +23,12 @@ import { type ProvingDataOracle } from './../kernel_prover/proving_data_oracle.j
  * A data oracle that provides information needed for simulating a transaction.
  */
 export class KernelOracle implements ProvingDataOracle {
-  constructor(private contractDataOracle: ContractDataOracle, private keyStore: KeyStore, private node: AztecNode) {}
+  constructor(
+    private contractDataOracle: ContractDataOracle,
+    private keyStore: KeyStore,
+    private node: AztecNode,
+    private log = createDebugLogger('aztec:pxe:kernel_oracle'),
+  ) {}
 
   public async getContractAddressPreimage(address: AztecAddress) {
     const instance = await this.contractDataOracle.getContractInstance(address);
@@ -61,7 +69,11 @@ export class KernelOracle implements ProvingDataOracle {
     return header.state.partial.noteHashTree.root;
   }
 
-  public getMasterNullifierSecretKey(nullifierPublicKey: Point) {
-    return this.keyStore.getMasterNullifierSecretKeyForPublicKey(nullifierPublicKey);
+  public getMasterSecretKey(masterPublicKey: Point): Promise<GrumpkinPrivateKey> {
+    return this.keyStore.getMasterSecretKey(masterPublicKey);
+  }
+
+  public getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector): Promise<string> {
+    return this.contractDataOracle.getDebugFunctionName(contractAddress, selector);
   }
 }

package/src/kernel_prover/kernel_prover.ts

@@ -2,7 +2,12 @@ import { type KernelProofOutput, type ProofCreator } from '@aztec/circuit-types'
 import {
   CallRequest,
   Fr,
-  MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
+  MAX_KEY_VALIDATION_REQUESTS_PER_TX,
+  MAX_NEW_NOTE_HASHES_PER_TX,
+  MAX_NEW_NULLIFIERS_PER_TX,
+  MAX_NOTE_ENCRYPTED_LOGS_PER_TX,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
+  MAX_NULLIFIER_READ_REQUESTS_PER_TX,
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
   NESTED_RECURSIVE_PROOF_LENGTH,
   PrivateCallData,
@@ -17,6 +22,7 @@ import {
   type TxRequest,
   VK_TREE_HEIGHT,
   VerificationKeyAsFields,
+  getNonEmptyItems,
   makeRecursiveProof,
 } from '@aztec/circuits.js';
 import { padArrayEnd } from '@aztec/foundation/collection';
@@ -26,9 +32,10 @@ import { pushTestData } from '@aztec/foundation/testing';
 import { type ExecutionResult, collectNoteHashLeafIndexMap, collectNullifiedNoteHashCounters } from '@aztec/simulator';
 
 import {
+  buildPrivateKernelInitHints,
   buildPrivateKernelInnerHints,
+  buildPrivateKernelResetInputs,
   buildPrivateKernelTailHints,
-  buildPrivateKernelTailOutputs,
 } from './private_inputs_builders/index.js';
 import { type ProvingDataOracle } from './proving_data_oracle.js';
 
@@ -70,41 +77,50 @@ export class KernelProver {
     const noteHashNullifierCounterMap = collectNullifiedNoteHashCounters(executionResult);
 
     while (executionStack.length) {
+      if (!firstIteration && this.needsReset(executionStack, output)) {
+        output = await this.runReset(executionStack, output, noteHashLeafIndexMap, noteHashNullifierCounterMap);
+      }
       const currentExecution = executionStack.pop()!;
-      executionStack.push(...currentExecution.nestedExecutions);
+      executionStack.push(...[...currentExecution.nestedExecutions].reverse());
 
-      const privateCallRequests = currentExecution.nestedExecutions.map(result =>
-        result.callStackItem.toCallRequest(currentExecution.callStackItem.publicInputs.callContext),
-      );
       const publicCallRequests = currentExecution.enqueuedPublicFunctionCalls.map(result => result.toCallRequest());
       const publicTeardownCallRequest = currentExecution.publicTeardownFunctionCall.isEmpty()
         ? CallRequest.empty()
         : currentExecution.publicTeardownFunctionCall.toCallRequest();
 
+      const functionName = await this.oracle.getDebugFunctionName(
+        currentExecution.callStackItem.contractAddress,
+        currentExecution.callStackItem.functionData.selector,
+      );
+
       const proofOutput = await this.proofCreator.createAppCircuitProof(
         currentExecution.partialWitness,
         currentExecution.acir,
+        functionName,
       );
 
       const privateCallData = await this.createPrivateCallData(
         currentExecution,
-        privateCallRequests,
         publicCallRequests,
         publicTeardownCallRequest,
         proofOutput.proof,
         proofOutput.verificationKey,
       );
 
-      const hints = buildPrivateKernelInnerHints(
-        currentExecution.callStackItem.publicInputs,
-        noteHashNullifierCounterMap,
-      );
-
       if (firstIteration) {
+        const hints = buildPrivateKernelInitHints(
+          currentExecution.callStackItem.publicInputs,
+          noteHashNullifierCounterMap,
+          currentExecution.callStackItem.publicInputs.privateCallRequests,
+        );
         const proofInput = new PrivateKernelInitCircuitPrivateInputs(txRequest, privateCallData, hints);
         pushTestData('private-kernel-inputs-init', proofInput);
         output = await this.proofCreator.createProofInit(proofInput);
       } else {
+        const hints = buildPrivateKernelInnerHints(
+          currentExecution.callStackItem.publicInputs,
+          noteHashNullifierCounterMap,
+        );
         const previousVkMembershipWitness = await this.oracle.getVkMembershipWitness(output.verificationKey);
         const previousKernelData = new PrivateKernelData(
           output.publicInputs,
@@ -120,6 +136,9 @@ export class KernelProver {
       firstIteration = false;
     }
 
+    if (this.somethingToReset(output)) {
+      output = await this.runReset(executionStack, output, noteHashLeafIndexMap, noteHashNullifierCounterMap);
+    }
     const previousVkMembershipWitness = await this.oracle.getVkMembershipWitness(output.verificationKey);
     const previousKernelData = new PrivateKernelData(
       output.publicInputs,
@@ -133,19 +152,76 @@ export class KernelProver {
       `Calling private kernel tail with hwm ${previousKernelData.publicInputs.minRevertibleSideEffectCounter}`,
     );
 
-    const hints = await buildPrivateKernelTailHints(output.publicInputs, noteHashLeafIndexMap, this.oracle);
+    const hints = buildPrivateKernelTailHints(output.publicInputs);
 
-    const expectedOutputs = buildPrivateKernelTailOutputs(hints.sortedNewNoteHashes, hints.sortedNewNullifiers);
-
-    const privateInputs = new PrivateKernelTailCircuitPrivateInputs(previousKernelData, expectedOutputs, hints);
+    const privateInputs = new PrivateKernelTailCircuitPrivateInputs(previousKernelData, hints);
 
     pushTestData('private-kernel-inputs-ordering', privateInputs);
     return await this.proofCreator.createProofTail(privateInputs);
   }
 
+  private needsReset(executionStack: ExecutionResult[], output: KernelProofOutput<PrivateKernelCircuitPublicInputs>) {
+    const nextIteration = executionStack[executionStack.length - 1];
+    return (
+      getNonEmptyItems(nextIteration.callStackItem.publicInputs.newNoteHashes).length +
+        getNonEmptyItems(output.publicInputs.end.newNoteHashes).length >
+        MAX_NEW_NOTE_HASHES_PER_TX ||
+      getNonEmptyItems(nextIteration.callStackItem.publicInputs.newNullifiers).length +
+        getNonEmptyItems(output.publicInputs.end.newNullifiers).length >
+        MAX_NEW_NULLIFIERS_PER_TX ||
+      getNonEmptyItems(nextIteration.callStackItem.publicInputs.noteEncryptedLogsHashes).length +
+        getNonEmptyItems(output.publicInputs.end.noteEncryptedLogsHashes).length >
+        MAX_NOTE_ENCRYPTED_LOGS_PER_TX ||
+      getNonEmptyItems(nextIteration.callStackItem.publicInputs.noteHashReadRequests).length +
+        getNonEmptyItems(output.publicInputs.validationRequests.noteHashReadRequests).length >
+        MAX_NOTE_HASH_READ_REQUESTS_PER_TX ||
+      getNonEmptyItems(nextIteration.callStackItem.publicInputs.nullifierReadRequests).length +
+        getNonEmptyItems(output.publicInputs.validationRequests.nullifierReadRequests).length >
+        MAX_NULLIFIER_READ_REQUESTS_PER_TX ||
+      getNonEmptyItems(nextIteration.callStackItem.publicInputs.keyValidationRequestsAndGenerators).length +
+        getNonEmptyItems(output.publicInputs.validationRequests.scopedKeyValidationRequestsAndGenerators).length >
+        MAX_KEY_VALIDATION_REQUESTS_PER_TX
+    );
+  }
+
+  private somethingToReset(output: KernelProofOutput<PrivateKernelCircuitPublicInputs>) {
+    return (
+      getNonEmptyItems(output.publicInputs.validationRequests.noteHashReadRequests).length > 0 ||
+      getNonEmptyItems(output.publicInputs.validationRequests.nullifierReadRequests).length > 0 ||
+      getNonEmptyItems(output.publicInputs.validationRequests.scopedKeyValidationRequestsAndGenerators).length > 0 ||
+      output.publicInputs.end.newNoteHashes.find(noteHash => noteHash.nullifierCounter !== 0) ||
+      output.publicInputs.end.newNullifiers.find(nullifier => !nullifier.nullifiedNoteHash.equals(Fr.zero()))
+    );
+  }
+
+  private async runReset(
+    executionStack: ExecutionResult[],
+    output: KernelProofOutput<PrivateKernelCircuitPublicInputs>,
+    noteHashLeafIndexMap: Map<bigint, bigint>,
+    noteHashNullifierCounterMap: Map<number, number>,
+  ): Promise<KernelProofOutput<PrivateKernelCircuitPublicInputs>> {
+    const previousVkMembershipWitness = await this.oracle.getVkMembershipWitness(output.verificationKey);
+    const previousKernelData = new PrivateKernelData(
+      output.publicInputs,
+      output.proof,
+      output.verificationKey,
+      Number(previousVkMembershipWitness.leafIndex),
+      assertLength<Fr, typeof VK_TREE_HEIGHT>(previousVkMembershipWitness.siblingPath, VK_TREE_HEIGHT),
+    );
+
+    return this.proofCreator.createProofReset(
+      await buildPrivateKernelResetInputs(
+        executionStack,
+        previousKernelData,
+        noteHashLeafIndexMap,
+        noteHashNullifierCounterMap,
+        this.oracle,
+      ),
+    );
+  }
+
   private async createPrivateCallData(
     { callStackItem }: ExecutionResult,
-    privateCallRequests: CallRequest[],
     publicCallRequests: CallRequest[],
     publicTeardownCallRequest: CallRequest,
     proof: RecursiveProof<typeof RECURSIVE_PROOF_LENGTH>,
@@ -153,12 +229,6 @@ export class KernelProver {
   ) {
     const { contractAddress, functionData } = callStackItem;
 
-    // Pad with empty items to reach max/const length expected by circuit.
-    const privateCallStack = padArrayEnd(
-      privateCallRequests,
-      CallRequest.empty(),
-      MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
-    );
     const publicCallStack = padArrayEnd(publicCallRequests, CallRequest.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
 
     const functionLeafMembershipWitness = await this.oracle.getFunctionMembershipWitness(
@@ -177,7 +247,6 @@ export class KernelProver {
 
     return PrivateCallData.from({
       callStackItem,
-      privateCallStack,
       publicCallStack,
       publicTeardownCallRequest,
       proof,

package/src/kernel_prover/private_inputs_builders/build_private_kernel_init_hints.ts

@@ -0,0 +1,28 @@
+import {
+  type MAX_NEW_NOTE_HASHES_PER_CALL,
+  type PrivateCallRequest,
+  type PrivateCircuitPublicInputs,
+  PrivateKernelInitHints,
+  countAccumulatedItems,
+} from '@aztec/circuits.js';
+import { type Tuple } from '@aztec/foundation/serialize';
+
+export function buildPrivateKernelInitHints(
+  publicInputs: PrivateCircuitPublicInputs,
+  noteHashNullifierCounterMap: Map<number, number>,
+  privateCallRequests: PrivateCallRequest[],
+) {
+  const nullifierCounters = publicInputs.newNoteHashes.map(
+    n => noteHashNullifierCounterMap.get(n.counter) ?? 0,
+  ) as Tuple<number, typeof MAX_NEW_NOTE_HASHES_PER_CALL>;
+
+  const minRevertibleCounter = publicInputs.minRevertibleSideEffectCounter.toNumber();
+  let firstRevertiblePrivateCallRequestIndex = privateCallRequests.findIndex(
+    r => r.startSideEffectCounter >= minRevertibleCounter,
+  );
+  if (firstRevertiblePrivateCallRequestIndex === -1) {
+    firstRevertiblePrivateCallRequestIndex = countAccumulatedItems(privateCallRequests);
+  }
+
+  return new PrivateKernelInitHints(nullifierCounters, firstRevertiblePrivateCallRequestIndex);
+}