@aztec/bb-prover 0.76.4 → 0.77.0-testnet-ignition.21
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/avm_proving_tests/avm_proving_tester.d.ts +8 -8
- package/dest/avm_proving_tests/avm_proving_tester.d.ts.map +1 -1
- package/dest/avm_proving_tests/avm_proving_tester.js +24 -25
- package/dest/bb/cli.d.ts +3 -3
- package/dest/bb/cli.d.ts.map +1 -1
- package/dest/bb/cli.js +4 -9
- package/dest/bb/execute.d.ts +7 -37
- package/dest/bb/execute.d.ts.map +1 -1
- package/dest/bb/execute.js +359 -357
- package/dest/bb/index.js +4 -6
- package/dest/config.js +1 -2
- package/dest/honk.d.ts +1 -1
- package/dest/honk.d.ts.map +1 -1
- package/dest/honk.js +8 -5
- package/dest/index.d.ts +1 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +0 -1
- package/dest/instrumentation.d.ts +2 -2
- package/dest/instrumentation.d.ts.map +1 -1
- package/dest/instrumentation.js +50 -47
- package/dest/prover/bb_native_private_kernel_prover.d.ts +4 -4
- package/dest/prover/bb_native_private_kernel_prover.d.ts.map +1 -1
- package/dest/prover/bb_native_private_kernel_prover.js +19 -19
- package/dest/prover/bb_private_kernel_prover.d.ts +7 -6
- package/dest/prover/bb_private_kernel_prover.d.ts.map +1 -1
- package/dest/prover/bb_private_kernel_prover.js +14 -15
- package/dest/prover/bb_prover.d.ts +7 -10
- package/dest/prover/bb_prover.d.ts.map +1 -1
- package/dest/prover/bb_prover.js +402 -447
- package/dest/prover/client_ivc_proof_utils.d.ts +3 -3
- package/dest/prover/client_ivc_proof_utils.d.ts.map +1 -1
- package/dest/prover/client_ivc_proof_utils.js +18 -12
- package/dest/prover/index.js +0 -1
- package/dest/stats.d.ts +2 -2
- package/dest/stats.d.ts.map +1 -1
- package/dest/stats.js +15 -14
- package/dest/test/delay_values.d.ts +4 -0
- package/dest/test/delay_values.d.ts.map +1 -0
- package/dest/test/delay_values.js +29 -0
- package/dest/test/index.js +0 -1
- package/dest/test/test_circuit_prover.d.ts +16 -7
- package/dest/test/test_circuit_prover.d.ts.map +1 -1
- package/dest/test/test_circuit_prover.js +165 -161
- package/dest/test/test_verifier.d.ts +2 -1
- package/dest/test/test_verifier.d.ts.map +1 -1
- package/dest/test/test_verifier.js +0 -1
- package/dest/verification_key/verification_key_data.d.ts +1 -1
- package/dest/verification_key/verification_key_data.d.ts.map +1 -1
- package/dest/verification_key/verification_key_data.js +13 -9
- package/dest/verifier/bb_verifier.d.ts +6 -4
- package/dest/verifier/bb_verifier.d.ts.map +1 -1
- package/dest/verifier/bb_verifier.js +18 -18
- package/dest/verifier/index.js +0 -1
- package/dest/wasm/bb_wasm_private_kernel_prover.d.ts +5 -4
- package/dest/wasm/bb_wasm_private_kernel_prover.d.ts.map +1 -1
- package/dest/wasm/bb_wasm_private_kernel_prover.js +26 -11
- package/dest/wasm/bundle.d.ts +1 -1
- package/dest/wasm/bundle.d.ts.map +1 -1
- package/dest/wasm/bundle.js +1 -2
- package/dest/wasm/lazy.d.ts +1 -1
- package/dest/wasm/lazy.d.ts.map +1 -1
- package/dest/wasm/lazy.js +1 -2
- package/package.json +18 -19
- package/src/avm_proving_tests/avm_proving_tester.ts +17 -33
- package/src/bb/cli.ts +3 -3
- package/src/bb/execute.ts +80 -211
- package/src/honk.ts +1 -1
- package/src/index.ts +1 -1
- package/src/instrumentation.ts +10 -10
- package/src/prover/bb_native_private_kernel_prover.ts +5 -4
- package/src/prover/bb_private_kernel_prover.ts +20 -20
- package/src/prover/bb_prover.ts +33 -100
- package/src/prover/client_ivc_proof_utils.ts +3 -3
- package/src/stats.ts +2 -2
- package/src/test/delay_values.ts +31 -0
- package/src/test/test_circuit_prover.ts +149 -120
- package/src/test/test_verifier.ts +2 -1
- package/src/verification_key/verification_key_data.ts +4 -7
- package/src/verifier/bb_verifier.ts +16 -9
- package/src/wasm/bb_wasm_private_kernel_prover.ts +18 -5
- package/src/wasm/bundle.ts +1 -1
- package/src/wasm/lazy.ts +1 -1
package/dest/bb/execute.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { serializeWithMessagePack } from '@aztec/circuits.js';
|
|
2
1
|
import { sha256 } from '@aztec/foundation/crypto';
|
|
3
2
|
import { Timer } from '@aztec/foundation/timer';
|
|
4
3
|
import * as proc from 'child_process';
|
|
@@ -9,15 +8,16 @@ export const VK_FILENAME = 'vk';
|
|
|
9
8
|
export const VK_FIELDS_FILENAME = 'vk_fields.json';
|
|
10
9
|
export const PROOF_FILENAME = 'proof';
|
|
11
10
|
export const PROOF_FIELDS_FILENAME = 'proof_fields.json';
|
|
11
|
+
export const AVM_INPUTS_FILENAME = 'avm_inputs.bin';
|
|
12
12
|
export const AVM_BYTECODE_FILENAME = 'avm_bytecode.bin';
|
|
13
13
|
export const AVM_PUBLIC_INPUTS_FILENAME = 'avm_public_inputs.bin';
|
|
14
14
|
export const AVM_HINTS_FILENAME = 'avm_hints.bin';
|
|
15
|
-
export var BB_RESULT
|
|
16
|
-
(function (BB_RESULT) {
|
|
15
|
+
export var BB_RESULT = /*#__PURE__*/ function(BB_RESULT) {
|
|
17
16
|
BB_RESULT[BB_RESULT["SUCCESS"] = 0] = "SUCCESS";
|
|
18
17
|
BB_RESULT[BB_RESULT["FAILURE"] = 1] = "FAILURE";
|
|
19
18
|
BB_RESULT[BB_RESULT["ALREADY_PRESENT"] = 2] = "ALREADY_PRESENT";
|
|
20
|
-
|
|
19
|
+
return BB_RESULT;
|
|
20
|
+
}({});
|
|
21
21
|
/**
|
|
22
22
|
* Invokes the Barretenberg binary with the provided command and args
|
|
23
23
|
* @param pathToBB - The path to the BB binary
|
|
@@ -26,51 +26,66 @@ export var BB_RESULT;
|
|
|
26
26
|
* @param logger - A log function
|
|
27
27
|
* @param resultParser - An optional handler for detecting success or failure
|
|
28
28
|
* @returns The completed partial witness outputted from the circuit
|
|
29
|
-
*/
|
|
30
|
-
|
|
31
|
-
return new Promise(resolve => {
|
|
29
|
+
*/ export function executeBB(pathToBB, command, args, logger, resultParser = (code)=>code === 0) {
|
|
30
|
+
return new Promise((resolve)=>{
|
|
32
31
|
// spawn the bb process
|
|
33
32
|
const { HARDWARE_CONCURRENCY: _, ...envWithoutConcurrency } = process.env;
|
|
34
33
|
const env = process.env.HARDWARE_CONCURRENCY ? process.env : envWithoutConcurrency;
|
|
35
34
|
logger(`Executing BB with: ${pathToBB} ${command} ${args.join(' ')}`);
|
|
36
|
-
const bb = proc.spawn(pathToBB, [
|
|
37
|
-
|
|
35
|
+
const bb = proc.spawn(pathToBB, [
|
|
36
|
+
command,
|
|
37
|
+
...args
|
|
38
|
+
], {
|
|
39
|
+
env
|
|
38
40
|
});
|
|
39
|
-
bb.stdout.on('data', data
|
|
41
|
+
bb.stdout.on('data', (data)=>{
|
|
40
42
|
const message = data.toString('utf-8').replace(/\n$/, '');
|
|
41
43
|
logger(message);
|
|
42
44
|
});
|
|
43
|
-
bb.stderr.on('data', data
|
|
45
|
+
bb.stderr.on('data', (data)=>{
|
|
44
46
|
const message = data.toString('utf-8').replace(/\n$/, '');
|
|
45
47
|
logger(message);
|
|
46
48
|
});
|
|
47
|
-
bb.on('close', (exitCode, signal)
|
|
49
|
+
bb.on('close', (exitCode, signal)=>{
|
|
48
50
|
if (resultParser(exitCode)) {
|
|
49
|
-
resolve({
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
51
|
+
resolve({
|
|
52
|
+
status: 0,
|
|
53
|
+
exitCode,
|
|
54
|
+
signal
|
|
55
|
+
});
|
|
56
|
+
} else {
|
|
57
|
+
resolve({
|
|
58
|
+
status: 1,
|
|
59
|
+
exitCode,
|
|
60
|
+
signal
|
|
61
|
+
});
|
|
53
62
|
}
|
|
54
63
|
});
|
|
55
|
-
}).catch(_
|
|
64
|
+
}).catch((_)=>({
|
|
65
|
+
status: 1,
|
|
66
|
+
exitCode: -1,
|
|
67
|
+
signal: undefined
|
|
68
|
+
}));
|
|
56
69
|
}
|
|
57
70
|
// TODO(#7369) comment this etc (really just take inspiration from this and rewrite it all O:))
|
|
58
71
|
export async function executeBbClientIvcProof(pathToBB, workingDirectory, bytecodeStackPath, witnessStackPath, log) {
|
|
59
72
|
// Check that the working directory exists
|
|
60
73
|
try {
|
|
61
74
|
await fs.access(workingDirectory);
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
|
|
75
|
+
} catch (error) {
|
|
76
|
+
return {
|
|
77
|
+
status: 1,
|
|
78
|
+
reason: `Working directory ${workingDirectory} does not exist`
|
|
79
|
+
};
|
|
65
80
|
}
|
|
66
81
|
// The proof is written to e.g. /workingDirectory/proof
|
|
67
82
|
const outputPath = `${workingDirectory}`;
|
|
68
|
-
const binaryPresent = await fs
|
|
69
|
-
.access(pathToBB, fs.constants.R_OK)
|
|
70
|
-
.then(_ => true)
|
|
71
|
-
.catch(_ => false);
|
|
83
|
+
const binaryPresent = await fs.access(pathToBB, fs.constants.R_OK).then((_)=>true).catch((_)=>false);
|
|
72
84
|
if (!binaryPresent) {
|
|
73
|
-
return {
|
|
85
|
+
return {
|
|
86
|
+
status: 1,
|
|
87
|
+
reason: `Failed to find bb binary at ${pathToBB}`
|
|
88
|
+
};
|
|
74
89
|
}
|
|
75
90
|
try {
|
|
76
91
|
// Write the bytecode to the working directory
|
|
@@ -88,94 +103,66 @@ export async function executeBbClientIvcProof(pathToBB, workingDirectory, byteco
|
|
|
88
103
|
'client_ivc',
|
|
89
104
|
'--input_type',
|
|
90
105
|
'runtime_stack',
|
|
106
|
+
'--write_vk'
|
|
91
107
|
];
|
|
92
108
|
const timer = new Timer();
|
|
93
|
-
const logFunction = (message)
|
|
109
|
+
const logFunction = (message)=>{
|
|
94
110
|
log(`bb - ${message}`);
|
|
95
111
|
};
|
|
96
112
|
const result = await executeBB(pathToBB, 'prove', args, logFunction);
|
|
97
113
|
const durationMs = timer.ms();
|
|
98
|
-
if (result.status ==
|
|
114
|
+
if (result.status == 0) {
|
|
99
115
|
return {
|
|
100
|
-
status:
|
|
116
|
+
status: 0,
|
|
101
117
|
durationMs,
|
|
102
118
|
proofPath: `${outputPath}`,
|
|
103
119
|
pkPath: undefined,
|
|
104
|
-
vkPath: `${outputPath}
|
|
120
|
+
vkPath: `${outputPath}`
|
|
105
121
|
};
|
|
106
122
|
}
|
|
107
123
|
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
108
124
|
return {
|
|
109
|
-
status:
|
|
125
|
+
status: 1,
|
|
110
126
|
reason: `Failed to generate proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
111
|
-
retry: !!result.signal
|
|
112
|
-
};
|
|
113
|
-
}
|
|
114
|
-
catch (error) {
|
|
115
|
-
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
/**
|
|
119
|
-
* Used for generating verification keys of noir circuits.
|
|
120
|
-
* It is assumed that the working directory is a temporary and/or random directory used solely for generating this VK.
|
|
121
|
-
* @param pathToBB - The full path to the bb binary
|
|
122
|
-
* @param workingDirectory - A working directory for use by bb
|
|
123
|
-
* @param circuitName - An identifier for the circuit
|
|
124
|
-
* @param bytecode - The compiled circuit bytecode
|
|
125
|
-
* @param inputWitnessFile - The circuit input witness
|
|
126
|
-
* @param log - A logging function
|
|
127
|
-
* @returns An object containing a result indication, the location of the VK and the duration taken
|
|
128
|
-
*/
|
|
129
|
-
export async function computeVerificationKey(pathToBB, workingDirectory, circuitName, bytecode, recursive, flavor, log) {
|
|
130
|
-
// Check that the working directory exists
|
|
131
|
-
try {
|
|
132
|
-
await fs.access(workingDirectory);
|
|
133
|
-
}
|
|
134
|
-
catch (error) {
|
|
135
|
-
return { status: BB_RESULT.FAILURE, reason: `Working directory ${workingDirectory} does not exist` };
|
|
136
|
-
}
|
|
137
|
-
// The bytecode is written to e.g. /workingDirectory/BaseParityArtifact-bytecode
|
|
138
|
-
const bytecodePath = `${workingDirectory}/${circuitName}-bytecode`;
|
|
139
|
-
// The verification key is written to this path
|
|
140
|
-
const outputPath = `${workingDirectory}/vk`;
|
|
141
|
-
const binaryPresent = await fs
|
|
142
|
-
.access(pathToBB, fs.constants.R_OK)
|
|
143
|
-
.then(_ => true)
|
|
144
|
-
.catch(_ => false);
|
|
145
|
-
if (!binaryPresent) {
|
|
146
|
-
return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
|
|
147
|
-
}
|
|
148
|
-
try {
|
|
149
|
-
// Write the bytecode to the working directory
|
|
150
|
-
await fs.writeFile(bytecodePath, bytecode);
|
|
151
|
-
const timer = new Timer();
|
|
152
|
-
const logFunction = (message) => {
|
|
153
|
-
log(`computeVerificationKey(${circuitName}) BB out - ${message}`);
|
|
127
|
+
retry: !!result.signal
|
|
154
128
|
};
|
|
155
|
-
|
|
156
|
-
let result = await executeBB(pathToBB, `write_vk_${flavor}`, args, logFunction);
|
|
157
|
-
if (result.status == BB_RESULT.FAILURE) {
|
|
158
|
-
return { status: BB_RESULT.FAILURE, reason: 'Failed writing VK.' };
|
|
159
|
-
}
|
|
160
|
-
result = await executeBB(pathToBB, `vk_as_fields_${flavor}`, ['-o', outputPath + '_fields.json', '-k', outputPath, '-v'], logFunction);
|
|
161
|
-
const duration = timer.ms();
|
|
162
|
-
if (result.status == BB_RESULT.SUCCESS) {
|
|
163
|
-
return {
|
|
164
|
-
status: BB_RESULT.SUCCESS,
|
|
165
|
-
durationMs: duration,
|
|
166
|
-
pkPath: undefined,
|
|
167
|
-
vkPath: `${outputPath}`,
|
|
168
|
-
};
|
|
169
|
-
}
|
|
170
|
-
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
129
|
+
} catch (error) {
|
|
171
130
|
return {
|
|
172
|
-
status:
|
|
173
|
-
reason:
|
|
174
|
-
retry: !!result.signal,
|
|
131
|
+
status: 1,
|
|
132
|
+
reason: `${error}`
|
|
175
133
|
};
|
|
176
134
|
}
|
|
177
|
-
|
|
178
|
-
|
|
135
|
+
}
|
|
136
|
+
function getArgs(flavor) {
|
|
137
|
+
switch(flavor){
|
|
138
|
+
case 'ultra_honk':
|
|
139
|
+
{
|
|
140
|
+
return [
|
|
141
|
+
'--scheme',
|
|
142
|
+
'ultra_honk',
|
|
143
|
+
'--oracle_hash',
|
|
144
|
+
'poseidon2'
|
|
145
|
+
];
|
|
146
|
+
}
|
|
147
|
+
case 'ultra_keccak_honk':
|
|
148
|
+
{
|
|
149
|
+
return [
|
|
150
|
+
'--scheme',
|
|
151
|
+
'ultra_honk',
|
|
152
|
+
'--oracle_hash',
|
|
153
|
+
'keccak'
|
|
154
|
+
];
|
|
155
|
+
}
|
|
156
|
+
case 'ultra_rollup_honk':
|
|
157
|
+
{
|
|
158
|
+
return [
|
|
159
|
+
'--scheme',
|
|
160
|
+
'ultra_honk',
|
|
161
|
+
'--oracle_hash',
|
|
162
|
+
'poseidon2',
|
|
163
|
+
'--ipa_accumulation'
|
|
164
|
+
];
|
|
165
|
+
}
|
|
179
166
|
}
|
|
180
167
|
}
|
|
181
168
|
/**
|
|
@@ -188,54 +175,71 @@ export async function computeVerificationKey(pathToBB, workingDirectory, circuit
|
|
|
188
175
|
* @param inputWitnessFile - The circuit input witness
|
|
189
176
|
* @param log - A logging function
|
|
190
177
|
* @returns An object containing a result indication, the location of the proof and the duration taken
|
|
191
|
-
*/
|
|
192
|
-
export async function generateProof(pathToBB, workingDirectory, circuitName, bytecode, recursive, inputWitnessFile, flavor, log) {
|
|
178
|
+
*/ export async function generateProof(pathToBB, workingDirectory, circuitName, bytecode, recursive, inputWitnessFile, flavor, log) {
|
|
193
179
|
// Check that the working directory exists
|
|
194
180
|
try {
|
|
195
181
|
await fs.access(workingDirectory);
|
|
196
|
-
}
|
|
197
|
-
|
|
198
|
-
|
|
182
|
+
} catch (error) {
|
|
183
|
+
return {
|
|
184
|
+
status: 1,
|
|
185
|
+
reason: `Working directory ${workingDirectory} does not exist`
|
|
186
|
+
};
|
|
199
187
|
}
|
|
200
188
|
// The bytecode is written to e.g. /workingDirectory/BaseParityArtifact-bytecode
|
|
201
189
|
const bytecodePath = `${workingDirectory}/${circuitName}-bytecode`;
|
|
202
190
|
// The proof is written to e.g. /workingDirectory/ultra_honk/proof
|
|
203
191
|
const outputPath = `${workingDirectory}`;
|
|
204
|
-
const binaryPresent = await fs
|
|
205
|
-
.access(pathToBB, fs.constants.R_OK)
|
|
206
|
-
.then(_ => true)
|
|
207
|
-
.catch(_ => false);
|
|
192
|
+
const binaryPresent = await fs.access(pathToBB, fs.constants.R_OK).then((_)=>true).catch((_)=>false);
|
|
208
193
|
if (!binaryPresent) {
|
|
209
|
-
return {
|
|
194
|
+
return {
|
|
195
|
+
status: 1,
|
|
196
|
+
reason: `Failed to find bb binary at ${pathToBB}`
|
|
197
|
+
};
|
|
210
198
|
}
|
|
211
199
|
try {
|
|
212
200
|
// Write the bytecode to the working directory
|
|
213
201
|
await fs.writeFile(bytecodePath, bytecode);
|
|
214
|
-
const args = [
|
|
202
|
+
const args = getArgs(flavor).concat([
|
|
203
|
+
'--output_format',
|
|
204
|
+
'bytes_and_fields',
|
|
205
|
+
'--write_vk',
|
|
206
|
+
'-o',
|
|
207
|
+
outputPath,
|
|
208
|
+
'-b',
|
|
209
|
+
bytecodePath,
|
|
210
|
+
'-w',
|
|
211
|
+
inputWitnessFile,
|
|
212
|
+
'-v'
|
|
213
|
+
]);
|
|
214
|
+
if (recursive) {
|
|
215
|
+
args.push('--init_kzg_accumulator');
|
|
216
|
+
}
|
|
215
217
|
const timer = new Timer();
|
|
216
|
-
const logFunction = (message)
|
|
218
|
+
const logFunction = (message)=>{
|
|
217
219
|
log(`${circuitName} BB out - ${message}`);
|
|
218
220
|
};
|
|
219
|
-
const result = await executeBB(pathToBB, `
|
|
221
|
+
const result = await executeBB(pathToBB, `prove`, args, logFunction);
|
|
220
222
|
const duration = timer.ms();
|
|
221
|
-
if (result.status ==
|
|
223
|
+
if (result.status == 0) {
|
|
222
224
|
return {
|
|
223
|
-
status:
|
|
225
|
+
status: 0,
|
|
224
226
|
durationMs: duration,
|
|
225
227
|
proofPath: `${outputPath}`,
|
|
226
228
|
pkPath: undefined,
|
|
227
|
-
vkPath: `${outputPath}
|
|
229
|
+
vkPath: `${outputPath}`
|
|
228
230
|
};
|
|
229
231
|
}
|
|
230
232
|
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
231
233
|
return {
|
|
232
|
-
status:
|
|
234
|
+
status: 1,
|
|
233
235
|
reason: `Failed to generate proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
234
|
-
retry: !!result.signal
|
|
236
|
+
retry: !!result.signal
|
|
237
|
+
};
|
|
238
|
+
} catch (error) {
|
|
239
|
+
return {
|
|
240
|
+
status: 1,
|
|
241
|
+
reason: `${error}`
|
|
235
242
|
};
|
|
236
|
-
}
|
|
237
|
-
catch (error) {
|
|
238
|
-
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
239
243
|
}
|
|
240
244
|
}
|
|
241
245
|
/**
|
|
@@ -248,57 +252,67 @@ export async function generateProof(pathToBB, workingDirectory, circuitName, byt
|
|
|
248
252
|
* @param inputWitnessFile - The circuit input witness
|
|
249
253
|
* @param log - A logging function
|
|
250
254
|
* @returns An object containing a result indication, the location of the proof and the duration taken
|
|
251
|
-
*/
|
|
252
|
-
export async function generateTubeProof(pathToBB, workingDirectory, log) {
|
|
255
|
+
*/ export async function generateTubeProof(pathToBB, workingDirectory, log) {
|
|
253
256
|
// Check that the working directory exists
|
|
254
257
|
try {
|
|
255
258
|
await fs.access(workingDirectory);
|
|
256
|
-
}
|
|
257
|
-
|
|
258
|
-
|
|
259
|
+
} catch (error) {
|
|
260
|
+
return {
|
|
261
|
+
status: 1,
|
|
262
|
+
reason: `Working directory ${workingDirectory} does not exist`
|
|
263
|
+
};
|
|
259
264
|
}
|
|
260
265
|
// // Paths for the inputs
|
|
261
266
|
const vkPath = join(workingDirectory, CLIENT_IVC_VK_FILE_NAME);
|
|
262
267
|
const proofPath = join(workingDirectory, CLIENT_IVC_PROOF_FILE_NAME);
|
|
263
268
|
// The proof is written to e.g. /workingDirectory/proof
|
|
264
269
|
const outputPath = workingDirectory;
|
|
265
|
-
const filePresent = async (file)
|
|
266
|
-
.access(file, fs.constants.R_OK)
|
|
267
|
-
.then(_ => true)
|
|
268
|
-
.catch(_ => false);
|
|
270
|
+
const filePresent = async (file)=>await fs.access(file, fs.constants.R_OK).then((_)=>true).catch((_)=>false);
|
|
269
271
|
const binaryPresent = await filePresent(pathToBB);
|
|
270
272
|
if (!binaryPresent) {
|
|
271
|
-
return {
|
|
273
|
+
return {
|
|
274
|
+
status: 1,
|
|
275
|
+
reason: `Failed to find bb binary at ${pathToBB}`
|
|
276
|
+
};
|
|
272
277
|
}
|
|
273
278
|
try {
|
|
274
|
-
if (!
|
|
275
|
-
return {
|
|
279
|
+
if (!await filePresent(vkPath) || !await filePresent(proofPath)) {
|
|
280
|
+
return {
|
|
281
|
+
status: 1,
|
|
282
|
+
reason: `Client IVC input files not present in ${workingDirectory}`
|
|
283
|
+
};
|
|
276
284
|
}
|
|
277
|
-
const args = [
|
|
285
|
+
const args = [
|
|
286
|
+
'-o',
|
|
287
|
+
outputPath,
|
|
288
|
+
'-v'
|
|
289
|
+
];
|
|
278
290
|
const timer = new Timer();
|
|
279
|
-
const logFunction = (message)
|
|
291
|
+
const logFunction = (message)=>{
|
|
280
292
|
log(`TubeCircuit (prove) BB out - ${message}`);
|
|
281
293
|
};
|
|
282
294
|
const result = await executeBB(pathToBB, 'prove_tube', args, logFunction);
|
|
283
295
|
const durationMs = timer.ms();
|
|
284
|
-
if (result.status ==
|
|
296
|
+
if (result.status == 0) {
|
|
285
297
|
return {
|
|
286
|
-
status:
|
|
298
|
+
status: 0,
|
|
287
299
|
durationMs,
|
|
288
300
|
proofPath: outputPath,
|
|
289
301
|
pkPath: undefined,
|
|
290
|
-
vkPath: outputPath
|
|
302
|
+
vkPath: outputPath
|
|
291
303
|
};
|
|
292
304
|
}
|
|
293
305
|
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
294
306
|
return {
|
|
295
|
-
status:
|
|
307
|
+
status: 1,
|
|
296
308
|
reason: `Failed to generate proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
297
|
-
retry: !!result.signal
|
|
309
|
+
retry: !!result.signal
|
|
310
|
+
};
|
|
311
|
+
} catch (error) {
|
|
312
|
+
return {
|
|
313
|
+
status: 1,
|
|
314
|
+
reason: `${error}`
|
|
298
315
|
};
|
|
299
|
-
}
|
|
300
|
-
catch (error) {
|
|
301
|
-
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
302
316
|
}
|
|
303
317
|
}
|
|
304
318
|
/**
|
|
@@ -309,64 +323,73 @@ export async function generateTubeProof(pathToBB, workingDirectory, log) {
|
|
|
309
323
|
* @param input - The inputs for the public function to be proven
|
|
310
324
|
* @param log - A logging function
|
|
311
325
|
* @returns An object containing a result indication, the location of the proof and the duration taken
|
|
312
|
-
*/
|
|
313
|
-
export async function generateAvmProofV2(pathToBB, workingDirectory, input, logger) {
|
|
326
|
+
*/ export async function generateAvmProofV2(pathToBB, workingDirectory, input, logger) {
|
|
314
327
|
// Check that the working directory exists
|
|
315
328
|
try {
|
|
316
329
|
await fs.access(workingDirectory);
|
|
317
|
-
}
|
|
318
|
-
|
|
319
|
-
|
|
330
|
+
} catch (error) {
|
|
331
|
+
return {
|
|
332
|
+
status: 1,
|
|
333
|
+
reason: `Working directory ${workingDirectory} does not exist`
|
|
334
|
+
};
|
|
320
335
|
}
|
|
321
336
|
// The proof is written to e.g. /workingDirectory/proof
|
|
322
337
|
const outputPath = workingDirectory;
|
|
323
|
-
const filePresent = async (file)
|
|
324
|
-
.access(file, fs.constants.R_OK)
|
|
325
|
-
.then(_ => true)
|
|
326
|
-
.catch(_ => false);
|
|
338
|
+
const filePresent = async (file)=>await fs.access(file, fs.constants.R_OK).then((_)=>true).catch((_)=>false);
|
|
327
339
|
const binaryPresent = await filePresent(pathToBB);
|
|
328
340
|
if (!binaryPresent) {
|
|
329
|
-
return {
|
|
341
|
+
return {
|
|
342
|
+
status: 1,
|
|
343
|
+
reason: `Failed to find bb binary at ${pathToBB}`
|
|
344
|
+
};
|
|
330
345
|
}
|
|
331
|
-
const inputsBuffer = input.
|
|
346
|
+
const inputsBuffer = input.serializeWithMessagePack();
|
|
332
347
|
try {
|
|
333
348
|
// Write the inputs to the working directory.
|
|
334
|
-
const avmInputsPath = join(workingDirectory,
|
|
349
|
+
const avmInputsPath = join(workingDirectory, AVM_INPUTS_FILENAME);
|
|
335
350
|
await fs.writeFile(avmInputsPath, inputsBuffer);
|
|
336
|
-
if (!
|
|
337
|
-
return {
|
|
351
|
+
if (!await filePresent(avmInputsPath)) {
|
|
352
|
+
return {
|
|
353
|
+
status: 1,
|
|
354
|
+
reason: `Could not write avm inputs to ${avmInputsPath}`
|
|
355
|
+
};
|
|
338
356
|
}
|
|
339
357
|
const args = [
|
|
340
358
|
'--avm-inputs',
|
|
341
359
|
avmInputsPath,
|
|
342
360
|
'-o',
|
|
343
|
-
outputPath
|
|
344
|
-
logger.level === 'debug' || logger.level === 'trace' ? '-d' : logger.level === 'verbose' ? '-v' : '',
|
|
361
|
+
outputPath
|
|
345
362
|
];
|
|
363
|
+
const loggingArg = logger.level === 'debug' || logger.level === 'trace' ? '-d' : logger.level === 'verbose' ? '-v' : '';
|
|
364
|
+
if (loggingArg !== '') {
|
|
365
|
+
args.push(loggingArg);
|
|
366
|
+
}
|
|
346
367
|
const timer = new Timer();
|
|
347
|
-
const logFunction = (message)
|
|
368
|
+
const logFunction = (message)=>{
|
|
348
369
|
logger.verbose(`AvmCircuit (prove) BB out - ${message}`);
|
|
349
370
|
};
|
|
350
371
|
const result = await executeBB(pathToBB, 'avm2_prove', args, logFunction);
|
|
351
372
|
const duration = timer.ms();
|
|
352
|
-
if (result.status ==
|
|
373
|
+
if (result.status == 0) {
|
|
353
374
|
return {
|
|
354
|
-
status:
|
|
375
|
+
status: 0,
|
|
355
376
|
durationMs: duration,
|
|
356
377
|
proofPath: join(outputPath, PROOF_FILENAME),
|
|
357
378
|
pkPath: undefined,
|
|
358
|
-
vkPath: outputPath
|
|
379
|
+
vkPath: outputPath
|
|
359
380
|
};
|
|
360
381
|
}
|
|
361
382
|
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
362
383
|
return {
|
|
363
|
-
status:
|
|
384
|
+
status: 1,
|
|
364
385
|
reason: `Failed to generate proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
365
|
-
retry: !!result.signal
|
|
386
|
+
retry: !!result.signal
|
|
387
|
+
};
|
|
388
|
+
} catch (error) {
|
|
389
|
+
return {
|
|
390
|
+
status: 1,
|
|
391
|
+
reason: `${error}`
|
|
366
392
|
};
|
|
367
|
-
}
|
|
368
|
-
catch (error) {
|
|
369
|
-
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
370
393
|
}
|
|
371
394
|
}
|
|
372
395
|
/**
|
|
@@ -377,73 +400,79 @@ export async function generateAvmProofV2(pathToBB, workingDirectory, input, logg
|
|
|
377
400
|
* @param bytecode - The AVM bytecode for the public function to be proven (expected to be decompressed)
|
|
378
401
|
* @param log - A logging function
|
|
379
402
|
* @returns An object containing a result indication, the location of the proof and the duration taken
|
|
380
|
-
*/
|
|
381
|
-
export async function generateAvmProof(pathToBB, workingDirectory, input, logger, checkCircuitOnly = false) {
|
|
403
|
+
*/ export async function generateAvmProof(pathToBB, workingDirectory, _input, logger, checkCircuitOnly = false) {
|
|
382
404
|
// Check that the working directory exists
|
|
383
405
|
try {
|
|
384
406
|
await fs.access(workingDirectory);
|
|
385
|
-
}
|
|
386
|
-
|
|
387
|
-
|
|
407
|
+
} catch (error) {
|
|
408
|
+
return {
|
|
409
|
+
status: 1,
|
|
410
|
+
reason: `Working directory ${workingDirectory} does not exist`
|
|
411
|
+
};
|
|
388
412
|
}
|
|
389
413
|
// Paths for the inputs
|
|
390
414
|
const publicInputsPath = join(workingDirectory, AVM_PUBLIC_INPUTS_FILENAME);
|
|
391
415
|
const avmHintsPath = join(workingDirectory, AVM_HINTS_FILENAME);
|
|
392
416
|
// The proof is written to e.g. /workingDirectory/proof
|
|
393
417
|
const outputPath = workingDirectory;
|
|
394
|
-
const filePresent = async (file)
|
|
395
|
-
.access(file, fs.constants.R_OK)
|
|
396
|
-
.then(_ => true)
|
|
397
|
-
.catch(_ => false);
|
|
418
|
+
const filePresent = async (file)=>await fs.access(file, fs.constants.R_OK).then((_)=>true).catch((_)=>false);
|
|
398
419
|
const binaryPresent = await filePresent(pathToBB);
|
|
399
420
|
if (!binaryPresent) {
|
|
400
|
-
return {
|
|
421
|
+
return {
|
|
422
|
+
status: 1,
|
|
423
|
+
reason: `Failed to find bb binary at ${pathToBB}`
|
|
424
|
+
};
|
|
401
425
|
}
|
|
402
426
|
try {
|
|
403
427
|
// Write the inputs to the working directory.
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
}
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
}
|
|
428
|
+
// WARNING: Not writing the inputs since VM1 is disabled!
|
|
429
|
+
// await fs.writeFile(publicInputsPath, input.publicInputs.toBuffer());
|
|
430
|
+
// if (!(await filePresent(publicInputsPath))) {
|
|
431
|
+
// return { status: BB_RESULT.FAILURE, reason: `Could not write publicInputs at ${publicInputsPath}` };
|
|
432
|
+
// }
|
|
433
|
+
// await fs.writeFile(avmHintsPath, input.avmHints.toBuffer());
|
|
434
|
+
// if (!(await filePresent(avmHintsPath))) {
|
|
435
|
+
// return { status: BB_RESULT.FAILURE, reason: `Could not write avmHints at ${avmHintsPath}` };
|
|
436
|
+
// }
|
|
412
437
|
const args = [
|
|
413
438
|
'--avm-public-inputs',
|
|
414
439
|
publicInputsPath,
|
|
415
440
|
'--avm-hints',
|
|
416
441
|
avmHintsPath,
|
|
417
442
|
'-o',
|
|
418
|
-
outputPath
|
|
419
|
-
logger.level === 'debug' || logger.level === 'trace' ? '-d' : logger.level === 'verbose' ? '-v' : '',
|
|
420
|
-
checkCircuitOnly ? '--check-circuit-only' : '',
|
|
443
|
+
outputPath
|
|
421
444
|
];
|
|
445
|
+
const loggingArg = logger.level === 'debug' || logger.level === 'trace' ? '-d' : logger.level === 'verbose' ? '-v' : '';
|
|
446
|
+
if (loggingArg !== '') {
|
|
447
|
+
args.push(loggingArg);
|
|
448
|
+
}
|
|
422
449
|
const timer = new Timer();
|
|
423
450
|
const cmd = checkCircuitOnly ? 'check_circuit' : 'prove';
|
|
424
|
-
const logFunction = (message)
|
|
451
|
+
const logFunction = (message)=>{
|
|
425
452
|
logger.verbose(`AvmCircuit (${cmd}) BB out - ${message}`);
|
|
426
453
|
};
|
|
427
454
|
const result = await executeBB(pathToBB, `avm_${cmd}`, args, logFunction);
|
|
428
455
|
const duration = timer.ms();
|
|
429
|
-
if (result.status ==
|
|
456
|
+
if (result.status == 0) {
|
|
430
457
|
return {
|
|
431
|
-
status:
|
|
458
|
+
status: 0,
|
|
432
459
|
durationMs: duration,
|
|
433
460
|
proofPath: join(outputPath, PROOF_FILENAME),
|
|
434
461
|
pkPath: undefined,
|
|
435
|
-
vkPath: outputPath
|
|
462
|
+
vkPath: outputPath
|
|
436
463
|
};
|
|
437
464
|
}
|
|
438
465
|
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
439
466
|
return {
|
|
440
|
-
status:
|
|
467
|
+
status: 1,
|
|
441
468
|
reason: `Failed to generate proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
442
|
-
retry: !!result.signal
|
|
469
|
+
retry: !!result.signal
|
|
470
|
+
};
|
|
471
|
+
} catch (error) {
|
|
472
|
+
return {
|
|
473
|
+
status: 1,
|
|
474
|
+
reason: `${error}`
|
|
443
475
|
};
|
|
444
|
-
}
|
|
445
|
-
catch (error) {
|
|
446
|
-
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
447
476
|
}
|
|
448
477
|
}
|
|
449
478
|
/**
|
|
@@ -453,9 +482,8 @@ export async function generateAvmProof(pathToBB, workingDirectory, input, logger
|
|
|
453
482
|
* @param verificationKeyPath - The full path to the circuit verification key
|
|
454
483
|
* @param log - A logging function
|
|
455
484
|
* @returns An object containing a result indication and duration taken
|
|
456
|
-
*/
|
|
457
|
-
|
|
458
|
-
return await verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath, `verify_${ultraHonkFlavor}`, log);
|
|
485
|
+
*/ export async function verifyProof(pathToBB, proofFullPath, verificationKeyPath, ultraHonkFlavor, log) {
|
|
486
|
+
return await verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath, `verify`, log, getArgs(ultraHonkFlavor));
|
|
459
487
|
}
|
|
460
488
|
/**
|
|
461
489
|
* Used for verifying proofs of the AVM
|
|
@@ -464,25 +492,24 @@ export async function verifyProof(pathToBB, proofFullPath, verificationKeyPath,
|
|
|
464
492
|
* @param verificationKeyPath - The full path to the circuit verification key
|
|
465
493
|
* @param log - A logging function
|
|
466
494
|
* @returns An object containing a result indication and duration taken
|
|
467
|
-
*/
|
|
468
|
-
export async function verifyAvmProof(pathToBB, proofFullPath, verificationKeyPath, logger) {
|
|
495
|
+
*/ export async function verifyAvmProof(pathToBB, proofFullPath, verificationKeyPath, logger) {
|
|
469
496
|
return await verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath, 'avm_verify', logger);
|
|
470
497
|
}
|
|
471
498
|
export async function verifyAvmProofV2(pathToBB, workingDirectory, proofFullPath, publicInputs, verificationKeyPath, logger) {
|
|
472
|
-
const inputsBuffer = serializeWithMessagePack(
|
|
499
|
+
const inputsBuffer = publicInputs.serializeWithMessagePack();
|
|
473
500
|
// Write the inputs to the working directory.
|
|
474
|
-
const filePresent = async (file)
|
|
475
|
-
.access(file, fs.constants.R_OK)
|
|
476
|
-
.then(_ => true)
|
|
477
|
-
.catch(_ => false);
|
|
501
|
+
const filePresent = async (file)=>await fs.access(file, fs.constants.R_OK).then((_)=>true).catch((_)=>false);
|
|
478
502
|
const avmInputsPath = join(workingDirectory, 'avm_public_inputs.bin');
|
|
479
503
|
await fs.writeFile(avmInputsPath, inputsBuffer);
|
|
480
|
-
if (!
|
|
481
|
-
return {
|
|
504
|
+
if (!await filePresent(avmInputsPath)) {
|
|
505
|
+
return {
|
|
506
|
+
status: 1,
|
|
507
|
+
reason: `Could not write avm inputs to ${avmInputsPath}`
|
|
508
|
+
};
|
|
482
509
|
}
|
|
483
510
|
return await verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath, 'avm2_verify', logger, [
|
|
484
511
|
'--avm-public-inputs',
|
|
485
|
-
avmInputsPath
|
|
512
|
+
avmInputsPath
|
|
486
513
|
]);
|
|
487
514
|
}
|
|
488
515
|
/**
|
|
@@ -492,33 +519,44 @@ export async function verifyAvmProofV2(pathToBB, workingDirectory, proofFullPath
|
|
|
492
519
|
* @param targetPath - The path to the folder with the proof, accumulator, and verification keys
|
|
493
520
|
* @param log - A logging function
|
|
494
521
|
* @returns An object containing a result indication and duration taken
|
|
495
|
-
*/
|
|
496
|
-
|
|
497
|
-
const binaryPresent = await fs
|
|
498
|
-
.access(pathToBB, fs.constants.R_OK)
|
|
499
|
-
.then(_ => true)
|
|
500
|
-
.catch(_ => false);
|
|
522
|
+
*/ export async function verifyClientIvcProof(pathToBB, proofPath, keyPath, log) {
|
|
523
|
+
const binaryPresent = await fs.access(pathToBB, fs.constants.R_OK).then((_)=>true).catch((_)=>false);
|
|
501
524
|
if (!binaryPresent) {
|
|
502
|
-
return {
|
|
525
|
+
return {
|
|
526
|
+
status: 1,
|
|
527
|
+
reason: `Failed to find bb binary at ${pathToBB}`
|
|
528
|
+
};
|
|
503
529
|
}
|
|
504
530
|
try {
|
|
505
|
-
const args = [
|
|
531
|
+
const args = [
|
|
532
|
+
'--scheme',
|
|
533
|
+
'client_ivc',
|
|
534
|
+
'-p',
|
|
535
|
+
proofPath,
|
|
536
|
+
'-k',
|
|
537
|
+
keyPath
|
|
538
|
+
];
|
|
506
539
|
const timer = new Timer();
|
|
507
540
|
const command = 'verify';
|
|
508
541
|
const result = await executeBB(pathToBB, command, args, log);
|
|
509
542
|
const duration = timer.ms();
|
|
510
|
-
if (result.status ==
|
|
511
|
-
return {
|
|
543
|
+
if (result.status == 0) {
|
|
544
|
+
return {
|
|
545
|
+
status: 0,
|
|
546
|
+
durationMs: duration
|
|
547
|
+
};
|
|
512
548
|
}
|
|
513
549
|
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
514
550
|
return {
|
|
515
|
-
status:
|
|
551
|
+
status: 1,
|
|
516
552
|
reason: `Failed to verify proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
517
|
-
retry: !!result.signal
|
|
553
|
+
retry: !!result.signal
|
|
554
|
+
};
|
|
555
|
+
} catch (error) {
|
|
556
|
+
return {
|
|
557
|
+
status: 1,
|
|
558
|
+
reason: `${error}`
|
|
518
559
|
};
|
|
519
|
-
}
|
|
520
|
-
catch (error) {
|
|
521
|
-
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
522
560
|
}
|
|
523
561
|
}
|
|
524
562
|
/**
|
|
@@ -529,17 +567,16 @@ export async function verifyClientIvcProof(pathToBB, targetPath, log) {
|
|
|
529
567
|
* @param command - The BB command to execute (verify/avm_verify)
|
|
530
568
|
* @param log - A logging function
|
|
531
569
|
* @returns An object containing a result indication and duration taken
|
|
532
|
-
*/
|
|
533
|
-
|
|
534
|
-
const binaryPresent = await fs
|
|
535
|
-
.access(pathToBB, fs.constants.R_OK)
|
|
536
|
-
.then(_ => true)
|
|
537
|
-
.catch(_ => false);
|
|
570
|
+
*/ async function verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath, command, logger, extraArgs = []) {
|
|
571
|
+
const binaryPresent = await fs.access(pathToBB, fs.constants.R_OK).then((_)=>true).catch((_)=>false);
|
|
538
572
|
if (!binaryPresent) {
|
|
539
|
-
return {
|
|
573
|
+
return {
|
|
574
|
+
status: 1,
|
|
575
|
+
reason: `Failed to find bb binary at ${pathToBB}`
|
|
576
|
+
};
|
|
540
577
|
}
|
|
541
|
-
const logFunction = (message)
|
|
542
|
-
logger.verbose(`
|
|
578
|
+
const logFunction = (message)=>{
|
|
579
|
+
logger.verbose(`bb-prover (verify) BB out - ${message}`);
|
|
543
580
|
};
|
|
544
581
|
try {
|
|
545
582
|
const args = [
|
|
@@ -547,135 +584,91 @@ async function verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath,
|
|
|
547
584
|
proofFullPath,
|
|
548
585
|
'-k',
|
|
549
586
|
verificationKeyPath,
|
|
550
|
-
|
|
551
|
-
...extraArgs,
|
|
587
|
+
...extraArgs
|
|
552
588
|
];
|
|
589
|
+
const loggingArg = logger.level === 'debug' || logger.level === 'trace' ? '-d' : logger.level === 'verbose' ? '-v' : '';
|
|
590
|
+
if (loggingArg !== '') {
|
|
591
|
+
args.push(loggingArg);
|
|
592
|
+
}
|
|
553
593
|
const timer = new Timer();
|
|
554
594
|
const result = await executeBB(pathToBB, command, args, logFunction);
|
|
555
595
|
const duration = timer.ms();
|
|
556
|
-
if (result.status ==
|
|
557
|
-
return {
|
|
596
|
+
if (result.status == 0) {
|
|
597
|
+
return {
|
|
598
|
+
status: 0,
|
|
599
|
+
durationMs: duration
|
|
600
|
+
};
|
|
558
601
|
}
|
|
559
602
|
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
560
603
|
return {
|
|
561
|
-
status:
|
|
604
|
+
status: 1,
|
|
562
605
|
reason: `Failed to verify proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
563
|
-
retry: !!result.signal
|
|
606
|
+
retry: !!result.signal
|
|
564
607
|
};
|
|
565
|
-
}
|
|
566
|
-
catch (error) {
|
|
567
|
-
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
568
|
-
}
|
|
569
|
-
}
|
|
570
|
-
/**
|
|
571
|
-
* Used for verifying proofs of noir circuits
|
|
572
|
-
* @param pathToBB - The full path to the bb binary
|
|
573
|
-
* @param verificationKeyPath - The directory containing the binary verification key
|
|
574
|
-
* @param verificationKeyFilename - The filename of the verification key
|
|
575
|
-
* @param log - A logging function
|
|
576
|
-
* @returns An object containing a result indication and duration taken
|
|
577
|
-
*/
|
|
578
|
-
export async function writeVkAsFields(pathToBB, verificationKeyPath, verificationKeyFilename, log) {
|
|
579
|
-
const binaryPresent = await fs
|
|
580
|
-
.access(pathToBB, fs.constants.R_OK)
|
|
581
|
-
.then(_ => true)
|
|
582
|
-
.catch(_ => false);
|
|
583
|
-
if (!binaryPresent) {
|
|
584
|
-
return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
|
|
585
|
-
}
|
|
586
|
-
try {
|
|
587
|
-
const args = ['-k', `${verificationKeyPath}/${verificationKeyFilename}`, '-v'];
|
|
588
|
-
const timer = new Timer();
|
|
589
|
-
const result = await executeBB(pathToBB, 'vk_as_fields_ultra_honk', args, log);
|
|
590
|
-
const duration = timer.ms();
|
|
591
|
-
if (result.status == BB_RESULT.SUCCESS) {
|
|
592
|
-
return { status: BB_RESULT.SUCCESS, durationMs: duration, vkPath: verificationKeyPath };
|
|
593
|
-
}
|
|
594
|
-
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
608
|
+
} catch (error) {
|
|
595
609
|
return {
|
|
596
|
-
status:
|
|
597
|
-
reason:
|
|
598
|
-
retry: !!result.signal,
|
|
610
|
+
status: 1,
|
|
611
|
+
reason: `${error}`
|
|
599
612
|
};
|
|
600
613
|
}
|
|
601
|
-
catch (error) {
|
|
602
|
-
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
603
|
-
}
|
|
604
614
|
}
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
* @param pathToBB - The full path to the bb binary
|
|
608
|
-
* @param proofPath - The directory containing the binary proof
|
|
609
|
-
* @param proofFileName - The filename of the proof
|
|
610
|
-
* @param vkFileName - The filename of the verification key
|
|
611
|
-
* @param log - A logging function
|
|
612
|
-
* @returns An object containing a result indication and duration taken
|
|
613
|
-
*/
|
|
614
|
-
export async function writeProofAsFields(pathToBB, proofPath, proofFileName, vkFilePath, log) {
|
|
615
|
-
const binaryPresent = await fs
|
|
616
|
-
.access(pathToBB, fs.constants.R_OK)
|
|
617
|
-
.then(_ => true)
|
|
618
|
-
.catch(_ => false);
|
|
615
|
+
export async function generateContractForVerificationKey(pathToBB, vkFilePath, contractPath, log) {
|
|
616
|
+
const binaryPresent = await fs.access(pathToBB, fs.constants.R_OK).then((_)=>true).catch((_)=>false);
|
|
619
617
|
if (!binaryPresent) {
|
|
620
|
-
return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
|
|
621
|
-
}
|
|
622
|
-
try {
|
|
623
|
-
const args = ['-p', `${proofPath}/${proofFileName}`, '-k', vkFilePath, '-v'];
|
|
624
|
-
const timer = new Timer();
|
|
625
|
-
const result = await executeBB(pathToBB, 'proof_as_fields_honk', args, log);
|
|
626
|
-
const duration = timer.ms();
|
|
627
|
-
if (result.status == BB_RESULT.SUCCESS) {
|
|
628
|
-
return { status: BB_RESULT.SUCCESS, durationMs: duration, proofPath: proofPath };
|
|
629
|
-
}
|
|
630
|
-
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
631
618
|
return {
|
|
632
|
-
status:
|
|
633
|
-
reason: `Failed to
|
|
634
|
-
retry: !!result.signal,
|
|
619
|
+
status: 1,
|
|
620
|
+
reason: `Failed to find bb binary at ${pathToBB}`
|
|
635
621
|
};
|
|
636
622
|
}
|
|
637
|
-
catch (error) {
|
|
638
|
-
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
639
|
-
}
|
|
640
|
-
}
|
|
641
|
-
export async function generateContractForVerificationKey(pathToBB, vkFilePath, contractPath, log) {
|
|
642
|
-
const binaryPresent = await fs
|
|
643
|
-
.access(pathToBB, fs.constants.R_OK)
|
|
644
|
-
.then(_ => true)
|
|
645
|
-
.catch(_ => false);
|
|
646
|
-
if (!binaryPresent) {
|
|
647
|
-
return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
|
|
648
|
-
}
|
|
649
623
|
const outputDir = dirname(contractPath);
|
|
650
624
|
const contractName = basename(contractPath);
|
|
651
625
|
// cache contract generation based on vk file and contract name
|
|
652
|
-
const cacheKey = sha256(Buffer.concat([
|
|
653
|
-
|
|
654
|
-
|
|
626
|
+
const cacheKey = sha256(Buffer.concat([
|
|
627
|
+
Buffer.from(contractName),
|
|
628
|
+
await fs.readFile(vkFilePath)
|
|
629
|
+
]));
|
|
630
|
+
await fs.mkdir(outputDir, {
|
|
631
|
+
recursive: true
|
|
632
|
+
});
|
|
633
|
+
const res = await fsCache(outputDir, cacheKey, log, false, async ()=>{
|
|
655
634
|
try {
|
|
656
|
-
const args = [
|
|
635
|
+
const args = [
|
|
636
|
+
'--scheme',
|
|
637
|
+
'ultra_honk',
|
|
638
|
+
'-k',
|
|
639
|
+
vkFilePath,
|
|
640
|
+
'-o',
|
|
641
|
+
contractPath,
|
|
642
|
+
'-v'
|
|
643
|
+
];
|
|
657
644
|
const timer = new Timer();
|
|
658
|
-
const result = await executeBB(pathToBB, '
|
|
645
|
+
const result = await executeBB(pathToBB, 'contract', args, log);
|
|
659
646
|
const duration = timer.ms();
|
|
660
|
-
if (result.status ==
|
|
661
|
-
return {
|
|
647
|
+
if (result.status == 0) {
|
|
648
|
+
return {
|
|
649
|
+
status: 0,
|
|
650
|
+
durationMs: duration,
|
|
651
|
+
contractPath
|
|
652
|
+
};
|
|
662
653
|
}
|
|
663
654
|
// Not a great error message here but it is difficult to decipher what comes from bb
|
|
664
655
|
return {
|
|
665
|
-
status:
|
|
656
|
+
status: 1,
|
|
666
657
|
reason: `Failed to write verifier contract. Exit code ${result.exitCode}. Signal ${result.signal}.`,
|
|
667
|
-
retry: !!result.signal
|
|
658
|
+
retry: !!result.signal
|
|
659
|
+
};
|
|
660
|
+
} catch (error) {
|
|
661
|
+
return {
|
|
662
|
+
status: 1,
|
|
663
|
+
reason: `${error}`
|
|
668
664
|
};
|
|
669
|
-
}
|
|
670
|
-
catch (error) {
|
|
671
|
-
return { status: BB_RESULT.FAILURE, reason: `${error}` };
|
|
672
665
|
}
|
|
673
666
|
});
|
|
674
667
|
if (!res) {
|
|
675
668
|
return {
|
|
676
|
-
status:
|
|
669
|
+
status: 2,
|
|
677
670
|
durationMs: 0,
|
|
678
|
-
contractPath
|
|
671
|
+
contractPath
|
|
679
672
|
};
|
|
680
673
|
}
|
|
681
674
|
return res;
|
|
@@ -688,27 +681,28 @@ export async function generateContractForVerificationKey(pathToBB, vkFilePath, c
|
|
|
688
681
|
* @param bytecode - The bytecode of the circuit
|
|
689
682
|
* @param flavor - The flavor of the backend - mega_honk or ultra_honk variants
|
|
690
683
|
* @returns An object containing the status, gate count, and time taken
|
|
691
|
-
*/
|
|
692
|
-
export async function computeGateCountForCircuit(pathToBB, workingDirectory, circuitName, bytecode, flavor, log) {
|
|
684
|
+
*/ export async function computeGateCountForCircuit(pathToBB, workingDirectory, circuitName, bytecode, flavor, log) {
|
|
693
685
|
// Check that the working directory exists
|
|
694
686
|
try {
|
|
695
687
|
await fs.access(workingDirectory);
|
|
696
|
-
}
|
|
697
|
-
|
|
698
|
-
|
|
688
|
+
} catch (error) {
|
|
689
|
+
return {
|
|
690
|
+
status: 1,
|
|
691
|
+
reason: `Working directory ${workingDirectory} does not exist`
|
|
692
|
+
};
|
|
699
693
|
}
|
|
700
694
|
// The bytecode is written to e.g. /workingDirectory/BaseParityArtifact-bytecode
|
|
701
695
|
const bytecodePath = `${workingDirectory}/${circuitName}-bytecode`;
|
|
702
|
-
const binaryPresent = await fs
|
|
703
|
-
.access(pathToBB, fs.constants.R_OK)
|
|
704
|
-
.then(_ => true)
|
|
705
|
-
.catch(_ => false);
|
|
696
|
+
const binaryPresent = await fs.access(pathToBB, fs.constants.R_OK).then((_)=>true).catch((_)=>false);
|
|
706
697
|
if (!binaryPresent) {
|
|
707
|
-
return {
|
|
698
|
+
return {
|
|
699
|
+
status: 1,
|
|
700
|
+
reason: `Failed to find bb binary at ${pathToBB}`
|
|
701
|
+
};
|
|
708
702
|
}
|
|
709
703
|
// Accumulate the stdout from bb
|
|
710
704
|
let stdout = '';
|
|
711
|
-
const logHandler = (message)
|
|
705
|
+
const logHandler = (message)=>{
|
|
712
706
|
stdout += message;
|
|
713
707
|
log(message);
|
|
714
708
|
};
|
|
@@ -716,25 +710,39 @@ export async function computeGateCountForCircuit(pathToBB, workingDirectory, cir
|
|
|
716
710
|
// Write the bytecode to the working directory
|
|
717
711
|
await fs.writeFile(bytecodePath, bytecode);
|
|
718
712
|
const timer = new Timer();
|
|
719
|
-
const result = await executeBB(pathToBB,
|
|
713
|
+
const result = await executeBB(pathToBB, 'gates', [
|
|
714
|
+
'--scheme',
|
|
715
|
+
flavor === 'mega_honk' ? 'client_ivc' : 'ultra_honk',
|
|
716
|
+
'-b',
|
|
717
|
+
bytecodePath,
|
|
718
|
+
'-v'
|
|
719
|
+
], logHandler);
|
|
720
720
|
const duration = timer.ms();
|
|
721
|
-
if (result.status ==
|
|
721
|
+
if (result.status == 0) {
|
|
722
722
|
// Look for "circuit_size" in the stdout and parse the number
|
|
723
723
|
const circuitSizeMatch = stdout.match(/circuit_size": (\d+)/);
|
|
724
724
|
if (!circuitSizeMatch) {
|
|
725
|
-
return {
|
|
725
|
+
return {
|
|
726
|
+
status: 1,
|
|
727
|
+
reason: 'Failed to parse circuit_size from bb gates stdout.'
|
|
728
|
+
};
|
|
726
729
|
}
|
|
727
730
|
const circuitSize = parseInt(circuitSizeMatch[1]);
|
|
728
731
|
return {
|
|
729
|
-
status:
|
|
732
|
+
status: 0,
|
|
730
733
|
durationMs: duration,
|
|
731
|
-
circuitSize: circuitSize
|
|
734
|
+
circuitSize: circuitSize
|
|
732
735
|
};
|
|
733
736
|
}
|
|
734
|
-
return {
|
|
735
|
-
|
|
736
|
-
|
|
737
|
-
|
|
737
|
+
return {
|
|
738
|
+
status: 1,
|
|
739
|
+
reason: 'Failed getting the gate count.'
|
|
740
|
+
};
|
|
741
|
+
} catch (error) {
|
|
742
|
+
return {
|
|
743
|
+
status: 1,
|
|
744
|
+
reason: `${error}`
|
|
745
|
+
};
|
|
738
746
|
}
|
|
739
747
|
}
|
|
740
748
|
const CACHE_FILENAME = '.cache';
|
|
@@ -743,17 +751,14 @@ async function fsCache(dir, expectedCacheKey, logger, force, action) {
|
|
|
743
751
|
let run;
|
|
744
752
|
if (force) {
|
|
745
753
|
run = true;
|
|
746
|
-
}
|
|
747
|
-
else {
|
|
754
|
+
} else {
|
|
748
755
|
try {
|
|
749
756
|
run = !expectedCacheKey.equals(await fs.readFile(cacheFilePath));
|
|
750
|
-
}
|
|
751
|
-
catch (err) {
|
|
757
|
+
} catch (err) {
|
|
752
758
|
if (err && 'code' in err && err.code === 'ENOENT') {
|
|
753
759
|
// cache file doesn't exist, swallow error and run
|
|
754
760
|
run = true;
|
|
755
|
-
}
|
|
756
|
-
else {
|
|
761
|
+
} else {
|
|
757
762
|
throw err;
|
|
758
763
|
}
|
|
759
764
|
}
|
|
@@ -762,17 +767,14 @@ async function fsCache(dir, expectedCacheKey, logger, force, action) {
|
|
|
762
767
|
if (run) {
|
|
763
768
|
logger(`Cache miss or forced run. Running operation in ${dir}...`);
|
|
764
769
|
res = await action();
|
|
765
|
-
}
|
|
766
|
-
else {
|
|
770
|
+
} else {
|
|
767
771
|
logger(`Cache hit. Skipping operation in ${dir}...`);
|
|
768
772
|
}
|
|
769
773
|
try {
|
|
770
774
|
await fs.writeFile(cacheFilePath, expectedCacheKey);
|
|
771
|
-
}
|
|
772
|
-
catch (err) {
|
|
775
|
+
} catch (err) {
|
|
773
776
|
logger(`Couldn't write cache data to ${cacheFilePath}. Skipping cache...`);
|
|
774
|
-
|
|
777
|
+
// ignore
|
|
775
778
|
}
|
|
776
779
|
return res;
|
|
777
780
|
}
|
|
778
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/bb/execute.ts"],"names":[],"mappings":"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"}
|