@aztec/bb.js 0.4.3 → 0.4.5

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.
Files changed (9) hide show
  1. package/dest/barretenberg-threads.wasm +0 -0
  2. package/dest/barretenberg.wasm +0 -0
  3. package/dest/browser/995.js +2 -2
  4. package/dest/browser/main.d.ts.map +1 -1
  5. package/dest/browser/main.js +2 -2
  6. package/dest/node/main.d.ts.map +1 -1
  7. package/dest/node/main.js +51 -19
  8. package/package.json +2 -2
  9. package/src/main.ts +45 -22
package/dest/barretenberg-threads.wasm CHANGED
Binary file
package/dest/barretenberg.wasm CHANGED
Binary file
package/dest/browser/995.js CHANGED
@@ -353,14 +353,14 @@ tslib_1.__exportStar(__webpack_require__(754), exports);
353
353
  /***/ 77:
354
354
  /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
355
355
 
356
- module.exports = __webpack_require__.p + "b03fe9ef064d8eba5ff7.wasm";
356
+ module.exports = __webpack_require__.p + "16788c9fdde215ddc685.wasm";
357
357
 
358
358
  /***/ }),
359
359
 
360
360
  /***/ 90:
361
361
  /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
362
362
 
363
- module.exports = __webpack_require__.p + "7d24b8a508ae77ca0b04.wasm";
363
+ module.exports = __webpack_require__.p + "0a80d26169b7556e78d1.wasm";
364
364
 
365
365
  /***/ })
366
366
 
package/dest/browser/main.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";AA6EA,wBAAsB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,oBAepH;AAED,wBAAsB,KAAK,CACzB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,OAAO,EACpB,UAAU,EAAE,MAAM,iBAiBnB;AAED,wBAAsB,SAAS,CAAC,YAAY,EAAE,MAAM,iBAOnD;AAED,wBAAsB,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAWnF;AAED,wBAAsB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAahE;AAED,wBAAsB,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAiBtF;AAED,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAmBtG;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,iBAiBtE"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";AAkFA,wBAAsB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,oBAepH;AAED,wBAAsB,KAAK,CACzB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,OAAO,EACpB,UAAU,EAAE,MAAM,iBAoBnB;AAED,wBAAsB,SAAS,CAAC,YAAY,EAAE,MAAM,iBAOnD;AAED,wBAAsB,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAUnF;AAED,wBAAsB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAgBhE;AAED,wBAAsB,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAoBtF;AAED,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAwBtG;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,iBAsBtE"}
package/dest/browser/main.js CHANGED
@@ -5446,7 +5446,7 @@ exports.RawBuffer = RawBuffer;
5446
5446
  /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
5447
5447
 
5448
5448
  "use strict";
5449
- module.exports = __webpack_require__.p + "b03fe9ef064d8eba5ff7.wasm";
5449
+ module.exports = __webpack_require__.p + "16788c9fdde215ddc685.wasm";
5450
5450
 
5451
5451
  /***/ }),
5452
5452
 
@@ -5454,7 +5454,7 @@ module.exports = __webpack_require__.p + "b03fe9ef064d8eba5ff7.wasm";
5454
5454
  /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
5455
5455
 
5456
5456
  "use strict";
5457
- module.exports = __webpack_require__.p + "7d24b8a508ae77ca0b04.wasm";
5457
+ module.exports = __webpack_require__.p + "0a80d26169b7556e78d1.wasm";
5458
5458
 
5459
5459
  /***/ }),
5460
5460
 
package/dest/node/main.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";AA6EA,wBAAsB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,oBAepH;AAED,wBAAsB,KAAK,CACzB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,OAAO,EACpB,UAAU,EAAE,MAAM,iBAiBnB;AAED,wBAAsB,SAAS,CAAC,YAAY,EAAE,MAAM,iBAOnD;AAED,wBAAsB,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAWnF;AAED,wBAAsB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAahE;AAED,wBAAsB,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAiBtF;AAED,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAmBtG;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,iBAiBtE"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";AAkFA,wBAAsB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,oBAepH;AAED,wBAAsB,KAAK,CACzB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,OAAO,EACpB,UAAU,EAAE,MAAM,iBAoBnB;AAED,wBAAsB,SAAS,CAAC,YAAY,EAAE,MAAM,iBAOnD;AAED,wBAAsB,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAUnF;AAED,wBAAsB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAgBhE;AAED,wBAAsB,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAoBtF;AAED,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAwBtG;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,iBAsBtE"}
package/dest/node/main.js CHANGED
@@ -6,8 +6,13 @@ import { gunzipSync } from 'zlib';
6
6
  import { Command } from 'commander';
7
7
  createDebug.log = console.error.bind(console);
8
8
  const debug = createDebug('bb.js');
9
- // Maximum we support natively. It is 2^19 for browser.
10
- const MAX_CIRCUIT_SIZE = 2 ** 23;
9
+ // Maximum we support in node and the browser is 2^19.
10
+ // This is because both node and browser use barretenberg.wasm.
11
+ //
12
+ // This is not a restriction in the bb binary and one should be
13
+ // aware of this discrepancy, when creating proofs in bb versus
14
+ // creating the same proofs in the node CLI.
15
+ const MAX_CIRCUIT_SIZE = 2 ** 19;
11
16
  function getBytecode(bytecodePath) {
12
17
  const encodedCircuit = readFileSync(bytecodePath, 'utf-8');
13
18
  const buffer = Buffer.from(encodedCircuit, 'base64');
@@ -67,7 +72,7 @@ export async function proveAndVerify(bytecodePath, witnessPath, crsPath, isRecur
67
72
  const proof = await api.acirCreateProof(acirComposer, bytecode, witness, isRecursive);
68
73
  debug(`verifying...`);
69
74
  const verified = await api.acirVerifyProof(acirComposer, proof, isRecursive);
70
- process.stdout.write(`${verified}`);
75
+ debug(`verified: ${verified}`);
71
76
  return verified;
72
77
  }
73
78
  finally {
@@ -82,9 +87,14 @@ export async function prove(bytecodePath, witnessPath, crsPath, isRecursive, out
82
87
  const witness = getWitness(witnessPath);
83
88
  const proof = await api.acirCreateProof(acirComposer, bytecode, witness, isRecursive);
84
89
  debug(`done.`);
85
- process.stdout.write(proof);
86
- writeFileSync(outputPath, proof);
87
- debug(`proof written to: ${outputPath}`);
90
+ if (outputPath === '-') {
91
+ process.stdout.write(proof);
92
+ debug(`proof written to stdout`);
93
+ }
94
+ else {
95
+ writeFileSync(outputPath, proof);
96
+ debug(`proof written to: ${outputPath}`);
97
+ }
88
98
  }
89
99
  finally {
90
100
  await api.destroy();
@@ -104,7 +114,7 @@ export async function verify(proofPath, isRecursive, vkPath) {
104
114
  try {
105
115
  await api.acirLoadVerificationKey(acirComposer, new RawBuffer(readFileSync(vkPath)));
106
116
  const verified = await api.acirVerifyProof(acirComposer, readFileSync(proofPath), isRecursive);
107
- process.stdout.write(`${verified}`);
117
+ debug(`verified: ${verified}`);
108
118
  return verified;
109
119
  }
110
120
  finally {
@@ -116,9 +126,14 @@ export async function contract(outputPath, vkPath) {
116
126
  try {
117
127
  await api.acirLoadVerificationKey(acirComposer, new RawBuffer(readFileSync(vkPath)));
118
128
  const contract = await api.acirGetSolidityVerifier(acirComposer);
119
- process.stdout.write(contract);
120
- writeFileSync(outputPath, contract);
121
- debug(`contract written to: ${outputPath}`);
129
+ if (outputPath === '-') {
130
+ process.stdout.write(contract);
131
+ debug(`contract written to stdout`);
132
+ }
133
+ else {
134
+ writeFileSync(outputPath, contract);
135
+ debug(`contract written to: ${outputPath}`);
136
+ }
122
137
  }
123
138
  finally {
124
139
  await api.destroy();
@@ -132,9 +147,14 @@ export async function writeVk(bytecodePath, crsPath, outputPath) {
132
147
  await api.acirInitProvingKey(acirComposer, bytecode);
133
148
  debug('initing verification key...');
134
149
  const vk = await api.acirGetVerificationKey(acirComposer);
135
- process.stdout.write(vk);
136
- writeFileSync(outputPath, vk);
137
- debug(`vk written to: ${outputPath}`);
150
+ if (outputPath === '-') {
151
+ process.stdout.write(vk);
152
+ debug(`vk written to stdout`);
153
+ }
154
+ else {
155
+ writeFileSync(outputPath, vk);
156
+ debug(`vk written to: ${outputPath}`);
157
+ }
138
158
  }
139
159
  finally {
140
160
  await api.destroy();
@@ -146,8 +166,14 @@ export async function proofAsFields(proofPath, numInnerPublicInputs, outputPath)
146
166
  debug('serializing proof byte array into field elements');
147
167
  const proofAsFields = await api.acirSerializeProofIntoFields(acirComposer, readFileSync(proofPath), numInnerPublicInputs);
148
168
  const jsonProofAsFields = JSON.stringify(proofAsFields.map(f => f.toString()));
149
- process.stdout.write(jsonProofAsFields);
150
- writeFileSync(outputPath, jsonProofAsFields);
169
+ if (outputPath === '-') {
170
+ process.stdout.write(jsonProofAsFields);
171
+ debug(`proofAsFields written to stdout`);
172
+ }
173
+ else {
174
+ writeFileSync(outputPath, jsonProofAsFields);
175
+ debug(`proofAsFields written to: ${outputPath}`);
176
+ }
151
177
  debug('done.');
152
178
  }
153
179
  finally {
@@ -162,8 +188,14 @@ export async function vkAsFields(vkPath, vkeyOutputPath) {
162
188
  const [vkAsFields, vkHash] = await api.acirSerializeVerificationKeyIntoFields(acirComposer);
163
189
  const output = [vkHash, ...vkAsFields].map(f => f.toString());
164
190
  const jsonVKAsFields = JSON.stringify(output);
165
- process.stdout.write(jsonVKAsFields);
166
- writeFileSync(vkeyOutputPath, jsonVKAsFields);
191
+ if (vkeyOutputPath === '-') {
192
+ process.stdout.write(jsonVKAsFields);
193
+ debug(`vkAsFields written to stdout`);
194
+ }
195
+ else {
196
+ writeFileSync(vkeyOutputPath, jsonVKAsFields);
197
+ debug(`vkAsFields written to: ${vkeyOutputPath}`);
198
+ }
167
199
  debug('done.');
168
200
  }
169
201
  finally {
@@ -223,7 +255,7 @@ program
223
255
  .command('contract')
224
256
  .description('Output solidity verification key contract.')
225
257
  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/main.bytecode')
226
- .option('-o, --output-path <path>', 'Specify the path to write the contract', '-')
258
+ .option('-o, --output-path <path>', 'Specify the path to write the contract', './target/contract.sol')
227
259
  .requiredOption('-k, --vk <path>', 'path to a verification key. avoids recomputation.')
228
260
  .action(async ({ outputPath, vk }) => {
229
261
  handleGlobalOptions();
@@ -258,4 +290,4 @@ program
258
290
  await vkAsFields(inputPath, outputPath);
259
291
  });
260
292
  program.name('bb.js').parse(process.argv);
261
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAwB,uBAAuB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC3F,OAAO,WAAW,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,WAAW,CAAC,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC9C,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;AAEnC,uDAAuD;AACvD,MAAM,gBAAgB,GAAG,CAAC,IAAI,EAAE,CAAC;AAEjC,SAAS,WAAW,CAAC,YAAoB;IACvC,MAAM,cAAc,GAAG,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IACxC,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,YAAoB,EAAE,GAAyB;IACrE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,kBAAkB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IAC9D,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,UAAU,CAAC,WAAmB;IACrC,MAAM,IAAI,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IACtC,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,YAAoB,EAAE,GAAyB;IAC/E,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;IAC3C,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACzE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACpC,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,YAAoB,EAAE,OAAe;IACvD,MAAM,GAAG,GAAG,MAAM,uBAAuB,EAAE,CAAC;IAE5C,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACpE,IAAI,YAAY,GAAG,gBAAgB,EAAE;QACnC,MAAM,IAAI,KAAK,CAAC,mBAAmB,YAAY,6BAA6B,gBAAgB,EAAE,CAAC,CAAC;KACjG;IAED,KAAK,CAAC,iBAAiB,WAAW,EAAE,CAAC,CAAC;IACtC,KAAK,CAAC,kBAAkB,YAAY,EAAE,CAAC,CAAC;IACxC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACxB,qCAAqC;IACrC,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,YAAY,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;IAErD,wFAAwF;IACxF,MAAM,GAAG,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAEhD,uCAAuC;IACvC,8GAA8G;IAC9G,MAAM,GAAG,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,EAAE,GAAG,CAAC,SAAS,EAAE,IAAI,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAEpG,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;IACjE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AAC1D,CAAC;AAED,KAAK,UAAU,QAAQ;IACrB,MAAM,GAAG,GAAG,MAAM,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAE7C,qCAAqC;IACrC,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAE7B,uCAAuC;IACvC,MAAM,GAAG,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,EAAE,GAAG,CAAC,SAAS,EAAE,IAAI,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAEpG,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACtD,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC;AAC/B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,YAAoB,EAAE,WAAmB,EAAE,OAAe,EAAE,WAAoB;IACnH,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAChE,IAAI;QACF,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QAEtF,KAAK,CAAC,cAAc,CAAC,CAAC;QACtB,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QAC7E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,EAAE,CAAC,CAAC;QACpC,OAAO,QAAQ,CAAC;KACjB;YAAS;QACR,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;KACrB;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,YAAoB,EACpB,WAAmB,EACnB,OAAe,EACf,WAAoB,EACpB,UAAkB;IAElB,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAChE,IAAI;QACF,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QACtF,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAEjC,KAAK,CAAC,qBAAqB,UAAU,EAAE,CAAC,CAAC;KAC1C;YAAS;QACR,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;KACrB;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,YAAoB;IAClD,MAAM,GAAG,GAAG,MAAM,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAC7C,IAAI;QACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;KAC9D;YAAS;QACR,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;KACrB;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,SAAiB,EAAE,WAAoB,EAAE,MAAc;IAClF,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,MAAM,QAAQ,EAAE,CAAC;IAC/C,IAAI;QACF,MAAM,GAAG,CAAC,uBAAuB,CAAC,YAAY,EAAE,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACrF,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,YAAY,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC,CAAC;QAE/F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,EAAE,CAAC,CAAC;QACpC,OAAO,QAAQ,CAAC;KACjB;YAAS;QACR,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;KACrB;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,UAAkB,EAAE,MAAc;IAC/D,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,MAAM,QAAQ,EAAE,CAAC;IAC/C,IAAI;QACF,MAAM,GAAG,CAAC,uBAAuB,CAAC,YAAY,EAAE,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACrF,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;QAEjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC/B,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAEpC,KAAK,CAAC,wBAAwB,UAAU,EAAE,CAAC,CAAC;KAC7C;YAAS;QACR,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;KACrB;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,YAAoB,EAAE,OAAe,EAAE,UAAkB;IACrF,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAChE,IAAI;QACF,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAChC,MAAM,QAAQ,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,GAAG,CAAC,kBAAkB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAErD,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACrC,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;QAE1D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACzB,aAAa,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAE9B,KAAK,CAAC,kBAAkB,UAAU,EAAE,CAAC,CAAC;KACvC;YAAS;QACR,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;KACrB;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,SAAiB,EAAE,oBAA4B,EAAE,UAAkB;IACrG,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,MAAM,QAAQ,EAAE,CAAC;IAE/C,IAAI;QACF,KAAK,CAAC,kDAAkD,CAAC,CAAC;QAC1D,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,4BAA4B,CAC1D,YAAY,EACZ,YAAY,CAAC,SAAS,CAAC,EACvB,oBAAoB,CACrB,CAAC;QACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAE/E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACxC,aAAa,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAE7C,KAAK,CAAC,OAAO,CAAC,CAAC;KAChB;YAAS;QACR,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;KACrB;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,MAAc,EAAE,cAAsB;IACrE,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,MAAM,QAAQ,EAAE,CAAC;IAE/C,IAAI;QACF,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACvD,MAAM,GAAG,CAAC,uBAAuB,CAAC,YAAY,EAAE,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACrF,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,sCAAsC,CAAC,YAAY,CAAC,CAAC;QAC5F,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9D,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE9C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACrC,aAAa,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;QAE9C,KAAK,CAAC,OAAO,CAAC,CAAC;KAChB;YAAS;QACR,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;KACrB;AACH,CAAC;AAED,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,wBAAwB,EAAE,KAAK,CAAC,CAAC;AACjE,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;AAEjE,SAAS,mBAAmB;IAC1B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE;QAC1B,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;KAC9B;AACH,CAAC;AAED,OAAO;KACJ,OAAO,CAAC,kBAAkB,CAAC;KAC3B,WAAW,CAAC,6EAA6E,CAAC;KAC1F,MAAM,CAAC,4BAA4B,EAAE,2BAA2B,EAAE,wBAAwB,CAAC;KAC3F,MAAM,CAAC,2BAA2B,EAAE,0BAA0B,EAAE,qBAAqB,CAAC;KACtF,MAAM,CAAC,iBAAiB,EAAE,sDAAsD,EAAE,KAAK,CAAC;KACxF,MAAM,CAAC,KAAK,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;IAClE,mBAAmB,EAAE,CAAC;IACtB,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IACnF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,0CAA0C,CAAC;KACvD,MAAM,CAAC,4BAA4B,EAAE,2BAA2B,EAAE,wBAAwB,CAAC;KAC3F,MAAM,CAAC,2BAA2B,EAAE,0BAA0B,EAAE,qBAAqB,CAAC;KACtF,MAAM,CAAC,iBAAiB,EAAE,8BAA8B,EAAE,KAAK,CAAC;KAChE,MAAM,CAAC,0BAA0B,EAAE,+BAA+B,EAAE,gBAAgB,CAAC;KACrF,MAAM,CAAC,KAAK,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE;IAC9E,mBAAmB,EAAE,CAAC;IACtB,MAAM,KAAK,CAAC,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AACzE,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,sCAAsC,CAAC;KACnD,MAAM,CAAC,4BAA4B,EAAE,2BAA2B,EAAE,wBAAwB,CAAC;KAC3F,MAAM,CAAC,KAAK,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,EAAE;IAC/C,mBAAmB,EAAE,CAAC;IACtB,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,8DAA8D,CAAC;KAC3E,cAAc,CAAC,yBAAyB,EAAE,+BAA+B,CAAC;KAC1E,MAAM,CAAC,iBAAiB,EAAE,8BAA8B,EAAE,KAAK,CAAC;KAChE,cAAc,CAAC,iBAAiB,EAAE,mDAAmD,CAAC;KACtF,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE;IAC7C,mBAAmB,EAAE,CAAC;IACtB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;IACtD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,UAAU,CAAC;KACnB,WAAW,CAAC,4CAA4C,CAAC;KACzD,MAAM,CAAC,4BAA4B,EAAE,2BAA2B,EAAE,wBAAwB,CAAC;KAC3F,MAAM,CAAC,0BAA0B,EAAE,wCAAwC,EAAE,GAAG,CAAC;KACjF,cAAc,CAAC,iBAAiB,EAAE,mDAAmD,CAAC;KACtF,MAAM,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE;IACnC,mBAAmB,EAAE,CAAC;IACtB,MAAM,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AACjC,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,UAAU,CAAC;KACnB,WAAW,CAAC,0BAA0B,CAAC;KACvC,MAAM,CAAC,4BAA4B,EAAE,2BAA2B,EAAE,wBAAwB,CAAC;KAC3F,cAAc,CAAC,0BAA0B,EAAE,mCAAmC,CAAC;KAC/E,MAAM,CAAC,KAAK,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE;IACtD,mBAAmB,EAAE,CAAC;IACtB,MAAM,OAAO,CAAC,YAAY,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,iBAAiB,CAAC;KAC1B,WAAW,CAAC,qCAAqC,CAAC;KAClD,cAAc,CAAC,yBAAyB,EAAE,wBAAwB,CAAC;KACnE,cAAc,CAAC,kCAAkC,EAAE,qCAAqC,CAAC;KACzF,cAAc,CAAC,0BAA0B,EAAE,iDAAiD,CAAC;KAC7F,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,EAAE,EAAE;IAC3D,mBAAmB,EAAE,CAAC;IACtB,MAAM,aAAa,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;AAC9D,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,cAAc,CAAC;KACvB,WAAW,CAAC,oGAAoG,CAAC;KACjH,cAAc,CAAC,yBAAyB,EAAE,8CAA8C,CAAC;KACzF,cAAc,CAAC,0BAA0B,EAAE,yEAAyE,CAAC;KACrH,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE;IAC1C,mBAAmB,EAAE,CAAC;IACtB,MAAM,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEL,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
293
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/bb.js",
3
- "version": "0.4.3",
3
+ "version": "0.4.5",
4
4
  "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/circuits/cpp/barretenberg/ts",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -33,7 +33,7 @@
33
33
  "test": "yarn build:ts:browser && yarn build:ts:node && yarn test:jest && yarn test:bin",
34
34
  "test:jest": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests",
35
35
  "test:bin": "cd ./bin-test && ./bin-test.sh",
36
- "test-debug": "NODE_NO_WARNINGS=1 node --inspect-brk=0.0.0.0 --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests --runInBand",
36
+ "test:debug": "NODE_NO_WARNINGS=1 node --inspect-brk=0.0.0.0 --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests --runInBand",
37
37
  "prepack": "yarn build",
38
38
  "deploy": "npm publish --access public"
39
39
  },
package/src/main.ts CHANGED
@@ -8,8 +8,13 @@ import { Command } from 'commander';
8
8
  createDebug.log = console.error.bind(console);
9
9
  const debug = createDebug('bb.js');
10
10
 
11
- // Maximum we support natively. It is 2^19 for browser.
12
- const MAX_CIRCUIT_SIZE = 2 ** 23;
11
+ // Maximum we support in node and the browser is 2^19.
12
+ // This is because both node and browser use barretenberg.wasm.
13
+ //
14
+ // This is not a restriction in the bb binary and one should be
15
+ // aware of this discrepancy, when creating proofs in bb versus
16
+ // creating the same proofs in the node CLI.
17
+ const MAX_CIRCUIT_SIZE = 2 ** 19;
13
18
 
14
19
  function getBytecode(bytecodePath: string) {
15
20
  const encodedCircuit = readFileSync(bytecodePath, 'utf-8');
@@ -85,7 +90,7 @@ export async function proveAndVerify(bytecodePath: string, witnessPath: string,
85
90
 
86
91
  debug(`verifying...`);
87
92
  const verified = await api.acirVerifyProof(acirComposer, proof, isRecursive);
88
- process.stdout.write(`${verified}`);
93
+ debug(`verified: ${verified}`);
89
94
  return verified;
90
95
  } finally {
91
96
  await api.destroy();
@@ -107,10 +112,13 @@ export async function prove(
107
112
  const proof = await api.acirCreateProof(acirComposer, bytecode, witness, isRecursive);
108
113
  debug(`done.`);
109
114
 
110
- process.stdout.write(proof);
111
- writeFileSync(outputPath, proof);
112
-
113
- debug(`proof written to: ${outputPath}`);
115
+ if (outputPath === '-') {
116
+ process.stdout.write(proof);
117
+ debug(`proof written to stdout`);
118
+ } else {
119
+ writeFileSync(outputPath, proof);
120
+ debug(`proof written to: ${outputPath}`);
121
+ }
114
122
  } finally {
115
123
  await api.destroy();
116
124
  }
@@ -130,8 +138,7 @@ export async function verify(proofPath: string, isRecursive: boolean, vkPath: st
130
138
  try {
131
139
  await api.acirLoadVerificationKey(acirComposer, new RawBuffer(readFileSync(vkPath)));
132
140
  const verified = await api.acirVerifyProof(acirComposer, readFileSync(proofPath), isRecursive);
133
-
134
- process.stdout.write(`${verified}`);
141
+ debug(`verified: ${verified}`);
135
142
  return verified;
136
143
  } finally {
137
144
  await api.destroy();
@@ -144,10 +151,13 @@ export async function contract(outputPath: string, vkPath: string) {
144
151
  await api.acirLoadVerificationKey(acirComposer, new RawBuffer(readFileSync(vkPath)));
145
152
  const contract = await api.acirGetSolidityVerifier(acirComposer);
146
153
 
147
- process.stdout.write(contract);
148
- writeFileSync(outputPath, contract);
149
-
150
- debug(`contract written to: ${outputPath}`);
154
+ if (outputPath === '-') {
155
+ process.stdout.write(contract);
156
+ debug(`contract written to stdout`);
157
+ } else {
158
+ writeFileSync(outputPath, contract);
159
+ debug(`contract written to: ${outputPath}`);
160
+ }
151
161
  } finally {
152
162
  await api.destroy();
153
163
  }
@@ -163,10 +173,13 @@ export async function writeVk(bytecodePath: string, crsPath: string, outputPath:
163
173
  debug('initing verification key...');
164
174
  const vk = await api.acirGetVerificationKey(acirComposer);
165
175
 
166
- process.stdout.write(vk);
167
- writeFileSync(outputPath, vk);
168
-
169
- debug(`vk written to: ${outputPath}`);
176
+ if (outputPath === '-') {
177
+ process.stdout.write(vk);
178
+ debug(`vk written to stdout`);
179
+ } else {
180
+ writeFileSync(outputPath, vk);
181
+ debug(`vk written to: ${outputPath}`);
182
+ }
170
183
  } finally {
171
184
  await api.destroy();
172
185
  }
@@ -184,8 +197,13 @@ export async function proofAsFields(proofPath: string, numInnerPublicInputs: num
184
197
  );
185
198
  const jsonProofAsFields = JSON.stringify(proofAsFields.map(f => f.toString()));
186
199
 
187
- process.stdout.write(jsonProofAsFields);
188
- writeFileSync(outputPath, jsonProofAsFields);
200
+ if (outputPath === '-') {
201
+ process.stdout.write(jsonProofAsFields);
202
+ debug(`proofAsFields written to stdout`);
203
+ } else {
204
+ writeFileSync(outputPath, jsonProofAsFields);
205
+ debug(`proofAsFields written to: ${outputPath}`);
206
+ }
189
207
 
190
208
  debug('done.');
191
209
  } finally {
@@ -203,8 +221,13 @@ export async function vkAsFields(vkPath: string, vkeyOutputPath: string) {
203
221
  const output = [vkHash, ...vkAsFields].map(f => f.toString());
204
222
  const jsonVKAsFields = JSON.stringify(output);
205
223
 
206
- process.stdout.write(jsonVKAsFields);
207
- writeFileSync(vkeyOutputPath, jsonVKAsFields);
224
+ if (vkeyOutputPath === '-') {
225
+ process.stdout.write(jsonVKAsFields);
226
+ debug(`vkAsFields written to stdout`);
227
+ } else {
228
+ writeFileSync(vkeyOutputPath, jsonVKAsFields);
229
+ debug(`vkAsFields written to: ${vkeyOutputPath}`);
230
+ }
208
231
 
209
232
  debug('done.');
210
233
  } finally {
@@ -272,7 +295,7 @@ program
272
295
  .command('contract')
273
296
  .description('Output solidity verification key contract.')
274
297
  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/main.bytecode')
275
- .option('-o, --output-path <path>', 'Specify the path to write the contract', '-')
298
+ .option('-o, --output-path <path>', 'Specify the path to write the contract', './target/contract.sol')
276
299
  .requiredOption('-k, --vk <path>', 'path to a verification key. avoids recomputation.')
277
300
  .action(async ({ outputPath, vk }) => {
278
301
  handleGlobalOptions();