@aztec/bb-prover 0.41.0 → 0.43.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.
Files changed (59) hide show
  1. package/dest/bb/cli.d.ts.map +1 -1
  2. package/dest/bb/cli.js +24 -2
  3. package/dest/bb/execute.d.ts +30 -1
  4. package/dest/bb/execute.d.ts.map +1 -1
  5. package/dest/bb/execute.js +252 -60
  6. package/dest/config.d.ts +9 -0
  7. package/dest/config.d.ts.map +1 -0
  8. package/dest/config.js +2 -0
  9. package/dest/index.d.ts +2 -0
  10. package/dest/index.d.ts.map +1 -1
  11. package/dest/index.js +3 -1
  12. package/dest/mappings/mappings.d.ts +1 -0
  13. package/dest/mappings/mappings.d.ts.map +1 -1
  14. package/dest/mappings/mappings.js +27 -8
  15. package/dest/prover/bb_native_proof_creator.d.ts +2 -8
  16. package/dest/prover/bb_native_proof_creator.d.ts.map +1 -1
  17. package/dest/prover/bb_native_proof_creator.js +37 -79
  18. package/dest/prover/bb_prover.d.ts +33 -32
  19. package/dest/prover/bb_prover.d.ts.map +1 -1
  20. package/dest/prover/bb_prover.js +231 -162
  21. package/dest/stats.d.ts.map +1 -1
  22. package/dest/stats.js +8 -2
  23. package/dest/test/index.d.ts +1 -0
  24. package/dest/test/index.d.ts.map +1 -1
  25. package/dest/test/index.js +2 -1
  26. package/dest/test/test_circuit_prover.d.ts +9 -7
  27. package/dest/test/test_circuit_prover.d.ts.map +1 -1
  28. package/dest/test/test_circuit_prover.js +32 -16
  29. package/dest/test/test_verifier.d.ts +7 -0
  30. package/dest/test/test_verifier.d.ts.map +1 -0
  31. package/dest/test/test_verifier.js +10 -0
  32. package/dest/verification_key/verification_key_data.d.ts +8 -0
  33. package/dest/verification_key/verification_key_data.d.ts.map +1 -0
  34. package/dest/verification_key/verification_key_data.js +24 -0
  35. package/dest/verifier/bb_verifier.d.ts +18 -0
  36. package/dest/verifier/bb_verifier.d.ts.map +1 -0
  37. package/dest/verifier/bb_verifier.js +90 -0
  38. package/dest/verifier/index.d.ts +2 -0
  39. package/dest/verifier/index.d.ts.map +1 -0
  40. package/dest/verifier/index.js +2 -0
  41. package/package.json +6 -6
  42. package/src/bb/cli.ts +36 -1
  43. package/src/bb/execute.ts +340 -67
  44. package/src/config.ts +9 -0
  45. package/src/index.ts +2 -0
  46. package/src/mappings/mappings.ts +38 -12
  47. package/src/prover/bb_native_proof_creator.ts +49 -91
  48. package/src/prover/bb_prover.ts +396 -221
  49. package/src/stats.ts +7 -1
  50. package/src/test/index.ts +1 -0
  51. package/src/test/test_circuit_prover.ts +85 -23
  52. package/src/test/test_verifier.ts +12 -0
  53. package/src/verification_key/verification_key_data.ts +35 -0
  54. package/src/verifier/bb_verifier.ts +156 -0
  55. package/src/verifier/index.ts +1 -0
  56. package/dest/prover/verification_key_data.d.ts +0 -16
  57. package/dest/prover/verification_key_data.d.ts.map +0 -1
  58. package/dest/prover/verification_key_data.js +0 -5
  59. package/src/prover/verification_key_data.ts +0 -16
@@ -2,7 +2,7 @@
2
2
  import { type AppCircuitProofOutput, type KernelProofOutput, type ProofCreator } from '@aztec/circuit-types';
3
3
  import { Fr, type PrivateCircuitPublicInputs, type PrivateKernelCircuitPublicInputs, type PrivateKernelInitCircuitPrivateInputs, type PrivateKernelInnerCircuitPrivateInputs, type PrivateKernelResetCircuitPrivateInputsVariants, type PrivateKernelTailCircuitPrivateInputs, type PrivateKernelTailCircuitPublicInputs, Proof } from '@aztec/circuits.js';
4
4
  import { type ClientProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
5
- import { type ACVMField } from '@aztec/simulator';
5
+ import { type WitnessMap } from '@noir-lang/types';
6
6
  /**
7
7
  * This proof creator implementation uses the native bb binary.
8
8
  * This is a temporary implementation until we make the WASM version work.
@@ -19,7 +19,7 @@ export declare class BBNativeProofCreator implements ProofCreator {
19
19
  createProofInner(inputs: PrivateKernelInnerCircuitPrivateInputs): Promise<KernelProofOutput<PrivateKernelCircuitPublicInputs>>;
20
20
  createProofReset(inputs: PrivateKernelResetCircuitPrivateInputsVariants): Promise<KernelProofOutput<PrivateKernelCircuitPublicInputs>>;
21
21
  createProofTail(inputs: PrivateKernelTailCircuitPrivateInputs): Promise<KernelProofOutput<PrivateKernelTailCircuitPublicInputs>>;
22
- createAppCircuitProof(partialWitness: Map<number, ACVMField>, bytecode: Buffer, appCircuitName?: string): Promise<AppCircuitProofOutput>;
22
+ createAppCircuitProof(partialWitness: WitnessMap, bytecode: Buffer, appCircuitName?: string): Promise<AppCircuitProofOutput>;
23
23
  /**
24
24
  * Verifies a proof, will generate the verification key if one is not cached internally
25
25
  * @param circuitType - The type of circuit whose proof is to be verified
@@ -33,12 +33,6 @@ export declare class BBNativeProofCreator implements ProofCreator {
33
33
  * @returns The verification key data
34
34
  */
35
35
  private getVerificationKeyDataForCircuit;
36
- /**
37
- * Reads the verification key data stored at the specified location and parses into a VerificationKeyData
38
- * @param filePath - The directory containing the verification key data files
39
- * @returns The verification key data
40
- */
41
- private convertVk;
42
36
  /**
43
37
  * Ensures our verification key cache includes the key data located at the specified directory
44
38
  * @param filePath - The directory containing the verification key data files
@@ -1 +1 @@
1
- {"version":3,"file":"bb_native_proof_creator.d.ts","sourceRoot":"","sources":["../../src/prover/bb_native_proof_creator.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,iBAAiB,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE7G,OAAO,EACL,EAAE,EAEF,KAAK,0BAA0B,EAC/B,KAAK,gCAAgC,EACrC,KAAK,qCAAqC,EAC1C,KAAK,sCAAsC,EAC3C,KAAK,8CAA8C,EACnD,KAAK,qCAAqC,EAC1C,KAAK,oCAAoC,EACzC,KAAK,EAKN,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAEL,KAAK,sBAAsB,EAY5B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,KAAK,SAAS,EAAiB,MAAM,kBAAkB,CAAC;AA0BjE;;;GAGG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IASrD,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,GAAG;IAVb,OAAO,CAAC,SAAS,CAAuB;IAExC,OAAO,CAAC,gBAAgB,CAGpB;gBAGM,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,EAC1B,GAAG,yCAA8C;IAGpD,oBAAoB,CAAC,YAAY,EAAE,0BAA0B;IAQvD,eAAe,CAC1B,MAAM,EAAE,qCAAqC,GAC5C,OAAO,CAAC,iBAAiB,CAAC,gCAAgC,CAAC,CAAC;IASlD,gBAAgB,CAC3B,MAAM,EAAE,sCAAsC,GAC7C,OAAO,CAAC,iBAAiB,CAAC,gCAAgC,CAAC,CAAC;IASlD,gBAAgB,CAC3B,MAAM,EAAE,8CAA8C,GACrD,OAAO,CAAC,iBAAiB,CAAC,gCAAgC,CAAC,CAAC;IASlD,eAAe,CAC1B,MAAM,EAAE,qCAAqC,GAC5C,OAAO,CAAC,iBAAiB,CAAC,oCAAoC,CAAC,CAAC;IAiBtD,qBAAqB,CAChC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EACtC,QAAQ,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,qBAAqB,CAAC;IAsBjC;;;;OAIG;IACU,6BAA6B,CAAC,WAAW,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK;YAmB9E,kBAAkB;IAsBhC;;;;OAIG;YACW,gCAAgC;IAqB9C;;;;OAIG;YACW,SAAS;IAqBvB;;;;OAIG;YACW,+BAA+B;YAU/B,eAAe;YAiBf,6BAA6B;YAiD7B,WAAW;IAsEzB;;;;;OAKG;YACW,iBAAiB;CAoBhC"}
1
+ {"version":3,"file":"bb_native_proof_creator.d.ts","sourceRoot":"","sources":["../../src/prover/bb_native_proof_creator.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,iBAAiB,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE7G,OAAO,EAEL,EAAE,EAEF,KAAK,0BAA0B,EAC/B,KAAK,gCAAgC,EACrC,KAAK,qCAAqC,EAC1C,KAAK,sCAAsC,EAC3C,KAAK,8CAA8C,EACnD,KAAK,qCAAqC,EAC1C,KAAK,oCAAoC,EACzC,KAAK,EAKN,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAEL,KAAK,sBAAsB,EAY5B,MAAM,qCAAqC,CAAC;AAK7C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAcnD;;;GAGG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IASrD,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,GAAG;IAVb,OAAO,CAAC,SAAS,CAAuB;IAExC,OAAO,CAAC,gBAAgB,CAGpB;gBAGM,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,EAC1B,GAAG,yCAA8C;IAGpD,oBAAoB,CAAC,YAAY,EAAE,0BAA0B;IAQvD,eAAe,CAC1B,MAAM,EAAE,qCAAqC,GAC5C,OAAO,CAAC,iBAAiB,CAAC,gCAAgC,CAAC,CAAC;IASlD,gBAAgB,CAC3B,MAAM,EAAE,sCAAsC,GAC7C,OAAO,CAAC,iBAAiB,CAAC,gCAAgC,CAAC,CAAC;IASlD,gBAAgB,CAC3B,MAAM,EAAE,8CAA8C,GACrD,OAAO,CAAC,iBAAiB,CAAC,gCAAgC,CAAC,CAAC;IASlD,eAAe,CAC1B,MAAM,EAAE,qCAAqC,GAC5C,OAAO,CAAC,iBAAiB,CAAC,oCAAoC,CAAC,CAAC;IAiBtD,qBAAqB,CAChC,cAAc,EAAE,UAAU,EAC1B,QAAQ,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,qBAAqB,CAAC;IAkBjC;;;;OAIG;IACU,6BAA6B,CAAC,WAAW,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK;YAmB9E,kBAAkB;IAgBhC;;;;OAIG;YACW,gCAAgC;IAqB9C;;;;OAIG;YACW,+BAA+B;YAU/B,eAAe;YAYf,6BAA6B;YA6C7B,WAAW;IA6EzB;;;;;OAKG;YACW,iBAAiB;CAwBhC"}
@@ -1,15 +1,15 @@
1
- import { Fr, NESTED_RECURSIVE_PROOF_LENGTH, Proof, RECURSIVE_PROOF_LENGTH, RecursiveProof, VerificationKeyAsFields, } from '@aztec/circuits.js';
1
+ import { AGGREGATION_OBJECT_LENGTH, Fr, NESTED_RECURSIVE_PROOF_LENGTH, Proof, RECURSIVE_PROOF_LENGTH, RecursiveProof, } from '@aztec/circuits.js';
2
2
  import { siloNoteHash } from '@aztec/circuits.js/hash';
3
- import { randomBytes } from '@aztec/foundation/crypto';
3
+ import { runInDirectory } from '@aztec/foundation/fs';
4
4
  import { createDebugLogger } from '@aztec/foundation/log';
5
5
  import { Timer } from '@aztec/foundation/timer';
6
6
  import { ClientCircuitArtifacts, PrivateResetTagToArtifactName, convertPrivateKernelInitInputsToWitnessMap, convertPrivateKernelInitOutputsFromWitnessMap, convertPrivateKernelInnerInputsToWitnessMap, convertPrivateKernelInnerOutputsFromWitnessMap, convertPrivateKernelResetInputsToWitnessMap, convertPrivateKernelResetOutputsFromWitnessMap, convertPrivateKernelTailForPublicOutputsFromWitnessMap, convertPrivateKernelTailInputsToWitnessMap, convertPrivateKernelTailOutputsFromWitnessMap, convertPrivateKernelTailToPublicInputsToWitnessMap, } from '@aztec/noir-protocol-circuits-types';
7
7
  import { WASMSimulator } from '@aztec/simulator';
8
8
  import { serializeWitness } from '@noir-lang/noirc_abi';
9
9
  import * as fs from 'fs/promises';
10
- import { BB_RESULT, PROOF_FIELDS_FILENAME, PROOF_FILENAME, VK_FIELDS_FILENAME, VK_FILENAME, generateKeyForNoirCircuit, generateProof, verifyProof, } from '../bb/execute.js';
10
+ import { BB_RESULT, PROOF_FIELDS_FILENAME, PROOF_FILENAME, generateKeyForNoirCircuit, generateProof, verifyProof, } from '../bb/execute.js';
11
11
  import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
12
- import { AGGREGATION_OBJECT_SIZE, CIRCUIT_PUBLIC_INPUTS_INDEX, CIRCUIT_RECURSIVE_INDEX, CIRCUIT_SIZE_INDEX, } from './verification_key_data.js';
12
+ import { extractVkData } from '../verification_key/verification_key_data.js';
13
13
  /**
14
14
  * This proof creator implementation uses the native bb binary.
15
15
  * This is a temporary implementation until we make the WASM version work.
@@ -42,12 +42,9 @@ export class BBNativeProofCreator {
42
42
  return await this.createSafeProof(inputs, 'PrivateKernelTailToPublicArtifact', convertPrivateKernelTailToPublicInputsToWitnessMap, convertPrivateKernelTailForPublicOutputsFromWitnessMap);
43
43
  }
44
44
  async createAppCircuitProof(partialWitness, bytecode, appCircuitName) {
45
- const directory = `${this.bbWorkingDirectory}/${randomBytes(8).toString('hex')}`;
46
- await fs.mkdir(directory, { recursive: true });
47
- this.log.debug(`Created directory: ${directory}`);
48
- try {
45
+ const operation = async (directory) => {
49
46
  this.log.debug(`Proving app circuit`);
50
- const proofOutput = await this.createProof(directory, partialWitness, bytecode, 'App', 0, 0, appCircuitName);
47
+ const proofOutput = await this.createProof(directory, partialWitness, bytecode, 'App', appCircuitName);
51
48
  if (proofOutput.proof.proof.length != RECURSIVE_PROOF_LENGTH) {
52
49
  throw new Error(`Incorrect proof length`);
53
50
  }
@@ -57,11 +54,8 @@ export class BBNativeProofCreator {
57
54
  verificationKey: proofOutput.verificationKey,
58
55
  };
59
56
  return output;
60
- }
61
- finally {
62
- await fs.rm(directory, { recursive: true, force: true });
63
- this.log.debug(`Deleted directory: ${directory}`);
64
- }
57
+ };
58
+ return await runInDirectory(this.bbWorkingDirectory, operation);
65
59
  }
66
60
  /**
67
61
  * Verifies a proof, will generate the verification key if one is not cached internally
@@ -70,7 +64,7 @@ export class BBNativeProofCreator {
70
64
  */
71
65
  async verifyProofForProtocolCircuit(circuitType, proof) {
72
66
  const verificationKey = await this.getVerificationKeyDataForCircuit(circuitType);
73
- this.log.debug(`Verifying with key: ${verificationKey.hash.toString()}`);
67
+ this.log.debug(`Verifying with key: ${verificationKey.keyAsFields.hash.toString()}`);
74
68
  const logFunction = (message) => {
75
69
  this.log.debug(`${circuitType} BB out - ${message}`);
76
70
  };
@@ -82,19 +76,14 @@ export class BBNativeProofCreator {
82
76
  this.log.info(`Successfully verified ${circuitType} proof in ${result.duration} ms`);
83
77
  }
84
78
  async verifyProofFromKey(verificationKey, proof, logFunction = () => { }) {
85
- // Create random directory to be used for temp files
86
- const bbWorkingDirectory = `${this.bbWorkingDirectory}/${randomBytes(8).toString('hex')}`;
87
- await fs.mkdir(bbWorkingDirectory, { recursive: true });
88
- const proofFileName = `${bbWorkingDirectory}/proof`;
89
- const verificationKeyPath = `${bbWorkingDirectory}/vk`;
90
- await fs.writeFile(proofFileName, proof.buffer);
91
- await fs.writeFile(verificationKeyPath, verificationKey);
92
- try {
79
+ const operation = async (bbWorkingDirectory) => {
80
+ const proofFileName = `${bbWorkingDirectory}/proof`;
81
+ const verificationKeyPath = `${bbWorkingDirectory}/vk`;
82
+ await fs.writeFile(proofFileName, proof.buffer);
83
+ await fs.writeFile(verificationKeyPath, verificationKey);
93
84
  return await verifyProof(this.bbBinaryPath, proofFileName, verificationKeyPath, logFunction);
94
- }
95
- finally {
96
- await fs.rm(bbWorkingDirectory, { recursive: true, force: true });
97
- }
85
+ };
86
+ return await runInDirectory(this.bbWorkingDirectory, operation);
98
87
  }
99
88
  /**
100
89
  * Returns the verification key data for a circuit, will generate and cache it if not cached internally
@@ -108,37 +97,12 @@ export class BBNativeProofCreator {
108
97
  if (result.status === BB_RESULT.FAILURE) {
109
98
  throw new Error(`Failed to generate verification key for ${circuitType}, ${result.reason}`);
110
99
  }
111
- return this.convertVk(result.vkPath);
100
+ return extractVkData(result.vkPath);
112
101
  });
113
102
  this.verificationKeys.set(circuitType, promise);
114
103
  }
115
104
  return await promise;
116
105
  }
117
- /**
118
- * Reads the verification key data stored at the specified location and parses into a VerificationKeyData
119
- * @param filePath - The directory containing the verification key data files
120
- * @returns The verification key data
121
- */
122
- async convertVk(filePath) {
123
- const [rawFields, rawBinary] = await Promise.all([
124
- fs.readFile(`${filePath}/${VK_FIELDS_FILENAME}`, { encoding: 'utf-8' }),
125
- fs.readFile(`${filePath}/${VK_FILENAME}`),
126
- ]);
127
- const fieldsJson = JSON.parse(rawFields);
128
- const fields = fieldsJson.map(Fr.fromString);
129
- // The first item is the hash, this is not part of the actual VK
130
- const vkHash = fields[0];
131
- const actualVk = fields.slice(1);
132
- const vk = {
133
- hash: vkHash,
134
- keyAsFields: actualVk,
135
- keyAsBytes: rawBinary,
136
- numPublicInputs: Number(actualVk[CIRCUIT_PUBLIC_INPUTS_INDEX]),
137
- circuitSize: Number(actualVk[CIRCUIT_SIZE_INDEX]),
138
- isRecursive: actualVk[CIRCUIT_RECURSIVE_INDEX] == Fr.ONE,
139
- };
140
- return vk;
141
- }
142
106
  /**
143
107
  * Ensures our verification key cache includes the key data located at the specified directory
144
108
  * @param filePath - The directory containing the verification key data files
@@ -147,23 +111,17 @@ export class BBNativeProofCreator {
147
111
  async updateVerificationKeyAfterProof(filePath, circuitType) {
148
112
  let promise = this.verificationKeys.get(circuitType);
149
113
  if (!promise) {
150
- promise = this.convertVk(filePath);
114
+ promise = extractVkData(filePath);
151
115
  this.log.debug(`Updated verification key for circuit: ${circuitType}`);
152
116
  this.verificationKeys.set(circuitType, promise);
153
117
  }
154
118
  return await promise;
155
119
  }
156
120
  async createSafeProof(inputs, circuitType, convertInputs, convertOutputs) {
157
- const directory = `${this.bbWorkingDirectory}/${randomBytes(8).toString('hex')}`;
158
- await fs.mkdir(directory, { recursive: true });
159
- this.log.debug(`Created directory: ${directory}`);
160
- try {
121
+ const operation = async (directory) => {
161
122
  return await this.generateWitnessAndCreateProof(inputs, circuitType, directory, convertInputs, convertOutputs);
162
- }
163
- finally {
164
- await fs.rm(directory, { recursive: true, force: true });
165
- this.log.debug(`Deleted directory: ${directory}`);
166
- }
123
+ };
124
+ return await runInDirectory(this.bbWorkingDirectory, operation);
167
125
  }
168
126
  async generateWitnessAndCreateProof(inputs, circuitType, directory, convertInputs, convertOutputs) {
169
127
  this.log.debug(`Generating witness for ${circuitType}`);
@@ -172,16 +130,14 @@ export class BBNativeProofCreator {
172
130
  const timer = new Timer();
173
131
  const outputWitness = await this.simulator.simulateCircuit(witnessMap, compiledCircuit);
174
132
  const output = convertOutputs(outputWitness);
175
- const inputSize = inputs.toBuffer().length;
176
- const outputSize = output.toBuffer().length;
177
133
  this.log.debug(`Generated witness for ${circuitType}`, {
178
134
  eventName: 'circuit-witness-generation',
179
135
  circuitName: mapProtocolArtifactNameToCircuitName(circuitType),
180
136
  duration: timer.ms(),
181
- inputSize,
182
- outputSize,
137
+ inputSize: inputs.toBuffer().length,
138
+ outputSize: output.toBuffer().length,
183
139
  });
184
- const proofOutput = await this.createProof(directory, outputWitness, Buffer.from(compiledCircuit.bytecode, 'base64'), circuitType, inputSize, outputSize);
140
+ const proofOutput = await this.createProof(directory, outputWitness, Buffer.from(compiledCircuit.bytecode, 'base64'), circuitType);
185
141
  if (proofOutput.proof.proof.length != NESTED_RECURSIVE_PROOF_LENGTH) {
186
142
  throw new Error(`Incorrect proof length`);
187
143
  }
@@ -193,45 +149,47 @@ export class BBNativeProofCreator {
193
149
  };
194
150
  return kernelOutput;
195
151
  }
196
- async createProof(directory, partialWitness, bytecode, circuitType, inputSize, outputSize, appCircuitName) {
152
+ async createProof(directory, partialWitness, bytecode, circuitType, appCircuitName) {
197
153
  const compressedBincodedWitness = serializeWitness(partialWitness);
198
154
  const inputsWitnessFile = `${directory}/witness.gz`;
199
155
  await fs.writeFile(inputsWitnessFile, compressedBincodedWitness);
200
156
  this.log.debug(`Written ${inputsWitnessFile}`);
157
+ this.log.info(`Proving ${circuitType} circuit...`);
158
+ const timer = new Timer();
201
159
  const provingResult = await generateProof(this.bbBinaryPath, directory, circuitType, bytecode, inputsWitnessFile, this.log.debug);
202
160
  if (provingResult.status === BB_RESULT.FAILURE) {
203
161
  this.log.error(`Failed to generate proof for ${circuitType}: ${provingResult.reason}`);
204
162
  throw new Error(provingResult.reason);
205
163
  }
164
+ this.log.info(`Generated ${circuitType === 'App' ? appCircuitName : circuitType} circuit proof in ${timer.ms()} ms`);
206
165
  if (circuitType === 'App') {
207
- const vkData = await this.convertVk(directory);
166
+ const vkData = await extractVkData(directory);
208
167
  const proof = await this.readProofAsFields(directory, circuitType, vkData);
209
168
  this.log.debug(`Generated proof`, {
210
169
  eventName: 'circuit-proving',
211
170
  circuitName: 'app-circuit',
212
171
  duration: provingResult.duration,
213
- inputSize,
214
- outputSize,
172
+ inputSize: compressedBincodedWitness.length,
215
173
  proofSize: proof.binaryProof.buffer.length,
216
174
  appCircuitName,
217
175
  circuitSize: vkData.circuitSize,
218
176
  numPublicInputs: vkData.numPublicInputs,
219
177
  });
220
- return { proof, verificationKey: new VerificationKeyAsFields(vkData.keyAsFields, vkData.hash) };
178
+ return { proof, verificationKey: vkData.keyAsFields };
221
179
  }
222
180
  const vkData = await this.updateVerificationKeyAfterProof(directory, circuitType);
223
181
  const proof = await this.readProofAsFields(directory, circuitType, vkData);
182
+ await this.verifyProofForProtocolCircuit(circuitType, proof.binaryProof);
224
183
  this.log.debug(`Generated proof`, {
225
184
  circuitName: mapProtocolArtifactNameToCircuitName(circuitType),
226
185
  duration: provingResult.duration,
227
186
  eventName: 'circuit-proving',
228
- inputSize,
229
- outputSize,
187
+ inputSize: compressedBincodedWitness.length,
230
188
  proofSize: proof.binaryProof.buffer.length,
231
189
  circuitSize: vkData.circuitSize,
232
190
  numPublicInputs: vkData.numPublicInputs,
233
191
  });
234
- return { proof, verificationKey: new VerificationKeyAsFields(vkData.keyAsFields, vkData.hash) };
192
+ return { proof, verificationKey: vkData.keyAsFields };
235
193
  }
236
194
  /**
237
195
  * Parses and returns the proof data stored at the specified directory
@@ -246,11 +204,11 @@ export class BBNativeProofCreator {
246
204
  ]);
247
205
  const json = JSON.parse(proofString);
248
206
  const fields = json.map(Fr.fromString);
249
- const numPublicInputs = circuitType === 'App' ? vkData.numPublicInputs : vkData.numPublicInputs - AGGREGATION_OBJECT_SIZE;
207
+ const numPublicInputs = circuitType === 'App' ? vkData.numPublicInputs : vkData.numPublicInputs - AGGREGATION_OBJECT_LENGTH;
250
208
  const fieldsWithoutPublicInputs = fields.slice(numPublicInputs);
251
209
  this.log.debug(`Circuit type: ${circuitType}, complete proof length: ${fields.length}, without public inputs: ${fieldsWithoutPublicInputs.length}, num public inputs: ${numPublicInputs}, circuit size: ${vkData.circuitSize}, is recursive: ${vkData.isRecursive}, raw length: ${binaryProof.length}`);
252
- const proof = new RecursiveProof(fieldsWithoutPublicInputs, new Proof(binaryProof));
210
+ const proof = new RecursiveProof(fieldsWithoutPublicInputs, new Proof(binaryProof, vkData.numPublicInputs), true);
253
211
  return proof;
254
212
  }
255
213
  }
256
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_native_proof_creator.js","sourceRoot":"","sources":["../../src/prover/bb_native_proof_creator.ts"],"names":[],"mappings":"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"}
214
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_native_proof_creator.js","sourceRoot":"","sources":["../../src/prover/bb_native_proof_creator.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,10 @@
1
- /// <reference types="node" resolution-mode="require"/>
2
- import { type PublicInputsAndProof, type PublicKernelNonTailRequest, type PublicKernelTailRequest, type ServerCircuitProver } from '@aztec/circuit-types';
3
- import { type BaseOrMergeRollupPublicInputs, type BaseParityInputs, type BaseRollupInputs, type KernelCircuitPublicInputs, type MergeRollupInputs, NESTED_RECURSIVE_PROOF_LENGTH, Proof, type PublicKernelCircuitPublicInputs, RECURSIVE_PROOF_LENGTH, RecursiveProof, RootParityInput, type RootParityInputs, type RootRollupInputs, type RootRollupPublicInputs, VerificationKeyAsFields } from '@aztec/circuits.js';
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, type VerificationKeyAsFields, type VerificationKeyData } from '@aztec/circuits.js';
4
3
  import { type ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
5
- import { type WitnessMap } from '@noir-lang/types';
6
- export type BBProverConfig = {
7
- bbBinaryPath: string;
8
- bbWorkingDirectory: string;
9
- acvmBinaryPath: string;
10
- acvmWorkingDirectory: string;
4
+ import type { ACVMConfig, BBConfig } from '../config.js';
5
+ export interface BBProverConfig extends BBConfig, ACVMConfig {
11
6
  circuitFilter?: ServerProtocolArtifact[];
12
- };
7
+ }
13
8
  /**
14
9
  * Prover implementation that uses barretenberg native proving
15
10
  */
@@ -30,41 +25,49 @@ export declare class BBNativeRollupProver implements ServerCircuitProver {
30
25
  * @returns The public inputs of the parity circuit.
31
26
  */
32
27
  getRootParityProof(inputs: RootParityInputs): Promise<RootParityInput<typeof NESTED_RECURSIVE_PROOF_LENGTH>>;
28
+ /**
29
+ * Creates an AVM proof and verifies it.
30
+ * @param inputs - The inputs to the AVM circuit.
31
+ * @returns The proof.
32
+ */
33
+ getAvmProof(inputs: AvmCircuitInputs): Promise<ProofAndVerificationKey>;
33
34
  /**
34
35
  * Requests that a public kernel circuit be executed and the proof generated
35
36
  * @param kernelRequest - The object encapsulating the request for a proof
36
37
  * @returns The requested circuit's public inputs and proof
37
38
  */
38
- getPublicKernelProof(kernelRequest: PublicKernelNonTailRequest): Promise<PublicInputsAndProof<PublicKernelCircuitPublicInputs>>;
39
+ getPublicKernelProof(kernelRequest: PublicKernelNonTailRequest): Promise<PublicInputsAndRecursiveProof<PublicKernelCircuitPublicInputs>>;
39
40
  /**
40
41
  * Requests that the public kernel tail circuit be executed and the proof generated
41
42
  * @param kernelRequest - The object encapsulating the request for a proof
42
43
  * @returns The requested circuit's public inputs and proof
43
44
  */
44
- getPublicTailProof(kernelRequest: PublicKernelTailRequest): Promise<PublicInputsAndProof<KernelCircuitPublicInputs>>;
45
+ getPublicTailProof(kernelRequest: PublicKernelTailRequest): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>>;
45
46
  /**
46
47
  * Simulates the base rollup circuit from its inputs.
47
48
  * @param input - Inputs to the circuit.
48
49
  * @returns The public inputs as outputs of the simulation.
49
50
  */
50
- getBaseRollupProof(input: BaseRollupInputs): Promise<PublicInputsAndProof<BaseOrMergeRollupPublicInputs>>;
51
+ getBaseRollupProof(input: BaseRollupInputs): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>>;
51
52
  /**
52
53
  * Simulates the merge rollup circuit from its inputs.
53
54
  * @param input - Inputs to the circuit.
54
55
  * @returns The public inputs as outputs of the simulation.
55
56
  */
56
- getMergeRollupProof(input: MergeRollupInputs): Promise<PublicInputsAndProof<BaseOrMergeRollupPublicInputs>>;
57
+ getMergeRollupProof(input: MergeRollupInputs): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>>;
57
58
  /**
58
59
  * Simulates the root rollup circuit from its inputs.
59
60
  * @param input - Inputs to the circuit.
60
61
  * @returns The public inputs as outputs of the simulation.
61
62
  */
62
- getRootRollupProof(input: RootRollupInputs): Promise<PublicInputsAndProof<RootRollupPublicInputs>>;
63
- createProof<Input extends {
64
- toBuffer: () => Buffer;
65
- }, Output extends {
66
- toBuffer: () => Buffer;
67
- }>(input: Input, circuitType: ServerProtocolArtifact, convertInput: (input: Input) => WitnessMap, convertOutput: (outputWitness: WitnessMap) => Output): Promise<[Output, Proof]>;
63
+ getRootRollupProof(input: RootRollupInputs): Promise<PublicInputsAndRecursiveProof<RootRollupPublicInputs>>;
64
+ getEmptyPrivateKernelProof(inputs: PrivateKernelEmptyInputData): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>>;
65
+ private getEmptyNestedProof;
66
+ private getEmptyPrivateKernelProofFromEmptyNested;
67
+ private generateProofWithBB;
68
+ private createProof;
69
+ private generateAvmProofWithBB;
70
+ private createAvmProof;
68
71
  /**
69
72
  * Executes a circuit and returns it's outputs and corresponding proof with embedded aggregation object
70
73
  * @param witnessMap - The input witness
@@ -74,36 +77,34 @@ export declare class BBNativeRollupProver implements ServerCircuitProver {
74
77
  * @param convertOutput - Function for parsing the output witness to it's corresponding object
75
78
  * @returns The circuits output object and it's proof
76
79
  */
77
- createRecursiveProof<PROOF_LENGTH extends number, CircuitInputType extends {
78
- toBuffer: () => Buffer;
79
- }, CircuitOutputType extends {
80
- toBuffer: () => Buffer;
81
- }>(input: CircuitInputType, circuitType: ServerProtocolArtifact, proofLength: PROOF_LENGTH, convertInput: (input: CircuitInputType) => WitnessMap, convertOutput: (outputWitness: WitnessMap) => CircuitOutputType): Promise<[CircuitOutputType, RecursiveProof<PROOF_LENGTH>]>;
80
+ private createRecursiveProof;
82
81
  /**
83
82
  * Verifies a proof, will generate the verification key if one is not cached internally
84
83
  * @param circuitType - The type of circuit whose proof is to be verified
85
84
  * @param proof - The proof to be verified
86
85
  */
87
86
  verifyProof(circuitType: ServerProtocolArtifact, proof: Proof): Promise<void>;
87
+ verifyAvmProof(proof: Proof, verificationKey: VerificationKeyData): Promise<void>;
88
+ verifyWithKey(verificationKey: VerificationKeyData, proof: Proof): Promise<void>;
89
+ private verifyWithKeyInternal;
88
90
  /**
89
91
  * Returns the verification key for a circuit, will generate it if not cached internally
90
92
  * @param circuitType - The type of circuit for which the verification key is required
91
93
  * @returns The verification key
92
94
  */
93
95
  getVerificationKeyForCircuit(circuitType: ServerProtocolArtifact): Promise<VerificationKeyAsFields>;
94
- private verifyPreviousRollupProof;
96
+ /**
97
+ * Will check a recursive proof argument for validity of it's 'fields' format of proof and convert if required
98
+ * @param proof - The input proof that may need converting
99
+ * @returns - The valid proof
100
+ */
101
+ ensureValidProof(proof: RecursiveProof<typeof NESTED_RECURSIVE_PROOF_LENGTH>, circuit: ServerProtocolArtifact, vk: VerificationKeyData): Promise<RecursiveProof<109>>;
95
102
  /**
96
103
  * Returns the verification key data for a circuit, will generate and cache it if not cached internally
97
104
  * @param circuitType - The type of circuit for which the verification key is required
98
105
  * @returns The verification key data
99
106
  */
100
107
  private getVerificationKeyDataForCircuit;
101
- /**
102
- * Reads the verification key data stored at the specified location and parses into a VerificationKeyData
103
- * @param filePath - The directory containing the verification key data files
104
- * @returns The verification key data
105
- */
106
- private convertVk;
107
108
  /**
108
109
  * Ensures our verification key cache includes the key data located at the specified directory
109
110
  * @param filePath - The directory containing the verification key data files
@@ -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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"}