@obolnetwork/obol-sdk 2.12.2 → 2.12.5

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

@@ -3833,7 +3833,8 @@ function blsVerifyExtraShares(pubshares, threshold, distributedPubkey) {
 // src/errors.ts
 var ClusterLockValidationTimeoutError = class _ClusterLockValidationTimeoutError extends Error {
   /**
-   * @param timeoutMs - Same value as SDK whole-lock validation worker timeout.
+   * @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(
@@ -3854,8 +3855,11 @@ var MIN_PAIRS_PER_WORKER = 50;
 var MIN_PARALLEL_AGGREGATE_KEYS = 400;
 var MIN_KEYS_PER_WORKER_AGG = 100;
 var MIN_VALIDATORS_FOR_VALIDATION_WORKER = 50;
-var VALIDATION_WORKER_TIMEOUT_MS = 12e4;
-var WORKER_TIMEOUT_MS = 6e4;
+var VALIDATION_WORKER_TIMEOUT_MS = 3e5;
+var WORKER_TIMEOUT_MS = 18e4;
+function isValidationTimeoutReply(msg) {
+  return typeof msg === "object" && msg !== null && "validationTimeoutMs" in msg && typeof msg.validationTimeoutMs === "number";
+}
 var MAX_CONCURRENT_WORKERS_CAP = 8;
 function maxConcurrentWorkers(numWorkers) {
   return Math.min(numWorkers, MAX_CONCURRENT_WORKERS_CAP);
@@ -3952,7 +3956,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) => {
@@ -3963,7 +3967,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);
@@ -3979,7 +3987,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) => {
@@ -3990,7 +3998,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);
@@ -4151,6 +4163,14 @@ function validateClusterLockInWorker(lock, safeRpcUrl) {
         resolve(result);
       };
       worker.once("message", (msg) => {
+        if (isValidationTimeoutReply(msg)) {
+          if (settled) return;
+          settled = true;
+          clearTimeout(timer);
+          worker.terminate();
+          reject(new ClusterLockValidationTimeoutError(msg.validationTimeoutMs));
+          return;
+        }
         finish(msg === true);
       });
       worker.once("error", () => {