@aztec/bb-prover 0.40.1 → 0.42.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/cli.d.ts.map +1 -1
- package/dest/bb/cli.js +24 -2
- package/dest/bb/execute.d.ts +37 -2
- package/dest/bb/execute.d.ts.map +1 -1
- package/dest/bb/execute.js +276 -75
- package/dest/config.d.ts +9 -0
- package/dest/config.d.ts.map +1 -0
- package/dest/config.js +2 -0
- package/dest/index.d.ts +2 -0
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +3 -1
- package/dest/mappings/mappings.d.ts +1 -0
- package/dest/mappings/mappings.d.ts.map +1 -1
- package/dest/mappings/mappings.js +27 -8
- package/dest/prover/bb_native_proof_creator.d.ts +4 -9
- package/dest/prover/bb_native_proof_creator.d.ts.map +1 -1
- package/dest/prover/bb_native_proof_creator.js +77 -101
- package/dest/prover/bb_prover.d.ts +35 -23
- package/dest/prover/bb_prover.d.ts.map +1 -1
- package/dest/prover/bb_prover.js +247 -155
- package/dest/stats.d.ts +2 -5
- package/dest/stats.d.ts.map +1 -1
- package/dest/stats.js +27 -26
- package/dest/test/index.d.ts +1 -0
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/index.js +2 -1
- package/dest/test/test_circuit_prover.d.ts +9 -7
- package/dest/test/test_circuit_prover.d.ts.map +1 -1
- package/dest/test/test_circuit_prover.js +31 -15
- package/dest/test/test_verifier.d.ts +7 -0
- package/dest/test/test_verifier.d.ts.map +1 -0
- package/dest/test/test_verifier.js +10 -0
- package/dest/verification_key/verification_key_data.d.ts +8 -0
- package/dest/verification_key/verification_key_data.d.ts.map +1 -0
- package/dest/verification_key/verification_key_data.js +24 -0
- package/dest/verifier/bb_verifier.d.ts +18 -0
- package/dest/verifier/bb_verifier.d.ts.map +1 -0
- package/dest/verifier/bb_verifier.js +90 -0
- package/dest/verifier/index.d.ts +2 -0
- package/dest/verifier/index.d.ts.map +1 -0
- package/dest/verifier/index.js +2 -0
- package/package.json +6 -6
- package/src/bb/cli.ts +36 -1
- package/src/bb/execute.ts +371 -83
- package/src/config.ts +9 -0
- package/src/index.ts +2 -0
- package/src/mappings/mappings.ts +38 -12
- package/src/prover/bb_native_proof_creator.ts +139 -119
- package/src/prover/bb_prover.ts +454 -242
- package/src/stats.ts +30 -45
- package/src/test/index.ts +1 -0
- package/src/test/test_circuit_prover.ts +84 -21
- package/src/test/test_verifier.ts +12 -0
- package/src/verification_key/verification_key_data.ts +35 -0
- package/src/verifier/bb_verifier.ts +156 -0
- package/src/verifier/index.ts +1 -0
- package/dest/prover/verification_key_data.d.ts +0 -16
- package/dest/prover/verification_key_data.d.ts.map +0 -1
- package/dest/prover/verification_key_data.js +0 -5
- package/src/prover/verification_key_data.ts +0 -16
package/dest/bb/execute.js
CHANGED
|
@@ -2,6 +2,7 @@ import { sha256 } from '@aztec/foundation/crypto';
|
|
|
2
2
|
import { Timer } from '@aztec/foundation/timer';
|
|
3
3
|
import * as proc from 'child_process';
|
|
4
4
|
import * as fs from 'fs/promises';
|
|
5
|
+
import { basename, dirname, join } from 'path';
|
|
5
6
|
export const VK_FILENAME = 'vk';
|
|
6
7
|
export const VK_FIELDS_FILENAME = 'vk_fields.json';
|
|
7
8
|
export const PROOF_FILENAME = 'proof';
|
|
@@ -22,9 +23,14 @@ export var BB_RESULT;
|
|
|
22
23
|
* @returns The completed partial witness outputted from the circuit
|
|
23
24
|
*/
|
|
24
25
|
export function executeBB(pathToBB, command, args, logger, resultParser = (code) => code === 0) {
|
|
25
|
-
return new Promise(
|
|
26
|
+
return new Promise(resolve => {
|
|
26
27
|
// spawn the bb process
|
|
27
|
-
const
|
|
28
|
+
const { HARDWARE_CONCURRENCY: _, ...envWithoutConcurrency } = process.env;
|
|
29
|
+
const env = process.env.HARDWARE_CONCURRENCY ? process.env : envWithoutConcurrency;
|
|
30
|
+
logger(`Executing BB with: ${command} ${args.join(' ')}`);
|
|
31
|
+
const bb = proc.spawn(pathToBB, [command, ...args], {
|
|
32
|
+
env,
|
|
33
|
+
});
|
|
28
34
|
bb.stdout.on('data', data => {
|
|
29
35
|
const message = data.toString('utf-8').replace(/\n$/, '');
|
|
30
36
|
logger(message);
|
|
@@ -33,17 +39,16 @@ export function executeBB(pathToBB, command, args, logger, resultParser = (code)
|
|
|
33
39
|
const message = data.toString('utf-8').replace(/\n$/, '');
|
|
34
40
|
logger(message);
|
|
35
41
|
});
|
|
36
|
-
bb.on('close', (
|
|
37
|
-
if (resultParser(
|
|
38
|
-
resolve(BB_RESULT.SUCCESS);
|
|
42
|
+
bb.on('close', (exitCode, signal) => {
|
|
43
|
+
if (resultParser(exitCode)) {
|
|
44
|
+
resolve({ status: BB_RESULT.SUCCESS, exitCode, signal });
|
|
39
45
|
}
|
|
40
46
|
else {
|
|
41
|
-
|
|
47
|
+
resolve({ status: BB_RESULT.FAILURE, exitCode, signal });
|
|
42
48
|
}
|
|
43
49
|
});
|
|
44
|
-
}).catch(_ => BB_RESULT.FAILURE);
|
|
50
|
+
}).catch(_ => ({ status: BB_RESULT.FAILURE, exitCode: -1, signal: undefined }));
|
|
45
51
|
}
|
|
46
|
-
const bytecodeHashFilename = 'bytecode_hash';
|
|
47
52
|
const bytecodeFilename = 'bytecode';
|
|
48
53
|
/**
|
|
49
54
|
* Used for generating either a proving or verification key, will exit early if the key already exists
|
|
@@ -65,34 +70,85 @@ export async function generateKeyForNoirCircuit(pathToBB, workingDirectory, circ
|
|
|
65
70
|
// The bytecode is written to e.g. /workingDirectory/pk/BaseParityArtifact/bytecode
|
|
66
71
|
// The bytecode is removed after the key is generated, leaving just the hash file
|
|
67
72
|
const circuitOutputDirectory = `${workingDirectory}/${key}/${circuitName}`;
|
|
68
|
-
const bytecodeHashPath = `${circuitOutputDirectory}/${bytecodeHashFilename}`;
|
|
69
|
-
const bytecodePath = `${circuitOutputDirectory}/${bytecodeFilename}`;
|
|
70
|
-
const bytecodeHash = sha256(bytecode);
|
|
71
73
|
const outputPath = `${circuitOutputDirectory}`;
|
|
74
|
+
const bytecodeHash = sha256(bytecode);
|
|
72
75
|
// ensure the directory exists
|
|
73
76
|
await fs.mkdir(circuitOutputDirectory, { recursive: true });
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
.
|
|
78
|
-
.
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
77
|
+
const res = await fsCache(circuitOutputDirectory, bytecodeHash, log, force, async () => {
|
|
78
|
+
const binaryPresent = await fs
|
|
79
|
+
.access(pathToBB, fs.constants.R_OK)
|
|
80
|
+
.then(_ => true)
|
|
81
|
+
.catch(_ => false);
|
|
82
|
+
if (!binaryPresent) {
|
|
83
|
+
return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
|
|
84
|
+
}
|
|
85
|
+
// We are now going to generate the key
|
|
86
|
+
try {
|
|
87
|
+
const bytecodePath = `${circuitOutputDirectory}/${bytecodeFilename}`;
|
|
88
|
+
// Write the bytecode to the working directory
|
|
89
|
+
await fs.writeFile(bytecodePath, bytecode);
|
|
90
|
+
// args are the output path and the input bytecode path
|
|
91
|
+
const args = ['-o', `${outputPath}/${VK_FILENAME}`, '-b', bytecodePath];
|
|
92
|
+
const timer = new Timer();
|
|
93
|
+
let result = await executeBB(pathToBB, `write_${key}`, args, log);
|
|
94
|
+
// If we succeeded and the type of key if verification, have bb write the 'fields' version too
|
|
95
|
+
if (result.status == BB_RESULT.SUCCESS && key === 'vk') {
|
|
96
|
+
const asFieldsArgs = ['-k', `${outputPath}/${VK_FILENAME}`, '-o', `${outputPath}/${VK_FIELDS_FILENAME}`, '-v'];
|
|
97
|
+
result = await executeBB(pathToBB, `vk_as_fields`, asFieldsArgs, log);
|
|
98
|
+
}
|
|
99
|
+
const duration = timer.ms();
|
|
100
|
+
if (result.status == BB_RESULT.SUCCESS) {
|
|
101
|
+
return {
|
|
102
|
+
status: BB_RESULT.SUCCESS,
|
|
103
|
+
duration,
|
|
104
|
+
pkPath: key === 'pk' ? outputPath : undefined,
|
|
105
|
+
vkPath: key === 'vk' ? outputPath : undefined,
|
|
106
|
+
proofPath: undefined,
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
110
|
+
return {
|
|
111
|
+
status: BB_RESULT.FAILURE,
|
|
112
|
+
reason: `Failed to generate key. Exit code: ${result.exitCode}. Signal ${result.signal}.`,
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
catch (error) {
|
|
116
|
+
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
117
|
+
}
|
|
118
|
+
});
|
|
119
|
+
if (!res) {
|
|
87
120
|
return {
|
|
88
121
|
status: BB_RESULT.ALREADY_PRESENT,
|
|
89
122
|
duration: 0,
|
|
90
123
|
pkPath: key === 'pk' ? outputPath : undefined,
|
|
91
124
|
vkPath: key === 'vk' ? outputPath : undefined,
|
|
92
|
-
proofPath: undefined,
|
|
93
125
|
};
|
|
94
126
|
}
|
|
95
|
-
|
|
127
|
+
return res;
|
|
128
|
+
}
|
|
129
|
+
/**
|
|
130
|
+
* Used for generating proofs of noir circuits.
|
|
131
|
+
* It is assumed that the working directory is a temporary and/or random directory used solely for generating this proof.
|
|
132
|
+
* @param pathToBB - The full path to the bb binary
|
|
133
|
+
* @param workingDirectory - A working directory for use by bb
|
|
134
|
+
* @param circuitName - An identifier for the circuit
|
|
135
|
+
* @param bytecode - The compiled circuit bytecode
|
|
136
|
+
* @param inputWitnessFile - The circuit input witness
|
|
137
|
+
* @param log - A logging function
|
|
138
|
+
* @returns An object containing a result indication, the location of the proof and the duration taken
|
|
139
|
+
*/
|
|
140
|
+
export async function generateProof(pathToBB, workingDirectory, circuitName, bytecode, inputWitnessFile, log) {
|
|
141
|
+
// Check that the working directory exists
|
|
142
|
+
try {
|
|
143
|
+
await fs.access(workingDirectory);
|
|
144
|
+
}
|
|
145
|
+
catch (error) {
|
|
146
|
+
return { status: BB_RESULT.FAILURE, reason: `Working directory ${workingDirectory} does not exist` };
|
|
147
|
+
}
|
|
148
|
+
// The bytecode is written to e.g. /workingDirectory/BaseParityArtifact-bytecode
|
|
149
|
+
const bytecodePath = `${workingDirectory}/${circuitName}-bytecode`;
|
|
150
|
+
// The proof is written to e.g. /workingDirectory/proof
|
|
151
|
+
const outputPath = `${workingDirectory}`;
|
|
96
152
|
const binaryPresent = await fs
|
|
97
153
|
.access(pathToBB, fs.constants.R_OK)
|
|
98
154
|
.then(_ => true)
|
|
@@ -100,52 +156,45 @@ export async function generateKeyForNoirCircuit(pathToBB, workingDirectory, circ
|
|
|
100
156
|
if (!binaryPresent) {
|
|
101
157
|
return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
|
|
102
158
|
}
|
|
103
|
-
// We are now going to generate the key
|
|
104
159
|
try {
|
|
105
160
|
// Write the bytecode to the working directory
|
|
106
161
|
await fs.writeFile(bytecodePath, bytecode);
|
|
107
|
-
|
|
108
|
-
const args = ['-o', outputPath, '-b', bytecodePath];
|
|
162
|
+
const args = ['-o', outputPath, '-b', bytecodePath, '-w', inputWitnessFile, '-v'];
|
|
109
163
|
const timer = new Timer();
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
result = await executeBB(pathToBB, `vk_as_fields`, asFieldsArgs, log);
|
|
115
|
-
}
|
|
164
|
+
const logFunction = (message) => {
|
|
165
|
+
log(`${circuitName} BB out - ${message}`);
|
|
166
|
+
};
|
|
167
|
+
const result = await executeBB(pathToBB, 'prove_output_all', args, logFunction);
|
|
116
168
|
const duration = timer.ms();
|
|
117
|
-
|
|
118
|
-
await fs.rm(bytecodePath, { force: true });
|
|
119
|
-
if (result == BB_RESULT.SUCCESS) {
|
|
120
|
-
// Store the bytecode hash so we don't need to regenerate at a later time
|
|
121
|
-
await fs.writeFile(bytecodeHashPath, bytecodeHash);
|
|
169
|
+
if (result.status == BB_RESULT.SUCCESS) {
|
|
122
170
|
return {
|
|
123
171
|
status: BB_RESULT.SUCCESS,
|
|
124
172
|
duration,
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
173
|
+
proofPath: `${outputPath}`,
|
|
174
|
+
pkPath: undefined,
|
|
175
|
+
vkPath: `${outputPath}`,
|
|
128
176
|
};
|
|
129
177
|
}
|
|
130
178
|
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
131
|
-
return {
|
|
179
|
+
return {
|
|
180
|
+
status: BB_RESULT.FAILURE,
|
|
181
|
+
reason: `Failed to generate proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
182
|
+
};
|
|
132
183
|
}
|
|
133
184
|
catch (error) {
|
|
134
185
|
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
135
186
|
}
|
|
136
187
|
}
|
|
137
188
|
/**
|
|
138
|
-
* Used for generating proofs
|
|
189
|
+
* Used for generating AVM proofs.
|
|
139
190
|
* It is assumed that the working directory is a temporary and/or random directory used solely for generating this proof.
|
|
140
191
|
* @param pathToBB - The full path to the bb binary
|
|
141
192
|
* @param workingDirectory - A working directory for use by bb
|
|
142
|
-
* @param
|
|
143
|
-
* @param bytecode - The compiled circuit bytecode
|
|
144
|
-
* @param inputWitnessFile - The circuit input witness
|
|
193
|
+
* @param bytecode - The AVM bytecode for the public function to be proven (expected to be decompressed)
|
|
145
194
|
* @param log - A logging function
|
|
146
195
|
* @returns An object containing a result indication, the location of the proof and the duration taken
|
|
147
196
|
*/
|
|
148
|
-
export async function
|
|
197
|
+
export async function generateAvmProof(pathToBB, workingDirectory, input, log) {
|
|
149
198
|
// Check that the working directory exists
|
|
150
199
|
try {
|
|
151
200
|
await fs.access(workingDirectory);
|
|
@@ -153,40 +202,73 @@ export async function generateProof(pathToBB, workingDirectory, circuitName, byt
|
|
|
153
202
|
catch (error) {
|
|
154
203
|
return { status: BB_RESULT.FAILURE, reason: `Working directory ${workingDirectory} does not exist` };
|
|
155
204
|
}
|
|
156
|
-
//
|
|
157
|
-
const bytecodePath =
|
|
205
|
+
// Paths for the inputs
|
|
206
|
+
const bytecodePath = join(workingDirectory, 'avm_bytecode.bin');
|
|
207
|
+
const calldataPath = join(workingDirectory, 'avm_calldata.bin');
|
|
208
|
+
const publicInputsPath = join(workingDirectory, 'avm_public_inputs.bin');
|
|
209
|
+
const avmHintsPath = join(workingDirectory, 'avm_hints.bin');
|
|
158
210
|
// The proof is written to e.g. /workingDirectory/proof
|
|
159
|
-
const outputPath =
|
|
160
|
-
const
|
|
161
|
-
.access(
|
|
211
|
+
const outputPath = workingDirectory;
|
|
212
|
+
const filePresent = async (file) => await fs
|
|
213
|
+
.access(file, fs.constants.R_OK)
|
|
162
214
|
.then(_ => true)
|
|
163
215
|
.catch(_ => false);
|
|
216
|
+
const binaryPresent = await filePresent(pathToBB);
|
|
164
217
|
if (!binaryPresent) {
|
|
165
218
|
return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
|
|
166
219
|
}
|
|
167
220
|
try {
|
|
168
|
-
// Write the
|
|
169
|
-
await fs.writeFile(bytecodePath, bytecode);
|
|
170
|
-
|
|
221
|
+
// Write the inputs to the working directory.
|
|
222
|
+
await fs.writeFile(bytecodePath, input.bytecode);
|
|
223
|
+
if (!filePresent(bytecodePath)) {
|
|
224
|
+
return { status: BB_RESULT.FAILURE, reason: `Could not write bytecode at ${bytecodePath}` };
|
|
225
|
+
}
|
|
226
|
+
await fs.writeFile(calldataPath, input.calldata.map(fr => fr.toBuffer()));
|
|
227
|
+
if (!filePresent(calldataPath)) {
|
|
228
|
+
return { status: BB_RESULT.FAILURE, reason: `Could not write calldata at ${calldataPath}` };
|
|
229
|
+
}
|
|
230
|
+
// public inputs are used directly as a vector of fields in C++,
|
|
231
|
+
// so we serialize them as such here instead of just using toBuffer
|
|
232
|
+
await fs.writeFile(publicInputsPath, input.publicInputs.toFields().map(fr => fr.toBuffer()));
|
|
233
|
+
if (!filePresent(publicInputsPath)) {
|
|
234
|
+
return { status: BB_RESULT.FAILURE, reason: `Could not write publicInputs at ${publicInputsPath}` };
|
|
235
|
+
}
|
|
236
|
+
await fs.writeFile(avmHintsPath, input.avmHints.toBuffer());
|
|
237
|
+
if (!filePresent(avmHintsPath)) {
|
|
238
|
+
return { status: BB_RESULT.FAILURE, reason: `Could not write avmHints at ${avmHintsPath}` };
|
|
239
|
+
}
|
|
240
|
+
const args = [
|
|
241
|
+
'--avm-bytecode',
|
|
242
|
+
bytecodePath,
|
|
243
|
+
'--avm-calldata',
|
|
244
|
+
calldataPath,
|
|
245
|
+
'--avm-public-inputs',
|
|
246
|
+
publicInputsPath,
|
|
247
|
+
'--avm-hints',
|
|
248
|
+
avmHintsPath,
|
|
249
|
+
'-o',
|
|
250
|
+
outputPath,
|
|
251
|
+
];
|
|
171
252
|
const timer = new Timer();
|
|
172
253
|
const logFunction = (message) => {
|
|
173
|
-
log(
|
|
254
|
+
log(`AvmCircuit (prove) BB out - ${message}`);
|
|
174
255
|
};
|
|
175
|
-
const result = await executeBB(pathToBB, '
|
|
256
|
+
const result = await executeBB(pathToBB, 'avm_prove', args, logFunction);
|
|
176
257
|
const duration = timer.ms();
|
|
177
|
-
|
|
178
|
-
await fs.rm(bytecodePath, { force: true });
|
|
179
|
-
if (result == BB_RESULT.SUCCESS) {
|
|
258
|
+
if (result.status == BB_RESULT.SUCCESS) {
|
|
180
259
|
return {
|
|
181
260
|
status: BB_RESULT.SUCCESS,
|
|
182
261
|
duration,
|
|
183
|
-
proofPath:
|
|
262
|
+
proofPath: join(outputPath, PROOF_FILENAME),
|
|
184
263
|
pkPath: undefined,
|
|
185
|
-
vkPath:
|
|
264
|
+
vkPath: outputPath,
|
|
186
265
|
};
|
|
187
266
|
}
|
|
188
267
|
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
189
|
-
return {
|
|
268
|
+
return {
|
|
269
|
+
status: BB_RESULT.FAILURE,
|
|
270
|
+
reason: `Failed to generate proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
271
|
+
};
|
|
190
272
|
}
|
|
191
273
|
catch (error) {
|
|
192
274
|
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
@@ -201,6 +283,29 @@ export async function generateProof(pathToBB, workingDirectory, circuitName, byt
|
|
|
201
283
|
* @returns An object containing a result indication and duration taken
|
|
202
284
|
*/
|
|
203
285
|
export async function verifyProof(pathToBB, proofFullPath, verificationKeyPath, log) {
|
|
286
|
+
return await verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath, 'verify', log);
|
|
287
|
+
}
|
|
288
|
+
/**
|
|
289
|
+
* Used for verifying proofs of the AVM
|
|
290
|
+
* @param pathToBB - The full path to the bb binary
|
|
291
|
+
* @param proofFullPath - The full path to the proof to be verified
|
|
292
|
+
* @param verificationKeyPath - The full path to the circuit verification key
|
|
293
|
+
* @param log - A logging function
|
|
294
|
+
* @returns An object containing a result indication and duration taken
|
|
295
|
+
*/
|
|
296
|
+
export async function verifyAvmProof(pathToBB, proofFullPath, verificationKeyPath, log) {
|
|
297
|
+
return await verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath, 'avm_verify', log);
|
|
298
|
+
}
|
|
299
|
+
/**
|
|
300
|
+
* Used for verifying proofs with BB
|
|
301
|
+
* @param pathToBB - The full path to the bb binary
|
|
302
|
+
* @param proofFullPath - The full path to the proof to be verified
|
|
303
|
+
* @param verificationKeyPath - The full path to the circuit verification key
|
|
304
|
+
* @param command - The BB command to execute (verify/avm_verify)
|
|
305
|
+
* @param log - A logging function
|
|
306
|
+
* @returns An object containing a result indication and duration taken
|
|
307
|
+
*/
|
|
308
|
+
async function verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath, command, log) {
|
|
204
309
|
const binaryPresent = await fs
|
|
205
310
|
.access(pathToBB, fs.constants.R_OK)
|
|
206
311
|
.then(_ => true)
|
|
@@ -211,13 +316,16 @@ export async function verifyProof(pathToBB, proofFullPath, verificationKeyPath,
|
|
|
211
316
|
try {
|
|
212
317
|
const args = ['-p', proofFullPath, '-k', verificationKeyPath];
|
|
213
318
|
const timer = new Timer();
|
|
214
|
-
const result = await executeBB(pathToBB,
|
|
319
|
+
const result = await executeBB(pathToBB, command, args, log);
|
|
215
320
|
const duration = timer.ms();
|
|
216
|
-
if (result == BB_RESULT.SUCCESS) {
|
|
321
|
+
if (result.status == BB_RESULT.SUCCESS) {
|
|
217
322
|
return { status: BB_RESULT.SUCCESS, duration };
|
|
218
323
|
}
|
|
219
324
|
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
220
|
-
return {
|
|
325
|
+
return {
|
|
326
|
+
status: BB_RESULT.FAILURE,
|
|
327
|
+
reason: `Failed to verify proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
328
|
+
};
|
|
221
329
|
}
|
|
222
330
|
catch (error) {
|
|
223
331
|
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
@@ -244,11 +352,14 @@ export async function writeVkAsFields(pathToBB, verificationKeyPath, verificatio
|
|
|
244
352
|
const timer = new Timer();
|
|
245
353
|
const result = await executeBB(pathToBB, 'vk_as_fields', args, log);
|
|
246
354
|
const duration = timer.ms();
|
|
247
|
-
if (result == BB_RESULT.SUCCESS) {
|
|
355
|
+
if (result.status == BB_RESULT.SUCCESS) {
|
|
248
356
|
return { status: BB_RESULT.SUCCESS, duration, vkPath: verificationKeyPath };
|
|
249
357
|
}
|
|
250
358
|
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
251
|
-
return {
|
|
359
|
+
return {
|
|
360
|
+
status: BB_RESULT.FAILURE,
|
|
361
|
+
reason: `Failed to create vk as fields. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
362
|
+
};
|
|
252
363
|
}
|
|
253
364
|
catch (error) {
|
|
254
365
|
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
@@ -259,10 +370,11 @@ export async function writeVkAsFields(pathToBB, verificationKeyPath, verificatio
|
|
|
259
370
|
* @param pathToBB - The full path to the bb binary
|
|
260
371
|
* @param proofPath - The directory containing the binary proof
|
|
261
372
|
* @param proofFileName - The filename of the proof
|
|
373
|
+
* @param vkFileName - The filename of the verification key
|
|
262
374
|
* @param log - A logging function
|
|
263
375
|
* @returns An object containing a result indication and duration taken
|
|
264
376
|
*/
|
|
265
|
-
export async function writeProofAsFields(pathToBB, proofPath, proofFileName, log) {
|
|
377
|
+
export async function writeProofAsFields(pathToBB, proofPath, proofFileName, vkFilePath, log) {
|
|
266
378
|
const binaryPresent = await fs
|
|
267
379
|
.access(pathToBB, fs.constants.R_OK)
|
|
268
380
|
.then(_ => true)
|
|
@@ -271,18 +383,107 @@ export async function writeProofAsFields(pathToBB, proofPath, proofFileName, log
|
|
|
271
383
|
return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
|
|
272
384
|
}
|
|
273
385
|
try {
|
|
274
|
-
const args = ['-p', `${proofPath}/${proofFileName}`, '-v'];
|
|
386
|
+
const args = ['-p', `${proofPath}/${proofFileName}`, '-k', vkFilePath, '-v'];
|
|
275
387
|
const timer = new Timer();
|
|
276
388
|
const result = await executeBB(pathToBB, 'proof_as_fields', args, log);
|
|
277
389
|
const duration = timer.ms();
|
|
278
|
-
if (result == BB_RESULT.SUCCESS) {
|
|
390
|
+
if (result.status == BB_RESULT.SUCCESS) {
|
|
279
391
|
return { status: BB_RESULT.SUCCESS, duration, proofPath: proofPath };
|
|
280
392
|
}
|
|
281
393
|
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
282
|
-
return {
|
|
394
|
+
return {
|
|
395
|
+
status: BB_RESULT.FAILURE,
|
|
396
|
+
reason: `Failed to create proof as fields. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
397
|
+
};
|
|
283
398
|
}
|
|
284
399
|
catch (error) {
|
|
285
400
|
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
286
401
|
}
|
|
287
402
|
}
|
|
288
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/bb/execute.ts"],"names":[],"mappings":"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"}
|
|
403
|
+
export async function generateContractForVerificationKey(pathToBB, vkFilePath, contractPath, log) {
|
|
404
|
+
const binaryPresent = await fs
|
|
405
|
+
.access(pathToBB, fs.constants.R_OK)
|
|
406
|
+
.then(_ => true)
|
|
407
|
+
.catch(_ => false);
|
|
408
|
+
if (!binaryPresent) {
|
|
409
|
+
return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
|
|
410
|
+
}
|
|
411
|
+
const outputDir = dirname(contractPath);
|
|
412
|
+
const contractName = basename(contractPath);
|
|
413
|
+
// cache contract generation based on vk file and contract name
|
|
414
|
+
const cacheKey = sha256(Buffer.concat([Buffer.from(contractName), await fs.readFile(vkFilePath)]));
|
|
415
|
+
await fs.mkdir(outputDir, { recursive: true });
|
|
416
|
+
const res = await fsCache(outputDir, cacheKey, log, false, async () => {
|
|
417
|
+
try {
|
|
418
|
+
const args = ['-k', vkFilePath, '-o', contractPath, '-v'];
|
|
419
|
+
const timer = new Timer();
|
|
420
|
+
const result = await executeBB(pathToBB, 'contract', args, log);
|
|
421
|
+
const duration = timer.ms();
|
|
422
|
+
if (result.status == BB_RESULT.SUCCESS) {
|
|
423
|
+
return { status: BB_RESULT.SUCCESS, duration, contractPath };
|
|
424
|
+
}
|
|
425
|
+
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
426
|
+
return {
|
|
427
|
+
status: BB_RESULT.FAILURE,
|
|
428
|
+
reason: `Failed to write verifier contract. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
429
|
+
};
|
|
430
|
+
}
|
|
431
|
+
catch (error) {
|
|
432
|
+
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
433
|
+
}
|
|
434
|
+
});
|
|
435
|
+
if (!res) {
|
|
436
|
+
return {
|
|
437
|
+
status: BB_RESULT.ALREADY_PRESENT,
|
|
438
|
+
duration: 0,
|
|
439
|
+
contractPath,
|
|
440
|
+
};
|
|
441
|
+
}
|
|
442
|
+
return res;
|
|
443
|
+
}
|
|
444
|
+
export async function generateContractForCircuit(pathToBB, workingDirectory, circuitName, compiledCircuit, contractName, log, force = false) {
|
|
445
|
+
const vkResult = await generateKeyForNoirCircuit(pathToBB, workingDirectory, circuitName, compiledCircuit, 'vk', log, force);
|
|
446
|
+
if (vkResult.status === BB_RESULT.FAILURE) {
|
|
447
|
+
return vkResult;
|
|
448
|
+
}
|
|
449
|
+
return generateContractForVerificationKey(pathToBB, join(vkResult.vkPath, VK_FILENAME), join(workingDirectory, 'contract', circuitName, contractName), log);
|
|
450
|
+
}
|
|
451
|
+
const CACHE_FILENAME = '.cache';
|
|
452
|
+
async function fsCache(dir, expectedCacheKey, logger, force, action) {
|
|
453
|
+
const cacheFilePath = join(dir, CACHE_FILENAME);
|
|
454
|
+
let run;
|
|
455
|
+
if (force) {
|
|
456
|
+
run = true;
|
|
457
|
+
}
|
|
458
|
+
else {
|
|
459
|
+
try {
|
|
460
|
+
run = !expectedCacheKey.equals(await fs.readFile(cacheFilePath));
|
|
461
|
+
}
|
|
462
|
+
catch (err) {
|
|
463
|
+
if (err && 'code' in err && err.code === 'ENOENT') {
|
|
464
|
+
// cache file doesn't exist, swallow error and run
|
|
465
|
+
run = true;
|
|
466
|
+
}
|
|
467
|
+
else {
|
|
468
|
+
throw err;
|
|
469
|
+
}
|
|
470
|
+
}
|
|
471
|
+
}
|
|
472
|
+
let res;
|
|
473
|
+
if (run) {
|
|
474
|
+
logger(`Cache miss or forced run. Running operation in ${dir}...`);
|
|
475
|
+
res = await action();
|
|
476
|
+
}
|
|
477
|
+
else {
|
|
478
|
+
logger(`Cache hit. Skipping operation in ${dir}...`);
|
|
479
|
+
}
|
|
480
|
+
try {
|
|
481
|
+
await fs.writeFile(cacheFilePath, expectedCacheKey);
|
|
482
|
+
}
|
|
483
|
+
catch (err) {
|
|
484
|
+
logger(`Couldn't write cache data to ${cacheFilePath}. Skipping cache...`);
|
|
485
|
+
// ignore
|
|
486
|
+
}
|
|
487
|
+
return res;
|
|
488
|
+
}
|
|
489
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/bb/execute.ts"],"names":[],"mappings":"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"}
|
package/dest/config.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,UAAU;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC;CAC9B"}
|
package/dest/config.js
ADDED
package/dest/index.d.ts
CHANGED
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC"}
|
package/dest/index.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
export * from './prover/index.js';
|
|
2
2
|
export * from './test/index.js';
|
|
3
|
-
|
|
3
|
+
export * from './verifier/index.js';
|
|
4
|
+
export * from './config.js';
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxhQUFhLENBQUMifQ==
|
|
@@ -8,5 +8,6 @@ export type PublicKernelProvingOps = {
|
|
|
8
8
|
convertOutputs: (outputs: WitnessMap) => PublicKernelCircuitPublicInputs;
|
|
9
9
|
};
|
|
10
10
|
export type KernelTypeToArtifact = Record<PublicKernelType, PublicKernelProvingOps | undefined>;
|
|
11
|
+
export declare const SimulatedPublicKernelArtifactMapping: KernelTypeToArtifact;
|
|
11
12
|
export declare const PublicKernelArtifactMapping: KernelTypeToArtifact;
|
|
12
13
|
//# sourceMappingURL=mappings.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mappings.d.ts","sourceRoot":"","sources":["../../src/mappings/mappings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,gCAAgC,EAAE,KAAK,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AACjH,OAAO,EACL,KAAK,sBAAsB,
|
|
1
|
+
{"version":3,"file":"mappings.d.ts","sourceRoot":"","sources":["../../src/mappings/mappings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,gCAAgC,EAAE,KAAK,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AACjH,OAAO,EACL,KAAK,sBAAsB,EAa5B,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,aAAa,EAAE,CAAC,MAAM,EAAE,gCAAgC,KAAK,UAAU,CAAC;IACxE,cAAc,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,+BAA+B,CAAC;CAC1E,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,gBAAgB,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;AAEhG,eAAO,MAAM,oCAAoC,EAAE,oBAkBlD,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,oBAkBzC,CAAC"}
|