@aztec/bb.js 0.81.0 → 0.82.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/browser/barretenberg/backend.d.ts.map +1 -1
- package/dest/browser/barretenberg-threads.js +1 -1
- package/dest/browser/barretenberg.js +1 -1
- package/dest/browser/index.js +11 -25
- package/dest/browser/proof/index.d.ts.map +1 -1
- package/dest/node/barretenberg/backend.d.ts.map +1 -1
- package/dest/node/barretenberg/backend.js +7 -28
- package/dest/node/barretenberg_wasm/barretenberg-threads.wasm.gz +0 -0
- package/dest/node/proof/index.d.ts.map +1 -1
- package/dest/node/proof/index.js +11 -16
- package/dest/node-cjs/barretenberg/backend.d.ts.map +1 -1
- package/dest/node-cjs/barretenberg/backend.js +6 -27
- package/dest/node-cjs/barretenberg_wasm/barretenberg-threads.wasm.gz +0 -0
- package/dest/node-cjs/proof/index.d.ts.map +1 -1
- package/dest/node-cjs/proof/index.js +11 -16
- package/package.json +1 -1
- package/src/barretenberg/backend.ts +7 -38
- package/src/proof/index.ts +11 -16
package/dest/browser/index.js
CHANGED
|
@@ -8330,23 +8330,20 @@ var __webpack_exports__ = {};
|
|
|
8330
8330
|
};
|
|
8331
8331
|
}
|
|
8332
8332
|
}
|
|
8333
|
-
const
|
|
8333
|
+
const metadataOffset = 4;
|
|
8334
8334
|
const fieldByteSize = 32;
|
|
8335
8335
|
function splitHonkProof(proofWithPublicInputs, numPublicInputs) {
|
|
8336
|
-
const
|
|
8337
|
-
const
|
|
8338
|
-
const
|
|
8339
|
-
const proof = new Uint8Array([ ...proofStart, ...proofEnd ]);
|
|
8340
|
-
const publicInputs = proofWithPublicInputs.slice(serializedBufferSize, serializedBufferSize + publicInputsSplitIndex);
|
|
8336
|
+
const proofWithPI = proofWithPublicInputs.slice(metadataOffset);
|
|
8337
|
+
const publicInputs = proofWithPI.slice(0, numPublicInputs * fieldByteSize);
|
|
8338
|
+
const proof = proofWithPI.slice(numPublicInputs * fieldByteSize);
|
|
8341
8339
|
return {
|
|
8342
8340
|
proof,
|
|
8343
8341
|
publicInputs
|
|
8344
8342
|
};
|
|
8345
8343
|
}
|
|
8346
8344
|
function reconstructHonkProof(publicInputs, proof) {
|
|
8347
|
-
const
|
|
8348
|
-
const
|
|
8349
|
-
const proofWithPublicInputs = Uint8Array.from([ ...proofStart, ...publicInputs, ...proofEnd ]);
|
|
8345
|
+
const proofSize = numToUInt32BE((publicInputs.length + proof.length) / fieldByteSize);
|
|
8346
|
+
const proofWithPublicInputs = Uint8Array.from([ ...proofSize, ...publicInputs, ...proof ]);
|
|
8350
8347
|
return proofWithPublicInputs;
|
|
8351
8348
|
}
|
|
8352
8349
|
function reconstructUltraPlonkProof(proofData) {
|
|
@@ -10453,8 +10450,6 @@ var __webpack_exports__ = {};
|
|
|
10453
10450
|
await this.api.destroy();
|
|
10454
10451
|
}
|
|
10455
10452
|
}
|
|
10456
|
-
const backend_serializedBufferSize = 4;
|
|
10457
|
-
const backend_fieldByteSize = 32;
|
|
10458
10453
|
class UltraHonkBackend {
|
|
10459
10454
|
constructor(acirBytecode, backendOptions = {
|
|
10460
10455
|
threads: 1
|
|
@@ -10481,12 +10476,8 @@ var __webpack_exports__ = {};
|
|
|
10481
10476
|
const vk = await writeVKUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive);
|
|
10482
10477
|
const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new RawBuffer(vk));
|
|
10483
10478
|
const numPublicInputs = Number(vkAsFields[1].toString());
|
|
10484
|
-
const
|
|
10485
|
-
const
|
|
10486
|
-
const proofEnd = proofWithPublicInputs.slice(backend_serializedBufferSize + publicInputsSplitIndex);
|
|
10487
|
-
const proof = new Uint8Array([ ...proofStart, ...proofEnd ]);
|
|
10488
|
-
const publicInputsConcatenated = proofWithPublicInputs.slice(backend_serializedBufferSize, backend_serializedBufferSize + publicInputsSplitIndex);
|
|
10489
|
-
const publicInputs = deflattenFields(publicInputsConcatenated);
|
|
10479
|
+
const {proof, publicInputs: publicInputsBytes} = splitHonkProof(proofWithPublicInputs, numPublicInputs);
|
|
10480
|
+
const publicInputs = deflattenFields(publicInputsBytes);
|
|
10490
10481
|
return {
|
|
10491
10482
|
proof,
|
|
10492
10483
|
publicInputs
|
|
@@ -10499,17 +10490,12 @@ var __webpack_exports__ = {};
|
|
|
10499
10490
|
const writeVKUltraHonk = options?.keccak ? this.api.acirWriteVkUltraKeccakHonk.bind(this.api) : this.api.acirWriteVkUltraHonk.bind(this.api);
|
|
10500
10491
|
const vk = await writeVKUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive);
|
|
10501
10492
|
const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new RawBuffer(vk));
|
|
10502
|
-
const numSerdeHeaderBytes = 4;
|
|
10503
10493
|
const numKZGAccumulatorFieldElements = 16;
|
|
10504
10494
|
const publicInputsSizeIndex = 1;
|
|
10505
10495
|
const numPublicInputs = Number(vkAsFields[publicInputsSizeIndex].toString()) - numKZGAccumulatorFieldElements;
|
|
10506
|
-
const
|
|
10507
|
-
const
|
|
10508
|
-
|
|
10509
|
-
proofNoPIs.set(proofWithPublicInputs.subarray(numSerdeHeaderBytes + numPublicInputsBytes), numSerdeHeaderBytes);
|
|
10510
|
-
const proof = deflattenFields(proofNoPIs.slice(numSerdeHeaderBytes));
|
|
10511
|
-
const publicInputsConcatenated = proofWithPublicInputs.slice(backend_serializedBufferSize, backend_serializedBufferSize + numPublicInputsBytes);
|
|
10512
|
-
const publicInputs = deflattenFields(publicInputsConcatenated);
|
|
10496
|
+
const {proof: proofBytes, publicInputs: publicInputsBytes} = splitHonkProof(proofWithPublicInputs, numPublicInputs);
|
|
10497
|
+
const publicInputs = deflattenFields(publicInputsBytes);
|
|
10498
|
+
const proof = deflattenFields(proofBytes);
|
|
10513
10499
|
return {
|
|
10514
10500
|
proof,
|
|
10515
10501
|
publicInputs
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/proof/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/proof/index.ts"],"names":[],"mappings":"AAEA;;;KAGK;AACL,MAAM,MAAM,SAAS,GAAG;IACtB,4CAA4C;IAC5C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,wDAAwD;IACxD,KAAK,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF;;;KAGK;AACL,MAAM,MAAM,qBAAqB,GAAG;IAClC,4CAA4C;IAC5C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,wDAAwD;IACxD,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAMF,wBAAgB,cAAc,CAC5B,qBAAqB,EAAE,UAAU,EACjC,eAAe,EAAE,MAAM,GACtB;IAAE,YAAY,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,CAWjD;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAM5F;AAED,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,SAAS,GAAG,UAAU,CAQ3E;AAED,wBAAgB,eAAe,CAAC,eAAe,EAAE,UAAU,GAAG,MAAM,EAAE,CAUrE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAGjE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG1E,OAAO,EAGL,SAAS,EACT,qBAAqB,
|
|
1
|
+
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Barretenberg } from './index.js';
|
|
2
2
|
import { RawBuffer } from '../types/raw_buffer.js';
|
|
3
3
|
import { decompressSync as gunzip } from 'fflate';
|
|
4
|
-
import { deflattenFields, flattenFieldsAsArray, reconstructHonkProof, reconstructUltraPlonkProof, } from '../proof/index.js';
|
|
4
|
+
import { deflattenFields, flattenFieldsAsArray, reconstructHonkProof, reconstructUltraPlonkProof, splitHonkProof, } from '../proof/index.js';
|
|
5
5
|
export class AztecClientBackendError extends Error {
|
|
6
6
|
constructor(message) {
|
|
7
7
|
super(message);
|
|
@@ -96,9 +96,6 @@ export class UltraPlonkBackend {
|
|
|
96
96
|
await this.api.destroy();
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
|
-
// Buffers are prepended with their size. The size takes 4 bytes.
|
|
100
|
-
const serializedBufferSize = 4;
|
|
101
|
-
const fieldByteSize = 32;
|
|
102
99
|
export class UltraHonkBackend {
|
|
103
100
|
constructor(acirBytecode, backendOptions = { threads: 1 }, circuitOptions = { recursive: false }) {
|
|
104
101
|
this.backendOptions = backendOptions;
|
|
@@ -130,16 +127,8 @@ export class UltraHonkBackend {
|
|
|
130
127
|
const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new RawBuffer(vk));
|
|
131
128
|
// Item at index 1 in VK is the number of public inputs
|
|
132
129
|
const numPublicInputs = Number(vkAsFields[1].toString());
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
const proofStart = proofWithPublicInputs.slice(0, serializedBufferSize);
|
|
136
|
-
const publicInputsSplitIndex = numPublicInputs * fieldByteSize;
|
|
137
|
-
const proofEnd = proofWithPublicInputs.slice(serializedBufferSize + publicInputsSplitIndex);
|
|
138
|
-
// Construct the proof without the public inputs
|
|
139
|
-
const proof = new Uint8Array([...proofStart, ...proofEnd]);
|
|
140
|
-
// Fetch the number of public inputs out of the proof string
|
|
141
|
-
const publicInputsConcatenated = proofWithPublicInputs.slice(serializedBufferSize, serializedBufferSize + publicInputsSplitIndex);
|
|
142
|
-
const publicInputs = deflattenFields(publicInputsConcatenated);
|
|
130
|
+
const { proof, publicInputs: publicInputsBytes } = splitHonkProof(proofWithPublicInputs, numPublicInputs);
|
|
131
|
+
const publicInputs = deflattenFields(publicInputsBytes);
|
|
143
132
|
return { proof, publicInputs };
|
|
144
133
|
}
|
|
145
134
|
async generateProofForRecursiveAggregation(compressedWitness, options) {
|
|
@@ -154,23 +143,13 @@ export class UltraHonkBackend {
|
|
|
154
143
|
: this.api.acirWriteVkUltraHonk.bind(this.api);
|
|
155
144
|
const vk = await writeVKUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive);
|
|
156
145
|
const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new RawBuffer(vk));
|
|
157
|
-
// proofWithPublicInputs starts with a four-byte size
|
|
158
|
-
const numSerdeHeaderBytes = 4;
|
|
159
146
|
// some public inputs are handled specially
|
|
160
147
|
const numKZGAccumulatorFieldElements = 16;
|
|
161
148
|
const publicInputsSizeIndex = 1; // index into VK for numPublicInputs
|
|
162
149
|
const numPublicInputs = Number(vkAsFields[publicInputsSizeIndex].toString()) - numKZGAccumulatorFieldElements;
|
|
163
|
-
|
|
164
|
-
const
|
|
165
|
-
const
|
|
166
|
-
// copy the elements before the public inputs
|
|
167
|
-
proofNoPIs.set(proofWithPublicInputs.subarray(0, numSerdeHeaderBytes), 0);
|
|
168
|
-
// copy the elements after the public inputs
|
|
169
|
-
proofNoPIs.set(proofWithPublicInputs.subarray(numSerdeHeaderBytes + numPublicInputsBytes), numSerdeHeaderBytes);
|
|
170
|
-
const proof = deflattenFields(proofNoPIs.slice(numSerdeHeaderBytes));
|
|
171
|
-
// Fetch the number of public inputs out of the proof string
|
|
172
|
-
const publicInputsConcatenated = proofWithPublicInputs.slice(serializedBufferSize, serializedBufferSize + numPublicInputsBytes);
|
|
173
|
-
const publicInputs = deflattenFields(publicInputsConcatenated);
|
|
150
|
+
const { proof: proofBytes, publicInputs: publicInputsBytes } = splitHonkProof(proofWithPublicInputs, numPublicInputs);
|
|
151
|
+
const publicInputs = deflattenFields(publicInputsBytes);
|
|
152
|
+
const proof = deflattenFields(proofBytes);
|
|
174
153
|
return { proof, publicInputs };
|
|
175
154
|
}
|
|
176
155
|
async verifyProof(proofData, options) {
|
|
@@ -295,4 +274,4 @@ function base64Decode(input) {
|
|
|
295
274
|
throw new Error('No implementation found for base64 decoding.');
|
|
296
275
|
}
|
|
297
276
|
}
|
|
298
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"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"}
|
|
277
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/proof/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/proof/index.ts"],"names":[],"mappings":"AAEA;;;KAGK;AACL,MAAM,MAAM,SAAS,GAAG;IACtB,4CAA4C;IAC5C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,wDAAwD;IACxD,KAAK,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF;;;KAGK;AACL,MAAM,MAAM,qBAAqB,GAAG;IAClC,4CAA4C;IAC5C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,wDAAwD;IACxD,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAMF,wBAAgB,cAAc,CAC5B,qBAAqB,EAAE,UAAU,EACjC,eAAe,EAAE,MAAM,GACtB;IAAE,YAAY,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,CAWjD;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAM5F;AAED,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,SAAS,GAAG,UAAU,CAQ3E;AAED,wBAAgB,eAAe,CAAC,eAAe,EAAE,UAAU,GAAG,MAAM,EAAE,CAUrE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAGjE"}
|
package/dest/node/proof/index.js
CHANGED
|
@@ -1,26 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import { numToUInt32BE } from "../serialize/serialize.js";
|
|
2
|
+
// Honk proofs start with 4 bytes for the size of the proof in fields
|
|
3
|
+
const metadataOffset = 4;
|
|
3
4
|
const fieldByteSize = 32;
|
|
4
5
|
export function splitHonkProof(proofWithPublicInputs, numPublicInputs) {
|
|
5
|
-
//
|
|
6
|
-
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const proofEnd = proofWithPublicInputs.slice(serializedBufferSize + publicInputsSplitIndex);
|
|
10
|
-
// Construct the proof without the public inputs
|
|
11
|
-
const proof = new Uint8Array([...proofStart, ...proofEnd]);
|
|
12
|
-
// Fetch the number of public inputs out of the proof string
|
|
13
|
-
const publicInputs = proofWithPublicInputs.slice(serializedBufferSize, serializedBufferSize + publicInputsSplitIndex);
|
|
6
|
+
// Remove the metadata (proof size in fields)
|
|
7
|
+
const proofWithPI = proofWithPublicInputs.slice(metadataOffset);
|
|
8
|
+
const publicInputs = proofWithPI.slice(0, numPublicInputs * fieldByteSize);
|
|
9
|
+
const proof = proofWithPI.slice(numPublicInputs * fieldByteSize);
|
|
14
10
|
return {
|
|
15
11
|
proof,
|
|
16
12
|
publicInputs,
|
|
17
13
|
};
|
|
18
14
|
}
|
|
19
15
|
export function reconstructHonkProof(publicInputs, proof) {
|
|
20
|
-
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
const proofWithPublicInputs = Uint8Array.from([...proofStart, ...publicInputs, ...proofEnd]);
|
|
16
|
+
// Append proofWithPublicInputs size in fields
|
|
17
|
+
const proofSize = numToUInt32BE((publicInputs.length + proof.length) / fieldByteSize);
|
|
18
|
+
const proofWithPublicInputs = Uint8Array.from([...proofSize, ...publicInputs, ...proof]);
|
|
24
19
|
return proofWithPublicInputs;
|
|
25
20
|
}
|
|
26
21
|
export function reconstructUltraPlonkProof(proofData) {
|
|
@@ -77,4 +72,4 @@ function hexToUint8Array(hex) {
|
|
|
77
72
|
}
|
|
78
73
|
return u8;
|
|
79
74
|
}
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvb2YvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBd0IxRCxxRUFBcUU7QUFDckUsTUFBTSxjQUFjLEdBQUcsQ0FBQyxDQUFDO0FBQ3pCLE1BQU0sYUFBYSxHQUFHLEVBQUUsQ0FBQztBQUV6QixNQUFNLFVBQVUsY0FBYyxDQUM1QixxQkFBaUMsRUFDakMsZUFBdUI7SUFFdkIsNkNBQTZDO0lBQzdDLE1BQU0sV0FBVyxHQUFHLHFCQUFxQixDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUVoRSxNQUFNLFlBQVksR0FBRyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxlQUFlLEdBQUcsYUFBYSxDQUFDLENBQUM7SUFDM0UsTUFBTSxLQUFLLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQyxlQUFlLEdBQUcsYUFBYSxDQUFDLENBQUM7SUFFakUsT0FBTztRQUNMLEtBQUs7UUFDTCxZQUFZO0tBQ2IsQ0FBQztBQUNKLENBQUM7QUFFRCxNQUFNLFVBQVUsb0JBQW9CLENBQUMsWUFBd0IsRUFBRSxLQUFpQjtJQUM5RSw4Q0FBOEM7SUFDOUMsTUFBTSxTQUFTLEdBQUcsYUFBYSxDQUFDLENBQUMsWUFBWSxDQUFDLE1BQU0sR0FBRyxLQUFLLENBQUMsTUFBTSxDQUFDLEdBQUcsYUFBYSxDQUFDLENBQUM7SUFFdEYsTUFBTSxxQkFBcUIsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxTQUFTLEVBQUUsR0FBRyxZQUFZLEVBQUUsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBQ3pGLE9BQU8scUJBQXFCLENBQUM7QUFDL0IsQ0FBQztBQUVELE1BQU0sVUFBVSwwQkFBMEIsQ0FBQyxTQUFvQjtJQUM3RCx1QkFBdUI7SUFDdkIsTUFBTSx3QkFBd0IsR0FBRyxv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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG1E,OAAO,EAGL,SAAS,EACT,qBAAqB,
|
|
1
|
+
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"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"}
|
|
@@ -101,9 +101,6 @@ class UltraPlonkBackend {
|
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
103
|
exports.UltraPlonkBackend = UltraPlonkBackend;
|
|
104
|
-
// Buffers are prepended with their size. The size takes 4 bytes.
|
|
105
|
-
const serializedBufferSize = 4;
|
|
106
|
-
const fieldByteSize = 32;
|
|
107
104
|
class UltraHonkBackend {
|
|
108
105
|
constructor(acirBytecode, backendOptions = { threads: 1 }, circuitOptions = { recursive: false }) {
|
|
109
106
|
this.backendOptions = backendOptions;
|
|
@@ -135,16 +132,8 @@ class UltraHonkBackend {
|
|
|
135
132
|
const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new raw_buffer_js_1.RawBuffer(vk));
|
|
136
133
|
// Item at index 1 in VK is the number of public inputs
|
|
137
134
|
const numPublicInputs = Number(vkAsFields[1].toString());
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
const proofStart = proofWithPublicInputs.slice(0, serializedBufferSize);
|
|
141
|
-
const publicInputsSplitIndex = numPublicInputs * fieldByteSize;
|
|
142
|
-
const proofEnd = proofWithPublicInputs.slice(serializedBufferSize + publicInputsSplitIndex);
|
|
143
|
-
// Construct the proof without the public inputs
|
|
144
|
-
const proof = new Uint8Array([...proofStart, ...proofEnd]);
|
|
145
|
-
// Fetch the number of public inputs out of the proof string
|
|
146
|
-
const publicInputsConcatenated = proofWithPublicInputs.slice(serializedBufferSize, serializedBufferSize + publicInputsSplitIndex);
|
|
147
|
-
const publicInputs = (0, index_js_2.deflattenFields)(publicInputsConcatenated);
|
|
135
|
+
const { proof, publicInputs: publicInputsBytes } = (0, index_js_2.splitHonkProof)(proofWithPublicInputs, numPublicInputs);
|
|
136
|
+
const publicInputs = (0, index_js_2.deflattenFields)(publicInputsBytes);
|
|
148
137
|
return { proof, publicInputs };
|
|
149
138
|
}
|
|
150
139
|
async generateProofForRecursiveAggregation(compressedWitness, options) {
|
|
@@ -159,23 +148,13 @@ class UltraHonkBackend {
|
|
|
159
148
|
: this.api.acirWriteVkUltraHonk.bind(this.api);
|
|
160
149
|
const vk = await writeVKUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive);
|
|
161
150
|
const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new raw_buffer_js_1.RawBuffer(vk));
|
|
162
|
-
// proofWithPublicInputs starts with a four-byte size
|
|
163
|
-
const numSerdeHeaderBytes = 4;
|
|
164
151
|
// some public inputs are handled specially
|
|
165
152
|
const numKZGAccumulatorFieldElements = 16;
|
|
166
153
|
const publicInputsSizeIndex = 1; // index into VK for numPublicInputs
|
|
167
154
|
const numPublicInputs = Number(vkAsFields[publicInputsSizeIndex].toString()) - numKZGAccumulatorFieldElements;
|
|
168
|
-
|
|
169
|
-
const
|
|
170
|
-
const
|
|
171
|
-
// copy the elements before the public inputs
|
|
172
|
-
proofNoPIs.set(proofWithPublicInputs.subarray(0, numSerdeHeaderBytes), 0);
|
|
173
|
-
// copy the elements after the public inputs
|
|
174
|
-
proofNoPIs.set(proofWithPublicInputs.subarray(numSerdeHeaderBytes + numPublicInputsBytes), numSerdeHeaderBytes);
|
|
175
|
-
const proof = (0, index_js_2.deflattenFields)(proofNoPIs.slice(numSerdeHeaderBytes));
|
|
176
|
-
// Fetch the number of public inputs out of the proof string
|
|
177
|
-
const publicInputsConcatenated = proofWithPublicInputs.slice(serializedBufferSize, serializedBufferSize + numPublicInputsBytes);
|
|
178
|
-
const publicInputs = (0, index_js_2.deflattenFields)(publicInputsConcatenated);
|
|
155
|
+
const { proof: proofBytes, publicInputs: publicInputsBytes } = (0, index_js_2.splitHonkProof)(proofWithPublicInputs, numPublicInputs);
|
|
156
|
+
const publicInputs = (0, index_js_2.deflattenFields)(publicInputsBytes);
|
|
157
|
+
const proof = (0, index_js_2.deflattenFields)(proofBytes);
|
|
179
158
|
return { proof, publicInputs };
|
|
180
159
|
}
|
|
181
160
|
async verifyProof(proofData, options) {
|
|
@@ -302,4 +281,4 @@ function base64Decode(input) {
|
|
|
302
281
|
throw new Error('No implementation found for base64 decoding.');
|
|
303
282
|
}
|
|
304
283
|
}
|
|
305
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"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"}
|
|
284
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/proof/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/proof/index.ts"],"names":[],"mappings":"AAEA;;;KAGK;AACL,MAAM,MAAM,SAAS,GAAG;IACtB,4CAA4C;IAC5C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,wDAAwD;IACxD,KAAK,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF;;;KAGK;AACL,MAAM,MAAM,qBAAqB,GAAG;IAClC,4CAA4C;IAC5C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,wDAAwD;IACxD,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAMF,wBAAgB,cAAc,CAC5B,qBAAqB,EAAE,UAAU,EACjC,eAAe,EAAE,MAAM,GACtB;IAAE,YAAY,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,CAWjD;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAM5F;AAED,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,SAAS,GAAG,UAAU,CAQ3E;AAED,wBAAgB,eAAe,CAAC,eAAe,EAAE,UAAU,GAAG,MAAM,EAAE,CAUrE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAGjE"}
|
|
@@ -1,19 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.flattenFieldsAsArray = exports.deflattenFields = exports.reconstructUltraPlonkProof = exports.reconstructHonkProof = exports.splitHonkProof = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
const serialize_js_1 = require("../serialize/serialize.js");
|
|
5
|
+
// Honk proofs start with 4 bytes for the size of the proof in fields
|
|
6
|
+
const metadataOffset = 4;
|
|
6
7
|
const fieldByteSize = 32;
|
|
7
8
|
function splitHonkProof(proofWithPublicInputs, numPublicInputs) {
|
|
8
|
-
//
|
|
9
|
-
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
const proofEnd = proofWithPublicInputs.slice(serializedBufferSize + publicInputsSplitIndex);
|
|
13
|
-
// Construct the proof without the public inputs
|
|
14
|
-
const proof = new Uint8Array([...proofStart, ...proofEnd]);
|
|
15
|
-
// Fetch the number of public inputs out of the proof string
|
|
16
|
-
const publicInputs = proofWithPublicInputs.slice(serializedBufferSize, serializedBufferSize + publicInputsSplitIndex);
|
|
9
|
+
// Remove the metadata (proof size in fields)
|
|
10
|
+
const proofWithPI = proofWithPublicInputs.slice(metadataOffset);
|
|
11
|
+
const publicInputs = proofWithPI.slice(0, numPublicInputs * fieldByteSize);
|
|
12
|
+
const proof = proofWithPI.slice(numPublicInputs * fieldByteSize);
|
|
17
13
|
return {
|
|
18
14
|
proof,
|
|
19
15
|
publicInputs,
|
|
@@ -21,10 +17,9 @@ function splitHonkProof(proofWithPublicInputs, numPublicInputs) {
|
|
|
21
17
|
}
|
|
22
18
|
exports.splitHonkProof = splitHonkProof;
|
|
23
19
|
function reconstructHonkProof(publicInputs, proof) {
|
|
24
|
-
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
-
const proofWithPublicInputs = Uint8Array.from([...proofStart, ...publicInputs, ...proofEnd]);
|
|
20
|
+
// Append proofWithPublicInputs size in fields
|
|
21
|
+
const proofSize = (0, serialize_js_1.numToUInt32BE)((publicInputs.length + proof.length) / fieldByteSize);
|
|
22
|
+
const proofWithPublicInputs = Uint8Array.from([...proofSize, ...publicInputs, ...proof]);
|
|
28
23
|
return proofWithPublicInputs;
|
|
29
24
|
}
|
|
30
25
|
exports.reconstructHonkProof = reconstructHonkProof;
|
|
@@ -85,4 +80,4 @@ function hexToUint8Array(hex) {
|
|
|
85
80
|
}
|
|
86
81
|
return u8;
|
|
87
82
|
}
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvb2YvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNERBQTBEO0FBd0IxRCxxRUFBcUU7QUFDckUsTUFBTSxjQUFjLEdBQUcsQ0FBQyxDQUFDO0FBQ3pCLE1BQU0sYUFBYSxHQUFHLEVBQUUsQ0FBQztBQUV6QixTQUFnQixjQUFjLENBQzVCLHFCQUFpQyxFQUNqQyxlQUF1QjtJQUV2Qiw2Q0FBNkM7SUFDN0MsTUFBTSxXQUFXLEdBQUcscUJBQXFCLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBRWhFLE1BQU0sWUFBWSxHQUFHLFdBQVcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLGVBQWUsR0FBRyxhQUFhLENBQUMsQ0FBQztJQUMzRSxNQUFNLEtBQUssR0FBRyxXQUFXLENBQUMsS0FBSyxDQUFDLGVBQWUsR0FBRyxhQUFhLENBQUMsQ0FBQztJQUVqRSxPQUFPO1FBQ0wsS0FBSztRQUNMLFlBQVk7S0FDYixDQUFDO0FBQ0osQ0FBQztBQWRELHdDQWNDO0FBRUQsU0FBZ0Isb0JBQW9CLENBQUMsWUFBd0IsRUFBRSxLQUFpQjtJQUM5RSw4Q0FBOEM7SUFDOUMsTUFBTSxTQUFTLEdBQUcsSUFBQSw0QkFBYSxFQUFDLENBQUMsWUFBWSxDQUFDLE1BQU0sR0FBRyxLQUFLLENBQUMsTUFBTSxDQUFDLEdBQUcsYUFBYSxDQUFDLENBQUM7SUFFdEYsTUFBTSxxQkFBcUIsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxTQUFTLEVBQUUsR0FBRyxZQUFZLEVBQUUsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBQ3pGLE9BQU8scUJBQXFCLENBQUM7QUFDL0IsQ0FBQztBQU5ELG9EQU1DO0FBRUQsU0FBZ0IsMEJBQTBCLENBQUMsU0FBb0I7SUFDN0QsdUJBQXVCO0lBQ3ZCLE1BQU0sd0JBQXdCLEdBQUcsb0JBQW9CLENBQUMs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
|
package/package.json
CHANGED
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
ProofDataForRecursion,
|
|
9
9
|
reconstructHonkProof,
|
|
10
10
|
reconstructUltraPlonkProof,
|
|
11
|
+
splitHonkProof,
|
|
11
12
|
} from '../proof/index.js';
|
|
12
13
|
|
|
13
14
|
export class AztecClientBackendError extends Error {
|
|
@@ -154,10 +155,6 @@ export class UltraPlonkBackend {
|
|
|
154
155
|
}
|
|
155
156
|
}
|
|
156
157
|
|
|
157
|
-
// Buffers are prepended with their size. The size takes 4 bytes.
|
|
158
|
-
const serializedBufferSize = 4;
|
|
159
|
-
const fieldByteSize = 32;
|
|
160
|
-
|
|
161
158
|
/**
|
|
162
159
|
* Options for the UltraHonkBackend.
|
|
163
160
|
*/
|
|
@@ -222,22 +219,8 @@ export class UltraHonkBackend {
|
|
|
222
219
|
// Item at index 1 in VK is the number of public inputs
|
|
223
220
|
const numPublicInputs = Number(vkAsFields[1].toString());
|
|
224
221
|
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
// Get the part before and after the public inputs
|
|
228
|
-
const proofStart = proofWithPublicInputs.slice(0, serializedBufferSize);
|
|
229
|
-
const publicInputsSplitIndex = numPublicInputs * fieldByteSize;
|
|
230
|
-
const proofEnd = proofWithPublicInputs.slice(serializedBufferSize + publicInputsSplitIndex);
|
|
231
|
-
|
|
232
|
-
// Construct the proof without the public inputs
|
|
233
|
-
const proof = new Uint8Array([...proofStart, ...proofEnd]);
|
|
234
|
-
|
|
235
|
-
// Fetch the number of public inputs out of the proof string
|
|
236
|
-
const publicInputsConcatenated = proofWithPublicInputs.slice(
|
|
237
|
-
serializedBufferSize,
|
|
238
|
-
serializedBufferSize + publicInputsSplitIndex,
|
|
239
|
-
);
|
|
240
|
-
const publicInputs = deflattenFields(publicInputsConcatenated);
|
|
222
|
+
const { proof, publicInputs: publicInputsBytes } = splitHonkProof(proofWithPublicInputs, numPublicInputs);
|
|
223
|
+
const publicInputs = deflattenFields(publicInputsBytes);
|
|
241
224
|
|
|
242
225
|
return { proof, publicInputs };
|
|
243
226
|
}
|
|
@@ -265,29 +248,15 @@ export class UltraHonkBackend {
|
|
|
265
248
|
const vk = await writeVKUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive);
|
|
266
249
|
const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new RawBuffer(vk));
|
|
267
250
|
|
|
268
|
-
// proofWithPublicInputs starts with a four-byte size
|
|
269
|
-
const numSerdeHeaderBytes = 4;
|
|
270
251
|
// some public inputs are handled specially
|
|
271
252
|
const numKZGAccumulatorFieldElements = 16;
|
|
272
253
|
const publicInputsSizeIndex = 1; // index into VK for numPublicInputs
|
|
273
|
-
|
|
274
254
|
const numPublicInputs = Number(vkAsFields[publicInputsSizeIndex].toString()) - numKZGAccumulatorFieldElements;
|
|
275
255
|
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
const
|
|
279
|
-
|
|
280
|
-
proofNoPIs.set(proofWithPublicInputs.subarray(0, numSerdeHeaderBytes), 0);
|
|
281
|
-
// copy the elements after the public inputs
|
|
282
|
-
proofNoPIs.set(proofWithPublicInputs.subarray(numSerdeHeaderBytes + numPublicInputsBytes), numSerdeHeaderBytes);
|
|
283
|
-
const proof: string[] = deflattenFields(proofNoPIs.slice(numSerdeHeaderBytes));
|
|
284
|
-
|
|
285
|
-
// Fetch the number of public inputs out of the proof string
|
|
286
|
-
const publicInputsConcatenated = proofWithPublicInputs.slice(
|
|
287
|
-
serializedBufferSize,
|
|
288
|
-
serializedBufferSize + numPublicInputsBytes,
|
|
289
|
-
);
|
|
290
|
-
const publicInputs = deflattenFields(publicInputsConcatenated);
|
|
256
|
+
const { proof: proofBytes, publicInputs: publicInputsBytes } = splitHonkProof(proofWithPublicInputs, numPublicInputs);
|
|
257
|
+
|
|
258
|
+
const publicInputs = deflattenFields(publicInputsBytes);
|
|
259
|
+
const proof = deflattenFields(proofBytes);
|
|
291
260
|
|
|
292
261
|
return { proof, publicInputs };
|
|
293
262
|
}
|