@aztec/bb-prover 0.55.1 → 0.56.0

package/src/test/test_circuit_prover.ts

@@ -1,8 +1,6 @@
 import {
   type AvmProofAndVerificationKey,
   type PublicInputsAndRecursiveProof,
-  type PublicKernelNonTailRequest,
-  type PublicKernelTailRequest,
   type ServerCircuitProver,
   makePublicInputsAndRecursiveProof,
 } from '@aztec/circuit-types';
@@ -22,7 +20,10 @@ import {
   type PrivateKernelEmptyInputData,
   PrivateKernelEmptyInputs,
   type Proof,
+  type PublicKernelCircuitPrivateInputs,
   type PublicKernelCircuitPublicInputs,
+  type PublicKernelInnerCircuitPrivateInputs,
+  type PublicKernelTailCircuitPrivateInputs,
   RECURSIVE_PROOF_LENGTH,
   type RecursiveProof,
   RootParityInput,
@@ -31,6 +32,7 @@ import {
   type RootRollupPublicInputs,
   TUBE_PROOF_LENGTH,
   type TubeInputs,
+  type VMCircuitPublicInputs,
   VerificationKeyData,
   makeEmptyProof,
   makeEmptyRecursiveProof,
@@ -61,6 +63,10 @@ import {
   convertSimulatedBaseRollupInputsToWitnessMap,
   convertSimulatedBaseRollupOutputsFromWitnessMap,
   convertSimulatedPrivateKernelEmptyOutputsFromWitnessMap,
+  convertSimulatedPublicInnerInputsToWitnessMap,
+  convertSimulatedPublicInnerOutputFromWitnessMap,
+  convertSimulatedPublicMergeInputsToWitnessMap,
+  convertSimulatedPublicMergeOutputFromWitnessMap,
   convertSimulatedPublicTailInputsToWitnessMap,
   convertSimulatedPublicTailOutputFromWitnessMap,
   getVKSiblingPath,
@@ -69,8 +75,7 @@ import { type SimulationProvider, WASMSimulator, emitCircuitSimulationStats } fr
 import { type TelemetryClient, 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.
@@ -342,6 +347,12 @@ export class TestCircuitProver implements ServerCircuitProver {
     );
   }
 
+  public getBlockRootRollupFinalProof(
+    input: BlockRootRollupInputs,
+  ): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>> {
+    return this.getBlockRootRollupProof(input);
+  }
+
   /**
    * Simulates the block merge rollup circuit from its inputs.
    * @param input - Inputs to the circuit.
@@ -413,29 +424,53 @@ export class TestCircuitProver implements ServerCircuitProver {
     );
   }
 
-  @trackSpan('TestCircuitProver.getPublicKernelProof')
-  public async getPublicKernelProof(
-    kernelRequest: PublicKernelNonTailRequest,
-  ): Promise<PublicInputsAndRecursiveProof<PublicKernelCircuitPublicInputs>> {
+  @trackSpan('TestCircuitProver.getPublicKernelInnerProof')
+  public async getPublicKernelInnerProof(
+    inputs: PublicKernelInnerCircuitPrivateInputs,
+  ): Promise<PublicInputsAndRecursiveProof<VMCircuitPublicInputs>> {
     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 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(),
+      inputs.toBuffer().length,
+      result.toBuffer().length,
+      this.logger,
     );
+    await this.delay();
+    return makePublicInputsAndRecursiveProof(
+      result,
+      makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
+      ProtocolCircuitVks[artifact],
+    );
+  }
+
+  @trackSpan('TestCircuitProver.getPublicKernelMergeProof')
+  public async getPublicKernelMergeProof(
+    inputs: PublicKernelCircuitPrivateInputs,
+  ): Promise<PublicInputsAndRecursiveProof<PublicKernelCircuitPublicInputs>> {
+    const timer = new Timer();
+
+    const artifact = 'PublicKernelMergeArtifact';
+    const circuitName = mapProtocolArtifactNameToCircuitName(artifact);
+
+    const witnessMap = convertSimulatedPublicMergeInputsToWitnessMap(inputs);
+    const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts[artifact]);
 
-    const result = kernelOps.convertOutputs(witness);
-    const circuitName = mapPublicKernelToCircuitName(kernelRequest.type);
+    const result = convertSimulatedPublicMergeOutputFromWitnessMap(witness);
     this.instrumentation.recordDuration('simulationDuration', circuitName, timer);
     emitCircuitSimulationStats(
       circuitName,
       timer.ms(),
-      kernelRequest.inputs.toBuffer().length,
+      inputs.toBuffer().length,
       result.toBuffer().length,
       this.logger,
     );
@@ -443,28 +478,29 @@ export class TestCircuitProver implements ServerCircuitProver {
     return makePublicInputsAndRecursiveProof(
       result,
       makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
-      ProtocolCircuitVks[kernelOps.artifact],
+      ProtocolCircuitVks[artifact],
     );
   }
 
   @trackSpan('TestCircuitProver.getPublicTailProof')
   public async getPublicTailProof(
-    kernelRequest: PublicKernelTailRequest,
+    inputs: PublicKernelTailCircuitPrivateInputs,
   ): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>> {
     const timer = new Timer();
-    const witnessMap = convertSimulatedPublicTailInputsToWitnessMap(kernelRequest.inputs);
+
+    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);
+    this.instrumentation.recordDuration('simulationDuration', circuitName, timer);
     emitCircuitSimulationStats(
-      'public-kernel-tail',
+      circuitName,
       timer.ms(),
-      kernelRequest.inputs.toBuffer().length,
+      inputs.toBuffer().length,
       result.toBuffer().length,
       this.logger,
     );
@@ -472,7 +508,7 @@ export class TestCircuitProver implements ServerCircuitProver {
     return makePublicInputsAndRecursiveProof(
       result,
       makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
-      ProtocolCircuitVks['PublicKernelTailArtifact'],
+      ProtocolCircuitVks[artifact],
     );
   }
 

package/dest/mappings/mappings.d.ts

@@ -1,13 +0,0 @@
-import { PublicKernelType } from '@aztec/circuit-types';
-import { type PublicKernelCircuitPrivateInputs, type PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
-import { type ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
-import { type WitnessMap } from '@noir-lang/types';
-export type PublicKernelProvingOps = {
-    artifact: ServerProtocolArtifact;
-    convertInputs: (inputs: PublicKernelCircuitPrivateInputs) => WitnessMap;
-    convertOutputs: (outputs: WitnessMap) => PublicKernelCircuitPublicInputs;
-};
-export type KernelTypeToArtifact = Record<PublicKernelType, PublicKernelProvingOps | undefined>;
-export declare const SimulatedPublicKernelArtifactMapping: KernelTypeToArtifact;
-export declare const PublicKernelArtifactMapping: KernelTypeToArtifact;
-//# sourceMappingURL=mappings.d.ts.map

package/dest/mappings/mappings.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mappings.d.ts","sourceRoot":"","sources":["../../src/mappings/mappings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,gCAAgC,EAAE,KAAK,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AACjH,OAAO,EACL,KAAK,sBAAsB,EAa5B,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,aAAa,EAAE,CAAC,MAAM,EAAE,gCAAgC,KAAK,UAAU,CAAC;IACxE,cAAc,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,+BAA+B,CAAC;CAC1E,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,gBAAgB,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;AAEhG,eAAO,MAAM,oCAAoC,EAAE,oBAkBlD,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,oBAkBzC,CAAC"}

package/dest/mappings/mappings.js

@@ -1,41 +0,0 @@
-import { PublicKernelType } from '@aztec/circuit-types';
-import { convertPublicInnerInputsToWitnessMap, convertPublicInnerOutputFromWitnessMap, convertPublicSetupInputsToWitnessMap, convertPublicSetupOutputFromWitnessMap, convertPublicTeardownInputsToWitnessMap, convertPublicTeardownOutputFromWitnessMap, convertSimulatedPublicInnerInputsToWitnessMap, convertSimulatedPublicInnerOutputFromWitnessMap, convertSimulatedPublicSetupInputsToWitnessMap, convertSimulatedPublicSetupOutputFromWitnessMap, convertSimulatedPublicTeardownInputsToWitnessMap, convertSimulatedPublicTeardownOutputFromWitnessMap, } from '@aztec/noir-protocol-circuits-types';
-export const SimulatedPublicKernelArtifactMapping = {
-    [PublicKernelType.NON_PUBLIC]: undefined,
-    [PublicKernelType.APP_LOGIC]: {
-        artifact: 'PublicKernelAppLogicArtifact',
-        convertInputs: convertSimulatedPublicInnerInputsToWitnessMap,
-        convertOutputs: convertSimulatedPublicInnerOutputFromWitnessMap,
-    },
-    [PublicKernelType.SETUP]: {
-        artifact: 'PublicKernelSetupArtifact',
-        convertInputs: convertSimulatedPublicSetupInputsToWitnessMap,
-        convertOutputs: convertSimulatedPublicSetupOutputFromWitnessMap,
-    },
-    [PublicKernelType.TEARDOWN]: {
-        artifact: 'PublicKernelTeardownArtifact',
-        convertInputs: convertSimulatedPublicTeardownInputsToWitnessMap,
-        convertOutputs: convertSimulatedPublicTeardownOutputFromWitnessMap,
-    },
-    [PublicKernelType.TAIL]: undefined,
-};
-export const PublicKernelArtifactMapping = {
-    [PublicKernelType.NON_PUBLIC]: undefined,
-    [PublicKernelType.APP_LOGIC]: {
-        artifact: 'PublicKernelAppLogicArtifact',
-        convertInputs: convertPublicInnerInputsToWitnessMap,
-        convertOutputs: convertPublicInnerOutputFromWitnessMap,
-    },
-    [PublicKernelType.SETUP]: {
-        artifact: 'PublicKernelSetupArtifact',
-        convertInputs: convertPublicSetupInputsToWitnessMap,
-        convertOutputs: convertPublicSetupOutputFromWitnessMap,
-    },
-    [PublicKernelType.TEARDOWN]: {
-        artifact: 'PublicKernelTeardownArtifact',
-        convertInputs: convertPublicTeardownInputsToWitnessMap,
-        convertOutputs: convertPublicTeardownOutputFromWitnessMap,
-    },
-    [PublicKernelType.TAIL]: undefined,
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFwcGluZ3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWFwcGluZ3MvbWFwcGluZ3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFeEQsT0FBTyxFQUVMLG9DQUFvQyxFQUNwQyxzQ0FBc0MsRUFDdEMsb0NBQW9DLEVBQ3BDLHNDQUFzQyxFQUN0Qyx1Q0FBdUMsRUFDdkMseUNBQXlDLEVBQ3pDLDZDQUE2QyxFQUM3QywrQ0FBK0MsRUFDL0MsNkNBQTZDLEVBQzdDLCtDQUErQyxFQUMvQyxnREFBZ0QsRUFDaEQsa0RBQWtELEdBQ25ELE1BQU0scUNBQXFDLENBQUM7QUFZN0MsTUFBTSxDQUFDLE1BQU0sb0NBQW9DLEdBQXlCO0lBQ3hFLENBQUMsZ0JBQWdCLENBQUMsVUFBVSxDQUFDLEVBQUUsU0FBUztJQUN4QyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxFQUFFO1FBQzVCLFFBQVEsRUFBRSw4QkFBOEI7UUFDeEMsYUFBYSxFQUFFLDZDQUE2QztRQUM1RCxjQUFjLEVBQUUsK0NBQStDO0tBQ2hFO0lBQ0QsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsRUFBRTtRQUN4QixRQUFRLEVBQUUsMkJBQTJCO1FBQ3JDLGFBQWEsRUFBRSw2Q0FBNkM7UUFDNUQsY0FBYyxFQUFFLCtDQUErQztLQUNoRTtJQUNELENBQUMsZ0JBQWdCLENBQUMsUUFBUSxDQUFDLEVBQUU7UUFDM0IsUUFBUSxFQUFFLDhCQUE4QjtRQUN4QyxhQUFhLEVBQUUsZ0RBQWdEO1FBQy9ELGNBQWMsRUFBRSxrREFBa0Q7S0FDbkU7SUFDRCxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxFQUFFLFNBQVM7Q0FDbkMsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLDJCQUEyQixHQUF5QjtJQUMvRCxDQUFDLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxFQUFFLFNBQVM7SUFDeEMsQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsRUFBRTtRQUM1QixRQUFRLEVBQUUsOEJBQThCO1FBQ3hDLGFBQWEsRUFBRSxvQ0FBb0M7UUFDbkQsY0FBYyxFQUFFLHNDQUFzQztLQUN2RDtJQUNELENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLEVBQUU7UUFDeEIsUUFBUSxFQUFFLDJCQUEyQjtRQUNyQyxhQUFhLEVBQUUsb0NBQW9DO1FBQ25ELGNBQWMsRUFBRSxzQ0FBc0M7S0FDdkQ7SUFDRCxDQUFDLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxFQUFFO1FBQzNCLFFBQVEsRUFBRSw4QkFBOEI7UUFDeEMsYUFBYSxFQUFFLHVDQUF1QztRQUN0RCxjQUFjLEVBQUUseUNBQXlDO0tBQzFEO0lBQ0QsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsRUFBRSxTQUFTO0NBQ25DLENBQUMifQ==

package/src/mappings/mappings.ts

@@ -1,67 +0,0 @@
-import { PublicKernelType } from '@aztec/circuit-types';
-import { type PublicKernelCircuitPrivateInputs, type PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
-import {
-  type ServerProtocolArtifact,
-  convertPublicInnerInputsToWitnessMap,
-  convertPublicInnerOutputFromWitnessMap,
-  convertPublicSetupInputsToWitnessMap,
-  convertPublicSetupOutputFromWitnessMap,
-  convertPublicTeardownInputsToWitnessMap,
-  convertPublicTeardownOutputFromWitnessMap,
-  convertSimulatedPublicInnerInputsToWitnessMap,
-  convertSimulatedPublicInnerOutputFromWitnessMap,
-  convertSimulatedPublicSetupInputsToWitnessMap,
-  convertSimulatedPublicSetupOutputFromWitnessMap,
-  convertSimulatedPublicTeardownInputsToWitnessMap,
-  convertSimulatedPublicTeardownOutputFromWitnessMap,
-} from '@aztec/noir-protocol-circuits-types';
-
-import { type WitnessMap } from '@noir-lang/types';
-
-export type PublicKernelProvingOps = {
-  artifact: ServerProtocolArtifact;
-  convertInputs: (inputs: PublicKernelCircuitPrivateInputs) => WitnessMap;
-  convertOutputs: (outputs: WitnessMap) => PublicKernelCircuitPublicInputs;
-};
-
-export type KernelTypeToArtifact = Record<PublicKernelType, PublicKernelProvingOps | undefined>;
-
-export const SimulatedPublicKernelArtifactMapping: KernelTypeToArtifact = {
-  [PublicKernelType.NON_PUBLIC]: undefined,
-  [PublicKernelType.APP_LOGIC]: {
-    artifact: 'PublicKernelAppLogicArtifact',
-    convertInputs: convertSimulatedPublicInnerInputsToWitnessMap,
-    convertOutputs: convertSimulatedPublicInnerOutputFromWitnessMap,
-  },
-  [PublicKernelType.SETUP]: {
-    artifact: 'PublicKernelSetupArtifact',
-    convertInputs: convertSimulatedPublicSetupInputsToWitnessMap,
-    convertOutputs: convertSimulatedPublicSetupOutputFromWitnessMap,
-  },
-  [PublicKernelType.TEARDOWN]: {
-    artifact: 'PublicKernelTeardownArtifact',
-    convertInputs: convertSimulatedPublicTeardownInputsToWitnessMap,
-    convertOutputs: convertSimulatedPublicTeardownOutputFromWitnessMap,
-  },
-  [PublicKernelType.TAIL]: undefined,
-};
-
-export const PublicKernelArtifactMapping: KernelTypeToArtifact = {
-  [PublicKernelType.NON_PUBLIC]: undefined,
-  [PublicKernelType.APP_LOGIC]: {
-    artifact: 'PublicKernelAppLogicArtifact',
-    convertInputs: convertPublicInnerInputsToWitnessMap,
-    convertOutputs: convertPublicInnerOutputFromWitnessMap,
-  },
-  [PublicKernelType.SETUP]: {
-    artifact: 'PublicKernelSetupArtifact',
-    convertInputs: convertPublicSetupInputsToWitnessMap,
-    convertOutputs: convertPublicSetupOutputFromWitnessMap,
-  },
-  [PublicKernelType.TEARDOWN]: {
-    artifact: 'PublicKernelTeardownArtifact',
-    convertInputs: convertPublicTeardownInputsToWitnessMap,
-    convertOutputs: convertPublicTeardownOutputFromWitnessMap,
-  },
-  [PublicKernelType.TAIL]: undefined,
-};