@aztec/bb-prover 0.47.1 → 0.48.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -19,23 +19,23 @@ export declare class ProverInstrumentation {
19
19
  * Records the duration of a circuit operation.
20
20
  * @param metric - The metric to record
21
21
  * @param circuitName - The name of the circuit
22
- * @param timerOrS - The duration
22
+ * @param timerOrMS - The duration
23
23
  */
24
- recordDuration(metric: 'simulationDuration' | 'witGenDuration' | 'provingDuration', circuitName: CircuitName, timerOrS: Timer | number): void;
24
+ recordDuration(metric: 'simulationDuration' | 'witGenDuration' | 'provingDuration', circuitName: CircuitName | 'tubeCircuit', timerOrMS: Timer | number): void;
25
25
  /**
26
26
  * Records the duration of an AVM circuit operation.
27
27
  * @param metric - The metric to record
28
28
  * @param appCircuitName - The name of the function circuit (should be a `contract:function` string)
29
- * @param timerOrS - The duration
29
+ * @param timerOrMS - The duration
30
30
  */
31
- recordAvmDuration(metric: 'witGenDuration' | 'provingDuration', appCircuitName: string, timerOrS: Timer | number): void;
31
+ recordAvmDuration(metric: 'witGenDuration' | 'provingDuration', appCircuitName: string, timerOrMS: Timer | number): void;
32
32
  /**
33
33
  * Records the size of a circuit operation.
34
34
  * @param metric - Records the size of a circuit operation.
35
35
  * @param circuitName - The name of the circuit
36
36
  * @param size - The size
37
37
  */
38
- recordSize(metric: 'witGenInputSize' | 'witGenOutputSize' | 'proofSize' | 'circuitSize' | 'circuitPublicInputCount', circuitName: CircuitName, size: number): void;
38
+ recordSize(metric: 'witGenInputSize' | 'witGenOutputSize' | 'proofSize' | 'circuitSize' | 'circuitPublicInputCount', circuitName: CircuitName | 'tubeCircuit', size: number): void;
39
39
  /**
40
40
  * Records the size of an AVM circuit operation.
41
41
  * @param metric - The metric to record
@@ -1 +1 @@
1
- {"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../src/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,MAAM,EAEZ,MAAM,yBAAyB,CAAC;AAEjC;;GAEG;AACH,qBAAa,qBAAqB;IAChC,OAAO,CAAC,kBAAkB,CAAY;IACtC,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,eAAe,CAAQ;IAE/B,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,gBAAgB,CAAQ;IAEhC,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,uBAAuB,CAAQ;IAEvC,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAEnB,SAAS,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM;IAwDpD;;;;;OAKG;IACH,cAAc,CACZ,MAAM,EAAE,oBAAoB,GAAG,gBAAgB,GAAG,iBAAiB,EACnE,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,KAAK,GAAG,MAAM;IAS1B;;;;;OAKG;IACH,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,iBAAiB,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,GAAG,MAAM;IAOhH;;;;;OAKG;IACH,UAAU,CACR,MAAM,EAAE,iBAAiB,GAAG,kBAAkB,GAAG,WAAW,GAAG,aAAa,GAAG,yBAAyB,EACxG,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,MAAM;IAQd;;;;;OAKG;IACH,aAAa,CACX,MAAM,EAAE,iBAAiB,GAAG,kBAAkB,GAAG,WAAW,GAAG,aAAa,GAAG,yBAAyB,EACxG,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,MAAM;CAMf"}
1
+ {"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../src/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC;;GAEG;AACH,qBAAa,qBAAqB;IAChC,OAAO,CAAC,kBAAkB,CAAY;IACtC,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,eAAe,CAAY;IAEnC,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,gBAAgB,CAAQ;IAEhC,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,uBAAuB,CAAQ;IAEvC,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAEnB,SAAS,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM;IA4DpD;;;;;OAKG;IACH,cAAc,CACZ,MAAM,EAAE,oBAAoB,GAAG,gBAAgB,GAAG,iBAAiB,EACnE,WAAW,EAAE,WAAW,GAAG,aAAa,EACxC,SAAS,EAAE,KAAK,GAAG,MAAM;IAS3B;;;;;OAKG;IACH,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,iBAAiB,EAAE,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,GAAG,MAAM;IAOjH;;;;;OAKG;IACH,UAAU,CACR,MAAM,EAAE,iBAAiB,GAAG,kBAAkB,GAAG,WAAW,GAAG,aAAa,GAAG,yBAAyB,EACxG,WAAW,EAAE,WAAW,GAAG,aAAa,EACxC,IAAI,EAAE,MAAM;IAQd;;;;;OAKG;IACH,aAAa,CACX,MAAM,EAAE,iBAAiB,GAAG,kBAAkB,GAAG,WAAW,GAAG,aAAa,GAAG,yBAAyB,EACxG,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,MAAM;CAMf"}
@@ -1,4 +1,4 @@
1
- import { Attributes, Metrics, ValueType, } from '@aztec/telemetry-client';
1
+ import { Attributes, Metrics, ValueType, millisecondBuckets, } from '@aztec/telemetry-client';
2
2
  /**
3
3
  * Instrumentation class for Prover implementations.
4
4
  */
@@ -8,23 +8,27 @@ export class ProverInstrumentation {
8
8
  const meter = telemetry.getMeter(name);
9
9
  this.simulationDuration = meter.createHistogram(Metrics.CIRCUIT_SIMULATION_DURATION, {
10
10
  description: 'Records how long it takes to simulate a circuit',
11
- unit: 's',
12
- valueType: ValueType.DOUBLE,
11
+ unit: 'ms',
12
+ valueType: ValueType.INT,
13
13
  advice: {
14
- explicitBucketBoundaries: [0.1, 0.25, 0.5, 1, 2.5, 5, 10, 30, 60],
14
+ explicitBucketBoundaries: millisecondBuckets(1), // 10ms -> ~327s
15
15
  },
16
16
  });
17
- this.witGenDuration = meter.createGauge(Metrics.CIRCUIT_WITNESS_GEN_DURATION, {
17
+ this.witGenDuration = meter.createHistogram(Metrics.CIRCUIT_WITNESS_GEN_DURATION, {
18
18
  description: 'Records how long it takes to generate the partial witness for a circuit',
19
- unit: 's',
20
- valueType: ValueType.DOUBLE,
19
+ unit: 'ms',
20
+ valueType: ValueType.INT,
21
+ advice: {
22
+ explicitBucketBoundaries: millisecondBuckets(1),
23
+ },
21
24
  });
22
- // ideally this would be a histogram, but proving takes a long time on the server
23
- // and they don't happen that often so Prometheus & Grafana have a hard time handling it
24
- this.provingDuration = meter.createGauge(Metrics.CIRCUIT_PROVING_DURATION, {
25
- unit: 's',
25
+ this.provingDuration = meter.createHistogram(Metrics.CIRCUIT_PROVING_DURATION, {
26
+ unit: 'ms',
26
27
  description: 'Records how long it takes to prove a circuit',
27
- valueType: ValueType.DOUBLE,
28
+ valueType: ValueType.INT,
29
+ advice: {
30
+ explicitBucketBoundaries: millisecondBuckets(2), // 100ms -> 54 minutes
31
+ },
28
32
  });
29
33
  this.witGenInputSize = meter.createGauge(Metrics.CIRCUIT_WITNESS_GEN_INPUT_SIZE, {
30
34
  unit: 'By',
@@ -54,11 +58,11 @@ export class ProverInstrumentation {
54
58
  * Records the duration of a circuit operation.
55
59
  * @param metric - The metric to record
56
60
  * @param circuitName - The name of the circuit
57
- * @param timerOrS - The duration
61
+ * @param timerOrMS - The duration
58
62
  */
59
- recordDuration(metric, circuitName, timerOrS) {
60
- const s = typeof timerOrS === 'number' ? timerOrS : timerOrS.s();
61
- this[metric].record(s, {
63
+ recordDuration(metric, circuitName, timerOrMS) {
64
+ const ms = typeof timerOrMS === 'number' ? timerOrMS : timerOrMS.ms();
65
+ this[metric].record(Math.ceil(ms), {
62
66
  [Attributes.PROTOCOL_CIRCUIT_NAME]: circuitName,
63
67
  [Attributes.PROTOCOL_CIRCUIT_TYPE]: 'server',
64
68
  });
@@ -67,11 +71,11 @@ export class ProverInstrumentation {
67
71
  * Records the duration of an AVM circuit operation.
68
72
  * @param metric - The metric to record
69
73
  * @param appCircuitName - The name of the function circuit (should be a `contract:function` string)
70
- * @param timerOrS - The duration
74
+ * @param timerOrMS - The duration
71
75
  */
72
- recordAvmDuration(metric, appCircuitName, timerOrS) {
73
- const s = typeof timerOrS === 'number' ? timerOrS : timerOrS.s();
74
- this[metric].record(s, {
76
+ recordAvmDuration(metric, appCircuitName, timerOrMS) {
77
+ const ms = typeof timerOrMS === 'number' ? timerOrMS : timerOrMS.s();
78
+ this[metric].record(Math.ceil(ms), {
75
79
  [Attributes.APP_CIRCUIT_NAME]: appCircuitName,
76
80
  });
77
81
  }
@@ -99,4 +103,4 @@ export class ProverInstrumentation {
99
103
  });
100
104
  }
101
105
  }
102
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2luc3RydW1lbnRhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQ0wsVUFBVSxFQUdWLE9BQU8sRUFHUCxTQUFTLEdBQ1YsTUFBTSx5QkFBeUIsQ0FBQztBQUVqQzs7R0FFRztBQUNILE1BQU0sT0FBTyxxQkFBcUI7SUFjaEMsWUFBWSxTQUEwQixFQUFFLElBQVk7UUFDbEQsSUFBSSxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3hDLE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFdkMsSUFBSSxDQUFDLGtCQUFrQixHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLDJCQUEyQixFQUFFO1lBQ25GLFdBQVcsRUFBRSxpREFBaUQ7WUFDOUQsSUFBSSxFQUFFLEdBQUc7WUFDVCxTQUFTLEVBQUUsU0FBUyxDQUFDLE1BQU07WUFDM0IsTUFBTSxFQUFFO2dCQUNOLHdCQUF3QixFQUFFLENBQUMsR0FBRyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUM7YUFDbEU7U0FDRixDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsY0FBYyxHQUFHLEtBQUssQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLDRCQUE0QixFQUFFO1lBQzVFLFdBQVcsRUFBRSx5RUFBeUU7WUFDdEYsSUFBSSxFQUFFLEdBQUc7WUFDVCxTQUFTLEVBQUUsU0FBUyxDQUFDLE1BQU07U0FDNUIsQ0FBQyxDQUFDO1FBRUgsaUZBQWlGO1FBQ2pGLHdGQUF3RjtRQUN4RixJQUFJLENBQUMsZUFBZSxHQUFHLEtBQUssQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLHdCQUF3QixF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
106
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2luc3RydW1lbnRhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQ0wsVUFBVSxFQUdWLE9BQU8sRUFHUCxTQUFTLEVBQ1Qsa0JBQWtCLEdBQ25CLE1BQU0seUJBQXlCLENBQUM7QUFFakM7O0dBRUc7QUFDSCxNQUFNLE9BQU8scUJBQXFCO0lBY2hDLFlBQVksU0FBMEIsRUFBRSxJQUFZO1FBQ2xELElBQUksQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN4QyxNQUFNLEtBQUssR0FBRyxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRXZDLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQywyQkFBMkIsRUFBRTtZQUNuRixXQUFXLEVBQUUsaURBQWlEO1lBQzlELElBQUksRUFBRSxJQUFJO1lBQ1YsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1lBQ3hCLE1BQU0sRUFBRTtnQkFDTix3QkFBd0IsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsRUFBRSxnQkFBZ0I7YUFDbEU7U0FDRixDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsY0FBYyxHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLDRCQUE0QixFQUFFO1lBQ2hGLFdBQVcsRUFBRSx5RUFBeUU7WUFDdEYsSUFBSSxFQUFFLElBQUk7WUFDVixTQUFTLEVBQUUsU0FBUyxDQUFDLEdBQUc7WUFDeEIsTUFBTSxFQUFFO2dCQUNOLHdCQUF3QixFQUFFLGtCQUFrQixDQUFDLENBQUMsQ0FBQzthQUNoRDtTQUNGLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxlQUFlLEdBQUcsS0FBSyxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUMsd0JBQXdCLEVBQUU7WUFDN0UsSUFB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
@@ -1,5 +1,5 @@
1
1
  import { type ProofAndVerificationKey, type PublicInputsAndRecursiveProof, type PublicKernelNonTailRequest, type PublicKernelTailRequest, type ServerCircuitProver } from '@aztec/circuit-types';
2
- import { type AvmCircuitInputs, type BaseOrMergeRollupPublicInputs, type BaseParityInputs, type BaseRollupInputs, type KernelCircuitPublicInputs, type MergeRollupInputs, NESTED_RECURSIVE_PROOF_LENGTH, type PrivateKernelEmptyInputData, Proof, type PublicKernelCircuitPublicInputs, RECURSIVE_PROOF_LENGTH, RecursiveProof, RootParityInput, type RootParityInputs, type RootRollupInputs, type RootRollupPublicInputs, TUBE_PROOF_LENGTH, TubeInputs, type VerificationKeyAsFields, type VerificationKeyData } from '@aztec/circuits.js';
2
+ import { type AvmCircuitInputs, type BaseOrMergeRollupPublicInputs, type BaseParityInputs, type BaseRollupInputs, type KernelCircuitPublicInputs, type MergeRollupInputs, NESTED_RECURSIVE_PROOF_LENGTH, type PrivateKernelEmptyInputData, Proof, type PublicKernelCircuitPublicInputs, RECURSIVE_PROOF_LENGTH, RecursiveProof, RootParityInput, type RootParityInputs, type RootRollupInputs, type RootRollupPublicInputs, TUBE_PROOF_LENGTH, type TubeInputs, type VerificationKeyAsFields, type VerificationKeyData } from '@aztec/circuits.js';
3
3
  import { type ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
4
4
  import { type TelemetryClient } from '@aztec/telemetry-client';
5
5
  import type { ACVMConfig, BBConfig } from '../config.js';
@@ -1 +1 @@
1
- {"version":3,"file":"bb_prover.d.ts","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bb_prover.d.ts","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { __esDecorate, __runInitializers } from "tslib";
2
2
  /* eslint-disable require-await */
3
3
  import { makePublicInputsAndRecursiveProof, } from '@aztec/circuit-types';
4
- import { AGGREGATION_OBJECT_LENGTH, EmptyNestedCircuitInputs, EmptyNestedData, Fr, NESTED_RECURSIVE_PROOF_LENGTH, PrivateKernelEmptyInputs, Proof, RECURSIVE_PROOF_LENGTH, RecursiveProof, RootParityInput, TUBE_PROOF_LENGTH, TubeInputs, makeRecursiveProofFromBinary, } from '@aztec/circuits.js';
4
+ import { AGGREGATION_OBJECT_LENGTH, EmptyNestedCircuitInputs, EmptyNestedData, Fr, NESTED_RECURSIVE_PROOF_LENGTH, PrivateKernelEmptyInputs, Proof, RECURSIVE_PROOF_LENGTH, RecursiveProof, RootParityInput, TUBE_PROOF_LENGTH, makeRecursiveProofFromBinary, } from '@aztec/circuits.js';
5
5
  import { runInDirectory } from '@aztec/foundation/fs';
6
6
  import { createDebugLogger } from '@aztec/foundation/log';
7
7
  import { Timer } from '@aztec/foundation/timer';
@@ -94,13 +94,6 @@ let BBNativeRollupProver = (() => {
94
94
  }
95
95
  // We may need to convert the recursive proof into fields format
96
96
  kernelRequest.inputs.previousKernel.proof = await this.ensureValidProof(kernelRequest.inputs.previousKernel.proof, kernelOps.artifact, kernelRequest.inputs.previousKernel.vk);
97
- // PUBLIC KERNEL: kernel request should be nonempty at start of public kernel proving but it is not
98
- // TODO(#7369): We should properly enqueue the tube in the public kernel lifetime
99
- if (!kernelRequest.inputs.previousKernel.clientIvcProof.isEmpty()) {
100
- const { tubeVK, tubeProof } = await this.getTubeProof(new TubeInputs(kernelRequest.inputs.previousKernel.clientIvcProof));
101
- kernelRequest.inputs.previousKernel.vk = tubeVK;
102
- kernelRequest.inputs.previousKernel.proof = tubeProof;
103
- }
104
97
  await this.verifyWithKey(kernelRequest.inputs.previousKernel.vk, kernelRequest.inputs.previousKernel.proof.binaryProof);
105
98
  const { circuitOutput, proof } = await this.createRecursiveProof(kernelRequest.inputs, kernelOps.artifact, NESTED_RECURSIVE_PROOF_LENGTH, kernelOps.convertInputs, kernelOps.convertOutputs);
106
99
  const verificationKey = await this.getVerificationKeyDataForCircuit(kernelOps.artifact);
@@ -126,9 +119,7 @@ let BBNativeRollupProver = (() => {
126
119
  async getBaseRollupProof(baseRollupInput) {
127
120
  // We may need to convert the recursive proof into fields format
128
121
  logger.debug(`kernel Data proof: ${baseRollupInput.kernelData.proof}`);
129
- logger.info(`in getBaseRollupProof`);
130
- logger.info(`Number of public inputs in baseRollupInput: ${baseRollupInput.kernelData.vk.numPublicInputs}`);
131
- logger.info(`Number of public inputs ${baseRollupInput.kernelData.publicInputs}`);
122
+ logger.debug(`Number of public inputs in baseRollupInput: ${baseRollupInput.kernelData.vk.numPublicInputs}`);
132
123
  baseRollupInput.kernelData.proof = await this.ensureValidProof(baseRollupInput.kernelData.proof, 'BaseRollupArtifact', baseRollupInput.kernelData.vk);
133
124
  const { circuitOutput, proof } = await this.createRecursiveProof(baseRollupInput, // BaseRollupInputs
134
125
  'BaseRollupArtifact', NESTED_RECURSIVE_PROOF_LENGTH, // WORKTODO: this should be BASE_ROLLUP_PROOF_LENGTH or something like this
@@ -217,7 +208,7 @@ let BBNativeRollupProver = (() => {
217
208
  this.instrumentation.recordDuration('witGenDuration', circuitName, timer);
218
209
  this.instrumentation.recordSize('witGenInputSize', circuitName, input.toBuffer().length);
219
210
  this.instrumentation.recordSize('witGenOutputSize', circuitName, output.toBuffer().length);
220
- logger.debug(`Generated witness`, {
211
+ logger.info(`Generated witness`, {
221
212
  circuitName,
222
213
  duration: timer.ms(),
223
214
  inputSize: input.toBuffer().length,
@@ -246,7 +237,7 @@ let BBNativeRollupProver = (() => {
246
237
  const rawProof = await fs.readFile(`${provingResult.proofPath}/${PROOF_FILENAME}`);
247
238
  const proof = new Proof(rawProof, vkData.numPublicInputs);
248
239
  const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
249
- this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs / 1000);
240
+ this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs);
250
241
  this.instrumentation.recordSize('proofSize', circuitName, proof.buffer.length);
251
242
  this.instrumentation.recordSize('circuitPublicInputCount', circuitName, vkData.numPublicInputs);
252
243
  this.instrumentation.recordSize('circuitSize', circuitName, vkData.circuitSize);
@@ -327,6 +318,10 @@ let BBNativeRollupProver = (() => {
327
318
  // Read the proof as fields
328
319
  const tubeVK = await extractVkData(provingResult.vkPath);
329
320
  const tubeProof = await this.readTubeProofAsFields(provingResult.proofPath, tubeVK, TUBE_PROOF_LENGTH);
321
+ this.instrumentation.recordDuration('provingDuration', 'tubeCircuit', provingResult.durationMs);
322
+ this.instrumentation.recordSize('proofSize', 'tubeCircuit', tubeProof.binaryProof.buffer.length);
323
+ this.instrumentation.recordSize('circuitPublicInputCount', 'tubeCircuit', tubeVK.numPublicInputs);
324
+ this.instrumentation.recordSize('circuitSize', 'tubeCircuit', tubeVK.circuitSize);
330
325
  // Sanity check the tube proof (can be removed later)
331
326
  await this.verifyWithKey(tubeVK, tubeProof.binaryProof);
332
327
  // TODO(#7369): properly time tube construction
@@ -351,7 +346,7 @@ let BBNativeRollupProver = (() => {
351
346
  // Read the proof as fields
352
347
  const proof = await this.readProofAsFields(provingResult.proofPath, circuitType, proofLength);
353
348
  const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
354
- this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs / 1000);
349
+ this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs);
355
350
  this.instrumentation.recordSize('proofSize', circuitName, proof.binaryProof.buffer.length);
356
351
  this.instrumentation.recordSize('circuitPublicInputCount', circuitName, vkData.numPublicInputs);
357
352
  this.instrumentation.recordSize('circuitSize', circuitName, vkData.circuitSize);
@@ -564,4 +559,4 @@ let BBNativeRollupProver = (() => {
564
559
  _a;
565
560
  })();
566
561
  export { BBNativeRollupProver };
567
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_prover.js","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"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"}
562
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_prover.js","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"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"}
@@ -9,10 +9,13 @@ import { type TelemetryClient } from '@aztec/telemetry-client';
9
9
  */
10
10
  export declare class TestCircuitProver implements ServerCircuitProver {
11
11
  private simulationProvider?;
12
- private logger;
12
+ private opts;
13
13
  private wasmSimulator;
14
14
  private instrumentation;
15
- constructor(telemetry: TelemetryClient, simulationProvider?: SimulationProvider | undefined, logger?: import("@aztec/foundation/log").Logger);
15
+ private logger;
16
+ constructor(telemetry: TelemetryClient, simulationProvider?: SimulationProvider | undefined, opts?: {
17
+ proverTestDelayMs: number;
18
+ });
16
19
  get tracer(): import("@aztec/telemetry-client").Tracer;
17
20
  getEmptyPrivateKernelProof(inputs: PrivateKernelEmptyInputData): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>>;
18
21
  getEmptyTubeProof(inputs: PrivateKernelEmptyInputData): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>>;
@@ -53,6 +56,7 @@ export declare class TestCircuitProver implements ServerCircuitProver {
53
56
  getPublicKernelProof(kernelRequest: PublicKernelNonTailRequest): Promise<PublicInputsAndRecursiveProof<PublicKernelCircuitPublicInputs>>;
54
57
  getPublicTailProof(kernelRequest: PublicKernelTailRequest): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>>;
55
58
  getAvmProof(_inputs: AvmCircuitInputs): Promise<ProofAndVerificationKey>;
59
+ private delay;
56
60
  verifyProof(_1: ServerProtocolArtifact, _2: Proof): Promise<void>;
57
61
  }
58
62
  //# sourceMappingURL=test_circuit_prover.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"test_circuit_prover.d.ts","sourceRoot":"","sources":["../../src/test/test_circuit_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,6BAA6B,EAClC,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EAEzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,6BAA6B,EAClC,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAErB,KAAK,yBAAyB,EAC9B,KAAK,iBAAiB,EACtB,6BAA6B,EAC7B,KAAK,2BAA2B,EAEhC,KAAK,KAAK,EACV,KAAK,+BAA+B,EACpC,sBAAsB,EACtB,KAAK,cAAc,EACnB,eAAe,EACf,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,iBAAiB,EACjB,KAAK,UAAU,EACf,mBAAmB,EAIpB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAGL,KAAK,sBAAsB,EAkB5B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,kBAAkB,CAAC;AACtG,OAAO,EAAE,KAAK,eAAe,EAAa,MAAM,yBAAyB,CAAC;AAM1E;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,mBAAmB;IAMzD,OAAO,CAAC,kBAAkB,CAAC;IAC3B,OAAO,CAAC,MAAM;IANhB,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,eAAe,CAAwB;gBAG7C,SAAS,EAAE,eAAe,EAClB,kBAAkB,CAAC,gCAAoB,EACvC,MAAM,yCAAyC;IAKzD,IAAI,MAAM,6CAET;IAEY,0BAA0B,CACrC,MAAM,EAAE,2BAA2B,GAClC,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IA0BvD,iBAAiB,CAC5B,MAAM,EAAE,2BAA2B,GAClC,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IA0BpE;;;;OAIG;IAEU,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,sBAAsB,CAAC,CAAC;IA+BlH;;;;OAIG;IAEU,kBAAkB,CAC7B,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,eAAe,CAAC,OAAO,6BAA6B,CAAC,CAAC;IA+BjE;;;;OAIG;IAEU,kBAAkB,CAC7B,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;IA2BjE,YAAY,CACjB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC;QAAE,MAAM,EAAE,mBAAmB,CAAC;QAAC,SAAS,EAAE,cAAc,CAAC,OAAO,iBAAiB,CAAC,CAAA;KAAE,CAAC;IAOhG;;;;OAIG;IAEU,mBAAmB,CAC9B,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;IA2BxE;;;;OAIG;IAEU,kBAAkB,CAC7B,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,6BAA6B,CAAC,sBAAsB,CAAC,CAAC;IA4BpD,oBAAoB,CAC/B,aAAa,EAAE,0BAA0B,GACxC,OAAO,CAAC,6BAA6B,CAAC,+BAA+B,CAAC,CAAC;IAgC7D,kBAAkB,CAC7B,aAAa,EAAE,uBAAuB,GACrC,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IA0BpE,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAQjE,WAAW,CAAC,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzE"}
1
+ {"version":3,"file":"test_circuit_prover.d.ts","sourceRoot":"","sources":["../../src/test/test_circuit_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,6BAA6B,EAClC,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EAEzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,6BAA6B,EAClC,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAErB,KAAK,yBAAyB,EAC9B,KAAK,iBAAiB,EACtB,6BAA6B,EAC7B,KAAK,2BAA2B,EAEhC,KAAK,KAAK,EACV,KAAK,+BAA+B,EACpC,sBAAsB,EACtB,KAAK,cAAc,EACnB,eAAe,EACf,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,iBAAiB,EACjB,KAAK,UAAU,EACf,mBAAmB,EAIpB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAGL,KAAK,sBAAsB,EAkB5B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,kBAAkB,CAAC;AACtG,OAAO,EAAE,KAAK,eAAe,EAAa,MAAM,yBAAyB,CAAC;AAM1E;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,mBAAmB;IAOzD,OAAO,CAAC,kBAAkB,CAAC;IAC3B,OAAO,CAAC,IAAI;IAPd,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,eAAe,CAAwB;IAC/C,OAAO,CAAC,MAAM,CAA0C;gBAGtD,SAAS,EAAE,eAAe,EAClB,kBAAkB,CAAC,gCAAoB,EACvC,IAAI,GAAE;QAAE,iBAAiB,EAAE,MAAM,CAAA;KAA6B;IAKxE,IAAI,MAAM,6CAET;IAEY,0BAA0B,CACrC,MAAM,EAAE,2BAA2B,GAClC,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IA0BvD,iBAAiB,CAC5B,MAAM,EAAE,2BAA2B,GAClC,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IA0BpE;;;;OAIG;IAEU,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,sBAAsB,CAAC,CAAC;IA+BlH;;;;OAIG;IAEU,kBAAkB,CAC7B,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,eAAe,CAAC,OAAO,6BAA6B,CAAC,CAAC;IA+BjE;;;;OAIG;IAEU,kBAAkB,CAC7B,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;IA4B3D,YAAY,CACvB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC;QAAE,MAAM,EAAE,mBAAmB,CAAC;QAAC,SAAS,EAAE,cAAc,CAAC,OAAO,iBAAiB,CAAC,CAAA;KAAE,CAAC;IAQhG;;;;OAIG;IAEU,mBAAmB,CAC9B,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;IA4BxE;;;;OAIG;IAEU,kBAAkB,CAC7B,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,6BAA6B,CAAC,sBAAsB,CAAC,CAAC;IA6BpD,oBAAoB,CAC/B,aAAa,EAAE,0BAA0B,GACxC,OAAO,CAAC,6BAA6B,CAAC,+BAA+B,CAAC,CAAC;IAgC7D,kBAAkB,CAC7B,aAAa,EAAE,uBAAuB,GACrC,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IA0BvD,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,uBAAuB,CAAC;YAQvE,KAAK;IAOZ,WAAW,CAAC,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzE"}
@@ -2,6 +2,7 @@ import { __esDecorate, __runInitializers } from "tslib";
2
2
  import { makePublicInputsAndRecursiveProof, } from '@aztec/circuit-types';
3
3
  import { EmptyNestedData, NESTED_RECURSIVE_PROOF_LENGTH, PrivateKernelEmptyInputs, RECURSIVE_PROOF_LENGTH, RootParityInput, TUBE_PROOF_LENGTH, VerificationKeyData, makeEmptyProof, makeEmptyRecursiveProof, makeRecursiveProof, } from '@aztec/circuits.js';
4
4
  import { createDebugLogger } from '@aztec/foundation/log';
5
+ import { sleep } from '@aztec/foundation/sleep';
5
6
  import { Timer } from '@aztec/foundation/timer';
6
7
  import { ProtocolCircuitVkIndexes, ProtocolCircuitVks, SimulatedServerCircuitArtifacts, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap, convertPrivateKernelEmptyInputsToWitnessMap, convertPrivateKernelEmptyOutputsFromWitnessMap, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap, convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap, convertSimulatedBaseRollupInputsToWitnessMap, convertSimulatedBaseRollupOutputsFromWitnessMap, convertSimulatedPrivateKernelEmptyOutputsFromWitnessMap, convertSimulatedPublicTailInputsToWitnessMap, convertSimulatedPublicTailOutputFromWitnessMap, getVKSiblingPath, } from '@aztec/noir-protocol-circuits-types';
7
8
  import { WASMSimulator, emitCircuitSimulationStats } from '@aztec/simulator';
@@ -24,10 +25,11 @@ let TestCircuitProver = (() => {
24
25
  let _getPublicKernelProof_decorators;
25
26
  let _getPublicTailProof_decorators;
26
27
  return _a = class TestCircuitProver {
27
- constructor(telemetry, simulationProvider, logger = createDebugLogger('aztec:test-prover')) {
28
+ constructor(telemetry, simulationProvider, opts = { proverTestDelayMs: 0 }) {
28
29
  this.simulationProvider = (__runInitializers(this, _instanceExtraInitializers), simulationProvider);
29
- this.logger = logger;
30
+ this.opts = opts;
30
31
  this.wasmSimulator = new WASMSimulator();
32
+ this.logger = createDebugLogger('aztec:test-prover');
31
33
  this.instrumentation = new ProverInstrumentation(telemetry, 'TestCircuitProver');
32
34
  }
33
35
  get tracer() {
@@ -39,6 +41,7 @@ let TestCircuitProver = (() => {
39
41
  const witnessMap = convertPrivateKernelEmptyInputsToWitnessMap(kernelInputs);
40
42
  const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.PrivateKernelEmptyArtifact);
41
43
  const result = convertSimulatedPrivateKernelEmptyOutputsFromWitnessMap(witness);
44
+ await this.delay();
42
45
  return makePublicInputsAndRecursiveProof(result, makeRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['PrivateKernelEmptyArtifact']);
43
46
  }
44
47
  async getEmptyTubeProof(inputs) {
@@ -47,6 +50,7 @@ let TestCircuitProver = (() => {
47
50
  const witnessMap = convertPrivateKernelEmptyInputsToWitnessMap(kernelInputs);
48
51
  const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.PrivateKernelEmptyArtifact);
49
52
  const result = convertPrivateKernelEmptyOutputsFromWitnessMap(witness);
53
+ await this.delay();
50
54
  return makePublicInputsAndRecursiveProof(result, makeRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFake());
51
55
  }
52
56
  /**
@@ -63,6 +67,7 @@ let TestCircuitProver = (() => {
63
67
  const rootParityInput = new RootParityInput(makeRecursiveProof(RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['BaseParityArtifact'].keyAsFields, getVKSiblingPath(ProtocolCircuitVkIndexes['BaseParityArtifact']), result);
64
68
  this.instrumentation.recordDuration('simulationDuration', 'base-parity', timer);
65
69
  emitCircuitSimulationStats('base-parity', timer.ms(), inputs.toBuffer().length, result.toBuffer().length, this.logger);
70
+ await this.delay();
66
71
  return Promise.resolve(rootParityInput);
67
72
  }
68
73
  /**
@@ -79,6 +84,7 @@ let TestCircuitProver = (() => {
79
84
  const rootParityInput = new RootParityInput(makeRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['RootParityArtifact'].keyAsFields, getVKSiblingPath(ProtocolCircuitVkIndexes['RootParityArtifact']), result);
80
85
  this.instrumentation.recordDuration('simulationDuration', 'root-parity', timer);
81
86
  emitCircuitSimulationStats('root-parity', timer.ms(), inputs.toBuffer().length, result.toBuffer().length, this.logger);
87
+ await this.delay();
82
88
  return Promise.resolve(rootParityInput);
83
89
  }
84
90
  /**
@@ -94,13 +100,15 @@ let TestCircuitProver = (() => {
94
100
  const result = convertSimulatedBaseRollupOutputsFromWitnessMap(witness);
95
101
  this.instrumentation.recordDuration('simulationDuration', 'base-rollup', timer);
96
102
  emitCircuitSimulationStats('base-rollup', timer.ms(), input.toBuffer().length, result.toBuffer().length, this.logger);
103
+ await this.delay();
97
104
  return makePublicInputsAndRecursiveProof(result, makeRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['BaseRollupArtifact']);
98
105
  }
99
- getTubeProof(_tubeInput) {
100
- return Promise.resolve({
106
+ async getTubeProof(_tubeInput) {
107
+ await this.delay();
108
+ return {
101
109
  tubeVK: VerificationKeyData.makeFake(),
102
110
  tubeProof: makeEmptyRecursiveProof(TUBE_PROOF_LENGTH),
103
- });
111
+ };
104
112
  }
105
113
  /**
106
114
  * Simulates the merge rollup circuit from its inputs.
@@ -115,6 +123,7 @@ let TestCircuitProver = (() => {
115
123
  const result = convertMergeRollupOutputsFromWitnessMap(witness);
116
124
  this.instrumentation.recordDuration('simulationDuration', 'merge-rollup', timer);
117
125
  emitCircuitSimulationStats('merge-rollup', timer.ms(), input.toBuffer().length, result.toBuffer().length, this.logger);
126
+ await this.delay();
118
127
  return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['MergeRollupArtifact']);
119
128
  }
120
129
  /**
@@ -130,6 +139,7 @@ let TestCircuitProver = (() => {
130
139
  const result = convertRootRollupOutputsFromWitnessMap(witness);
131
140
  this.instrumentation.recordDuration('simulationDuration', 'root-rollup', timer);
132
141
  emitCircuitSimulationStats('root-rollup', timer.ms(), input.toBuffer().length, result.toBuffer().length, this.logger);
142
+ await this.delay();
133
143
  return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['RootRollupArtifact']);
134
144
  }
135
145
  async getPublicKernelProof(kernelRequest) {
@@ -144,6 +154,7 @@ let TestCircuitProver = (() => {
144
154
  const circuitName = mapPublicKernelToCircuitName(kernelRequest.type);
145
155
  this.instrumentation.recordDuration('simulationDuration', circuitName, timer);
146
156
  emitCircuitSimulationStats(circuitName, timer.ms(), kernelRequest.inputs.toBuffer().length, result.toBuffer().length, this.logger);
157
+ await this.delay();
147
158
  return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks[kernelOps.artifact]);
148
159
  }
149
160
  async getPublicTailProof(kernelRequest) {
@@ -154,13 +165,20 @@ let TestCircuitProver = (() => {
154
165
  const result = convertSimulatedPublicTailOutputFromWitnessMap(witness);
155
166
  this.instrumentation.recordDuration('simulationDuration', 'public-kernel-tail', timer);
156
167
  emitCircuitSimulationStats('public-kernel-tail', timer.ms(), kernelRequest.inputs.toBuffer().length, result.toBuffer().length, this.logger);
168
+ await this.delay();
157
169
  return makePublicInputsAndRecursiveProof(result, makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH), ProtocolCircuitVks['PublicKernelTailArtifact']);
158
170
  }
159
- getAvmProof(_inputs) {
171
+ async getAvmProof(_inputs) {
160
172
  // We can't simulate the AVM because we don't have enough context to do so (e.g., DBs).
161
173
  // We just return an empty proof and VK data.
162
174
  this.logger.debug('Skipping AVM simulation in TestCircuitProver.');
163
- return Promise.resolve({ proof: makeEmptyProof(), verificationKey: VerificationKeyData.makeFake() });
175
+ await this.delay();
176
+ return { proof: makeEmptyProof(), verificationKey: VerificationKeyData.makeFake() };
177
+ }
178
+ async delay() {
179
+ if (this.opts.proverTestDelayMs > 0) {
180
+ await sleep(this.opts.proverTestDelayMs);
181
+ }
164
182
  }
165
183
  // Not implemented for test circuits
166
184
  verifyProof(_1, _2) {
@@ -188,4 +206,4 @@ let TestCircuitProver = (() => {
188
206
  _a;
189
207
  })();
190
208
  export { TestCircuitProver };
191
- //# 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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"}
209
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test_circuit_prover.js","sourceRoot":"","sources":["../../src/test/test_circuit_prover.ts"],"names":[],"mappings":";AAAA,OAAO,EAML,iCAAiC,GAClC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAKL,eAAe,EAGf,6BAA6B,EAE7B,wBAAwB,EAGxB,sBAAsB,EAEtB,eAAe,EAIf,iBAAiB,EAEjB,mBAAmB,EACnB,cAAc,EACd,uBAAuB,EACvB,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAElB,+BAA+B,EAC/B,mCAAmC,EACnC,sCAAsC,EACtC,oCAAoC,EACpC,uCAAuC,EACvC,2CAA2C,EAC3C,8CAA8C,EAC9C,mCAAmC,EACnC,sCAAsC,EACtC,mCAAmC,EACnC,sCAAsC,EACtC,4CAA4C,EAC5C,+CAA+C,EAC/C,uDAAuD,EACvD,4CAA4C,EAC5C,8CAA8C,EAC9C,gBAAgB,GACjB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAA2B,aAAa,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AACtG,OAAO,EAAwB,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAE1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,oCAAoC,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAE3D;;;GAGG;IACU,iBAAiB;;;;;;;;;;sBAAjB,iBAAiB;YAK5B,YACE,SAA0B,EAClB,kBAAuC,EACvC,OAAsC,EAAE,iBAAiB,EAAE,CAAC,EAAE;gBAD9D,uBAAkB,IAPjB,mDAAiB,EAOlB,kBAAkB,EAAqB;gBACvC,SAAI,GAAJ,IAAI,CAA0D;gBAPhE,kBAAa,GAAG,IAAI,aAAa,EAAE,CAAC;gBAEpC,WAAM,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;gBAOtD,IAAI,CAAC,eAAe,GAAG,IAAI,qBAAqB,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;YACnF,CAAC;YAED,IAAI,MAAM;gBACR,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;YACrC,CAAC;YAEM,KAAK,CAAC,0BAA0B,CACrC,MAAmC;gBAEnC,MAAM,WAAW,GAAG,IAAI,eAAe,CACrC,kBAAkB,CAAC,sBAAsB,CAAC,EAC1C,kBAAkB,CAAC,qBAAqB,CAAC,CAAC,WAAW,CACtD,CAAC;gBACF,MAAM,YAAY,GAAG,IAAI,wBAAwB,CAC/C,WAAW,EACX,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,UAAU,CAClB,CAAC;gBACF,MAAM,UAAU,GAAG,2CAA2C,CAAC,YAAY,CAAC,CAAC;gBAC7E,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CACtD,UAAU,EACV,+BAA+B,CAAC,0BAA0B,CAC3D,CAAC;gBACF,MAAM,MAAM,GAAG,uDAAuD,CAAC,OAAO,CAAC,CAAC;gBAChF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,iCAAiC,CACtC,MAAM,EACN,kBAAkB,CAAC,6BAA6B,CAAC,EACjD,kBAAkB,CAAC,4BAA4B,CAAC,CACjD,CAAC;YACJ,CAAC;YAEM,KAAK,CAAC,iBAAiB,CAC5B,MAAmC;gBAEnC,MAAM,WAAW,GAAG,IAAI,eAAe,CACrC,kBAAkB,CAAC,sBAAsB,CAAC,EAC1C,kBAAkB,CAAC,qBAAqB,CAAC,CAAC,WAAW,CACtD,CAAC;gBACF,MAAM,YAAY,GAAG,IAAI,wBAAwB,CAC/C,WAAW,EACX,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,UAAU,CAClB,CAAC;gBACF,MAAM,UAAU,GAAG,2CAA2C,CAAC,YAAY,CAAC,CAAC;gBAC7E,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CACtD,UAAU,EACV,+BAA+B,CAAC,0BAA0B,CAC3D,CAAC;gBACF,MAAM,MAAM,GAAG,8CAA8C,CAAC,OAAO,CAAC,CAAC;gBACvE,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,iCAAiC,CACtC,MAAM,EACN,kBAAkB,CAAC,6BAA6B,CAAC,EACjD,mBAAmB,CAAC,QAAQ,EAAE,CAC/B,CAAC;YACJ,CAAC;YAED;;;;eAIG;YAEI,KAAK,CAAC,kBAAkB,CAAC,MAAwB;gBACtD,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;gBAC1B,MAAM,UAAU,GAAG,mCAAmC,CAAC,MAAM,CAAC,CAAC;gBAE/D,mDAAmD;gBACnD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CACtD,UAAU,EACV,+BAA+B,CAAC,kBAAkB,CACnD,CAAC;gBACF,MAAM,MAAM,GAAG,sCAAsC,CAAC,OAAO,CAAC,CAAC;gBAE/D,MAAM,eAAe,GAAG,IAAI,eAAe,CACzC,kBAAkB,CAAgC,sBAAsB,CAAC,EACzE,kBAAkB,CAAC,oBAAoB,CAAC,CAAC,WAAW,EACpD,gBAAgB,CAAC,wBAAwB,CAAC,oBAAoB,CAAC,CAAC,EAChE,MAAM,CACP,CAAC;gBAEF,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,oBAAoB,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;gBAEhF,0BAA0B,CACxB,aAAa,EACb,KAAK,CAAC,EAAE,EAAE,EACV,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EACxB,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EACxB,IAAI,CAAC,MAAM,CACZ,CAAC;gBACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YAC1C,CAAC;YAED;;;;eAIG;YAEI,KAAK,CAAC,kBAAkB,CAC7B,MAAwB;gBAExB,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;gBAC1B,MAAM,UAAU,GAAG,mCAAmC,CAAC,MAAM,CAAC,CAAC;gBAE/D,mDAAmD;gBACnD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CACtD,UAAU,EACV,+BAA+B,CAAC,kBAAkB,CACnD,CAAC;gBAEF,MAAM,MAAM,GAAG,sCAAsC,CAAC,OAAO,CAAC,CAAC;gBAE/D,MAAM,eAAe,GAAG,IAAI,eAAe,CACzC,kBAAkB,CAAuC,6BAA6B,CAAC,EACvF,kBAAkB,CAAC,oBAAoB,CAAC,CAAC,WAAW,EACpD,gBAAgB,CAAC,wBAAwB,CAAC,oBAAoB,CAAC,CAAC,EAChE,MAAM,CACP,CAAC;gBAEF,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,oBAAoB,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;gBAChF,0BAA0B,CACxB,aAAa,EACb,KAAK,CAAC,EAAE,EAAE,EACV,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EACxB,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EACxB,IAAI,CAAC,MAAM,CACZ,CAAC;gBACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YAC1C,CAAC;YAED;;;;eAIG;YAEI,KAAK,CAAC,kBAAkB,CAC7B,KAAuB;gBAEvB,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;gBAC1B,MAAM,UAAU,GAAG,4CAA4C,CAAC,KAAK,CAAC,CAAC;gBAEvE,MAAM,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,aAAa,CAAC;gBACzE,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,eAAe,CACtD,UAAU,EACV,+BAA+B,CAAC,kBAAkB,CACnD,CAAC;gBAEF,MAAM,MAAM,GAAG,+CAA+C,CAAC,OAAO,CAAC,CAAC;gBAExE,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,oBAAoB,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;gBAChF,0BAA0B,CACxB,aAAa,EACb,KAAK,CAAC,EAAE,EAAE,EACV,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,EACvB,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EACxB,IAAI,CAAC,MAAM,CACZ,CAAC;gBACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,iCAAiC,CACtC,MAAM,EACN,kBAAkB,CAAC,6BAA6B,CAAC,EACjD,kBAAkB,CAAC,oBAAoB,CAAC,CACzC,CAAC;YACJ,CAAC;YAEM,KAAK,CAAC,YAAY,CACvB,UAAsB;gBAEtB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO;oBACL,MAAM,EAAE,mBAAmB,CAAC,QAAQ,EAAE;oBACtC,SAAS,EAAE,uBAAuB,CAAC,iBAAiB,CAAC;iBACtD,CAAC;YACJ,CAAC;YAED;;;;eAIG;YAEI,KAAK,CAAC,mBAAmB,CAC9B,KAAwB;gBAExB,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;gBAC1B,MAAM,UAAU,GAAG,oCAAoC,CAAC,KAAK,CAAC,CAAC;gBAE/D,mDAAmD;gBACnD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CACtD,UAAU,EACV,+BAA+B,CAAC,mBAAmB,CACpD,CAAC;gBAEF,MAAM,MAAM,GAAG,uCAAuC,CAAC,OAAO,CAAC,CAAC;gBAEhE,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,oBAAoB,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;gBACjF,0BAA0B,CACxB,cAAc,EACd,KAAK,CAAC,EAAE,EAAE,EACV,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,EACvB,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EACxB,IAAI,CAAC,MAAM,CACZ,CAAC;gBACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,iCAAiC,CACtC,MAAM,EACN,uBAAuB,CAAC,6BAA6B,CAAC,EACtD,kBAAkB,CAAC,qBAAqB,CAAC,CAC1C,CAAC;YACJ,CAAC;YAED;;;;eAIG;YAEI,KAAK,CAAC,kBAAkB,CAC7B,KAAuB;gBAEvB,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;gBAC1B,MAAM,UAAU,GAAG,mCAAmC,CAAC,KAAK,CAAC,CAAC;gBAE9D,mDAAmD;gBACnD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CACtD,UAAU,EACV,+BAA+B,CAAC,kBAAkB,CACnD,CAAC;gBAEF,MAAM,MAAM,GAAG,sCAAsC,CAAC,OAAO,CAAC,CAAC;gBAE/D,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,oBAAoB,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;gBAChF,0BAA0B,CACxB,aAAa,EACb,KAAK,CAAC,EAAE,EAAE,EACV,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,EACvB,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EACxB,IAAI,CAAC,MAAM,CACZ,CAAC;gBACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,iCAAiC,CACtC,MAAM,EACN,uBAAuB,CAAC,6BAA6B,CAAC,EACtD,kBAAkB,CAAC,oBAAoB,CAAC,CACzC,CAAC;YACJ,CAAC;YAGM,KAAK,CAAC,oBAAoB,CAC/B,aAAyC;gBAEzC,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;gBAC1B,MAAM,SAAS,GAAG,oCAAoC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBAC3E,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;oBAC5B,MAAM,IAAI,KAAK,CAAC,mCAAmC,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC3E,CAAC;gBACD,MAAM,UAAU,GAAG,SAAS,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;gBAEjE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CACtD,UAAU,EACV,+BAA+B,CAAC,SAAS,CAAC,QAAQ,CAAC,CACpD,CAAC;gBAEF,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;gBACjD,MAAM,WAAW,GAAG,4BAA4B,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBACrE,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,oBAAoB,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;gBAC9E,0BAA0B,CACxB,WAAW,EACX,KAAK,CAAC,EAAE,EAAE,EACV,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EACtC,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EACxB,IAAI,CAAC,MAAM,CACZ,CAAC;gBACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,iCAAiC,CACtC,MAAM,EACN,uBAAuB,CAAC,6BAA6B,CAAC,EACtD,kBAAkB,CAAC,SAAS,CAAC,QAAQ,CAAC,CACvC,CAAC;YACJ,CAAC;YAGM,KAAK,CAAC,kBAAkB,CAC7B,aAAsC;gBAEtC,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;gBAC1B,MAAM,UAAU,GAAG,4CAA4C,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;gBACtF,mDAAmD;gBACnD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CACtD,UAAU,EACV,+BAA+B,CAAC,0BAA0B,CAAC,CAC5D,CAAC;gBAEF,MAAM,MAAM,GAAG,8CAA8C,CAAC,OAAO,CAAC,CAAC;gBACvE,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,oBAAoB,EAAE,oBAAoB,EAAE,KAAK,CAAC,CAAC;gBACvF,0BAA0B,CACxB,oBAAoB,EACpB,KAAK,CAAC,EAAE,EAAE,EACV,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EACtC,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EACxB,IAAI,CAAC,MAAM,CACZ,CAAC;gBACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,iCAAiC,CACtC,MAAM,EACN,uBAAuB,CAAC,6BAA6B,CAAC,EACtD,kBAAkB,CAAC,0BAA0B,CAAC,CAC/C,CAAC;YACJ,CAAC;YAEM,KAAK,CAAC,WAAW,CAAC,OAAyB;gBAChD,uFAAuF;gBACvF,6CAA6C;gBAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;gBACnE,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,eAAe,EAAE,mBAAmB,CAAC,QAAQ,EAAE,EAAE,CAAC;YACtF,CAAC;YAEO,KAAK,CAAC,KAAK;gBACjB,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,EAAE,CAAC;oBACpC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBAC3C,CAAC;YACH,CAAC;YAED,oCAAoC;YAC7B,WAAW,CAAC,EAA0B,EAAE,EAAS;gBACtD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC;YAC9D,CAAC;;;;8CA7QA,SAAS,CAAC,sCAAsC,CAAC;8CAqCjD,SAAS,CAAC,sCAAsC,CAAC;8CAuCjD,SAAS,CAAC,sCAAsC,CAAC;+CA8CjD,SAAS,CAAC,uCAAuC,CAAC;8CAoClD,SAAS,CAAC,sCAAsC,CAAC;gDA+BjD,SAAS,CAAC,wCAAwC,CAAC;8CAkCnD,SAAS,CAAC,sCAAsC,CAAC;YA9NlD,uMAAa,kBAAkB,6DA6B9B;YAQD,uMAAa,kBAAkB,6DA+B9B;YAQD,uMAAa,kBAAkB,6DA4B9B;YAkBD,0MAAa,mBAAmB,6DA4B/B;YAQD,uMAAa,kBAAkB,6DA4B9B;YAGD,6MAAa,oBAAoB,6DA+BhC;YAGD,uMAAa,kBAAkB,6DA0B9B;;;;;SAxUU,iBAAiB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/bb-prover",
3
- "version": "0.47.1",
3
+ "version": "0.48.0",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js"
@@ -59,12 +59,12 @@
59
59
  ]
60
60
  },
61
61
  "dependencies": {
62
- "@aztec/circuit-types": "0.47.1",
63
- "@aztec/circuits.js": "0.47.1",
64
- "@aztec/foundation": "0.47.1",
65
- "@aztec/noir-protocol-circuits-types": "0.47.1",
66
- "@aztec/simulator": "0.47.1",
67
- "@aztec/telemetry-client": "0.47.1",
62
+ "@aztec/circuit-types": "0.48.0",
63
+ "@aztec/circuits.js": "0.48.0",
64
+ "@aztec/foundation": "0.48.0",
65
+ "@aztec/noir-protocol-circuits-types": "0.48.0",
66
+ "@aztec/simulator": "0.48.0",
67
+ "@aztec/telemetry-client": "0.48.0",
68
68
  "@msgpack/msgpack": "^3.0.0-beta2",
69
69
  "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
70
70
  "@noir-lang/types": "portal:../../noir/packages/types",
@@ -8,6 +8,7 @@ import {
8
8
  type TelemetryClient,
9
9
  type Tracer,
10
10
  ValueType,
11
+ millisecondBuckets,
11
12
  } from '@aztec/telemetry-client';
12
13
 
13
14
  /**
@@ -15,8 +16,8 @@ import {
15
16
  */
16
17
  export class ProverInstrumentation {
17
18
  private simulationDuration: Histogram;
18
- private witGenDuration: Gauge;
19
- private provingDuration: Gauge;
19
+ private witGenDuration: Histogram;
20
+ private provingDuration: Histogram;
20
21
 
21
22
  private witGenInputSize: Gauge;
22
23
  private witGenOutputSize: Gauge;
@@ -33,25 +34,29 @@ export class ProverInstrumentation {
33
34
 
34
35
  this.simulationDuration = meter.createHistogram(Metrics.CIRCUIT_SIMULATION_DURATION, {
35
36
  description: 'Records how long it takes to simulate a circuit',
36
- unit: 's',
37
- valueType: ValueType.DOUBLE,
37
+ unit: 'ms',
38
+ valueType: ValueType.INT,
38
39
  advice: {
39
- explicitBucketBoundaries: [0.1, 0.25, 0.5, 1, 2.5, 5, 10, 30, 60],
40
+ explicitBucketBoundaries: millisecondBuckets(1), // 10ms -> ~327s
40
41
  },
41
42
  });
42
43
 
43
- this.witGenDuration = meter.createGauge(Metrics.CIRCUIT_WITNESS_GEN_DURATION, {
44
+ this.witGenDuration = meter.createHistogram(Metrics.CIRCUIT_WITNESS_GEN_DURATION, {
44
45
  description: 'Records how long it takes to generate the partial witness for a circuit',
45
- unit: 's',
46
- valueType: ValueType.DOUBLE,
46
+ unit: 'ms',
47
+ valueType: ValueType.INT,
48
+ advice: {
49
+ explicitBucketBoundaries: millisecondBuckets(1),
50
+ },
47
51
  });
48
52
 
49
- // ideally this would be a histogram, but proving takes a long time on the server
50
- // and they don't happen that often so Prometheus & Grafana have a hard time handling it
51
- this.provingDuration = meter.createGauge(Metrics.CIRCUIT_PROVING_DURATION, {
52
- unit: 's',
53
+ this.provingDuration = meter.createHistogram(Metrics.CIRCUIT_PROVING_DURATION, {
54
+ unit: 'ms',
53
55
  description: 'Records how long it takes to prove a circuit',
54
- valueType: ValueType.DOUBLE,
56
+ valueType: ValueType.INT,
57
+ advice: {
58
+ explicitBucketBoundaries: millisecondBuckets(2), // 100ms -> 54 minutes
59
+ },
55
60
  });
56
61
 
57
62
  this.witGenInputSize = meter.createGauge(Metrics.CIRCUIT_WITNESS_GEN_INPUT_SIZE, {
@@ -87,15 +92,15 @@ export class ProverInstrumentation {
87
92
  * Records the duration of a circuit operation.
88
93
  * @param metric - The metric to record
89
94
  * @param circuitName - The name of the circuit
90
- * @param timerOrS - The duration
95
+ * @param timerOrMS - The duration
91
96
  */
92
97
  recordDuration(
93
98
  metric: 'simulationDuration' | 'witGenDuration' | 'provingDuration',
94
- circuitName: CircuitName,
95
- timerOrS: Timer | number,
99
+ circuitName: CircuitName | 'tubeCircuit',
100
+ timerOrMS: Timer | number,
96
101
  ) {
97
- const s = typeof timerOrS === 'number' ? timerOrS : timerOrS.s();
98
- this[metric].record(s, {
102
+ const ms = typeof timerOrMS === 'number' ? timerOrMS : timerOrMS.ms();
103
+ this[metric].record(Math.ceil(ms), {
99
104
  [Attributes.PROTOCOL_CIRCUIT_NAME]: circuitName,
100
105
  [Attributes.PROTOCOL_CIRCUIT_TYPE]: 'server',
101
106
  });
@@ -105,11 +110,11 @@ export class ProverInstrumentation {
105
110
  * Records the duration of an AVM circuit operation.
106
111
  * @param metric - The metric to record
107
112
  * @param appCircuitName - The name of the function circuit (should be a `contract:function` string)
108
- * @param timerOrS - The duration
113
+ * @param timerOrMS - The duration
109
114
  */
110
- recordAvmDuration(metric: 'witGenDuration' | 'provingDuration', appCircuitName: string, timerOrS: Timer | number) {
111
- const s = typeof timerOrS === 'number' ? timerOrS : timerOrS.s();
112
- this[metric].record(s, {
115
+ recordAvmDuration(metric: 'witGenDuration' | 'provingDuration', appCircuitName: string, timerOrMS: Timer | number) {
116
+ const ms = typeof timerOrMS === 'number' ? timerOrMS : timerOrMS.s();
117
+ this[metric].record(Math.ceil(ms), {
113
118
  [Attributes.APP_CIRCUIT_NAME]: appCircuitName,
114
119
  });
115
120
  }
@@ -122,7 +127,7 @@ export class ProverInstrumentation {
122
127
  */
123
128
  recordSize(
124
129
  metric: 'witGenInputSize' | 'witGenOutputSize' | 'proofSize' | 'circuitSize' | 'circuitPublicInputCount',
125
- circuitName: CircuitName,
130
+ circuitName: CircuitName | 'tubeCircuit',
126
131
  size: number,
127
132
  ) {
128
133
  this[metric].record(Math.ceil(size), {
@@ -31,7 +31,7 @@ import {
31
31
  type RootRollupInputs,
32
32
  type RootRollupPublicInputs,
33
33
  TUBE_PROOF_LENGTH,
34
- TubeInputs,
34
+ type TubeInputs,
35
35
  type VerificationKeyAsFields,
36
36
  type VerificationKeyData,
37
37
  makeRecursiveProofFromBinary,
@@ -226,16 +226,6 @@ export class BBNativeRollupProver implements ServerCircuitProver {
226
226
  kernelRequest.inputs.previousKernel.vk,
227
227
  );
228
228
 
229
- // PUBLIC KERNEL: kernel request should be nonempty at start of public kernel proving but it is not
230
- // TODO(#7369): We should properly enqueue the tube in the public kernel lifetime
231
- if (!kernelRequest.inputs.previousKernel.clientIvcProof.isEmpty()) {
232
- const { tubeVK, tubeProof } = await this.getTubeProof(
233
- new TubeInputs(kernelRequest.inputs.previousKernel.clientIvcProof),
234
- );
235
- kernelRequest.inputs.previousKernel.vk = tubeVK;
236
- kernelRequest.inputs.previousKernel.proof = tubeProof;
237
- }
238
-
239
229
  await this.verifyWithKey(
240
230
  kernelRequest.inputs.previousKernel.vk,
241
231
  kernelRequest.inputs.previousKernel.proof.binaryProof,
@@ -289,9 +279,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
289
279
  ): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>> {
290
280
  // We may need to convert the recursive proof into fields format
291
281
  logger.debug(`kernel Data proof: ${baseRollupInput.kernelData.proof}`);
292
- logger.info(`in getBaseRollupProof`);
293
- logger.info(`Number of public inputs in baseRollupInput: ${baseRollupInput.kernelData.vk.numPublicInputs}`);
294
- logger.info(`Number of public inputs ${baseRollupInput.kernelData.publicInputs}`);
282
+ logger.debug(`Number of public inputs in baseRollupInput: ${baseRollupInput.kernelData.vk.numPublicInputs}`);
295
283
  baseRollupInput.kernelData.proof = await this.ensureValidProof(
296
284
  baseRollupInput.kernelData.proof,
297
285
  'BaseRollupArtifact',
@@ -477,7 +465,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
477
465
  this.instrumentation.recordSize('witGenInputSize', circuitName, input.toBuffer().length);
478
466
  this.instrumentation.recordSize('witGenOutputSize', circuitName, output.toBuffer().length);
479
467
 
480
- logger.debug(`Generated witness`, {
468
+ logger.info(`Generated witness`, {
481
469
  circuitName,
482
470
  duration: timer.ms(),
483
471
  inputSize: input.toBuffer().length,
@@ -531,7 +519,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
531
519
  const proof = new Proof(rawProof, vkData.numPublicInputs);
532
520
  const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
533
521
 
534
- this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs / 1000);
522
+ this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs);
535
523
  this.instrumentation.recordSize('proofSize', circuitName, proof.buffer.length);
536
524
  this.instrumentation.recordSize('circuitPublicInputCount', circuitName, vkData.numPublicInputs);
537
525
  this.instrumentation.recordSize('circuitSize', circuitName, vkData.circuitSize);
@@ -634,6 +622,12 @@ export class BBNativeRollupProver implements ServerCircuitProver {
634
622
  // Read the proof as fields
635
623
  const tubeVK = await extractVkData(provingResult.vkPath!);
636
624
  const tubeProof = await this.readTubeProofAsFields(provingResult.proofPath!, tubeVK, TUBE_PROOF_LENGTH);
625
+
626
+ this.instrumentation.recordDuration('provingDuration', 'tubeCircuit', provingResult.durationMs);
627
+ this.instrumentation.recordSize('proofSize', 'tubeCircuit', tubeProof.binaryProof.buffer.length);
628
+ this.instrumentation.recordSize('circuitPublicInputCount', 'tubeCircuit', tubeVK.numPublicInputs);
629
+ this.instrumentation.recordSize('circuitSize', 'tubeCircuit', tubeVK.circuitSize);
630
+
637
631
  // Sanity check the tube proof (can be removed later)
638
632
  await this.verifyWithKey(tubeVK, tubeProof.binaryProof);
639
633
 
@@ -681,7 +675,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
681
675
  const proof = await this.readProofAsFields(provingResult.proofPath!, circuitType, proofLength);
682
676
 
683
677
  const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
684
- this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs / 1000);
678
+ this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs);
685
679
  this.instrumentation.recordSize('proofSize', circuitName, proof.binaryProof.buffer.length);
686
680
  this.instrumentation.recordSize('circuitPublicInputCount', circuitName, vkData.numPublicInputs);
687
681
  this.instrumentation.recordSize('circuitSize', circuitName, vkData.circuitSize);
@@ -33,6 +33,7 @@ import {
33
33
  makeRecursiveProof,
34
34
  } from '@aztec/circuits.js';
35
35
  import { createDebugLogger } from '@aztec/foundation/log';
36
+ import { sleep } from '@aztec/foundation/sleep';
36
37
  import { Timer } from '@aztec/foundation/timer';
37
38
  import {
38
39
  ProtocolCircuitVkIndexes,
@@ -70,11 +71,12 @@ import { mapPublicKernelToCircuitName } from '../stats.js';
70
71
  export class TestCircuitProver implements ServerCircuitProver {
71
72
  private wasmSimulator = new WASMSimulator();
72
73
  private instrumentation: ProverInstrumentation;
74
+ private logger = createDebugLogger('aztec:test-prover');
73
75
 
74
76
  constructor(
75
77
  telemetry: TelemetryClient,
76
78
  private simulationProvider?: SimulationProvider,
77
- private logger = createDebugLogger('aztec:test-prover'),
79
+ private opts: { proverTestDelayMs: number } = { proverTestDelayMs: 0 },
78
80
  ) {
79
81
  this.instrumentation = new ProverInstrumentation(telemetry, 'TestCircuitProver');
80
82
  }
@@ -103,7 +105,7 @@ export class TestCircuitProver implements ServerCircuitProver {
103
105
  SimulatedServerCircuitArtifacts.PrivateKernelEmptyArtifact,
104
106
  );
105
107
  const result = convertSimulatedPrivateKernelEmptyOutputsFromWitnessMap(witness);
106
-
108
+ await this.delay();
107
109
  return makePublicInputsAndRecursiveProof(
108
110
  result,
109
111
  makeRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
@@ -131,7 +133,7 @@ export class TestCircuitProver implements ServerCircuitProver {
131
133
  SimulatedServerCircuitArtifacts.PrivateKernelEmptyArtifact,
132
134
  );
133
135
  const result = convertPrivateKernelEmptyOutputsFromWitnessMap(witness);
134
-
136
+ await this.delay();
135
137
  return makePublicInputsAndRecursiveProof(
136
138
  result,
137
139
  makeRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
@@ -172,7 +174,7 @@ export class TestCircuitProver implements ServerCircuitProver {
172
174
  result.toBuffer().length,
173
175
  this.logger,
174
176
  );
175
-
177
+ await this.delay();
176
178
  return Promise.resolve(rootParityInput);
177
179
  }
178
180
 
@@ -211,7 +213,7 @@ export class TestCircuitProver implements ServerCircuitProver {
211
213
  result.toBuffer().length,
212
214
  this.logger,
213
215
  );
214
-
216
+ await this.delay();
215
217
  return Promise.resolve(rootParityInput);
216
218
  }
217
219
 
@@ -243,6 +245,7 @@ export class TestCircuitProver implements ServerCircuitProver {
243
245
  result.toBuffer().length,
244
246
  this.logger,
245
247
  );
248
+ await this.delay();
246
249
  return makePublicInputsAndRecursiveProof(
247
250
  result,
248
251
  makeRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
@@ -250,13 +253,14 @@ export class TestCircuitProver implements ServerCircuitProver {
250
253
  );
251
254
  }
252
255
 
253
- public getTubeProof(
256
+ public async getTubeProof(
254
257
  _tubeInput: TubeInputs,
255
258
  ): Promise<{ tubeVK: VerificationKeyData; tubeProof: RecursiveProof<typeof TUBE_PROOF_LENGTH> }> {
256
- return Promise.resolve({
259
+ await this.delay();
260
+ return {
257
261
  tubeVK: VerificationKeyData.makeFake(),
258
262
  tubeProof: makeEmptyRecursiveProof(TUBE_PROOF_LENGTH),
259
- });
263
+ };
260
264
  }
261
265
 
262
266
  /**
@@ -287,6 +291,7 @@ export class TestCircuitProver implements ServerCircuitProver {
287
291
  result.toBuffer().length,
288
292
  this.logger,
289
293
  );
294
+ await this.delay();
290
295
  return makePublicInputsAndRecursiveProof(
291
296
  result,
292
297
  makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
@@ -322,6 +327,7 @@ export class TestCircuitProver implements ServerCircuitProver {
322
327
  result.toBuffer().length,
323
328
  this.logger,
324
329
  );
330
+ await this.delay();
325
331
  return makePublicInputsAndRecursiveProof(
326
332
  result,
327
333
  makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
@@ -355,7 +361,7 @@ export class TestCircuitProver implements ServerCircuitProver {
355
361
  result.toBuffer().length,
356
362
  this.logger,
357
363
  );
358
-
364
+ await this.delay();
359
365
  return makePublicInputsAndRecursiveProof(
360
366
  result,
361
367
  makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
@@ -384,7 +390,7 @@ export class TestCircuitProver implements ServerCircuitProver {
384
390
  result.toBuffer().length,
385
391
  this.logger,
386
392
  );
387
-
393
+ await this.delay();
388
394
  return makePublicInputsAndRecursiveProof(
389
395
  result,
390
396
  makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
@@ -392,11 +398,18 @@ export class TestCircuitProver implements ServerCircuitProver {
392
398
  );
393
399
  }
394
400
 
395
- getAvmProof(_inputs: AvmCircuitInputs): Promise<ProofAndVerificationKey> {
401
+ public async getAvmProof(_inputs: AvmCircuitInputs): Promise<ProofAndVerificationKey> {
396
402
  // We can't simulate the AVM because we don't have enough context to do so (e.g., DBs).
397
403
  // We just return an empty proof and VK data.
398
404
  this.logger.debug('Skipping AVM simulation in TestCircuitProver.');
399
- return Promise.resolve({ proof: makeEmptyProof(), verificationKey: VerificationKeyData.makeFake() });
405
+ await this.delay();
406
+ return { proof: makeEmptyProof(), verificationKey: VerificationKeyData.makeFake() };
407
+ }
408
+
409
+ private async delay(): Promise<void> {
410
+ if (this.opts.proverTestDelayMs > 0) {
411
+ await sleep(this.opts.proverTestDelayMs);
412
+ }
400
413
  }
401
414
 
402
415
  // Not implemented for test circuits