@aztec/bb-prover 0.60.0 → 0.62.0

package/dest/test/test_circuit_prover.js

@@ -1,10 +1,10 @@
 import { __esDecorate, __runInitializers } from "tslib";
 import { makeProofAndVerificationKey, makePublicInputsAndRecursiveProof, } from '@aztec/circuit-types';
-import { AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS, EmptyNestedData, NESTED_RECURSIVE_PROOF_LENGTH, PrivateKernelEmptyInputs, RECURSIVE_PROOF_LENGTH, RootParityInput, TUBE_PROOF_LENGTH, VerificationKeyData, makeEmptyProof, makeEmptyRecursiveProof, makeRecursiveProof, } from '@aztec/circuits.js';
+import { AVM_PROOF_LENGTH_IN_FIELDS, AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS, EmptyNestedData, NESTED_RECURSIVE_PROOF_LENGTH, PrivateKernelEmptyInputs, RECURSIVE_PROOF_LENGTH, RootParityInput, TUBE_PROOF_LENGTH, VerificationKeyData, makeEmptyRecursiveProof, makeRecursiveProof, } from '@aztec/circuits.js';
 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, convertEmptyBlockRootRollupInputsToWitnessMap, convertEmptyBlockRootRollupOutputsFromWitnessMap, 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 { ProtocolCircuitVkIndexes, ProtocolCircuitVks, SimulatedServerCircuitArtifacts, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap, convertBlockMergeRollupInputsToWitnessMap, convertBlockMergeRollupOutputsFromWitnessMap, convertBlockRootRollupInputsToWitnessMap, convertBlockRootRollupOutputsFromWitnessMap, convertEmptyBlockRootRollupInputsToWitnessMap, convertEmptyBlockRootRollupOutputsFromWitnessMap, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap, convertPrivateKernelEmptyInputsToWitnessMap, convertPrivateKernelEmptyOutputsFromWitnessMap, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap, convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap, convertSimulatedPrivateBaseRollupInputsToWitnessMap, convertSimulatedPrivateBaseRollupOutputsFromWitnessMap, convertSimulatedPrivateKernelEmptyOutputsFromWitnessMap, convertSimulatedPublicBaseRollupInputsToWitnessMap, convertSimulatedPublicBaseRollupOutputsFromWitnessMap, getVKSiblingPath, } from '@aztec/noir-protocol-circuits-types';
 import { WASMSimulator, emitCircuitSimulationStats } from '@aztec/simulator';
 import { trackSpan } from '@aztec/telemetry-client';
 import { ProverInstrumentation } from '../instrumentation.js';
@@ -18,15 +18,13 @@ let TestCircuitProver = (() => {
     let _instanceExtraInitializers = [];
     let _getBaseParityProof_decorators;
     let _getRootParityProof_decorators;
-    let _getBaseRollupProof_decorators;
+    let _getPrivateBaseRollupProof_decorators;
+    let _getPublicBaseRollupProof_decorators;
     let _getMergeRollupProof_decorators;
     let _getBlockRootRollupProof_decorators;
     let _getEmptyBlockRootRollupProof_decorators;
     let _getBlockMergeRollupProof_decorators;
     let _getRootRollupProof_decorators;
-    let _getPublicKernelInnerProof_decorators;
-    let _getPublicKernelMergeProof_decorators;
-    let _getPublicTailProof_decorators;
     return _a = class TestCircuitProver {
             constructor(telemetry, simulationProvider, opts = { proverTestDelayMs: 0 }) {
                 this.simulationProvider = (__runInitializers(this, _instanceExtraInitializers), simulationProvider);
@@ -41,20 +39,12 @@ let TestCircuitProver = (() => {
             async getEmptyPrivateKernelProof(inputs) {
                 const emptyNested = new EmptyNestedData(makeRecursiveProof(RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['EmptyNestedArtifact'].keyAsFields);
                 const kernelInputs = new PrivateKernelEmptyInputs(emptyNested, inputs.header, inputs.chainId, inputs.version, inputs.vkTreeRoot, inputs.protocolContractTreeRoot);
-                const witnessMap = convertPrivateKernelEmptyInputsToWitnessMap(kernelInputs);
-                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.PrivateKernelEmptyArtifact);
-                const result = convertSimulatedPrivateKernelEmptyOutputsFromWitnessMap(witness);
-                await this.delay();
-                return makePublicInputsAndRecursiveProof(result, makeRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['PrivateKernelEmptyArtifact']);
+                return await this.simulate(kernelInputs, 'PrivateKernelEmptyArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertPrivateKernelEmptyInputsToWitnessMap, convertSimulatedPrivateKernelEmptyOutputsFromWitnessMap);
             }
             async getEmptyTubeProof(inputs) {
                 const emptyNested = new EmptyNestedData(makeRecursiveProof(RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['EmptyNestedArtifact'].keyAsFields);
                 const kernelInputs = new PrivateKernelEmptyInputs(emptyNested, inputs.header, inputs.chainId, inputs.version, inputs.vkTreeRoot, inputs.protocolContractTreeRoot);
-                const witnessMap = convertPrivateKernelEmptyInputsToWitnessMap(kernelInputs);
-                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.PrivateKernelEmptyArtifact);
-                const result = convertPrivateKernelEmptyOutputsFromWitnessMap(witness);
-                await this.delay();
-                return makePublicInputsAndRecursiveProof(result, makeRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFakeHonk());
+                return await this.simulate(kernelInputs, 'EmptyNestedArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertPrivateKernelEmptyInputsToWitnessMap, convertPrivateKernelEmptyOutputsFromWitnessMap);
             }
             /**
              * Simulates the base parity circuit from its inputs.
@@ -62,16 +52,8 @@ let TestCircuitProver = (() => {
              * @returns The public inputs of the parity circuit.
              */
             async getBaseParityProof(inputs) {
-                const timer = new Timer();
-                const witnessMap = convertBaseParityInputsToWitnessMap(inputs);
-                // use WASM here as it is faster for small circuits
-                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.BaseParityArtifact);
-                const result = convertBaseParityOutputsFromWitnessMap(witness);
-                const rootParityInput = new RootParityInput(makeRecursiveProof(RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['BaseParityArtifact'].keyAsFields, getVKSiblingPath(ProtocolCircuitVkIndexes['BaseParityArtifact']), result);
-                this.instrumentation.recordDuration('simulationDuration', 'base-parity', timer);
-                emitCircuitSimulationStats('base-parity', timer.ms(), inputs.toBuffer().length, result.toBuffer().length, this.logger);
-                await this.delay();
-                return Promise.resolve(rootParityInput);
+                const result = await this.simulate(inputs, 'BaseParityArtifact', RECURSIVE_PROOF_LENGTH, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap);
+                return new RootParityInput(result.proof, result.verificationKey.keyAsFields, getVKSiblingPath(ProtocolCircuitVkIndexes['BaseParityArtifact']), result.inputs);
             }
             /**
              * Simulates the root parity circuit from its inputs.
@@ -79,52 +61,26 @@ let TestCircuitProver = (() => {
              * @returns The public inputs of the parity circuit.
              */
             async getRootParityProof(inputs) {
-                const timer = new Timer();
-                const witnessMap = convertRootParityInputsToWitnessMap(inputs);
-                // use WASM here as it is faster for small circuits
-                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.RootParityArtifact);
-                const result = convertRootParityOutputsFromWitnessMap(witness);
-                const rootParityInput = new RootParityInput(makeRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['RootParityArtifact'].keyAsFields, getVKSiblingPath(ProtocolCircuitVkIndexes['RootParityArtifact']), result);
-                this.instrumentation.recordDuration('simulationDuration', 'root-parity', timer);
-                emitCircuitSimulationStats('root-parity', timer.ms(), inputs.toBuffer().length, result.toBuffer().length, this.logger);
-                await this.delay();
-                return Promise.resolve(rootParityInput);
-            }
-            /**
-             * Simulates the base rollup circuit from its inputs.
-             * @param input - Inputs to the circuit.
-             * @returns The public inputs as outputs of the simulation.
-             */
-            async getBaseRollupProof(input) {
-                const timer = new Timer();
-                const witnessMap = convertSimulatedBaseRollupInputsToWitnessMap(input);
-                const simulationProvider = this.simulationProvider ?? this.wasmSimulator;
-                const witness = await simulationProvider.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.BaseRollupArtifact);
-                const result = convertSimulatedBaseRollupOutputsFromWitnessMap(witness);
-                this.instrumentation.recordDuration('simulationDuration', 'base-rollup', timer);
-                emitCircuitSimulationStats('base-rollup', timer.ms(), input.toBuffer().length, result.toBuffer().length, this.logger);
-                await this.delay();
-                return makePublicInputsAndRecursiveProof(result, makeRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['BaseRollupArtifact']);
+                const result = await this.simulate(inputs, 'RootParityArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap);
+                return new RootParityInput(result.proof, result.verificationKey.keyAsFields, getVKSiblingPath(ProtocolCircuitVkIndexes['RootParityArtifact']), result.inputs);
             }
             async getTubeProof(_tubeInput) {
                 await this.delay();
                 return makeProofAndVerificationKey(makeEmptyRecursiveProof(TUBE_PROOF_LENGTH), VerificationKeyData.makeFakeHonk());
             }
+            async getPrivateBaseRollupProof(inputs) {
+                return await this.simulate(inputs, 'PrivateBaseRollupArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertSimulatedPrivateBaseRollupInputsToWitnessMap, convertSimulatedPrivateBaseRollupOutputsFromWitnessMap);
+            }
+            async getPublicBaseRollupProof(inputs) {
+                return await this.simulate(inputs, 'PublicBaseRollupArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertSimulatedPublicBaseRollupInputsToWitnessMap, convertSimulatedPublicBaseRollupOutputsFromWitnessMap);
+            }
             /**
              * Simulates the merge rollup circuit from its inputs.
              * @param input - Inputs to the circuit.
              * @returns The public inputs as outputs of the simulation.
              */
             async getMergeRollupProof(input) {
-                const timer = new Timer();
-                const witnessMap = convertMergeRollupInputsToWitnessMap(input);
-                // use WASM here as it is faster for small circuits
-                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.MergeRollupArtifact);
-                const result = convertMergeRollupOutputsFromWitnessMap(witness);
-                this.instrumentation.recordDuration('simulationDuration', 'merge-rollup', timer);
-                emitCircuitSimulationStats('merge-rollup', timer.ms(), input.toBuffer().length, result.toBuffer().length, this.logger);
-                await this.delay();
-                return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['MergeRollupArtifact']);
+                return await this.simulate(input, 'MergeRollupArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap);
             }
             /**
              * Simulates the block root rollup circuit from its inputs.
@@ -132,14 +88,7 @@ let TestCircuitProver = (() => {
              * @returns The public inputs as outputs of the simulation.
              */
             async getBlockRootRollupProof(input) {
-                const timer = new Timer();
-                const witnessMap = convertBlockRootRollupInputsToWitnessMap(input);
-                // use WASM here as it is faster for small circuits
-                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.BlockRootRollupArtifact);
-                const result = convertBlockRootRollupOutputsFromWitnessMap(witness);
-                this.instrumentation.recordDuration('simulationDuration', 'block-root-rollup', timer);
-                emitCircuitSimulationStats('block-root-rollup', timer.ms(), input.toBuffer().length, result.toBuffer().length, this.logger);
-                return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['BlockRootRollupArtifact']);
+                return await this.simulate(input, 'BlockRootRollupArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertBlockRootRollupInputsToWitnessMap, convertBlockRootRollupOutputsFromWitnessMap);
             }
             /**
              * Simulates the empty block root rollup circuit from its inputs.
@@ -147,14 +96,7 @@ let TestCircuitProver = (() => {
              * @returns The public inputs as outputs of the simulation.
              */
             async getEmptyBlockRootRollupProof(input) {
-                const timer = new Timer();
-                const witnessMap = convertEmptyBlockRootRollupInputsToWitnessMap(input);
-                // use WASM here as it is faster for small circuits
-                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.EmptyBlockRootRollupArtifact);
-                const result = convertEmptyBlockRootRollupOutputsFromWitnessMap(witness);
-                this.instrumentation.recordDuration('simulationDuration', 'empty-block-root-rollup', timer);
-                emitCircuitSimulationStats('empty-block-root-rollup', timer.ms(), input.toBuffer().length, result.toBuffer().length, this.logger);
-                return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['EmptyBlockRootRollupArtifact']);
+                return await this.simulate(input, 'EmptyBlockRootRollupArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertEmptyBlockRootRollupInputsToWitnessMap, convertEmptyBlockRootRollupOutputsFromWitnessMap);
             }
             /**
              * Simulates the block merge rollup circuit from its inputs.
@@ -162,14 +104,7 @@ let TestCircuitProver = (() => {
              * @returns The public inputs as outputs of the simulation.
              */
             async getBlockMergeRollupProof(input) {
-                const timer = new Timer();
-                const witnessMap = convertBlockMergeRollupInputsToWitnessMap(input);
-                // use WASM here as it is faster for small circuits
-                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.BlockMergeRollupArtifact);
-                const result = convertBlockMergeRollupOutputsFromWitnessMap(witness);
-                this.instrumentation.recordDuration('simulationDuration', 'block-merge-rollup', timer);
-                emitCircuitSimulationStats('block-merge-rollup', timer.ms(), input.toBuffer().length, result.toBuffer().length, this.logger);
-                return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['BlockMergeRollupArtifact']);
+                return await this.simulate(input, 'BlockMergeRollupArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertBlockMergeRollupInputsToWitnessMap, convertBlockMergeRollupOutputsFromWitnessMap);
             }
             /**
              * Simulates the root rollup circuit from its inputs.
@@ -177,59 +112,14 @@ let TestCircuitProver = (() => {
              * @returns The public inputs as outputs of the simulation.
              */
             async getRootRollupProof(input) {
-                const timer = new Timer();
-                const witnessMap = convertRootRollupInputsToWitnessMap(input);
-                // use WASM here as it is faster for small circuits
-                const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.RootRollupArtifact);
-                const result = convertRootRollupOutputsFromWitnessMap(witness);
-                this.instrumentation.recordDuration('simulationDuration', 'root-rollup', timer);
-                emitCircuitSimulationStats('root-rollup', timer.ms(), input.toBuffer().length, result.toBuffer().length, this.logger);
-                await this.delay();
-                return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['RootRollupArtifact']);
-            }
-            async getPublicKernelInnerProof(inputs) {
-                const timer = new Timer();
-                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]);
-            }
-            async getPublicKernelMergeProof(inputs) {
-                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 = 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[artifact]);
-                const result = convertSimulatedPublicTailOutputFromWitnessMap(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]);
+                return await this.simulate(input, 'RootRollupArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap);
             }
             async getAvmProof(_inputs) {
                 // We can't simulate the AVM because we don't have enough context to do so (e.g., DBs).
                 // We just return an empty proof and VK data.
                 this.logger.debug('Skipping AVM simulation in TestCircuitProver.');
                 await this.delay();
-                return makeProofAndVerificationKey(makeEmptyProof(), VerificationKeyData.makeFake(AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS));
+                return makeProofAndVerificationKey(makeEmptyRecursiveProof(AVM_PROOF_LENGTH_IN_FIELDS), VerificationKeyData.makeFake(AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS));
             }
             async delay() {
                 if (this.opts.proverTestDelayMs > 0) {
@@ -240,34 +130,42 @@ let TestCircuitProver = (() => {
             verifyProof(_1, _2) {
                 return Promise.reject(new Error('Method not implemented.'));
             }
+            async simulate(input, artifactName, proofLength, convertInput, convertOutput) {
+                const timer = new Timer();
+                const witnessMap = convertInput(input);
+                const circuitName = mapProtocolArtifactNameToCircuitName(artifactName);
+                const simulationProvider = this.simulationProvider ?? this.wasmSimulator;
+                const witness = await simulationProvider.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts[artifactName]);
+                const result = convertOutput(witness);
+                this.instrumentation.recordDuration('simulationDuration', circuitName, timer);
+                emitCircuitSimulationStats(circuitName, timer.ms(), input.toBuffer().length, result.toBuffer().length, this.logger);
+                await this.delay();
+                return makePublicInputsAndRecursiveProof(result, makeRecursiveProof(proofLength), ProtocolCircuitVks[artifactName]);
+            }
         },
         (() => {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
             _getBaseParityProof_decorators = [trackSpan('TestCircuitProver.getBaseParityProof')];
             _getRootParityProof_decorators = [trackSpan('TestCircuitProver.getRootParityProof')];
-            _getBaseRollupProof_decorators = [trackSpan('TestCircuitProver.getBaseRollupProof')];
+            _getPrivateBaseRollupProof_decorators = [trackSpan('TestCircuitProver.getPrivateBaseRollupProof')];
+            _getPublicBaseRollupProof_decorators = [trackSpan('TestCircuitProver.getPublicBaseRollupProof')];
             _getMergeRollupProof_decorators = [trackSpan('TestCircuitProver.getMergeRollupProof')];
             _getBlockRootRollupProof_decorators = [trackSpan('TestCircuitProver.getBlockRootRollupProof')];
             _getEmptyBlockRootRollupProof_decorators = [trackSpan('TestCircuitProver.getEmptyBlockRootRollupProof')];
             _getBlockMergeRollupProof_decorators = [trackSpan('TestCircuitProver.getBlockMergeRollupProof')];
             _getRootRollupProof_decorators = [trackSpan('TestCircuitProver.getRootRollupProof')];
-            _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);
-            __esDecorate(_a, null, _getBaseRollupProof_decorators, { kind: "method", name: "getBaseRollupProof", static: false, private: false, access: { has: obj => "getBaseRollupProof" in obj, get: obj => obj.getBaseRollupProof }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _getPrivateBaseRollupProof_decorators, { kind: "method", name: "getPrivateBaseRollupProof", static: false, private: false, access: { has: obj => "getPrivateBaseRollupProof" in obj, get: obj => obj.getPrivateBaseRollupProof }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _getPublicBaseRollupProof_decorators, { kind: "method", name: "getPublicBaseRollupProof", static: false, private: false, access: { has: obj => "getPublicBaseRollupProof" in obj, get: obj => obj.getPublicBaseRollupProof }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _getMergeRollupProof_decorators, { kind: "method", name: "getMergeRollupProof", static: false, private: false, access: { has: obj => "getMergeRollupProof" in obj, get: obj => obj.getMergeRollupProof }, metadata: _metadata }, null, _instanceExtraInitializers);
             __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, _getEmptyBlockRootRollupProof_decorators, { kind: "method", name: "getEmptyBlockRootRollupProof", static: false, private: false, access: { has: obj => "getEmptyBlockRootRollupProof" in obj, get: obj => obj.getEmptyBlockRootRollupProof }, 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, _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,9 +1,12 @@
 {
   "name": "@aztec/bb-prover",
-  "version": "0.60.0",
+  "version": "0.62.0",
   "type": "module",
   "exports": {
-    ".": "./dest/index.js"
+    ".": "./dest/index.js",
+    "./prover": "./dest/prover/index.js",
+    "./verifier": "./dest/verifier/index.js",
+    "./test": "./dest/test/index.js"
   },
   "bin": {
     "bb-cli": "./dest/bb/index.js"
@@ -62,12 +65,12 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.60.0",
-    "@aztec/circuits.js": "0.60.0",
-    "@aztec/foundation": "0.60.0",
-    "@aztec/noir-protocol-circuits-types": "0.60.0",
-    "@aztec/simulator": "0.60.0",
-    "@aztec/telemetry-client": "0.60.0",
+    "@aztec/circuit-types": "0.62.0",
+    "@aztec/circuits.js": "0.62.0",
+    "@aztec/foundation": "0.62.0",
+    "@aztec/noir-protocol-circuits-types": "0.62.0",
+    "@aztec/simulator": "0.62.0",
+    "@aztec/telemetry-client": "0.62.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@noir-lang/types": "portal:../../noir/packages/types",

package/src/bb/cli.ts

@@ -90,6 +90,7 @@ export function getProgram(log: LogFn): Command {
         compiledCircuit,
         options.contractName,
         log,
+        /*force= */ true,
       );
     });
 

package/src/bb/execute.ts

@@ -151,6 +151,7 @@ export async function generateKeyForNoirCircuit(
       const args = ['-o', `${outputPath}/${VK_FILENAME}`, '-b', bytecodePath];
       const timer = new Timer();
       let result = await executeBB(pathToBB, `write_vk_${flavor}`, args, log);
+
       // If we succeeded and the type of key if verification, have bb write the 'fields' version too
       if (result.status == BB_RESULT.SUCCESS) {
         const asFieldsArgs = ['-k', `${outputPath}/${VK_FILENAME}`, '-o', `${outputPath}/${VK_FIELDS_FILENAME}`, '-v'];
@@ -504,7 +505,6 @@ export async function generateAvmProof(
   }
 
   // Paths for the inputs
-  const bytecodePath = join(workingDirectory, AVM_BYTECODE_FILENAME);
   const calldataPath = join(workingDirectory, AVM_CALLDATA_FILENAME);
   const publicInputsPath = join(workingDirectory, AVM_PUBLIC_INPUTS_FILENAME);
   const avmHintsPath = join(workingDirectory, AVM_HINTS_FILENAME);
@@ -525,10 +525,6 @@ export async function generateAvmProof(
 
   try {
     // Write the inputs to the working directory.
-    await fs.writeFile(bytecodePath, input.bytecode);
-    if (!filePresent(bytecodePath)) {
-      return { status: BB_RESULT.FAILURE, reason: `Could not write bytecode at ${bytecodePath}` };
-    }
     await fs.writeFile(
       calldataPath,
       input.calldata.map(fr => fr.toBuffer()),
@@ -553,8 +549,6 @@ export async function generateAvmProof(
     }
 
     const args = [
-      '--avm-bytecode',
-      bytecodePath,
       '--avm-calldata',
       calldataPath,
       '--avm-public-inputs',

package/src/prover/bb_private_kernel_prover.ts

@@ -376,6 +376,7 @@ export class BBNativePrivateKernelProver implements PrivateKernelProver {
       fieldsWithoutPublicInputs,
       new Proof(binaryProof, vkData.numPublicInputs),
       true,
+      fieldsWithoutPublicInputs.length,
     );
     return proof;
   }