@aztec/bb.js 2.0.0-nightly.20250813 → 2.0.0-nightly.20250815
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 +77 -73
- package/dest/browser/barretenberg/index.d.ts +13 -9
- package/dest/browser/barretenberg/index.d.ts.map +1 -1
- package/dest/browser/barretenberg/index.js +20 -7
- 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/generated/api_types.d.ts +118 -260
- package/dest/browser/cbind/generated/api_types.d.ts.map +1 -1
- package/dest/browser/cbind/generated/api_types.js +148 -372
- package/dest/browser/cbind/generated/async.d.ts +4 -7
- package/dest/browser/cbind/generated/async.d.ts.map +1 -1
- package/dest/browser/cbind/generated/async.js +20 -47
- package/dest/browser/cbind/generated/native.d.ts +4 -7
- package/dest/browser/cbind/generated/native.d.ts.map +1 -1
- package/dest/browser/cbind/generated/native.js +20 -47
- package/dest/browser/cbind/generated/sync.d.ts +4 -7
- package/dest/browser/cbind/generated/sync.d.ts.map +1 -1
- package/dest/browser/cbind/generated/sync.js +19 -43
- package/dest/browser/cbind/schema_compiler.d.ts.map +1 -1
- package/dest/browser/cbind/schema_compiler.js +11 -11
- 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 +77 -73
- package/dest/node/barretenberg/index.d.ts +13 -9
- package/dest/node/barretenberg/index.d.ts.map +1 -1
- package/dest/node/barretenberg/index.js +20 -7
- package/dest/node/barretenberg_wasm/barretenberg-threads.wasm.gz +0 -0
- package/dest/node/cbind/generated/api_types.d.ts +118 -260
- package/dest/node/cbind/generated/api_types.d.ts.map +1 -1
- package/dest/node/cbind/generated/api_types.js +148 -372
- package/dest/node/cbind/generated/async.d.ts +4 -7
- package/dest/node/cbind/generated/async.d.ts.map +1 -1
- package/dest/node/cbind/generated/async.js +20 -47
- package/dest/node/cbind/generated/native.d.ts +4 -7
- package/dest/node/cbind/generated/native.d.ts.map +1 -1
- package/dest/node/cbind/generated/native.js +20 -47
- package/dest/node/cbind/generated/sync.d.ts +4 -7
- package/dest/node/cbind/generated/sync.d.ts.map +1 -1
- package/dest/node/cbind/generated/sync.js +19 -43
- package/dest/node/cbind/schema_compiler.d.ts.map +1 -1
- package/dest/node/cbind/schema_compiler.js +11 -11
- 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 +76 -72
- package/dest/node-cjs/barretenberg/index.d.ts +13 -9
- package/dest/node-cjs/barretenberg/index.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg/index.js +20 -7
- package/dest/node-cjs/barretenberg_wasm/barretenberg-threads.wasm.gz +0 -0
- package/dest/node-cjs/cbind/generated/api_types.d.ts +118 -260
- package/dest/node-cjs/cbind/generated/api_types.d.ts.map +1 -1
- package/dest/node-cjs/cbind/generated/api_types.js +158 -394
- package/dest/node-cjs/cbind/generated/async.d.ts +4 -7
- package/dest/node-cjs/cbind/generated/async.d.ts.map +1 -1
- package/dest/node-cjs/cbind/generated/async.js +19 -46
- package/dest/node-cjs/cbind/generated/native.d.ts +4 -7
- package/dest/node-cjs/cbind/generated/native.d.ts.map +1 -1
- package/dest/node-cjs/cbind/generated/native.js +19 -46
- package/dest/node-cjs/cbind/generated/sync.d.ts +4 -7
- package/dest/node-cjs/cbind/generated/sync.d.ts.map +1 -1
- package/dest/node-cjs/cbind/generated/sync.js +18 -42
- package/dest/node-cjs/cbind/schema_compiler.d.ts.map +1 -1
- package/dest/node-cjs/cbind/schema_compiler.js +11 -11
- 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 +1 -1
- package/src/barretenberg/backend.ts +84 -84
- package/src/barretenberg/index.ts +32 -14
- package/src/cbind/schema_compiler.ts +10 -9
- package/src/proof/index.ts +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema_compiler.d.ts","sourceRoot":"","sources":["../../../src/cbind/schema_compiler.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,MAAM,MAAM,MAAM,GACd,MAAM,GACN,YAAY,GACZ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,GACnB,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GACzB,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC,GACtB,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,GACpB,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC,GACrB,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GACxC,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,GACxB,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAC3B,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAEhC,MAAM,MAAM,YAAY,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAErD,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAGD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC5C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAkBD,qBAAa,cAAc;IAMb,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,SAAS,CAA+B;IAChD,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,eAAe,CAAqB;gBAExB,MAAM,EAAE,cAAc;IAE1C;;OAEG;IACH,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI;IA0BvE;;OAEG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ;
|
|
1
|
+
{"version":3,"file":"schema_compiler.d.ts","sourceRoot":"","sources":["../../../src/cbind/schema_compiler.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,MAAM,MAAM,MAAM,GACd,MAAM,GACN,YAAY,GACZ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,GACnB,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GACzB,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC,GACtB,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,GACpB,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC,GACrB,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GACxC,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,GACxB,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAC3B,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAEhC,MAAM,MAAM,YAAY,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAErD,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAGD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC5C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAkBD,qBAAa,cAAc;IAMb,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,SAAS,CAA+B;IAChD,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,eAAe,CAAqB;gBAExB,MAAM,EAAE,cAAc;IAE1C;;OAEG;IACH,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI;IA0BvE;;OAEG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ;IAgBvC;;OAEG;IACH,OAAO,IAAI,MAAM;IAgGjB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,gBAAgB;IAuCxB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,kBAAkB;IA8F1B,OAAO,CAAC,sBAAsB;IAmB9B,OAAO,CAAC,mBAAmB;IAiB3B,OAAO,CAAC,oBAAoB;IAkB5B,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,wBAAwB;IAWhC,OAAO,CAAC,gBAAgB;IAyBxB,OAAO,CAAC,kBAAkB;IAyB1B,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,eAAe;IAuCvB,OAAO,CAAC,0BAA0B;IAWlC,OAAO,CAAC,gBAAgB;IA8BxB,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,iBAAiB;IAuCzB,OAAO,CAAC,sBAAsB;CAqH/B;AAGD,wBAAgB,yBAAyB,IAAI,cAAc,CAK1D;AAED,wBAAgB,qBAAqB,IAAI,cAAc,CAQtD;AAED,wBAAgB,sBAAsB,IAAI,cAAc,CAQvD;AAED,wBAAgB,uBAAuB,IAAI,cAAc,CAQxD"}
|
|
@@ -59,8 +59,13 @@ class SchemaCompiler {
|
|
|
59
59
|
processSchema(schema) {
|
|
60
60
|
const key = this.getSchemaKey(schema);
|
|
61
61
|
if (this.typeCache.has(key)) {
|
|
62
|
-
|
|
62
|
+
const ret = this.typeCache.get(key);
|
|
63
|
+
if (ret.typeName === 'unknown') {
|
|
64
|
+
throw new Error(`Recursive schema detected at ${key}, please check your schema for circular references.`);
|
|
65
|
+
}
|
|
66
|
+
return ret;
|
|
63
67
|
}
|
|
68
|
+
this.typeCache.set(key, { typeName: 'unknown', msgpackTypeName: '' });
|
|
64
69
|
const typeInfo = this.generateTypeInfo(schema);
|
|
65
70
|
this.typeCache.set(key, typeInfo);
|
|
66
71
|
return typeInfo;
|
|
@@ -232,14 +237,7 @@ class SchemaCompiler {
|
|
|
232
237
|
const namedTypes = args[0];
|
|
233
238
|
const tupleTypes = [];
|
|
234
239
|
for (const [name, schemaOrName] of namedTypes) {
|
|
235
|
-
let typeInfo;
|
|
236
|
-
if (typeof schemaOrName === 'string') {
|
|
237
|
-
const typeName = pascalCase(schemaOrName);
|
|
238
|
-
typeInfo = this.getOrCreateEmptyType(typeName);
|
|
239
|
-
}
|
|
240
|
-
else {
|
|
241
|
-
typeInfo = this.processSchema(schemaOrName);
|
|
242
|
-
}
|
|
240
|
+
let typeInfo = this.processSchema(schemaOrName);
|
|
243
241
|
// Track usage of the type
|
|
244
242
|
this.trackTypeUsage(typeInfo.typeName);
|
|
245
243
|
tupleTypes.push(`["${name}", ${typeInfo.typeName}]`);
|
|
@@ -449,7 +447,9 @@ ${conversions}
|
|
|
449
447
|
neededImports.add('BbApiBase');
|
|
450
448
|
if (neededImports.size > 0) {
|
|
451
449
|
const sortedImports = Array.from(neededImports).sort();
|
|
452
|
-
|
|
450
|
+
// Remove duplicates
|
|
451
|
+
const uniqueImports = sortedImports.filter((item, index) => sortedImports.indexOf(item) === index);
|
|
452
|
+
imports.push(`import { ${uniqueImports.join(', ')} } from './api_types.js';`);
|
|
453
453
|
}
|
|
454
454
|
}
|
|
455
455
|
return imports;
|
|
@@ -688,4 +688,4 @@ function createNativeApiCompiler() {
|
|
|
688
688
|
],
|
|
689
689
|
});
|
|
690
690
|
}
|
|
691
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"schema_compiler.js","sourceRoot":"","sources":["../../../src/cbind/schema_compiler.ts"],"names":[],"mappings":"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"}
|
|
691
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"schema_compiler.js","sourceRoot":"","sources":["../../../src/cbind/schema_compiler.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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvb2YvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBZ0JBLHdDQVdDO0FBRUQsb0RBR0M7QUFFRCwwQ0FVQztBQUVELG9EQUdDO0FBZUQsMENBWUM7QUFFRCwwQ0FlQztBQWxGWSxRQUFBLG1CQUFtQixHQUFHLEVBQUUsQ0FBQztBQUV0QyxzQkFBc0I7QUFDdEIsTUFBTSxhQUFhLEdBQUcsRUFBRSxDQUFDO0FBRXpCLFNBQWdCLGNBQWMsQ0FDNUIscUJBQWlDLEVBQ2pDLGVBQXVCO0lBRXZCLE1BQU0sWUFBWSxHQUFHLHFCQUFxQixDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsZUFBZSxHQUFHLGFBQWEsQ0FBQyxDQUFDO0lBQ3JGLE1BQU0sS0FBSyxHQUFHLHFCQUFxQixDQUFDLEtBQUssQ0FBQyxlQUFlLEdBQUcsYUFBYSxDQUFDLENBQUM7SUFFM0UsT0FBTztRQUNMLEtBQUs7UUFDTCxZQUFZO0tBQ2IsQ0FBQztBQUNKLENBQUM7QUFFRCxTQUFnQixvQkFBb0IsQ0FBQyxZQUF3QixFQUFFLEtBQWlCO0lBQzlFLE1BQU0scUJBQXFCLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsWUFBWSxFQUFFLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQztJQUMzRSxPQUFPLHFCQUFxQixDQUFDO0FBQy9CLENBQUM7QUFFRCxTQUFnQixlQUFlLENBQUMsZUFBMkI7SUFDekQsTUFBTSxlQUFlLEdBQUcsRUFBRSxDQUFDO0lBQzNCLE1BQU0sNEJBQTRCLEdBQWlCLEVBQUUsQ0FBQztJQUV0RCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsZUFBZSxDQUFDLE1BQU0sRUFBRSxDQUFDLElBQUksZUFBZSxFQUFFLENBQUM7UUFDakUsTUFBTSxXQUFXLEdBQUcsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxHQUFHLGVBQWUsQ0FBQyxDQUFDO1FBQ2xFLDRCQUE0QixDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBRUQsT0FBTyw0QkFBNEIsQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLENBQUM7QUFDM0QsQ0FBQztBQUVELFNBQWdCLG9CQUFvQixDQUFDLE1BQWdCO0lBQ25ELE1BQU0scUJBQXFCLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUMxRCxPQUFPLGtCQUFrQixDQUFDLHFCQUFxQixDQUFDLENBQUM7QUFDbkQsQ0FBQztBQUVELFNBQVMsa0JBQWtCLENBQUMsTUFBb0I7SUFDOUMsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsRUFBRSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ3JFLE1BQU0sTUFBTSxHQUFHLElBQUksVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBRTNDLElBQUksTUFBTSxHQUFHLENBQUMsQ0FBQztJQUNmLEtBQUssTUFBTSxHQUFHLElBQUksTUFBTSxFQUFFLENBQUM7UUFDekIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDeEIsTUFBTSxJQUFJLEdBQUcsQ0FBQyxNQUFNLENBQUM7SUFDdkIsQ0FBQztJQUVELE9BQU8sTUFBTSxDQUFDO0FBQ2hCLENBQUM7QUFFRCxTQUFnQixlQUFlLENBQUMsTUFBa0I7SUFDaEQsTUFBTSxHQUFHLEdBQWEsRUFBRSxDQUFDO0lBRXpCLE1BQU0sQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDdkIsSUFBSSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQ2pCLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQyxDQUFDO1FBQ2QsQ0FBQztRQUNELEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDZCxDQUFDLENBQUMsQ0FBQztJQUVILE9BQU8sSUFBSSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7QUFDN0IsQ0FBQztBQUVELFNBQWdCLGVBQWUsQ0FBQyxHQUFXO0lBQ3pDLE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLEVBQUUsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUVoRSxNQUFNLEdBQUcsR0FBRyxZQUFZLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQztJQUNwQyxNQUFNLEVBQUUsR0FBRyxJQUFJLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUUvQixJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDVixJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDVixPQUFPLENBQUMsR0FBRyxHQUFHLEVBQUUsQ0FBQztRQUNmLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxRQUFRLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ25ELENBQUMsSUFBSSxDQUFDLENBQUM7UUFDUCxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ1QsQ0FBQztJQUVELE9BQU8sRUFBRSxDQUFDO0FBQ1osQ0FBQyJ9
|
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": "2.0.0-nightly.
|
|
4
|
+
"version": "2.0.0-nightly.20250815",
|
|
5
5
|
"homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/barretenberg/ts",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"type": "module",
|
|
@@ -7,6 +7,8 @@ import {
|
|
|
7
7
|
reconstructHonkProof,
|
|
8
8
|
splitHonkProof,
|
|
9
9
|
PAIRING_POINTS_SIZE,
|
|
10
|
+
uint8ArrayToHex,
|
|
11
|
+
hexToUint8Array,
|
|
10
12
|
} from '../proof/index.js';
|
|
11
13
|
import { fromClientIVCProof, toClientIVCProof } from '../cbind/generated/api_types.js';
|
|
12
14
|
import { ungzip } from 'pako';
|
|
@@ -68,94 +70,80 @@ export class UltraHonkBackend {
|
|
|
68
70
|
const honkRecursion = true;
|
|
69
71
|
await api.acirInitSRS(this.acirUncompressedBytecode, this.circuitOptions.recursive, honkRecursion);
|
|
70
72
|
|
|
71
|
-
// We don't init a proving key here in the Honk API
|
|
72
|
-
// await api.acirInitProvingKey(this.acirComposer, this.acirUncompressedBytecode);
|
|
73
73
|
this.api = api;
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
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
|
+
|
|
77
88
|
async generateProof(compressedWitness: Uint8Array, options?: UltraHonkBackendOptions): Promise<ProofData> {
|
|
78
89
|
await this.instantiate();
|
|
79
90
|
|
|
80
|
-
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
-
:
|
|
84
|
-
|
|
85
|
-
:
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
? this.api.acirProveUltraStarknetHonk.bind(this.api)
|
|
100
|
-
: options?.starknetZK
|
|
101
|
-
? this.api.acirProveUltraStarknetZkHonk.bind(this.api)
|
|
102
|
-
: this.api.acirProveUltraZKHonk.bind(this.api);
|
|
103
|
-
|
|
104
|
-
const proofWithPublicInputs = await proveUltraHonk(
|
|
105
|
-
this.acirUncompressedBytecode,
|
|
106
|
-
ungzip(compressedWitness),
|
|
107
|
-
new RawBuffer(vkBuf),
|
|
108
|
-
);
|
|
109
|
-
|
|
110
|
-
// Item at index 1 in VK is the number of public inputs
|
|
111
|
-
const publicInputsSizeIndex = 1; // index into VK for numPublicInputs
|
|
112
|
-
const numPublicInputs = Number(vkAsFields[publicInputsSizeIndex].toString()) - PAIRING_POINTS_SIZE;
|
|
113
|
-
|
|
114
|
-
const { proof, publicInputs: publicInputsBytes } = splitHonkProof(proofWithPublicInputs, numPublicInputs);
|
|
115
|
-
const publicInputs = deflattenFields(publicInputsBytes);
|
|
116
|
-
|
|
117
|
-
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) };
|
|
118
110
|
}
|
|
119
111
|
|
|
120
112
|
async verifyProof(proofData: ProofData, options?: UltraHonkBackendOptions): Promise<boolean> {
|
|
121
113
|
await this.instantiate();
|
|
122
114
|
|
|
123
|
-
const
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
:
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
: this.api.acirVerifyUltraZKHonk.bind(this.api);
|
|
143
|
-
|
|
144
|
-
const vkBuf = await writeVkUltraHonk(this.acirUncompressedBytecode);
|
|
145
|
-
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;
|
|
146
134
|
}
|
|
147
135
|
|
|
148
136
|
async getVerificationKey(options?: UltraHonkBackendOptions): Promise<Uint8Array> {
|
|
149
137
|
await this.instantiate();
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
:
|
|
153
|
-
|
|
154
|
-
:
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
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;
|
|
159
147
|
}
|
|
160
148
|
|
|
161
149
|
/** @description Returns a solidity verifier */
|
|
@@ -183,17 +171,22 @@ export class UltraHonkBackend {
|
|
|
183
171
|
|
|
184
172
|
// TODO: perhaps we should put this in the init function. Need to benchmark
|
|
185
173
|
// TODO how long it takes.
|
|
186
|
-
const
|
|
187
|
-
|
|
174
|
+
const vkResult = await this.api.circuitComputeVk({
|
|
175
|
+
circuit: {
|
|
176
|
+
name: 'circuit',
|
|
177
|
+
bytecode: Buffer.from(this.acirUncompressedBytecode),
|
|
178
|
+
},
|
|
179
|
+
settings: this.getProofSettingsFromOptions({}),
|
|
180
|
+
});
|
|
188
181
|
|
|
189
182
|
return {
|
|
190
183
|
// TODO(https://github.com/noir-lang/noir/issues/5661)
|
|
191
184
|
proofAsFields: [],
|
|
192
|
-
vkAsFields:
|
|
185
|
+
vkAsFields: vkResult.fields.map(field => field.toString()),
|
|
193
186
|
// We use an empty string for the vk hash here as it is unneeded as part of the recursive artifacts
|
|
194
187
|
// The user can be expected to hash the vk inside their circuit to check whether the vk is the circuit
|
|
195
188
|
// they expect
|
|
196
|
-
vkHash:
|
|
189
|
+
vkHash: uint8ArrayToHex(vkResult.hash)
|
|
197
190
|
};
|
|
198
191
|
}
|
|
199
192
|
|
|
@@ -238,7 +231,7 @@ export class AztecClientBackend {
|
|
|
238
231
|
await this.instantiate();
|
|
239
232
|
|
|
240
233
|
// Queue IVC start with the number of circuits
|
|
241
|
-
this.api.clientIvcStart({ numCircuits: this.acirBuf.length });
|
|
234
|
+
this.api.clientIvcStart({ numCircuits: this.acirBuf.length - 1 });
|
|
242
235
|
|
|
243
236
|
// Queue load and accumulate for each circuit
|
|
244
237
|
for (let i = 0; i < this.acirBuf.length; i++) {
|
|
@@ -255,13 +248,20 @@ export class AztecClientBackend {
|
|
|
255
248
|
verificationKey: Buffer.from(vk),
|
|
256
249
|
}
|
|
257
250
|
});
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
251
|
+
if (i != this.acirBuf.length-1){
|
|
252
|
+
// Accumulate with witness
|
|
253
|
+
this.api.clientIvcAccumulate({
|
|
254
|
+
witness: Buffer.from(witness),
|
|
255
|
+
});
|
|
256
|
+
} else{
|
|
257
|
+
this.api.clientIvcHidingKernel({
|
|
258
|
+
witness: Buffer.from(witness),
|
|
259
|
+
});
|
|
260
|
+
}
|
|
263
261
|
}
|
|
264
262
|
|
|
263
|
+
|
|
264
|
+
|
|
265
265
|
// Generate the proof (and wait for all previous steps to finish)
|
|
266
266
|
const proveResult = await this.api.clientIvcProve({});
|
|
267
267
|
|
|
@@ -269,7 +269,7 @@ export class AztecClientBackend {
|
|
|
269
269
|
const proof = new Encoder({useRecords: false}).encode(fromClientIVCProof(proveResult.proof));
|
|
270
270
|
// Generate the VK
|
|
271
271
|
const vkResult = await this.api.clientIvcComputeIvcVk({ circuit: {
|
|
272
|
-
name: '
|
|
272
|
+
name: 'hiding',
|
|
273
273
|
bytecode: this.acirBuf[this.acirBuf.length - 1],
|
|
274
274
|
} });
|
|
275
275
|
|
|
@@ -293,7 +293,7 @@ export class AztecClientBackend {
|
|
|
293
293
|
await this.instantiate();
|
|
294
294
|
const circuitSizes: number[] = [];
|
|
295
295
|
for (const buf of this.acirBuf) {
|
|
296
|
-
const gates = await this.api.
|
|
296
|
+
const gates = await this.api.clientIvcStats({
|
|
297
297
|
circuit: {
|
|
298
298
|
name: 'circuit',
|
|
299
299
|
bytecode: buf,
|
|
@@ -8,7 +8,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
10
|
import { AsyncApi } from '../cbind/generated/async.js';
|
|
11
|
-
import { BbApiBase } from '../cbind/generated/api_types.js';
|
|
11
|
+
import { BbApiBase, CircuitComputeVk, CircuitProve, CircuitVerify, ClientIvcAccumulate, ClientIvcComputeIvcVk, ClientIvcStats, ClientIvcLoad, ClientIvcProve, ClientIvcStart, ClientIvcVerify, VkAsFields, ClientIvcHidingKernel } from '../cbind/generated/api_types.js';
|
|
12
12
|
|
|
13
13
|
export { BarretenbergVerifier } from './verifier.js';
|
|
14
14
|
export { UltraHonkBackend, AztecClientBackend } from './backend.js';
|
|
@@ -120,37 +120,55 @@ export class Barretenberg extends BarretenbergApi {
|
|
|
120
120
|
return this.wasm;
|
|
121
121
|
}
|
|
122
122
|
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
// Wrap ClientIVC methods used by AztecClientBackend
|
|
128
|
-
async clientIvcStart(command: Parameters<BbApiBase['clientIvcStart']>[0]) {
|
|
123
|
+
// Wrap ClientIVC methods used by AztecClientBackend and UltraHonkBackend
|
|
124
|
+
async clientIvcStart(command: ClientIvcStart) {
|
|
129
125
|
return this.bbApi.clientIvcStart(command);
|
|
130
126
|
}
|
|
131
127
|
|
|
132
|
-
async clientIvcLoad(command:
|
|
128
|
+
async clientIvcLoad(command: ClientIvcLoad) {
|
|
133
129
|
return this.bbApi.clientIvcLoad(command);
|
|
134
130
|
}
|
|
135
131
|
|
|
136
|
-
async clientIvcAccumulate(command:
|
|
132
|
+
async clientIvcAccumulate(command: ClientIvcAccumulate) {
|
|
137
133
|
return this.bbApi.clientIvcAccumulate(command);
|
|
138
134
|
}
|
|
139
135
|
|
|
140
|
-
async
|
|
136
|
+
async clientIvcHidingKernel(command: ClientIvcHidingKernel) {
|
|
137
|
+
return this.bbApi.clientIvcHidingKernel(command);
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
|
|
141
|
+
async clientIvcProve(command: ClientIvcProve) {
|
|
141
142
|
return this.bbApi.clientIvcProve(command);
|
|
142
143
|
}
|
|
143
144
|
|
|
144
|
-
async clientIvcVerify(command:
|
|
145
|
+
async clientIvcVerify(command: ClientIvcVerify) {
|
|
145
146
|
return this.bbApi.clientIvcVerify(command);
|
|
146
147
|
}
|
|
147
148
|
|
|
148
|
-
async clientIvcComputeIvcVk(command:
|
|
149
|
+
async clientIvcComputeIvcVk(command: ClientIvcComputeIvcVk) {
|
|
149
150
|
return this.bbApi.clientIvcComputeIvcVk(command);
|
|
150
151
|
}
|
|
151
152
|
|
|
152
|
-
async
|
|
153
|
-
return this.bbApi.
|
|
153
|
+
async clientIvcStats(command: ClientIvcStats) {
|
|
154
|
+
return this.bbApi.clientIvcStats(command);
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
// Wrap circuit methods used by BbApiUltraHonkBackend
|
|
158
|
+
async circuitProve(command: CircuitProve) {
|
|
159
|
+
return this.bbApi.circuitProve(command);
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
async circuitComputeVk(command: CircuitComputeVk) {
|
|
163
|
+
return this.bbApi.circuitComputeVk(command);
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
async circuitVerify(command: CircuitVerify) {
|
|
167
|
+
return this.bbApi.circuitVerify(command);
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
async vkAsFields(command: VkAsFields) {
|
|
171
|
+
return this.bbApi.vkAsFields(command);
|
|
154
172
|
}
|
|
155
173
|
}
|
|
156
174
|
|
|
@@ -98,9 +98,14 @@ export class SchemaCompiler {
|
|
|
98
98
|
processSchema(schema: Schema): TypeInfo {
|
|
99
99
|
const key = this.getSchemaKey(schema);
|
|
100
100
|
if (this.typeCache.has(key)) {
|
|
101
|
-
|
|
101
|
+
const ret = this.typeCache.get(key)!;
|
|
102
|
+
if (ret.typeName === 'unknown') {
|
|
103
|
+
throw new Error(`Recursive schema detected at ${key}, please check your schema for circular references.`);
|
|
104
|
+
}
|
|
105
|
+
return ret;
|
|
102
106
|
}
|
|
103
107
|
|
|
108
|
+
this.typeCache.set(key, { typeName: 'unknown', msgpackTypeName: '' });
|
|
104
109
|
const typeInfo = this.generateTypeInfo(schema);
|
|
105
110
|
this.typeCache.set(key, typeInfo);
|
|
106
111
|
return typeInfo;
|
|
@@ -314,13 +319,7 @@ export class SchemaCompiler {
|
|
|
314
319
|
const tupleTypes: string[] = [];
|
|
315
320
|
|
|
316
321
|
for (const [name, schemaOrName] of namedTypes) {
|
|
317
|
-
let typeInfo
|
|
318
|
-
if (typeof schemaOrName === 'string') {
|
|
319
|
-
const typeName = pascalCase(schemaOrName);
|
|
320
|
-
typeInfo = this.getOrCreateEmptyType(typeName);
|
|
321
|
-
} else {
|
|
322
|
-
typeInfo = this.processSchema(schemaOrName);
|
|
323
|
-
}
|
|
322
|
+
let typeInfo = this.processSchema(schemaOrName);
|
|
324
323
|
// Track usage of the type
|
|
325
324
|
this.trackTypeUsage(typeInfo.typeName);
|
|
326
325
|
tupleTypes.push(`["${name}", ${typeInfo.typeName}]`);
|
|
@@ -570,7 +569,9 @@ ${conversions}
|
|
|
570
569
|
|
|
571
570
|
if (neededImports.size > 0) {
|
|
572
571
|
const sortedImports = Array.from(neededImports).sort();
|
|
573
|
-
|
|
572
|
+
// Remove duplicates
|
|
573
|
+
const uniqueImports = sortedImports.filter((item, index) => sortedImports.indexOf(item) === index);
|
|
574
|
+
imports.push(`import { ${uniqueImports.join(', ')} } from './api_types.js';`);
|
|
574
575
|
}
|
|
575
576
|
}
|
|
576
577
|
|
package/src/proof/index.ts
CHANGED
|
@@ -62,7 +62,7 @@ function flattenUint8Arrays(arrays: Uint8Array[]): Uint8Array {
|
|
|
62
62
|
return result;
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
-
function uint8ArrayToHex(buffer: Uint8Array): string {
|
|
65
|
+
export function uint8ArrayToHex(buffer: Uint8Array): string {
|
|
66
66
|
const hex: string[] = [];
|
|
67
67
|
|
|
68
68
|
buffer.forEach(function (i) {
|
|
@@ -76,7 +76,7 @@ function uint8ArrayToHex(buffer: Uint8Array): string {
|
|
|
76
76
|
return '0x' + hex.join('');
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
-
function hexToUint8Array(hex: string): Uint8Array {
|
|
79
|
+
export function hexToUint8Array(hex: string): Uint8Array {
|
|
80
80
|
const sanitisedHex = BigInt(hex).toString(16).padStart(64, '0');
|
|
81
81
|
|
|
82
82
|
const len = sanitisedHex.length / 2;
|