@aztec/bb-prover 0.43.0 → 0.44.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.
- package/dest/bb/execute.d.ts +1 -1
- package/dest/bb/execute.d.ts.map +1 -1
- package/dest/bb/execute.js +10 -10
- package/dest/instrumentation.d.ts +47 -0
- package/dest/instrumentation.d.ts.map +1 -0
- package/dest/instrumentation.js +102 -0
- package/dest/prover/bb_native_proof_creator.d.ts.map +1 -1
- package/dest/prover/bb_native_proof_creator.js +10 -8
- package/dest/prover/bb_prover.d.ts +5 -2
- package/dest/prover/bb_prover.d.ts.map +1 -1
- package/dest/prover/bb_prover.js +442 -390
- package/dest/stats.d.ts +1 -2
- package/dest/stats.d.ts.map +1 -1
- package/dest/stats.js +2 -16
- package/dest/test/test_circuit_prover.d.ts +4 -1
- package/dest/test/test_circuit_prover.d.ts.map +1 -1
- package/dest/test/test_circuit_prover.js +165 -119
- package/package.json +16 -7
- package/src/bb/execute.ts +10 -10
- package/src/instrumentation.ts +149 -0
- package/src/prover/bb_native_proof_creator.ts +9 -9
- package/src/prover/bb_prover.ts +72 -34
- package/src/stats.ts +1 -15
- package/src/test/test_circuit_prover.ts +28 -2
package/dest/prover/bb_prover.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { __esDecorate, __runInitializers } from "tslib";
|
|
1
2
|
/* eslint-disable require-await */
|
|
2
3
|
import { makePublicInputsAndRecursiveProof, } from '@aztec/circuit-types';
|
|
3
4
|
import { AGGREGATION_OBJECT_LENGTH, EmptyNestedCircuitInputs, EmptyNestedData, Fr, NESTED_RECURSIVE_PROOF_LENGTH, PrivateKernelEmptyInputs, Proof, RECURSIVE_PROOF_LENGTH, RecursiveProof, RootParityInput, makeRecursiveProofFromBinary, } from '@aztec/circuits.js';
|
|
@@ -6,10 +7,12 @@ import { createDebugLogger } from '@aztec/foundation/log';
|
|
|
6
7
|
import { Timer } from '@aztec/foundation/timer';
|
|
7
8
|
import { EmptyNestedArtifact, ServerCircuitArtifacts, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap, convertBaseRollupInputsToWitnessMap, convertBaseRollupOutputsFromWitnessMap, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap, convertPrivateKernelEmptyInputsToWitnessMap, convertPrivateKernelEmptyOutputsFromWitnessMap, convertPublicTailInputsToWitnessMap, convertPublicTailOutputFromWitnessMap, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap, convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap, } from '@aztec/noir-protocol-circuits-types';
|
|
8
9
|
import { NativeACVMSimulator } from '@aztec/simulator';
|
|
10
|
+
import { Attributes, trackSpan } from '@aztec/telemetry-client';
|
|
9
11
|
import { abiEncode } from '@noir-lang/noirc_abi';
|
|
10
12
|
import * as fs from 'fs/promises';
|
|
11
13
|
import * as path from 'path';
|
|
12
14
|
import { BB_RESULT, PROOF_FIELDS_FILENAME, PROOF_FILENAME, VK_FILENAME, generateAvmProof, generateKeyForNoirCircuit, generateProof, verifyAvmProof, verifyProof, writeProofAsFields, } from '../bb/execute.js';
|
|
15
|
+
import { ProverInstrumentation } from '../instrumentation.js';
|
|
13
16
|
import { PublicKernelArtifactMapping } from '../mappings/mappings.js';
|
|
14
17
|
import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
|
|
15
18
|
import { extractVkData } from '../verification_key/verification_key_data.js';
|
|
@@ -21,397 +24,446 @@ const CIRCUITS_WITHOUT_AGGREGATION = new Set([
|
|
|
21
24
|
/**
|
|
22
25
|
* Prover implementation that uses barretenberg native proving
|
|
23
26
|
*/
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
return new BBNativeRollupProver(config);
|
|
37
|
-
}
|
|
38
|
-
/**
|
|
39
|
-
* Simulates the base parity circuit from its inputs.
|
|
40
|
-
* @param inputs - Inputs to the circuit.
|
|
41
|
-
* @returns The public inputs of the parity circuit.
|
|
42
|
-
*/
|
|
43
|
-
async getBaseParityProof(inputs) {
|
|
44
|
-
const { circuitOutput, proof } = await this.createRecursiveProof(inputs, 'BaseParityArtifact', RECURSIVE_PROOF_LENGTH, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap);
|
|
45
|
-
const verificationKey = await this.getVerificationKeyDataForCircuit('BaseParityArtifact');
|
|
46
|
-
await this.verifyProof('BaseParityArtifact', proof.binaryProof);
|
|
47
|
-
return new RootParityInput(proof, verificationKey.keyAsFields, circuitOutput);
|
|
48
|
-
}
|
|
49
|
-
/**
|
|
50
|
-
* Simulates the root parity circuit from its inputs.
|
|
51
|
-
* @param inputs - Inputs to the circuit.
|
|
52
|
-
* @returns The public inputs of the parity circuit.
|
|
53
|
-
*/
|
|
54
|
-
async getRootParityProof(inputs) {
|
|
55
|
-
const { circuitOutput, proof } = await this.createRecursiveProof(inputs, 'RootParityArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap);
|
|
56
|
-
const verificationKey = await this.getVerificationKeyDataForCircuit('RootParityArtifact');
|
|
57
|
-
await this.verifyProof('RootParityArtifact', proof.binaryProof);
|
|
58
|
-
return new RootParityInput(proof, verificationKey.keyAsFields, circuitOutput);
|
|
59
|
-
}
|
|
60
|
-
/**
|
|
61
|
-
* Creates an AVM proof and verifies it.
|
|
62
|
-
* @param inputs - The inputs to the AVM circuit.
|
|
63
|
-
* @returns The proof.
|
|
64
|
-
*/
|
|
65
|
-
async getAvmProof(inputs) {
|
|
66
|
-
const proofAndVk = await this.createAvmProof(inputs);
|
|
67
|
-
await this.verifyAvmProof(proofAndVk.proof, proofAndVk.verificationKey);
|
|
68
|
-
return proofAndVk;
|
|
69
|
-
}
|
|
70
|
-
/**
|
|
71
|
-
* Requests that a public kernel circuit be executed and the proof generated
|
|
72
|
-
* @param kernelRequest - The object encapsulating the request for a proof
|
|
73
|
-
* @returns The requested circuit's public inputs and proof
|
|
74
|
-
*/
|
|
75
|
-
async getPublicKernelProof(kernelRequest) {
|
|
76
|
-
const kernelOps = PublicKernelArtifactMapping[kernelRequest.type];
|
|
77
|
-
if (kernelOps === undefined) {
|
|
78
|
-
throw new Error(`Unable to prove kernel type ${kernelRequest.type}`);
|
|
79
|
-
}
|
|
80
|
-
// We may need to convert the recursive proof into fields format
|
|
81
|
-
kernelRequest.inputs.previousKernel.proof = await this.ensureValidProof(kernelRequest.inputs.previousKernel.proof, kernelOps.artifact, kernelRequest.inputs.previousKernel.vk);
|
|
82
|
-
await this.verifyWithKey(kernelRequest.inputs.previousKernel.vk, kernelRequest.inputs.previousKernel.proof.binaryProof);
|
|
83
|
-
const { circuitOutput, proof } = await this.createRecursiveProof(kernelRequest.inputs, kernelOps.artifact, NESTED_RECURSIVE_PROOF_LENGTH, kernelOps.convertInputs, kernelOps.convertOutputs);
|
|
84
|
-
const verificationKey = await this.getVerificationKeyDataForCircuit(kernelOps.artifact);
|
|
85
|
-
await this.verifyProof(kernelOps.artifact, proof.binaryProof);
|
|
86
|
-
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
87
|
-
}
|
|
88
|
-
/**
|
|
89
|
-
* Requests that the public kernel tail circuit be executed and the proof generated
|
|
90
|
-
* @param kernelRequest - The object encapsulating the request for a proof
|
|
91
|
-
* @returns The requested circuit's public inputs and proof
|
|
92
|
-
*/
|
|
93
|
-
async getPublicTailProof(kernelRequest) {
|
|
94
|
-
const { circuitOutput, proof } = await this.createRecursiveProof(kernelRequest.inputs, 'PublicKernelTailArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertPublicTailInputsToWitnessMap, convertPublicTailOutputFromWitnessMap);
|
|
95
|
-
const verificationKey = await this.getVerificationKeyDataForCircuit('PublicKernelTailArtifact');
|
|
96
|
-
await this.verifyProof('PublicKernelTailArtifact', proof.binaryProof);
|
|
97
|
-
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
98
|
-
}
|
|
99
|
-
/**
|
|
100
|
-
* Simulates the base rollup circuit from its inputs.
|
|
101
|
-
* @param input - Inputs to the circuit.
|
|
102
|
-
* @returns The public inputs as outputs of the simulation.
|
|
103
|
-
*/
|
|
104
|
-
async getBaseRollupProof(input) {
|
|
105
|
-
// We may need to convert the recursive proof into fields format
|
|
106
|
-
input.kernelData.proof = await this.ensureValidProof(input.kernelData.proof, 'BaseRollupArtifact', input.kernelData.vk);
|
|
107
|
-
const { circuitOutput, proof } = await this.createRecursiveProof(input, 'BaseRollupArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertBaseRollupInputsToWitnessMap, convertBaseRollupOutputsFromWitnessMap);
|
|
108
|
-
const verificationKey = await this.getVerificationKeyDataForCircuit('BaseRollupArtifact');
|
|
109
|
-
await this.verifyProof('BaseRollupArtifact', proof.binaryProof);
|
|
110
|
-
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
111
|
-
}
|
|
112
|
-
/**
|
|
113
|
-
* Simulates the merge rollup circuit from its inputs.
|
|
114
|
-
* @param input - Inputs to the circuit.
|
|
115
|
-
* @returns The public inputs as outputs of the simulation.
|
|
116
|
-
*/
|
|
117
|
-
async getMergeRollupProof(input) {
|
|
118
|
-
const { circuitOutput, proof } = await this.createRecursiveProof(input, 'MergeRollupArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap);
|
|
119
|
-
const verificationKey = await this.getVerificationKeyDataForCircuit('MergeRollupArtifact');
|
|
120
|
-
await this.verifyProof('MergeRollupArtifact', proof.binaryProof);
|
|
121
|
-
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
122
|
-
}
|
|
123
|
-
/**
|
|
124
|
-
* Simulates the root rollup circuit from its inputs.
|
|
125
|
-
* @param input - Inputs to the circuit.
|
|
126
|
-
* @returns The public inputs as outputs of the simulation.
|
|
127
|
-
*/
|
|
128
|
-
async getRootRollupProof(input) {
|
|
129
|
-
const { circuitOutput, proof } = await this.createProof(input, 'RootRollupArtifact', convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap);
|
|
130
|
-
const recursiveProof = makeRecursiveProofFromBinary(proof, NESTED_RECURSIVE_PROOF_LENGTH);
|
|
131
|
-
const verificationKey = await this.getVerificationKeyDataForCircuit('RootRollupArtifact');
|
|
132
|
-
await this.verifyProof('RootRollupArtifact', proof);
|
|
133
|
-
return makePublicInputsAndRecursiveProof(circuitOutput, recursiveProof, verificationKey);
|
|
134
|
-
}
|
|
135
|
-
async getEmptyPrivateKernelProof(inputs) {
|
|
136
|
-
const emptyNested = await this.getEmptyNestedProof();
|
|
137
|
-
const emptyPrivateKernelProof = await this.getEmptyPrivateKernelProofFromEmptyNested(PrivateKernelEmptyInputs.from({
|
|
138
|
-
...inputs,
|
|
139
|
-
emptyNested,
|
|
140
|
-
}));
|
|
141
|
-
return emptyPrivateKernelProof;
|
|
142
|
-
}
|
|
143
|
-
async getEmptyNestedProof() {
|
|
144
|
-
const inputs = new EmptyNestedCircuitInputs();
|
|
145
|
-
const { proof } = await this.createRecursiveProof(inputs, 'EmptyNestedArtifact', RECURSIVE_PROOF_LENGTH, (nothing) => abiEncode(EmptyNestedArtifact.abi, { _inputs: nothing }), () => new EmptyNestedCircuitInputs());
|
|
146
|
-
const verificationKey = await this.getVerificationKeyDataForCircuit('EmptyNestedArtifact');
|
|
147
|
-
await this.verifyProof('EmptyNestedArtifact', proof.binaryProof);
|
|
148
|
-
return new EmptyNestedData(proof, verificationKey.keyAsFields);
|
|
149
|
-
}
|
|
150
|
-
async getEmptyPrivateKernelProofFromEmptyNested(inputs) {
|
|
151
|
-
const { circuitOutput, proof } = await this.createRecursiveProof(inputs, 'PrivateKernelEmptyArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertPrivateKernelEmptyInputsToWitnessMap, convertPrivateKernelEmptyOutputsFromWitnessMap);
|
|
152
|
-
const verificationKey = await this.getVerificationKeyDataForCircuit('PrivateKernelEmptyArtifact');
|
|
153
|
-
await this.verifyProof('PrivateKernelEmptyArtifact', proof.binaryProof);
|
|
154
|
-
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
155
|
-
}
|
|
156
|
-
async generateProofWithBB(input, circuitType, convertInput, convertOutput, workingDirectory) {
|
|
157
|
-
// Have the ACVM write the partial witness here
|
|
158
|
-
const outputWitnessFile = path.join(workingDirectory, 'partial-witness.gz');
|
|
159
|
-
// Generate the partial witness using the ACVM
|
|
160
|
-
// A further temp directory will be created beneath ours and then cleaned up after the partial witness has been copied to our specified location
|
|
161
|
-
const simulator = new NativeACVMSimulator(this.config.acvmWorkingDirectory, this.config.acvmBinaryPath, outputWitnessFile);
|
|
162
|
-
const artifact = ServerCircuitArtifacts[circuitType];
|
|
163
|
-
logger.debug(`Generating witness data for ${circuitType}`);
|
|
164
|
-
const inputWitness = convertInput(input);
|
|
165
|
-
const timer = new Timer();
|
|
166
|
-
const outputWitness = await simulator.simulateCircuit(inputWitness, artifact);
|
|
167
|
-
const witnessGenerationDuration = timer.ms();
|
|
168
|
-
const output = convertOutput(outputWitness);
|
|
169
|
-
logger.debug(`Generated witness`, {
|
|
170
|
-
circuitName: mapProtocolArtifactNameToCircuitName(circuitType),
|
|
171
|
-
duration: witnessGenerationDuration,
|
|
172
|
-
inputSize: input.toBuffer().length,
|
|
173
|
-
outputSize: output.toBuffer().length,
|
|
174
|
-
eventName: 'circuit-witness-generation',
|
|
175
|
-
});
|
|
176
|
-
// Now prove the circuit from the generated witness
|
|
177
|
-
logger.debug(`Proving ${circuitType}...`);
|
|
178
|
-
const provingResult = await generateProof(this.config.bbBinaryPath, workingDirectory, circuitType, Buffer.from(artifact.bytecode, 'base64'), outputWitnessFile, logger.debug);
|
|
179
|
-
if (provingResult.status === BB_RESULT.FAILURE) {
|
|
180
|
-
logger.error(`Failed to generate proof for ${circuitType}: ${provingResult.reason}`);
|
|
181
|
-
throw new Error(provingResult.reason);
|
|
182
|
-
}
|
|
183
|
-
// Ensure our vk cache is up to date
|
|
184
|
-
const vkData = await this.updateVerificationKeyAfterProof(provingResult.vkPath, circuitType);
|
|
185
|
-
return {
|
|
186
|
-
circuitOutput: output,
|
|
187
|
-
vkData,
|
|
188
|
-
provingResult,
|
|
189
|
-
};
|
|
190
|
-
}
|
|
191
|
-
async createProof(input, circuitType, convertInput, convertOutput) {
|
|
192
|
-
const operation = async (bbWorkingDirectory) => {
|
|
193
|
-
const { provingResult, vkData, circuitOutput: output, } = await this.generateProofWithBB(input, circuitType, convertInput, convertOutput, bbWorkingDirectory);
|
|
194
|
-
// Read the binary proof
|
|
195
|
-
const rawProof = await fs.readFile(`${provingResult.proofPath}/${PROOF_FILENAME}`);
|
|
196
|
-
const proof = new Proof(rawProof, vkData.numPublicInputs);
|
|
197
|
-
logger.info(`Generated proof for ${circuitType} in ${Math.ceil(provingResult.duration)} ms, size: ${proof.buffer.length} bytes`, {
|
|
198
|
-
circuitName: mapProtocolArtifactNameToCircuitName(circuitType),
|
|
199
|
-
// does not include reading the proof from disk
|
|
200
|
-
duration: provingResult.duration,
|
|
201
|
-
proofSize: proof.buffer.length,
|
|
202
|
-
eventName: 'circuit-proving',
|
|
203
|
-
// circuitOutput is the partial witness that became the input to the proof
|
|
204
|
-
inputSize: output.toBuffer().length,
|
|
205
|
-
circuitSize: vkData.circuitSize,
|
|
206
|
-
numPublicInputs: vkData.numPublicInputs,
|
|
207
|
-
});
|
|
208
|
-
return { circuitOutput: output, proof };
|
|
209
|
-
};
|
|
210
|
-
return await runInDirectory(this.config.bbWorkingDirectory, operation);
|
|
211
|
-
}
|
|
212
|
-
async generateAvmProofWithBB(input, workingDirectory) {
|
|
213
|
-
logger.debug(`Proving avm-circuit...`);
|
|
214
|
-
const provingResult = await generateAvmProof(this.config.bbBinaryPath, workingDirectory, input, logger.verbose);
|
|
215
|
-
if (provingResult.status === BB_RESULT.FAILURE) {
|
|
216
|
-
logger.error(`Failed to generate proof for avm-circuit: ${provingResult.reason}`);
|
|
217
|
-
throw new Error(provingResult.reason);
|
|
218
|
-
}
|
|
219
|
-
return provingResult;
|
|
220
|
-
}
|
|
221
|
-
async createAvmProof(input) {
|
|
222
|
-
const cleanupDir = !process.env.AVM_PROVING_PRESERVE_WORKING_DIR;
|
|
223
|
-
const operation = async (bbWorkingDirectory) => {
|
|
224
|
-
if (!cleanupDir) {
|
|
225
|
-
logger.info(`Preserving working directory ${bbWorkingDirectory}`);
|
|
27
|
+
let BBNativeRollupProver = (() => {
|
|
28
|
+
var _a;
|
|
29
|
+
let _instanceExtraInitializers = [];
|
|
30
|
+
let _getBaseParityProof_decorators;
|
|
31
|
+
let _getRootParityProof_decorators;
|
|
32
|
+
let _getAvmProof_decorators;
|
|
33
|
+
let _getPublicKernelProof_decorators;
|
|
34
|
+
return _a = class BBNativeRollupProver {
|
|
35
|
+
constructor(config, telemetry) {
|
|
36
|
+
this.config = (__runInitializers(this, _instanceExtraInitializers), config);
|
|
37
|
+
this.verificationKeys = new Map();
|
|
38
|
+
this.instrumentation = new ProverInstrumentation(telemetry, 'BBNativeRollupProver');
|
|
226
39
|
}
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
// TODO(https://github.com/AztecProtocol/aztec-packages/issues/6773): this VK data format is wrong.
|
|
230
|
-
// In particular, the number of public inputs, etc will be wrong.
|
|
231
|
-
const verificationKey = await extractVkData(provingResult.vkPath);
|
|
232
|
-
const proof = new Proof(rawProof, verificationKey.numPublicInputs);
|
|
233
|
-
const circuitType = 'avm-circuit';
|
|
234
|
-
logger.info(`Generated proof for ${circuitType} in ${Math.ceil(provingResult.duration)} ms, size: ${proof.buffer.length} bytes`, {
|
|
235
|
-
circuitName: circuitType,
|
|
236
|
-
// does not include reading the proof from disk
|
|
237
|
-
duration: provingResult.duration,
|
|
238
|
-
proofSize: proof.buffer.length,
|
|
239
|
-
eventName: 'circuit-proving',
|
|
240
|
-
inputSize: input.toBuffer().length,
|
|
241
|
-
circuitSize: verificationKey.circuitSize,
|
|
242
|
-
numPublicInputs: verificationKey.numPublicInputs,
|
|
243
|
-
});
|
|
244
|
-
return { proof, verificationKey };
|
|
245
|
-
};
|
|
246
|
-
return await runInDirectory(this.config.bbWorkingDirectory, operation, cleanupDir);
|
|
247
|
-
}
|
|
248
|
-
/**
|
|
249
|
-
* Executes a circuit and returns it's outputs and corresponding proof with embedded aggregation object
|
|
250
|
-
* @param witnessMap - The input witness
|
|
251
|
-
* @param circuitType - The type of circuit to be executed
|
|
252
|
-
* @param proofLength - The length of the proof to be generated. This is a dummy parameter to aid in type checking
|
|
253
|
-
* @param convertInput - Function for mapping the input object to a witness map.
|
|
254
|
-
* @param convertOutput - Function for parsing the output witness to it's corresponding object
|
|
255
|
-
* @returns The circuits output object and it's proof
|
|
256
|
-
*/
|
|
257
|
-
async createRecursiveProof(input, circuitType, proofLength, convertInput, convertOutput) {
|
|
258
|
-
const operation = async (bbWorkingDirectory) => {
|
|
259
|
-
const { provingResult, vkData, circuitOutput: output, } = await this.generateProofWithBB(input, circuitType, convertInput, convertOutput, bbWorkingDirectory);
|
|
260
|
-
// Read the proof as fields
|
|
261
|
-
const proof = await this.readProofAsFields(provingResult.proofPath, circuitType, proofLength);
|
|
262
|
-
logger.info(`Generated proof for ${circuitType} in ${Math.ceil(provingResult.duration)} ms, size: ${proof.proof.length} fields`, {
|
|
263
|
-
circuitName: mapProtocolArtifactNameToCircuitName(circuitType),
|
|
264
|
-
circuitSize: vkData.circuitSize,
|
|
265
|
-
duration: provingResult.duration,
|
|
266
|
-
inputSize: output.toBuffer().length,
|
|
267
|
-
proofSize: proof.binaryProof.buffer.length,
|
|
268
|
-
eventName: 'circuit-proving',
|
|
269
|
-
numPublicInputs: vkData.numPublicInputs,
|
|
270
|
-
});
|
|
271
|
-
return {
|
|
272
|
-
circuitOutput: output,
|
|
273
|
-
proof,
|
|
274
|
-
};
|
|
275
|
-
};
|
|
276
|
-
return await runInDirectory(this.config.bbWorkingDirectory, operation);
|
|
277
|
-
}
|
|
278
|
-
/**
|
|
279
|
-
* Verifies a proof, will generate the verification key if one is not cached internally
|
|
280
|
-
* @param circuitType - The type of circuit whose proof is to be verified
|
|
281
|
-
* @param proof - The proof to be verified
|
|
282
|
-
*/
|
|
283
|
-
async verifyProof(circuitType, proof) {
|
|
284
|
-
const verificationKey = await this.getVerificationKeyDataForCircuit(circuitType);
|
|
285
|
-
return await this.verifyWithKey(verificationKey, proof);
|
|
286
|
-
}
|
|
287
|
-
async verifyAvmProof(proof, verificationKey) {
|
|
288
|
-
return await this.verifyWithKeyInternal(proof, verificationKey, verifyAvmProof);
|
|
289
|
-
}
|
|
290
|
-
async verifyWithKey(verificationKey, proof) {
|
|
291
|
-
return await this.verifyWithKeyInternal(proof, verificationKey, verifyProof);
|
|
292
|
-
}
|
|
293
|
-
async verifyWithKeyInternal(proof, verificationKey, verificationFunction) {
|
|
294
|
-
const operation = async (bbWorkingDirectory) => {
|
|
295
|
-
const proofFileName = path.join(bbWorkingDirectory, PROOF_FILENAME);
|
|
296
|
-
const verificationKeyPath = path.join(bbWorkingDirectory, VK_FILENAME);
|
|
297
|
-
await fs.writeFile(proofFileName, proof.buffer);
|
|
298
|
-
await fs.writeFile(verificationKeyPath, verificationKey.keyAsBytes);
|
|
299
|
-
const logFunction = (message) => {
|
|
300
|
-
logger.debug(`BB out - ${message}`);
|
|
301
|
-
};
|
|
302
|
-
const result = await verificationFunction(this.config.bbBinaryPath, proofFileName, verificationKeyPath, logFunction);
|
|
303
|
-
if (result.status === BB_RESULT.FAILURE) {
|
|
304
|
-
const errorMessage = `Failed to verify proof from key!`;
|
|
305
|
-
throw new Error(errorMessage);
|
|
40
|
+
get tracer() {
|
|
41
|
+
return this.instrumentation.tracer;
|
|
306
42
|
}
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
*/
|
|
316
|
-
async getVerificationKeyForCircuit(circuitType) {
|
|
317
|
-
const vkData = await this.getVerificationKeyDataForCircuit(circuitType);
|
|
318
|
-
return vkData.clone().keyAsFields;
|
|
319
|
-
}
|
|
320
|
-
/**
|
|
321
|
-
* Will check a recursive proof argument for validity of it's 'fields' format of proof and convert if required
|
|
322
|
-
* @param proof - The input proof that may need converting
|
|
323
|
-
* @returns - The valid proof
|
|
324
|
-
*/
|
|
325
|
-
async ensureValidProof(proof, circuit, vk) {
|
|
326
|
-
// If the 'fields' proof is already valid then simply return
|
|
327
|
-
// This will be false for proofs coming from clients
|
|
328
|
-
if (proof.fieldsValid) {
|
|
329
|
-
return proof;
|
|
330
|
-
}
|
|
331
|
-
const operation = async (bbWorkingDirectory) => {
|
|
332
|
-
const numPublicInputs = vk.numPublicInputs - AGGREGATION_OBJECT_LENGTH;
|
|
333
|
-
const proofFullFilename = path.join(bbWorkingDirectory, PROOF_FILENAME);
|
|
334
|
-
const vkFullFilename = path.join(bbWorkingDirectory, VK_FILENAME);
|
|
335
|
-
logger.debug(`Converting proof to fields format for circuit ${circuit}, directory ${bbWorkingDirectory}, num public inputs: ${vk.numPublicInputs}, proof length ${proof.binaryProof.buffer.length}, vk length ${vk.keyAsBytes.length}`);
|
|
336
|
-
await fs.writeFile(proofFullFilename, proof.binaryProof.buffer);
|
|
337
|
-
await fs.writeFile(vkFullFilename, vk.keyAsBytes);
|
|
338
|
-
const logFunction = (message) => {
|
|
339
|
-
logger.debug(`${circuit} BB out - ${message}`);
|
|
340
|
-
};
|
|
341
|
-
const result = await writeProofAsFields(this.config.bbBinaryPath, bbWorkingDirectory, PROOF_FILENAME, vkFullFilename, logFunction);
|
|
342
|
-
if (result.status === BB_RESULT.FAILURE) {
|
|
343
|
-
const errorMessage = `Failed to convert ${circuit} proof to fields, ${result.reason}`;
|
|
344
|
-
throw new Error(errorMessage);
|
|
43
|
+
static async new(config, telemetry) {
|
|
44
|
+
await fs.access(config.acvmBinaryPath, fs.constants.R_OK);
|
|
45
|
+
await fs.mkdir(config.acvmWorkingDirectory, { recursive: true });
|
|
46
|
+
await fs.access(config.bbBinaryPath, fs.constants.R_OK);
|
|
47
|
+
await fs.mkdir(config.bbWorkingDirectory, { recursive: true });
|
|
48
|
+
logger.info(`Using native BB at ${config.bbBinaryPath} and working directory ${config.bbWorkingDirectory}`);
|
|
49
|
+
logger.info(`Using native ACVM at ${config.acvmBinaryPath} and working directory ${config.acvmWorkingDirectory}`);
|
|
50
|
+
return new _a(config, telemetry);
|
|
345
51
|
}
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
52
|
+
/**
|
|
53
|
+
* Simulates the base parity circuit from its inputs.
|
|
54
|
+
* @param inputs - Inputs to the circuit.
|
|
55
|
+
* @returns The public inputs of the parity circuit.
|
|
56
|
+
*/
|
|
57
|
+
async getBaseParityProof(inputs) {
|
|
58
|
+
const { circuitOutput, proof } = await this.createRecursiveProof(inputs, 'BaseParityArtifact', RECURSIVE_PROOF_LENGTH, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap);
|
|
59
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit('BaseParityArtifact');
|
|
60
|
+
await this.verifyProof('BaseParityArtifact', proof.binaryProof);
|
|
61
|
+
return new RootParityInput(proof, verificationKey.keyAsFields, circuitOutput);
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Simulates the root parity circuit from its inputs.
|
|
65
|
+
* @param inputs - Inputs to the circuit.
|
|
66
|
+
* @returns The public inputs of the parity circuit.
|
|
67
|
+
*/
|
|
68
|
+
async getRootParityProof(inputs) {
|
|
69
|
+
const { circuitOutput, proof } = await this.createRecursiveProof(inputs, 'RootParityArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap);
|
|
70
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit('RootParityArtifact');
|
|
71
|
+
await this.verifyProof('RootParityArtifact', proof.binaryProof);
|
|
72
|
+
return new RootParityInput(proof, verificationKey.keyAsFields, circuitOutput);
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Creates an AVM proof and verifies it.
|
|
76
|
+
* @param inputs - The inputs to the AVM circuit.
|
|
77
|
+
* @returns The proof.
|
|
78
|
+
*/
|
|
79
|
+
async getAvmProof(inputs) {
|
|
80
|
+
const proofAndVk = await this.createAvmProof(inputs);
|
|
81
|
+
await this.verifyAvmProof(proofAndVk.proof, proofAndVk.verificationKey);
|
|
82
|
+
return proofAndVk;
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Requests that a public kernel circuit be executed and the proof generated
|
|
86
|
+
* @param kernelRequest - The object encapsulating the request for a proof
|
|
87
|
+
* @returns The requested circuit's public inputs and proof
|
|
88
|
+
*/
|
|
89
|
+
async getPublicKernelProof(kernelRequest) {
|
|
90
|
+
const kernelOps = PublicKernelArtifactMapping[kernelRequest.type];
|
|
91
|
+
if (kernelOps === undefined) {
|
|
92
|
+
throw new Error(`Unable to prove kernel type ${kernelRequest.type}`);
|
|
93
|
+
}
|
|
94
|
+
// We may need to convert the recursive proof into fields format
|
|
95
|
+
kernelRequest.inputs.previousKernel.proof = await this.ensureValidProof(kernelRequest.inputs.previousKernel.proof, kernelOps.artifact, kernelRequest.inputs.previousKernel.vk);
|
|
96
|
+
await this.verifyWithKey(kernelRequest.inputs.previousKernel.vk, kernelRequest.inputs.previousKernel.proof.binaryProof);
|
|
97
|
+
const { circuitOutput, proof } = await this.createRecursiveProof(kernelRequest.inputs, kernelOps.artifact, NESTED_RECURSIVE_PROOF_LENGTH, kernelOps.convertInputs, kernelOps.convertOutputs);
|
|
98
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit(kernelOps.artifact);
|
|
99
|
+
await this.verifyProof(kernelOps.artifact, proof.binaryProof);
|
|
100
|
+
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
* Requests that the public kernel tail circuit be executed and the proof generated
|
|
104
|
+
* @param kernelRequest - The object encapsulating the request for a proof
|
|
105
|
+
* @returns The requested circuit's public inputs and proof
|
|
106
|
+
*/
|
|
107
|
+
async getPublicTailProof(kernelRequest) {
|
|
108
|
+
const { circuitOutput, proof } = await this.createRecursiveProof(kernelRequest.inputs, 'PublicKernelTailArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertPublicTailInputsToWitnessMap, convertPublicTailOutputFromWitnessMap);
|
|
109
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit('PublicKernelTailArtifact');
|
|
110
|
+
await this.verifyProof('PublicKernelTailArtifact', proof.binaryProof);
|
|
111
|
+
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* Simulates the base rollup circuit from its inputs.
|
|
115
|
+
* @param input - Inputs to the circuit.
|
|
116
|
+
* @returns The public inputs as outputs of the simulation.
|
|
117
|
+
*/
|
|
118
|
+
async getBaseRollupProof(input) {
|
|
119
|
+
// We may need to convert the recursive proof into fields format
|
|
120
|
+
input.kernelData.proof = await this.ensureValidProof(input.kernelData.proof, 'BaseRollupArtifact', input.kernelData.vk);
|
|
121
|
+
const { circuitOutput, proof } = await this.createRecursiveProof(input, 'BaseRollupArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertBaseRollupInputsToWitnessMap, convertBaseRollupOutputsFromWitnessMap);
|
|
122
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit('BaseRollupArtifact');
|
|
123
|
+
await this.verifyProof('BaseRollupArtifact', proof.binaryProof);
|
|
124
|
+
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
* Simulates the merge rollup circuit from its inputs.
|
|
128
|
+
* @param input - Inputs to the circuit.
|
|
129
|
+
* @returns The public inputs as outputs of the simulation.
|
|
130
|
+
*/
|
|
131
|
+
async getMergeRollupProof(input) {
|
|
132
|
+
const { circuitOutput, proof } = await this.createRecursiveProof(input, 'MergeRollupArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap);
|
|
133
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit('MergeRollupArtifact');
|
|
134
|
+
await this.verifyProof('MergeRollupArtifact', proof.binaryProof);
|
|
135
|
+
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
136
|
+
}
|
|
137
|
+
/**
|
|
138
|
+
* Simulates the root rollup circuit from its inputs.
|
|
139
|
+
* @param input - Inputs to the circuit.
|
|
140
|
+
* @returns The public inputs as outputs of the simulation.
|
|
141
|
+
*/
|
|
142
|
+
async getRootRollupProof(input) {
|
|
143
|
+
const { circuitOutput, proof } = await this.createProof(input, 'RootRollupArtifact', convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap);
|
|
144
|
+
const recursiveProof = makeRecursiveProofFromBinary(proof, NESTED_RECURSIVE_PROOF_LENGTH);
|
|
145
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit('RootRollupArtifact');
|
|
146
|
+
await this.verifyProof('RootRollupArtifact', proof);
|
|
147
|
+
return makePublicInputsAndRecursiveProof(circuitOutput, recursiveProof, verificationKey);
|
|
148
|
+
}
|
|
149
|
+
async getEmptyPrivateKernelProof(inputs) {
|
|
150
|
+
const emptyNested = await this.getEmptyNestedProof();
|
|
151
|
+
const emptyPrivateKernelProof = await this.getEmptyPrivateKernelProofFromEmptyNested(PrivateKernelEmptyInputs.from({
|
|
152
|
+
...inputs,
|
|
153
|
+
emptyNested,
|
|
154
|
+
}));
|
|
155
|
+
return emptyPrivateKernelProof;
|
|
156
|
+
}
|
|
157
|
+
async getEmptyNestedProof() {
|
|
158
|
+
const inputs = new EmptyNestedCircuitInputs();
|
|
159
|
+
const { proof } = await this.createRecursiveProof(inputs, 'EmptyNestedArtifact', RECURSIVE_PROOF_LENGTH, (nothing) => abiEncode(EmptyNestedArtifact.abi, { _inputs: nothing }), () => new EmptyNestedCircuitInputs());
|
|
160
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit('EmptyNestedArtifact');
|
|
161
|
+
await this.verifyProof('EmptyNestedArtifact', proof.binaryProof);
|
|
162
|
+
return new EmptyNestedData(proof, verificationKey.keyAsFields);
|
|
163
|
+
}
|
|
164
|
+
async getEmptyPrivateKernelProofFromEmptyNested(inputs) {
|
|
165
|
+
const { circuitOutput, proof } = await this.createRecursiveProof(inputs, 'PrivateKernelEmptyArtifact', NESTED_RECURSIVE_PROOF_LENGTH, convertPrivateKernelEmptyInputsToWitnessMap, convertPrivateKernelEmptyOutputsFromWitnessMap);
|
|
166
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit('PrivateKernelEmptyArtifact');
|
|
167
|
+
await this.verifyProof('PrivateKernelEmptyArtifact', proof.binaryProof);
|
|
168
|
+
return makePublicInputsAndRecursiveProof(circuitOutput, proof, verificationKey);
|
|
169
|
+
}
|
|
170
|
+
async generateProofWithBB(input, circuitType, convertInput, convertOutput, workingDirectory) {
|
|
171
|
+
// Have the ACVM write the partial witness here
|
|
172
|
+
const outputWitnessFile = path.join(workingDirectory, 'partial-witness.gz');
|
|
173
|
+
// Generate the partial witness using the ACVM
|
|
174
|
+
// A further temp directory will be created beneath ours and then cleaned up after the partial witness has been copied to our specified location
|
|
175
|
+
const simulator = new NativeACVMSimulator(this.config.acvmWorkingDirectory, this.config.acvmBinaryPath, outputWitnessFile);
|
|
176
|
+
const artifact = ServerCircuitArtifacts[circuitType];
|
|
177
|
+
logger.debug(`Generating witness data for ${circuitType}`);
|
|
178
|
+
const inputWitness = convertInput(input);
|
|
179
|
+
const timer = new Timer();
|
|
180
|
+
const outputWitness = await simulator.simulateCircuit(inputWitness, artifact);
|
|
181
|
+
const output = convertOutput(outputWitness);
|
|
182
|
+
const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
|
|
183
|
+
this.instrumentation.recordDuration('witGenDuration', circuitName, timer);
|
|
184
|
+
this.instrumentation.recordSize('witGenInputSize', circuitName, input.toBuffer().length);
|
|
185
|
+
this.instrumentation.recordSize('witGenOutputSize', circuitName, output.toBuffer().length);
|
|
186
|
+
logger.debug(`Generated witness`, {
|
|
187
|
+
circuitName,
|
|
188
|
+
duration: timer.ms(),
|
|
189
|
+
inputSize: input.toBuffer().length,
|
|
190
|
+
outputSize: output.toBuffer().length,
|
|
191
|
+
eventName: 'circuit-witness-generation',
|
|
192
|
+
});
|
|
193
|
+
// Now prove the circuit from the generated witness
|
|
194
|
+
logger.debug(`Proving ${circuitType}...`);
|
|
195
|
+
const provingResult = await generateProof(this.config.bbBinaryPath, workingDirectory, circuitType, Buffer.from(artifact.bytecode, 'base64'), outputWitnessFile, logger.debug);
|
|
196
|
+
if (provingResult.status === BB_RESULT.FAILURE) {
|
|
197
|
+
logger.error(`Failed to generate proof for ${circuitType}: ${provingResult.reason}`);
|
|
198
|
+
throw new Error(provingResult.reason);
|
|
199
|
+
}
|
|
200
|
+
// Ensure our vk cache is up to date
|
|
201
|
+
const vkData = await this.updateVerificationKeyAfterProof(provingResult.vkPath, circuitType);
|
|
202
|
+
return {
|
|
203
|
+
circuitOutput: output,
|
|
204
|
+
vkData,
|
|
205
|
+
provingResult,
|
|
206
|
+
};
|
|
207
|
+
}
|
|
208
|
+
async createProof(input, circuitType, convertInput, convertOutput) {
|
|
209
|
+
const operation = async (bbWorkingDirectory) => {
|
|
210
|
+
const { provingResult, vkData, circuitOutput: output, } = await this.generateProofWithBB(input, circuitType, convertInput, convertOutput, bbWorkingDirectory);
|
|
211
|
+
// Read the binary proof
|
|
212
|
+
const rawProof = await fs.readFile(`${provingResult.proofPath}/${PROOF_FILENAME}`);
|
|
213
|
+
const proof = new Proof(rawProof, vkData.numPublicInputs);
|
|
214
|
+
const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
|
|
215
|
+
this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs / 1000);
|
|
216
|
+
this.instrumentation.recordSize('proofSize', circuitName, proof.buffer.length);
|
|
217
|
+
this.instrumentation.recordSize('circuitPublicInputCount', circuitName, vkData.numPublicInputs);
|
|
218
|
+
this.instrumentation.recordSize('circuitSize', circuitName, vkData.circuitSize);
|
|
219
|
+
logger.info(`Generated proof for ${circuitType} in ${Math.ceil(provingResult.durationMs)} ms`, {
|
|
220
|
+
circuitName,
|
|
221
|
+
// does not include reading the proof from disk
|
|
222
|
+
duration: provingResult.durationMs,
|
|
223
|
+
proofSize: proof.buffer.length,
|
|
224
|
+
eventName: 'circuit-proving',
|
|
225
|
+
// circuitOutput is the partial witness that became the input to the proof
|
|
226
|
+
inputSize: output.toBuffer().length,
|
|
227
|
+
circuitSize: vkData.circuitSize,
|
|
228
|
+
numPublicInputs: vkData.numPublicInputs,
|
|
229
|
+
});
|
|
230
|
+
return { circuitOutput: output, proof };
|
|
231
|
+
};
|
|
232
|
+
return await runInDirectory(this.config.bbWorkingDirectory, operation);
|
|
233
|
+
}
|
|
234
|
+
async generateAvmProofWithBB(input, workingDirectory) {
|
|
235
|
+
logger.info(`Proving avm-circuit for ${input.functionName}...`);
|
|
236
|
+
const provingResult = await generateAvmProof(this.config.bbBinaryPath, workingDirectory, input, logger.verbose);
|
|
237
|
+
if (provingResult.status === BB_RESULT.FAILURE) {
|
|
238
|
+
logger.error(`Failed to generate AVM proof for ${input.functionName}: ${provingResult.reason}`);
|
|
239
|
+
throw new Error(provingResult.reason);
|
|
240
|
+
}
|
|
241
|
+
return provingResult;
|
|
242
|
+
}
|
|
243
|
+
async createAvmProof(input) {
|
|
244
|
+
const cleanupDir = !process.env.AVM_PROVING_PRESERVE_WORKING_DIR;
|
|
245
|
+
const operation = async (bbWorkingDirectory) => {
|
|
246
|
+
if (!cleanupDir) {
|
|
247
|
+
logger.info(`Preserving working directory ${bbWorkingDirectory}`);
|
|
248
|
+
}
|
|
249
|
+
const provingResult = await this.generateAvmProofWithBB(input, bbWorkingDirectory);
|
|
250
|
+
const rawProof = await fs.readFile(provingResult.proofPath);
|
|
251
|
+
// TODO(https://github.com/AztecProtocol/aztec-packages/issues/6773): this VK data format is wrong.
|
|
252
|
+
// In particular, the number of public inputs, etc will be wrong.
|
|
253
|
+
const verificationKey = await extractVkData(provingResult.vkPath);
|
|
254
|
+
const proof = new Proof(rawProof, verificationKey.numPublicInputs);
|
|
255
|
+
const circuitType = 'avm-circuit';
|
|
256
|
+
const appCircuitName = 'unknown';
|
|
257
|
+
this.instrumentation.recordAvmDuration('provingDuration', appCircuitName, provingResult.durationMs);
|
|
258
|
+
this.instrumentation.recordAvmSize('proofSize', appCircuitName, proof.buffer.length);
|
|
259
|
+
this.instrumentation.recordAvmSize('circuitPublicInputCount', appCircuitName, verificationKey.numPublicInputs);
|
|
260
|
+
this.instrumentation.recordAvmSize('circuitSize', appCircuitName, verificationKey.circuitSize);
|
|
261
|
+
logger.info(`Generated proof for ${circuitType}(${input.functionName}) in ${Math.ceil(provingResult.durationMs)} ms`, {
|
|
262
|
+
circuitName: circuitType,
|
|
263
|
+
appCircuitName: input.functionName,
|
|
264
|
+
// does not include reading the proof from disk
|
|
265
|
+
duration: provingResult.durationMs,
|
|
266
|
+
proofSize: proof.buffer.length,
|
|
267
|
+
eventName: 'circuit-proving',
|
|
268
|
+
inputSize: input.toBuffer().length,
|
|
269
|
+
circuitSize: verificationKey.circuitSize, // FIX: wrong in VK
|
|
270
|
+
numPublicInputs: verificationKey.numPublicInputs, // FIX: wrong in VK
|
|
271
|
+
});
|
|
272
|
+
return { proof, verificationKey };
|
|
273
|
+
};
|
|
274
|
+
return await runInDirectory(this.config.bbWorkingDirectory, operation, cleanupDir);
|
|
275
|
+
}
|
|
276
|
+
/**
|
|
277
|
+
* Executes a circuit and returns it's outputs and corresponding proof with embedded aggregation object
|
|
278
|
+
* @param witnessMap - The input witness
|
|
279
|
+
* @param circuitType - The type of circuit to be executed
|
|
280
|
+
* @param proofLength - The length of the proof to be generated. This is a dummy parameter to aid in type checking
|
|
281
|
+
* @param convertInput - Function for mapping the input object to a witness map.
|
|
282
|
+
* @param convertOutput - Function for parsing the output witness to it's corresponding object
|
|
283
|
+
* @returns The circuits output object and it's proof
|
|
284
|
+
*/
|
|
285
|
+
async createRecursiveProof(input, circuitType, proofLength, convertInput, convertOutput) {
|
|
286
|
+
const operation = async (bbWorkingDirectory) => {
|
|
287
|
+
const { provingResult, vkData, circuitOutput: output, } = await this.generateProofWithBB(input, circuitType, convertInput, convertOutput, bbWorkingDirectory);
|
|
288
|
+
// Read the proof as fields
|
|
289
|
+
const proof = await this.readProofAsFields(provingResult.proofPath, circuitType, proofLength);
|
|
290
|
+
const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
|
|
291
|
+
this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs / 1000);
|
|
292
|
+
this.instrumentation.recordSize('proofSize', circuitName, proof.binaryProof.buffer.length);
|
|
293
|
+
this.instrumentation.recordSize('circuitPublicInputCount', circuitName, vkData.numPublicInputs);
|
|
294
|
+
this.instrumentation.recordSize('circuitSize', circuitName, vkData.circuitSize);
|
|
295
|
+
logger.info(`Generated proof for ${circuitType} in ${Math.ceil(provingResult.durationMs)} ms, size: ${proof.proof.length} fields`, {
|
|
296
|
+
circuitName,
|
|
297
|
+
circuitSize: vkData.circuitSize,
|
|
298
|
+
duration: provingResult.durationMs,
|
|
299
|
+
inputSize: output.toBuffer().length,
|
|
300
|
+
proofSize: proof.binaryProof.buffer.length,
|
|
301
|
+
eventName: 'circuit-proving',
|
|
302
|
+
numPublicInputs: vkData.numPublicInputs,
|
|
303
|
+
});
|
|
304
|
+
return {
|
|
305
|
+
circuitOutput: output,
|
|
306
|
+
proof,
|
|
307
|
+
};
|
|
308
|
+
};
|
|
309
|
+
return await runInDirectory(this.config.bbWorkingDirectory, operation);
|
|
310
|
+
}
|
|
311
|
+
/**
|
|
312
|
+
* Verifies a proof, will generate the verification key if one is not cached internally
|
|
313
|
+
* @param circuitType - The type of circuit whose proof is to be verified
|
|
314
|
+
* @param proof - The proof to be verified
|
|
315
|
+
*/
|
|
316
|
+
async verifyProof(circuitType, proof) {
|
|
317
|
+
const verificationKey = await this.getVerificationKeyDataForCircuit(circuitType);
|
|
318
|
+
return await this.verifyWithKey(verificationKey, proof);
|
|
319
|
+
}
|
|
320
|
+
async verifyAvmProof(proof, verificationKey) {
|
|
321
|
+
return await this.verifyWithKeyInternal(proof, verificationKey, verifyAvmProof);
|
|
322
|
+
}
|
|
323
|
+
async verifyWithKey(verificationKey, proof) {
|
|
324
|
+
return await this.verifyWithKeyInternal(proof, verificationKey, verifyProof);
|
|
325
|
+
}
|
|
326
|
+
async verifyWithKeyInternal(proof, verificationKey, verificationFunction) {
|
|
327
|
+
const operation = async (bbWorkingDirectory) => {
|
|
328
|
+
const proofFileName = path.join(bbWorkingDirectory, PROOF_FILENAME);
|
|
329
|
+
const verificationKeyPath = path.join(bbWorkingDirectory, VK_FILENAME);
|
|
330
|
+
await fs.writeFile(proofFileName, proof.buffer);
|
|
331
|
+
await fs.writeFile(verificationKeyPath, verificationKey.keyAsBytes);
|
|
332
|
+
const logFunction = (message) => {
|
|
333
|
+
logger.debug(`BB out - ${message}`);
|
|
334
|
+
};
|
|
335
|
+
const result = await verificationFunction(this.config.bbBinaryPath, proofFileName, verificationKeyPath, logFunction);
|
|
336
|
+
if (result.status === BB_RESULT.FAILURE) {
|
|
337
|
+
const errorMessage = `Failed to verify proof from key!`;
|
|
338
|
+
throw new Error(errorMessage);
|
|
339
|
+
}
|
|
340
|
+
logger.debug(`Successfully verified proof from key in ${result.durationMs} ms`);
|
|
341
|
+
};
|
|
342
|
+
await runInDirectory(this.config.bbWorkingDirectory, operation);
|
|
343
|
+
}
|
|
344
|
+
/**
|
|
345
|
+
* Returns the verification key for a circuit, will generate it if not cached internally
|
|
346
|
+
* @param circuitType - The type of circuit for which the verification key is required
|
|
347
|
+
* @returns The verification key
|
|
348
|
+
*/
|
|
349
|
+
async getVerificationKeyForCircuit(circuitType) {
|
|
350
|
+
const vkData = await this.getVerificationKeyDataForCircuit(circuitType);
|
|
351
|
+
return vkData.clone().keyAsFields;
|
|
352
|
+
}
|
|
353
|
+
/**
|
|
354
|
+
* Will check a recursive proof argument for validity of it's 'fields' format of proof and convert if required
|
|
355
|
+
* @param proof - The input proof that may need converting
|
|
356
|
+
* @returns - The valid proof
|
|
357
|
+
*/
|
|
358
|
+
async ensureValidProof(proof, circuit, vk) {
|
|
359
|
+
// If the 'fields' proof is already valid then simply return
|
|
360
|
+
// This will be false for proofs coming from clients
|
|
361
|
+
if (proof.fieldsValid) {
|
|
362
|
+
return proof;
|
|
366
363
|
}
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_prover.js","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"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"}
|
|
364
|
+
const operation = async (bbWorkingDirectory) => {
|
|
365
|
+
const numPublicInputs = vk.numPublicInputs - AGGREGATION_OBJECT_LENGTH;
|
|
366
|
+
const proofFullFilename = path.join(bbWorkingDirectory, PROOF_FILENAME);
|
|
367
|
+
const vkFullFilename = path.join(bbWorkingDirectory, VK_FILENAME);
|
|
368
|
+
logger.debug(`Converting proof to fields format for circuit ${circuit}, directory ${bbWorkingDirectory}, num public inputs: ${vk.numPublicInputs}, proof length ${proof.binaryProof.buffer.length}, vk length ${vk.keyAsBytes.length}`);
|
|
369
|
+
await fs.writeFile(proofFullFilename, proof.binaryProof.buffer);
|
|
370
|
+
await fs.writeFile(vkFullFilename, vk.keyAsBytes);
|
|
371
|
+
const logFunction = (message) => {
|
|
372
|
+
logger.debug(`${circuit} BB out - ${message}`);
|
|
373
|
+
};
|
|
374
|
+
const result = await writeProofAsFields(this.config.bbBinaryPath, bbWorkingDirectory, PROOF_FILENAME, vkFullFilename, logFunction);
|
|
375
|
+
if (result.status === BB_RESULT.FAILURE) {
|
|
376
|
+
const errorMessage = `Failed to convert ${circuit} proof to fields, ${result.reason}`;
|
|
377
|
+
throw new Error(errorMessage);
|
|
378
|
+
}
|
|
379
|
+
const proofString = await fs.readFile(path.join(bbWorkingDirectory, PROOF_FIELDS_FILENAME), {
|
|
380
|
+
encoding: 'utf-8',
|
|
381
|
+
});
|
|
382
|
+
const json = JSON.parse(proofString);
|
|
383
|
+
const fields = json.slice(numPublicInputs).map(Fr.fromString);
|
|
384
|
+
return new RecursiveProof(fields, new Proof(proof.binaryProof.buffer, vk.numPublicInputs), true);
|
|
385
|
+
};
|
|
386
|
+
return await runInDirectory(this.config.bbWorkingDirectory, operation);
|
|
387
|
+
}
|
|
388
|
+
/**
|
|
389
|
+
* Returns the verification key data for a circuit, will generate and cache it if not cached internally
|
|
390
|
+
* @param circuitType - The type of circuit for which the verification key is required
|
|
391
|
+
* @returns The verification key data
|
|
392
|
+
*/
|
|
393
|
+
async getVerificationKeyDataForCircuit(circuitType) {
|
|
394
|
+
let promise = this.verificationKeys.get(circuitType);
|
|
395
|
+
if (!promise) {
|
|
396
|
+
promise = generateKeyForNoirCircuit(this.config.bbBinaryPath, this.config.bbWorkingDirectory, circuitType, ServerCircuitArtifacts[circuitType], 'vk', logger.debug).then(result => {
|
|
397
|
+
if (result.status === BB_RESULT.FAILURE) {
|
|
398
|
+
throw new Error(`Failed to generate verification key for ${circuitType}, ${result.reason}`);
|
|
399
|
+
}
|
|
400
|
+
return extractVkData(result.vkPath);
|
|
401
|
+
});
|
|
402
|
+
this.verificationKeys.set(circuitType, promise);
|
|
403
|
+
}
|
|
404
|
+
const vk = await promise;
|
|
405
|
+
return vk.clone();
|
|
406
|
+
}
|
|
407
|
+
/**
|
|
408
|
+
* Ensures our verification key cache includes the key data located at the specified directory
|
|
409
|
+
* @param filePath - The directory containing the verification key data files
|
|
410
|
+
* @param circuitType - The type of circuit to which the verification key corresponds
|
|
411
|
+
*/
|
|
412
|
+
async updateVerificationKeyAfterProof(filePath, circuitType) {
|
|
413
|
+
let promise = this.verificationKeys.get(circuitType);
|
|
414
|
+
if (!promise) {
|
|
415
|
+
promise = extractVkData(filePath);
|
|
416
|
+
this.verificationKeys.set(circuitType, promise);
|
|
417
|
+
}
|
|
418
|
+
return promise;
|
|
419
|
+
}
|
|
420
|
+
/**
|
|
421
|
+
* Parses and returns the proof data stored at the specified directory
|
|
422
|
+
* @param filePath - The directory containing the proof data
|
|
423
|
+
* @param circuitType - The type of circuit proven
|
|
424
|
+
* @returns The proof
|
|
425
|
+
*/
|
|
426
|
+
async readProofAsFields(filePath, circuitType, proofLength) {
|
|
427
|
+
const proofFilename = path.join(filePath, PROOF_FILENAME);
|
|
428
|
+
const proofFieldsFilename = path.join(filePath, PROOF_FIELDS_FILENAME);
|
|
429
|
+
const [binaryProof, proofString] = await Promise.all([
|
|
430
|
+
fs.readFile(proofFilename),
|
|
431
|
+
fs.readFile(proofFieldsFilename, { encoding: 'utf-8' }),
|
|
432
|
+
]);
|
|
433
|
+
const json = JSON.parse(proofString);
|
|
434
|
+
const vkData = await this.verificationKeys.get(circuitType);
|
|
435
|
+
if (!vkData) {
|
|
436
|
+
throw new Error(`Invalid verification key for ${circuitType}`);
|
|
437
|
+
}
|
|
438
|
+
const numPublicInputs = CIRCUITS_WITHOUT_AGGREGATION.has(circuitType)
|
|
439
|
+
? vkData.numPublicInputs
|
|
440
|
+
: vkData.numPublicInputs - AGGREGATION_OBJECT_LENGTH;
|
|
441
|
+
const fieldsWithoutPublicInputs = json.slice(numPublicInputs).map(Fr.fromString);
|
|
442
|
+
logger.debug(`Circuit type: ${circuitType}, complete proof length: ${json.length}, without public inputs: ${fieldsWithoutPublicInputs.length}, num public inputs: ${numPublicInputs}, circuit size: ${vkData.circuitSize}, is recursive: ${vkData.isRecursive}, raw length: ${binaryProof.length}`);
|
|
443
|
+
const proof = new RecursiveProof(fieldsWithoutPublicInputs, new Proof(binaryProof, numPublicInputs), true);
|
|
444
|
+
if (proof.proof.length !== proofLength) {
|
|
445
|
+
throw new Error(`Proof length doesn't match expected length (${proof.proof.length} != ${proofLength})`);
|
|
446
|
+
}
|
|
447
|
+
return proof;
|
|
448
|
+
}
|
|
449
|
+
},
|
|
450
|
+
(() => {
|
|
451
|
+
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
|
|
452
|
+
_getBaseParityProof_decorators = [trackSpan('BBNativeRollupProver.getBaseParityProof', { [Attributes.PROTOCOL_CIRCUIT_NAME]: 'base-parity' })];
|
|
453
|
+
_getRootParityProof_decorators = [trackSpan('BBNativeRollupProver.getRootParityProof', { [Attributes.PROTOCOL_CIRCUIT_NAME]: 'root-parity' })];
|
|
454
|
+
_getAvmProof_decorators = [trackSpan('BBNativeRollupProver.getAvmProof', inputs => ({
|
|
455
|
+
[Attributes.APP_CIRCUIT_NAME]: inputs.functionName,
|
|
456
|
+
}))];
|
|
457
|
+
_getPublicKernelProof_decorators = [trackSpan('BBNativeRollupProver.getPublicKernelProof', kernelReq => ({
|
|
458
|
+
[Attributes.PROTOCOL_CIRCUIT_NAME]: mapProtocolArtifactNameToCircuitName(PublicKernelArtifactMapping[kernelReq.type].artifact),
|
|
459
|
+
}))];
|
|
460
|
+
__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);
|
|
461
|
+
__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);
|
|
462
|
+
__esDecorate(_a, null, _getAvmProof_decorators, { kind: "method", name: "getAvmProof", static: false, private: false, access: { has: obj => "getAvmProof" in obj, get: obj => obj.getAvmProof }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
463
|
+
__esDecorate(_a, null, _getPublicKernelProof_decorators, { kind: "method", name: "getPublicKernelProof", static: false, private: false, access: { has: obj => "getPublicKernelProof" in obj, get: obj => obj.getPublicKernelProof }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
464
|
+
if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
465
|
+
})(),
|
|
466
|
+
_a;
|
|
467
|
+
})();
|
|
468
|
+
export { BBNativeRollupProver };
|
|
469
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_prover.js","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"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"}
|