@aztec/bb.js 0.80.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.
@@ -8330,28 +8330,20 @@ var __webpack_exports__ = {};
8330
8330
  };
8331
8331
  }
8332
8332
  }
8333
- const serializedBufferSize = 4;
8333
+ const metadataOffset = 4;
8334
8334
  const fieldByteSize = 32;
8335
- const publicInputOffset = 3;
8336
- const publicInputsOffsetBytes = publicInputOffset * fieldByteSize;
8337
- function splitHonkProof(proofWithPublicInputs) {
8338
- const proofAsStrings = deflattenFields(proofWithPublicInputs.slice(4));
8339
- const numPublicInputs = Number(proofAsStrings[1]);
8340
- const publicInputsOffset = publicInputsOffsetBytes + serializedBufferSize;
8341
- const proofStart = proofWithPublicInputs.slice(0, publicInputsOffset);
8342
- const publicInputsSplitIndex = numPublicInputs * fieldByteSize;
8343
- const proofEnd = proofWithPublicInputs.slice(publicInputsOffset + publicInputsSplitIndex);
8344
- const proof = new Uint8Array([ ...proofStart, ...proofEnd ]);
8345
- const publicInputs = proofWithPublicInputs.slice(publicInputsOffset, publicInputsOffset + publicInputsSplitIndex);
8335
+ function splitHonkProof(proofWithPublicInputs, numPublicInputs) {
8336
+ const proofWithPI = proofWithPublicInputs.slice(metadataOffset);
8337
+ const publicInputs = proofWithPI.slice(0, numPublicInputs * fieldByteSize);
8338
+ const proof = proofWithPI.slice(numPublicInputs * fieldByteSize);
8346
8339
  return {
8347
8340
  proof,
8348
8341
  publicInputs
8349
8342
  };
8350
8343
  }
8351
8344
  function reconstructHonkProof(publicInputs, proof) {
8352
- const proofStart = proof.slice(0, publicInputsOffsetBytes + serializedBufferSize);
8353
- const proofEnd = proof.slice(publicInputsOffsetBytes + serializedBufferSize);
8354
- const proofWithPublicInputs = Uint8Array.from([ ...proofStart, ...publicInputs, ...proofEnd ]);
8345
+ const proofSize = numToUInt32BE((publicInputs.length + proof.length) / fieldByteSize);
8346
+ const proofWithPublicInputs = Uint8Array.from([ ...proofSize, ...publicInputs, ...proof ]);
8355
8347
  return proofWithPublicInputs;
8356
8348
  }
8357
8349
  function reconstructUltraPlonkProof(proofData) {
@@ -10458,10 +10450,6 @@ var __webpack_exports__ = {};
10458
10450
  await this.api.destroy();
10459
10451
  }
10460
10452
  }
10461
- const backend_serializedBufferSize = 4;
10462
- const backend_fieldByteSize = 32;
10463
- const backend_publicInputOffset = 3;
10464
- const backend_publicInputsOffsetBytes = backend_publicInputOffset * backend_fieldByteSize;
10465
10453
  class UltraHonkBackend {
10466
10454
  constructor(acirBytecode, backendOptions = {
10467
10455
  threads: 1
@@ -10484,15 +10472,12 @@ var __webpack_exports__ = {};
10484
10472
  await this.instantiate();
10485
10473
  const proveUltraHonk = options?.keccak ? this.api.acirProveUltraKeccakHonk.bind(this.api) : this.api.acirProveUltraHonk.bind(this.api);
10486
10474
  const proofWithPublicInputs = await proveUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive, decompressSync(compressedWitness));
10487
- const proofAsStrings = deflattenFields(proofWithPublicInputs.slice(4));
10488
- const numPublicInputs = Number(proofAsStrings[1]);
10489
- const publicInputsOffset = backend_publicInputsOffsetBytes + backend_serializedBufferSize;
10490
- const proofStart = proofWithPublicInputs.slice(0, publicInputsOffset);
10491
- const publicInputsSplitIndex = numPublicInputs * backend_fieldByteSize;
10492
- const proofEnd = proofWithPublicInputs.slice(publicInputsOffset + publicInputsSplitIndex);
10493
- const proof = new Uint8Array([ ...proofStart, ...proofEnd ]);
10494
- const publicInputsConcatenated = proofWithPublicInputs.slice(publicInputsOffset, publicInputsOffset + publicInputsSplitIndex);
10495
- const publicInputs = deflattenFields(publicInputsConcatenated);
10475
+ const writeVKUltraHonk = options?.keccak ? this.api.acirWriteVkUltraKeccakHonk.bind(this.api) : this.api.acirWriteVkUltraHonk.bind(this.api);
10476
+ const vk = await writeVKUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive);
10477
+ const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new RawBuffer(vk));
10478
+ const numPublicInputs = Number(vkAsFields[1].toString());
10479
+ const {proof, publicInputs: publicInputsBytes} = splitHonkProof(proofWithPublicInputs, numPublicInputs);
10480
+ const publicInputs = deflattenFields(publicInputsBytes);
10496
10481
  return {
10497
10482
  proof,
10498
10483
  publicInputs
@@ -10502,22 +10487,15 @@ var __webpack_exports__ = {};
10502
10487
  await this.instantiate();
10503
10488
  const proveUltraHonk = options?.keccak ? this.api.acirProveUltraKeccakHonk.bind(this.api) : this.api.acirProveUltraHonk.bind(this.api);
10504
10489
  const proofWithPublicInputs = await proveUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive, decompressSync(compressedWitness));
10505
- const numSerdeHeaderBytes = 4;
10490
+ const writeVKUltraHonk = options?.keccak ? this.api.acirWriteVkUltraKeccakHonk.bind(this.api) : this.api.acirWriteVkUltraHonk.bind(this.api);
10491
+ const vk = await writeVKUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive);
10492
+ const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new RawBuffer(vk));
10506
10493
  const numKZGAccumulatorFieldElements = 16;
10507
- const numProofPreambleElements = 3;
10508
10494
  const publicInputsSizeIndex = 1;
10509
- const proofAsStrings = deflattenFields(proofWithPublicInputs.slice(numSerdeHeaderBytes));
10510
- const numPublicInputs = Number(proofAsStrings[publicInputsSizeIndex]) - numKZGAccumulatorFieldElements;
10511
- const publicInputsOffset = backend_publicInputsOffsetBytes + backend_serializedBufferSize;
10512
- const publicInputsSplitIndex = numPublicInputs * backend_fieldByteSize;
10513
- const numPublicInputsBytes = numPublicInputs * backend_fieldByteSize;
10514
- const numHeaderPlusPreambleBytes = numSerdeHeaderBytes + numProofPreambleElements * backend_fieldByteSize;
10515
- const proofNoPIs = new Uint8Array(proofWithPublicInputs.length - numPublicInputsBytes);
10516
- proofNoPIs.set(proofWithPublicInputs.subarray(0, numHeaderPlusPreambleBytes), 0);
10517
- proofNoPIs.set(proofWithPublicInputs.subarray(numHeaderPlusPreambleBytes + numPublicInputsBytes), numHeaderPlusPreambleBytes);
10518
- const proof = deflattenFields(proofNoPIs.slice(numSerdeHeaderBytes));
10519
- const publicInputsConcatenated = proofWithPublicInputs.slice(publicInputsOffset, publicInputsOffset + publicInputsSplitIndex);
10520
- const publicInputs = deflattenFields(publicInputsConcatenated);
10495
+ const numPublicInputs = Number(vkAsFields[publicInputsSizeIndex].toString()) - numKZGAccumulatorFieldElements;
10496
+ const {proof: proofBytes, publicInputs: publicInputsBytes} = splitHonkProof(proofWithPublicInputs, numPublicInputs);
10497
+ const publicInputs = deflattenFields(publicInputsBytes);
10498
+ const proof = deflattenFields(proofBytes);
10521
10499
  return {
10522
10500
  proof,
10523
10501
  publicInputs
@@ -18,7 +18,7 @@ export type ProofDataForRecursion = {
18
18
  /** @description An byte array representing the proof */
19
19
  proof: string[];
20
20
  };
21
- export declare function splitHonkProof(proofWithPublicInputs: Uint8Array): {
21
+ export declare function splitHonkProof(proofWithPublicInputs: Uint8Array, numPublicInputs: number): {
22
22
  publicInputs: Uint8Array;
23
23
  proof: Uint8Array;
24
24
  };
@@ -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;;;KAGK;AACL,MAAM,MAAM,qBAAqB,GAAG;IAClC,4CAA4C;IAC5C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,wDAAwD;IACxD,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAQF,wBAAgB,cAAc,CAAC,qBAAqB,EAAE,UAAU,GAAG;IAAE,YAAY,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,CAqBjH;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAQ5F;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
+ {"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":"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"}
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,11 +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
- const publicInputOffset = 3;
103
- const publicInputsOffsetBytes = publicInputOffset * fieldByteSize;
104
99
  export class UltraHonkBackend {
105
100
  constructor(acirBytecode, backendOptions = { threads: 1 }, circuitOptions = { recursive: false }) {
106
101
  this.backendOptions = backendOptions;
@@ -124,19 +119,16 @@ export class UltraHonkBackend {
124
119
  ? this.api.acirProveUltraKeccakHonk.bind(this.api)
125
120
  : this.api.acirProveUltraHonk.bind(this.api);
126
121
  const proofWithPublicInputs = await proveUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive, gunzip(compressedWitness));
127
- const proofAsStrings = deflattenFields(proofWithPublicInputs.slice(4));
128
- const numPublicInputs = Number(proofAsStrings[1]);
129
- // Account for the serialized buffer size at start
130
- const publicInputsOffset = publicInputsOffsetBytes + serializedBufferSize;
131
- // Get the part before and after the public inputs
132
- const proofStart = proofWithPublicInputs.slice(0, publicInputsOffset);
133
- const publicInputsSplitIndex = numPublicInputs * fieldByteSize;
134
- const proofEnd = proofWithPublicInputs.slice(publicInputsOffset + publicInputsSplitIndex);
135
- // Construct the proof without the public inputs
136
- const proof = new Uint8Array([...proofStart, ...proofEnd]);
137
- // Fetch the number of public inputs out of the proof string
138
- const publicInputsConcatenated = proofWithPublicInputs.slice(publicInputsOffset, publicInputsOffset + publicInputsSplitIndex);
139
- const publicInputs = deflattenFields(publicInputsConcatenated);
122
+ // Write VK to get the number of public inputs
123
+ const writeVKUltraHonk = options?.keccak
124
+ ? this.api.acirWriteVkUltraKeccakHonk.bind(this.api)
125
+ : this.api.acirWriteVkUltraHonk.bind(this.api);
126
+ const vk = await writeVKUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive);
127
+ const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new RawBuffer(vk));
128
+ // Item at index 1 in VK is the number of public inputs
129
+ const numPublicInputs = Number(vkAsFields[1].toString());
130
+ const { proof, publicInputs: publicInputsBytes } = splitHonkProof(proofWithPublicInputs, numPublicInputs);
131
+ const publicInputs = deflattenFields(publicInputsBytes);
140
132
  return { proof, publicInputs };
141
133
  }
142
134
  async generateProofForRecursiveAggregation(compressedWitness, options) {
@@ -145,31 +137,19 @@ export class UltraHonkBackend {
145
137
  ? this.api.acirProveUltraKeccakHonk.bind(this.api)
146
138
  : this.api.acirProveUltraHonk.bind(this.api);
147
139
  const proofWithPublicInputs = await proveUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive, gunzip(compressedWitness));
148
- // proofWithPublicInputs starts with a four-byte size
149
- const numSerdeHeaderBytes = 4;
140
+ // Write VK to get the number of public inputs
141
+ const writeVKUltraHonk = options?.keccak
142
+ ? this.api.acirWriteVkUltraKeccakHonk.bind(this.api)
143
+ : this.api.acirWriteVkUltraHonk.bind(this.api);
144
+ const vk = await writeVKUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive);
145
+ const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new RawBuffer(vk));
150
146
  // some public inputs are handled specially
151
147
  const numKZGAccumulatorFieldElements = 16;
152
- // proof begins with: size, num public inputs, public input offset
153
- const numProofPreambleElements = 3;
154
- const publicInputsSizeIndex = 1;
155
- // Slice serde header and convert to fields
156
- const proofAsStrings = deflattenFields(proofWithPublicInputs.slice(numSerdeHeaderBytes));
157
- const numPublicInputs = Number(proofAsStrings[publicInputsSizeIndex]) - numKZGAccumulatorFieldElements;
158
- // Account for the serialized buffer size at start
159
- const publicInputsOffset = publicInputsOffsetBytes + serializedBufferSize;
160
- const publicInputsSplitIndex = numPublicInputs * fieldByteSize;
161
- // Construct the proof without the public inputs
162
- const numPublicInputsBytes = numPublicInputs * fieldByteSize;
163
- const numHeaderPlusPreambleBytes = numSerdeHeaderBytes + numProofPreambleElements * fieldByteSize;
164
- const proofNoPIs = new Uint8Array(proofWithPublicInputs.length - numPublicInputsBytes);
165
- // copy the elements before the public inputs
166
- proofNoPIs.set(proofWithPublicInputs.subarray(0, numHeaderPlusPreambleBytes), 0);
167
- // copy the elements after the public inputs
168
- proofNoPIs.set(proofWithPublicInputs.subarray(numHeaderPlusPreambleBytes + numPublicInputsBytes), numHeaderPlusPreambleBytes);
169
- const proof = deflattenFields(proofNoPIs.slice(numSerdeHeaderBytes));
170
- // Fetch the number of public inputs out of the proof string
171
- const publicInputsConcatenated = proofWithPublicInputs.slice(publicInputsOffset, publicInputsOffset + publicInputsSplitIndex);
172
- const publicInputs = deflattenFields(publicInputsConcatenated);
148
+ const publicInputsSizeIndex = 1; // index into VK for numPublicInputs
149
+ const numPublicInputs = Number(vkAsFields[publicInputsSizeIndex].toString()) - numKZGAccumulatorFieldElements;
150
+ const { proof: proofBytes, publicInputs: publicInputsBytes } = splitHonkProof(proofWithPublicInputs, numPublicInputs);
151
+ const publicInputs = deflattenFields(publicInputsBytes);
152
+ const proof = deflattenFields(proofBytes);
173
153
  return { proof, publicInputs };
174
154
  }
175
155
  async verifyProof(proofData, options) {
@@ -248,8 +228,8 @@ export class AztecClientBackend {
248
228
  await this.instantiate();
249
229
  const proofAndVk = await this.api.acirProveAztecClient(this.acirMsgpack, witnessMsgpack);
250
230
  const [proof, vk] = proofAndVk;
251
- if (!await this.verify(proof, vk)) {
252
- throw new AztecClientBackendError("Failed to verify the private (ClientIVC) transaction proof!");
231
+ if (!(await this.verify(proof, vk))) {
232
+ throw new AztecClientBackendError('Failed to verify the private (ClientIVC) transaction proof!');
253
233
  }
254
234
  return proofAndVk;
255
235
  }
@@ -294,4 +274,4 @@ function base64Decode(input) {
294
274
  throw new Error('No implementation found for base64 decoding.');
295
275
  }
296
276
  }
297
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,YAAY,EAAkB,MAAM,YAAY,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,cAAc,IAAI,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EACL,eAAe,EACf,oBAAoB,EAGpB,oBAAoB,EACpB,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAE3B,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IAChD,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;CACF;AAED,MAAM,OAAO,iBAAiB;IAY5B,YACE,YAAoB,EACV,iBAAiC,EAAE,OAAO,EAAE,CAAC,EAAE,EAC/C,iBAAiC,EAAE,SAAS,EAAE,KAAK,EAAE;QADrD,mBAAc,GAAd,cAAc,CAAiC;QAC/C,mBAAc,GAAd,cAAc,CAAuC;QAE/D,IAAI,CAAC,wBAAwB,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACjE,CAAC;IAED,cAAc;IACd,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAExD,MAAM,aAAa,GAAG,KAAK,CAAC;YAC5B,6DAA6D;YAC7D,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAC1D,IAAI,CAAC,wBAAwB,EAC7B,IAAI,CAAC,cAAc,CAAC,SAAS,EAC7B,aAAa,CACd,CAAC;YAEF,MAAM,GAAG,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC;YAC9C,IAAI,CAAC,YAAY,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;YAChE,MAAM,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YAC9G,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACjB,CAAC;IACH,CAAC;IAED,qCAAqC;IACrC,KAAK,CAAC,aAAa,CAAC,iBAA6B;QAC/C,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,CAC1D,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,wBAAwB,EAC7B,IAAI,CAAC,cAAc,CAAC,SAAS,EAC7B,MAAM,CAAC,iBAAiB,CAAC,CAC1B,CAAC;QAEF,oDAAoD;QACpD,2BAA2B;QAC3B,MAAM,kCAAkC,GAAG,IAAI,CAAC;QAEhD,MAAM,UAAU,GAAG,qBAAqB,CAAC,MAAM,GAAG,kCAAkC,CAAC;QAErF,MAAM,wBAAwB,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QAC5E,MAAM,KAAK,GAAG,qBAAqB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,eAAe,CAAC,wBAAwB,CAAC,CAAC;QAE/D,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IACjC,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACH,KAAK,CAAC,+BAA+B,CACnC,SAAoB,EACpB,iBAAiB,GAAG,CAAC;QAMrB,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,MAAM,KAAK,GAAG,0BAA0B,CAAC,SAAS,CAAC,CAAC;QACpD,MAAM,aAAa,GAAG,CACpB,MAAM,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,iBAAiB,CAAC,CACzF,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAE3B,2EAA2E;QAC3E,0BAA0B;QAC1B,MAAM,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAE1D,sHAAsH;QACtH,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,sCAAsC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEpF,OAAO;YACL,aAAa,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACnD,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;YAC1C,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;SACzB,CAAC;IACJ,CAAC;IAED,oCAAoC;IACpC,KAAK,CAAC,WAAW,CAAC,SAAoB;QACpC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1D,MAAM,KAAK,GAAG,0BAA0B,CAAC,SAAS,CAAC,CAAC;QACpD,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC;IAED,gDAAgD;IAChD,KAAK,CAAC,kBAAkB;QACtB,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1D,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAClE,CAAC;IAED,+CAA+C;IAC/C,KAAK,CAAC,mBAAmB;QACvB,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1D,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,iEAAiE;AACjE,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAC/B,MAAM,aAAa,GAAG,EAAE,CAAC;AACzB,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,uBAAuB,GAAG,iBAAiB,GAAG,aAAa,CAAC;AAalE,MAAM,OAAO,gBAAgB;IAS3B,YACE,YAAoB,EACV,iBAAiC,EAAE,OAAO,EAAE,CAAC,EAAE,EAC/C,iBAAiC,EAAE,SAAS,EAAE,KAAK,EAAE;QADrD,mBAAc,GAAd,cAAc,CAAiC;QAC/C,mBAAc,GAAd,cAAc,CAAuC;QAE/D,IAAI,CAAC,wBAAwB,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACjE,CAAC;IACD,cAAc;IACd,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACxD,MAAM,aAAa,GAAG,IAAI,CAAC;YAC3B,MAAM,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;YAEnG,mDAAmD;YACnD,kFAAkF;YAClF,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACjB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,iBAA6B,EAAE,OAAiC;QAClF,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,MAAM,cAAc,GAAG,OAAO,EAAE,MAAM;YACpC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YAClD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE/C,MAAM,qBAAqB,GAAG,MAAM,cAAc,CAChD,IAAI,CAAC,wBAAwB,EAC7B,IAAI,CAAC,cAAc,CAAC,SAAS,EAC7B,MAAM,CAAC,iBAAiB,CAAC,CAC1B,CAAC;QAEF,MAAM,cAAc,GAAG,eAAe,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAEvE,MAAM,eAAe,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAElD,kDAAkD;QAClD,MAAM,kBAAkB,GAAG,uBAAuB,GAAG,oBAAoB,CAAC;QAC1E,kDAAkD;QAClD,MAAM,UAAU,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;QACtE,MAAM,sBAAsB,GAAG,eAAe,GAAG,aAAa,CAAC;QAC/D,MAAM,QAAQ,GAAG,qBAAqB,CAAC,KAAK,CAAC,kBAAkB,GAAG,sBAAsB,CAAC,CAAC;QAE1F,gDAAgD;QAChD,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC;QAE3D,4DAA4D;QAC5D,MAAM,wBAAwB,GAAG,qBAAqB,CAAC,KAAK,CAC1D,kBAAkB,EAClB,kBAAkB,GAAG,sBAAsB,CAC5C,CAAC;QACF,MAAM,YAAY,GAAG,eAAe,CAAC,wBAAwB,CAAC,CAAC;QAE/D,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,oCAAoC,CACxC,iBAA6B,EAC7B,OAAiC;QAEjC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,MAAM,cAAc,GAAG,OAAO,EAAE,MAAM;YACpC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YAClD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE/C,MAAM,qBAAqB,GAAG,MAAM,cAAc,CAChD,IAAI,CAAC,wBAAwB,EAC7B,IAAI,CAAC,cAAc,CAAC,SAAS,EAC7B,MAAM,CAAC,iBAAiB,CAAC,CAC1B,CAAC;QAEF,qDAAqD;QACrD,MAAM,mBAAmB,GAAG,CAAC,CAAC;QAC9B,2CAA2C;QAC3C,MAAM,8BAA8B,GAAG,EAAE,CAAC;QAC1C,kEAAkE;QAClE,MAAM,wBAAwB,GAAG,CAAC,CAAC;QACnC,MAAM,qBAAqB,GAAG,CAAC,CAAC;QAEhC,2CAA2C;QAC3C,MAAM,cAAc,GAAG,eAAe,CAAC,qBAAqB,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;QACzF,MAAM,eAAe,GAAG,MAAM,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC,GAAG,8BAA8B,CAAC;QAEvG,kDAAkD;QAClD,MAAM,kBAAkB,GAAG,uBAAuB,GAAG,oBAAoB,CAAC;QAC1E,MAAM,sBAAsB,GAAG,eAAe,GAAG,aAAa,CAAC;QAE/D,gDAAgD;QAChD,MAAM,oBAAoB,GAAG,eAAe,GAAG,aAAa,CAAC;QAC7D,MAAM,0BAA0B,GAAG,mBAAmB,GAAG,wBAAwB,GAAG,aAAa,CAAC;QAClG,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,qBAAqB,CAAC,MAAM,GAAG,oBAAoB,CAAC,CAAC;QACvF,6CAA6C;QAC7C,UAAU,CAAC,GAAG,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,EAAE,0BAA0B,CAAC,EAAE,CAAC,CAAC,CAAC;QACjF,4CAA4C;QAC5C,UAAU,CAAC,GAAG,CACZ,qBAAqB,CAAC,QAAQ,CAAC,0BAA0B,GAAG,oBAAoB,CAAC,EACjF,0BAA0B,CAC3B,CAAC;QACF,MAAM,KAAK,GAAa,eAAe,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAE/E,4DAA4D;QAC5D,MAAM,wBAAwB,GAAG,qBAAqB,CAAC,KAAK,CAC1D,kBAAkB,EAClB,kBAAkB,GAAG,sBAAsB,CAC5C,CAAC;QACF,MAAM,YAAY,GAAG,eAAe,CAAC,wBAAwB,CAAC,CAAC;QAE/D,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,SAAoB,EAAE,OAAiC;QACvE,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,MAAM,KAAK,GAAG,oBAAoB,CAAC,oBAAoB,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAElG,MAAM,gBAAgB,GAAG,OAAO,EAAE,MAAM;YACtC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YACpD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,eAAe,GAAG,OAAO,EAAE,MAAM;YACrC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YACnD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEhD,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACnG,OAAO,MAAM,eAAe,CAAC,KAAK,EAAE,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,OAAiC;QACxD,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,OAAO,EAAE,MAAM;YACpB,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC;YACzG,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IACxG,CAAC;IAED,+CAA+C;IAC/C,KAAK,CAAC,mBAAmB,CAAC,EAAe;QACvC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,KAAK,GACT,EAAE,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;QAC5G,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACtG,CAAC;IAED,8JAA8J;IAC9J,KAAK,CAAC,+BAA+B;IACnC,6DAA6D;IAC7D,MAAkB;IAClB,6DAA6D;IAC7D,kBAA0B;QAE1B,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,iHAAiH;QACjH,oGAAoG;QACpG,+BAA+B;QAC/B,wGAAwG;QACxG,yBAAyB;QACzB,6DAA6D;QAC7D,qGAAqG;QAErG,2EAA2E;QAC3E,0BAA0B;QAC1B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAChH,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAEzD,OAAO;YACL,sDAAsD;YACtD,aAAa,EAAE,EAAE;YACjB,UAAU,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;YACvC,mGAAmG;YACnG,sGAAsG;YACtG,cAAc;YACd,MAAM,EAAE,EAAE;SACX,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,OAAO,kBAAkB;IAQ7B,YAAsB,WAAyB,EAAY,UAA0B,EAAE,OAAO,EAAE,CAAC,EAAE;QAA7E,gBAAW,GAAX,WAAW,CAAc;QAAY,YAAO,GAAP,OAAO,CAAiC;IAAG,CAAC;IAEvG,cAAc;IACd,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACjD,MAAM,GAAG,CAAC,gBAAgB,EAAE,CAAC;YAC7B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACjB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,cAA4B;QACtC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QACzF,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC;QAC/B,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,uBAAuB,CAAC,6DAA6D,CAAC,CAAC;QACnG,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAiB,EAAE,EAAc;QAC5C,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,cAA4B;QAC/C,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,GAAG,CAAC,6BAA6B,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,KAAK;QACT,uBAAuB;QACvB,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,yDAAyD;AACzD,SAAS,gBAAgB,CAAC,qBAA6B;IACrD,MAAM,kBAAkB,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAAC;IAC/D,OAAO,MAAM,CAAC,kBAAkB,CAAC,CAAC;AACpC,CAAC;AAED,mEAAmE;AACnE,sEAAsE;AACtE,SAAS,YAAY,CAAC,KAAa;IACjC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,sBAAsB;QACtB,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACvC,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC;IAC9D,CAAC;SAAM,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;QACtC,sBAAsB;QACtB,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;AACH,CAAC"}
277
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"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"}
@@ -18,7 +18,7 @@ export type ProofDataForRecursion = {
18
18
  /** @description An byte array representing the proof */
19
19
  proof: string[];
20
20
  };
21
- export declare function splitHonkProof(proofWithPublicInputs: Uint8Array): {
21
+ export declare function splitHonkProof(proofWithPublicInputs: Uint8Array, numPublicInputs: number): {
22
22
  publicInputs: Uint8Array;
23
23
  proof: Uint8Array;
24
24
  };
@@ -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;;;KAGK;AACL,MAAM,MAAM,qBAAqB,GAAG;IAClC,4CAA4C;IAC5C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,wDAAwD;IACxD,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAQF,wBAAgB,cAAc,CAAC,qBAAqB,EAAE,UAAU,GAAG;IAAE,YAAY,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,CAqBjH;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAQ5F;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
+ {"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,31 +1,21 @@
1
- // Buffers are prepended with their size. The size takes 4 bytes.
2
- const serializedBufferSize = 4;
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
- const publicInputOffset = 3;
5
- const publicInputsOffsetBytes = publicInputOffset * fieldByteSize;
6
- export function splitHonkProof(proofWithPublicInputs) {
7
- const proofAsStrings = deflattenFields(proofWithPublicInputs.slice(4));
8
- const numPublicInputs = Number(proofAsStrings[1]);
9
- // Account for the serialized buffer size at start
10
- const publicInputsOffset = publicInputsOffsetBytes + serializedBufferSize;
11
- // Get the part before and after the public inputs
12
- const proofStart = proofWithPublicInputs.slice(0, publicInputsOffset);
13
- const publicInputsSplitIndex = numPublicInputs * fieldByteSize;
14
- const proofEnd = proofWithPublicInputs.slice(publicInputsOffset + publicInputsSplitIndex);
15
- // Construct the proof without the public inputs
16
- const proof = new Uint8Array([...proofStart, ...proofEnd]);
17
- // Fetch the number of public inputs out of the proof string
18
- const publicInputs = proofWithPublicInputs.slice(publicInputsOffset, publicInputsOffset + publicInputsSplitIndex);
5
+ export function splitHonkProof(proofWithPublicInputs, numPublicInputs) {
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);
19
10
  return {
20
11
  proof,
21
12
  publicInputs,
22
13
  };
23
14
  }
24
15
  export function reconstructHonkProof(publicInputs, proof) {
25
- const proofStart = proof.slice(0, publicInputsOffsetBytes + serializedBufferSize);
26
- const proofEnd = proof.slice(publicInputsOffsetBytes + serializedBufferSize);
27
- // Concatenate publicInputs and proof
28
- 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]);
29
19
  return proofWithPublicInputs;
30
20
  }
31
21
  export function reconstructUltraPlonkProof(proofData) {
@@ -82,4 +72,4 @@ function hexToUint8Array(hex) {
82
72
  }
83
73
  return u8;
84
74
  }
85
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvb2YvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBc0JBLGlFQUFpRTtBQUNqRSxNQUFNLG9CQUFvQixHQUFHLENBQUMsQ0FBQztBQUMvQixNQUFNLGFBQWEsR0FBRyxFQUFFLENBQUM7QUFDekIsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLENBQUM7QUFDNUIsTUFBTSx1QkFBdUIsR0FBRyxpQkFBaUIsR0FBRyxhQUFhLENBQUM7QUFFbEUsTUFBTSxVQUFVLGNBQWMsQ0FBQyxxQkFBaUM7SUFDOUQsTUFBTSxjQUFjLEdBQUcsZUFBZSxDQUFDLHFCQUFxQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRXZFLE1BQU0sZUFBZSxHQUFHLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUVsRCxrREFBa0Q7SUFDbEQsTUFBTSxrQkFBa0IsR0FBRyx1QkFBdUIsR0FBRyxvQkFBb0IsQ0FBQztJQUMxRSxrREFBa0Q7SUFDbEQsTUFBTSxVQUFVLEdBQUcscUJBQXFCLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO0lBQ3RFLE1BQU0sc0JBQXNCLEdBQUcsZUFBZSxHQUFHLGFBQWEsQ0FBQztJQUMvRCxNQUFNLFFBQVEsR0FBRyxxQkFBcUIsQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEdBQUcsc0JBQXNCLENBQUMsQ0FBQztJQUMxRixnREFBZ0Q7SUFDaEQsTUFBTSxLQUFLLEdBQUcsSUFBSSxVQUFVLENBQUMsQ0FBQyxHQUFHLFVBQVUsRUFBRSxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUM7SUFFM0QsNERBQTREO0lBQzVELE1BQU0sWUFBWSxHQUFHLHFCQUFxQixDQUFDLEtBQUssQ0FBQyxrQkFBa0IsRUFBRSxrQkFBa0IsR0FBRyxzQkFBc0IsQ0FBQyxDQUFDO0lBRWxILE9BQU87UUFDTCxL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
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":"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"}
1
+ {"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../../src/barretenberg/backend.ts"],"names":[],"mappings":"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"}
@@ -101,11 +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
- const publicInputOffset = 3;
108
- const publicInputsOffsetBytes = publicInputOffset * fieldByteSize;
109
104
  class UltraHonkBackend {
110
105
  constructor(acirBytecode, backendOptions = { threads: 1 }, circuitOptions = { recursive: false }) {
111
106
  this.backendOptions = backendOptions;
@@ -129,19 +124,16 @@ class UltraHonkBackend {
129
124
  ? this.api.acirProveUltraKeccakHonk.bind(this.api)
130
125
  : this.api.acirProveUltraHonk.bind(this.api);
131
126
  const proofWithPublicInputs = await proveUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive, (0, fflate_1.decompressSync)(compressedWitness));
132
- const proofAsStrings = (0, index_js_2.deflattenFields)(proofWithPublicInputs.slice(4));
133
- const numPublicInputs = Number(proofAsStrings[1]);
134
- // Account for the serialized buffer size at start
135
- const publicInputsOffset = publicInputsOffsetBytes + serializedBufferSize;
136
- // Get the part before and after the public inputs
137
- const proofStart = proofWithPublicInputs.slice(0, publicInputsOffset);
138
- const publicInputsSplitIndex = numPublicInputs * fieldByteSize;
139
- const proofEnd = proofWithPublicInputs.slice(publicInputsOffset + publicInputsSplitIndex);
140
- // Construct the proof without the public inputs
141
- const proof = new Uint8Array([...proofStart, ...proofEnd]);
142
- // Fetch the number of public inputs out of the proof string
143
- const publicInputsConcatenated = proofWithPublicInputs.slice(publicInputsOffset, publicInputsOffset + publicInputsSplitIndex);
144
- const publicInputs = (0, index_js_2.deflattenFields)(publicInputsConcatenated);
127
+ // Write VK to get the number of public inputs
128
+ const writeVKUltraHonk = options?.keccak
129
+ ? this.api.acirWriteVkUltraKeccakHonk.bind(this.api)
130
+ : this.api.acirWriteVkUltraHonk.bind(this.api);
131
+ const vk = await writeVKUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive);
132
+ const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new raw_buffer_js_1.RawBuffer(vk));
133
+ // Item at index 1 in VK is the number of public inputs
134
+ const numPublicInputs = Number(vkAsFields[1].toString());
135
+ const { proof, publicInputs: publicInputsBytes } = (0, index_js_2.splitHonkProof)(proofWithPublicInputs, numPublicInputs);
136
+ const publicInputs = (0, index_js_2.deflattenFields)(publicInputsBytes);
145
137
  return { proof, publicInputs };
146
138
  }
147
139
  async generateProofForRecursiveAggregation(compressedWitness, options) {
@@ -150,31 +142,19 @@ class UltraHonkBackend {
150
142
  ? this.api.acirProveUltraKeccakHonk.bind(this.api)
151
143
  : this.api.acirProveUltraHonk.bind(this.api);
152
144
  const proofWithPublicInputs = await proveUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive, (0, fflate_1.decompressSync)(compressedWitness));
153
- // proofWithPublicInputs starts with a four-byte size
154
- const numSerdeHeaderBytes = 4;
145
+ // Write VK to get the number of public inputs
146
+ const writeVKUltraHonk = options?.keccak
147
+ ? this.api.acirWriteVkUltraKeccakHonk.bind(this.api)
148
+ : this.api.acirWriteVkUltraHonk.bind(this.api);
149
+ const vk = await writeVKUltraHonk(this.acirUncompressedBytecode, this.circuitOptions.recursive);
150
+ const vkAsFields = await this.api.acirVkAsFieldsUltraHonk(new raw_buffer_js_1.RawBuffer(vk));
155
151
  // some public inputs are handled specially
156
152
  const numKZGAccumulatorFieldElements = 16;
157
- // proof begins with: size, num public inputs, public input offset
158
- const numProofPreambleElements = 3;
159
- const publicInputsSizeIndex = 1;
160
- // Slice serde header and convert to fields
161
- const proofAsStrings = (0, index_js_2.deflattenFields)(proofWithPublicInputs.slice(numSerdeHeaderBytes));
162
- const numPublicInputs = Number(proofAsStrings[publicInputsSizeIndex]) - numKZGAccumulatorFieldElements;
163
- // Account for the serialized buffer size at start
164
- const publicInputsOffset = publicInputsOffsetBytes + serializedBufferSize;
165
- const publicInputsSplitIndex = numPublicInputs * fieldByteSize;
166
- // Construct the proof without the public inputs
167
- const numPublicInputsBytes = numPublicInputs * fieldByteSize;
168
- const numHeaderPlusPreambleBytes = numSerdeHeaderBytes + numProofPreambleElements * fieldByteSize;
169
- const proofNoPIs = new Uint8Array(proofWithPublicInputs.length - numPublicInputsBytes);
170
- // copy the elements before the public inputs
171
- proofNoPIs.set(proofWithPublicInputs.subarray(0, numHeaderPlusPreambleBytes), 0);
172
- // copy the elements after the public inputs
173
- proofNoPIs.set(proofWithPublicInputs.subarray(numHeaderPlusPreambleBytes + numPublicInputsBytes), numHeaderPlusPreambleBytes);
174
- const proof = (0, index_js_2.deflattenFields)(proofNoPIs.slice(numSerdeHeaderBytes));
175
- // Fetch the number of public inputs out of the proof string
176
- const publicInputsConcatenated = proofWithPublicInputs.slice(publicInputsOffset, publicInputsOffset + publicInputsSplitIndex);
177
- const publicInputs = (0, index_js_2.deflattenFields)(publicInputsConcatenated);
153
+ const publicInputsSizeIndex = 1; // index into VK for numPublicInputs
154
+ const numPublicInputs = Number(vkAsFields[publicInputsSizeIndex].toString()) - numKZGAccumulatorFieldElements;
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);
178
158
  return { proof, publicInputs };
179
159
  }
180
160
  async verifyProof(proofData, options) {
@@ -254,8 +234,8 @@ class AztecClientBackend {
254
234
  await this.instantiate();
255
235
  const proofAndVk = await this.api.acirProveAztecClient(this.acirMsgpack, witnessMsgpack);
256
236
  const [proof, vk] = proofAndVk;
257
- if (!await this.verify(proof, vk)) {
258
- throw new AztecClientBackendError("Failed to verify the private (ClientIVC) transaction proof!");
237
+ if (!(await this.verify(proof, vk))) {
238
+ throw new AztecClientBackendError('Failed to verify the private (ClientIVC) transaction proof!');
259
239
  }
260
240
  return proofAndVk;
261
241
  }
@@ -301,4 +281,4 @@ function base64Decode(input) {
301
281
  throw new Error('No implementation found for base64 decoding.');
302
282
  }
303
283
  }
304
- //# 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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"}
@@ -18,7 +18,7 @@ export type ProofDataForRecursion = {
18
18
  /** @description An byte array representing the proof */
19
19
  proof: string[];
20
20
  };
21
- export declare function splitHonkProof(proofWithPublicInputs: Uint8Array): {
21
+ export declare function splitHonkProof(proofWithPublicInputs: Uint8Array, numPublicInputs: number): {
22
22
  publicInputs: Uint8Array;
23
23
  proof: Uint8Array;
24
24
  };
@@ -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;;;KAGK;AACL,MAAM,MAAM,qBAAqB,GAAG;IAClC,4CAA4C;IAC5C,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,wDAAwD;IACxD,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAQF,wBAAgB,cAAc,CAAC,qBAAqB,EAAE,UAAU,GAAG;IAAE,YAAY,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,CAqBjH;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAQ5F;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
+ {"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"}