@aztec/bb.js 0.3.6 → 0.4.2

package/README.md

@@ -118,3 +118,4 @@ To run the tests run `yarn test`.
 To run a continuous "stress test" run `yarn simple_test` to do 10 full pk/proof/vk iterations.
 
 To run the same test in the browser run `yarn serve`, navigate to appropriate URL and open the console.
+

package/dest/browser/539.js

@@ -1604,6 +1604,7 @@ function generateUUID() {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   __addDisposableResource: () => (/* binding */ __addDisposableResource),
 /* harmony export */   __assign: () => (/* binding */ __assign),
 /* harmony export */   __asyncDelegator: () => (/* binding */ __asyncDelegator),
 /* harmony export */   __asyncGenerator: () => (/* binding */ __asyncGenerator),
@@ -1615,6 +1616,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   __classPrivateFieldSet: () => (/* binding */ __classPrivateFieldSet),
 /* harmony export */   __createBinding: () => (/* binding */ __createBinding),
 /* harmony export */   __decorate: () => (/* binding */ __decorate),
+/* harmony export */   __disposeResources: () => (/* binding */ __disposeResources),
 /* harmony export */   __esDecorate: () => (/* binding */ __esDecorate),
 /* harmony export */   __exportStar: () => (/* binding */ __exportStar),
 /* harmony export */   __extends: () => (/* binding */ __extends),
@@ -1649,7 +1651,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise */
+/* global Reflect, Promise, SuppressedError, Symbol */
 
 var extendStatics = function(d, b) {
   extendStatics = Object.setPrototypeOf ||
@@ -1929,6 +1931,53 @@ function __classPrivateFieldIn(state, receiver) {
   return typeof state === "function" ? receiver === state : state.has(receiver);
 }
 
+function __addDisposableResource(env, value, async) {
+  if (value !== null && value !== void 0) {
+    if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+    var dispose;
+    if (async) {
+        if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+        dispose = value[Symbol.asyncDispose];
+    }
+    if (dispose === void 0) {
+        if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+        dispose = value[Symbol.dispose];
+    }
+    if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    env.stack.push({ value: value, dispose: dispose, async: async });
+  }
+  else if (async) {
+    env.stack.push({ async: true });
+  }
+  return value;
+}
+
+var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+  var e = new Error(message);
+  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
+function __disposeResources(env) {
+  function fail(e) {
+    env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+    env.hasError = true;
+  }
+  function next() {
+    while (env.stack.length) {
+      var rec = env.stack.pop();
+      try {
+        var result = rec.dispose && rec.dispose.call(rec.value);
+        if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+      }
+      catch (e) {
+          fail(e);
+      }
+    }
+    if (env.hasError) throw env.error;
+  }
+  return next();
+}
+
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
   __extends,
   __assign,
@@ -1955,6 +2004,8 @@ function __classPrivateFieldIn(state, receiver) {
   __classPrivateFieldGet,
   __classPrivateFieldSet,
   __classPrivateFieldIn,
+  __addDisposableResource,
+  __disposeResources,
 });
 
 

package/dest/browser/995.js

@@ -353,14 +353,14 @@ tslib_1.__exportStar(__webpack_require__(754), exports);
 /***/ 77:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-module.exports = __webpack_require__.p + "622893dfa9efcd1f244c.wasm";
+module.exports = __webpack_require__.p + "b03fe9ef064d8eba5ff7.wasm";
 
 /***/ }),
 
 /***/ 90:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-module.exports = __webpack_require__.p + "1c27be86ce84ef20f268.wasm";
+module.exports = __webpack_require__.p + "7d24b8a508ae77ca0b04.wasm";
 
 /***/ })
 

package/dest/browser/main.d.ts

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-export declare function proveAndVerify(jsonPath: string, witnessPath: string, crsPath: string, isRecursive: boolean): Promise<boolean>;
-export declare function prove(jsonPath: string, witnessPath: string, crsPath: string, isRecursive: boolean, outputPath: string): Promise<void>;
-export declare function gateCount(jsonPath: string): Promise<void>;
+export declare function proveAndVerify(bytecodePath: string, witnessPath: string, crsPath: string, isRecursive: boolean): Promise<boolean>;
+export declare function prove(bytecodePath: string, witnessPath: string, crsPath: string, isRecursive: boolean, outputPath: string): Promise<void>;
+export declare function gateCount(bytecodePath: string): Promise<void>;
 export declare function verify(proofPath: string, isRecursive: boolean, vkPath: string): Promise<boolean>;
 export declare function contract(outputPath: string, vkPath: string): Promise<void>;
-export declare function writeVk(jsonPath: string, crsPath: string, outputPath: string): Promise<void>;
+export declare function writeVk(bytecodePath: string, crsPath: string, outputPath: string): Promise<void>;
 export declare function proofAsFields(proofPath: string, numInnerPublicInputs: number, outputPath: string): Promise<void>;
 export declare function vkAsFields(vkPath: string, vkeyOutputPath: string): Promise<void>;
 //# sourceMappingURL=main.d.ts.map

package/dest/browser/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";AA0FA,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,oBAehH;AAED,wBAAsB,KAAK,CACzB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,OAAO,EACpB,UAAU,EAAE,MAAM,iBAenB;AAED,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,iBAO/C;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,iBAchE;AAED,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAkBlF;AAED,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAgBtG;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,iBAatE"}
+{"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"}

package/dest/browser/main.js

@@ -5446,7 +5446,7 @@ exports.RawBuffer = RawBuffer;
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 "use strict";
-module.exports = __webpack_require__.p + "622893dfa9efcd1f244c.wasm";
+module.exports = __webpack_require__.p + "b03fe9ef064d8eba5ff7.wasm";
 
 /***/ }),
 
@@ -5454,7 +5454,7 @@ module.exports = __webpack_require__.p + "622893dfa9efcd1f244c.wasm";
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 "use strict";
-module.exports = __webpack_require__.p + "1c27be86ce84ef20f268.wasm";
+module.exports = __webpack_require__.p + "7d24b8a508ae77ca0b04.wasm";
 
 /***/ }),
 
@@ -6039,6 +6039,7 @@ function entries(customStore = defaultGetStore()) {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   __addDisposableResource: () => (/* binding */ __addDisposableResource),
 /* harmony export */   __assign: () => (/* binding */ __assign),
 /* harmony export */   __asyncDelegator: () => (/* binding */ __asyncDelegator),
 /* harmony export */   __asyncGenerator: () => (/* binding */ __asyncGenerator),
@@ -6050,6 +6051,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   __classPrivateFieldSet: () => (/* binding */ __classPrivateFieldSet),
 /* harmony export */   __createBinding: () => (/* binding */ __createBinding),
 /* harmony export */   __decorate: () => (/* binding */ __decorate),
+/* harmony export */   __disposeResources: () => (/* binding */ __disposeResources),
 /* harmony export */   __esDecorate: () => (/* binding */ __esDecorate),
 /* harmony export */   __exportStar: () => (/* binding */ __exportStar),
 /* harmony export */   __extends: () => (/* binding */ __extends),
@@ -6084,7 +6086,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise */
+/* global Reflect, Promise, SuppressedError, Symbol */
 
 var extendStatics = function(d, b) {
   extendStatics = Object.setPrototypeOf ||
@@ -6364,6 +6366,53 @@ function __classPrivateFieldIn(state, receiver) {
   return typeof state === "function" ? receiver === state : state.has(receiver);
 }
 
+function __addDisposableResource(env, value, async) {
+  if (value !== null && value !== void 0) {
+    if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+    var dispose;
+    if (async) {
+        if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+        dispose = value[Symbol.asyncDispose];
+    }
+    if (dispose === void 0) {
+        if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+        dispose = value[Symbol.dispose];
+    }
+    if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    env.stack.push({ value: value, dispose: dispose, async: async });
+  }
+  else if (async) {
+    env.stack.push({ async: true });
+  }
+  return value;
+}
+
+var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+  var e = new Error(message);
+  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
+function __disposeResources(env) {
+  function fail(e) {
+    env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+    env.hasError = true;
+  }
+  function next() {
+    while (env.stack.length) {
+      var rec = env.stack.pop();
+      try {
+        var result = rec.dispose && rec.dispose.call(rec.value);
+        if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+      }
+      catch (e) {
+          fail(e);
+      }
+    }
+    if (env.hasError) throw env.error;
+  }
+  return next();
+}
+
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
   __extends,
   __assign,
@@ -6390,6 +6439,8 @@ function __classPrivateFieldIn(state, receiver) {
   __classPrivateFieldGet,
   __classPrivateFieldSet,
   __classPrivateFieldIn,
+  __addDisposableResource,
+  __disposeResources,
 });
 
 

package/dest/node/main.d.ts

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-export declare function proveAndVerify(jsonPath: string, witnessPath: string, crsPath: string, isRecursive: boolean): Promise<boolean>;
-export declare function prove(jsonPath: string, witnessPath: string, crsPath: string, isRecursive: boolean, outputPath: string): Promise<void>;
-export declare function gateCount(jsonPath: string): Promise<void>;
+export declare function proveAndVerify(bytecodePath: string, witnessPath: string, crsPath: string, isRecursive: boolean): Promise<boolean>;
+export declare function prove(bytecodePath: string, witnessPath: string, crsPath: string, isRecursive: boolean, outputPath: string): Promise<void>;
+export declare function gateCount(bytecodePath: string): Promise<void>;
 export declare function verify(proofPath: string, isRecursive: boolean, vkPath: string): Promise<boolean>;
 export declare function contract(outputPath: string, vkPath: string): Promise<void>;
-export declare function writeVk(jsonPath: string, crsPath: string, outputPath: string): Promise<void>;
+export declare function writeVk(bytecodePath: string, crsPath: string, outputPath: string): Promise<void>;
 export declare function proofAsFields(proofPath: string, numInnerPublicInputs: number, outputPath: string): Promise<void>;
 export declare function vkAsFields(vkPath: string, vkeyOutputPath: string): Promise<void>;
 //# sourceMappingURL=main.d.ts.map

package/dest/node/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";AA0FA,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,oBAehH;AAED,wBAAsB,KAAK,CACzB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,OAAO,EACpB,UAAU,EAAE,MAAM,iBAenB;AAED,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,iBAO/C;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,iBAchE;AAED,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAkBlF;AAED,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAgBtG;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,iBAatE"}
+{"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"}

package/dest/node/main.js

@@ -8,26 +8,14 @@ createDebug.log = console.error.bind(console);
 const debug = createDebug('bb.js');
 // Maximum we support.
 const MAX_CIRCUIT_SIZE = 2 ** 19;
-function getJsonData(jsonPath) {
-    const json = readFileSync(jsonPath, 'utf-8');
-    const parsed = JSON.parse(json);
-    return parsed;
-}
-function getBytecode(jsonPath) {
-    const parsed = getJsonData(jsonPath);
-    const buffer = Buffer.from(parsed.bytecode, 'base64');
+function getBytecode(bytecodePath) {
+    const encodedCircuit = readFileSync(bytecodePath, 'utf-8');
+    const buffer = Buffer.from(encodedCircuit, 'base64');
     const decompressed = gunzipSync(buffer);
     return decompressed;
 }
-async function getGates(jsonPath, api) {
-    const parsed = getJsonData(jsonPath);
-    if (parsed.gates) {
-        return +parsed.gates;
-    }
-    const { total } = await computeCircuitSize(jsonPath, api);
-    const jsonData = getJsonData(jsonPath);
-    jsonData.gates = total;
-    writeFileSync(jsonPath, JSON.stringify(jsonData));
+async function getGates(bytecodePath, api) {
+    const { total } = await computeCircuitSize(bytecodePath, api);
     return total;
 }
 function getWitness(witnessPath) {
@@ -35,15 +23,15 @@ function getWitness(witnessPath) {
     const decompressed = gunzipSync(data);
     return decompressed;
 }
-async function computeCircuitSize(jsonPath, api) {
+async function computeCircuitSize(bytecodePath, api) {
     debug(`computing circuit size...`);
-    const bytecode = getBytecode(jsonPath);
+    const bytecode = getBytecode(bytecodePath);
     const [exact, total, subgroup] = await api.acirGetCircuitSizes(bytecode);
     return { exact, total, subgroup };
 }
-async function init(jsonPath, crsPath) {
+async function init(bytecodePath, crsPath) {
     const api = await newBarretenbergApiAsync();
-    const circuitSize = await getGates(jsonPath, api);
+    const circuitSize = await getGates(bytecodePath, api);
     const subgroupSize = Math.pow(2, Math.ceil(Math.log2(circuitSize)));
     if (subgroupSize > MAX_CIRCUIT_SIZE) {
         throw new Error(`Circuit size of ${subgroupSize} exceeds max supported of ${MAX_CIRCUIT_SIZE}`);
@@ -56,7 +44,7 @@ async function init(jsonPath, crsPath) {
     // Important to init slab allocator as first thing, to ensure maximum memory efficiency.
     await api.commonInitSlabAllocator(subgroupSize);
     // Load CRS into wasm global CRS state.
-    // TODO: Make RawBuffer be default behaviour, and have a specific Vector type for when wanting length prefixed.
+    // TODO: Make RawBuffer be default behavior, and have a specific Vector type for when wanting length prefixed.
     await api.srsInitSrs(new RawBuffer(crs.getG1Data()), crs.numPoints, new RawBuffer(crs.getG2Data()));
     const acirComposer = await api.acirNewAcirComposer(subgroupSize);
     return { api, acirComposer, circuitSize: subgroupSize };
@@ -70,41 +58,42 @@ async function initLite() {
     const acirComposer = await api.acirNewAcirComposer(0);
     return { api, acirComposer };
 }
-export async function proveAndVerify(jsonPath, witnessPath, crsPath, isRecursive) {
-    const { api, acirComposer } = await init(jsonPath, crsPath);
+export async function proveAndVerify(bytecodePath, witnessPath, crsPath, isRecursive) {
+    const { api, acirComposer } = await init(bytecodePath, crsPath);
     try {
         debug(`creating proof...`);
-        const bytecode = getBytecode(jsonPath);
+        const bytecode = getBytecode(bytecodePath);
         const witness = getWitness(witnessPath);
         const proof = await api.acirCreateProof(acirComposer, bytecode, witness, isRecursive);
         debug(`verifying...`);
         const verified = await api.acirVerifyProof(acirComposer, proof, isRecursive);
-        console.log(`verified: ${verified}`);
+        process.stdout.write(`${verified}`);
         return verified;
     }
     finally {
         await api.destroy();
     }
 }
-export async function prove(jsonPath, witnessPath, crsPath, isRecursive, outputPath) {
-    const { api, acirComposer } = await init(jsonPath, crsPath);
+export async function prove(bytecodePath, witnessPath, crsPath, isRecursive, outputPath) {
+    const { api, acirComposer } = await init(bytecodePath, crsPath);
     try {
         debug(`creating proof...`);
-        const bytecode = getBytecode(jsonPath);
+        const bytecode = getBytecode(bytecodePath);
         const witness = getWitness(witnessPath);
         const proof = await api.acirCreateProof(acirComposer, bytecode, witness, isRecursive);
         debug(`done.`);
+        process.stdout.write(proof);
         writeFileSync(outputPath, proof);
-        console.log(`proof written to: ${outputPath}`);
+        debug(`proof written to: ${outputPath}`);
     }
     finally {
         await api.destroy();
     }
 }
-export async function gateCount(jsonPath) {
+export async function gateCount(bytecodePath) {
     const api = await newBarretenbergApiAsync(1);
     try {
-        console.log(`gates: ${await getGates(jsonPath, api)}`);
+        process.stdout.write(`${await getGates(bytecodePath, api)}`);
     }
     finally {
         await api.destroy();
@@ -115,7 +104,7 @@ export async function verify(proofPath, isRecursive, vkPath) {
     try {
         await api.acirLoadVerificationKey(acirComposer, new RawBuffer(readFileSync(vkPath)));
         const verified = await api.acirVerifyProof(acirComposer, readFileSync(proofPath), isRecursive);
-        console.log(`verified: ${verified}`);
+        process.stdout.write(`${verified}`);
         return verified;
     }
     finally {
@@ -127,33 +116,25 @@ export async function contract(outputPath, vkPath) {
     try {
         await api.acirLoadVerificationKey(acirComposer, new RawBuffer(readFileSync(vkPath)));
         const contract = await api.acirGetSolidityVerifier(acirComposer);
-        if (outputPath === '-') {
-            console.log(contract);
-        }
-        else {
-            writeFileSync(outputPath, contract);
-            console.log(`contract written to: ${outputPath}`);
-        }
+        process.stdout.write(contract);
+        writeFileSync(outputPath, contract);
+        debug(`contract written to: ${outputPath}`);
     }
     finally {
         await api.destroy();
     }
 }
-export async function writeVk(jsonPath, crsPath, outputPath) {
-    const { api, acirComposer } = await init(jsonPath, crsPath);
+export async function writeVk(bytecodePath, crsPath, outputPath) {
+    const { api, acirComposer } = await init(bytecodePath, crsPath);
     try {
         debug('initing proving key...');
-        const bytecode = getBytecode(jsonPath);
+        const bytecode = getBytecode(bytecodePath);
         await api.acirInitProvingKey(acirComposer, bytecode);
         debug('initing verification key...');
         const vk = await api.acirGetVerificationKey(acirComposer);
-        if (outputPath === '-') {
-            process.stdout.write(vk);
-        }
-        else {
-            writeFileSync(outputPath, vk);
-            console.log(`vk written to: ${outputPath}`);
-        }
+        process.stdout.write(vk);
+        writeFileSync(outputPath, vk);
+        debug(`vk written to: ${outputPath}`);
     }
     finally {
         await api.destroy();
@@ -164,7 +145,9 @@ export async function proofAsFields(proofPath, numInnerPublicInputs, outputPath)
     try {
         debug('serializing proof byte array into field elements');
         const proofAsFields = await api.acirSerializeProofIntoFields(acirComposer, readFileSync(proofPath), numInnerPublicInputs);
-        writeFileSync(outputPath, JSON.stringify(proofAsFields.map(f => f.toString())));
+        const jsonProofAsFields = JSON.stringify(proofAsFields.map(f => f.toString()));
+        process.stdout.write(jsonProofAsFields);
+        writeFileSync(outputPath, jsonProofAsFields);
         debug('done.');
     }
     finally {
@@ -178,7 +161,9 @@ export async function vkAsFields(vkPath, vkeyOutputPath) {
         await api.acirLoadVerificationKey(acirComposer, new RawBuffer(readFileSync(vkPath)));
         const [vkAsFields, vkHash] = await api.acirSerializeVerificationKeyIntoFields(acirComposer);
         const output = [vkHash, ...vkAsFields].map(f => f.toString());
-        writeFileSync(vkeyOutputPath, JSON.stringify(output));
+        const jsonVKAsFields = JSON.stringify(output);
+        process.stdout.write(jsonVKAsFields);
+        writeFileSync(vkeyOutputPath, jsonVKAsFields);
         debug('done.');
     }
     finally {
@@ -196,32 +181,32 @@ function handleGlobalOptions() {
 program
     .command('prove_and_verify')
     .description('Generate a proof and verify it. Process exits with success or failure code.')
-    .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
+    .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/main.bytecode')
     .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.tr')
     .option('-r, --recursive', 'prove and verify using recursive prover and verifier', false)
-    .action(async ({ jsonPath, witnessPath, recursive, crsPath }) => {
+    .action(async ({ bytecodePath, witnessPath, recursive, crsPath }) => {
     handleGlobalOptions();
-    const result = await proveAndVerify(jsonPath, witnessPath, crsPath, recursive);
+    const result = await proveAndVerify(bytecodePath, witnessPath, crsPath, recursive);
     process.exit(result ? 0 : 1);
 });
 program
     .command('prove')
     .description('Generate a proof and write it to a file.')
-    .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
+    .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/main.bytecode')
     .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.tr')
     .option('-r, --recursive', 'prove using recursive prover', false)
     .option('-o, --output-path <path>', 'Specify the proof output path', './proofs/proof')
-    .action(async ({ jsonPath, witnessPath, recursive, outputPath, crsPath }) => {
+    .action(async ({ bytecodePath, witnessPath, recursive, outputPath, crsPath }) => {
     handleGlobalOptions();
-    await prove(jsonPath, witnessPath, crsPath, recursive, outputPath);
+    await prove(bytecodePath, witnessPath, crsPath, recursive, outputPath);
 });
 program
     .command('gates')
     .description('Print gate count to standard output.')
-    .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
-    .action(async ({ jsonPath }) => {
+    .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/main.bytecode')
+    .action(async ({ bytecodePath: bytecodePath }) => {
     handleGlobalOptions();
-    await gateCount(jsonPath);
+    await gateCount(bytecodePath);
 });
 program
     .command('verify')
@@ -237,7 +222,7 @@ program
 program
     .command('contract')
     .description('Output solidity verification key contract.')
-    .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
+    .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/main.bytecode')
     .option('-o, --output-path <path>', 'Specify the path to write the contract', '-')
     .requiredOption('-k, --vk <path>', 'path to a verification key. avoids recomputation.')
     .action(async ({ outputPath, vk }) => {
@@ -247,11 +232,11 @@ program
 program
     .command('write_vk')
     .description('Output verification key.')
-    .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
+    .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/main.bytecode')
     .requiredOption('-o, --output-path <path>', 'Specify the path to write the key')
-    .action(async ({ jsonPath, outputPath, crsPath }) => {
+    .action(async ({ bytecodePath, outputPath, crsPath }) => {
     handleGlobalOptions();
-    await writeVk(jsonPath, crsPath, outputPath);
+    await writeVk(bytecodePath, crsPath, outputPath);
 });
 program
     .command('proof_as_fields')
@@ -265,7 +250,7 @@ program
 });
 program
     .command('vk_as_fields')
-    .description('Return the verifiation key represented as fields elements. Also return the verification key hash.')
+    .description('Return the verification key represented as fields elements. Also return the verification key hash.')
     .requiredOption('-i, --input-path <path>', 'Specifies the vk path (output from write_vk)')
     .requiredOption('-o, --output-path <path>', 'Specify the JSON path to write the verification key fields and key hash')
     .action(async ({ inputPath, outputPath }) => {
@@ -273,4 +258,4 @@ program
     await vkAsFields(inputPath, outputPath);
 });
 program.name('bb.js').parse(process.argv);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb.js",
-  "version": "0.3.6",
+  "version": "0.4.2",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/circuits/cpp/barretenberg/ts",
   "license": "MIT",
   "type": "module",
@@ -9,8 +9,10 @@
     "displayName": "bb.js",
     "tsconfig": "./tsconfig.json"
   },
-  "main": "./dest/index.js",
-  "bin": "./dest/main.js",
+  "main": "./dest/node/index.js",
+  "bin": {
+    "bb": "dest/node/main.js"
+  },
   "files": [
     "src/",
     "dest/",
@@ -66,6 +68,7 @@
     "ts-jest": "^29.1.0",
     "ts-loader": "^9.4.2",
     "tsconfig-paths-webpack-plugin": "^4.0.1",
+    "tslib": "^2.6.2",
     "typescript": "^5.0.4",
     "webpack": "^5.82.1",
     "webpack-cli": "^5.1.1",

package/src/main.ts

@@ -11,28 +11,15 @@ const debug = createDebug('bb.js');
 // Maximum we support.
 const MAX_CIRCUIT_SIZE = 2 ** 19;
 
-function getJsonData(jsonPath: string) {
-  const json = readFileSync(jsonPath, 'utf-8');
-  const parsed = JSON.parse(json);
-  return parsed;
-}
-
-function getBytecode(jsonPath: string) {
-  const parsed = getJsonData(jsonPath);
-  const buffer = Buffer.from(parsed.bytecode, 'base64');
+function getBytecode(bytecodePath: string) {
+  const encodedCircuit = readFileSync(bytecodePath, 'utf-8');
+  const buffer = Buffer.from(encodedCircuit, 'base64');
   const decompressed = gunzipSync(buffer);
   return decompressed;
 }
 
-async function getGates(jsonPath: string, api: BarretenbergApiAsync) {
-  const parsed = getJsonData(jsonPath);
-  if (parsed.gates) {
-    return +parsed.gates;
-  }
-  const { total } = await computeCircuitSize(jsonPath, api);
-  const jsonData = getJsonData(jsonPath);
-  jsonData.gates = total;
-  writeFileSync(jsonPath, JSON.stringify(jsonData));
+async function getGates(bytecodePath: string, api: BarretenbergApiAsync) {
+  const { total } = await computeCircuitSize(bytecodePath, api);
   return total;
 }
 
@@ -42,17 +29,17 @@ function getWitness(witnessPath: string) {
   return decompressed;
 }
 
-async function computeCircuitSize(jsonPath: string, api: BarretenbergApiAsync) {
+async function computeCircuitSize(bytecodePath: string, api: BarretenbergApiAsync) {
   debug(`computing circuit size...`);
-  const bytecode = getBytecode(jsonPath);
+  const bytecode = getBytecode(bytecodePath);
   const [exact, total, subgroup] = await api.acirGetCircuitSizes(bytecode);
   return { exact, total, subgroup };
 }
 
-async function init(jsonPath: string, crsPath: string) {
+async function init(bytecodePath: string, crsPath: string) {
   const api = await newBarretenbergApiAsync();
 
-  const circuitSize = await getGates(jsonPath, api);
+  const circuitSize = await getGates(bytecodePath, api);
   const subgroupSize = Math.pow(2, Math.ceil(Math.log2(circuitSize)));
   if (subgroupSize > MAX_CIRCUIT_SIZE) {
     throw new Error(`Circuit size of ${subgroupSize} exceeds max supported of ${MAX_CIRCUIT_SIZE}`);
@@ -68,7 +55,7 @@ async function init(jsonPath: string, crsPath: string) {
   await api.commonInitSlabAllocator(subgroupSize);
 
   // Load CRS into wasm global CRS state.
-  // TODO: Make RawBuffer be default behaviour, and have a specific Vector type for when wanting length prefixed.
+  // TODO: Make RawBuffer be default behavior, and have a specific Vector type for when wanting length prefixed.
   await api.srsInitSrs(new RawBuffer(crs.getG1Data()), crs.numPoints, new RawBuffer(crs.getG2Data()));
 
   const acirComposer = await api.acirNewAcirComposer(subgroupSize);
@@ -88,17 +75,17 @@ async function initLite() {
   return { api, acirComposer };
 }
 
-export async function proveAndVerify(jsonPath: string, witnessPath: string, crsPath: string, isRecursive: boolean) {
-  const { api, acirComposer } = await init(jsonPath, crsPath);
+export async function proveAndVerify(bytecodePath: string, witnessPath: string, crsPath: string, isRecursive: boolean) {
+  const { api, acirComposer } = await init(bytecodePath, crsPath);
   try {
     debug(`creating proof...`);
-    const bytecode = getBytecode(jsonPath);
+    const bytecode = getBytecode(bytecodePath);
     const witness = getWitness(witnessPath);
     const proof = await api.acirCreateProof(acirComposer, bytecode, witness, isRecursive);
 
     debug(`verifying...`);
     const verified = await api.acirVerifyProof(acirComposer, proof, isRecursive);
-    console.log(`verified: ${verified}`);
+    process.stdout.write(`${verified}`);
     return verified;
   } finally {
     await api.destroy();
@@ -106,31 +93,33 @@ export async function proveAndVerify(jsonPath: string, witnessPath: string, crsP
 }
 
 export async function prove(
-  jsonPath: string,
+  bytecodePath: string,
   witnessPath: string,
   crsPath: string,
   isRecursive: boolean,
   outputPath: string,
 ) {
-  const { api, acirComposer } = await init(jsonPath, crsPath);
+  const { api, acirComposer } = await init(bytecodePath, crsPath);
   try {
     debug(`creating proof...`);
-    const bytecode = getBytecode(jsonPath);
+    const bytecode = getBytecode(bytecodePath);
     const witness = getWitness(witnessPath);
     const proof = await api.acirCreateProof(acirComposer, bytecode, witness, isRecursive);
     debug(`done.`);
 
+    process.stdout.write(proof);
     writeFileSync(outputPath, proof);
-    console.log(`proof written to: ${outputPath}`);
+
+    debug(`proof written to: ${outputPath}`);
   } finally {
     await api.destroy();
   }
 }
 
-export async function gateCount(jsonPath: string) {
+export async function gateCount(bytecodePath: string) {
   const api = await newBarretenbergApiAsync(1);
   try {
-    console.log(`gates: ${await getGates(jsonPath, api)}`);
+    process.stdout.write(`${await getGates(bytecodePath, api)}`);
   } finally {
     await api.destroy();
   }
@@ -141,7 +130,8 @@ export async function verify(proofPath: string, isRecursive: boolean, vkPath: st
   try {
     await api.acirLoadVerificationKey(acirComposer, new RawBuffer(readFileSync(vkPath)));
     const verified = await api.acirVerifyProof(acirComposer, readFileSync(proofPath), isRecursive);
-    console.log(`verified: ${verified}`);
+
+    process.stdout.write(`${verified}`);
     return verified;
   } finally {
     await api.destroy();
@@ -153,32 +143,30 @@ export async function contract(outputPath: string, vkPath: string) {
   try {
     await api.acirLoadVerificationKey(acirComposer, new RawBuffer(readFileSync(vkPath)));
     const contract = await api.acirGetSolidityVerifier(acirComposer);
-    if (outputPath === '-') {
-      console.log(contract);
-    } else {
-      writeFileSync(outputPath, contract);
-      console.log(`contract written to: ${outputPath}`);
-    }
+
+    process.stdout.write(contract);
+    writeFileSync(outputPath, contract);
+
+    debug(`contract written to: ${outputPath}`);
   } finally {
     await api.destroy();
   }
 }
 
-export async function writeVk(jsonPath: string, crsPath: string, outputPath: string) {
-  const { api, acirComposer } = await init(jsonPath, crsPath);
+export async function writeVk(bytecodePath: string, crsPath: string, outputPath: string) {
+  const { api, acirComposer } = await init(bytecodePath, crsPath);
   try {
     debug('initing proving key...');
-    const bytecode = getBytecode(jsonPath);
+    const bytecode = getBytecode(bytecodePath);
     await api.acirInitProvingKey(acirComposer, bytecode);
 
     debug('initing verification key...');
     const vk = await api.acirGetVerificationKey(acirComposer);
-    if (outputPath === '-') {
-      process.stdout.write(vk);
-    } else {
-      writeFileSync(outputPath, vk);
-      console.log(`vk written to: ${outputPath}`);
-    }
+
+    process.stdout.write(vk);
+    writeFileSync(outputPath, vk);
+
+    debug(`vk written to: ${outputPath}`);
   } finally {
     await api.destroy();
   }
@@ -194,8 +182,11 @@ export async function proofAsFields(proofPath: string, numInnerPublicInputs: num
       readFileSync(proofPath),
       numInnerPublicInputs,
     );
+    const jsonProofAsFields = JSON.stringify(proofAsFields.map(f => f.toString()));
+
+    process.stdout.write(jsonProofAsFields);
+    writeFileSync(outputPath, jsonProofAsFields);
 
-    writeFileSync(outputPath, JSON.stringify(proofAsFields.map(f => f.toString())));
     debug('done.');
   } finally {
     await api.destroy();
@@ -210,7 +201,11 @@ export async function vkAsFields(vkPath: string, vkeyOutputPath: string) {
     await api.acirLoadVerificationKey(acirComposer, new RawBuffer(readFileSync(vkPath)));
     const [vkAsFields, vkHash] = await api.acirSerializeVerificationKeyIntoFields(acirComposer);
     const output = [vkHash, ...vkAsFields].map(f => f.toString());
-    writeFileSync(vkeyOutputPath, JSON.stringify(output));
+    const jsonVKAsFields = JSON.stringify(output);
+
+    process.stdout.write(jsonVKAsFields);
+    writeFileSync(vkeyOutputPath, jsonVKAsFields);
+
     debug('done.');
   } finally {
     await api.destroy();
@@ -231,34 +226,34 @@ function handleGlobalOptions() {
 program
   .command('prove_and_verify')
   .description('Generate a proof and verify it. Process exits with success or failure code.')
-  .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/main.bytecode')
   .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.tr')
   .option('-r, --recursive', 'prove and verify using recursive prover and verifier', false)
-  .action(async ({ jsonPath, witnessPath, recursive, crsPath }) => {
+  .action(async ({ bytecodePath, witnessPath, recursive, crsPath }) => {
     handleGlobalOptions();
-    const result = await proveAndVerify(jsonPath, witnessPath, crsPath, recursive);
+    const result = await proveAndVerify(bytecodePath, witnessPath, crsPath, recursive);
     process.exit(result ? 0 : 1);
   });
 
 program
   .command('prove')
   .description('Generate a proof and write it to a file.')
-  .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/main.bytecode')
   .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.tr')
   .option('-r, --recursive', 'prove using recursive prover', false)
   .option('-o, --output-path <path>', 'Specify the proof output path', './proofs/proof')
-  .action(async ({ jsonPath, witnessPath, recursive, outputPath, crsPath }) => {
+  .action(async ({ bytecodePath, witnessPath, recursive, outputPath, crsPath }) => {
     handleGlobalOptions();
-    await prove(jsonPath, witnessPath, crsPath, recursive, outputPath);
+    await prove(bytecodePath, witnessPath, crsPath, recursive, outputPath);
   });
 
 program
   .command('gates')
   .description('Print gate count to standard output.')
-  .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
-  .action(async ({ jsonPath }) => {
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/main.bytecode')
+  .action(async ({ bytecodePath: bytecodePath }) => {
     handleGlobalOptions();
-    await gateCount(jsonPath);
+    await gateCount(bytecodePath);
   });
 
 program
@@ -276,7 +271,7 @@ program
 program
   .command('contract')
   .description('Output solidity verification key contract.')
-  .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/main.bytecode')
   .option('-o, --output-path <path>', 'Specify the path to write the contract', '-')
   .requiredOption('-k, --vk <path>', 'path to a verification key. avoids recomputation.')
   .action(async ({ outputPath, vk }) => {
@@ -287,11 +282,11 @@ program
 program
   .command('write_vk')
   .description('Output verification key.')
-  .option('-j, --json-path <path>', 'Specify the JSON path', './target/main.json')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/main.bytecode')
   .requiredOption('-o, --output-path <path>', 'Specify the path to write the key')
-  .action(async ({ jsonPath, outputPath, crsPath }) => {
+  .action(async ({ bytecodePath, outputPath, crsPath }) => {
     handleGlobalOptions();
-    await writeVk(jsonPath, crsPath, outputPath);
+    await writeVk(bytecodePath, crsPath, outputPath);
   });
 
 program
@@ -307,7 +302,7 @@ program
 
 program
   .command('vk_as_fields')
-  .description('Return the verifiation key represented as fields elements. Also return the verification key hash.')
+  .description('Return the verification key represented as fields elements. Also return the verification key hash.')
   .requiredOption('-i, --input-path <path>', 'Specifies the vk path (output from write_vk)')
   .requiredOption('-o, --output-path <path>', 'Specify the JSON path to write the verification key fields and key hash')
   .action(async ({ inputPath, outputPath }) => {