feat: napi rebuild

package.json

@@ -36,13 +36,16 @@
     "test-coverage:e2e": "c8 --config .c8rc.json --report-dir coverage/e2e/ --all npm run test:e2e",
     "test-coverage:e2e-sim": "c8 --config .c8rc.json --report-dir coverage/e2e-sim/ --all npm run test:e2e:sim",
     "test-coverage:spec": "c8 --config .c8rc.json --report-dir coverage/spec/ --all npm run test:spec",
-    "benchmark": "yarn benchmark:files 'packages/*/test/perf/**/*.test.ts'",
-    "benchmark:files": "NODE_OPTIONS='--max-old-space-size=4096 --loader=ts-node/esm' benchmark --config .benchrc.yaml --defaultBranch unstable",
+    "benchmark": "UV_THREADPOOL_SIZE=$(node -e 'console.log(require(`os`).availableParallelism())') yarn benchmark:files 'packages/*/test/perf/**/*.test.ts'",
+    "benchmark:files": "UV_THREADPOOL_SIZE=$(node -e 'console.log(require(`os`).availableParallelism())') NODE_OPTIONS='--max-old-space-size=4096 --loader=ts-node/esm' benchmark --config .benchrc.yaml --defaultBranch unstable",
     "release:create-rc": "node scripts/release/create_rc.mjs",
     "release:tag-rc": "node scripts/release/tag_rc.mjs",
     "release:tag-stable": "node scripts/release/tag_stable.mjs",
     "release:publish": "lerna publish from-package --yes --no-verify-access"
   },
+  "dependencies": {
+    "@chainsafe/blst": "^1.0.0"
+  },
   "devDependencies": {
     "@actions/core": "^1.10.1",
     "@chainsafe/eslint-plugin-node": "^11.2.3",

packages/beacon-node/package.json

@@ -95,8 +95,7 @@
   },
   "dependencies": {
     "@chainsafe/as-sha256": "^0.4.1",
-    "@chainsafe/bls": "7.1.3",
-    "@chainsafe/blst": "^0.2.10",
+    "@chainsafe/bls": "^8.0.0",
     "@chainsafe/discv5": "^9.0.0",
     "@chainsafe/enr": "^3.0.0",
     "@chainsafe/libp2p-gossipsub": "^11.2.1",

packages/beacon-node/src/chain/bls/index.ts

@@ -1,4 +1,5 @@
 export type {IBlsVerifier} from "./interface.js";
 export type {BlsMultiThreadWorkerPoolModules, JobQueueItemType} from "./multithread/index.js";
+export {BlsPoolType} from "./multithread/types.js";
 export {BlsMultiThreadWorkerPool} from "./multithread/index.js";
 export {BlsSingleThreadVerifier} from "./singleThread.js";

packages/beacon-node/src/chain/bls/interface.ts

@@ -22,6 +22,14 @@ export type VerifySignatureOpts = {
   priority?: boolean;
 };
 
+export interface QueuedVerificationOpts extends VerifySignatureOpts {
+  /**
+   * Include multiplying in randomization factor for verification. Only applicable for verification
+   * of same message batches.  Applied via the worker pool options
+   */
+  disableSameMessageVerificationRandomness?: boolean;
+}
+
 export interface IBlsVerifier {
   /**
    * Verify 1 or more signature sets. Sets may be verified on batch or not depending on their count
@@ -44,7 +52,7 @@ export interface IBlsVerifier {
    * Signatures have already been checked for subgroup
    * Signature checks above could be done here for convienence as well
    */
-  verifySignatureSets(sets: ISignatureSet[], opts?: VerifySignatureOpts): Promise<boolean>;
+  verifySignatureSets(sets: ISignatureSet[], opts?: QueuedVerificationOpts): Promise<boolean>;
 
   /**
    * Similar to verifySignatureSets but:
@@ -55,7 +63,7 @@ export interface IBlsVerifier {
   verifySignatureSetsSameMessage(
     sets: {publicKey: PublicKey; signature: Uint8Array}[],
     messsage: Uint8Array,
-    opts?: Omit<VerifySignatureOpts, "verifyOnMainThread">
+    opts?: Omit<QueuedVerificationOpts, "verifyOnMainThread">
   ): Promise<boolean[]>;
 
   /** For multithread pool awaits terminating all workers */

packages/beacon-node/src/chain/bls/maybeBatch.ts

@@ -1,29 +1,18 @@
-import {CoordType, PublicKey} from "@chainsafe/bls/types";
 import bls from "@chainsafe/bls";
+import {WorkRequestSet} from "./multithread/types.js";
+import {deserializeSet} from "./multithread/utils.js";
 
 const MIN_SET_COUNT_TO_BATCH = 2;
 
-export type SignatureSetDeserialized = {
-  publicKey: PublicKey;
-  message: Uint8Array;
-  signature: Uint8Array;
-};
-
 /**
  * Verify signatures sets with batch verification or regular core verify depending on the set count.
  * Abstracted in a separate file to be consumed by the threaded pool and the main thread implementation.
  */
-export function verifySignatureSetsMaybeBatch(sets: SignatureSetDeserialized[]): boolean {
+export function verifySignatureSetsMaybeBatch(sets: WorkRequestSet[]): boolean {
   try {
+    const deserialized = sets.map(deserializeSet);
     if (sets.length >= MIN_SET_COUNT_TO_BATCH) {
-      return bls.Signature.verifyMultipleSignatures(
-        sets.map((s) => ({
-          publicKey: s.publicKey,
-          message: s.message,
-          // true = validate signature
-          signature: bls.Signature.fromBytes(s.signature, CoordType.affine, true),
-        }))
-      );
+      return bls.verifyMultipleSignatures(deserialized);
     }
 
     // .every on an empty array returns true
@@ -32,11 +21,32 @@ export function verifySignatureSetsMaybeBatch(sets: SignatureSetDeserialized[]):
     }
 
     // If too few signature sets verify them without batching
-    return sets.every((set) => {
-      // true = validate signature
-      const sig = bls.Signature.fromBytes(set.signature, CoordType.affine, true);
-      return sig.verify(set.publicKey, set.message);
-    });
+    return deserialized.every(({message, publicKey, signature}) => bls.verify(publicKey, message, signature));
+  } catch (_) {
+    // A signature could be malformed, in that case fromBytes throws error
+    // blst-ts `verifyMultipleSignatures` is also a fallible operation if mul_n_aggregate fails
+    // see https://github.com/ChainSafe/blst-ts/blob/b1ba6333f664b08e5c50b2b0d18c4f079203962b/src/lib.ts#L291
+    return false;
+  }
+}
+
+export async function asyncVerifySignatureSetsMaybeBatch(sets: WorkRequestSet[]): Promise<boolean> {
+  try {
+    const deserialized = sets.map(deserializeSet);
+    if (sets.length >= MIN_SET_COUNT_TO_BATCH) {
+      return await bls.asyncVerifyMultipleSignatures(deserialized);
+    }
+
+    // .every on an empty array returns true
+    if (sets.length === 0) {
+      throw Error("Empty signature sets");
+    }
+
+    const promises = await Promise.all(
+      deserialized.map(({message, publicKey, signature}) => bls.asyncVerify(publicKey, message, signature))
+    );
+    // If too few signature sets verify them without batching
+    return promises.every((isValid) => isValid);
   } catch (_) {
     // A signature could be malformed, in that case fromBytes throws error
     // blst-ts `verifyMultipleSignatures` is also a fallible operation if mul_n_aggregate fails