@aztec/bb.js 0.7.10 → 0.8.2

package/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/index.ts

@@ -2,7 +2,17 @@ import { Worker } from 'worker_threads';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
 
+function getCurrentDir() {
+  if (typeof __dirname !== 'undefined') {
+    return __dirname;
+  } else {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    return dirname(fileURLToPath(import.meta.url));
+  }
+}
+
 export function createMainWorker() {
-  const __dirname = dirname(fileURLToPath(import.meta.url));
+  const __dirname = getCurrentDir();
   return new Worker(__dirname + `/main.worker.js`);
 }

package/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/index.ts

@@ -2,7 +2,17 @@ import { Worker } from 'worker_threads';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
 
+function getCurrentDir() {
+  if (typeof __dirname !== 'undefined') {
+    return __dirname;
+  } else {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    return dirname(fileURLToPath(import.meta.url));
+  }
+}
+
 export function createThreadWorker() {
-  const __dirname = dirname(fileURLToPath(import.meta.url));
+  const __dirname = getCurrentDir();
   return new Worker(__dirname + `/thread.worker.js`);
 }

package/src/barretenberg_wasm/fetch_code/browser/index.ts

@@ -1,5 +1,5 @@
-import barretenbergModule from '../../../barretenberg.wasm';
-import barretenbergThreadsModule from '../../../barretenberg-threads.wasm';
+import barretenbergModule from '../../barretenberg.wasm';
+import barretenbergThreadsModule from '../../barretenberg-threads.wasm';
 
 // Annoyingly the wasm declares if it's memory is shared or not. So now we need two wasms if we want to be
 // able to fallback on "non shared memory" situations.

package/src/barretenberg_wasm/fetch_code/node/index.ts

@@ -2,8 +2,18 @@ import { readFile } from 'fs/promises';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
 
+function getCurrentDir() {
+  if (typeof __dirname !== 'undefined') {
+    return __dirname;
+  } else {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    return dirname(fileURLToPath(import.meta.url));
+  }
+}
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function fetchCode(multithreaded: boolean) {
-  const path = dirname(fileURLToPath(import.meta.url)) + '/../../../barretenberg-threads.wasm';
+  const path = getCurrentDir() + '/../../barretenberg-threads.wasm';
   return await readFile(path);
 }

package/src/bindgen/index.ts

@@ -1,7 +1,7 @@
 import { generateRustCode } from './rust.js';
 import { generateTypeScriptCode } from './typescript.js';
 
-const [, , exports = '../exports.json', lang = 'ts'] = process.argv;
+const [, , exp = '../exports.json', lang = 'ts'] = process.argv;
 
 function generateCode(exports: string, lang: string) {
   switch (lang) {
@@ -14,4 +14,4 @@ function generateCode(exports: string, lang: string) {
   }
 }
 
-console.log(generateCode(exports, lang));
+console.log(generateCode(exp, lang));

package/src/bindgen/typescript.ts

@@ -9,7 +9,7 @@ export function generateTypeScriptCode(filename: string) {
 
   let output = `// WARNING: FILE CODE GENERATED BY BINDGEN UTILITY. DO NOT EDIT!
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { BarretenbergBinder, BarretenbergBinderSync } from '../barretenberg_binder/index.js';
+import { BarretenbergBinder } from '../barretenberg_binder/index.js';
 import { BufferDeserializer, NumberDeserializer, VectorDeserializer, BoolDeserializer, StringDeserializer } from '../serialize/index.js';
 import { Fr, Fq, Point, Buffer32, Buffer128, Ptr } from '../types/index.js';
 

package/src/crs/node/ignition_files_crs.ts

@@ -3,10 +3,20 @@ import { readFile } from 'fs/promises';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
 
+function getCurrentDir() {
+  if (typeof __dirname !== 'undefined') {
+    return __dirname;
+  } else {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    return dirname(fileURLToPath(import.meta.url));
+  }
+}
+
 /**
  * The path to our SRS object, assuming that we are in barretenberg/ts folder.
  */
-export const SRS_DEV_PATH = dirname(fileURLToPath(import.meta.url)) + '/../../../cpp/srs_db/ignition/monomial';
+export const SRS_DEV_PATH = getCurrentDir() + '/../../../cpp/srs_db/ignition/monomial';
 
 /**
  * Downloader for CRS from a local file (for Node).

package/src/info.ts

@@ -0,0 +1,23 @@
+/* eslint-disable camelcase */
+export const acvmInfoJson = {
+  language: {
+    name: 'PLONK-CSAT',
+    width: 3,
+  },
+  opcodes_supported: ['arithmetic', 'directive', 'brillig', 'memory_init', 'memory_op'],
+  black_box_functions_supported: [
+    'and',
+    'xor',
+    'range',
+    'sha256',
+    'blake2s',
+    'keccak256',
+    'schnorr_verify',
+    'pedersen',
+    'hash_to_field_128_security',
+    'ecdsa_secp256k1',
+    'ecdsa_secp256r1',
+    'fixed_base_scalar_mul',
+    'recursive_aggregation',
+  ],
+};

package/src/main.ts

@@ -4,7 +4,7 @@ import createDebug from 'debug';
 import { readFileSync, writeFileSync } from 'fs';
 import { gunzipSync } from 'zlib';
 import { Command } from 'commander';
-import acvmInfoJson from './info.json' assert { type: 'json' };
+import { acvmInfoJson } from './info.js';
 createDebug.log = console.error.bind(console);
 const debug = createDebug('bb.js');
 
@@ -126,7 +126,15 @@ export async function prove(
 export async function gateCount(bytecodePath: string) {
   const api = await Barretenberg.new(1);
   try {
-    process.stdout.write(`${await getGates(bytecodePath, api)}`);
+    const numberOfGates = await getGates(bytecodePath, api);
+
+    // Create an 8-byte buffer and write the number into it.
+    // Writing number directly to stdout will result in a variable sized
+    // input depending on the size.
+    const buffer = Buffer.alloc(8);
+    buffer.writeBigInt64LE(BigInt(numberOfGates));
+
+    process.stdout.write(buffer);
   } finally {
     await api.destroy();
   }

package/cjs-entry/index.cjs

@@ -1,10 +0,0 @@
-let loadedModule;
-
-async function loadModule() {
-  if (!loadedModule) {
-    loadedModule = await import('../dest/node/index.js');
-  }
-  return loadedModule;
-}
-
-module.exports = { loadModule };

package/cjs-entry/index.d.ts

@@ -1 +0,0 @@
-export function loadModule(): Promise<typeof import('../dest/node/index.js')>;

package/dest/node/info.json

@@ -1,22 +0,0 @@
-{
-    "language": {
-        "name": "PLONK-CSAT",
-        "width": 3
-    },
-    "opcodes_supported": ["arithmetic", "directive", "brillig", "memory_init", "memory_op"],
-    "black_box_functions_supported": [
-        "and",
-        "xor",
-        "range",
-        "sha256",
-        "blake2s",
-        "keccak256",
-        "schnorr_verify",
-        "pedersen",
-        "hash_to_field_128_security",
-        "ecdsa_secp256k1",
-        "ecdsa_secp256r1",
-        "fixed_base_scalar_mul",
-        "recursive_aggregation"
-    ]
-}

package/src/info.json

@@ -1,22 +0,0 @@
-{
-  "language": {
-    "name": "PLONK-CSAT",
-    "width": 3
-  },
-  "opcodes_supported": ["arithmetic", "directive", "brillig", "memory_init", "memory_op"],
-  "black_box_functions_supported": [
-    "and",
-    "xor",
-    "range",
-    "sha256",
-    "blake2s",
-    "keccak256",
-    "schnorr_verify",
-    "pedersen",
-    "hash_to_field_128_security",
-    "ecdsa_secp256k1",
-    "ecdsa_secp256r1",
-    "fixed_base_scalar_mul",
-    "recursive_aggregation"
-  ]
-}