@aztec/bb.js 1.0.0-nightly.20250612 → 1.0.0-nightly.20250614
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/browser/barretenberg/backend.d.ts.map +1 -1
- package/dest/browser/barretenberg/backend.js +13 -13
- package/dest/browser/barretenberg/index.d.ts +2 -1
- package/dest/browser/barretenberg/index.d.ts.map +1 -1
- package/dest/browser/barretenberg/index.js +11 -3
- package/dest/browser/barretenberg_api/index.d.ts +5 -5
- package/dest/browser/barretenberg_api/index.d.ts.map +1 -1
- package/dest/browser/barretenberg_api/index.js +11 -11
- package/dest/browser/barretenberg_wasm/barretenberg_wasm_main/index.d.ts +1 -0
- package/dest/browser/barretenberg_wasm/barretenberg_wasm_main/index.d.ts.map +1 -1
- package/dest/browser/barretenberg_wasm/barretenberg_wasm_main/index.js +10 -2
- package/dest/browser/barretenberg_wasm/fetch_code/browser/barretenberg-threads.js +1 -1
- package/dest/browser/barretenberg_wasm/fetch_code/browser/barretenberg.js +1 -1
- package/dest/node/barretenberg/backend.d.ts.map +1 -1
- package/dest/node/barretenberg/backend.js +13 -13
- package/dest/node/barretenberg/index.d.ts +2 -1
- package/dest/node/barretenberg/index.d.ts.map +1 -1
- package/dest/node/barretenberg/index.js +11 -3
- package/dest/node/barretenberg_api/index.d.ts +5 -5
- package/dest/node/barretenberg_api/index.d.ts.map +1 -1
- package/dest/node/barretenberg_api/index.js +11 -11
- package/dest/node/barretenberg_wasm/barretenberg-threads.wasm.gz +0 -0
- package/dest/node/barretenberg_wasm/barretenberg_wasm_main/index.d.ts +1 -0
- package/dest/node/barretenberg_wasm/barretenberg_wasm_main/index.d.ts.map +1 -1
- package/dest/node/barretenberg_wasm/barretenberg_wasm_main/index.js +10 -2
- package/dest/node/main.d.ts +1 -1
- package/dest/node/main.d.ts.map +1 -1
- package/dest/node/main.js +19 -18
- package/dest/node-cjs/barretenberg/backend.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg/backend.js +13 -13
- package/dest/node-cjs/barretenberg/index.d.ts +2 -1
- package/dest/node-cjs/barretenberg/index.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg/index.js +11 -3
- package/dest/node-cjs/barretenberg_api/index.d.ts +5 -5
- package/dest/node-cjs/barretenberg_api/index.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg_api/index.js +11 -11
- package/dest/node-cjs/barretenberg_wasm/barretenberg-threads.wasm.gz +0 -0
- package/dest/node-cjs/barretenberg_wasm/barretenberg_wasm_main/index.d.ts +1 -0
- package/dest/node-cjs/barretenberg_wasm/barretenberg_wasm_main/index.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg_wasm/barretenberg_wasm_main/index.js +10 -2
- package/dest/node-cjs/main.d.ts +1 -1
- package/dest/node-cjs/main.d.ts.map +1 -1
- package/dest/node-cjs/main.js +19 -18
- package/package.json +1 -1
- package/src/barretenberg/backend.ts +18 -14
- package/src/barretenberg/index.ts +11 -2
- package/src/barretenberg_api/index.ts +22 -12
- package/src/barretenberg_wasm/barretenberg_wasm_main/index.ts +10 -1
- package/src/main.ts +18 -16
package/dest/node-cjs/main.js
CHANGED
|
@@ -134,7 +134,7 @@ async function contractUltraHonk(bytecodePath, vkPath, crsPath, outputPath) {
|
|
|
134
134
|
await api.destroy();
|
|
135
135
|
}
|
|
136
136
|
}
|
|
137
|
-
async function proveUltraHonk(bytecodePath, witnessPath, crsPath, outputPath, options) {
|
|
137
|
+
async function proveUltraHonk(bytecodePath, witnessPath, crsPath, vkPath, outputPath, options) {
|
|
138
138
|
const { api } = await initUltraHonk(bytecodePath, crsPath);
|
|
139
139
|
try {
|
|
140
140
|
debug(`Creating UltraHonk proof bytecode=${bytecodePath}`);
|
|
@@ -149,7 +149,7 @@ async function proveUltraHonk(bytecodePath, witnessPath, crsPath, outputPath, op
|
|
|
149
149
|
: options?.starknetZK
|
|
150
150
|
? api.acirProveUltraStarknetZkHonk.bind(api)
|
|
151
151
|
: api.acirProveUltraHonk.bind(api);
|
|
152
|
-
const proof = await acirProveUltraHonk(bytecode, witness);
|
|
152
|
+
const proof = await acirProveUltraHonk(bytecode, witness, new index_js_1.RawBuffer((0, fs_1.readFileSync)(vkPath)));
|
|
153
153
|
if (outputPath === '-') {
|
|
154
154
|
process.stdout.write(proof);
|
|
155
155
|
debug(`Proof written to stdout`);
|
|
@@ -361,32 +361,34 @@ program
|
|
|
361
361
|
.description('Generate a proof and write it to a file.')
|
|
362
362
|
.option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
|
|
363
363
|
.option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
|
|
364
|
+
.option('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
|
|
364
365
|
.option('-o, --output-path <path>', 'Specify the proof output path', './proofs/proof')
|
|
365
|
-
.action(async ({ bytecodePath, witnessPath, outputPath }) => {
|
|
366
|
+
.action(async ({ bytecodePath, witnessPath, vkPath, outputPath }) => {
|
|
366
367
|
const { crsPath } = handleGlobalOptions();
|
|
367
|
-
debug(`Creating UltraHonk proof
|
|
368
|
-
await proveUltraHonk(bytecodePath, witnessPath, crsPath, outputPath);
|
|
368
|
+
debug(`Creating UltraHonk proof bytecodePath=${bytecodePath}, witnessPath=${witnessPath}, vkPath=${vkPath}`);
|
|
369
|
+
await proveUltraHonk(bytecodePath, witnessPath, crsPath, vkPath, outputPath);
|
|
369
370
|
});
|
|
370
371
|
program
|
|
371
372
|
.command('prove_ultra_keccak_honk')
|
|
372
373
|
.description('Generate a proof and write it to a file.')
|
|
373
374
|
.option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
|
|
374
375
|
.option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
|
|
376
|
+
.option('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
|
|
375
377
|
.option('-o, --output-path <path>', 'Specify the proof output path', './proofs/proof')
|
|
376
|
-
.action(async ({ bytecodePath, witnessPath, outputPath }) => {
|
|
378
|
+
.action(async ({ bytecodePath, witnessPath, vkPath, outputPath }) => {
|
|
377
379
|
const { crsPath } = handleGlobalOptions();
|
|
378
|
-
await proveUltraHonk(bytecodePath, witnessPath, crsPath, outputPath, { keccak: true });
|
|
380
|
+
await proveUltraHonk(bytecodePath, witnessPath, crsPath, vkPath, outputPath, { keccak: true });
|
|
379
381
|
});
|
|
380
382
|
program
|
|
381
383
|
.command('prove_ultra_starknet_honk')
|
|
382
384
|
.description('Generate a proof and write it to a file.')
|
|
383
385
|
.option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
|
|
384
|
-
.option('-r, --recursive', 'Create a SNARK friendly proof', false)
|
|
385
386
|
.option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
|
|
387
|
+
.option('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
|
|
386
388
|
.option('-o, --output-path <path>', 'Specify the proof output path', './proofs/proof')
|
|
387
|
-
.action(async ({ bytecodePath, witnessPath, outputPath }) => {
|
|
389
|
+
.action(async ({ bytecodePath, witnessPath, vkPath, outputPath }) => {
|
|
388
390
|
const { crsPath } = handleGlobalOptions();
|
|
389
|
-
await proveUltraHonk(bytecodePath, witnessPath, crsPath, outputPath, { starknet: true });
|
|
391
|
+
await proveUltraHonk(bytecodePath, witnessPath, crsPath, vkPath, outputPath, { starknet: true });
|
|
390
392
|
});
|
|
391
393
|
program
|
|
392
394
|
.command('write_vk_ultra_honk')
|
|
@@ -411,7 +413,6 @@ program
|
|
|
411
413
|
.command('write_vk_ultra_starknet_honk')
|
|
412
414
|
.description('Output verification key.')
|
|
413
415
|
.option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
|
|
414
|
-
.option('-r, --recursive', 'Create a SNARK friendly proof', false)
|
|
415
416
|
.requiredOption('-o, --output-path <path>', 'Specify the path to write the key')
|
|
416
417
|
.action(async ({ bytecodePath, outputPath }) => {
|
|
417
418
|
const { crsPath } = handleGlobalOptions();
|
|
@@ -421,20 +422,20 @@ program
|
|
|
421
422
|
.command('verify_ultra_honk')
|
|
422
423
|
.description('Verify a proof. Process exists with success or failure code.')
|
|
423
424
|
.requiredOption('-p, --proof-path <path>', 'Specify the path to the proof')
|
|
424
|
-
.requiredOption('-k, --vk <path>', 'path to a verification key. avoids recomputation.')
|
|
425
|
-
.action(async ({ proofPath,
|
|
425
|
+
.requiredOption('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
|
|
426
|
+
.action(async ({ proofPath, vkPath }) => {
|
|
426
427
|
const { crsPath } = handleGlobalOptions();
|
|
427
|
-
const result = await verifyUltraHonk(proofPath,
|
|
428
|
+
const result = await verifyUltraHonk(proofPath, vkPath, crsPath);
|
|
428
429
|
process.exit(result ? 0 : 1);
|
|
429
430
|
});
|
|
430
431
|
program
|
|
431
432
|
.command('verify_ultra_keccak_honk')
|
|
432
433
|
.description('Verify a proof. Process exists with success or failure code.')
|
|
433
434
|
.requiredOption('-p, --proof-path <path>', 'Specify the path to the proof')
|
|
434
|
-
.requiredOption('-k, --vk <path>', 'path to a verification key. avoids recomputation.')
|
|
435
|
-
.action(async ({ proofPath,
|
|
435
|
+
.requiredOption('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
|
|
436
|
+
.action(async ({ proofPath, vkPath }) => {
|
|
436
437
|
const { crsPath } = handleGlobalOptions();
|
|
437
|
-
const result = await verifyUltraHonk(proofPath,
|
|
438
|
+
const result = await verifyUltraHonk(proofPath, vkPath, crsPath, { keccak: true });
|
|
438
439
|
process.exit(result ? 0 : 1);
|
|
439
440
|
});
|
|
440
441
|
program
|
|
@@ -466,4 +467,4 @@ program
|
|
|
466
467
|
await vkAsFieldsUltraHonk(vkPath, outputPath, crsPath);
|
|
467
468
|
});
|
|
468
469
|
program.name('bb.js').parse(process.argv);
|
|
469
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}
|
|
470
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/bb.js",
|
|
3
3
|
"packageManager": "yarn@4.5.2",
|
|
4
|
-
"version": "1.0.0-nightly.
|
|
4
|
+
"version": "1.0.0-nightly.20250614",
|
|
5
5
|
"homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/barretenberg/ts",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"type": "module",
|
|
@@ -92,18 +92,6 @@ export class UltraHonkBackend {
|
|
|
92
92
|
async generateProof(compressedWitness: Uint8Array, options?: UltraHonkBackendOptions): Promise<ProofData> {
|
|
93
93
|
await this.instantiate();
|
|
94
94
|
|
|
95
|
-
const proveUltraHonk = options?.keccak
|
|
96
|
-
? this.api.acirProveUltraKeccakHonk.bind(this.api)
|
|
97
|
-
: options?.keccakZK
|
|
98
|
-
? this.api.acirProveUltraKeccakZkHonk.bind(this.api)
|
|
99
|
-
: options?.starknet
|
|
100
|
-
? this.api.acirProveUltraStarknetHonk.bind(this.api)
|
|
101
|
-
: options?.starknetZK
|
|
102
|
-
? this.api.acirProveUltraStarknetZkHonk.bind(this.api)
|
|
103
|
-
: this.api.acirProveUltraHonk.bind(this.api);
|
|
104
|
-
|
|
105
|
-
const proofWithPublicInputs = await proveUltraHonk(this.acirUncompressedBytecode, ungzip(compressedWitness));
|
|
106
|
-
|
|
107
95
|
// Write VK to get the number of public inputs
|
|
108
96
|
const writeVKUltraHonk = options?.keccak
|
|
109
97
|
? this.api.acirWriteVkUltraKeccakHonk.bind(this.api)
|
|
@@ -115,8 +103,24 @@ export class UltraHonkBackend {
|
|
|
115
103
|
? this.api.acirWriteVkUltraStarknetZkHonk.bind(this.api)
|
|
116
104
|
: this.api.acirWriteVkUltraHonk.bind(this.api);
|
|
117
105
|
|
|
118
|
-
const
|
|
119
|
-
const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new RawBuffer(
|
|
106
|
+
const vkBuf = await writeVKUltraHonk(this.acirUncompressedBytecode);
|
|
107
|
+
const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new RawBuffer(vkBuf));
|
|
108
|
+
|
|
109
|
+
const proveUltraHonk = options?.keccak
|
|
110
|
+
? this.api.acirProveUltraKeccakHonk.bind(this.api)
|
|
111
|
+
: options?.keccakZK
|
|
112
|
+
? this.api.acirProveUltraKeccakZkHonk.bind(this.api)
|
|
113
|
+
: options?.starknet
|
|
114
|
+
? this.api.acirProveUltraStarknetHonk.bind(this.api)
|
|
115
|
+
: options?.starknetZK
|
|
116
|
+
? this.api.acirProveUltraStarknetZkHonk.bind(this.api)
|
|
117
|
+
: this.api.acirProveUltraHonk.bind(this.api);
|
|
118
|
+
|
|
119
|
+
const proofWithPublicInputs = await proveUltraHonk(
|
|
120
|
+
this.acirUncompressedBytecode,
|
|
121
|
+
ungzip(compressedWitness),
|
|
122
|
+
new RawBuffer(vkBuf),
|
|
123
|
+
);
|
|
120
124
|
|
|
121
125
|
// Item at index 1 in VK is the number of public inputs
|
|
122
126
|
const publicInputsSizeIndex = 1; // index into VK for numPublicInputs
|
|
@@ -80,9 +80,9 @@ export class Barretenberg extends BarretenbergApi {
|
|
|
80
80
|
await this.srsInitSrs(new RawBuffer(crs.getG1Data()), crs.numPoints, new RawBuffer(crs.getG2Data()));
|
|
81
81
|
}
|
|
82
82
|
|
|
83
|
-
async initSRSClientIVC(): Promise<void> {
|
|
83
|
+
async initSRSClientIVC(srsSize = this.getDefaultSrsSize()): Promise<void> {
|
|
84
84
|
// crsPath can be undefined
|
|
85
|
-
const crs = await Crs.new(
|
|
85
|
+
const crs = await Crs.new(srsSize + 1, this.options.crsPath, this.options.logger);
|
|
86
86
|
const grumpkinCrs = await GrumpkinCrs.new(2 ** 16 + 1, this.options.crsPath, this.options.logger);
|
|
87
87
|
|
|
88
88
|
// Load CRS into wasm global CRS state.
|
|
@@ -91,6 +91,15 @@ export class Barretenberg extends BarretenbergApi {
|
|
|
91
91
|
await this.srsInitGrumpkinSrs(new RawBuffer(grumpkinCrs.getG1Data()), grumpkinCrs.numPoints);
|
|
92
92
|
}
|
|
93
93
|
|
|
94
|
+
getDefaultSrsSize(): number {
|
|
95
|
+
// iOS browser is very aggressive with memory. Check if running in browser and on iOS
|
|
96
|
+
// We expect the mobile iOS browser to kill us >=1GB, so no real use in using a larger SRS.
|
|
97
|
+
if (typeof window !== 'undefined' && /iPad|iPhone/.test(navigator.userAgent)) {
|
|
98
|
+
return 2 ** 18;
|
|
99
|
+
}
|
|
100
|
+
return 2 ** 20;
|
|
101
|
+
}
|
|
102
|
+
|
|
94
103
|
async acirInitSRS(bytecode: Uint8Array, recursive: boolean, honkRecursion: boolean): Promise<void> {
|
|
95
104
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
96
105
|
const [_total, subgroupSize] = await this.acirGetCircuitSizes(bytecode, recursive, honkRecursion);
|
|
@@ -223,7 +223,6 @@ export class BarretenbergApi {
|
|
|
223
223
|
return out as any;
|
|
224
224
|
}
|
|
225
225
|
|
|
226
|
-
|
|
227
226
|
async acirProveAndVerifyUltraHonk(constraintSystemBuf: Uint8Array, witnessBuf: Uint8Array): Promise<boolean> {
|
|
228
227
|
const inArgs = [constraintSystemBuf, witnessBuf].map(serializeBufferable);
|
|
229
228
|
const outTypes: OutputType[] = [BoolDeserializer()];
|
|
@@ -384,8 +383,8 @@ export class BarretenbergApi {
|
|
|
384
383
|
return out as any;
|
|
385
384
|
}
|
|
386
385
|
|
|
387
|
-
async acirProveUltraHonk(acirVec: Uint8Array, witnessVec: Uint8Array): Promise<Uint8Array> {
|
|
388
|
-
const inArgs = [acirVec, witnessVec].map(serializeBufferable);
|
|
386
|
+
async acirProveUltraHonk(acirVec: Uint8Array, witnessVec: Uint8Array, vkBuf: Uint8Array): Promise<Uint8Array> {
|
|
387
|
+
const inArgs = [acirVec, witnessVec, vkBuf].map(serializeBufferable);
|
|
389
388
|
const outTypes: OutputType[] = [BufferDeserializer()];
|
|
390
389
|
const result = await this.wasm.callWasmExport(
|
|
391
390
|
'acir_prove_ultra_honk',
|
|
@@ -396,8 +395,8 @@ export class BarretenbergApi {
|
|
|
396
395
|
return out[0];
|
|
397
396
|
}
|
|
398
397
|
|
|
399
|
-
async acirProveUltraKeccakHonk(acirVec: Uint8Array, witnessVec: Uint8Array): Promise<Uint8Array> {
|
|
400
|
-
const inArgs = [acirVec, witnessVec].map(serializeBufferable);
|
|
398
|
+
async acirProveUltraKeccakHonk(acirVec: Uint8Array, witnessVec: Uint8Array, vkBuf: Uint8Array): Promise<Uint8Array> {
|
|
399
|
+
const inArgs = [acirVec, witnessVec, vkBuf].map(serializeBufferable);
|
|
401
400
|
const outTypes: OutputType[] = [BufferDeserializer()];
|
|
402
401
|
const result = await this.wasm.callWasmExport(
|
|
403
402
|
'acir_prove_ultra_keccak_honk',
|
|
@@ -408,8 +407,12 @@ export class BarretenbergApi {
|
|
|
408
407
|
return out[0];
|
|
409
408
|
}
|
|
410
409
|
|
|
411
|
-
async acirProveUltraKeccakZkHonk(
|
|
412
|
-
|
|
410
|
+
async acirProveUltraKeccakZkHonk(
|
|
411
|
+
acirVec: Uint8Array,
|
|
412
|
+
witnessVec: Uint8Array,
|
|
413
|
+
vkBuf: Uint8Array,
|
|
414
|
+
): Promise<Uint8Array> {
|
|
415
|
+
const inArgs = [acirVec, witnessVec, vkBuf].map(serializeBufferable);
|
|
413
416
|
const outTypes: OutputType[] = [BufferDeserializer()];
|
|
414
417
|
const result = await this.wasm.callWasmExport(
|
|
415
418
|
'acir_prove_ultra_keccak_zk_honk',
|
|
@@ -420,8 +423,12 @@ export class BarretenbergApi {
|
|
|
420
423
|
return out[0];
|
|
421
424
|
}
|
|
422
425
|
|
|
423
|
-
async acirProveUltraStarknetHonk(
|
|
424
|
-
|
|
426
|
+
async acirProveUltraStarknetHonk(
|
|
427
|
+
acirVec: Uint8Array,
|
|
428
|
+
witnessVec: Uint8Array,
|
|
429
|
+
vkBuf: Uint8Array,
|
|
430
|
+
): Promise<Uint8Array> {
|
|
431
|
+
const inArgs = [acirVec, witnessVec, vkBuf].map(serializeBufferable);
|
|
425
432
|
const outTypes: OutputType[] = [BufferDeserializer()];
|
|
426
433
|
const result = await this.wasm.callWasmExport(
|
|
427
434
|
'acir_prove_ultra_starknet_honk',
|
|
@@ -432,8 +439,12 @@ export class BarretenbergApi {
|
|
|
432
439
|
return out[0];
|
|
433
440
|
}
|
|
434
441
|
|
|
435
|
-
async acirProveUltraStarknetZkHonk(
|
|
436
|
-
|
|
442
|
+
async acirProveUltraStarknetZkHonk(
|
|
443
|
+
acirVec: Uint8Array,
|
|
444
|
+
witnessVec: Uint8Array,
|
|
445
|
+
vkBuf: Uint8Array,
|
|
446
|
+
): Promise<Uint8Array> {
|
|
447
|
+
const inArgs = [acirVec, witnessVec, vkBuf].map(serializeBufferable);
|
|
437
448
|
const outTypes: OutputType[] = [BufferDeserializer()];
|
|
438
449
|
const result = await this.wasm.callWasmExport(
|
|
439
450
|
'acir_prove_ultra_starknet_zk_honk',
|
|
@@ -819,7 +830,6 @@ export class BarretenbergApiSync {
|
|
|
819
830
|
return out as any;
|
|
820
831
|
}
|
|
821
832
|
|
|
822
|
-
|
|
823
833
|
acirProveAndVerifyUltraHonk(constraintSystemBuf: Uint8Array, witnessBuf: Uint8Array): boolean {
|
|
824
834
|
const inArgs = [constraintSystemBuf, witnessBuf].map(serializeBufferable);
|
|
825
835
|
const outTypes: OutputType[] = [BoolDeserializer()];
|
|
@@ -31,7 +31,7 @@ export class BarretenbergWasmMain extends BarretenbergWasmBase {
|
|
|
31
31
|
threads = Math.min(getNumCpu(), BarretenbergWasmMain.MAX_THREADS),
|
|
32
32
|
logger: (msg: string) => void = createDebugLogger('bb_wasm'),
|
|
33
33
|
initial = 32,
|
|
34
|
-
maximum =
|
|
34
|
+
maximum = this.getDefaultMaximumMemoryPages(),
|
|
35
35
|
) {
|
|
36
36
|
this.logger = logger;
|
|
37
37
|
|
|
@@ -63,6 +63,15 @@ export class BarretenbergWasmMain extends BarretenbergWasmBase {
|
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
|
|
66
|
+
private getDefaultMaximumMemoryPages(): number {
|
|
67
|
+
// iOS browser is very aggressive with memory. Check if running in browser and on iOS
|
|
68
|
+
// We at any rate expect the mobile iOS browser to kill us >=1GB, so we don't set a maximum higher than that.
|
|
69
|
+
if (typeof window !== 'undefined' && /iPad|iPhone/.test(navigator.userAgent)) {
|
|
70
|
+
return 2 ** 14;
|
|
71
|
+
}
|
|
72
|
+
return 2 ** 16;
|
|
73
|
+
}
|
|
74
|
+
|
|
66
75
|
/**
|
|
67
76
|
* Called on main thread. Signals child threads to gracefully exit.
|
|
68
77
|
*/
|
package/src/main.ts
CHANGED
|
@@ -148,6 +148,7 @@ export async function proveUltraHonk(
|
|
|
148
148
|
bytecodePath: string,
|
|
149
149
|
witnessPath: string,
|
|
150
150
|
crsPath: string,
|
|
151
|
+
vkPath: string,
|
|
151
152
|
outputPath: string,
|
|
152
153
|
options?: UltraHonkBackendOptions,
|
|
153
154
|
) {
|
|
@@ -166,7 +167,7 @@ export async function proveUltraHonk(
|
|
|
166
167
|
: options?.starknetZK
|
|
167
168
|
? api.acirProveUltraStarknetZkHonk.bind(api)
|
|
168
169
|
: api.acirProveUltraHonk.bind(api);
|
|
169
|
-
const proof = await acirProveUltraHonk(bytecode, witness);
|
|
170
|
+
const proof = await acirProveUltraHonk(bytecode, witness, new RawBuffer(readFileSync(vkPath)));
|
|
170
171
|
|
|
171
172
|
if (outputPath === '-') {
|
|
172
173
|
process.stdout.write(proof);
|
|
@@ -414,11 +415,12 @@ program
|
|
|
414
415
|
.description('Generate a proof and write it to a file.')
|
|
415
416
|
.option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
|
|
416
417
|
.option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
|
|
418
|
+
.option('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
|
|
417
419
|
.option('-o, --output-path <path>', 'Specify the proof output path', './proofs/proof')
|
|
418
|
-
.action(async ({ bytecodePath, witnessPath, outputPath }) => {
|
|
420
|
+
.action(async ({ bytecodePath, witnessPath, vkPath, outputPath }) => {
|
|
419
421
|
const { crsPath } = handleGlobalOptions();
|
|
420
|
-
debug(`Creating UltraHonk proof
|
|
421
|
-
await proveUltraHonk(bytecodePath, witnessPath, crsPath, outputPath);
|
|
422
|
+
debug(`Creating UltraHonk proof bytecodePath=${bytecodePath}, witnessPath=${witnessPath}, vkPath=${vkPath}`);
|
|
423
|
+
await proveUltraHonk(bytecodePath, witnessPath, crsPath, vkPath, outputPath);
|
|
422
424
|
});
|
|
423
425
|
|
|
424
426
|
program
|
|
@@ -426,22 +428,23 @@ program
|
|
|
426
428
|
.description('Generate a proof and write it to a file.')
|
|
427
429
|
.option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
|
|
428
430
|
.option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
|
|
431
|
+
.option('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
|
|
429
432
|
.option('-o, --output-path <path>', 'Specify the proof output path', './proofs/proof')
|
|
430
|
-
.action(async ({ bytecodePath, witnessPath, outputPath }) => {
|
|
433
|
+
.action(async ({ bytecodePath, witnessPath, vkPath, outputPath }) => {
|
|
431
434
|
const { crsPath } = handleGlobalOptions();
|
|
432
|
-
await proveUltraHonk(bytecodePath, witnessPath, crsPath, outputPath, { keccak: true });
|
|
435
|
+
await proveUltraHonk(bytecodePath, witnessPath, crsPath, vkPath, outputPath, { keccak: true });
|
|
433
436
|
});
|
|
434
437
|
|
|
435
438
|
program
|
|
436
439
|
.command('prove_ultra_starknet_honk')
|
|
437
440
|
.description('Generate a proof and write it to a file.')
|
|
438
441
|
.option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
|
|
439
|
-
.option('-r, --recursive', 'Create a SNARK friendly proof', false)
|
|
440
442
|
.option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
|
|
443
|
+
.option('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
|
|
441
444
|
.option('-o, --output-path <path>', 'Specify the proof output path', './proofs/proof')
|
|
442
|
-
.action(async ({ bytecodePath, witnessPath, outputPath }) => {
|
|
445
|
+
.action(async ({ bytecodePath, witnessPath, vkPath, outputPath }) => {
|
|
443
446
|
const { crsPath } = handleGlobalOptions();
|
|
444
|
-
await proveUltraHonk(bytecodePath, witnessPath, crsPath, outputPath, { starknet: true });
|
|
447
|
+
await proveUltraHonk(bytecodePath, witnessPath, crsPath, vkPath, outputPath, { starknet: true });
|
|
445
448
|
});
|
|
446
449
|
|
|
447
450
|
program
|
|
@@ -469,7 +472,6 @@ program
|
|
|
469
472
|
.command('write_vk_ultra_starknet_honk')
|
|
470
473
|
.description('Output verification key.')
|
|
471
474
|
.option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/program.json')
|
|
472
|
-
.option('-r, --recursive', 'Create a SNARK friendly proof', false)
|
|
473
475
|
.requiredOption('-o, --output-path <path>', 'Specify the path to write the key')
|
|
474
476
|
.action(async ({ bytecodePath, outputPath }) => {
|
|
475
477
|
const { crsPath } = handleGlobalOptions();
|
|
@@ -480,10 +482,10 @@ program
|
|
|
480
482
|
.command('verify_ultra_honk')
|
|
481
483
|
.description('Verify a proof. Process exists with success or failure code.')
|
|
482
484
|
.requiredOption('-p, --proof-path <path>', 'Specify the path to the proof')
|
|
483
|
-
.requiredOption('-k, --vk <path>', 'path to a verification key. avoids recomputation.')
|
|
484
|
-
.action(async ({ proofPath,
|
|
485
|
+
.requiredOption('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
|
|
486
|
+
.action(async ({ proofPath, vkPath }) => {
|
|
485
487
|
const { crsPath } = handleGlobalOptions();
|
|
486
|
-
const result = await verifyUltraHonk(proofPath,
|
|
488
|
+
const result = await verifyUltraHonk(proofPath, vkPath, crsPath);
|
|
487
489
|
process.exit(result ? 0 : 1);
|
|
488
490
|
});
|
|
489
491
|
|
|
@@ -491,10 +493,10 @@ program
|
|
|
491
493
|
.command('verify_ultra_keccak_honk')
|
|
492
494
|
.description('Verify a proof. Process exists with success or failure code.')
|
|
493
495
|
.requiredOption('-p, --proof-path <path>', 'Specify the path to the proof')
|
|
494
|
-
.requiredOption('-k, --vk <path>', 'path to a verification key. avoids recomputation.')
|
|
495
|
-
.action(async ({ proofPath,
|
|
496
|
+
.requiredOption('-k, --vk-path <path>', 'path to a verification key. avoids recomputation.')
|
|
497
|
+
.action(async ({ proofPath, vkPath }) => {
|
|
496
498
|
const { crsPath } = handleGlobalOptions();
|
|
497
|
-
const result = await verifyUltraHonk(proofPath,
|
|
499
|
+
const result = await verifyUltraHonk(proofPath, vkPath, crsPath, { keccak: true });
|
|
498
500
|
process.exit(result ? 0 : 1);
|
|
499
501
|
});
|
|
500
502
|
|