@lodestar/beacon-node 1.23.0-dev.86a8df7fb2 → 1.23.0-dev.94b6c5b0db

package/lib/chain/serializeState.js

@@ -1,3 +1,48 @@
+var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose;
+        if (async) {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        env.stack.push({ value: value, dispose: dispose, async: async });
+    }
+    else if (async) {
+        env.stack.push({ async: true });
+    }
+    return value;
+};
+var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
+    return function (env) {
+        function fail(e) {
+            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        function next() {
+            while (env.stack.length) {
+                var rec = env.stack.pop();
+                try {
+                    var result = rec.dispose && rec.dispose.call(rec.value);
+                    if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                }
+                catch (e) {
+                    fail(e);
+                }
+            }
+            if (env.hasError) throw env.error;
+        }
+        return next();
+    };
+})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+});
 /*
  * Serialize state using the BufferPool if provided.
  */
@@ -5,18 +50,26 @@ export async function serializeState(state, source, processFn, bufferPool) {
     const size = state.type.tree_serializedSize(state.node);
     let stateBytes = null;
     if (bufferPool) {
-        const bufferWithKey = bufferPool.alloc(size, source);
-        if (bufferWithKey) {
-            stateBytes = bufferWithKey.buffer;
-            const dataView = new DataView(stateBytes.buffer, stateBytes.byteOffset, stateBytes.byteLength);
-            state.serializeToBytes({ uint8Array: stateBytes, dataView }, 0);
+        const env_1 = { stack: [], error: void 0, hasError: false };
+        try {
+            const bufferWithKey = __addDisposableResource(env_1, bufferPool.alloc(size, source), false);
+            if (bufferWithKey) {
+                stateBytes = bufferWithKey.buffer;
+                const dataView = new DataView(stateBytes.buffer, stateBytes.byteOffset, stateBytes.byteLength);
+                state.serializeToBytes({ uint8Array: stateBytes, dataView }, 0);
+                return processFn(stateBytes);
+            }
+        }
+        catch (e_1) {
+            env_1.error = e_1;
+            env_1.hasError = true;
+        }
+        finally {
+            __disposeResources(env_1);
         }
     }
-    if (!stateBytes) {
-        // we already have metrics in BufferPool so no need to do it here
-        stateBytes = state.serialize();
-    }
+    // we already have metrics in BufferPool so no need to do it here
+    stateBytes = state.serialize();
     return processFn(stateBytes);
-    // release the buffer back to the pool automatically
 }
 //# sourceMappingURL=serializeState.js.map

package/lib/chain/serializeState.js.map

@@ -1 +1 @@
-{"version":3,"file":"serializeState.js","sourceRoot":"","sources":["../../src/chain/serializeState.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,KAAgC,EAChC,MAAmB,EACnB,SAAiC,EACjC,UAA8B;IAE9B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxD,IAAI,UAAU,GAAsB,IAAI,CAAC;IACzC,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACrD,IAAI,aAAa,EAAE,CAAC;YAClB,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC;YAClC,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;YAC/F,KAAK,CAAC,gBAAgB,CAAC,EAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAC,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAED,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,iEAAiE;QACjE,UAAU,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;IACjC,CAAC;IAED,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC;IAC7B,oDAAoD;AACtD,CAAC"}
+{"version":3,"file":"serializeState.js","sourceRoot":"","sources":["../../src/chain/serializeState.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,KAAgC,EAChC,MAAmB,EACnB,SAAiC,EACjC,UAA8B;IAE9B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxD,IAAI,UAAU,GAAsB,IAAI,CAAC;IACzC,IAAI,UAAU,EAAE,CAAC;;;YACf,MAAM,aAAa,kCAAG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,QAAA,CAAC;YACrD,IAAI,aAAa,EAAE,CAAC;gBAClB,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC;gBAClC,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;gBAC/F,KAAK,CAAC,gBAAgB,CAAC,EAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAC,EAAE,CAAC,CAAC,CAAC;gBAC9D,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC;YAC/B,CAAC;;;;;;;;;KAEF;IAED,iEAAiE;IACjE,UAAU,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;IAE/B,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC;AAC/B,CAAC"}

package/lib/chain/shufflingCache.d.ts

@@ -1,5 +1,6 @@
-import { CachedBeaconStateAllForks, EpochShuffling } from "@lodestar/state-transition";
+import { BeaconStateAllForks, EpochShuffling, IShufflingCache, ShufflingBuildProps } from "@lodestar/state-transition";
 import { Epoch, RootHex } from "@lodestar/types";
+import { LodestarError, Logger } from "@lodestar/utils";
 import { Metrics } from "../metrics/metrics.js";
 export type ShufflingCacheOpts = {
     maxShufflingCacheEpochs?: number;
@@ -10,31 +11,54 @@ export type ShufflingCacheOpts = {
  * - if a shuffling is not available (which does not happen with default chain option of maxSkipSlots = 32), track a promise to make sure we don't compute the same shuffling twice
  * - skip computing shuffling when loading state bytes from disk
  */
-export declare class ShufflingCache {
-    private readonly metrics;
+export declare class ShufflingCache implements IShufflingCache {
+    readonly metrics: Metrics | null;
+    readonly logger: Logger | null;
     /** LRU cache implemented as a map, pruned every time we add an item */
     private readonly itemsByDecisionRootByEpoch;
     private readonly maxEpochs;
-    constructor(metrics?: Metrics | null, opts?: ShufflingCacheOpts);
-    /**
-     * Extract shuffling from state and add to cache
-     */
-    processState(state: CachedBeaconStateAllForks, shufflingEpoch: Epoch): EpochShuffling;
+    constructor(metrics?: Metrics | null, logger?: Logger | null, opts?: ShufflingCacheOpts, precalculatedShufflings?: {
+        shuffling: EpochShuffling | null;
+        decisionRoot: RootHex;
+    }[]);
     /**
      * Insert a promise to make sure we don't regen state for the same shuffling.
      * Bound by MAX_SHUFFLING_PROMISE to make sure our node does not blow up.
      */
-    insertPromise(shufflingEpoch: Epoch, decisionRootHex: RootHex): void;
+    insertPromise(epoch: Epoch, decisionRoot: RootHex): void;
     /**
      * Most of the time, this should return a shuffling immediately.
      * If there's a promise, it means we are computing the same shuffling, so we wait for the promise to resolve.
      * Return null if we don't have a shuffling for this epoch and dependentRootHex.
      */
-    get(shufflingEpoch: Epoch, decisionRootHex: RootHex): Promise<EpochShuffling | null>;
+    get(epoch: Epoch, decisionRoot: RootHex): Promise<EpochShuffling | null>;
     /**
-     * Same to get() function but synchronous.
+     * Gets a cached shuffling via the epoch and decision root.  If the shuffling is not
+     * available it will build it synchronously and return the shuffling.
+     *
+     * NOTE: If a shuffling is already queued and not calculated it will build and resolve
+     * the promise but the already queued build will happen at some later time
      */
-    getSync(shufflingEpoch: Epoch, decisionRootHex: RootHex): EpochShuffling | null;
-    private add;
+    getSync<T extends ShufflingBuildProps | undefined>(epoch: Epoch, decisionRoot: RootHex, buildProps?: T): T extends ShufflingBuildProps ? EpochShuffling : EpochShuffling | null;
+    /**
+     * Queue asynchronous build for an EpochShuffling, triggered from state-transition
+     */
+    build(epoch: number, decisionRoot: string, state: BeaconStateAllForks, activeIndices: Uint32Array): void;
+    /**
+     * Add an EpochShuffling to the ShufflingCache. If a promise for the shuffling is present it will
+     * resolve the promise with the built shuffling
+     */
+    private set;
+}
+export declare enum ShufflingCacheErrorCode {
+    NO_SHUFFLING_FOUND = "SHUFFLING_CACHE_ERROR_NO_SHUFFLING_FOUND"
+}
+type ShufflingCacheErrorType = {
+    code: ShufflingCacheErrorCode.NO_SHUFFLING_FOUND;
+    epoch: Epoch;
+    decisionRoot: RootHex;
+};
+export declare class ShufflingCacheError extends LodestarError<ShufflingCacheErrorType> {
 }
+export {};
 //# sourceMappingURL=shufflingCache.d.ts.map

package/lib/chain/shufflingCache.js

@@ -1,8 +1,6 @@
-import { getShufflingDecisionBlock } from "@lodestar/state-transition";
-import { ssz } from "@lodestar/types";
-import { MapDef, pruneSetToMax, toRootHex } from "@lodestar/utils";
-import { GENESIS_SLOT } from "@lodestar/params";
-import { computeAnchorCheckpoint } from "./initState.js";
+import { computeEpochShuffling, } from "@lodestar/state-transition";
+import { LodestarError, MapDef, pruneSetToMax } from "@lodestar/utils";
+import { callInNextEventLoop } from "../util/eventLoop.js";
 /**
  * Same value to CheckpointBalancesCache, with the assumption that we don't have to use it for old epochs. In the worse case:
  * - when loading state bytes from disk, we need to compute shuffling for all epochs (~1s as of Sep 2023)
@@ -27,71 +25,31 @@ var CacheItemType;
  * - skip computing shuffling when loading state bytes from disk
  */
 export class ShufflingCache {
-    constructor(metrics = null, opts = {}) {
+    constructor(metrics = null, logger = null, opts = {}, precalculatedShufflings) {
         this.metrics = metrics;
+        this.logger = logger;
         /** LRU cache implemented as a map, pruned every time we add an item */
         this.itemsByDecisionRootByEpoch = new MapDef(() => new Map());
         if (metrics) {
             metrics.shufflingCache.size.addCollect(() => metrics.shufflingCache.size.set(Array.from(this.itemsByDecisionRootByEpoch.values()).reduce((total, innerMap) => total + innerMap.size, 0)));
         }
         this.maxEpochs = opts.maxShufflingCacheEpochs ?? MAX_EPOCHS;
-    }
-    /**
-     * Extract shuffling from state and add to cache
-     */
-    processState(state, shufflingEpoch) {
-        const decisionBlockHex = getDecisionBlock(state, shufflingEpoch);
-        let shuffling;
-        switch (shufflingEpoch) {
-            case state.epochCtx.nextShuffling.epoch:
-                shuffling = state.epochCtx.nextShuffling;
-                break;
-            case state.epochCtx.currentShuffling.epoch:
-                shuffling = state.epochCtx.currentShuffling;
-                break;
-            case state.epochCtx.previousShuffling.epoch:
-                shuffling = state.epochCtx.previousShuffling;
-                break;
-            default:
-                throw new Error(`Shuffling not found from state ${state.slot} for epoch ${shufflingEpoch}`);
-        }
-        let cacheItem = this.itemsByDecisionRootByEpoch.getOrDefault(shufflingEpoch).get(decisionBlockHex);
-        if (cacheItem !== undefined) {
-            // update existing promise
-            if (isPromiseCacheItem(cacheItem)) {
-                // unblock consumers of this promise
-                cacheItem.resolveFn(shuffling);
-                // then update item type to shuffling
-                cacheItem = {
-                    type: CacheItemType.shuffling,
-                    shuffling,
-                };
-                this.add(shufflingEpoch, decisionBlockHex, cacheItem);
-                // we updated type to CacheItemType.shuffling so the above fields are not used anyway
-                this.metrics?.shufflingCache.processStateUpdatePromise.inc();
-            }
-            else {
-                // ShufflingCacheItem, do nothing
-                this.metrics?.shufflingCache.processStateNoOp.inc();
+        precalculatedShufflings?.map(({ shuffling, decisionRoot }) => {
+            if (shuffling !== null) {
+                this.set(shuffling, decisionRoot);
             }
-        }
-        else {
-            // not found, new shuffling
-            this.add(shufflingEpoch, decisionBlockHex, { type: CacheItemType.shuffling, shuffling });
-            this.metrics?.shufflingCache.processStateInsertNew.inc();
-        }
-        return shuffling;
+        });
     }
     /**
      * Insert a promise to make sure we don't regen state for the same shuffling.
      * Bound by MAX_SHUFFLING_PROMISE to make sure our node does not blow up.
      */
-    insertPromise(shufflingEpoch, decisionRootHex) {
+    insertPromise(epoch, decisionRoot) {
         const promiseCount = Array.from(this.itemsByDecisionRootByEpoch.values())
             .flatMap((innerMap) => Array.from(innerMap.values()))
             .filter((item) => isPromiseCacheItem(item)).length;
         if (promiseCount >= MAX_PROMISES) {
-            throw new Error(`Too many shuffling promises: ${promiseCount}, shufflingEpoch: ${shufflingEpoch}, decisionRootHex: ${decisionRootHex}`);
+            throw new Error(`Too many shuffling promises: ${promiseCount}, shufflingEpoch: ${epoch}, decisionRootHex: ${decisionRoot}`);
         }
         let resolveFn = null;
         const promise = new Promise((resolve) => {
@@ -102,10 +60,11 @@ export class ShufflingCache {
         }
         const cacheItem = {
             type: CacheItemType.promise,
+            timeInsertedMs: Date.now(),
             promise,
             resolveFn,
         };
-        this.add(shufflingEpoch, decisionRootHex, cacheItem);
+        this.itemsByDecisionRootByEpoch.getOrDefault(epoch).set(decisionRoot, cacheItem);
         this.metrics?.shufflingCache.insertPromiseCount.inc();
     }
     /**
@@ -113,35 +72,89 @@ export class ShufflingCache {
      * If there's a promise, it means we are computing the same shuffling, so we wait for the promise to resolve.
      * Return null if we don't have a shuffling for this epoch and dependentRootHex.
      */
-    async get(shufflingEpoch, decisionRootHex) {
-        const cacheItem = this.itemsByDecisionRootByEpoch.getOrDefault(shufflingEpoch).get(decisionRootHex);
+    async get(epoch, decisionRoot) {
+        const cacheItem = this.itemsByDecisionRootByEpoch.getOrDefault(epoch).get(decisionRoot);
         if (cacheItem === undefined) {
+            this.metrics?.shufflingCache.miss.inc();
             return null;
         }
         if (isShufflingCacheItem(cacheItem)) {
+            this.metrics?.shufflingCache.hit.inc();
             return cacheItem.shuffling;
         }
         else {
-            // promise
+            this.metrics?.shufflingCache.shufflingPromiseNotResolved.inc();
             return cacheItem.promise;
         }
     }
     /**
-     * Same to get() function but synchronous.
+     * Gets a cached shuffling via the epoch and decision root.  If the shuffling is not
+     * available it will build it synchronously and return the shuffling.
+     *
+     * NOTE: If a shuffling is already queued and not calculated it will build and resolve
+     * the promise but the already queued build will happen at some later time
      */
-    getSync(shufflingEpoch, decisionRootHex) {
-        const cacheItem = this.itemsByDecisionRootByEpoch.getOrDefault(shufflingEpoch).get(decisionRootHex);
-        if (cacheItem === undefined) {
-            return null;
+    getSync(epoch, decisionRoot, buildProps) {
+        const cacheItem = this.itemsByDecisionRootByEpoch.getOrDefault(epoch).get(decisionRoot);
+        if (!cacheItem) {
+            this.metrics?.shufflingCache.miss.inc();
         }
-        if (isShufflingCacheItem(cacheItem)) {
+        else if (isShufflingCacheItem(cacheItem)) {
+            this.metrics?.shufflingCache.hit.inc();
             return cacheItem.shuffling;
         }
-        // ignore promise
-        return null;
+        else if (buildProps) {
+            // TODO: (@matthewkeil) This should possible log a warning??
+            this.metrics?.shufflingCache.shufflingPromiseNotResolvedAndThrownAway.inc();
+        }
+        else {
+            this.metrics?.shufflingCache.shufflingPromiseNotResolved.inc();
+        }
+        let shuffling = null;
+        if (buildProps) {
+            const timer = this.metrics?.shufflingCache.shufflingCalculationTime.startTimer({ source: "getSync" });
+            shuffling = computeEpochShuffling(buildProps.state, buildProps.activeIndices, epoch);
+            timer?.();
+            this.set(shuffling, decisionRoot);
+        }
+        return shuffling;
     }
-    add(shufflingEpoch, decisionBlock, cacheItem) {
-        this.itemsByDecisionRootByEpoch.getOrDefault(shufflingEpoch).set(decisionBlock, cacheItem);
+    /**
+     * Queue asynchronous build for an EpochShuffling, triggered from state-transition
+     */
+    build(epoch, decisionRoot, state, activeIndices) {
+        this.insertPromise(epoch, decisionRoot);
+        /**
+         * TODO: (@matthewkeil) This will get replaced by a proper build queue and a worker to do calculations
+         * on a NICE thread with a rust implementation
+         */
+        callInNextEventLoop(() => {
+            const timer = this.metrics?.shufflingCache.shufflingCalculationTime.startTimer({ source: "build" });
+            const shuffling = computeEpochShuffling(state, activeIndices, epoch);
+            timer?.();
+            this.set(shuffling, decisionRoot);
+        });
+    }
+    /**
+     * Add an EpochShuffling to the ShufflingCache. If a promise for the shuffling is present it will
+     * resolve the promise with the built shuffling
+     */
+    set(shuffling, decisionRoot) {
+        const shufflingAtEpoch = this.itemsByDecisionRootByEpoch.getOrDefault(shuffling.epoch);
+        // if a pending shuffling promise exists, resolve it
+        const cacheItem = shufflingAtEpoch.get(decisionRoot);
+        if (cacheItem) {
+            if (isPromiseCacheItem(cacheItem)) {
+                cacheItem.resolveFn(shuffling);
+                this.metrics?.shufflingCache.shufflingPromiseResolutionTime.observe((Date.now() - cacheItem.timeInsertedMs) / 1000);
+            }
+            else {
+                this.metrics?.shufflingCache.shufflingBuiltMultipleTimes.inc();
+            }
+        }
+        // set the shuffling
+        shufflingAtEpoch.set(decisionRoot, { type: CacheItemType.shuffling, shuffling });
+        // prune the cache
         pruneSetToMax(this.itemsByDecisionRootByEpoch, this.maxEpochs);
     }
 }
@@ -151,14 +164,10 @@ function isShufflingCacheItem(item) {
 function isPromiseCacheItem(item) {
     return item.type === CacheItemType.promise;
 }
-/**
- * Get the shuffling decision block root for the given epoch of given state
- *   - Special case close to genesis block, return the genesis block root
- *   - This is similar to forkchoice.getDependentRoot() function, otherwise we cannot get cached shuffing in attestation verification when syncing from genesis.
- */
-function getDecisionBlock(state, epoch) {
-    return state.slot > GENESIS_SLOT
-        ? getShufflingDecisionBlock(state, epoch)
-        : toRootHex(ssz.phase0.BeaconBlockHeader.hashTreeRoot(computeAnchorCheckpoint(state.config, state).blockHeader));
+export var ShufflingCacheErrorCode;
+(function (ShufflingCacheErrorCode) {
+    ShufflingCacheErrorCode["NO_SHUFFLING_FOUND"] = "SHUFFLING_CACHE_ERROR_NO_SHUFFLING_FOUND";
+})(ShufflingCacheErrorCode || (ShufflingCacheErrorCode = {}));
+export class ShufflingCacheError extends LodestarError {
 }
 //# sourceMappingURL=shufflingCache.js.map

package/lib/chain/shufflingCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"shufflingCache.js","sourceRoot":"","sources":["../../src/chain/shufflingCache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shufflingCache.js","sourceRoot":"","sources":["../../src/chain/shufflingCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,qBAAqB,GACtB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAC,aAAa,EAAU,MAAM,EAAE,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE7E,OAAO,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAC;AAEzD;;;;;IAKI;AACJ,MAAM,UAAU,GAAG,CAAC,CAAC;AAErB;;;GAGG;AACH,MAAM,YAAY,GAAG,CAAC,CAAC;AAEvB,IAAK,aAGJ;AAHD,WAAK,aAAa;IAChB,2DAAS,CAAA;IACT,uDAAO,CAAA;AACT,CAAC,EAHI,aAAa,KAAb,aAAa,QAGjB;AAoBD;;;;;GAKG;AACH,MAAM,OAAO,cAAc;IAQzB,YACW,UAA0B,IAAI,EAC9B,SAAwB,IAAI,EACrC,OAA2B,EAAE,EAC7B,uBAAqF;QAH5E,YAAO,GAAP,OAAO,CAAuB;QAC9B,WAAM,GAAN,MAAM,CAAsB;QATvC,uEAAuE;QACtD,+BAA0B,GAA2C,IAAI,MAAM,CAC9F,GAAG,EAAE,CAAC,IAAI,GAAG,EAAsB,CACpC,CAAC;QAUA,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAC1C,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAC7B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAC3G,CACF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,uBAAuB,IAAI,UAAU,CAAC;QAE5D,uBAAuB,EAAE,GAAG,CAAC,CAAC,EAAC,SAAS,EAAE,YAAY,EAAC,EAAE,EAAE;YACzD,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBACvB,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YACpC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,KAAY,EAAE,YAAqB;QAC/C,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,CAAC;aACtE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;aACpD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;QACrD,IAAI,YAAY,IAAI,YAAY,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CACb,gCAAgC,YAAY,qBAAqB,KAAK,sBAAsB,YAAY,EAAE,CAC3G,CAAC;QACJ,CAAC;QACD,IAAI,SAAS,GAAiD,IAAI,CAAC;QACnE,MAAM,OAAO,GAAG,IAAI,OAAO,CAAiB,CAAC,OAAO,EAAE,EAAE;YACtD,SAAS,GAAG,OAAO,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,SAAS,GAAqB;YAClC,IAAI,EAAE,aAAa,CAAC,OAAO;YAC3B,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE;YAC1B,OAAO;YACP,SAAS;SACV,CAAC;QACF,IAAI,CAAC,0BAA0B,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;QACjF,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC;IACxD,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAG,CAAC,KAAY,EAAE,YAAqB;QAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,0BAA0B,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACxF,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YACvC,OAAO,SAAS,CAAC,SAAS,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAC;YAC/D,OAAO,SAAS,CAAC,OAAO,CAAC;QAC3B,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,OAAO,CACL,KAAY,EACZ,YAAqB,EACrB,UAAc;QAEd,MAAM,SAAS,GAAG,IAAI,CAAC,0BAA0B,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACxF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1C,CAAC;aAAM,IAAI,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YACvC,OAAO,SAAS,CAAC,SAAS,CAAC;QAC7B,CAAC;aAAM,IAAI,UAAU,EAAE,CAAC;YACtB,4DAA4D;YAC5D,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,wCAAwC,CAAC,GAAG,EAAE,CAAC;QAC9E,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAC;QACjE,CAAC;QAED,IAAI,SAAS,GAA0B,IAAI,CAAC;QAC5C,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,wBAAwB,CAAC,UAAU,CAAC,EAAC,MAAM,EAAE,SAAS,EAAC,CAAC,CAAC;YACpG,SAAS,GAAG,qBAAqB,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YACrF,KAAK,EAAE,EAAE,CAAC;YACV,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,SAAmF,CAAC;IAC7F,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAa,EAAE,YAAoB,EAAE,KAA0B,EAAE,aAA0B;QAC/F,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QACxC;;;WAGG;QACH,mBAAmB,CAAC,GAAG,EAAE;YACvB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,wBAAwB,CAAC,UAAU,CAAC,EAAC,MAAM,EAAE,OAAO,EAAC,CAAC,CAAC;YAClG,MAAM,SAAS,GAAG,qBAAqB,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;YACrE,KAAK,EAAE,EAAE,CAAC;YACV,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACK,GAAG,CAAC,SAAyB,EAAE,YAAoB;QACzD,MAAM,gBAAgB,GAAG,IAAI,CAAC,0BAA0B,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACvF,oDAAoD;QACpD,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACrD,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC;gBAClC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBAC/B,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,8BAA8B,CAAC,OAAO,CACjE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,cAAc,CAAC,GAAG,IAAI,CAC/C,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAC;YACjE,CAAC;QACH,CAAC;QACD,oBAAoB;QACpB,gBAAgB,CAAC,GAAG,CAAC,YAAY,EAAE,EAAC,IAAI,EAAE,aAAa,CAAC,SAAS,EAAE,SAAS,EAAC,CAAC,CAAC;QAC/E,kBAAkB;QAClB,aAAa,CAAC,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACjE,CAAC;CACF;AAED,SAAS,oBAAoB,CAAC,IAAe;IAC3C,OAAO,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,SAAS,CAAC;AAC/C,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAe;IACzC,OAAO,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,OAAO,CAAC;AAC7C,CAAC;AAED,MAAM,CAAN,IAAY,uBAEX;AAFD,WAAY,uBAAuB;IACjC,0FAA+D,CAAA;AACjE,CAAC,EAFW,uBAAuB,KAAvB,uBAAuB,QAElC;AAQD,MAAM,OAAO,mBAAoB,SAAQ,aAAsC;CAAG"}

package/lib/chain/stateCache/persistentCheckpointsCache.js

@@ -97,7 +97,7 @@ export class PersistentCheckpointStateCache {
         this.preComputedCheckpointHits = null;
         this.cache = new MapTracker(metrics?.cpStateCache);
         if (metrics) {
-            this.metrics = metrics.cpStateCache;
+            this.metrics = metrics;
             metrics.cpStateCache.size.addCollect(() => {
                 let persistCount = 0;
                 let inMemoryCount = 0;
@@ -167,34 +167,26 @@ export class PersistentCheckpointStateCache {
         const { persistedKey, stateBytes } = stateOrStateBytesData;
         const logMeta = { persistedKey: toHex(persistedKey) };
         this.logger.debug("Reload: read state successful", logMeta);
-        this.metrics?.stateReloadSecFromSlot.observe(this.clock?.secFromSlot(this.clock?.currentSlot ?? 0) ?? 0);
+        this.metrics?.cpStateCache.stateReloadSecFromSlot.observe(this.clock?.secFromSlot(this.clock?.currentSlot ?? 0) ?? 0);
         const seedState = this.findSeedStateToReload(cp);
-        this.metrics?.stateReloadEpochDiff.observe(Math.abs(seedState.epochCtx.epoch - cp.epoch));
+        this.metrics?.cpStateCache.stateReloadEpochDiff.observe(Math.abs(seedState.epochCtx.epoch - cp.epoch));
         this.logger.debug("Reload: found seed state", { ...logMeta, seedSlot: seedState.slot });
         try {
             const env_1 = { stack: [], error: void 0, hasError: false };
             try {
                 // 80% of validators serialization time comes from memory allocation, this is to avoid it
-                const sszTimer = this.metrics?.stateReloadValidatorsSerializeDuration.startTimer();
+                const sszTimer = this.metrics?.cpStateCache.stateReloadValidatorsSerializeDuration.startTimer();
                 // automatically free the buffer pool after this scope
                 const validatorsBytesWithKey = __addDisposableResource(env_1, this.serializeStateValidators(seedState), false);
                 let validatorsBytes = validatorsBytesWithKey?.buffer;
                 if (validatorsBytes == null) {
                     // fallback logic in case we can't use the buffer pool
-                    this.metrics?.stateReloadValidatorsSerializeAllocCount.inc();
+                    this.metrics?.cpStateCache.stateReloadValidatorsSerializeAllocCount.inc();
                     validatorsBytes = seedState.validators.serialize();
                 }
                 sszTimer?.();
-                const timer = this.metrics?.stateReloadDuration.startTimer();
-                const newCachedState = loadCachedBeaconState(seedState, stateBytes, {
-                    shufflingGetter: (shufflingEpoch, decisionRootHex) => {
-                        const shuffling = this.shufflingCache.getSync(shufflingEpoch, decisionRootHex);
-                        if (shuffling == null) {
-                            this.metrics?.stateReloadShufflingCacheMiss.inc();
-                        }
-                        return shuffling;
-                    },
-                }, validatorsBytes);
+                const timer = this.metrics?.cpStateCache.stateReloadDuration.startTimer();
+                const newCachedState = loadCachedBeaconState(seedState, stateBytes, {}, validatorsBytes);
                 newCachedState.commit();
                 const stateRoot = toRootHex(newCachedState.hashTreeRoot());
                 timer?.();
@@ -256,7 +248,7 @@ export class PersistentCheckpointStateCache {
             throw new Error("Expected persistent key");
         }
         const persistedKey = cacheItem.value;
-        const dbReadTimer = this.metrics?.stateReloadDbReadTime.startTimer();
+        const dbReadTimer = this.metrics?.cpStateCache.stateReloadDbReadTime.startTimer();
         const stateBytes = await this.datastore.read(persistedKey);
         dbReadTimer?.();
         if (stateBytes === null) {
@@ -268,19 +260,19 @@ export class PersistentCheckpointStateCache {
      * Similar to get() api without reloading from disk
      */
     get(cpOrKey, opts) {
-        this.metrics?.lookups.inc();
+        this.metrics?.cpStateCache.lookups.inc();
         const cpKey = typeof cpOrKey === "string" ? cpOrKey : toCacheKey(cpOrKey);
         const cacheItem = this.cache.get(cpKey);
         if (cacheItem === undefined) {
             return null;
         }
-        this.metrics?.hits.inc();
+        this.metrics?.cpStateCache.hits.inc();
         if (cpKey === this.preComputedCheckpoint) {
             this.preComputedCheckpointHits = (this.preComputedCheckpointHits ?? 0) + 1;
         }
         if (isInMemoryCacheItem(cacheItem)) {
             const { state } = cacheItem;
-            this.metrics?.stateClonedCount.observe(state.clonedCount);
+            this.metrics?.cpStateCache.stateClonedCount.observe(state.clonedCount);
             return state.clone(opts?.dontTransferCache);
         }
         return null;
@@ -292,7 +284,7 @@ export class PersistentCheckpointStateCache {
         const cpHex = toCheckpointHex(cp);
         const key = toCacheKey(cpHex);
         const cacheItem = this.cache.get(key);
-        this.metrics?.adds.inc();
+        this.metrics?.cpStateCache.adds.inc();
         if (cacheItem !== undefined && isPersistedCacheItem(cacheItem)) {
             const persistedKey = cacheItem.value;
             // was persisted to disk, set back to memory
@@ -622,7 +614,7 @@ export class PersistentCheckpointStateCache {
                     }
                     else {
                         // persist and do not update epochIndex
-                        this.metrics?.statePersistSecFromSlot.observe(this.clock?.secFromSlot(this.clock?.currentSlot ?? 0) ?? 0);
+                        this.metrics?.cpStateCache.statePersistSecFromSlot.observe(this.clock?.secFromSlot(this.clock?.currentSlot ?? 0) ?? 0);
                         const cpPersist = { epoch: epoch, root: fromHex(rootHex) };
                         // It's not sustainable to allocate ~240MB for each state every epoch, so we use buffer pool to reuse the memory.
                         // As monitored on holesky as of Jan 2024:
@@ -630,9 +622,13 @@ export class PersistentCheckpointStateCache {
                         //   - It helps stabilize persist time and save ~300ms in average (1.5s vs 1.2s)
                         //   - It also helps the state reload to save ~500ms in average (4.3s vs 3.8s)
                         //   - Also `serializeState.test.ts` perf test shows a lot of differences allocating ~240MB once vs per state serialization
-                        const timer = this.metrics?.stateSerializeDuration.startTimer();
-                        persistedKey = await serializeState(state, AllocSource.PERSISTENT_CHECKPOINTS_CACHE_STATE, (stateBytes) => this.datastore.write(cpPersist, stateBytes), this.bufferPool);
-                        timer?.();
+                        const timer = this.metrics?.stateSerializeDuration.startTimer({
+                            source: AllocSource.PERSISTENT_CHECKPOINTS_CACHE_STATE,
+                        });
+                        persistedKey = await serializeState(state, AllocSource.PERSISTENT_CHECKPOINTS_CACHE_STATE, (stateBytes) => {
+                            timer?.();
+                            return this.datastore.write(cpPersist, stateBytes);
+                        }, this.bufferPool);
                         persistCount++;
                         this.logger.verbose("Pruned checkpoint state from memory and persisted to disk", {
                             ...logMeta,
@@ -654,7 +650,7 @@ export class PersistentCheckpointStateCache {
                         this.cache.delete(cpKey);
                         this.epochIndex.get(epoch)?.delete(rootHex);
                     }
-                    this.metrics?.statePruneFromMemoryCount.inc();
+                    this.metrics?.cpStateCache.statePruneFromMemoryCount.inc();
                     this.logger.verbose("Pruned checkpoint state from memory", logMeta);
                 }
             }
@@ -675,7 +671,7 @@ export class PersistentCheckpointStateCache {
                 if (persistedKey) {
                     await this.datastore.remove(persistedKey);
                     persistCount++;
-                    this.metrics?.persistedStateRemoveCount.inc();
+                    this.metrics?.cpStateCache.persistedStateRemoveCount.inc();
                 }
             }
             this.cache.delete(key);