@lodestar/beacon-node 1.35.0-dev.c88a6ed255 → 1.35.0-dev.cec9bef1db

package/lib/chain/blocks/verifyBlocksStateTransitionOnly.d.ts

@@ -3,7 +3,8 @@ import { Logger } from "@lodestar/utils";
 import { Metrics } from "../../metrics/index.js";
 import { BlockProcessOpts } from "../options.js";
 import { ValidatorMonitor } from "../validatorMonitor.js";
-import { BlockInput, ImportBlockOpts } from "./types.js";
+import { IBlockInput } from "./blockInput/index.js";
+import { ImportBlockOpts } from "./types.js";
 /**
  * Verifies 1 or more blocks are fully valid running the full state transition; from a linear sequence of blocks.
  *
@@ -12,7 +13,7 @@ import { BlockInput, ImportBlockOpts } from "./types.js";
  *   - STFN - per_block_processing()
  *   - Check state root matches
  */
-export declare function verifyBlocksStateTransitionOnly(preState0: CachedBeaconStateAllForks, blocks: BlockInput[], dataAvailabilityStatuses: DataAvailabilityStatus[], logger: Logger, metrics: Metrics | null, validatorMonitor: ValidatorMonitor | null, signal: AbortSignal, opts: BlockProcessOpts & ImportBlockOpts): Promise<{
+export declare function verifyBlocksStateTransitionOnly(preState0: CachedBeaconStateAllForks, blocks: IBlockInput[], dataAvailabilityStatuses: DataAvailabilityStatus[], logger: Logger, metrics: Metrics | null, validatorMonitor: ValidatorMonitor | null, signal: AbortSignal, opts: BlockProcessOpts & ImportBlockOpts): Promise<{
     postStates: CachedBeaconStateAllForks[];
     proposerBalanceDeltas: number[];
     verifyStateTime: number;

package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js

@@ -17,7 +17,7 @@ export async function verifyBlocksStateTransitionOnly(preState0, blocks, dataAva
     const recvToValLatency = Date.now() / 1000 - (opts.seenTimestampSec ?? Date.now() / 1000);
     for (let i = 0; i < blocks.length; i++) {
         const { validProposerSignature, validSignatures } = opts;
-        const { block } = blocks[i];
+        const block = blocks[i].getBlock();
         const preState = i === 0 ? preState0 : postStates[i - 1];
         const dataAvailabilityStatus = dataAvailabilityStatuses[i];
         // STFN - per_slot_processing() + per_block_processing()
@@ -65,7 +65,7 @@ export async function verifyBlocksStateTransitionOnly(preState0, blocks, dataAva
     }
     const verifyStateTime = Date.now();
     if (blocks.length === 1 && opts.seenTimestampSec !== undefined) {
-        const slot = blocks[0].block.message.slot;
+        const slot = blocks[0].getBlock().message.slot;
         const recvToValidation = verifyStateTime / 1000 - opts.seenTimestampSec;
         const validationTime = recvToValidation - recvToValLatency;
         metrics?.gossipBlock.stateTransition.recvToValidation.observe(recvToValidation);

package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyBlocksStateTransitionOnly.js","sourceRoot":"","sources":["../../../src/chain/blocks/verifyBlocksStateTransitionOnly.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verifyBlocksStateTransitionOnly.js","sourceRoot":"","sources":["../../../src/chain/blocks/verifyBlocksStateTransitionOnly.ts"],"names":[],"mappings":"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"}

package/lib/chain/blocks/writeBlockInputToDb.d.ts

@@ -1,5 +1,5 @@
 import { BeaconChain } from "../chain.js";
-import { BlockInput } from "./types.js";
+import { IBlockInput } from "./blockInput/index.js";
 /**
  * Persists block input data to DB. This operation must be eventually completed if a block is imported to the fork-choice.
  * Else the node will be in an inconsistent state that can lead to being stuck.
@@ -7,9 +7,9 @@ import { BlockInput } from "./types.js";
  * This operation may be performed before, during or after importing to the fork-choice. As long as errors
  * are handled properly for eventual consistency.
  */
-export declare function writeBlockInputToDb(this: BeaconChain, blocksInput: BlockInput[]): Promise<void>;
+export declare function writeBlockInputToDb(this: BeaconChain, blocksInputs: IBlockInput[]): Promise<void>;
 /**
  * Prunes eagerly persisted block inputs only if not known to the fork-choice
  */
-export declare function removeEagerlyPersistedBlockInputs(this: BeaconChain, blockInputs: BlockInput[]): Promise<void>;
+export declare function removeEagerlyPersistedBlockInputs(this: BeaconChain, blockInputs: IBlockInput[]): Promise<void>;
 //# sourceMappingURL=writeBlockInputToDb.d.ts.map

package/lib/chain/blocks/writeBlockInputToDb.js

@@ -1,6 +1,6 @@
-import { ForkName, isForkPostDeneb, isForkPostFulu } from "@lodestar/params";
-import { prettyPrintIndices, toHex, toRootHex } from "@lodestar/utils";
-import { BlockInputType } from "./types.js";
+import { prettyPrintIndices, toRootHex } from "@lodestar/utils";
+import { isBlockInputBlobs, isBlockInputColumns } from "./blockInput/index.js";
+import { BLOB_AVAILABILITY_TIMEOUT } from "./verifyBlocksDataAvailability.js";
 /**
  * Persists block input data to DB. This operation must be eventually completed if a block is imported to the fork-choice.
  * Else the node will be in an inconsistent state that can lead to being stuck.
@@ -8,10 +8,14 @@ import { BlockInputType } from "./types.js";
  * This operation may be performed before, during or after importing to the fork-choice. As long as errors
  * are handled properly for eventual consistency.
  */
-export async function writeBlockInputToDb(blocksInput) {
+export async function writeBlockInputToDb(blocksInputs) {
     const fnPromises = [];
-    for (const blockInput of blocksInput) {
-        const { block } = blockInput;
+    // track slots for logging
+    const slots = [];
+    for (const blockInput of blocksInputs) {
+        const block = blockInput.getBlock();
+        const slot = block.message.slot;
+        slots.push(slot);
         const blockRoot = this.config.getForkTypes(block.message.slot).BeaconBlock.hashTreeRoot(block.message);
         const blockRootHex = toRootHex(blockRoot);
         const blockBytes = this.serializedCache.get(block);
@@ -29,53 +33,48 @@ export async function writeBlockInputToDb(blocksInput) {
             root: blockRootHex,
             inputType: blockInput.type,
         });
-        if (blockInput.type === BlockInputType.availableData || blockInput.type === BlockInputType.dataPromise) {
-            const blockData = blockInput.type === BlockInputType.availableData
-                ? blockInput.blockData
-                : await blockInput.cachedData.availabilityPromise;
-            // NOTE: Old data is pruned on archive
-            if (isForkPostFulu(blockData.fork)) {
-                const { custodyConfig } = this;
-                const { custodyColumns } = custodyConfig;
-                const blobsLen = block.message.body.blobKzgCommitments.length;
-                let dataColumnsLen;
-                if (blobsLen === 0) {
-                    dataColumnsLen = 0;
-                }
-                else {
-                    dataColumnsLen = custodyColumns.length;
-                }
-                const blockDataColumns = blockData.dataColumns;
-                const dataColumnSidecars = blockDataColumns.filter((dataColumnSidecar) => custodyColumns.includes(dataColumnSidecar.index));
-                if (dataColumnSidecars.length !== dataColumnsLen) {
-                    throw Error(`Invalid dataColumnSidecars=${dataColumnSidecars.length} for custody expected custodyColumnsLen=${dataColumnsLen}`);
-                }
-                fnPromises.push(this.db.dataColumnSidecar.putMany(blockRoot, dataColumnSidecars));
-                this.logger.debug("Persisted dataColumnSidecars to hot DB", {
-                    slot: block.message.slot,
-                    root: blockRootHex,
-                    blockDataColumns: blockDataColumns.length,
-                    dataColumnSidecars: dataColumnSidecars.length,
-                    numBlobs: blobsLen,
-                    custodyColumns: custodyColumns.length,
-                });
+        if (!blockInput.hasAllData()) {
+            await blockInput.waitForAllData(BLOB_AVAILABILITY_TIMEOUT);
+        }
+        // NOTE: Old data is pruned on archive
+        if (isBlockInputColumns(blockInput)) {
+            const { custodyColumns } = this.custodyConfig;
+            const blobsLen = block.message.body.blobKzgCommitments.length;
+            let dataColumnsLen;
+            if (blobsLen === 0) {
+                dataColumnsLen = 0;
+            }
+            else {
+                dataColumnsLen = custodyColumns.length;
             }
-            else if (isForkPostDeneb(blockData.fork)) {
-                const blobSidecars = blockData.blobs;
-                fnPromises.push(this.db.blobSidecars.add({ blockRoot, slot: block.message.slot, blobSidecars }));
-                this.logger.debug("Persisted blobSidecars to hot DB", {
-                    blobsLen: blobSidecars.length,
-                    slot: block.message.slot,
-                    root: blockRootHex,
-                });
+            const dataColumnSidecars = blockInput.getCustodyColumns();
+            if (dataColumnSidecars.length !== dataColumnsLen) {
+                this.logger.debug(`Invalid dataColumnSidecars=${dataColumnSidecars.length} for custody expected custodyColumnsLen=${dataColumnsLen}`);
             }
+            fnPromises.push(this.db.dataColumnSidecar.putMany(blockRoot, dataColumnSidecars));
+            this.logger.debug("Persisted dataColumnSidecars to hot DB", {
+                slot: block.message.slot,
+                root: blockRootHex,
+                dataColumnSidecars: dataColumnSidecars.length,
+                numBlobs: blobsLen,
+                custodyColumns: custodyColumns.length,
+            });
         }
+        else if (isBlockInputBlobs(blockInput)) {
+            const blobSidecars = blockInput.getBlobs();
+            fnPromises.push(this.db.blobSidecars.add({ blockRoot, slot: block.message.slot, blobSidecars }));
+            this.logger.debug("Persisted blobSidecars to hot DB", {
+                blobsLen: blobSidecars.length,
+                slot: block.message.slot,
+                root: blockRootHex,
+            });
+        }
+        await Promise.all(fnPromises);
+        this.logger.debug("Persisted blocksInput to db", {
+            blocksInput: blocksInputs.length,
+            slots: prettyPrintIndices(slots),
+        });
     }
-    await Promise.all(fnPromises);
-    this.logger.debug("Persisted blocksInput to db", {
-        blocksInput: blocksInput.length,
-        slots: prettyPrintIndices(blocksInput.map((blockInput) => blockInput.block.message.slot)),
-    });
 }
 /**
  * Prunes eagerly persisted block inputs only if not known to the fork-choice
@@ -85,28 +84,24 @@ export async function removeEagerlyPersistedBlockInputs(blockInputs) {
     const blobsToRemove = [];
     const dataColumnsToRemove = [];
     for (const blockInput of blockInputs) {
-        const { block, type } = blockInput;
+        const block = blockInput.getBlock();
         const slot = block.message.slot;
         const blockRoot = this.config.getForkTypes(slot).BeaconBlock.hashTreeRoot(block.message);
-        const blockRootHex = toHex(blockRoot);
+        const blockRootHex = toRootHex(blockRoot);
         if (!this.forkChoice.hasBlockHex(blockRootHex)) {
             blockToRemove.push(block);
-            if (type === BlockInputType.availableData) {
-                const { blockData } = blockInput;
-                if (blockData.fork === ForkName.deneb || blockData.fork === ForkName.electra) {
-                    const blobSidecars = blockData.blobs;
-                    blobsToRemove.push({ blockRoot, slot, blobSidecars });
-                }
-                else {
-                    const { custodyConfig } = this;
-                    const { custodyColumns } = custodyConfig;
-                    const dataColumnsLen = custodyColumns.length;
-                    const dataColumnSidecars = blockData.dataColumns.filter((dataColumnSidecar) => custodyColumns.includes(dataColumnSidecar.index));
-                    if (dataColumnSidecars.length !== dataColumnsLen) {
-                        throw Error(`Invalid dataColumnSidecars=${dataColumnSidecars.length} for custody expected custodyColumnsLen=${dataColumnsLen}`);
-                    }
-                    dataColumnsToRemove.push(blockRoot);
+            if (isBlockInputColumns(blockInput)) {
+                const { custodyColumns } = this.custodyConfig;
+                const dataColumnsLen = custodyColumns.length;
+                const dataColumnSidecars = blockInput.getCustodyColumns();
+                if (dataColumnSidecars.length !== dataColumnsLen) {
+                    throw Error(`Invalid dataColumnSidecars=${dataColumnSidecars.length} for custody expected custodyColumnsLen=${dataColumnsLen}`);
                 }
+                dataColumnsToRemove.push(blockRoot);
+            }
+            else if (isBlockInputBlobs(blockInput)) {
+                const blobSidecars = blockInput.getBlobs();
+                blobsToRemove.push({ blockRoot, slot, blobSidecars });
             }
         }
     }

package/lib/chain/blocks/writeBlockInputToDb.js.map

@@ -1 +1 @@
-{"version":3,"file":"writeBlockInputToDb.js","sourceRoot":"","sources":["../../../src/chain/blocks/writeBlockInputToDb.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"writeBlockInputToDb.js","sourceRoot":"","sources":["../../../src/chain/blocks/writeBlockInputToDb.ts"],"names":[],"mappings":"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"}

package/lib/chain/bls/multithread/index.js

@@ -64,170 +64,15 @@ var WorkerStatusCode;
  *   sets into packages of work and send at once to a worker to distribute the latency cost
  */
 export class BlsMultiThreadWorkerPool {
+    logger;
+    metrics;
+    workers;
+    jobs = new LinkedList();
+    bufferedJobs = null;
+    blsVerifyAllMultiThread;
+    closed = false;
+    workersBusy = 0;
     constructor(options, modules) {
-        this.jobs = new LinkedList();
-        this.bufferedJobs = null;
-        this.closed = false;
-        this.workersBusy = 0;
-        /**
-         * Potentially submit jobs to an idle worker, only if there's a worker and jobs
-         */
-        this.runJob = async () => {
-            if (this.closed) {
-                return;
-            }
-            // Find idle worker
-            const worker = this.workers.find((worker) => worker.status.code === WorkerStatusCode.idle);
-            if (!worker || worker.status.code !== WorkerStatusCode.idle) {
-                return;
-            }
-            // Prepare work package
-            const jobsInput = this.prepareWork();
-            if (jobsInput.length === 0) {
-                return;
-            }
-            // TODO: After sending the work to the worker the main thread can drop the job arguments
-            // and free-up memory, only needs to keep the job's Promise handlers.
-            // Maybe it's not useful since all data referenced in jobs is likely referenced by others
-            const workerApi = worker.status.workerApi;
-            worker.status = { code: WorkerStatusCode.running, workerApi };
-            this.workersBusy++;
-            try {
-                let startedJobsDefault = 0;
-                let startedJobsSameMessage = 0;
-                let startedSetsDefault = 0;
-                let startedSetsSameMessage = 0;
-                const workReqs = [];
-                const jobsStarted = [];
-                for (const job of jobsInput) {
-                    this.metrics?.blsThreadPool.jobWaitTime.observe((Date.now() - job.addedTimeMs) / 1000);
-                    let workReq;
-                    try {
-                        // Note: This can throw, must be handled per-job.
-                        // Pubkey and signature aggregation is defered here
-                        workReq = await jobItemWorkReq(job, this.metrics);
-                    }
-                    catch (e) {
-                        this.metrics?.blsThreadPool.errorAggregateSignatureSetsCount.inc({ type: job.type });
-                        switch (job.type) {
-                            case JobQueueItemType.default:
-                                job.reject(e);
-                                break;
-                            case JobQueueItemType.sameMessage:
-                                // there could be an invalid pubkey/signature, retry each individually
-                                this.retryJobItemSameMessage(job);
-                                break;
-                        }
-                        continue;
-                    }
-                    // Re-push all jobs with matching workReq for easier accounting of results
-                    workReqs.push(workReq);
-                    jobsStarted.push(job);
-                    if (job.type === JobQueueItemType.sameMessage) {
-                        startedJobsSameMessage += 1;
-                        startedSetsSameMessage += job.sets.length;
-                    }
-                    else {
-                        startedJobsDefault += 1;
-                        startedSetsDefault += job.sets.length;
-                    }
-                }
-                const startedSigSets = startedSetsDefault + startedSetsSameMessage;
-                this.metrics?.blsThreadPool.totalJobsGroupsStarted.inc(1);
-                this.metrics?.blsThreadPool.totalJobsStarted.inc({ type: JobQueueItemType.default }, startedJobsDefault);
-                this.metrics?.blsThreadPool.totalJobsStarted.inc({ type: JobQueueItemType.sameMessage }, startedJobsSameMessage);
-                this.metrics?.blsThreadPool.totalSigSetsStarted.inc({ type: JobQueueItemType.default }, startedSetsDefault);
-                this.metrics?.blsThreadPool.totalSigSetsStarted.inc({ type: JobQueueItemType.sameMessage }, startedSetsSameMessage);
-                // Send work package to the worker
-                // If the job, metrics or any code below throws: the job will reject never going stale.
-                // Only downside is the job promise may be resolved twice, but that's not an issue
-                const [jobStartSec, jobStartNs] = process.hrtime();
-                const workResult = await workerApi.verifyManySignatureSets(workReqs);
-                const [jobEndSec, jobEndNs] = process.hrtime();
-                const { workerId, batchRetries, batchSigsSuccess, workerStartTime, workerEndTime, results } = workResult;
-                const [workerStartSec, workerStartNs] = workerStartTime;
-                const [workerEndSec, workerEndNs] = workerEndTime;
-                let successCount = 0;
-                let errorCount = 0;
-                // Un-wrap work package
-                for (let i = 0; i < jobsStarted.length; i++) {
-                    const job = jobsStarted[i];
-                    const jobResult = results[i];
-                    const sigSetCount = jobItemSigSets(job);
-                    // TODO: enable exhaustive switch case checks lint rule
-                    switch (job.type) {
-                        case JobQueueItemType.default:
-                            if (!jobResult || jobResult.code !== WorkResultCode.success) {
-                                job.reject(getJobResultError(jobResult, i));
-                                errorCount += sigSetCount;
-                            }
-                            else {
-                                job.resolve(jobResult.result);
-                                successCount += sigSetCount;
-                            }
-                            break;
-                        // handle result of the verification of aggregated signature against aggregated pubkeys
-                        case JobQueueItemType.sameMessage:
-                            if (!jobResult || jobResult.code !== WorkResultCode.success) {
-                                job.reject(getJobResultError(jobResult, i));
-                                errorCount += 1;
-                            }
-                            else {
-                                if (jobResult.result) {
-                                    // All are valid, most of the time it goes here
-                                    job.resolve(job.sets.map(() => true));
-                                }
-                                else {
-                                    // Retry each individually
-                                    this.retryJobItemSameMessage(job);
-                                }
-                                successCount += 1;
-                            }
-                            break;
-                    }
-                }
-                const workerJobTimeSec = workerEndSec - workerStartSec + (workerEndNs - workerStartNs) / 1e9;
-                const latencyToWorkerSec = workerStartSec - jobStartSec + (workerStartNs - jobStartNs) / 1e9;
-                const latencyFromWorkerSec = jobEndSec - workerEndSec + Number(jobEndNs - workerEndNs) / 1e9;
-                this.metrics?.blsThreadPool.timePerSigSet.observe(workerJobTimeSec / startedSigSets);
-                this.metrics?.blsThreadPool.jobsWorkerTime.inc({ workerId }, workerJobTimeSec);
-                this.metrics?.blsThreadPool.latencyToWorker.observe(latencyToWorkerSec);
-                this.metrics?.blsThreadPool.latencyFromWorker.observe(latencyFromWorkerSec);
-                this.metrics?.blsThreadPool.successJobsSignatureSetsCount.inc(successCount);
-                this.metrics?.blsThreadPool.errorJobsSignatureSetsCount.inc(errorCount);
-                this.metrics?.blsThreadPool.batchRetries.inc(batchRetries);
-                this.metrics?.blsThreadPool.batchSigsSuccess.inc(batchSigsSuccess);
-            }
-            catch (e) {
-                // Worker communications should never reject
-                if (!this.closed) {
-                    this.logger.error("BlsMultiThreadWorkerPool error", {}, e);
-                }
-                // Reject all
-                for (const job of jobsInput) {
-                    job.reject(e);
-                }
-            }
-            worker.status = { code: WorkerStatusCode.idle, workerApi };
-            this.workersBusy--;
-            // Potentially run a new job
-            callInNextEventLoop(this.runJob);
-        };
-        /**
-         * Add all buffered jobs to the job queue and potentially run them immediately
-         */
-        this.runBufferedJobs = () => {
-            if (this.bufferedJobs) {
-                for (const job of this.bufferedJobs.jobs) {
-                    this.jobs.push(job);
-                }
-                for (const job of this.bufferedJobs.prioritizedJobs) {
-                    this.jobs.unshift(job);
-                }
-                this.bufferedJobs = null;
-                callInNextEventLoop(this.runJob);
-            }
-        };
         const { logger, metrics } = modules;
         this.logger = logger;
         this.metrics = metrics;
@@ -330,6 +175,7 @@ export class BlsMultiThreadWorkerPool {
         for (let i = 0; i < poolSize; i++) {
             const workerData = { workerId: i };
             const worker = new Worker(path.join(workerDir, "worker.js"), {
+                suppressTranspileTS: Boolean(globalThis.Bun),
                 workerData,
             });
             const workerDescriptor = {
@@ -405,6 +251,150 @@ export class BlsMultiThreadWorkerPool {
             callInNextEventLoop(this.runJob);
         }
     }
+    /**
+     * Potentially submit jobs to an idle worker, only if there's a worker and jobs
+     */
+    runJob = async () => {
+        if (this.closed) {
+            return;
+        }
+        // Find idle worker
+        const worker = this.workers.find((worker) => worker.status.code === WorkerStatusCode.idle);
+        if (!worker || worker.status.code !== WorkerStatusCode.idle) {
+            return;
+        }
+        // Prepare work package
+        const jobsInput = this.prepareWork();
+        if (jobsInput.length === 0) {
+            return;
+        }
+        // TODO: After sending the work to the worker the main thread can drop the job arguments
+        // and free-up memory, only needs to keep the job's Promise handlers.
+        // Maybe it's not useful since all data referenced in jobs is likely referenced by others
+        const workerApi = worker.status.workerApi;
+        worker.status = { code: WorkerStatusCode.running, workerApi };
+        this.workersBusy++;
+        try {
+            let startedJobsDefault = 0;
+            let startedJobsSameMessage = 0;
+            let startedSetsDefault = 0;
+            let startedSetsSameMessage = 0;
+            const workReqs = [];
+            const jobsStarted = [];
+            for (const job of jobsInput) {
+                this.metrics?.blsThreadPool.jobWaitTime.observe((Date.now() - job.addedTimeMs) / 1000);
+                let workReq;
+                try {
+                    // Note: This can throw, must be handled per-job.
+                    // Pubkey and signature aggregation is defered here
+                    workReq = await jobItemWorkReq(job, this.metrics);
+                }
+                catch (e) {
+                    this.metrics?.blsThreadPool.errorAggregateSignatureSetsCount.inc({ type: job.type });
+                    switch (job.type) {
+                        case JobQueueItemType.default:
+                            job.reject(e);
+                            break;
+                        case JobQueueItemType.sameMessage:
+                            // there could be an invalid pubkey/signature, retry each individually
+                            this.retryJobItemSameMessage(job);
+                            break;
+                    }
+                    continue;
+                }
+                // Re-push all jobs with matching workReq for easier accounting of results
+                workReqs.push(workReq);
+                jobsStarted.push(job);
+                if (job.type === JobQueueItemType.sameMessage) {
+                    startedJobsSameMessage += 1;
+                    startedSetsSameMessage += job.sets.length;
+                }
+                else {
+                    startedJobsDefault += 1;
+                    startedSetsDefault += job.sets.length;
+                }
+            }
+            const startedSigSets = startedSetsDefault + startedSetsSameMessage;
+            this.metrics?.blsThreadPool.totalJobsGroupsStarted.inc(1);
+            this.metrics?.blsThreadPool.totalJobsStarted.inc({ type: JobQueueItemType.default }, startedJobsDefault);
+            this.metrics?.blsThreadPool.totalJobsStarted.inc({ type: JobQueueItemType.sameMessage }, startedJobsSameMessage);
+            this.metrics?.blsThreadPool.totalSigSetsStarted.inc({ type: JobQueueItemType.default }, startedSetsDefault);
+            this.metrics?.blsThreadPool.totalSigSetsStarted.inc({ type: JobQueueItemType.sameMessage }, startedSetsSameMessage);
+            // Send work package to the worker
+            // If the job, metrics or any code below throws: the job will reject never going stale.
+            // Only downside is the job promise may be resolved twice, but that's not an issue
+            const [jobStartSec, jobStartNs] = process.hrtime();
+            const workResult = await workerApi.verifyManySignatureSets(workReqs);
+            const [jobEndSec, jobEndNs] = process.hrtime();
+            const { workerId, batchRetries, batchSigsSuccess, workerStartTime, workerEndTime, results } = workResult;
+            const [workerStartSec, workerStartNs] = workerStartTime;
+            const [workerEndSec, workerEndNs] = workerEndTime;
+            let successCount = 0;
+            let errorCount = 0;
+            // Un-wrap work package
+            for (let i = 0; i < jobsStarted.length; i++) {
+                const job = jobsStarted[i];
+                const jobResult = results[i];
+                const sigSetCount = jobItemSigSets(job);
+                // TODO: enable exhaustive switch case checks lint rule
+                switch (job.type) {
+                    case JobQueueItemType.default:
+                        if (!jobResult || jobResult.code !== WorkResultCode.success) {
+                            job.reject(getJobResultError(jobResult, i));
+                            errorCount += sigSetCount;
+                        }
+                        else {
+                            job.resolve(jobResult.result);
+                            successCount += sigSetCount;
+                        }
+                        break;
+                    // handle result of the verification of aggregated signature against aggregated pubkeys
+                    case JobQueueItemType.sameMessage:
+                        if (!jobResult || jobResult.code !== WorkResultCode.success) {
+                            job.reject(getJobResultError(jobResult, i));
+                            errorCount += 1;
+                        }
+                        else {
+                            if (jobResult.result) {
+                                // All are valid, most of the time it goes here
+                                job.resolve(job.sets.map(() => true));
+                            }
+                            else {
+                                // Retry each individually
+                                this.retryJobItemSameMessage(job);
+                            }
+                            successCount += 1;
+                        }
+                        break;
+                }
+            }
+            const workerJobTimeSec = workerEndSec - workerStartSec + (workerEndNs - workerStartNs) / 1e9;
+            const latencyToWorkerSec = workerStartSec - jobStartSec + (workerStartNs - jobStartNs) / 1e9;
+            const latencyFromWorkerSec = jobEndSec - workerEndSec + Number(jobEndNs - workerEndNs) / 1e9;
+            this.metrics?.blsThreadPool.timePerSigSet.observe(workerJobTimeSec / startedSigSets);
+            this.metrics?.blsThreadPool.jobsWorkerTime.inc({ workerId }, workerJobTimeSec);
+            this.metrics?.blsThreadPool.latencyToWorker.observe(latencyToWorkerSec);
+            this.metrics?.blsThreadPool.latencyFromWorker.observe(latencyFromWorkerSec);
+            this.metrics?.blsThreadPool.successJobsSignatureSetsCount.inc(successCount);
+            this.metrics?.blsThreadPool.errorJobsSignatureSetsCount.inc(errorCount);
+            this.metrics?.blsThreadPool.batchRetries.inc(batchRetries);
+            this.metrics?.blsThreadPool.batchSigsSuccess.inc(batchSigsSuccess);
+        }
+        catch (e) {
+            // Worker communications should never reject
+            if (!this.closed) {
+                this.logger.error("BlsMultiThreadWorkerPool error", {}, e);
+            }
+            // Reject all
+            for (const job of jobsInput) {
+                job.reject(e);
+            }
+        }
+        worker.status = { code: WorkerStatusCode.idle, workerApi };
+        this.workersBusy--;
+        // Potentially run a new job
+        callInNextEventLoop(this.runJob);
+    };
     /**
      * Grab pending work up to a max number of signatures
      */
@@ -421,6 +411,21 @@ export class BlsMultiThreadWorkerPool {
         }
         return jobs;
     }
+    /**
+     * Add all buffered jobs to the job queue and potentially run them immediately
+     */
+    runBufferedJobs = () => {
+        if (this.bufferedJobs) {
+            for (const job of this.bufferedJobs.jobs) {
+                this.jobs.push(job);
+            }
+            for (const job of this.bufferedJobs.prioritizedJobs) {
+                this.jobs.unshift(job);
+            }
+            this.bufferedJobs = null;
+            callInNextEventLoop(this.runJob);
+        }
+    };
     retryJobItemSameMessage(job) {
         // Create new jobs for each pubkey set, and Promise.all all the results
         for (const j of jobItemSameMessageToMultiSet(job)) {