@aztec/bb-prover 0.0.1-commit.a5db02d → 0.0.1-commit.aa0c64f

package/dest/verifier/batch_chonk_verifier.js

@@ -6,19 +6,21 @@ import { Timer } from '@aztec/foundation/timer';
 import { ProtocolCircuitVks } from '@aztec/noir-protocol-circuits-types/server/vks';
 import { Unpackr } from 'msgpackr';
 import { execFile } from 'node:child_process';
-import { unlinkSync } from 'node:fs';
-import { unlink } from 'node:fs/promises';
+import { rmSync } from 'node:fs';
+import { mkdtemp, rm } from 'node:fs/promises';
 import * as os from 'node:os';
 import * as path from 'node:path';
 import { promisify } from 'node:util';
 const execFileAsync = promisify(execFile);
+const RESULT_TIMEOUT_MS = 5 * 60 * 1000;
+const STOP_DRAIN_TIMEOUT_MS = 5_000;
 /** Maps client protocol artifacts used for chonk verification to VK indices. */ const CHONK_VK_ARTIFACTS = [
     'HidingKernelToRollup',
     'HidingKernelToPublic'
 ];
 /**
  * Batch verifier for Chonk IVC proofs. Uses the bb batch verifier service
- * which batches IPA verification into a single SRS MSM for better throughput.
+ * which batches IPA verification into a constant number of SRS MSMs for better throughput.
  *
  * Architecture:
  * - Spawns a persistent `bb msgpack run` process via Barretenberg (native backend)
@@ -31,6 +33,7 @@ const execFileAsync = promisify(execFile);
     batchSize;
     label;
     bb;
+    fifoDir;
     fifoPath;
     nextRequestId;
     pendingRequests;
@@ -39,17 +42,22 @@ const execFileAsync = promisify(execFile);
     logger;
     /** Maps artifact name to VK index in the batch verifier. */ vkIndexMap;
     /** Bound cleanup handler for process exit signals. */ exitCleanup;
+    stopped;
+    fatalError;
+    pendingDrainedResolvers;
     constructor(config, vkBuffers, batchSize, label){
         this.config = config;
         this.vkBuffers = vkBuffers;
         this.batchSize = batchSize;
         this.label = label;
+        this.fifoPath = '';
         this.nextRequestId = 0;
         this.pendingRequests = new Map();
         this.logger = createLogger('bb-prover:batch_chonk_verifier');
         this.vkIndexMap = new Map();
         this.exitCleanup = null;
-        this.fifoPath = path.join(os.tmpdir(), `bb-batch-${label}-${process.pid}-${Date.now()}.fifo`);
+        this.stopped = false;
+        this.pendingDrainedResolvers = new Set();
         this.fifoReader = new FifoFrameReader();
         this.sendQueue = new SerialQueue();
         this.sendQueue.start(1);
@@ -80,47 +88,91 @@ const execFileAsync = promisify(execFile);
     }
     async start() {
         this.logger.info('Starting BatchChonkVerifier');
-        this.bb = await Barretenberg.new({
-            bbPath: this.config.bbBinaryPath,
-            backend: BackendType.NativeUnixSocket
-        });
-        await this.bb.initSRSChonk();
-        await execFileAsync('mkfifo', [
-            this.fifoPath
-        ]);
-        this.registerExitCleanup();
-        await this.bb.chonkBatchVerifierStart({
-            vks: this.vkBuffers,
-            numCores: this.config.bbChonkVerifyConcurrency || 0,
-            batchSize: this.batchSize,
-            fifoPath: this.fifoPath
-        });
-        this.startFifoReader();
+        try {
+            this.bb = await Barretenberg.new({
+                bbPath: this.config.bbBinaryPath,
+                backend: BackendType.NativeUnixSocket
+            });
+            await this.bb.initSRSChonk();
+            // Keep the FIFO in a private directory so cleanup has a single owner.
+            this.fifoDir = await mkdtemp(path.join(os.tmpdir(), `bb-batch-${this.label}-${process.pid}-`));
+            this.fifoPath = path.join(this.fifoDir, 'results.fifo');
+            await execFileAsync('mkfifo', [
+                this.fifoPath
+            ]);
+            this.registerExitCleanup();
+            this.startFifoReader();
+            await this.bb.chonkBatchVerifierStart({
+                vks: this.vkBuffers,
+                numCores: this.config.bbChonkVerifyConcurrency || 0,
+                batchSize: this.batchSize,
+                fifoPath: this.fifoPath
+            });
+        } catch (err) {
+            this.fifoReader.stop();
+            this.deregisterExitCleanup();
+            await this.cleanupFifo();
+            await this.bb?.destroy().catch(()=>{});
+            throw err;
+        }
         this.logger.info('BatchChonkVerifier started', {
             fifoPath: this.fifoPath
         });
     }
     verifyProof(tx) {
-        const circuit = tx.data.forPublic ? 'HidingKernelToPublic' : 'HidingKernelToRollup';
-        const vkIndex = this.vkIndexMap.get(circuit);
-        if (vkIndex === undefined) {
-            throw new Error(`No VK index for circuit ${circuit}`);
-        }
-        const proofWithPubInputs = tx.chonkProof.attachPublicInputs(tx.data.publicInputs().toFields());
-        const proofFields = proofWithPubInputs.fieldsWithPublicInputs.map((f)=>f.toBuffer());
-        return this.enqueueProof(vkIndex, proofFields);
+        const totalTimer = new Timer();
+        return (async ()=>{
+            const circuit = tx.data.forPublic ? 'HidingKernelToPublic' : 'HidingKernelToRollup';
+            const vkIndex = this.vkIndexMap.get(circuit);
+            if (vkIndex === undefined) {
+                throw new Error(`No VK index for circuit ${circuit}`);
+            }
+            const proofWithPubInputs = tx.chonkProof.attachPublicInputs(tx.data.publicInputs().toFields());
+            const proofFields = proofWithPubInputs.fieldsWithPublicInputs.map((f)=>f.toBuffer());
+            return await this.enqueueProof(vkIndex, proofFields);
+        })().catch((err)=>{
+            this.logger.warn(`Failed to verify Chonk proof for tx ${tx.getTxHash().toString()}: ${String(err)}`);
+            return {
+                valid: false,
+                durationMs: 0,
+                totalDurationMs: totalTimer.ms()
+            };
+        });
     }
     /** Enqueue raw proof fields for verification. Used directly by tests with custom VKs. */ enqueueProof(vkIndex, proofFields) {
+        if (this.stopped) {
+            return Promise.reject(new Error('BatchChonkVerifier stopped'));
+        }
+        if (this.fatalError) {
+            return Promise.reject(this.fatalError);
+        }
         const totalTimer = new Timer();
         const requestId = this.nextRequestId++;
         const resultPromise = new Promise((resolve, reject)=>{
+            const timeout = setTimeout(()=>{
+                const pending = this.pendingRequests.get(requestId);
+                if (!pending) {
+                    return;
+                }
+                this.pendingRequests.delete(requestId);
+                pending.reject(new Error(`BatchChonkVerifier result timed out for request_id=${requestId}`));
+                this.notifyPendingDrained();
+            }, RESULT_TIMEOUT_MS);
+            // A pending result timer must never keep the host process alive on its own (e.g. an
+            // orphaned request at process exit); the FIFO reader keeps the loop alive while results
+            // are genuinely awaited.
+            timeout.unref();
             this.pendingRequests.set(requestId, {
                 resolve,
                 reject,
-                totalTimer
+                totalTimer,
+                timeout
             });
         });
         void this.sendQueue.put(async ()=>{
+            if (this.fatalError) {
+                throw this.fatalError;
+            }
             await this.bb.chonkBatchVerifierQueue({
                 requestId,
                 vkIndex,
@@ -130,35 +182,62 @@ const execFileAsync = promisify(execFile);
             const pending = this.pendingRequests.get(requestId);
             if (pending) {
                 this.pendingRequests.delete(requestId);
+                clearTimeout(pending.timeout);
                 pending.reject(err instanceof Error ? err : new Error(String(err)));
+                this.notifyPendingDrained();
             }
         });
         return resultPromise;
     }
     async stop() {
         this.logger.info('Stopping BatchChonkVerifier');
-        // Stop accepting new proofs
-        await this.sendQueue.end();
-        // Stop the bb service (flushes remaining proofs)
+        this.stopped = true;
         try {
-            await this.bb.chonkBatchVerifierStop({});
+            // Stop accepting new proofs and flush the send queue. Bound it so an unresponsive
+            // native process can't block teardown of our own event-loop handles indefinitely.
+            await this.withTimeout(this.sendQueue.end(), STOP_DRAIN_TIMEOUT_MS, 'send queue flush');
+            // Stop the bb service (flushes remaining proofs).
+            await this.withTimeout(this.bb.chonkBatchVerifierStop({}), STOP_DRAIN_TIMEOUT_MS, 'chonkBatchVerifierStop');
+            // Native stop flushes callbacks; keep the FIFO open until those frames are observed.
+            const drained = await this.waitForPendingRequestsToDrain(STOP_DRAIN_TIMEOUT_MS);
+            if (!drained) {
+                this.rejectPendingRequests(new Error('Timed out waiting for BatchChonkVerifier results during stop'));
+            }
         } catch (err) {
-            this.logger.warn(`Error stopping batch verifier service: ${err}`);
-        }
-        // Stop FIFO reader
-        this.fifoReader.stop();
-        // Clean up FIFO file and deregister exit handler
-        await unlink(this.fifoPath).catch(()=>{});
-        this.deregisterExitCleanup();
-        // Reject any remaining pending requests
-        for (const [id, pending] of this.pendingRequests){
-            pending.reject(new Error('BatchChonkVerifier stopped'));
-            this.pendingRequests.delete(id);
+            this.logger.warn(`Error during BatchChonkVerifier graceful stop: ${err}`);
+            this.rejectPendingRequests(err instanceof Error ? err : new Error(String(err)));
+        } finally{
+            // Always release our own event-loop handles — the FIFO read stream (a blocking
+            // threadpool read that can't be unref'd), the unix socket, the native process, and the
+            // exit handler — so the host process exits cleanly even if the native backend is wedged.
+            this.fifoReader.stop();
+            this.deregisterExitCleanup();
+            await this.cleanupFifo();
+            await this.bb.destroy().catch((err)=>this.logger.warn(`Error destroying bb backend during stop: ${err}`));
         }
-        // Destroy bb process
-        await this.bb.destroy();
         this.logger.info('BatchChonkVerifier stopped');
     }
+    /**
+   * Races a promise against a timeout so a wedged native backend can't block teardown. The
+   * timer is unref'd so it never keeps the process alive; the underlying promise stays handled
+   * by the race even if the timeout wins, so it cannot surface as an unhandled rejection.
+   */ async withTimeout(promise, timeoutMs, label) {
+        let timer;
+        const timeout = new Promise((_, reject)=>{
+            timer = setTimeout(()=>reject(new Error(`BatchChonkVerifier ${label} timed out after ${timeoutMs}ms`)), timeoutMs);
+            timer.unref();
+        });
+        try {
+            return await Promise.race([
+                promise,
+                timeout
+            ]);
+        } finally{
+            if (timer) {
+                clearTimeout(timer);
+            }
+        }
+    }
     startFifoReader() {
         const unpackr = new Unpackr({
             useRecords: false
@@ -169,16 +248,18 @@ const execFileAsync = promisify(execFile);
                 this.handleResult(result);
             } catch (err) {
                 this.logger.error(`FIFO: failed to decode msgpack result: ${err}`);
+                // A corrupt result stream cannot safely be matched to outstanding requests.
+                this.failVerifier(err instanceof Error ? err : new Error(String(err)));
             }
         });
         this.fifoReader.on('error', (err)=>{
             this.logger.error(`FIFO reader error: ${err}`);
+            this.failVerifier(err);
         });
         this.fifoReader.on('end', ()=>{
             this.logger.debug('FIFO reader: stream ended');
-            for (const [id, pending] of this.pendingRequests){
-                pending.reject(new Error('FIFO stream ended unexpectedly'));
-                this.pendingRequests.delete(id);
+            if (!this.stopped) {
+                this.failVerifier(new Error('FIFO stream ended unexpectedly'));
             }
         });
         this.fifoReader.start(this.fifoPath);
@@ -190,6 +271,7 @@ const execFileAsync = promisify(execFile);
             return;
         }
         this.pendingRequests.delete(result.request_id);
+        clearTimeout(pending.timeout);
         const valid = result.status === 0; // VerifyStatus::OK
         const durationMs = result.time_in_verify_ms;
         const totalDurationMs = pending.totalTimer.ms();
@@ -208,25 +290,95 @@ const execFileAsync = promisify(execFile);
             });
         }
         pending.resolve(ivcResult);
+        this.notifyPendingDrained();
     }
     registerExitCleanup() {
-        // Signal handlers must be synchronous — unlinkSync is intentional here
         this.exitCleanup = ()=>{
-            try {
-                unlinkSync(this.fifoPath);
-            } catch  {
-            /* ignore */ }
+            this.cleanupFifoSync();
         };
         process.on('exit', this.exitCleanup);
-        process.on('SIGINT', this.exitCleanup);
-        process.on('SIGTERM', this.exitCleanup);
     }
     deregisterExitCleanup() {
         if (this.exitCleanup) {
             process.removeListener('exit', this.exitCleanup);
-            process.removeListener('SIGINT', this.exitCleanup);
-            process.removeListener('SIGTERM', this.exitCleanup);
             this.exitCleanup = null;
         }
     }
+    rejectPendingRequests(error) {
+        for (const [id, pending] of Array.from(this.pendingRequests)){
+            pending.reject(error);
+            clearTimeout(pending.timeout);
+            this.pendingRequests.delete(id);
+        }
+        this.notifyPendingDrained();
+    }
+    failVerifier(error) {
+        if (!this.fatalError) {
+            this.fatalError = error;
+        }
+        this.rejectPendingRequests(error);
+    }
+    waitForPendingRequestsToDrain(timeoutMs) {
+        if (this.pendingRequests.size === 0) {
+            return Promise.resolve(true);
+        }
+        let timeout;
+        let onDrain;
+        const drained = new Promise((resolve)=>{
+            onDrain = ()=>resolve(true);
+            this.pendingDrainedResolvers.add(onDrain);
+        });
+        const timedOut = new Promise((resolve)=>{
+            timeout = setTimeout(()=>resolve(false), timeoutMs);
+            timeout.unref();
+        });
+        return Promise.race([
+            drained,
+            timedOut
+        ]).finally(()=>{
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+            if (onDrain) {
+                this.pendingDrainedResolvers.delete(onDrain);
+            }
+        });
+    }
+    notifyPendingDrained() {
+        if (this.pendingRequests.size > 0) {
+            return;
+        }
+        for (const resolve of Array.from(this.pendingDrainedResolvers)){
+            resolve();
+        }
+    }
+    async cleanupFifo() {
+        if (this.fifoDir) {
+            await rm(this.fifoDir, {
+                recursive: true,
+                force: true
+            }).catch(()=>{});
+        } else if (this.fifoPath) {
+            await rm(this.fifoPath, {
+                force: true
+            }).catch(()=>{});
+        }
+        this.fifoDir = undefined;
+        this.fifoPath = '';
+    }
+    cleanupFifoSync() {
+        try {
+            if (this.fifoDir) {
+                rmSync(this.fifoDir, {
+                    recursive: true,
+                    force: true
+                });
+            } else if (this.fifoPath) {
+                rmSync(this.fifoPath, {
+                    force: true
+                });
+            }
+        } catch  {
+        /* ignore */ }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb-prover",
-  "version": "0.0.1-commit.a5db02d",
+  "version": "0.0.1-commit.aa0c64f",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -70,16 +70,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "0.0.1-commit.a5db02d",
-    "@aztec/constants": "0.0.1-commit.a5db02d",
-    "@aztec/foundation": "0.0.1-commit.a5db02d",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.a5db02d",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.a5db02d",
-    "@aztec/noir-types": "0.0.1-commit.a5db02d",
-    "@aztec/simulator": "0.0.1-commit.a5db02d",
-    "@aztec/stdlib": "0.0.1-commit.a5db02d",
-    "@aztec/telemetry-client": "0.0.1-commit.a5db02d",
-    "@aztec/world-state": "0.0.1-commit.a5db02d",
+    "@aztec/bb.js": "0.0.1-commit.aa0c64f",
+    "@aztec/constants": "0.0.1-commit.aa0c64f",
+    "@aztec/foundation": "0.0.1-commit.aa0c64f",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.aa0c64f",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.aa0c64f",
+    "@aztec/noir-types": "0.0.1-commit.aa0c64f",
+    "@aztec/simulator": "0.0.1-commit.aa0c64f",
+    "@aztec/stdlib": "0.0.1-commit.aa0c64f",
+    "@aztec/telemetry-client": "0.0.1-commit.aa0c64f",
+    "@aztec/world-state": "0.0.1-commit.aa0c64f",
     "commander": "^12.1.0",
     "msgpackr": "^1.11.2",
     "pako": "^2.1.0",
@@ -87,11 +87,11 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/ethereum": "0.0.1-commit.a5db02d",
-    "@aztec/kv-store": "0.0.1-commit.a5db02d",
-    "@aztec/noir-contracts.js": "0.0.1-commit.a5db02d",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.a5db02d",
-    "@aztec/protocol-contracts": "0.0.1-commit.a5db02d",
+    "@aztec/ethereum": "0.0.1-commit.aa0c64f",
+    "@aztec/kv-store": "0.0.1-commit.aa0c64f",
+    "@aztec/noir-contracts.js": "0.0.1-commit.aa0c64f",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.aa0c64f",
+    "@aztec/protocol-contracts": "0.0.1-commit.aa0c64f",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",

package/src/avm_proving_tests/avm_proving_tester.ts

@@ -1,12 +1,15 @@
 import type { AvmStat } from '@aztec/bb.js';
+import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import {
+  type MeasuredSimulatorFactory,
   PublicTxSimulationTester,
   SimpleContractDataSource,
   type TestEnqueuedCall,
   type TestExecutorMetrics,
   type TestPrivateInsertions,
 } from '@aztec/simulator/public/fixtures';
+import { AvmSimulatorPool, MeasuredPublicTxSimulator } from '@aztec/simulator/server';
 import type { PublicTxResult } from '@aztec/simulator/server';
 import { AvmCircuitInputs, AvmCircuitPublicInputs, PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -32,7 +35,10 @@ const provingConfig: PublicSimulatorConfig = PublicSimulatorConfig.from({
 });
 
 export class AvmProvingTester extends PublicTxSimulationTester {
-  private readonly bbJsFactory = new BBJsFactory(BB_PATH);
+  private readonly bbJsFactory = new BBJsFactory(BB_PATH, {
+    debugDir: process.env.BB_DEBUG_OUTPUT_DIR,
+    logger: createLogger('bb-prover:avm-proving-tester'),
+  });
 
   constructor(
     private checkCircuitOnly: boolean,
@@ -40,9 +46,9 @@ export class AvmProvingTester extends PublicTxSimulationTester {
     merkleTrees: MerkleTreeWriteOperations,
     globals?: GlobalVariables,
     metrics?: TestExecutorMetrics,
+    simulatorFactory?: MeasuredSimulatorFactory,
   ) {
-    // simulator factory is undefined because for proving, we use the default C++ simulator
-    super(merkleTrees, contractDataSource, globals, metrics, /*simulatorFactory=*/ undefined, provingConfig);
+    super(merkleTrees, contractDataSource, globals, metrics, simulatorFactory, provingConfig);
   }
 
   static async new(
@@ -53,7 +59,29 @@ export class AvmProvingTester extends PublicTxSimulationTester {
   ) {
     const contractDataSource = new SimpleContractDataSource();
     const merkleTrees = await worldStateService.fork();
-    return new AvmProvingTester(checkCircuitOnly, contractDataSource, merkleTrees, globals, metrics);
+
+    const avmSimulator = await AvmSimulatorPool.spawn({ wsdbIpcPath: worldStateService.getIpcPath() });
+    const simulatorFactory: MeasuredSimulatorFactory = (mt, cdb, g, m, c) =>
+      new MeasuredPublicTxSimulator(avmSimulator, g, cdb, mt.getRevision().forkId, m, c, undefined);
+
+    const tester = new AvmProvingTester(
+      checkCircuitOnly,
+      contractDataSource,
+      merkleTrees,
+      globals,
+      metrics,
+      simulatorFactory,
+    );
+    tester.avmSimulator = avmSimulator;
+    return tester;
+  }
+
+  public override async close(): Promise<void> {
+    const results = await Promise.allSettled([super.close(), this.bbJsFactory.destroy()]);
+    const errors = results.flatMap(result => (result.status === 'rejected' ? [result.reason] : []));
+    if (errors.length > 0) {
+      throw new AggregateError(errors, `Failed to close AVM proving tester`);
+    }
   }
 
   /**

package/src/prover/client/bb_private_kernel_prover.ts

@@ -9,12 +9,20 @@ import {
   convertPrivateKernelInit2OutputsFromWitnessMapWithAbi,
   convertPrivateKernelInit3InputsToWitnessMapWithAbi,
   convertPrivateKernelInit3OutputsFromWitnessMapWithAbi,
+  convertPrivateKernelInit4InputsToWitnessMapWithAbi,
+  convertPrivateKernelInit4OutputsFromWitnessMapWithAbi,
+  convertPrivateKernelInit5InputsToWitnessMapWithAbi,
+  convertPrivateKernelInit5OutputsFromWitnessMapWithAbi,
   convertPrivateKernelInitInputsToWitnessMapWithAbi,
   convertPrivateKernelInitOutputsFromWitnessMapWithAbi,
   convertPrivateKernelInner2InputsToWitnessMapWithAbi,
   convertPrivateKernelInner2OutputsFromWitnessMapWithAbi,
   convertPrivateKernelInner3InputsToWitnessMapWithAbi,
   convertPrivateKernelInner3OutputsFromWitnessMapWithAbi,
+  convertPrivateKernelInner4InputsToWitnessMapWithAbi,
+  convertPrivateKernelInner4OutputsFromWitnessMapWithAbi,
+  convertPrivateKernelInner5InputsToWitnessMapWithAbi,
+  convertPrivateKernelInner5OutputsFromWitnessMapWithAbi,
   convertPrivateKernelInnerInputsToWitnessMapWithAbi,
   convertPrivateKernelInnerOutputsFromWitnessMapWithAbi,
   convertPrivateKernelResetInputsToWitnessMapWithAbi,
@@ -43,9 +51,13 @@ import type {
   PrivateKernelCircuitPublicInputs,
   PrivateKernelInit2CircuitPrivateInputs,
   PrivateKernelInit3CircuitPrivateInputs,
+  PrivateKernelInit4CircuitPrivateInputs,
+  PrivateKernelInit5CircuitPrivateInputs,
   PrivateKernelInitCircuitPrivateInputs,
   PrivateKernelInner2CircuitPrivateInputs,
   PrivateKernelInner3CircuitPrivateInputs,
+  PrivateKernelInner4CircuitPrivateInputs,
+  PrivateKernelInner5CircuitPrivateInputs,
   PrivateKernelInnerCircuitPrivateInputs,
   PrivateKernelResetCircuitPrivateInputs,
   PrivateKernelResetTailCircuitPrivateInputs,
@@ -136,6 +148,50 @@ export abstract class BBPrivateKernelProver implements PrivateKernelProver {
     );
   }
 
+  public async generateInit4Output(
+    inputs: PrivateKernelInit4CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.generateCircuitOutput(
+      inputs,
+      'PrivateKernelInit4Artifact',
+      convertPrivateKernelInit4InputsToWitnessMapWithAbi,
+      convertPrivateKernelInit4OutputsFromWitnessMapWithAbi,
+    );
+  }
+
+  public async simulateInit4(
+    inputs: PrivateKernelInit4CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.simulateCircuitOutput(
+      inputs,
+      'PrivateKernelInit4Artifact',
+      convertPrivateKernelInit4InputsToWitnessMapWithAbi,
+      convertPrivateKernelInit4OutputsFromWitnessMapWithAbi,
+    );
+  }
+
+  public async generateInit5Output(
+    inputs: PrivateKernelInit5CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.generateCircuitOutput(
+      inputs,
+      'PrivateKernelInit5Artifact',
+      convertPrivateKernelInit5InputsToWitnessMapWithAbi,
+      convertPrivateKernelInit5OutputsFromWitnessMapWithAbi,
+    );
+  }
+
+  public async simulateInit5(
+    inputs: PrivateKernelInit5CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.simulateCircuitOutput(
+      inputs,
+      'PrivateKernelInit5Artifact',
+      convertPrivateKernelInit5InputsToWitnessMapWithAbi,
+      convertPrivateKernelInit5OutputsFromWitnessMapWithAbi,
+    );
+  }
+
   public async generateInnerOutput(
     inputs: PrivateKernelInnerCircuitPrivateInputs,
   ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
@@ -202,6 +258,50 @@ export abstract class BBPrivateKernelProver implements PrivateKernelProver {
     );
   }
 
+  public async generateInner4Output(
+    inputs: PrivateKernelInner4CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.generateCircuitOutput(
+      inputs,
+      'PrivateKernelInner4Artifact',
+      convertPrivateKernelInner4InputsToWitnessMapWithAbi,
+      convertPrivateKernelInner4OutputsFromWitnessMapWithAbi,
+    );
+  }
+
+  public async simulateInner4(
+    inputs: PrivateKernelInner4CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.simulateCircuitOutput(
+      inputs,
+      'PrivateKernelInner4Artifact',
+      convertPrivateKernelInner4InputsToWitnessMapWithAbi,
+      convertPrivateKernelInner4OutputsFromWitnessMapWithAbi,
+    );
+  }
+
+  public async generateInner5Output(
+    inputs: PrivateKernelInner5CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.generateCircuitOutput(
+      inputs,
+      'PrivateKernelInner5Artifact',
+      convertPrivateKernelInner5InputsToWitnessMapWithAbi,
+      convertPrivateKernelInner5OutputsFromWitnessMapWithAbi,
+    );
+  }
+
+  public async simulateInner5(
+    inputs: PrivateKernelInner5CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.simulateCircuitOutput(
+      inputs,
+      'PrivateKernelInner5Artifact',
+      convertPrivateKernelInner5InputsToWitnessMapWithAbi,
+      convertPrivateKernelInner5OutputsFromWitnessMapWithAbi,
+    );
+  }
+
   public async generateResetOutput(
     inputs: PrivateKernelResetCircuitPrivateInputs,
   ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
@@ -387,6 +487,7 @@ export abstract class BBPrivateKernelProver implements PrivateKernelProver {
       executionSteps.map(step => ungzip(step.bytecode)),
       barretenberg,
       executionSteps.map(step => step.functionName),
+      executionSteps.map(step => step.kind),
     );
 
     // Use compressed prove path to get both proof fields and compressed proof bytes
@@ -413,13 +514,17 @@ export abstract class BBPrivateKernelProver implements PrivateKernelProver {
     return proofWithPubInputs;
   }
 
-  public async computeGateCountForCircuit(_bytecode: Buffer, _circuitName: string): Promise<number> {
+  public async computeGateCountForCircuit(
+    _bytecode: Buffer,
+    _circuitName: string,
+    _circuitKind: PrivateExecutionStep['kind'],
+  ): Promise<number> {
     // Note we do not pass the vk to the backend. This is unneeded for gate counts.
     const barretenberg = await Barretenberg.initSingleton({
       ...this.options,
       logger: this.options.logger?.[(process.env.LOG_LEVEL as LogLevel) || 'verbose'],
     });
-    const backend = new AztecClientBackend([ungzip(_bytecode)], barretenberg, [_circuitName]);
+    const backend = new AztecClientBackend([ungzip(_bytecode)], barretenberg, [_circuitName], [_circuitKind]);
     const gateCount = await backend.gates();
     return gateCount[0];
   }