@obolnetwork/obol-sdk 2.12.2 → 2.12.4

package/dist/cjs/src/verification/clusterLockValidationWorker.js

@@ -107,6 +107,22 @@ var __yieldStar = (value) => {
 // src/verification/clusterLockValidationWorker.ts
 var import_node_worker_threads = require("worker_threads");
 
+// src/errors.ts
+var ClusterLockValidationTimeoutError = class _ClusterLockValidationTimeoutError extends Error {
+  /**
+   * @param timeoutMs - Worker deadline that was exceeded (`VALIDATION_WORKER_TIMEOUT_MS`
+   *   for the whole-lock worker, `WORKER_TIMEOUT_MS` for per-chunk BLS workers).
+   */
+  constructor(timeoutMs) {
+    super(
+      `Cluster lock validation exceeded worker time limit (${timeoutMs} ms). Retry later; this does not imply invalid lock data.`
+    );
+    this.timeoutMs = timeoutMs;
+    this.name = "ClusterLockValidationTimeoutError";
+    Object.setPrototypeOf(this, _ClusterLockValidationTimeoutError.prototype);
+  }
+};
+
 // src/verification/common.ts
 var import_ssz7 = require("@chainsafe/ssz");
 var import_elliptic = __toESM(require("elliptic"));
@@ -138,7 +154,7 @@ var import_ethers = require("ethers");
 // package.json
 var package_default = {
   name: "@obolnetwork/obol-sdk",
-  version: "2.12.2",
+  version: "2.12.4",
   description: "A package for creating Distributed Validators using the Obol API.",
   bugs: {
     url: "https://github.com/obolnetwork/obol-sdk/issues"
@@ -153,7 +169,7 @@ var package_default = {
     "build:clean": "rm -rf ./dist",
     build: "npm-run-all build:clean build:tsup",
     "build:tsup": "tsup && tsc -b ./tsconfig.types.json",
-    test: "NODE_OPTIONS=--experimental-vm-modules jest test/**/**.spec.ts --testPathIgnorePatterns=test/sdk-package/",
+    test: "NODE_OPTIONS=--experimental-vm-modules OBOL_SDK_MAX_CONCURRENT_LOCK_VALIDATIONS=0 jest test/**/**.spec.ts --testPathIgnorePatterns=test/sdk-package/",
     "generate-typedoc": "typedoc",
     "npm:publish": "npm publish --tag latest",
     "npm:publish:next": "npm publish --tag next",
@@ -4954,7 +4970,7 @@ function verifySharesSync(shares, distributedKeys, threshold) {
 }
 function runWorkerAggregatePubkeys(wt, workerFile, data) {
   return __async(this, null, function* () {
-    return yield new Promise((resolve) => {
+    return yield new Promise((resolve, reject) => {
       let settled = false;
       const worker = new wt.Worker(workerFile, { workerData: data });
       const finish = (result) => {
@@ -4965,7 +4981,11 @@ function runWorkerAggregatePubkeys(wt, workerFile, data) {
         resolve(result);
       };
       const timer = setTimeout(() => {
-        finish(null);
+        if (settled) return;
+        settled = true;
+        clearTimeout(timer);
+        worker.terminate();
+        reject(new ClusterLockValidationTimeoutError(WORKER_TIMEOUT_MS));
       }, WORKER_TIMEOUT_MS);
       worker.once("message", (msg) => {
         finish(msg instanceof Uint8Array ? msg : null);
@@ -4981,7 +5001,7 @@ function runWorkerAggregatePubkeys(wt, workerFile, data) {
 }
 function runWorker(wt, workerFile, data) {
   return __async(this, null, function* () {
-    return yield new Promise((resolve) => {
+    return yield new Promise((resolve, reject) => {
       let settled = false;
       const worker = new wt.Worker(workerFile, { workerData: data });
       const finish = (result) => {
@@ -4992,7 +5012,11 @@ function runWorker(wt, workerFile, data) {
         resolve(result);
       };
       const timer = setTimeout(() => {
-        finish(false);
+        if (settled) return;
+        settled = true;
+        clearTimeout(timer);
+        worker.terminate();
+        reject(new ClusterLockValidationTimeoutError(WORKER_TIMEOUT_MS));
       }, WORKER_TIMEOUT_MS);
       worker.once("message", (msg) => {
         finish(msg === true);
@@ -14653,6 +14677,9 @@ var isValidClusterLock = (clusterLock, safeRpcUrl) => __async(null, null, functi
     }
     return true;
   } catch (err) {
+    if (err instanceof ClusterLockValidationTimeoutError) {
+      throw err;
+    }
     return false;
   }
 });
@@ -14663,7 +14690,11 @@ if (import_node_worker_threads.parentPort) {
   const port = import_node_worker_threads.parentPort;
   void isValidClusterLock(input.lock, input.safeRpcUrl).then((ok) => {
     port.postMessage(ok);
-  }).catch(() => {
+  }).catch((err) => {
+    if (err instanceof ClusterLockValidationTimeoutError) {
+      port.postMessage({ validationTimeoutMs: err.timeoutMs });
+      return;
+    }
     port.postMessage(false);
   });
 }