@aztec/bb.js 1.2.1 → 2.0.0-nightly.20250814
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 +1 -0
- package/dest/browser/barretenberg/backend.d.ts.map +1 -1
- package/dest/browser/barretenberg/backend.js +116 -108
- package/dest/browser/barretenberg/index.d.ts +13 -0
- package/dest/browser/barretenberg/index.d.ts.map +1 -1
- package/dest/browser/barretenberg/index.js +40 -2
- package/dest/browser/barretenberg/verifier.js +2 -2
- package/dest/browser/barretenberg_api/index.d.ts +2 -2
- package/dest/browser/barretenberg_api/index.d.ts.map +1 -1
- package/dest/browser/barretenberg_api/index.js +5 -5
- package/dest/browser/barretenberg_wasm/barretenberg_wasm_base/index.d.ts +1 -0
- package/dest/browser/barretenberg_wasm/barretenberg_wasm_base/index.d.ts.map +1 -1
- package/dest/browser/barretenberg_wasm/barretenberg_wasm_base/index.js +5 -4
- package/dest/browser/barretenberg_wasm/barretenberg_wasm_main/index.d.ts +2 -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 +17 -1
- package/dest/browser/barretenberg_wasm/barretenberg_wasm_thread/index.d.ts +1 -0
- package/dest/browser/barretenberg_wasm/barretenberg_wasm_thread/index.d.ts.map +1 -1
- 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/browser/cbind/generate.d.ts +5 -0
- package/dest/browser/cbind/generate.d.ts.map +1 -0
- package/dest/browser/cbind/generate.js +64 -0
- package/dest/browser/cbind/generated/api_types.d.ts +634 -0
- package/dest/browser/cbind/generated/api_types.d.ts.map +1 -0
- package/dest/browser/cbind/generated/api_types.js +851 -0
- package/dest/browser/cbind/generated/async.d.ts +23 -0
- package/dest/browser/cbind/generated/async.d.ts.map +1 -0
- package/dest/browser/cbind/generated/async.js +148 -0
- package/dest/browser/cbind/generated/native.d.ts +31 -0
- package/dest/browser/cbind/generated/native.d.ts.map +1 -0
- package/dest/browser/cbind/generated/native.js +234 -0
- package/dest/browser/cbind/generated/sync.d.ts +23 -0
- package/dest/browser/cbind/generated/sync.d.ts.map +1 -0
- package/dest/browser/cbind/generated/sync.js +133 -0
- package/dest/browser/cbind/schema_compiler.d.ts +70 -0
- package/dest/browser/cbind/schema_compiler.d.ts.map +1 -0
- package/dest/browser/cbind/schema_compiler.js +683 -0
- package/dest/browser/proof/index.d.ts +2 -0
- package/dest/browser/proof/index.d.ts.map +1 -1
- package/dest/browser/proof/index.js +3 -3
- package/dest/node/barretenberg/backend.d.ts +1 -0
- package/dest/node/barretenberg/backend.d.ts.map +1 -1
- package/dest/node/barretenberg/backend.js +116 -108
- package/dest/node/barretenberg/index.d.ts +13 -0
- package/dest/node/barretenberg/index.d.ts.map +1 -1
- package/dest/node/barretenberg/index.js +40 -2
- package/dest/node/barretenberg/verifier.js +2 -2
- package/dest/node/barretenberg_api/index.d.ts +2 -2
- package/dest/node/barretenberg_api/index.d.ts.map +1 -1
- package/dest/node/barretenberg_api/index.js +5 -5
- package/dest/node/barretenberg_wasm/barretenberg-threads.wasm.gz +0 -0
- package/dest/node/barretenberg_wasm/barretenberg_wasm_base/index.d.ts +1 -0
- package/dest/node/barretenberg_wasm/barretenberg_wasm_base/index.d.ts.map +1 -1
- package/dest/node/barretenberg_wasm/barretenberg_wasm_base/index.js +5 -4
- package/dest/node/barretenberg_wasm/barretenberg_wasm_main/index.d.ts +2 -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 +17 -1
- package/dest/node/barretenberg_wasm/barretenberg_wasm_thread/index.d.ts +1 -0
- package/dest/node/barretenberg_wasm/barretenberg_wasm_thread/index.d.ts.map +1 -1
- package/dest/node/cbind/generate.d.ts +5 -0
- package/dest/node/cbind/generate.d.ts.map +1 -0
- package/dest/node/cbind/generate.js +64 -0
- package/dest/node/cbind/generated/api_types.d.ts +634 -0
- package/dest/node/cbind/generated/api_types.d.ts.map +1 -0
- package/dest/node/cbind/generated/api_types.js +851 -0
- package/dest/node/cbind/generated/async.d.ts +23 -0
- package/dest/node/cbind/generated/async.d.ts.map +1 -0
- package/dest/node/cbind/generated/async.js +148 -0
- package/dest/node/cbind/generated/native.d.ts +31 -0
- package/dest/node/cbind/generated/native.d.ts.map +1 -0
- package/dest/node/cbind/generated/native.js +234 -0
- package/dest/node/cbind/generated/sync.d.ts +23 -0
- package/dest/node/cbind/generated/sync.d.ts.map +1 -0
- package/dest/node/cbind/generated/sync.js +133 -0
- package/dest/node/cbind/schema_compiler.d.ts +70 -0
- package/dest/node/cbind/schema_compiler.d.ts.map +1 -0
- package/dest/node/cbind/schema_compiler.js +683 -0
- package/dest/node/main.js +3 -3
- package/dest/node/proof/index.d.ts +2 -0
- package/dest/node/proof/index.d.ts.map +1 -1
- package/dest/node/proof/index.js +3 -3
- package/dest/node-cjs/barretenberg/backend.d.ts +1 -0
- package/dest/node-cjs/barretenberg/backend.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg/backend.js +117 -109
- package/dest/node-cjs/barretenberg/index.d.ts +13 -0
- package/dest/node-cjs/barretenberg/index.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg/index.js +40 -2
- package/dest/node-cjs/barretenberg/verifier.js +2 -2
- package/dest/node-cjs/barretenberg_api/index.d.ts +2 -2
- package/dest/node-cjs/barretenberg_api/index.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg_api/index.js +5 -5
- package/dest/node-cjs/barretenberg_wasm/barretenberg-threads.wasm.gz +0 -0
- package/dest/node-cjs/barretenberg_wasm/barretenberg_wasm_base/index.d.ts +1 -0
- package/dest/node-cjs/barretenberg_wasm/barretenberg_wasm_base/index.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg_wasm/barretenberg_wasm_base/index.js +5 -4
- package/dest/node-cjs/barretenberg_wasm/barretenberg_wasm_main/index.d.ts +2 -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 +17 -1
- package/dest/node-cjs/barretenberg_wasm/barretenberg_wasm_thread/index.d.ts +1 -0
- package/dest/node-cjs/barretenberg_wasm/barretenberg_wasm_thread/index.d.ts.map +1 -1
- package/dest/node-cjs/cbind/generate.d.ts +5 -0
- package/dest/node-cjs/cbind/generate.d.ts.map +1 -0
- package/dest/node-cjs/cbind/generate.js +66 -0
- package/dest/node-cjs/cbind/generated/api_types.d.ts +634 -0
- package/dest/node-cjs/cbind/generated/api_types.d.ts.map +1 -0
- package/dest/node-cjs/cbind/generated/api_types.js +925 -0
- package/dest/node-cjs/cbind/generated/async.d.ts +23 -0
- package/dest/node-cjs/cbind/generated/async.d.ts.map +1 -0
- package/dest/node-cjs/cbind/generated/async.js +152 -0
- package/dest/node-cjs/cbind/generated/native.d.ts +31 -0
- package/dest/node-cjs/cbind/generated/native.d.ts.map +1 -0
- package/dest/node-cjs/cbind/generated/native.js +238 -0
- package/dest/node-cjs/cbind/generated/sync.d.ts +23 -0
- package/dest/node-cjs/cbind/generated/sync.d.ts.map +1 -0
- package/dest/node-cjs/cbind/generated/sync.js +137 -0
- package/dest/node-cjs/cbind/schema_compiler.d.ts +70 -0
- package/dest/node-cjs/cbind/schema_compiler.d.ts.map +1 -0
- package/dest/node-cjs/cbind/schema_compiler.js +691 -0
- package/dest/node-cjs/main.js +3 -3
- package/dest/node-cjs/proof/index.d.ts +2 -0
- package/dest/node-cjs/proof/index.d.ts.map +1 -1
- package/dest/node-cjs/proof/index.js +3 -1
- package/package.json +4 -3
- package/src/barretenberg/backend.ts +129 -137
- package/src/barretenberg/index.ts +52 -1
- package/src/barretenberg/verifier.ts +1 -1
- package/src/barretenberg_api/index.ts +4 -4
- package/src/barretenberg_wasm/barretenberg_wasm_base/index.ts +5 -3
- package/src/barretenberg_wasm/barretenberg_wasm_main/index.ts +23 -0
- package/src/cbind/README.md +1 -0
- package/src/cbind/generate.ts +89 -0
- package/src/cbind/schema_compiler.ts +833 -0
- package/src/main.ts +2 -2
- package/src/proof/index.ts +2 -2
package/dest/node-cjs/main.js
CHANGED
|
@@ -148,7 +148,7 @@ async function proveUltraHonk(bytecodePath, witnessPath, crsPath, vkPath, output
|
|
|
148
148
|
? api.acirProveUltraStarknetHonk.bind(api)
|
|
149
149
|
: options?.starknetZK
|
|
150
150
|
? api.acirProveUltraStarknetZkHonk.bind(api)
|
|
151
|
-
: api.
|
|
151
|
+
: api.acirProveUltraZKHonk.bind(api);
|
|
152
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);
|
|
@@ -202,7 +202,7 @@ async function verifyUltraHonk(proofPath, vkPath, crsPath, options) {
|
|
|
202
202
|
? api.acirVerifyUltraStarknetHonk.bind(api)
|
|
203
203
|
: options?.starknetZK
|
|
204
204
|
? api.acirVerifyUltraStarknetZkHonk.bind(api)
|
|
205
|
-
: api.
|
|
205
|
+
: api.acirVerifyUltraZKHonk.bind(api);
|
|
206
206
|
const verified = await acirVerifyUltraHonk(Uint8Array.from((0, fs_1.readFileSync)(proofPath)), new index_js_1.RawBuffer((0, fs_1.readFileSync)(vkPath)));
|
|
207
207
|
debug(`Verification ${verified ? 'successful' : 'failed'}`);
|
|
208
208
|
return verified;
|
|
@@ -467,4 +467,4 @@ program
|
|
|
467
467
|
await vkAsFieldsUltraHonk(vkPath, outputPath, crsPath);
|
|
468
468
|
});
|
|
469
469
|
program.name('bb.js').parse(process.argv);
|
|
470
|
-
//# 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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"}
|
|
@@ -16,4 +16,6 @@ export declare function splitHonkProof(proofWithPublicInputs: Uint8Array, numPub
|
|
|
16
16
|
export declare function reconstructHonkProof(publicInputs: Uint8Array, proof: Uint8Array): Uint8Array;
|
|
17
17
|
export declare function deflattenFields(flattenedFields: Uint8Array): string[];
|
|
18
18
|
export declare function flattenFieldsAsArray(fields: string[]): Uint8Array;
|
|
19
|
+
export declare function uint8ArrayToHex(buffer: Uint8Array): string;
|
|
20
|
+
export declare function hexToUint8Array(hex: string): Uint8Array;
|
|
19
21
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/proof/index.ts"],"names":[],"mappings":"AAAA;;;KAGK;AACL,MAAM,MAAM,SAAS,GAAG;IACtB,4CAA4C;IAC5C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,wDAAwD;IACxD,KAAK,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAKtC,wBAAgB,cAAc,CAC5B,qBAAqB,EAAE,UAAU,EACjC,eAAe,EAAE,MAAM,GACtB;IAAE,YAAY,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,CAQjD;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAG5F;AAED,wBAAgB,eAAe,CAAC,eAAe,EAAE,UAAU,GAAG,MAAM,EAAE,CAUrE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAGjE"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/proof/index.ts"],"names":[],"mappings":"AAAA;;;KAGK;AACL,MAAM,MAAM,SAAS,GAAG;IACtB,4CAA4C;IAC5C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,wDAAwD;IACxD,KAAK,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAKtC,wBAAgB,cAAc,CAC5B,qBAAqB,EAAE,UAAU,EACjC,eAAe,EAAE,MAAM,GACtB;IAAE,YAAY,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,CAQjD;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAG5F;AAED,wBAAgB,eAAe,CAAC,eAAe,EAAE,UAAU,GAAG,MAAM,EAAE,CAUrE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAGjE;AAeD,wBAAgB,eAAe,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAY1D;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAevD"}
|
|
@@ -5,6 +5,8 @@ exports.splitHonkProof = splitHonkProof;
|
|
|
5
5
|
exports.reconstructHonkProof = reconstructHonkProof;
|
|
6
6
|
exports.deflattenFields = deflattenFields;
|
|
7
7
|
exports.flattenFieldsAsArray = flattenFieldsAsArray;
|
|
8
|
+
exports.uint8ArrayToHex = uint8ArrayToHex;
|
|
9
|
+
exports.hexToUint8Array = hexToUint8Array;
|
|
8
10
|
exports.PAIRING_POINTS_SIZE = 16;
|
|
9
11
|
// Fields are 32 bytes
|
|
10
12
|
const fieldByteSize = 32;
|
|
@@ -67,4 +69,4 @@ function hexToUint8Array(hex) {
|
|
|
67
69
|
}
|
|
68
70
|
return u8;
|
|
69
71
|
}
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvb2YvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBZ0JBLHdDQVdDO0FBRUQsb0RBR0M7QUFFRCwwQ0FVQztBQUVELG9EQUdDO0FBZUQsMENBWUM7QUFFRCwwQ0FlQztBQWxGWSxRQUFBLG1CQUFtQixHQUFHLEVBQUUsQ0FBQztBQUV0QyxzQkFBc0I7QUFDdEIsTUFBTSxhQUFhLEdBQUcsRUFBRSxDQUFDO0FBRXpCLFNBQWdCLGNBQWMsQ0FDNUIscUJBQWlDLEVBQ2pDLGVBQXVCO0lBRXZCLE1BQU0sWUFBWSxHQUFHLHFCQUFxQixDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsZUFBZSxHQUFHLGFBQWEsQ0FBQyxDQUFDO0lBQ3JGLE1BQU0sS0FBSyxHQUFHLHFCQUFxQixDQUFDLEtBQUssQ0FBQyxlQUFlLEdBQUcsYUFBYSxDQUFDLENBQUM7SUFFM0UsT0FBTztRQUNMLEtBQUs7UUFDTCxZQUFZO0tBQ2IsQ0FBQztBQUNKLENBQUM7QUFFRCxTQUFnQixvQkFBb0IsQ0FBQyxZQUF3QixFQUFFLEtBQWlCO0lBQzlFLE1BQU0scUJBQXFCLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsWUFBWSxFQUFFLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQztJQUMzRSxPQUFPLHFCQUFxQixDQUFDO0FBQy9CLENBQUM7QUFFRCxTQUFnQixlQUFlLENBQUMsZUFBMkI7SUFDekQsTUFBTSxlQUFlLEdBQUcsRUFBRSxDQUFDO0lBQzNCLE1BQU0sNEJBQTRCLEdBQWlCLEVBQUUsQ0FBQztJQUV0RCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsZUFBZSxDQUFDLE1BQU0sRUFBRSxDQUFDLElBQUksZUFBZSxFQUFFLENBQUM7UUFDakUsTUFBTSxXQUFXLEdBQUcsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxH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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": "
|
|
4
|
+
"version": "2.0.0-nightly.20250814",
|
|
5
5
|
"homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/barretenberg/ts",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"type": "module",
|
|
@@ -21,13 +21,14 @@
|
|
|
21
21
|
"README.md"
|
|
22
22
|
],
|
|
23
23
|
"scripts": {
|
|
24
|
-
"clean": "rm -rf ./dest .tsbuildinfo .tsbuildinfo.cjs",
|
|
25
|
-
"build": "yarn clean && yarn build:wasm && yarn build:esm && yarn build:cjs && yarn build:browser",
|
|
24
|
+
"clean": "rm -rf ./dest .tsbuildinfo .tsbuildinfo.cjs ./src/cbind/generated",
|
|
25
|
+
"build": "yarn clean && yarn generate && yarn build:wasm && yarn build:esm && yarn build:cjs && yarn build:browser",
|
|
26
26
|
"build:wasm": "./scripts/build_wasm.sh",
|
|
27
27
|
"build:esm": "tsc -b tsconfig.esm.json && chmod +x ./dest/node/main.js",
|
|
28
28
|
"build:cjs": "tsc -b tsconfig.cjs.json && ./scripts/cjs_postprocess.sh",
|
|
29
29
|
"build:browser": "tsc -b tsconfig.browser.json && ./scripts/browser_postprocess.sh",
|
|
30
30
|
"build:bindings": "cd .. && ./scripts/bindgen.sh",
|
|
31
|
+
"generate": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 ts-node src/cbind/generate.ts",
|
|
31
32
|
"formatting": "prettier --check ./src && eslint --max-warnings 0 ./src",
|
|
32
33
|
"formatting:fix": "prettier -w ./src",
|
|
33
34
|
"test": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests",
|
|
@@ -7,9 +7,13 @@ import {
|
|
|
7
7
|
reconstructHonkProof,
|
|
8
8
|
splitHonkProof,
|
|
9
9
|
PAIRING_POINTS_SIZE,
|
|
10
|
+
uint8ArrayToHex,
|
|
11
|
+
hexToUint8Array,
|
|
10
12
|
} from '../proof/index.js';
|
|
11
|
-
import {
|
|
13
|
+
import { fromClientIVCProof, toClientIVCProof } from '../cbind/generated/api_types.js';
|
|
12
14
|
import { ungzip } from 'pako';
|
|
15
|
+
import { Buffer } from 'buffer';
|
|
16
|
+
import { Decoder, Encoder } from 'msgpackr';
|
|
13
17
|
|
|
14
18
|
export class AztecClientBackendError extends Error {
|
|
15
19
|
constructor(message: string) {
|
|
@@ -17,23 +21,6 @@ export class AztecClientBackendError extends Error {
|
|
|
17
21
|
}
|
|
18
22
|
}
|
|
19
23
|
|
|
20
|
-
// Utility for parsing gate counts from buffer
|
|
21
|
-
// TODO: Where should this logic live? Should go away with move to msgpack.
|
|
22
|
-
function parseBigEndianU32Array(buffer: Uint8Array): number[] {
|
|
23
|
-
const dv = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
|
|
24
|
-
|
|
25
|
-
let offset = 0;
|
|
26
|
-
const count = buffer.byteLength >>> 2; // default is entire buffer length / 4
|
|
27
|
-
|
|
28
|
-
const out: number[] = new Array(count);
|
|
29
|
-
for (let i = 0; i < count; i++) {
|
|
30
|
-
out[i] = dv.getUint32(offset, false);
|
|
31
|
-
offset += 4;
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
return out;
|
|
35
|
-
}
|
|
36
|
-
|
|
37
24
|
/**
|
|
38
25
|
* Options for the UltraHonkBackend.
|
|
39
26
|
*/
|
|
@@ -83,94 +70,80 @@ export class UltraHonkBackend {
|
|
|
83
70
|
const honkRecursion = true;
|
|
84
71
|
await api.acirInitSRS(this.acirUncompressedBytecode, this.circuitOptions.recursive, honkRecursion);
|
|
85
72
|
|
|
86
|
-
// We don't init a proving key here in the Honk API
|
|
87
|
-
// await api.acirInitProvingKey(this.acirComposer, this.acirUncompressedBytecode);
|
|
88
73
|
this.api = api;
|
|
89
74
|
}
|
|
90
75
|
}
|
|
91
76
|
|
|
77
|
+
private getProofSettingsFromOptions(
|
|
78
|
+
options?: UltraHonkBackendOptions,
|
|
79
|
+
): { ipaAccumulation: boolean; oracleHashType: string; disableZk: boolean } {
|
|
80
|
+
return {
|
|
81
|
+
ipaAccumulation: false,
|
|
82
|
+
oracleHashType: options?.keccak || options?.keccakZK ? 'keccak' : (options?.starknet || options?.starknetZK ? 'starknet' : 'poseidon2'),
|
|
83
|
+
// TODO no current way to target non-zk poseidon2 hash
|
|
84
|
+
disableZk: options?.keccak || options?.starknet ? true : false,
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
|
|
92
88
|
async generateProof(compressedWitness: Uint8Array, options?: UltraHonkBackendOptions): Promise<ProofData> {
|
|
93
89
|
await this.instantiate();
|
|
94
90
|
|
|
95
|
-
|
|
96
|
-
const
|
|
97
|
-
|
|
98
|
-
:
|
|
99
|
-
|
|
100
|
-
:
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
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
|
-
);
|
|
124
|
-
|
|
125
|
-
// Item at index 1 in VK is the number of public inputs
|
|
126
|
-
const publicInputsSizeIndex = 1; // index into VK for numPublicInputs
|
|
127
|
-
const numPublicInputs = Number(vkAsFields[publicInputsSizeIndex].toString()) - PAIRING_POINTS_SIZE;
|
|
128
|
-
|
|
129
|
-
const { proof, publicInputs: publicInputsBytes } = splitHonkProof(proofWithPublicInputs, numPublicInputs);
|
|
130
|
-
const publicInputs = deflattenFields(publicInputsBytes);
|
|
131
|
-
|
|
132
|
-
return { proof, publicInputs };
|
|
91
|
+
const witness = ungzip(compressedWitness);
|
|
92
|
+
const { proof, publicInputs } = await this.api.circuitProve({
|
|
93
|
+
witness,
|
|
94
|
+
circuit: {
|
|
95
|
+
name: 'circuit',
|
|
96
|
+
bytecode: Buffer.from(this.acirUncompressedBytecode),
|
|
97
|
+
verificationKey: Buffer.from([]), // Empty VK - lower performance.
|
|
98
|
+
},
|
|
99
|
+
settings: this.getProofSettingsFromOptions(options)
|
|
100
|
+
});
|
|
101
|
+
console.log(`Generated proof for circuit with ${publicInputs.length} public inputs and ${proof.length} fields.`);
|
|
102
|
+
|
|
103
|
+
// We return ProofData as a flat buffer and an array of strings to match the current ProofData class.
|
|
104
|
+
const flatProof = new Uint8Array(proof.length * 32);
|
|
105
|
+
proof.forEach((fr, i) => {
|
|
106
|
+
flatProof.set(fr, i * 32);
|
|
107
|
+
});
|
|
108
|
+
|
|
109
|
+
return { proof: flatProof, publicInputs: publicInputs.map(uint8ArrayToHex) };
|
|
133
110
|
}
|
|
134
111
|
|
|
135
112
|
async verifyProof(proofData: ProofData, options?: UltraHonkBackendOptions): Promise<boolean> {
|
|
136
113
|
await this.instantiate();
|
|
137
114
|
|
|
138
|
-
const
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
:
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
: this.api.acirVerifyUltraHonk.bind(this.api);
|
|
158
|
-
|
|
159
|
-
const vkBuf = await writeVkUltraHonk(this.acirUncompressedBytecode);
|
|
160
|
-
return await verifyUltraHonk(proof, new RawBuffer(vkBuf));
|
|
115
|
+
const proofFrs: Uint8Array[] = [];
|
|
116
|
+
for (let i = 0; i < proofData.proof.length; i += 32) {
|
|
117
|
+
proofFrs.push(proofData.proof.slice(i, i + 32));
|
|
118
|
+
}
|
|
119
|
+
// TODO reconsider API - computing the VK at this point is not optimal
|
|
120
|
+
const vkResult = await this.api.circuitComputeVk({
|
|
121
|
+
circuit: {
|
|
122
|
+
name: 'circuit',
|
|
123
|
+
bytecode: this.acirUncompressedBytecode,
|
|
124
|
+
},
|
|
125
|
+
settings: this.getProofSettingsFromOptions(options),
|
|
126
|
+
});
|
|
127
|
+
const {verified} = await this.api.circuitVerify({
|
|
128
|
+
verificationKey: vkResult.bytes,
|
|
129
|
+
publicInputs: proofData.publicInputs.map(hexToUint8Array),
|
|
130
|
+
proof: proofFrs,
|
|
131
|
+
settings: this.getProofSettingsFromOptions(options),
|
|
132
|
+
});
|
|
133
|
+
return verified;
|
|
161
134
|
}
|
|
162
135
|
|
|
163
136
|
async getVerificationKey(options?: UltraHonkBackendOptions): Promise<Uint8Array> {
|
|
164
137
|
await this.instantiate();
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
:
|
|
168
|
-
|
|
169
|
-
:
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
138
|
+
|
|
139
|
+
const vkResult = await this.api.circuitComputeVk({
|
|
140
|
+
circuit: {
|
|
141
|
+
name: 'circuit',
|
|
142
|
+
bytecode: Buffer.from(this.acirUncompressedBytecode),
|
|
143
|
+
},
|
|
144
|
+
settings: this.getProofSettingsFromOptions(options),
|
|
145
|
+
});
|
|
146
|
+
return vkResult.bytes;
|
|
174
147
|
}
|
|
175
148
|
|
|
176
149
|
/** @description Returns a solidity verifier */
|
|
@@ -198,17 +171,22 @@ export class UltraHonkBackend {
|
|
|
198
171
|
|
|
199
172
|
// TODO: perhaps we should put this in the init function. Need to benchmark
|
|
200
173
|
// TODO how long it takes.
|
|
201
|
-
const
|
|
202
|
-
|
|
174
|
+
const vkResult = await this.api.circuitComputeVk({
|
|
175
|
+
circuit: {
|
|
176
|
+
name: 'circuit',
|
|
177
|
+
bytecode: Buffer.from(this.acirUncompressedBytecode),
|
|
178
|
+
},
|
|
179
|
+
settings: this.getProofSettingsFromOptions({}),
|
|
180
|
+
});
|
|
203
181
|
|
|
204
182
|
return {
|
|
205
183
|
// TODO(https://github.com/noir-lang/noir/issues/5661)
|
|
206
184
|
proofAsFields: [],
|
|
207
|
-
vkAsFields:
|
|
185
|
+
vkAsFields: vkResult.fields.map(field => field.toString()),
|
|
208
186
|
// We use an empty string for the vk hash here as it is unneeded as part of the recursive artifacts
|
|
209
187
|
// The user can be expected to hash the vk inside their circuit to check whether the vk is the circuit
|
|
210
188
|
// they expect
|
|
211
|
-
vkHash:
|
|
189
|
+
vkHash: uint8ArrayToHex(vkResult.hash)
|
|
212
190
|
};
|
|
213
191
|
}
|
|
214
192
|
|
|
@@ -219,39 +197,6 @@ export class UltraHonkBackend {
|
|
|
219
197
|
await this.api.destroy();
|
|
220
198
|
}
|
|
221
199
|
}
|
|
222
|
-
interface AztecClientExecutionStep {
|
|
223
|
-
functionName: string;
|
|
224
|
-
gateCount?: number;
|
|
225
|
-
// Note: not gzipped like in native code
|
|
226
|
-
bytecode: Uint8Array;
|
|
227
|
-
// Note: not gzipped like in native code. Already bincoded.
|
|
228
|
-
witness: Uint8Array;
|
|
229
|
-
/* TODO(https://github.com/AztecProtocol/barretenberg/issues/1328) this should get its own proper class. */
|
|
230
|
-
vk: Uint8Array;
|
|
231
|
-
}
|
|
232
|
-
|
|
233
|
-
function serializeAztecClientExecutionSteps(
|
|
234
|
-
acirBuf: Uint8Array[],
|
|
235
|
-
witnessBuf: Uint8Array[],
|
|
236
|
-
vksBuf: Uint8Array[],
|
|
237
|
-
): Uint8Array {
|
|
238
|
-
const steps: AztecClientExecutionStep[] = [];
|
|
239
|
-
for (let i = 0; i < acirBuf.length; i++) {
|
|
240
|
-
const bytecode = acirBuf[i];
|
|
241
|
-
// Witnesses are not provided at all for gates info.
|
|
242
|
-
const witness = witnessBuf[i] || Buffer.from([]);
|
|
243
|
-
// VKs are optional for proving (deprecated feature) or not provided at all for gates info.
|
|
244
|
-
const vk = vksBuf[i] || Buffer.from([]);
|
|
245
|
-
const functionName = `unknown_wasm_${i}`;
|
|
246
|
-
steps.push({
|
|
247
|
-
bytecode,
|
|
248
|
-
witness,
|
|
249
|
-
vk,
|
|
250
|
-
functionName,
|
|
251
|
-
});
|
|
252
|
-
}
|
|
253
|
-
return new Encoder({ useRecords: false }).pack(steps);
|
|
254
|
-
}
|
|
255
200
|
|
|
256
201
|
export class AztecClientBackend {
|
|
257
202
|
// These type assertions are used so that we don't
|
|
@@ -284,26 +229,73 @@ export class AztecClientBackend {
|
|
|
284
229
|
throw new AztecClientBackendError('Witness and VKs must have the same stack depth!');
|
|
285
230
|
}
|
|
286
231
|
await this.instantiate();
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
232
|
+
|
|
233
|
+
// Queue IVC start with the number of circuits
|
|
234
|
+
this.api.clientIvcStart({ numCircuits: this.acirBuf.length });
|
|
235
|
+
|
|
236
|
+
// Queue load and accumulate for each circuit
|
|
237
|
+
for (let i = 0; i < this.acirBuf.length; i++) {
|
|
238
|
+
const bytecode = this.acirBuf[i];
|
|
239
|
+
const witness = witnessBuf[i] || Buffer.from([]);
|
|
240
|
+
const vk = vksBuf[i] || Buffer.from([]);
|
|
241
|
+
const functionName = `unknown_wasm_${i}`;
|
|
242
|
+
|
|
243
|
+
// Load the circuit
|
|
244
|
+
this.api.clientIvcLoad({
|
|
245
|
+
circuit: {
|
|
246
|
+
name: functionName,
|
|
247
|
+
bytecode: Buffer.from(bytecode),
|
|
248
|
+
verificationKey: Buffer.from(vk),
|
|
249
|
+
}
|
|
250
|
+
});
|
|
251
|
+
|
|
252
|
+
// Accumulate with witness
|
|
253
|
+
this.api.clientIvcAccumulate({
|
|
254
|
+
witness: Buffer.from(witness),
|
|
255
|
+
});
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
// Generate the proof (and wait for all previous steps to finish)
|
|
259
|
+
const proveResult = await this.api.clientIvcProve({});
|
|
260
|
+
|
|
261
|
+
// The API currently expects a msgpack-encoded API.
|
|
262
|
+
const proof = new Encoder({useRecords: false}).encode(fromClientIVCProof(proveResult.proof));
|
|
263
|
+
// Generate the VK
|
|
264
|
+
const vkResult = await this.api.clientIvcComputeIvcVk({ circuit: {
|
|
265
|
+
name: 'tail',
|
|
266
|
+
bytecode: this.acirBuf[this.acirBuf.length - 1],
|
|
267
|
+
} });
|
|
268
|
+
|
|
269
|
+
// Note: Verification may not work correctly until we properly serialize the proof
|
|
270
|
+
if (!(await this.verify(proof, vkResult.bytes))) {
|
|
291
271
|
throw new AztecClientBackendError('Failed to verify the private (ClientIVC) transaction proof!');
|
|
292
272
|
}
|
|
293
|
-
return
|
|
273
|
+
return [proof, vkResult.bytes];
|
|
294
274
|
}
|
|
295
275
|
|
|
296
276
|
async verify(proof: Uint8Array, vk: Uint8Array): Promise<boolean> {
|
|
297
277
|
await this.instantiate();
|
|
298
|
-
|
|
278
|
+
const result = await this.api.clientIvcVerify({
|
|
279
|
+
proof: toClientIVCProof(new Decoder({useRecords: false}).decode(proof)),
|
|
280
|
+
vk: Buffer.from(vk),
|
|
281
|
+
});
|
|
282
|
+
return result.valid;
|
|
299
283
|
}
|
|
300
284
|
|
|
301
285
|
async gates(): Promise<number[]> {
|
|
302
|
-
// call function on API
|
|
303
286
|
await this.instantiate();
|
|
304
|
-
const
|
|
305
|
-
const
|
|
306
|
-
|
|
287
|
+
const circuitSizes: number[] = [];
|
|
288
|
+
for (const buf of this.acirBuf) {
|
|
289
|
+
const gates = await this.api.clientIvcStats({
|
|
290
|
+
circuit: {
|
|
291
|
+
name: 'circuit',
|
|
292
|
+
bytecode: buf,
|
|
293
|
+
},
|
|
294
|
+
includeGatesPerOpcode: false
|
|
295
|
+
});
|
|
296
|
+
circuitSizes.push(gates.circuitSize);
|
|
297
|
+
}
|
|
298
|
+
return circuitSizes;
|
|
307
299
|
}
|
|
308
300
|
|
|
309
301
|
async destroy(): Promise<void> {
|
|
@@ -7,6 +7,8 @@ import { Crs, GrumpkinCrs } from '../crs/index.js';
|
|
|
7
7
|
import { RawBuffer } from '../types/raw_buffer.js';
|
|
8
8
|
import { fetchModuleAndThreads } from '../barretenberg_wasm/index.js';
|
|
9
9
|
import { createDebugLogger } from '../log/index.js';
|
|
10
|
+
import { AsyncApi } from '../cbind/generated/async.js';
|
|
11
|
+
import { BbApiBase, CircuitComputeVk, CircuitProve, CircuitVerify, ClientIvcAccumulate, ClientIvcComputeIvcVk, ClientIvcStats, ClientIvcLoad, ClientIvcProve, ClientIvcStart, ClientIvcVerify, VkAsFields } from '../cbind/generated/api_types.js';
|
|
10
12
|
|
|
11
13
|
export { BarretenbergVerifier } from './verifier.js';
|
|
12
14
|
export { UltraHonkBackend, AztecClientBackend } from './backend.js';
|
|
@@ -39,6 +41,7 @@ export type CircuitOptions = {
|
|
|
39
41
|
*/
|
|
40
42
|
export class Barretenberg extends BarretenbergApi {
|
|
41
43
|
private options: BackendOptions;
|
|
44
|
+
private bbApi: BbApiBase;
|
|
42
45
|
|
|
43
46
|
private constructor(
|
|
44
47
|
private worker: any,
|
|
@@ -47,6 +50,7 @@ export class Barretenberg extends BarretenbergApi {
|
|
|
47
50
|
) {
|
|
48
51
|
super(wasm);
|
|
49
52
|
this.options = options;
|
|
53
|
+
this.bbApi = new AsyncApi(wasm);
|
|
50
54
|
}
|
|
51
55
|
|
|
52
56
|
/**
|
|
@@ -74,7 +78,8 @@ export class Barretenberg extends BarretenbergApi {
|
|
|
74
78
|
}
|
|
75
79
|
|
|
76
80
|
async initSRSForCircuitSize(circuitSize: number): Promise<void> {
|
|
77
|
-
const
|
|
81
|
+
const minSRSSize = 2 ** 9; // 2**9 is the dyadic size for the SmallSubgroupIPA MSM.
|
|
82
|
+
const crs = await Crs.new(Math.max(circuitSize, minSRSSize) + 1, this.options.crsPath, this.options.logger);
|
|
78
83
|
// TODO(https://github.com/AztecProtocol/barretenberg/issues/1129): Do slab allocator initialization?
|
|
79
84
|
// await this.commonInitSlabAllocator(circuitSize);
|
|
80
85
|
await this.srsInitSrs(new RawBuffer(crs.getG1Data()), crs.numPoints, new RawBuffer(crs.getG2Data()));
|
|
@@ -114,6 +119,52 @@ export class Barretenberg extends BarretenbergApi {
|
|
|
114
119
|
getWasm() {
|
|
115
120
|
return this.wasm;
|
|
116
121
|
}
|
|
122
|
+
|
|
123
|
+
// Wrap ClientIVC methods used by AztecClientBackend and UltraHonkBackend
|
|
124
|
+
async clientIvcStart(command: ClientIvcStart) {
|
|
125
|
+
return this.bbApi.clientIvcStart(command);
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
async clientIvcLoad(command: ClientIvcLoad) {
|
|
129
|
+
return this.bbApi.clientIvcLoad(command);
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
async clientIvcAccumulate(command: ClientIvcAccumulate) {
|
|
133
|
+
return this.bbApi.clientIvcAccumulate(command);
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
async clientIvcProve(command: ClientIvcProve) {
|
|
137
|
+
return this.bbApi.clientIvcProve(command);
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
async clientIvcVerify(command: ClientIvcVerify) {
|
|
141
|
+
return this.bbApi.clientIvcVerify(command);
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
async clientIvcComputeIvcVk(command: ClientIvcComputeIvcVk) {
|
|
145
|
+
return this.bbApi.clientIvcComputeIvcVk(command);
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
async clientIvcStats(command: ClientIvcStats) {
|
|
149
|
+
return this.bbApi.clientIvcStats(command);
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
// Wrap circuit methods used by BbApiUltraHonkBackend
|
|
153
|
+
async circuitProve(command: CircuitProve) {
|
|
154
|
+
return this.bbApi.circuitProve(command);
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
async circuitComputeVk(command: CircuitComputeVk) {
|
|
158
|
+
return this.bbApi.circuitComputeVk(command);
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
async circuitVerify(command: CircuitVerify) {
|
|
162
|
+
return this.bbApi.circuitVerify(command);
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
async vkAsFields(command: VkAsFields) {
|
|
166
|
+
return this.bbApi.vkAsFields(command);
|
|
167
|
+
}
|
|
117
168
|
}
|
|
118
169
|
|
|
119
170
|
let barretenbergSyncSingletonPromise: Promise<BarretenbergSync>;
|
|
@@ -31,7 +31,7 @@ export class BarretenbergVerifier {
|
|
|
31
31
|
await this.instantiate();
|
|
32
32
|
|
|
33
33
|
const proof = reconstructHonkProof(flattenFieldsAsArray(proofData.publicInputs), proofData.proof);
|
|
34
|
-
return await this.api.
|
|
34
|
+
return await this.api.acirVerifyUltraZKHonk(proof, new RawBuffer(verificationKey));
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
async destroy(): Promise<void> {
|