feat: switch bls to napi rebuild

lodestar

@@ -4,4 +4,5 @@
 #
 # ./lodestar.sh beacon --network mainnet
 
+export UV_THREADPOOL_SIZE=$(nproc);
 node --trace-deprecation --max-old-space-size=8192 ./packages/cli/bin/lodestar.js "$@"

package.json

@@ -36,8 +36,8 @@
     "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=$(nproc) yarn benchmark:files 'packages/*/test/perf/**/*.test.ts'",
+    "benchmark:files": "UV_THREADPOOL_SIZE=$(nproc) 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",
@@ -90,4 +90,4 @@
     "loupe": "^2.3.6",
     "vite": "^5.0.0"
   }
-}
+}

packages/beacon-node/package.json

@@ -92,8 +92,7 @@
   },
   "dependencies": {
     "@chainsafe/as-sha256": "^0.4.1",
-    "@chainsafe/bls": "7.1.3",
-    "@chainsafe/blst": "^0.2.10",
+    "@chainsafe/bls": "ChainSafe/bls#c40e3e8736a8203684652dfeac6c7b23e1f1f6fd",
     "@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 {BlsMultiThreadWorkerPool} from "./multithread/index.js";
+export type {JobQueueItemType} from "./jobItem.js";
+export type {BlsMultiThreadWorkerPoolModules} from "./multiThread.js";
+export {BlsMultiThreadWorkerPool} from "./multiThread.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
+   */
+  addVerificationRandomness?: 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/multithread/jobItem.ts → packages/beacon-node/src/chain/bls/jobItem.ts

@@ -1,11 +1,12 @@
 import bls from "@chainsafe/bls";
 import {CoordType, PointFormat, PublicKey} from "@chainsafe/bls/types";
 import {ISignatureSet, SignatureSetType} from "@lodestar/state-transition";
-import {VerifySignatureOpts} from "../interface.js";
-import {getAggregatedPubkey} from "../utils.js";
-import {LinkedList} from "../../../util/array.js";
-import {Metrics} from "../../../metrics/metrics.js";
+import {LinkedList} from "../../util/array.js";
+import {Metrics} from "../../metrics/metrics.js";
+import {QueuedVerificationOpts} from "./interface.js";
+import {getAggregatedPubkey} from "./utils.js";
 import {BlsWorkReq} from "./types.js";
+import {randomBytesNonZero} from "./utils.js";
 
 export type JobQueueItem = JobQueueItemDefault | JobQueueItemSameMessage;
 
@@ -14,7 +15,7 @@ export type JobQueueItemDefault = {
   resolve: (result: boolean) => void;
   reject: (error?: Error) => void;
   addedTimeMs: number;
-  opts: VerifySignatureOpts;
+  opts: QueuedVerificationOpts;
   sets: ISignatureSet[];
 };
 
@@ -23,7 +24,7 @@ export type JobQueueItemSameMessage = {
   resolve: (result: boolean[]) => void;
   reject: (error?: Error) => void;
   addedTimeMs: number;
-  opts: VerifySignatureOpts;
+  opts: QueuedVerificationOpts;
   sets: {publicKey: PublicKey; signature: Uint8Array}[];
   message: Uint8Array;
 };
@@ -56,7 +57,7 @@ export function jobItemWorkReq(job: JobQueueItem, format: PointFormat, metrics:
         opts: job.opts,
         sets: job.sets.map((set) => ({
           // this can throw, handled in the consumer code
-          publicKey: getAggregatedPubkey(set, metrics).toBytes(format),
+          publicKey: getAggregatedPubkey(set, metrics),
           signature: set.signature,
           message: set.signingRoot,
         })),
@@ -73,12 +74,31 @@ export function jobItemWorkReq(job: JobQueueItem, format: PointFormat, metrics:
       const signatures = job.sets.map((set) => bls.Signature.fromBytes(set.signature, CoordType.affine, true));
       timer?.();
 
+      // adding verification randomness is swig specific. must not attempt with herumi until
+      // @chainsafe/bls is updated to support it with herumi
+      if (job.opts.addVerificationRandomness) {
+        const randomness: Uint8Array[] = [];
+        for (let i = 0; i < job.sets.length; i++) {
+          randomness.push(randomBytesNonZero(8));
+        }
+        return {
+          opts: job.opts,
+          sets: [
+            {
+              message: job.message,
+              publicKey: bls.PublicKey.aggregate(job.sets.map((set, i) => set.publicKey.multiplyBy(randomness[i]))),
+              signature: bls.Signature.aggregate(signatures.map((sig, i) => sig.multiplyBy(randomness[i]))),
+            },
+          ],
+        };
+      }
+
       return {
         opts: job.opts,
         sets: [
           {
-            publicKey: bls.PublicKey.aggregate(job.sets.map((set) => set.publicKey)).toBytes(format),
-            signature: bls.Signature.aggregate(signatures).toBytes(format),
+            publicKey: bls.PublicKey.aggregate(job.sets.map((set) => set.publicKey)),
+            signature: bls.Signature.aggregate(signatures),
             message: job.message,
           },
         ],