@aztec/bb.js 0.4.6 → 0.5.1

package/dest/node/types/fixed_size_buffer.js

@@ -1,6 +1,6 @@
 import { randomBytes } from '../random/index.js';
 import { BufferReader } from '../serialize/index.js';
-export class Buffer32 {
+class Buffer32 {
     constructor(buffer) {
         this.buffer = buffer;
     }
@@ -16,7 +16,8 @@ export class Buffer32 {
     }
 }
 Buffer32.SIZE_IN_BYTES = 32;
-export class Buffer64 {
+export { Buffer32 };
+class Buffer64 {
     constructor(buffer) {
         this.buffer = buffer;
     }
@@ -32,7 +33,8 @@ export class Buffer64 {
     }
 }
 Buffer64.SIZE_IN_BYTES = 64;
-export class Buffer128 {
+export { Buffer64 };
+class Buffer128 {
     constructor(buffer) {
         this.buffer = buffer;
     }
@@ -48,4 +50,5 @@ export class Buffer128 {
     }
 }
 Buffer128.SIZE_IN_BYTES = 128;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4ZWRfc2l6ZV9idWZmZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvZml4ZWRfc2l6ZV9idWZmZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVyRCxNQUFNLE9BQU8sUUFBUTtJQUduQixZQUE0QixNQUFrQjtRQUFsQixXQUFNLEdBQU4sTUFBTSxDQUFZO0lBQUcsQ0FBQztJQUVsRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQWlDO1FBQ2pELE1BQU0sTUFBTSxHQUFHLFlBQVksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0MsT0FBTyxJQUFJLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO0lBQzVELENBQUM7SUFFRCxNQUFNLENBQUMsTUFBTTtRQUNYLE9BQU8sSUFBSSxRQUFRLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxRQUFRO1FBQ04sT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQ3JCLENBQUM7O0FBZk0sc0JBQWEsR0FBRyxFQUFFLENBQUM7QUFrQjVCLE1BQU0sT0FBTyxRQUFRO0lBR25CLFlBQTRCLE1BQWtCO1FBQWxCLFdBQU0sR0FBTixNQUFNLENBQVk7SUFBRyxDQUFDO0lBRWxELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBaUM7UUFDakQsTUFBTSxNQUFNLEdBQUcsWUFBWSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM3QyxPQUFPLElBQUksUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUFNO1FBQ1gsT0FBTyxJQUFJLFFBQVEsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7SUFDdkQsQ0FBQztJQUVELFFBQVE7UUFDTixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDckIsQ0FBQzs7QUFmTSxzQkFBYSxHQUFHLEVBQUUsQ0FBQztBQWtCNUIsTUFBTSxPQUFPLFNBQVM7SUFHcEIsWUFBNEIsTUFBa0I7UUFBbEIsV0FBTSxHQUFOLE1BQU0sQ0FBWTtJQUFHLENBQUM7SUFFbEQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFpQztRQUNqRCxNQUFNLE1BQU0sR0FBRyxZQUFZLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzdDLE9BQU8sSUFBSSxTQUFTLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztJQUM3RCxDQUFDO0lBRUQsTUFBTSxDQUFDLE1BQU07UUFDWCxPQUFPLElBQUksU0FBUyxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsUUFBUTtRQUNOLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQztJQUNyQixDQUFDOztBQWZNLHVCQUFhLEdBQUcsR0FBRyxDQUFDIn0=
+export { Buffer128 };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4ZWRfc2l6ZV9idWZmZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvZml4ZWRfc2l6ZV9idWZmZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVyRCxNQUFhLFFBQVE7SUFHbkIsWUFBNEIsTUFBa0I7UUFBbEIsV0FBTSxHQUFOLE1BQU0sQ0FBWTtJQUFHLENBQUM7SUFFbEQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFpQztRQUNqRCxNQUFNLE1BQU0sR0FBRyxZQUFZLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzdDLE9BQU8sSUFBSSxRQUFRLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztJQUM1RCxDQUFDO0lBRUQsTUFBTSxDQUFDLE1BQU07UUFDWCxPQUFPLElBQUksUUFBUSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztJQUN2RCxDQUFDO0lBRUQsUUFBUTtRQUNOLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQztJQUNyQixDQUFDOztBQWZNLHNCQUFhLEdBQUcsRUFBRSxDQUFDO1NBRGYsUUFBUTtBQW1CckIsTUFBYSxRQUFRO0lBR25CLFlBQTRCLE1BQWtCO1FBQWxCLFdBQU0sR0FBTixNQUFNLENBQVk7SUFBRyxDQUFDO0lBRWxELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBaUM7UUFDakQsTUFBTSxNQUFNLEdBQUcsWUFBWSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM3QyxPQUFPLElBQUksUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUFNO1FBQ1gsT0FBTyxJQUFJLFFBQVEsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7SUFDdkQsQ0FBQztJQUVELFFBQVE7UUFDTixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDckIsQ0FBQzs7QUFmTSxzQkFBYSxHQUFHLEVBQUUsQ0FBQztTQURmLFFBQVE7QUFtQnJCLE1BQWEsU0FBUztJQUdwQixZQUE0QixNQUFrQjtRQUFsQixXQUFNLEdBQU4sTUFBTSxDQUFZO0lBQUcsQ0FBQztJQUVsRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQWlDO1FBQ2pELE1BQU0sTUFBTSxHQUFHLFlBQVksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0MsT0FBTyxJQUFJLFNBQVMsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO0lBQzdELENBQUM7SUFFRCxNQUFNLENBQUMsTUFBTTtRQUNYLE9BQU8sSUFBSSxTQUFTLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO0lBQ3hELENBQUM7SUFFRCxRQUFRO1FBQ04sT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQ3JCLENBQUM7O0FBZk0sdUJBQWEsR0FBRyxHQUFHLENBQUM7U0FEaEIsU0FBUyJ9

package/dest/node/types/index.d.ts

@@ -1,6 +1,6 @@
 export * from './ptr.js';
 export * from './fields.js';
-export * from './node/index.js';
+export * from './point.js';
 export * from './fixed_size_buffer.js';
 export * from './raw_buffer.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/node/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC"}

package/dest/node/types/index.js

@@ -1,6 +1,6 @@
 export * from './ptr.js';
 export * from './fields.js';
-export * from './node/index.js';
+export * from './point.js';
 export * from './fixed_size_buffer.js';
 export * from './raw_buffer.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxVQUFVLENBQUM7QUFDekIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLGlCQUFpQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxVQUFVLENBQUM7QUFDekIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLGlCQUFpQixDQUFDIn0=

package/dest/{browser/types/node → node/types}/point.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
-import { Fr } from '../index.js';
-import { BufferReader } from '../../serialize/buffer_reader.js';
+import { Fr } from './index.js';
+import { BufferReader } from '../serialize/buffer_reader.js';
 export declare class Point {
     readonly x: Fr;
     readonly y: Fr;

package/dest/node/types/point.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/types/point.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,YAAY,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,qBAAa,KAAK;aAIY,CAAC,EAAE,EAAE;aAAkB,CAAC,EAAE,EAAE;IAHxD,MAAM,CAAC,aAAa,SAAM;IAC1B,MAAM,CAAC,KAAK,QAA+B;gBAEf,CAAC,EAAE,EAAE,EAAkB,CAAC,EAAE,EAAE;IAExD,MAAM,CAAC,MAAM;IAKb,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY;IAKnD,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM;IAIjC,QAAQ;IAIR,QAAQ;IAIR,MAAM,CAAC,GAAG,EAAE,KAAK;CAGlB"}

package/dest/node/types/point.js

@@ -0,0 +1,32 @@
+import { Fr } from './index.js';
+import { BufferReader } from '../serialize/buffer_reader.js';
+class Point {
+    constructor(x, y) {
+        this.x = x;
+        this.y = y;
+    }
+    static random() {
+        // TODO: This is not a point on the curve!
+        return new Point(Fr.random(), Fr.random());
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new this(Fr.fromBuffer(reader), Fr.fromBuffer(reader));
+    }
+    static fromString(address) {
+        return Point.fromBuffer(Buffer.from(address.replace(/^0x/i, ''), 'hex'));
+    }
+    toBuffer() {
+        return Buffer.concat([this.x.toBuffer(), this.y.toBuffer()]);
+    }
+    toString() {
+        return '0x' + this.toBuffer().toString('hex');
+    }
+    equals(rhs) {
+        return this.x.equals(rhs.x) && this.y.equals(rhs.y);
+    }
+}
+Point.SIZE_IN_BYTES = 64;
+Point.EMPTY = new Point(Fr.ZERO, Fr.ZERO);
+export { Point };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9pbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZXMvcG9pbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUNoQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFN0QsTUFBYSxLQUFLO0lBSWhCLFlBQTRCLENBQUssRUFBa0IsQ0FBSztRQUE1QixNQUFDLEdBQUQsQ0FBQyxDQUFJO1FBQWtCLE1BQUMsR0FBRCxDQUFDLENBQUk7SUFBRyxDQUFDO0lBRTVELE1BQU0sQ0FBQyxNQUFNO1FBQ1gsMENBQTBDO1FBQzFDLE9BQU8sSUFBSSxLQUFLLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQWlDO1FBQ2pELE1BQU0sTUFBTSxHQUFHLFlBQVksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0MsT0FBTyxJQUFJLElBQUksQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztJQUNoRSxDQUFDO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxPQUFlO1FBQy9CLE9BQU8sS0FBSyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFDM0UsQ0FBQztJQUVELFFBQVE7UUFDTixPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFFRCxRQUFRO1FBQ04sT0FBTyxJQUFJLEdBQUcsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRUQsTUFBTSxDQUFDLEdBQVU7UUFDZixPQUFPLElBQUksQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQzs7QUE3Qk0sbUJBQWEsR0FBRyxFQUFFLENBQUM7QUFDbkIsV0FBSyxHQUFHLElBQUksS0FBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1NBRmhDLEtBQUsifQ==

package/dest/node/types/ptr.js

@@ -3,7 +3,7 @@ import { BufferReader } from '../serialize/index.js';
  * Holds an opaque pointer into WASM memory.
  * Currently only 4 bytes, but could grow to 8 bytes with wasm64.
  */
-export class Ptr {
+class Ptr {
     constructor(value) {
         this.value = value;
     }
@@ -16,4 +16,5 @@ export class Ptr {
     }
 }
 Ptr.SIZE_IN_BYTES = 4;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHRyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3R5cGVzL3B0ci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFckQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLEdBQUc7SUFHZCxZQUE0QixLQUFpQjtRQUFqQixVQUFLLEdBQUwsS0FBSyxDQUFZO0lBQUcsQ0FBQztJQUVqRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQWlDO1FBQ2pELE1BQU0sTUFBTSxHQUFHLFlBQVksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0MsT0FBTyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO0lBQ3hELENBQUM7SUFFRCxRQUFRO1FBQ04sT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDO0lBQ3BCLENBQUM7O0FBWE0saUJBQWEsR0FBRyxDQUFDLENBQUMifQ==
+export { Ptr };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHRyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3R5cGVzL3B0ci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFckQ7OztHQUdHO0FBQ0gsTUFBYSxHQUFHO0lBR2QsWUFBNEIsS0FBaUI7UUFBakIsVUFBSyxHQUFMLEtBQUssQ0FBWTtJQUFHLENBQUM7SUFFakQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFpQztRQUNqRCxNQUFNLE1BQU0sR0FBRyxZQUFZLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzdDLE9BQU8sSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsUUFBUTtRQUNOLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQztJQUNwQixDQUFDOztBQVhNLGlCQUFhLEdBQUcsQ0FBQyxDQUFDO1NBRGQsR0FBRyJ9

package/package.json

@@ -1,51 +1,59 @@
 {
   "name": "@aztec/bb.js",
-  "version": "0.4.6",
+  "version": "0.5.1",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/circuits/cpp/barretenberg/ts",
   "license": "MIT",
   "type": "module",
-  "typedoc": {
-    "entryPoint": "./src/index.ts",
-    "displayName": "bb.js",
-    "tsconfig": "./tsconfig.json"
-  },
-  "main": "./dest/node/index.js",
-  "bin": {
-    "bb": "dest/node/main.js"
+  "types": "./cjs-entry/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./cjs-entry/index.cjs",
+      "browser": "./dest/browser/index.js",
+      "default": "./dest/node/index.js"
+    }
   },
+  "bin": "./dest/node/main.js",
   "files": [
     "src/",
     "dest/",
-    "!dest/browser/*.wasm",
     "README.md"
   ],
   "scripts": {
-    "clean": "rm -rf ./dest .tsbuildinfo.browser .tsbuildinfo.node",
-    "build": "yarn clean && yarn build:wasm && yarn build:ts:browser && yarn build:ts:node",
+    "clean": "rm -rf ./dest .tsbuildinfo",
+    "build": "yarn clean && yarn build:wasm && yarn build:ts",
     "build:dev": "tsc -b --watch",
-    "build:wasm": "cd ../cpp && cmake --preset wasm-threads && cmake --build --preset wasm-threads && cmake --preset wasm && cmake --build --preset wasm",
-    "build:ts:browser": "tsc -b tsconfig.browser.json && BUILD_TARGET=browser webpack && chmod +x ./dest/browser/main.js && BUILD_TARGET=browser node replace_imports.cjs",
-    "build:ts:node": "tsc -b tsconfig.node.json && chmod +x ./dest/node/main.js && BUILD_TARGET=node node replace_imports.cjs",
+    "build:wasm": "cd ../cpp && cmake --preset wasm-threads && cmake --build --preset wasm-threads && cmake --preset wasm && cmake --build --preset wasm && ./scripts/strip-wasm.sh",
+    "build:ts": "tsc -b && cp ./src/barretenberg-threads.wasm ./dest/node && webpack && chmod +x ./dest/node/main.js",
     "build:bindings": "cd .. && ./scripts/bindgen.sh",
-    "serve": "webpack serve",
     "formatting": "prettier --check ./src && eslint --max-warnings 0 ./src",
     "formatting:fix": "prettier -w ./src",
-    "test": "yarn build:ts:browser && yarn build:ts:node && yarn test:jest && yarn test:bin",
-    "test:jest": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests",
-    "test:bin": "cd ./bin-test && ./bin-test.sh",
-    "test:debug": "NODE_NO_WARNINGS=1 node --inspect-brk=0.0.0.0 --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests --runInBand",
+    "test": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests",
+    "test:debug": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 node --inspect-brk=0.0.0.0 --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests --runInBand",
+    "simple_test": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 node ./src/examples/simple.rawtest.ts",
     "prepack": "yarn build",
     "deploy": "npm publish --access public"
   },
   "jest": {
-    "testRegex": "./dest/node/.*\\.test\\.js$",
-    "rootDir": "./dest"
+    "preset": "ts-jest/presets/default-esm",
+    "transform": {
+      "./src/.*\\.ts": [
+        "ts-jest",
+        {
+          "useESM": true
+        }
+      ]
+    },
+    "moduleNameMapper": {
+      "^(\\.{1,2}/.*)\\.js$": "$1"
+    },
+    "testRegex": "./src/.*\\.test\\.ts$",
+    "rootDir": "./src"
   },
   "dependencies": {
     "comlink": "^4.4.1",
     "commander": "^10.0.1",
     "debug": "^4.3.4",
-    "idb-keyval": "^6.2.1"
+    "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.4.3",
@@ -61,17 +69,17 @@
     "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.8.0",
     "html-webpack-plugin": "^5.5.1",
+    "idb-keyval": "^6.2.1",
     "jest": "^29.5.0",
     "prettier": "^2.8.4",
-    "replace-in-file": "^7.0.1",
     "resolve-typescript-plugin": "^2.0.1",
     "ts-jest": "^29.1.0",
     "ts-loader": "^9.4.2",
-    "tsconfig-paths-webpack-plugin": "^4.0.1",
-    "tslib": "^2.6.2",
+    "ts-node": "^10.9.1",
     "typescript": "^5.0.4",
     "webpack": "^5.82.1",
     "webpack-cli": "^5.1.1",
-    "webpack-dev-server": "^4.15.0"
+    "webpack-dev-server": "^4.15.0",
+    "worker-loader": "^3.0.8"
   }
 }

package/src/barretenberg/index.ts

@@ -0,0 +1,42 @@
+import { proxy } from 'comlink';
+import { BarretenbergApi } from '../barretenberg_api/index.js';
+import { BarretenbergBinder } from '../barretenberg_binder/index.js';
+import { createMainWorker } from '../barretenberg_wasm/barretenberg_wasm_main/factory/node/index.js';
+import { BarretenbergWasmMainWorker } from '../barretenberg_wasm/barretenberg_wasm_main/index.js';
+import { getRemoteBarretenbergWasm } from '../barretenberg_wasm/helpers/index.js';
+import { BarretenbergWasmWorker } from '../barretenberg_wasm/index.js';
+import createDebug from 'debug';
+
+const debug = createDebug('bb.js:wasm');
+
+/**
+ * The main class library consumers interact with.
+ * It extends the generated api, and provides a static constructor "new" to compose components.
+ */
+export class Barretenberg extends BarretenbergApi {
+  private constructor(private worker: any, private wasm: BarretenbergWasmWorker) {
+    super(new BarretenbergBinder(wasm));
+  }
+
+  /**
+   * Constructs an instance of Barretenberg.
+   * Launches it within a worker. This is necessary as it block waiting on child threads to complete,
+   * and blocking the main thread in the browser is not allowed.
+   * It threads > 1 (defaults to hardware availability), child threads will be created on their own workers.
+   */
+  static async new(threads?: number) {
+    const worker = createMainWorker();
+    const wasm = getRemoteBarretenbergWasm<BarretenbergWasmMainWorker>(worker);
+    await wasm.init(threads, proxy(debug));
+    return new Barretenberg(worker, wasm);
+  }
+
+  async getNumThreads() {
+    return await this.wasm.getNumThreads();
+  }
+
+  async destroy() {
+    await this.wasm.destroy();
+    await this.worker.terminate();
+  }
+}

package/src/barretenberg_api/blake2s.test.ts

@@ -1,19 +1,18 @@
-import { newBarretenbergApiSync } from '../factory/index.js';
+import { Barretenberg } from '../barretenberg/index.js';
 import { Buffer32, Fr } from '../types/index.js';
-import { BarretenbergApiSync } from './index.js';
 
 describe('blake2s', () => {
-  let api: BarretenbergApiSync;
+  let api: Barretenberg;
 
   beforeAll(async () => {
-    api = await newBarretenbergApiSync();
+    api = await Barretenberg.new(1);
   });
 
   afterAll(async () => {
     await api.destroy();
   });
 
-  it('blake2s', () => {
+  it('blake2s', async () => {
     const input = Buffer.from('abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789');
     const expected = Buffer32.fromBuffer(
       new Uint8Array([
@@ -21,11 +20,11 @@ describe('blake2s', () => {
         0x2a, 0xc2, 0xb1, 0x00, 0x54, 0x1e, 0x04, 0xfe, 0x87, 0xb4, 0xa5, 0x9e, 0x12, 0x43,
       ]),
     );
-    const result = api.blake2s(input);
+    const result = await api.blake2s(input);
     expect(result).toEqual(expected);
   });
 
-  it('blake2sToField', () => {
+  it('blake2sToField', async () => {
     const input = Buffer.from('abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789');
     const expected = Fr.fromBufferReduce(
       new Uint8Array([
@@ -33,7 +32,7 @@ describe('blake2s', () => {
         0x2a, 0xc2, 0xb1, 0x00, 0x54, 0x1e, 0x04, 0xfe, 0x87, 0xb4, 0xa5, 0x9e, 0x12, 0x43,
       ]),
     );
-    const result = api.blake2sToField(input);
+    const result = await api.blake2sToField(input);
     expect(result).toEqual(expected);
   });
 });

package/src/barretenberg_api/common.test.ts

@@ -1,10 +1,10 @@
-import { BarretenbergApiAsync, newBarretenbergApiAsync } from '../factory/index.js';
+import { Barretenberg } from '../barretenberg/index.js';
 
 describe('env', () => {
-  let api: BarretenbergApiAsync;
+  let api: Barretenberg;
 
   beforeAll(async () => {
-    api = await newBarretenbergApiAsync(3);
+    api = await Barretenberg.new(3);
   }, 15000);
 
   afterAll(async () => {

package/src/barretenberg_api/index.ts

@@ -1,6 +1,6 @@
 // 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,
@@ -342,308 +342,3 @@ export class BarretenbergApi {
     return result as any;
   }
 }
-
-export class BarretenbergApiSync {
-  constructor(public binder: BarretenbergBinderSync) {}
-
-  async destroy() {
-    await this.binder.wasm.destroy();
-  }
-
-  pedersenInit(): void {
-    const result = this.binder.callWasmExport('pedersen___init', [], []);
-    return;
-  }
-
-  pedersenCompressFields(left: Fr, right: Fr): Fr {
-    const result = this.binder.callWasmExport('pedersen___compress_fields', [left, right], [Fr]);
-    return result[0];
-  }
-
-  pedersenPlookupCompressFields(left: Fr, right: Fr): Fr {
-    const result = this.binder.callWasmExport('pedersen___plookup_compress_fields', [left, right], [Fr]);
-    return result[0];
-  }
-
-  pedersenCompress(inputsBuffer: Fr[]): Fr {
-    const result = this.binder.callWasmExport('pedersen___compress', [inputsBuffer], [Fr]);
-    return result[0];
-  }
-
-  pedersenPlookupCompress(inputsBuffer: Fr[]): Fr {
-    const result = this.binder.callWasmExport('pedersen___plookup_compress', [inputsBuffer], [Fr]);
-    return result[0];
-  }
-
-  pedersenCompressWithHashIndex(inputsBuffer: Fr[], hashIndex: number): Fr {
-    const result = this.binder.callWasmExport('pedersen___compress_with_hash_index', [inputsBuffer, hashIndex], [Fr]);
-    return result[0];
-  }
-
-  pedersenCommit(inputsBuffer: Fr[]): Fr {
-    const result = this.binder.callWasmExport('pedersen___commit', [inputsBuffer], [Fr]);
-    return result[0];
-  }
-
-  pedersenPlookupCommit(inputsBuffer: Fr[]): Fr {
-    const result = this.binder.callWasmExport('pedersen___plookup_commit', [inputsBuffer], [Fr]);
-    return result[0];
-  }
-
-  pedersenPlookupCommitWithHashIndex(inputsBuffer: Fr[], hashIndex: number): Fr {
-    const result = this.binder.callWasmExport(
-      'pedersen___plookup_commit_with_hash_index',
-      [inputsBuffer, hashIndex],
-      [Fr],
-    );
-    return result[0];
-  }
-
-  pedersenBufferToField(data: Uint8Array): Fr {
-    const result = this.binder.callWasmExport('pedersen___buffer_to_field', [data], [Fr]);
-    return result[0];
-  }
-
-  pedersenHashInit(): void {
-    const result = this.binder.callWasmExport('pedersen_hash_init', [], []);
-    return;
-  }
-
-  pedersenHashPair(left: Fr, right: Fr): Fr {
-    const result = this.binder.callWasmExport('pedersen_hash_pair', [left, right], [Fr]);
-    return result[0];
-  }
-
-  pedersenHashMultiple(inputsBuffer: Fr[]): Fr {
-    const result = this.binder.callWasmExport('pedersen_hash_multiple', [inputsBuffer], [Fr]);
-    return result[0];
-  }
-
-  pedersenHashMultipleWithHashIndex(inputsBuffer: Fr[], hashIndex: number): Fr {
-    const result = this.binder.callWasmExport(
-      'pedersen_hash_multiple_with_hash_index',
-      [inputsBuffer, hashIndex],
-      [Fr],
-    );
-    return result[0];
-  }
-
-  pedersenHashToTree(data: Fr[]): Fr[] {
-    const result = this.binder.callWasmExport('pedersen_hash_to_tree', [data], [VectorDeserializer(Fr)]);
-    return result[0];
-  }
-
-  blake2s(data: Uint8Array): Buffer32 {
-    const result = this.binder.callWasmExport('blake2s', [data], [Buffer32]);
-    return result[0];
-  }
-
-  blake2sToField(data: Uint8Array): Fr {
-    const result = this.binder.callWasmExport('blake2s_to_field_', [data], [Fr]);
-    return result[0];
-  }
-
-  schnorrComputePublicKey(privateKey: Fr): Point {
-    const result = this.binder.callWasmExport('schnorr_compute_public_key', [privateKey], [Point]);
-    return result[0];
-  }
-
-  schnorrNegatePublicKey(publicKeyBuffer: Point): Point {
-    const result = this.binder.callWasmExport('schnorr_negate_public_key', [publicKeyBuffer], [Point]);
-    return result[0];
-  }
-
-  schnorrConstructSignature(message: Uint8Array, privateKey: Fr): [Buffer32, Buffer32] {
-    const result = this.binder.callWasmExport(
-      'schnorr_construct_signature',
-      [message, privateKey],
-      [Buffer32, Buffer32],
-    );
-    return result as any;
-  }
-
-  schnorrVerifySignature(message: Uint8Array, pubKey: Point, sigS: Buffer32, sigE: Buffer32): boolean {
-    const result = this.binder.callWasmExport(
-      'schnorr_verify_signature',
-      [message, pubKey, sigS, sigE],
-      [BoolDeserializer()],
-    );
-    return result[0];
-  }
-
-  schnorrMultisigCreateMultisigPublicKey(privateKey: Fq): Buffer128 {
-    const result = this.binder.callWasmExport('schnorr_multisig_create_multisig_public_key', [privateKey], [Buffer128]);
-    return result[0];
-  }
-
-  schnorrMultisigValidateAndCombineSignerPubkeys(signerPubkeyBuf: Buffer128[]): [Point, boolean] {
-    const result = this.binder.callWasmExport(
-      'schnorr_multisig_validate_and_combine_signer_pubkeys',
-      [signerPubkeyBuf],
-      [Point, BoolDeserializer()],
-    );
-    return result as any;
-  }
-
-  schnorrMultisigConstructSignatureRound1(): [Buffer128, Buffer128] {
-    const result = this.binder.callWasmExport(
-      'schnorr_multisig_construct_signature_round_1',
-      [],
-      [Buffer128, Buffer128],
-    );
-    return result as any;
-  }
-
-  schnorrMultisigConstructSignatureRound2(
-    message: Uint8Array,
-    privateKey: Fq,
-    signerRoundOnePrivateBuf: Buffer128,
-    signerPubkeysBuf: Buffer128[],
-    roundOnePublicBuf: Buffer128[],
-  ): [Fq, boolean] {
-    const result = this.binder.callWasmExport(
-      'schnorr_multisig_construct_signature_round_2',
-      [message, privateKey, signerRoundOnePrivateBuf, signerPubkeysBuf, roundOnePublicBuf],
-      [Fq, BoolDeserializer()],
-    );
-    return result as any;
-  }
-
-  schnorrMultisigCombineSignatures(
-    message: Uint8Array,
-    signerPubkeysBuf: Buffer128[],
-    roundOneBuf: Buffer128[],
-    roundTwoBuf: Fr[],
-  ): [Buffer32, Buffer32, boolean] {
-    const result = this.binder.callWasmExport(
-      'schnorr_multisig_combine_signatures',
-      [message, signerPubkeysBuf, roundOneBuf, roundTwoBuf],
-      [Buffer32, Buffer32, BoolDeserializer()],
-    );
-    return result as any;
-  }
-
-  srsInitSrs(pointsBuf: Uint8Array, numPoints: number, g2PointBuf: Uint8Array): void {
-    const result = this.binder.callWasmExport('srs_init_srs', [pointsBuf, numPoints, g2PointBuf], []);
-    return;
-  }
-
-  examplesSimpleCreateAndVerifyProof(): boolean {
-    const result = this.binder.callWasmExport('examples_simple_create_and_verify_proof', [], [BoolDeserializer()]);
-    return result[0];
-  }
-
-  testThreads(threads: number, iterations: number): number {
-    const result = this.binder.callWasmExport('test_threads', [threads, iterations], [NumberDeserializer()]);
-    return result[0];
-  }
-
-  testThreadAbort(): void {
-    const result = this.binder.callWasmExport('test_thread_abort', [], []);
-    return;
-  }
-
-  testAbort(): void {
-    const result = this.binder.callWasmExport('test_abort', [], []);
-    return;
-  }
-
-  commonInitSlabAllocator(circuitSize: number): void {
-    const result = this.binder.callWasmExport('common_init_slab_allocator', [circuitSize], []);
-    return;
-  }
-
-  acirGetCircuitSizes(constraintSystemBuf: Uint8Array): [number, number, number] {
-    const result = this.binder.callWasmExport(
-      'acir_get_circuit_sizes',
-      [constraintSystemBuf],
-      [NumberDeserializer(), NumberDeserializer(), NumberDeserializer()],
-    );
-    return result as any;
-  }
-
-  acirNewAcirComposer(sizeHint: number): Ptr {
-    const result = this.binder.callWasmExport('acir_new_acir_composer', [sizeHint], [Ptr]);
-    return result[0];
-  }
-
-  acirDeleteAcirComposer(acirComposerPtr: Ptr): void {
-    const result = this.binder.callWasmExport('acir_delete_acir_composer', [acirComposerPtr], []);
-    return;
-  }
-
-  acirCreateCircuit(acirComposerPtr: Ptr, constraintSystemBuf: Uint8Array, sizeHint: number): void {
-    const result = this.binder.callWasmExport(
-      'acir_create_circuit',
-      [acirComposerPtr, constraintSystemBuf, sizeHint],
-      [],
-    );
-    return;
-  }
-
-  acirInitProvingKey(acirComposerPtr: Ptr, constraintSystemBuf: Uint8Array): void {
-    const result = this.binder.callWasmExport('acir_init_proving_key', [acirComposerPtr, constraintSystemBuf], []);
-    return;
-  }
-
-  acirCreateProof(
-    acirComposerPtr: Ptr,
-    constraintSystemBuf: Uint8Array,
-    witnessBuf: Uint8Array,
-    isRecursive: boolean,
-  ): Uint8Array {
-    const result = this.binder.callWasmExport(
-      'acir_create_proof',
-      [acirComposerPtr, constraintSystemBuf, witnessBuf, isRecursive],
-      [BufferDeserializer()],
-    );
-    return result[0];
-  }
-
-  acirLoadVerificationKey(acirComposerPtr: Ptr, vkBuf: Uint8Array): void {
-    const result = this.binder.callWasmExport('acir_load_verification_key', [acirComposerPtr, vkBuf], []);
-    return;
-  }
-
-  acirInitVerificationKey(acirComposerPtr: Ptr): void {
-    const result = this.binder.callWasmExport('acir_init_verification_key', [acirComposerPtr], []);
-    return;
-  }
-
-  acirGetVerificationKey(acirComposerPtr: Ptr): Uint8Array {
-    const result = this.binder.callWasmExport('acir_get_verification_key', [acirComposerPtr], [BufferDeserializer()]);
-    return result[0];
-  }
-
-  acirVerifyProof(acirComposerPtr: Ptr, proofBuf: Uint8Array, isRecursive: boolean): boolean {
-    const result = this.binder.callWasmExport(
-      'acir_verify_proof',
-      [acirComposerPtr, proofBuf, isRecursive],
-      [BoolDeserializer()],
-    );
-    return result[0];
-  }
-
-  acirGetSolidityVerifier(acirComposerPtr: Ptr): string {
-    const result = this.binder.callWasmExport('acir_get_solidity_verifier', [acirComposerPtr], [StringDeserializer()]);
-    return result[0];
-  }
-
-  acirSerializeProofIntoFields(acirComposerPtr: Ptr, proofBuf: Uint8Array, numInnerPublicInputs: number): Fr[] {
-    const result = this.binder.callWasmExport(
-      'acir_serialize_proof_into_fields',
-      [acirComposerPtr, proofBuf, numInnerPublicInputs],
-      [VectorDeserializer(Fr)],
-    );
-    return result[0];
-  }
-
-  acirSerializeVerificationKeyIntoFields(acirComposerPtr: Ptr): [Fr[], Fr] {
-    const result = this.binder.callWasmExport(
-      'acir_serialize_verification_key_into_fields',
-      [acirComposerPtr],
-      [VectorDeserializer(Fr), Fr],
-    );
-    return result as any;
-  }
-}