@lodestar/utils 1.16.0-dev.5064fab473 → 1.16.0-dev.53f8f99c64

package/lib/format.d.ts

@@ -14,4 +14,16 @@ export declare function prettyBytesShort(root: Uint8Array | string): string;
  * values on explorers like beaconcha.in while improving readability of logs
  */
 export declare function truncBytes(root: Uint8Array | string): string;
+/**
+ * Format a bigint value as a decimal string
+ */
+export declare function formatBigDecimal(numerator: bigint, denominator: bigint, maxDecimalFactor: bigint): string;
+/**
+ * Format wei as ETH, with up to 5 decimals and append ' ETH'
+ */
+export declare function prettyWeiToEth(wei: bigint): string;
+/**
+ * Format milliseconds to time format HH:MM:SS.ms
+ */
+export declare function prettyMsToTime(timeMs: number): string;
 //# sourceMappingURL=format.d.ts.map

package/lib/format.js

@@ -1,4 +1,5 @@
 import { toHexString } from "./bytes.js";
+import { ETH_TO_WEI } from "./ethConversion.js";
 /**
  * Format bytes as `0x1234…1234`
  * 4 bytes can represent 4294967296 values, so the chance of collision is low
@@ -24,4 +25,29 @@ export function truncBytes(root) {
     const str = typeof root === "string" ? root : toHexString(root);
     return str.slice(0, 14);
 }
+/**
+ * Format a bigint value as a decimal string
+ */
+export function formatBigDecimal(numerator, denominator, maxDecimalFactor) {
+    const full = numerator / denominator;
+    const fraction = ((numerator - full * denominator) * maxDecimalFactor) / denominator;
+    // zeros to be added post decimal are number of zeros in maxDecimalFactor - number of digits in fraction
+    const zerosPostDecimal = String(maxDecimalFactor).length - 1 - String(fraction).length;
+    return `${full}.${"0".repeat(zerosPostDecimal)}${fraction}`;
+}
+// display upto 5 decimal places
+const MAX_DECIMAL_FACTOR = BigInt("100000");
+/**
+ * Format wei as ETH, with up to 5 decimals and append ' ETH'
+ */
+export function prettyWeiToEth(wei) {
+    return `${formatBigDecimal(wei, ETH_TO_WEI, MAX_DECIMAL_FACTOR)} ETH`;
+}
+/**
+ * Format milliseconds to time format HH:MM:SS.ms
+ */
+export function prettyMsToTime(timeMs) {
+    const date = new Date(0, 0, 0, 0, 0, 0, timeMs);
+    return `${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}.${date.getMilliseconds()}`;
+}
 //# sourceMappingURL=format.js.map

package/lib/format.js.map

@@ -1 +1 @@
-{"version":3,"file":"format.js","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AAEvC;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,IAAyB;IACnD,MAAM,GAAG,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAChE,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAyB;IACxD,MAAM,GAAG,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAChE,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;AAC/B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,IAAyB;IAClD,MAAM,GAAG,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAChE,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC1B,CAAC"}
+{"version":3,"file":"format.js","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAE9C;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,IAAyB;IACnD,MAAM,GAAG,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAChE,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAyB;IACxD,MAAM,GAAG,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAChE,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;AAC/B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,IAAyB;IAClD,MAAM,GAAG,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAChE,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,SAAiB,EAAE,WAAmB,EAAE,gBAAwB;IAC/F,MAAM,IAAI,GAAG,SAAS,GAAG,WAAW,CAAC;IACrC,MAAM,QAAQ,GAAG,CAAC,CAAC,SAAS,GAAG,IAAI,GAAG,WAAW,CAAC,GAAG,gBAAgB,CAAC,GAAG,WAAW,CAAC;IAErF,wGAAwG;IACxG,MAAM,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IACvF,OAAO,GAAG,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,QAAQ,EAAE,CAAC;AAC9D,CAAC;AAED,gCAAgC;AAChC,MAAM,kBAAkB,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAE5C;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,OAAO,GAAG,gBAAgB,CAAC,GAAG,EAAE,UAAU,EAAE,kBAAkB,CAAC,MAAM,CAAC;AACxE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAChD,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;AAClG,CAAC"}

package/lib/metrics.d.ts

@@ -1,3 +1,4 @@
+import { NonEmptyArray } from "./types.js";
 export type NoLabels = Record<string, never>;
 export type LabelsGeneric = Record<string, string | number>;
 export type LabelKeys<Labels extends LabelsGeneric> = Extract<keyof Labels, string>;
@@ -30,7 +31,7 @@ export type GaugeConfig<Labels extends LabelsGeneric> = {
 } & (NoLabels extends Labels ? {
     labelNames?: never;
 } : {
-    labelNames: [LabelKeys<Labels>, ...LabelKeys<Labels>[]];
+    labelNames: NonEmptyArray<LabelKeys<Labels>>;
 });
 export type HistogramConfig<Labels extends LabelsGeneric> = GaugeConfig<Labels> & {
     buckets?: number[];

package/lib/promise.d.ts

@@ -1,26 +1,45 @@
+import { ArrayToTuple, NonEmptyArray } from "./types.js";
 /**
  * While promise t is not finished, call function `fn` per `interval`
  */
 export declare function callFnWhenAwait<T>(p: Promise<NonNullable<T>>, fn: () => void, interval: number): Promise<NonNullable<T>>;
-export declare enum RaceEvent {
-    /** all reject/resolve before cutoff */
-    precutoff = "precutoff-return",
-    /** cutoff reached as some were pending till cutoff **/
-    cutoff = "cutoff-reached",
-    /** atleast one resolved till cutoff so no race required */
-    resolvedatcutoff = "resolved-at-cutoff",
-    /** if none reject/resolve before cutoff but one resolves or all reject before timeout */
-    pretimeout = "pretimeout-return",
-    /** timeout reached as none resolved and some were pending till timeout*/
-    timeout = "timeout-reached",
-    /** promise resolved */
-    resolved = "resolved",
-    /** promise rejected */
-    rejected = "rejected"
-}
+export type PromiseResult<T> = {
+    promise: Promise<T>;
+} & ({
+    status: "pending";
+} | {
+    status: "fulfilled";
+    value: T;
+    durationMs: number;
+} | {
+    status: "rejected";
+    reason: Error;
+    durationMs: number;
+});
+export type PromiseFulfilledResult<T> = PromiseResult<T> & {
+    status: "fulfilled";
+};
+export type PromiseRejectedResult<T> = PromiseResult<T> & {
+    status: "rejected";
+};
 /**
- * Wait for promises to resolve till cutoff and then race them beyond the cutoff with an overall timeout
- * @return resolved values or rejections or still pending errors corresponding to input promises
+ * Wrap a promise to an object to track the status and value of the promise
  */
-export declare function racePromisesWithCutoff<T>(promises: Promise<T>[], cutoffMs: number, timeoutMs: number, eventCb: (event: RaceEvent, delayMs: number, index?: number) => void): Promise<(Error | T)[]>;
+export declare function wrapPromise<T>(promise: PromiseLike<T>): PromiseResult<T>;
+type ReturnPromiseWithTuple<Tuple extends NonEmptyArray<PromiseLike<unknown>>> = {
+    [Index in keyof ArrayToTuple<Tuple>]: PromiseResult<Awaited<Tuple[Index]>>;
+};
+/**
+ * Two phased approach for resolving promises:
+ * - first wait `resolveTimeoutMs` or until all promises settle
+ * - then wait `raceTimeoutMs - resolveTimeoutMs` or until at least a single promise resolves
+ *
+ * Returns a list of promise results, see `PromiseResult`
+ */
+export declare function resolveOrRacePromises<T extends NonEmptyArray<PromiseLike<unknown>>>(promises: T, { resolveTimeoutMs, raceTimeoutMs, signal, }: {
+    resolveTimeoutMs: number;
+    raceTimeoutMs: number;
+    signal?: AbortSignal;
+}): Promise<ReturnPromiseWithTuple<T>> | never;
+export {};
 //# sourceMappingURL=promise.d.ts.map

package/lib/promise.js

@@ -1,3 +1,4 @@
+import { ErrorAborted, TimeoutError } from "./errors.js";
 import { sleep } from "./sleep.js";
 /**
  * While promise t is not finished, call function `fn` per `interval`
@@ -19,100 +20,78 @@ export async function callFnWhenAwait(p, fn, interval) {
     }
     return t;
 }
-var PromiseStatus;
-(function (PromiseStatus) {
-    PromiseStatus[PromiseStatus["resolved"] = 0] = "resolved";
-    PromiseStatus[PromiseStatus["rejected"] = 1] = "rejected";
-    PromiseStatus[PromiseStatus["pending"] = 2] = "pending";
-})(PromiseStatus || (PromiseStatus = {}));
-function mapStatusesToResponses(promisesStates) {
-    return promisesStates.map((pmStatus) => {
-        switch (pmStatus.status) {
-            case PromiseStatus.resolved:
-                return pmStatus.value;
-            case PromiseStatus.rejected:
-                return pmStatus.value;
-            case PromiseStatus.pending:
-                return Error("pending");
-        }
-    });
+/**
+ * Wrap a promise to an object to track the status and value of the promise
+ */
+export function wrapPromise(promise) {
+    const startedAt = Date.now();
+    const result = {
+        promise: promise.then((value) => {
+            result.status = "fulfilled";
+            result.value = value;
+            result.durationMs = Date.now() - startedAt;
+            return value;
+        }, (reason) => {
+            result.status = "rejected";
+            result.reason = reason;
+            result.durationMs = Date.now() - startedAt;
+            throw reason;
+        }),
+        status: "pending",
+    };
+    return result;
 }
-export var RaceEvent;
-(function (RaceEvent) {
-    /** all reject/resolve before cutoff */
-    RaceEvent["precutoff"] = "precutoff-return";
-    /** cutoff reached as some were pending till cutoff **/
-    RaceEvent["cutoff"] = "cutoff-reached";
-    /** atleast one resolved till cutoff so no race required */
-    RaceEvent["resolvedatcutoff"] = "resolved-at-cutoff";
-    /** if none reject/resolve before cutoff but one resolves or all reject before timeout */
-    RaceEvent["pretimeout"] = "pretimeout-return";
-    /** timeout reached as none resolved and some were pending till timeout*/
-    RaceEvent["timeout"] = "timeout-reached";
-    // events for the promises for better tracking
-    /** promise resolved */
-    RaceEvent["resolved"] = "resolved";
-    /** promise rejected */
-    RaceEvent["rejected"] = "rejected";
-})(RaceEvent || (RaceEvent = {}));
 /**
- * Wait for promises to resolve till cutoff and then race them beyond the cutoff with an overall timeout
- * @return resolved values or rejections or still pending errors corresponding to input promises
+ * Two phased approach for resolving promises:
+ * - first wait `resolveTimeoutMs` or until all promises settle
+ * - then wait `raceTimeoutMs - resolveTimeoutMs` or until at least a single promise resolves
+ *
+ * Returns a list of promise results, see `PromiseResult`
  */
-export async function racePromisesWithCutoff(promises, cutoffMs, timeoutMs, eventCb) {
-    // start the cutoff and timeout timers
-    let cutoffObserved = false;
-    const cutoffPromise = sleep(cutoffMs).then(() => {
-        cutoffObserved = true;
-    });
-    let timeoutObserved = false;
-    const timeoutPromise = sleep(timeoutMs).then(() => {
-        timeoutObserved = true;
-    });
-    const startTime = Date.now();
-    // Track promises status and resolved values/rejected errors
-    // Even if the promises reject with the following decoration promises will not throw
-    const promisesStates = [];
-    promises.forEach((promise, index) => {
-        promisesStates[index] = { status: PromiseStatus.pending, value: null };
-        promise
-            .then((value) => {
-            eventCb(RaceEvent.resolved, Date.now() - startTime, index);
-            promisesStates[index] = { status: PromiseStatus.resolved, value };
-        })
-            .catch((e) => {
-            eventCb(RaceEvent.rejected, Date.now() - startTime, index);
-            promisesStates[index] = { status: PromiseStatus.rejected, value: e };
-        });
-    });
-    // Wait till cutoff time unless all original promises resolve/reject early
-    await Promise.allSettled(promises.map((promise) => Promise.race([promise, cutoffPromise])));
-    if (cutoffObserved) {
-        // If any is resolved, then just simply return as we are post cutoff
-        const anyResolved = promisesStates.reduce((acc, pmState) => acc || pmState.status === PromiseStatus.resolved, false);
-        if (anyResolved) {
-            eventCb(RaceEvent.resolvedatcutoff, Date.now() - startTime);
-            return mapStatusesToResponses(promisesStates);
+export async function resolveOrRacePromises(promises, { resolveTimeoutMs, raceTimeoutMs, signal, }) {
+    if (raceTimeoutMs <= resolveTimeoutMs) {
+        throw new Error("Race time must be greater than resolve time");
+    }
+    const resolveTimeoutError = new TimeoutError(`Given promises can't be resolved within resolveTimeoutMs=${resolveTimeoutMs}`);
+    const raceTimeoutError = new TimeoutError(`Not a any single promise be resolved in given raceTimeoutMs=${raceTimeoutMs}`);
+    const promiseResults = promises.map((p) => wrapPromise(p));
+    // We intentionally want an array of promises here
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    promises = promiseResults.map((p) => p.promise);
+    try {
+        await Promise.race([
+            Promise.allSettled(promises),
+            sleep(resolveTimeoutMs, signal).then(() => {
+                throw resolveTimeoutError;
+            }),
+        ]);
+        return promiseResults;
+    }
+    catch (err) {
+        if (err instanceof ErrorAborted) {
+            return promiseResults;
         }
-        else {
-            eventCb(RaceEvent.cutoff, Date.now() - startTime);
+        if (err !== resolveTimeoutError) {
+            throw err;
         }
     }
-    else {
-        eventCb(RaceEvent.precutoff, Date.now() - startTime);
-        return mapStatusesToResponses(promisesStates);
-    }
-    // Post deadline resolve with any of the promise or all rejected before timeout
-    await Promise.any(promises.map((promise) => Promise.race([promise, timeoutPromise]))).catch(
-    // just ignore if all reject as we will returned mapped rejections
-    // eslint-disable-next-line  @typescript-eslint/no-empty-function
-    (_e) => { });
-    if (timeoutObserved) {
-        eventCb(RaceEvent.timeout, Date.now() - startTime);
+    try {
+        await Promise.race([
+            Promise.any(promises),
+            sleep(raceTimeoutMs - resolveTimeoutMs, signal).then(() => {
+                throw raceTimeoutError;
+            }),
+        ]);
+        return promiseResults;
     }
-    else {
-        eventCb(RaceEvent.pretimeout, Date.now() - startTime);
+    catch (err) {
+        if (err instanceof ErrorAborted) {
+            return promiseResults;
+        }
+        if (err !== raceTimeoutError && !(err instanceof AggregateError)) {
+            throw err;
+        }
     }
-    return mapStatusesToResponses(promisesStates);
+    return promiseResults;
 }
 //# sourceMappingURL=promise.js.map

package/lib/promise.js.map

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

package/lib/retry.d.ts

@@ -4,11 +4,17 @@ export type RetryOptions = {
      */
     retries?: number;
     /**
-     * An optional Function that is invoked after the provided callback throws
-     * It expects a boolean to know if it should retry or not
-     * Useful to make retrying conditional on the type of error thrown
+     * An optional Function that is invoked after the provided callback throws.
+     * It expects a boolean to know if it should retry or not.
+     * Useful to make retrying conditional on the type of error thrown.
      */
     shouldRetry?: (lastError: Error) => boolean;
+    /**
+     * An optional Function that is invoked right before a retry is performed.
+     * It's passed the Error that triggered it and a number identifying the attempt.
+     * Useful to track number of retries and errors in logs or metrics.
+     */
+    onRetry?: (lastError: Error, attempt: number) => unknown;
     /**
      * Milliseconds to wait before retrying again
      */

package/lib/retry.js

@@ -7,15 +7,25 @@ import { sleep } from "./sleep.js";
  */
 export async function retry(fn, opts) {
     const maxRetries = opts?.retries ?? 5;
+    // Number of retries + the initial attempt
+    const maxAttempts = maxRetries + 1;
     const shouldRetry = opts?.shouldRetry;
+    const onRetry = opts?.onRetry;
     let lastError = Error("RetryError");
-    for (let i = 1; i <= maxRetries; i++) {
+    for (let i = 1; i <= maxAttempts; i++) {
         try {
+            // If not the first attempt, invoke right before retrying
+            if (i > 1)
+                onRetry?.(lastError, i);
             return await fn(i);
         }
         catch (e) {
             lastError = e;
-            if (shouldRetry && !shouldRetry(lastError)) {
+            if (i === maxAttempts) {
+                // Reached maximum number of attempts, there's no need to check if we should retry
+                break;
+            }
+            else if (shouldRetry && !shouldRetry(lastError)) {
                 break;
             }
             else if (opts?.retryDelay !== undefined) {

package/lib/retry.js.map

@@ -1 +1 @@
-{"version":3,"file":"retry.js","sourceRoot":"","sources":["../src/retry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AAoBjC;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CAAI,EAAuC,EAAE,IAAmB;IACzF,MAAM,UAAU,GAAG,IAAI,EAAE,OAAO,IAAI,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,CAAC;IAEtC,IAAI,SAAS,GAAU,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC,EAAE,EAAE;QACpC,IAAI;YACF,OAAO,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;SACpB;QAAC,OAAO,CAAC,EAAE;YACV,SAAS,GAAG,CAAU,CAAC;YACvB,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;gBAC1C,MAAM;aACP;iBAAM,IAAI,IAAI,EAAE,UAAU,KAAK,SAAS,EAAE;gBACzC,MAAM,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;aAC7C;SACF;KACF;IACD,MAAM,SAAS,CAAC;AAClB,CAAC"}
+{"version":3,"file":"retry.js","sourceRoot":"","sources":["../src/retry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AA0BjC;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CAAI,EAAuC,EAAE,IAAmB;IACzF,MAAM,UAAU,GAAG,IAAI,EAAE,OAAO,IAAI,CAAC,CAAC;IACtC,0CAA0C;IAC1C,MAAM,WAAW,GAAG,UAAU,GAAG,CAAC,CAAC;IACnC,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,CAAC;IACtC,MAAM,OAAO,GAAG,IAAI,EAAE,OAAO,CAAC;IAE9B,IAAI,SAAS,GAAU,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC,EAAE,EAAE;QACrC,IAAI;YACF,yDAAyD;YACzD,IAAI,CAAC,GAAG,CAAC;gBAAE,OAAO,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAEnC,OAAO,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;SACpB;QAAC,OAAO,CAAC,EAAE;YACV,SAAS,GAAG,CAAU,CAAC;YAEvB,IAAI,CAAC,KAAK,WAAW,EAAE;gBACrB,kFAAkF;gBAClF,MAAM;aACP;iBAAM,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;gBACjD,MAAM;aACP;iBAAM,IAAI,IAAI,EAAE,UAAU,KAAK,SAAS,EAAE;gBACzC,MAAM,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;aAC7C;SACF;KACF;IACD,MAAM,SAAS,CAAC;AAClB,CAAC"}

package/lib/sleep.js

@@ -10,7 +10,6 @@ export async function sleep(ms, signal) {
     return new Promise((resolve, reject) => {
         if (signal && signal.aborted)
             return reject(new ErrorAborted());
-        // eslint-disable-next-line @typescript-eslint/no-empty-function
         let onDone = () => { };
         const timeout = setTimeout(() => {
             onDone();

package/lib/sleep.js.map

@@ -1 +1 @@
-{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../src/sleep.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,EAAU,EAAE,MAAoB;IAC1D,IAAI,EAAE,GAAG,CAAC,EAAE;QACV,OAAO;KACR;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,MAAM,IAAI,MAAM,CAAC,OAAO;YAAE,OAAO,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;QAEhE,gEAAgE;QAChE,IAAI,MAAM,GAAe,GAAG,EAAE,GAAE,CAAC,CAAC;QAElC,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,CAAC;QACZ,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,MAAM,OAAO,GAAG,GAAS,EAAE;YACzB,MAAM,EAAE,CAAC;YACT,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC;QACF,IAAI,MAAM;YAAE,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,GAAG,GAAG,EAAE;YACZ,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,IAAI,MAAM;gBAAE,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3D,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../src/sleep.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,EAAU,EAAE,MAAoB;IAC1D,IAAI,EAAE,GAAG,CAAC,EAAE;QACV,OAAO;KACR;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,MAAM,IAAI,MAAM,CAAC,OAAO;YAAE,OAAO,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;QAEhE,IAAI,MAAM,GAAe,GAAG,EAAE,GAAE,CAAC,CAAC;QAElC,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,CAAC;QACZ,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,MAAM,OAAO,GAAG,GAAS,EAAE;YACzB,MAAM,EAAE,CAAC;YACT,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC;QACF,IAAI,MAAM;YAAE,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,GAAG,GAAG,EAAE;YACZ,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,IAAI,MAAM;gBAAE,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3D,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}

package/lib/types.d.ts

@@ -7,4 +7,13 @@ export type RecursivePartial<T> = {
 };
 /** Type safe wrapper for Number constructor that takes 'any' */
 export declare function bnToNum(bn: bigint): number;
+export type NonEmptyArray<T> = [T, ...T[]];
+/**
+ * ArrayToTuple converts an `Array<T>` to `[T, ...T]`
+ *
+ * eg: `[1, 2, 3]` from type `number[]` to `[number, number, number]`
+ */
+export type ArrayToTuple<Tuple extends NonEmptyArray<unknown>> = {
+    [Index in keyof Tuple]: Tuple[Index];
+};
 //# sourceMappingURL=types.d.ts.map

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.16.0-dev.5064fab473",
+  "version": "1.16.0-dev.53f8f99c64",
   "type": "module",
   "exports": "./lib/index.js",
   "files": [
@@ -39,7 +39,7 @@
   },
   "types": "lib/index.d.ts",
   "dependencies": {
-    "@chainsafe/as-sha256": "^0.3.1",
+    "@chainsafe/as-sha256": "^0.4.1",
     "any-signal": "3.0.1",
     "bigint-buffer": "^1.1.5",
     "case": "^1.6.3",
@@ -58,5 +58,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "6d5a6d4fd1714586ee4acda1b2aaaf7d65bdc039"
+  "gitHead": "2536a9754d55fac8d093d83e8ee9c8428bfddf4d"
 }