Rebuild bindings

.gitignore

@@ -4,6 +4,8 @@ build
 dist
 node_modules
 prebuild/*.node
+.VSCodeCounter
+.vscode/settings.json
 
 npm-debug.log
 yarn-error.log

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "blst"]
-	path = blst
+	path = deps/blst
 	url = https://github.com/supranational/blst.git

.vscode/c_cpp_properties.json

@@ -0,0 +1,20 @@
+{
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "/Users/matthewkeil/.node-gyp/**"
+            ],
+            "defines": [],
+            "macFrameworkPath": [
+                "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks"
+            ],
+            "compilerPath": "/usr/bin/clang",
+            "cStandard": "c17",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "macos-clang-arm64"
+        }
+    ],
+    "version": 4
+}

.vscode/launch.json

@@ -0,0 +1,14 @@
+{
+  "version": "0.0.1",
+  "configurations": [
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug Native Addon",
+      "cwd": "${workspaceRoot}",
+      "preLaunchTask": "npm: build:debug",
+      "program": "node",
+      "args": ["node_modules/.bin/mocha", "test/unit/**/*.test.ts"]
+    }
+  ]
+}

binding.gyp

@@ -0,0 +1,66 @@
+{
+  'targets': [
+    {
+      'target_name': 'blst_ts_addon',
+      'sources': [
+        'deps/blst/src/server.c',
+        'deps/blst/build/assembly.S',
+        'src/addon.cc',
+        'src/functions.cc',
+        'src/public_key.cc',
+        'src/secret_key.cc',
+        'src/signature.cc',
+      ],
+      'dependencies': [ "<!(node -p \"require('node-addon-api').gyp\")" ],
+      'include_dirs': [
+        'deps/blst/bindings',
+        "<!@(node -p \"require('node-addon-api').include_dir\")",
+      ],
+      'defines': [ 'NAPI_CPP_EXCEPTIONS' ],
+      'cflags!': [
+          '-fno-exceptions',
+          '-fno-builtin-memcpy',
+          '-Wextern-c-compat',
+          '-Werror',
+          '-Wall',
+          '-Wextra',
+          '-Wpedantic',
+          '-Wunused-parameter',
+      ],
+      'cflags_cc!': [
+          '-fno-exceptions',
+          '-Werror',
+          '-Wall',
+          '-Wextra',
+          '-Wpedantic',
+          '-Wunused-parameter',
+      ],
+      'conditions': [
+        [ 'OS=="win"', {
+            'sources': [ 'blst/build/win64/*-x86_64.asm' ],
+            'defines': [ '_HAS_EXCEPTIONS=1' ],
+            'msvs_settings': {
+              'VCCLCompilerTool': {
+                'ExceptionHandling': 1,
+                'EnablePREfast': 'true',
+              },
+            },
+          }
+        ],
+        [ 'OS=="linux"', {
+            'ldflags': [ '-Wl,-Bsymbolic' ],
+          }
+        ],
+        ['OS=="mac"', {
+          'cflags+': ['-fvisibility=hidden'],
+          'xcode_settings': {
+            'OTHER_CFLAGS': ['-fvisibility=hidden'],
+            'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+            'CLANG_CXX_LIBRARY': 'libc++',
+            'MACOSX_DEPLOYMENT_TARGET': '12',
+          }
+        }]
+      ],
+    }
+  ]
+}

lib/index.d.ts

@@ -0,0 +1,97 @@
+/**
+ * Points are represented in two ways in BLST:
+ * - affine coordinates (x,y)
+ * - jacobian coordinates (x,y,z)
+ *
+ * The jacobian coordinates allow to aggregate points more efficiently,
+ * so if P1 points are aggregated often (Eth2.0) you want to keep the point
+ * cached in jacobian coordinates.
+ */
+export enum CoordType {
+  affine,
+  jacobian,
+}
+
+export type BlstBuffer = Uint8Array | Buffer;
+export type PublicKeyArg = BlstBuffer | PublicKey;
+export type SignatureArg = BlstBuffer | Signature;
+export interface SignatureSet {
+  msg: BlstBuffer;
+  publicKey: PublicKeyArg;
+  signature: SignatureArg;
+}
+export interface Serializable {
+  serialize(): Uint8Array;
+}
+
+/*
+ * Private constructor. Randomly generate ikm when new'ing a key if no
+ * ikm is provided.
+ *
+ * Use static methods `SecretKey.deserialize`, `SecretKey.fromKeygen` or
+ * `SecretKey.fromKeygenSync` to generate `SecretKey`s from your own
+ * material (ie serialized key or ikm).
+ *
+ * example:
+ * ```typescript
+ * const ikm = UintArray8.from(Buffer.from("your very own ikm"));
+ * const keyInfo = "Some key info";
+ * const key: SecretKey = SecretKey.fromKeygen(ikm, keyInfo);
+ *
+ * key = SecretKey.fromBytes(key.serialize());
+ * ```
+ */
+export class SecretKey implements Serializable {
+  private constructor();
+  static fromKeygen(ikm?: BlstBuffer, info?: string): Promise<SecretKey>;
+  static fromKeygenSync(ikm?: BlstBuffer, info?: string): SecretKey;
+  static deserialize(skBytes: BlstBuffer, info?: string): SecretKey;
+  serialize(): Buffer;
+  toPublicKey(): PublicKey;
+  sign(msg: BlstBuffer): Promise<Signature>;
+  signSync(msg: BlstBuffer): Signature;
+}
+export class PublicKey implements Serializable {
+  constructor(sk: BlstBuffer | SecretKey);
+  static deserialize(skBytes: BlstBuffer, coordType?: CoordType): PublicKey;
+  serialize(compress?: boolean): Buffer;
+  keyValidate(): Promise<void>;
+  keyValidateSync(): void;
+}
+export class Signature implements Serializable {
+  private constructor();
+  static deserialize(skBytes: BlstBuffer, coordType?: CoordType): Signature;
+  serialize(compress?: boolean): Buffer;
+  sigValidate(): Promise<void>;
+  sigValidateSync(): void;
+}
+// export const functions: {
+export function aggregatePublicKeys(keys: PublicKeyArg[]): Promise<PublicKey>;
+export function aggregatePublicKeysSync(keys: PublicKeyArg[]): PublicKey;
+export function aggregateSignatures(signatures: SignatureArg[]): Promise<Signature>;
+export function aggregateSignaturesSync(signatures: SignatureArg[]): Signature;
+export function verify(msg: BlstBuffer, publicKey: PublicKeyArg, signature: SignatureArg): Promise<boolean>;
+export function verifySync(msg: BlstBuffer, publicKey: PublicKeyArg, signature: SignatureArg): boolean;
+export function aggregateVerify(
+  msgs: BlstBuffer[],
+  publicKeys: PublicKeyArg[],
+  signature: SignatureArg
+): Promise<boolean>;
+export function aggregateVerifySync(msgs: BlstBuffer[], publicKeys: PublicKeyArg[], signature: SignatureArg): boolean;
+export function fastAggregateVerify(
+  msg: BlstBuffer,
+  publicKeys: PublicKeyArg[],
+  signature: SignatureArg
+): Promise<boolean>;
+export function fastAggregateVerifySync(msg: BlstBuffer, publicKeys: PublicKeyArg[], signature: SignatureArg): boolean;
+export function verifyMultipleAggregateSignatures(sets: SignatureSet[]): Promise<boolean>;
+export function verifyMultipleAggregateSignaturesSync(sets: SignatureSet[]): boolean;
+// };
+export const BLST_CONSTANTS: {
+  DST: string;
+  SECRET_KEY_LENGTH: number;
+  PUBLIC_KEY_LENGTH_UNCOMPRESSED: number;
+  PUBLIC_KEY_LENGTH_COMPRESSED: number;
+  SIGNATURE_LENGTH_UNCOMPRESSED: number;
+  SIGNATURE_LENGTH_COMPRESSED: number;
+};

lib/index.js

@@ -0,0 +1,2 @@
+// eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-call
+module.exports = exports = require("bindings")("blst_ts_addon");

package.json

@@ -2,23 +2,27 @@
   "name": "@chainsafe/blst",
   "version": "0.2.6",
   "description": "Typescript wrapper for supranational/blst native bindings, a highly performant BLS12-381 signature library",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "files": [
-    "dist",
-    "prebuild",
-    "blst"
+    "deps",
+    "lib",
+    "src"
   ],
   "scripts": {
-    "install": "node dist/scripts/install.js",
+    "dev": "ts-node tools/dev",
+    "test": "yarn test:unit && yarn test:spec && yarn test:perf",
     "lint": "eslint --color --ext .ts src/ test/",
-    "build": "tsc --project tsconfig.build.json",
-    "bootstrap": "yarn install --ignore-scripts && yarn build && yarn install",
-    "clean": "rm -rf prebuild/*.node dist blst/libblst.a blst/bindings/libblst.a blst/bindings/node.js/blst.node blst/bindings/node.js/blst_wrap.cpp",
-    "test": "yarn test:unit && yarn test:spec",
+    "clean": "node-gyp clean && node-gyp configure",
+    "build": "node-gyp build",
+    "build:clean": "npm run clean && npm run build",
+    "build:debug": "node-gyp build --debug",
     "test:unit": "mocha test/unit/**/*.test.ts",
     "test:spec": "mocha 'test/spec/**/*.test.ts'",
-    "download-spec-tests": "node -r ts-node/register test/spec/downloadTests.ts"
+    "test:perf": "benchmark test/perf/**/*.perf.ts",
+    "download-spec-tests": "ts-node test/spec/downloadTests.ts",
+    "bootstrap": "yarn install --ignore-scripts && yarn build && yarn install",
+    "clean:swig": "rm -rf prebuild/*.node dist blst/libblst.a blst/bindings/libblst.a blst/bindings/node.js/blst.node blst/bindings/node.js/blst_wrap.cpp"
   },
   "repository": {
     "type": "git",
@@ -32,6 +36,7 @@
   },
   "homepage": "https://github.com/ChainSafe/blst-ts#readme",
   "devDependencies": {
+    "@dapplion/benchmark": "^0.2.2",
     "@types/chai": "^4.2.13",
     "@types/js-yaml": "^4.0.5",
     "@types/mocha": "^8.0.3",
@@ -40,6 +45,7 @@
     "@typescript-eslint/eslint-plugin": "^4.21.0",
     "@typescript-eslint/parser": "^4.21.0",
     "chai": "^4.2.0",
+    "chokidar": "^3.5.3",
     "eslint": "^7.23.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
@@ -52,7 +58,9 @@
     "typescript": "^4.0.3"
   },
   "dependencies": {
+    "bindings": "^1.5.0",
+    "node-addon-api": "^4.3.0",
     "node-fetch": "^2.6.1",
-    "node-gyp": "^8.4.0"
+    "node-gyp": "^9.3.0"
   }
 }