@aztec/bb-prover 0.55.0 → 0.56.0

package/dest/test/test_circuit_prover.js

@@ -4,12 +4,11 @@ import { AvmVerificationKeyData, EmptyNestedData, NESTED_RECURSIVE_PROOF_LENGTH,
 import { createDebugLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
 import { Timer } from '@aztec/foundation/timer';
-import { ProtocolCircuitVkIndexes, ProtocolCircuitVks, SimulatedServerCircuitArtifacts, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap, convertBlockMergeRollupInputsToWitnessMap, convertBlockMergeRollupOutputsFromWitnessMap, convertBlockRootRollupInputsToWitnessMap, convertBlockRootRollupOutputsFromWitnessMap, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap, convertPrivateKernelEmptyInputsToWitnessMap, convertPrivateKernelEmptyOutputsFromWitnessMap, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap, convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap, convertSimulatedBaseRollupInputsToWitnessMap, convertSimulatedBaseRollupOutputsFromWitnessMap, convertSimulatedPrivateKernelEmptyOutputsFromWitnessMap, convertSimulatedPublicTailInputsToWitnessMap, convertSimulatedPublicTailOutputFromWitnessMap, getVKSiblingPath, } from '@aztec/noir-protocol-circuits-types';
+import { ProtocolCircuitVkIndexes, ProtocolCircuitVks, SimulatedServerCircuitArtifacts, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap, convertBlockMergeRollupInputsToWitnessMap, convertBlockMergeRollupOutputsFromWitnessMap, convertBlockRootRollupInputsToWitnessMap, convertBlockRootRollupOutputsFromWitnessMap, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap, convertPrivateKernelEmptyInputsToWitnessMap, convertPrivateKernelEmptyOutputsFromWitnessMap, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap, convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap, convertSimulatedBaseRollupInputsToWitnessMap, convertSimulatedBaseRollupOutputsFromWitnessMap, convertSimulatedPrivateKernelEmptyOutputsFromWitnessMap, convertSimulatedPublicInnerInputsToWitnessMap, convertSimulatedPublicInnerOutputFromWitnessMap, convertSimulatedPublicMergeInputsToWitnessMap, convertSimulatedPublicMergeOutputFromWitnessMap, convertSimulatedPublicTailInputsToWitnessMap, convertSimulatedPublicTailOutputFromWitnessMap, getVKSiblingPath, } from '@aztec/noir-protocol-circuits-types';
 import { WASMSimulator, emitCircuitSimulationStats } from '@aztec/simulator';
 import { trackSpan } from '@aztec/telemetry-client';
 import { ProverInstrumentation } from '../instrumentation.js';
-import { SimulatedPublicKernelArtifactMapping } from '../mappings/mappings.js';
-import { mapPublicKernelToCircuitName } from '../stats.js';
+import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
 /**
  * A class for use in testing situations (e2e, unit test, etc) and temporarily for assembling a block in the sequencer.
  * Simulates circuits using the most efficient method and performs no proving.
@@ -24,7 +23,8 @@ let TestCircuitProver = (() => {
     let _getBlockRootRollupProof_decorators;
     let _getBlockMergeRollupProof_decorators;
     let _getRootRollupProof_decorators;
-    let _getPublicKernelProof_decorators;
+    let _getPublicKernelInnerProof_decorators;
+    let _getPublicKernelMergeProof_decorators;
     let _getPublicTailProof_decorators;
     return _a = class TestCircuitProver {
             constructor(telemetry, simulationProvider, opts = { proverTestDelayMs: 0 }) {
@@ -143,6 +143,9 @@ let TestCircuitProver = (() => {
                 emitCircuitSimulationStats('block-root-rollup', timer.ms(), input.toBuffer().length, result.toBuffer().length, this.logger);
                 return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['BlockRootRollupArtifact']);
             }
+            getBlockRootRollupFinalProof(input) {
+                return this.getBlockRootRollupProof(input);
+            }
             /**
              * Simulates the block merge rollup circuit from its inputs.
              * @param input - Inputs to the circuit.
@@ -174,31 +177,42 @@ let TestCircuitProver = (() => {
                 await this.delay();
                 return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['RootRollupArtifact']);
             }
-            async getPublicKernelProof(kernelRequest) {
+            async getPublicKernelInnerProof(inputs) {
                 const timer = new Timer();
-                const kernelOps = SimulatedPublicKernelArtifactMapping[kernelRequest.type];
-                if (kernelOps === undefined) {
-                    throw new Error(`Unable to prove for kernel type ${kernelRequest.type}`);
-                }
-                const witnessMap = kernelOps.convertInputs(kernelRequest.inputs);
-                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts[kernelOps.artifact]);
-                const result = kernelOps.convertOutputs(witness);
-                const circuitName = mapPublicKernelToCircuitName(kernelRequest.type);
+                const artifact = 'PublicKernelInnerArtifact';
+                const circuitName = mapProtocolArtifactNameToCircuitName(artifact);
+                const witnessMap = convertSimulatedPublicInnerInputsToWitnessMap(inputs);
+                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts[artifact]);
+                const result = convertSimulatedPublicInnerOutputFromWitnessMap(witness);
                 this.instrumentation.recordDuration('simulationDuration', circuitName, timer);
-                emitCircuitSimulationStats(circuitName, timer.ms(), kernelRequest.inputs.toBuffer().length, result.toBuffer().length, this.logger);
+                emitCircuitSimulationStats(circuitName, timer.ms(), inputs.toBuffer().length, result.toBuffer().length, this.logger);
                 await this.delay();
-                return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks[kernelOps.artifact]);
+                return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks[artifact]);
             }
-            async getPublicTailProof(kernelRequest) {
+            async getPublicKernelMergeProof(inputs) {
                 const timer = new Timer();
-                const witnessMap = convertSimulatedPublicTailInputsToWitnessMap(kernelRequest.inputs);
+                const artifact = 'PublicKernelMergeArtifact';
+                const circuitName = mapProtocolArtifactNameToCircuitName(artifact);
+                const witnessMap = convertSimulatedPublicMergeInputsToWitnessMap(inputs);
+                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts[artifact]);
+                const result = convertSimulatedPublicMergeOutputFromWitnessMap(witness);
+                this.instrumentation.recordDuration('simulationDuration', circuitName, timer);
+                emitCircuitSimulationStats(circuitName, timer.ms(), inputs.toBuffer().length, result.toBuffer().length, this.logger);
+                await this.delay();
+                return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks[artifact]);
+            }
+            async getPublicTailProof(inputs) {
+                const timer = new Timer();
+                const artifact = 'PublicKernelTailArtifact';
+                const circuitName = mapProtocolArtifactNameToCircuitName(artifact);
+                const witnessMap = convertSimulatedPublicTailInputsToWitnessMap(inputs);
                 // use WASM here as it is faster for small circuits
-                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts['PublicKernelTailArtifact']);
+                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts[artifact]);
                 const result = convertSimulatedPublicTailOutputFromWitnessMap(witness);
-                this.instrumentation.recordDuration('simulationDuration', 'public-kernel-tail', timer);
-                emitCircuitSimulationStats('public-kernel-tail', timer.ms(), kernelRequest.inputs.toBuffer().length, result.toBuffer().length, this.logger);
+                this.instrumentation.recordDuration('simulationDuration', circuitName, timer);
+                emitCircuitSimulationStats(circuitName, timer.ms(), inputs.toBuffer().length, result.toBuffer().length, this.logger);
                 await this.delay();
-                return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['PublicKernelTailArtifact']);
+                return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks[artifact]);
             }
             async getAvmProof(_inputs) {
                 // We can't simulate the AVM because we don't have enough context to do so (e.g., DBs).
@@ -226,7 +240,8 @@ let TestCircuitProver = (() => {
             _getBlockRootRollupProof_decorators = [trackSpan('TestCircuitProver.getBlockRootRollupProof')];
             _getBlockMergeRollupProof_decorators = [trackSpan('TestCircuitProver.getBlockMergeRollupProof')];
             _getRootRollupProof_decorators = [trackSpan('TestCircuitProver.getRootRollupProof')];
-            _getPublicKernelProof_decorators = [trackSpan('TestCircuitProver.getPublicKernelProof')];
+            _getPublicKernelInnerProof_decorators = [trackSpan('TestCircuitProver.getPublicKernelInnerProof')];
+            _getPublicKernelMergeProof_decorators = [trackSpan('TestCircuitProver.getPublicKernelMergeProof')];
             _getPublicTailProof_decorators = [trackSpan('TestCircuitProver.getPublicTailProof')];
             __esDecorate(_a, null, _getBaseParityProof_decorators, { kind: "method", name: "getBaseParityProof", static: false, private: false, access: { has: obj => "getBaseParityProof" in obj, get: obj => obj.getBaseParityProof }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _getRootParityProof_decorators, { kind: "method", name: "getRootParityProof", static: false, private: false, access: { has: obj => "getRootParityProof" in obj, get: obj => obj.getRootParityProof }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -235,11 +250,12 @@ let TestCircuitProver = (() => {
             __esDecorate(_a, null, _getBlockRootRollupProof_decorators, { kind: "method", name: "getBlockRootRollupProof", static: false, private: false, access: { has: obj => "getBlockRootRollupProof" in obj, get: obj => obj.getBlockRootRollupProof }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _getBlockMergeRollupProof_decorators, { kind: "method", name: "getBlockMergeRollupProof", static: false, private: false, access: { has: obj => "getBlockMergeRollupProof" in obj, get: obj => obj.getBlockMergeRollupProof }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _getRootRollupProof_decorators, { kind: "method", name: "getRootRollupProof", static: false, private: false, access: { has: obj => "getRootRollupProof" in obj, get: obj => obj.getRootRollupProof }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _getPublicKernelProof_decorators, { kind: "method", name: "getPublicKernelProof", static: false, private: false, access: { has: obj => "getPublicKernelProof" in obj, get: obj => obj.getPublicKernelProof }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _getPublicKernelInnerProof_decorators, { kind: "method", name: "getPublicKernelInnerProof", static: false, private: false, access: { has: obj => "getPublicKernelInnerProof" in obj, get: obj => obj.getPublicKernelInnerProof }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _getPublicKernelMergeProof_decorators, { kind: "method", name: "getPublicKernelMergeProof", static: false, private: false, access: { has: obj => "getPublicKernelMergeProof" in obj, get: obj => obj.getPublicKernelMergeProof }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _getPublicTailProof_decorators, { kind: "method", name: "getPublicTailProof", static: false, private: false, access: { has: obj => "getPublicTailProof" in obj, get: obj => obj.getPublicTailProof }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         })(),
         _a;
 })();
 export { TestCircuitProver };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test_circuit_prover.js","sourceRoot":"","sources":["../../src/test/test_circuit_prover.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test_circuit_prover.js","sourceRoot":"","sources":["../../src/test/test_circuit_prover.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb-prover",
-  "version": "0.55.0",
+  "version": "0.56.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js"
@@ -59,12 +59,12 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.55.0",
-    "@aztec/circuits.js": "0.55.0",
-    "@aztec/foundation": "0.55.0",
-    "@aztec/noir-protocol-circuits-types": "0.55.0",
-    "@aztec/simulator": "0.55.0",
-    "@aztec/telemetry-client": "0.55.0",
+    "@aztec/circuit-types": "0.56.0",
+    "@aztec/circuits.js": "0.56.0",
+    "@aztec/foundation": "0.56.0",
+    "@aztec/noir-protocol-circuits-types": "0.56.0",
+    "@aztec/simulator": "0.56.0",
+    "@aztec/telemetry-client": "0.56.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@noir-lang/types": "portal:../../noir/packages/types",
@@ -74,6 +74,7 @@
   },
   "devDependencies": {
     "@aztec/ethereum": "workspace:^",
+    "@aztec/types": "workspace:^",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/memdown": "^3.0.0",

package/src/honk.ts

@@ -2,7 +2,10 @@ import { type ProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
 
 export type UltraHonkFlavor = 'ultra_honk' | 'ultra_keccak_honk';
 
-const UltraKeccakHonkCircuits = ['BlockRootRollupArtifact'] as const;
+const UltraKeccakHonkCircuits = [
+  'BlockRootRollupFinalArtifact',
+  'RootRollupArtifact',
+] as const satisfies ProtocolArtifact[];
 type UltraKeccakHonkCircuits = (typeof UltraKeccakHonkCircuits)[number];
 type UltraHonkCircuits = Exclude<ProtocolArtifact, UltraKeccakHonkCircuits>;
 

package/src/index.ts

@@ -3,3 +3,5 @@ export * from './test/index.js';
 export * from './verifier/index.js';
 export * from './config.js';
 export * from './bb/execute.js';
+
+export { type ClientProtocolCircuitVerifier } from '@aztec/circuit-types';

package/src/prover/bb_prover.ts

@@ -2,8 +2,6 @@
 import {
   type AvmProofAndVerificationKey,
   type PublicInputsAndRecursiveProof,
-  type PublicKernelNonTailRequest,
-  type PublicKernelTailRequest,
   type ServerCircuitProver,
   makePublicInputsAndRecursiveProof,
 } from '@aztec/circuit-types';
@@ -27,7 +25,10 @@ import {
   type PrivateKernelEmptyInputData,
   PrivateKernelEmptyInputs,
   Proof,
+  type PublicKernelCircuitPrivateInputs,
   type PublicKernelCircuitPublicInputs,
+  type PublicKernelInnerCircuitPrivateInputs,
+  type PublicKernelTailCircuitPrivateInputs,
   RECURSIVE_PROOF_LENGTH,
   RecursiveProof,
   RootParityInput,
@@ -36,6 +37,7 @@ import {
   type RootRollupPublicInputs,
   TUBE_PROOF_LENGTH,
   type TubeInputs,
+  type VMCircuitPublicInputs,
   type VerificationKeyAsFields,
   type VerificationKeyData,
   makeRecursiveProofFromBinary,
@@ -59,6 +61,10 @@ import {
   convertMergeRollupOutputsFromWitnessMap,
   convertPrivateKernelEmptyInputsToWitnessMap,
   convertPrivateKernelEmptyOutputsFromWitnessMap,
+  convertPublicInnerInputsToWitnessMap,
+  convertPublicInnerOutputFromWitnessMap,
+  convertPublicMergeInputsToWitnessMap,
+  convertPublicMergeOutputFromWitnessMap,
   convertPublicTailInputsToWitnessMap,
   convertPublicTailOutputFromWitnessMap,
   convertRootParityInputsToWitnessMap,
@@ -94,7 +100,6 @@ import {
 import type { ACVMConfig, BBConfig } from '../config.js';
 import { type UltraHonkFlavor, getUltraHonkFlavorForCircuit } from '../honk.js';
 import { ProverInstrumentation } from '../instrumentation.js';
-import { PublicKernelArtifactMapping } from '../mappings/mappings.js';
 import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
 import { extractAvmVkData, extractVkData } from '../verification_key/verification_key_data.js';
 
@@ -206,47 +211,70 @@ export class BBNativeRollupProver implements ServerCircuitProver {
   }
 
   /**
-   * Requests that a public kernel circuit be executed and the proof generated
+   * Requests that a public kernel inner circuit be executed and the proof generated
    * @param kernelRequest - The object encapsulating the request for a proof
    * @returns The requested circuit's public inputs and proof
    */
-  @trackSpan('BBNativeRollupProver.getPublicKernelProof', kernelReq => ({
-    [Attributes.PROTOCOL_CIRCUIT_NAME]: mapProtocolArtifactNameToCircuitName(
-      PublicKernelArtifactMapping[kernelReq.type]!.artifact,
-    ),
-  }))
-  public async getPublicKernelProof(
-    kernelRequest: PublicKernelNonTailRequest,
+  @trackSpan('BBNativeRollupProver.getPublicKernelInnerProof', {
+    [Attributes.PROTOCOL_CIRCUIT_NAME]: 'public-kernel-inner',
+  })
+  public async getPublicKernelInnerProof(
+    inputs: PublicKernelInnerCircuitPrivateInputs,
+  ): Promise<PublicInputsAndRecursiveProof<VMCircuitPublicInputs>> {
+    const artifact = 'PublicKernelInnerArtifact';
+
+    const { circuitOutput, proof } = await this.createRecursiveProof(
+      inputs,
+      artifact,
+      NESTED_RECURSIVE_PROOF_LENGTH,
+      convertPublicInnerInputsToWitnessMap,
+      convertPublicInnerOutputFromWitnessMap,
+    );
+
+    const verificationKey = await this.getVerificationKeyDataForCircuit(artifact);
+
+    await this.verifyProof(artifact, proof.binaryProof);
+
+    return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
+  }
+
+  /**
+   * Requests that a public kernel merge circuit be executed and the proof generated
+   * @param kernelRequest - The object encapsulating the request for a proof
+   * @returns The requested circuit's public inputs and proof
+   */
+  @trackSpan('BBNativeRollupProver.getPublicKernelMergeProof', {
+    [Attributes.PROTOCOL_CIRCUIT_NAME]: 'public-kernel-merge',
+  })
+  public async getPublicKernelMergeProof(
+    inputs: PublicKernelCircuitPrivateInputs,
   ): Promise<PublicInputsAndRecursiveProof<PublicKernelCircuitPublicInputs>> {
-    const kernelOps = PublicKernelArtifactMapping[kernelRequest.type];
-    if (kernelOps === undefined) {
-      throw new Error(`Unable to prove kernel type ${kernelRequest.type}`);
-    }
+    const artifact = 'PublicKernelMergeArtifact';
 
     // We may need to convert the recursive proof into fields format
-    kernelRequest.inputs.previousKernel.proof = await this.ensureValidProof(
-      kernelRequest.inputs.previousKernel.proof,
-      kernelOps.artifact,
-      kernelRequest.inputs.previousKernel.vk,
+    inputs.previousKernel.proof = await this.ensureValidProof(
+      inputs.previousKernel.proof,
+      artifact,
+      inputs.previousKernel.vk,
     );
 
     await this.verifyWithKey(
-      getUltraHonkFlavorForCircuit(kernelOps.artifact),
-      kernelRequest.inputs.previousKernel.vk,
-      kernelRequest.inputs.previousKernel.proof.binaryProof,
+      getUltraHonkFlavorForCircuit(artifact),
+      inputs.previousKernel.vk,
+      inputs.previousKernel.proof.binaryProof,
     );
 
     const { circuitOutput, proof } = await this.createRecursiveProof(
-      kernelRequest.inputs,
-      kernelOps.artifact,
+      inputs,
+      artifact,
       NESTED_RECURSIVE_PROOF_LENGTH,
-      kernelOps.convertInputs,
-      kernelOps.convertOutputs,
+      convertPublicMergeInputsToWitnessMap,
+      convertPublicMergeOutputFromWitnessMap,
     );
 
-    const verificationKey = await this.getVerificationKeyDataForCircuit(kernelOps.artifact);
+    const verificationKey = await this.getVerificationKeyDataForCircuit(artifact);
 
-    await this.verifyProof(kernelOps.artifact, proof.binaryProof);
+    await this.verifyProof(artifact, proof.binaryProof);
 
     return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
   }
@@ -257,10 +285,10 @@ export class BBNativeRollupProver implements ServerCircuitProver {
    * @returns The requested circuit's public inputs and proof
    */
   public async getPublicTailProof(
-    kernelRequest: PublicKernelTailRequest,
+    inputs: PublicKernelTailCircuitPrivateInputs,
   ): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>> {
     const { circuitOutput, proof } = await this.createRecursiveProof(
-      kernelRequest.inputs,
+      inputs,
       'PublicKernelTailArtifact',
       NESTED_RECURSIVE_PROOF_LENGTH,
       convertPublicTailInputsToWitnessMap,
@@ -337,20 +365,43 @@ export class BBNativeRollupProver implements ServerCircuitProver {
   public async getBlockRootRollupProof(
     input: BlockRootRollupInputs,
   ): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>> {
-    // TODO(#7346): When batch rollups are integrated, we probably want the below to be this.createRecursiveProof
-    // since we will no longer be verifying it directly on L1
-    const { circuitOutput, proof } = await this.createProof(
+    const { circuitOutput, proof } = await this.createRecursiveProof(
       input,
       'BlockRootRollupArtifact',
+      NESTED_RECURSIVE_PROOF_LENGTH,
+      convertBlockRootRollupInputsToWitnessMap,
+      convertBlockRootRollupOutputsFromWitnessMap,
+    );
+
+    const verificationKey = await this.getVerificationKeyDataForCircuit('BlockRootRollupArtifact');
+
+    await this.verifyProof('BlockRootRollupArtifact', proof.binaryProof);
+
+    return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
+  }
+
+  /**
+   * Simulates the block root rollup circuit from its inputs.
+   * Returns a non-recursive proof to verify on L1.
+   * @dev TODO(palla/prover): This is a temporary workaround to get the proof to L1 with the old block flow.
+   * @param input - Inputs to the circuit.
+   * @returns The public inputs as outputs of the simulation.
+   */
+  public async getBlockRootRollupFinalProof(
+    input: BlockRootRollupInputs,
+  ): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>> {
+    const { circuitOutput, proof } = await this.createProof(
+      input,
+      'BlockRootRollupFinalArtifact',
       convertBlockRootRollupInputsToWitnessMap,
       convertBlockRootRollupOutputsFromWitnessMap,
     );
 
     const recursiveProof = makeRecursiveProofFromBinary(proof, NESTED_RECURSIVE_PROOF_LENGTH);
 
-    const verificationKey = await this.getVerificationKeyDataForCircuit('BlockRootRollupArtifact');
+    const verificationKey = await this.getVerificationKeyDataForCircuit('BlockRootRollupFinalArtifact');
 
-    await this.verifyProof('BlockRootRollupArtifact', proof);
+    await this.verifyProof('BlockRootRollupFinalArtifact', proof);
 
     return makePublicInputsAndRecursiveProof(circuitOutput, recursiveProof, verificationKey);
   }

package/src/stats.ts

@@ -1,8 +1,6 @@
 import type { CircuitName } from '@aztec/circuit-types/stats';
 import { type ClientProtocolArtifact, type ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
 
-export { mapPublicKernelToCircuitName } from '@aztec/circuit-types';
-
 export function mapProtocolArtifactNameToCircuitName(
   artifact: ServerProtocolArtifact | ClientProtocolArtifact,
 ): CircuitName {
@@ -21,12 +19,10 @@ export function mapProtocolArtifactNameToCircuitName(
       return 'block-merge-rollup';
     case 'RootRollupArtifact':
       return 'root-rollup';
-    case 'PublicKernelSetupArtifact':
-      return 'public-kernel-setup';
-    case 'PublicKernelAppLogicArtifact':
-      return 'public-kernel-app-logic';
-    case 'PublicKernelTeardownArtifact':
-      return 'public-kernel-teardown';
+    case 'PublicKernelInnerArtifact':
+      return 'public-kernel-inner';
+    case 'PublicKernelMergeArtifact':
+      return 'public-kernel-merge';
     case 'PublicKernelTailArtifact':
       return 'public-kernel-tail';
     case 'PrivateKernelInitArtifact':
@@ -53,6 +49,8 @@ export function mapProtocolArtifactNameToCircuitName(
       return 'empty-nested';
     case 'PrivateKernelEmptyArtifact':
       return 'private-kernel-empty';
+    case 'BlockRootRollupFinalArtifact':
+      return 'block-root-rollup-final';
     default: {
       const _foo: never = artifact;
       throw new Error(`Unknown circuit type: ${artifact}`);

package/src/test/index.ts

@@ -1,2 +1,3 @@
 export * from './test_circuit_prover.js';
 export * from './test_verifier.js';
+export * from './test_avm.js';

package/src/test/test_avm.ts

@@ -0,0 +1,85 @@
+import {
+  AztecAddress,
+  ContractStorageRead,
+  ContractStorageUpdateRequest,
+  Gas,
+  GlobalVariables,
+  Header,
+  L2ToL1Message,
+  LogHash,
+  MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL,
+  MAX_L2_TO_L1_MSGS_PER_CALL,
+  MAX_NOTE_HASHES_PER_CALL,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+  MAX_NULLIFIERS_PER_CALL,
+  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+  MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+  MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
+  MAX_PUBLIC_DATA_READS_PER_CALL,
+  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
+  MAX_UNENCRYPTED_LOGS_PER_CALL,
+  NoteHash,
+  Nullifier,
+  PublicCircuitPublicInputs,
+  PublicInnerCallRequest,
+  ReadRequest,
+  RevertCode,
+  TreeLeafReadRequest,
+} from '@aztec/circuits.js';
+import { computeVarArgsHash } from '@aztec/circuits.js/hash';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { type PublicExecutionResult } from '@aztec/simulator';
+
+// TODO: pub somewhere more usable - copied from abstract phase manager
+export function getPublicInputs(result: PublicExecutionResult): PublicCircuitPublicInputs {
+  return PublicCircuitPublicInputs.from({
+    callContext: result.executionRequest.callContext,
+    proverAddress: AztecAddress.ZERO,
+    argsHash: computeVarArgsHash(result.executionRequest.args),
+    noteHashes: padArrayEnd(result.noteHashes, NoteHash.empty(), MAX_NOTE_HASHES_PER_CALL),
+    nullifiers: padArrayEnd(result.nullifiers, Nullifier.empty(), MAX_NULLIFIERS_PER_CALL),
+    l2ToL1Msgs: padArrayEnd(result.l2ToL1Messages, L2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_CALL),
+    startSideEffectCounter: result.startSideEffectCounter,
+    endSideEffectCounter: result.endSideEffectCounter,
+    returnsHash: computeVarArgsHash(result.returnValues),
+    noteHashReadRequests: padArrayEnd(
+      result.noteHashReadRequests,
+      TreeLeafReadRequest.empty(),
+      MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+    ),
+    nullifierReadRequests: padArrayEnd(
+      result.nullifierReadRequests,
+      ReadRequest.empty(),
+      MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+    ),
+    nullifierNonExistentReadRequests: padArrayEnd(
+      result.nullifierNonExistentReadRequests,
+      ReadRequest.empty(),
+      MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+    ),
+    l1ToL2MsgReadRequests: padArrayEnd(
+      result.l1ToL2MsgReadRequests,
+      TreeLeafReadRequest.empty(),
+      MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL,
+    ),
+    contractStorageReads: padArrayEnd(
+      result.contractStorageReads,
+      ContractStorageRead.empty(),
+      MAX_PUBLIC_DATA_READS_PER_CALL,
+    ),
+    contractStorageUpdateRequests: padArrayEnd(
+      result.contractStorageUpdateRequests,
+      ContractStorageUpdateRequest.empty(),
+      MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
+    ),
+    publicCallRequests: padArrayEnd([], PublicInnerCallRequest.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL),
+    unencryptedLogsHashes: padArrayEnd(result.unencryptedLogsHashes, LogHash.empty(), MAX_UNENCRYPTED_LOGS_PER_CALL),
+    historicalHeader: Header.empty(),
+    globalVariables: GlobalVariables.empty(),
+    startGasLeft: Gas.from(result.startGasLeft),
+    endGasLeft: Gas.from(result.endGasLeft),
+    transactionFee: result.transactionFee,
+    // TODO(@just-mitch): need better mapping from simulator to revert code.
+    revertCode: result.reverted ? RevertCode.APP_LOGIC_REVERTED : RevertCode.OK,
+  });
+}