@lodestar/beacon-node 1.22.0 → 1.23.0-dev.06b4c2d324

package/lib/chain/archiver/archiver.js

@@ -0,0 +1,117 @@
+import { JobItemQueue } from "../../util/queue/index.js";
+import { ChainEvent } from "../emitter.js";
+import { archiveBlocks } from "./archiveBlocks.js";
+import { StateArchiveMode } from "./interface.js";
+import { FrequencyStateArchiveStrategy } from "./strategies/frequencyStateArchiveStrategy.js";
+export const DEFAULT_STATE_ARCHIVE_MODE = StateArchiveMode.Frequency;
+export const PROCESS_FINALIZED_CHECKPOINT_QUEUE_LEN = 256;
+/**
+ * Used for running tasks that depends on some events or are executed
+ * periodically.
+ */
+export class Archiver {
+    constructor(db, chain, logger, signal, opts, metrics) {
+        this.db = db;
+        this.chain = chain;
+        this.logger = logger;
+        this.metrics = metrics;
+        this.onFinalizedCheckpoint = async (finalized) => {
+            return this.jobQueue.push(finalized);
+        };
+        this.onCheckpoint = () => {
+            const headStateRoot = this.chain.forkChoice.getHead().stateRoot;
+            this.chain.regen.pruneOnCheckpoint(this.chain.forkChoice.getFinalizedCheckpoint().epoch, this.chain.forkChoice.getJustifiedCheckpoint().epoch, headStateRoot);
+            this.statesArchiverStrategy.onCheckpoint(headStateRoot, this.metrics).catch((err) => {
+                this.logger.error("Error during state archive", { stateArchiveMode: this.stateArchiveMode }, err);
+            });
+        };
+        this.processFinalizedCheckpoint = async (finalized) => {
+            try {
+                const finalizedEpoch = finalized.epoch;
+                this.logger.verbose("Start processing finalized checkpoint", { epoch: finalizedEpoch, rootHex: finalized.rootHex });
+                await archiveBlocks(this.chain.config, this.db, this.chain.forkChoice, this.chain.lightClientServer, this.logger, finalized, this.chain.clock.currentEpoch, this.archiveBlobEpochs);
+                this.prevFinalized = finalized;
+                await this.statesArchiverStrategy.onFinalizedCheckpoint(finalized, this.metrics);
+                // should be after ArchiveBlocksTask to handle restart cleanly
+                await this.statesArchiverStrategy.maybeArchiveState(finalized, this.metrics);
+                this.chain.regen.pruneOnFinalized(finalizedEpoch);
+                // tasks rely on extended fork choice
+                const prunedBlocks = this.chain.forkChoice.prune(finalized.rootHex);
+                await this.updateBackfillRange(finalized);
+                this.logger.verbose("Finish processing finalized checkpoint", {
+                    epoch: finalizedEpoch,
+                    rootHex: finalized.rootHex,
+                    prunedBlocks: prunedBlocks.length,
+                });
+            }
+            catch (e) {
+                this.logger.error("Error processing finalized checkpoint", { epoch: finalized.epoch }, e);
+            }
+        };
+        /**
+         * Backfill sync relies on verified connected ranges (which are represented as key,value
+         * with a verified jump from a key back to value). Since the node could have progressed
+         * ahead from, we need to save the forward progress of this node as another backfill
+         * range entry, that backfill sync will use to jump back if this node is restarted
+         * for any reason.
+         * The current backfill has its own backfill entry from anchor slot to last backfilled
+         * slot. And this would create the entry from the current finalized slot to the anchor
+         * slot.
+         */
+        this.updateBackfillRange = async (finalized) => {
+            try {
+                // Mark the sequence in backfill db from finalized block's slot till anchor slot as
+                // filled.
+                const finalizedBlockFC = this.chain.forkChoice.getBlockHex(finalized.rootHex);
+                if (finalizedBlockFC && finalizedBlockFC.slot > this.chain.anchorStateLatestBlockSlot) {
+                    await this.db.backfilledRanges.put(finalizedBlockFC.slot, this.chain.anchorStateLatestBlockSlot);
+                    // Clear previously marked sequence till anchorStateLatestBlockSlot, without
+                    // touching backfill sync process sequence which are at
+                    // <=anchorStateLatestBlockSlot i.e. clear >anchorStateLatestBlockSlot
+                    // and < currentSlot
+                    const filteredSeqs = await this.db.backfilledRanges.entries({
+                        gt: this.chain.anchorStateLatestBlockSlot,
+                        lt: finalizedBlockFC.slot,
+                    });
+                    this.logger.debug("updated backfilledRanges", {
+                        key: finalizedBlockFC.slot,
+                        value: this.chain.anchorStateLatestBlockSlot,
+                    });
+                    if (filteredSeqs.length > 0) {
+                        await this.db.backfilledRanges.batchDelete(filteredSeqs.map((entry) => entry.key));
+                        this.logger.debug(`Forward Sync - cleaned up backfilledRanges between ${finalizedBlockFC.slot},${this.chain.anchorStateLatestBlockSlot}`, { seqs: JSON.stringify(filteredSeqs) });
+                    }
+                }
+            }
+            catch (e) {
+                this.logger.error("Error updating backfilledRanges on finalization", { epoch: finalized.epoch }, e);
+            }
+        };
+        if (opts.stateArchiveMode === StateArchiveMode.Frequency) {
+            this.statesArchiverStrategy = new FrequencyStateArchiveStrategy(chain.regen, db, logger, opts, chain.bufferPool);
+        }
+        else {
+            throw new Error(`State archive strategy "${opts.stateArchiveMode}" currently not supported.`);
+        }
+        this.stateArchiveMode = opts.stateArchiveMode;
+        this.archiveBlobEpochs = opts.archiveBlobEpochs;
+        this.prevFinalized = chain.forkChoice.getFinalizedCheckpoint();
+        this.jobQueue = new JobItemQueue(this.processFinalizedCheckpoint, {
+            maxLength: PROCESS_FINALIZED_CHECKPOINT_QUEUE_LEN,
+            signal,
+        });
+        if (!opts.disableArchiveOnCheckpoint) {
+            this.chain.emitter.on(ChainEvent.forkChoiceFinalized, this.onFinalizedCheckpoint);
+            this.chain.emitter.on(ChainEvent.checkpoint, this.onCheckpoint);
+            signal.addEventListener("abort", () => {
+                this.chain.emitter.off(ChainEvent.forkChoiceFinalized, this.onFinalizedCheckpoint);
+                this.chain.emitter.off(ChainEvent.checkpoint, this.onCheckpoint);
+            }, { once: true });
+        }
+    }
+    /** Archive latest finalized state */
+    async persistToDisk() {
+        return this.statesArchiverStrategy.maybeArchiveState(this.chain.forkChoice.getFinalizedCheckpoint());
+    }
+}
+//# sourceMappingURL=archiver.js.map

package/lib/chain/archiver/archiver.js.map

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

package/lib/chain/archiver/index.d.ts

@@ -1,53 +1,3 @@
-import { Logger } from "@lodestar/utils";
-import { IBeaconDb } from "../../db/index.js";
-import { IBeaconChain } from "../interface.js";
-import { StatesArchiverOpts } from "./archiveStates.js";
-export type ArchiverOpts = StatesArchiverOpts & {
-    disableArchiveOnCheckpoint?: boolean;
-    archiveBlobEpochs?: number;
-};
-type ProposalStats = {
-    total: number;
-    finalized: number;
-    orphaned: number;
-    missed: number;
-};
-export type FinalizedStats = {
-    allValidators: ProposalStats;
-    attachedValidators: ProposalStats;
-    finalizedCanonicalCheckpointsCount: number;
-    finalizedFoundCheckpointsInStateCache: number;
-    finalizedAttachedValidatorsCount: number;
-};
-/**
- * Used for running tasks that depends on some events or are executed
- * periodically.
- */
-export declare class Archiver {
-    private readonly db;
-    private readonly chain;
-    private readonly logger;
-    private jobQueue;
-    private prevFinalized;
-    private readonly statesArchiver;
-    private archiveBlobEpochs?;
-    constructor(db: IBeaconDb, chain: IBeaconChain, logger: Logger, signal: AbortSignal, opts: ArchiverOpts);
-    /** Archive latest finalized state */
-    persistToDisk(): Promise<void>;
-    private onFinalizedCheckpoint;
-    private onCheckpoint;
-    private processFinalizedCheckpoint;
-    /**
-     * Backfill sync relies on verified connected ranges (which are represented as key,value
-     * with a verified jump from a key back to value). Since the node could have progressed
-     * ahead from, we need to save the forward progress of this node as another backfill
-     * range entry, that backfill sync will use to jump back if this node is restarted
-     * for any reason.
-     * The current backfill has its own backfill entry from anchor slot to last backfilled
-     * slot. And this would create the entry from the current finalized slot to the anchor
-     * slot.
-     */
-    private updateBackfillRange;
-}
-export {};
+export * from "./archiver.js";
+export * from "./interface.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/chain/archiver/index.js

@@ -1,104 +1,3 @@
-import { JobItemQueue } from "../../util/queue/index.js";
-import { ChainEvent } from "../emitter.js";
-import { StatesArchiver } from "./archiveStates.js";
-import { archiveBlocks } from "./archiveBlocks.js";
-const PROCESS_FINALIZED_CHECKPOINT_QUEUE_LEN = 256;
-/**
- * Used for running tasks that depends on some events or are executed
- * periodically.
- */
-export class Archiver {
-    constructor(db, chain, logger, signal, opts) {
-        this.db = db;
-        this.chain = chain;
-        this.logger = logger;
-        this.onFinalizedCheckpoint = async (finalized) => {
-            return this.jobQueue.push(finalized);
-        };
-        this.onCheckpoint = () => {
-            const headStateRoot = this.chain.forkChoice.getHead().stateRoot;
-            this.chain.regen.pruneOnCheckpoint(this.chain.forkChoice.getFinalizedCheckpoint().epoch, this.chain.forkChoice.getJustifiedCheckpoint().epoch, headStateRoot);
-        };
-        this.processFinalizedCheckpoint = async (finalized) => {
-            try {
-                const finalizedEpoch = finalized.epoch;
-                this.logger.verbose("Start processing finalized checkpoint", { epoch: finalizedEpoch, rootHex: finalized.rootHex });
-                await archiveBlocks(this.chain.config, this.db, this.chain.forkChoice, this.chain.lightClientServer, this.logger, finalized, this.chain.clock.currentEpoch, this.archiveBlobEpochs);
-                this.prevFinalized = finalized;
-                // should be after ArchiveBlocksTask to handle restart cleanly
-                await this.statesArchiver.maybeArchiveState(finalized);
-                this.chain.regen.pruneOnFinalized(finalizedEpoch);
-                // tasks rely on extended fork choice
-                const prunedBlocks = this.chain.forkChoice.prune(finalized.rootHex);
-                await this.updateBackfillRange(finalized);
-                this.logger.verbose("Finish processing finalized checkpoint", {
-                    epoch: finalizedEpoch,
-                    rootHex: finalized.rootHex,
-                    prunedBlocks: prunedBlocks.length,
-                });
-            }
-            catch (e) {
-                this.logger.error("Error processing finalized checkpoint", { epoch: finalized.epoch }, e);
-            }
-        };
-        /**
-         * Backfill sync relies on verified connected ranges (which are represented as key,value
-         * with a verified jump from a key back to value). Since the node could have progressed
-         * ahead from, we need to save the forward progress of this node as another backfill
-         * range entry, that backfill sync will use to jump back if this node is restarted
-         * for any reason.
-         * The current backfill has its own backfill entry from anchor slot to last backfilled
-         * slot. And this would create the entry from the current finalized slot to the anchor
-         * slot.
-         */
-        this.updateBackfillRange = async (finalized) => {
-            try {
-                // Mark the sequence in backfill db from finalized block's slot till anchor slot as
-                // filled.
-                const finalizedBlockFC = this.chain.forkChoice.getBlockHex(finalized.rootHex);
-                if (finalizedBlockFC && finalizedBlockFC.slot > this.chain.anchorStateLatestBlockSlot) {
-                    await this.db.backfilledRanges.put(finalizedBlockFC.slot, this.chain.anchorStateLatestBlockSlot);
-                    // Clear previously marked sequence till anchorStateLatestBlockSlot, without
-                    // touching backfill sync process sequence which are at
-                    // <=anchorStateLatestBlockSlot i.e. clear >anchorStateLatestBlockSlot
-                    // and < currentSlot
-                    const filteredSeqs = await this.db.backfilledRanges.entries({
-                        gt: this.chain.anchorStateLatestBlockSlot,
-                        lt: finalizedBlockFC.slot,
-                    });
-                    this.logger.debug("updated backfilledRanges", {
-                        key: finalizedBlockFC.slot,
-                        value: this.chain.anchorStateLatestBlockSlot,
-                    });
-                    if (filteredSeqs.length > 0) {
-                        await this.db.backfilledRanges.batchDelete(filteredSeqs.map((entry) => entry.key));
-                        this.logger.debug(`Forward Sync - cleaned up backfilledRanges between ${finalizedBlockFC.slot},${this.chain.anchorStateLatestBlockSlot}`, { seqs: JSON.stringify(filteredSeqs) });
-                    }
-                }
-            }
-            catch (e) {
-                this.logger.error("Error updating backfilledRanges on finalization", { epoch: finalized.epoch }, e);
-            }
-        };
-        this.archiveBlobEpochs = opts.archiveBlobEpochs;
-        this.statesArchiver = new StatesArchiver(chain.regen, db, logger, opts, chain.bufferPool);
-        this.prevFinalized = chain.forkChoice.getFinalizedCheckpoint();
-        this.jobQueue = new JobItemQueue(this.processFinalizedCheckpoint, {
-            maxLength: PROCESS_FINALIZED_CHECKPOINT_QUEUE_LEN,
-            signal,
-        });
-        if (!opts.disableArchiveOnCheckpoint) {
-            this.chain.emitter.on(ChainEvent.forkChoiceFinalized, this.onFinalizedCheckpoint);
-            this.chain.emitter.on(ChainEvent.checkpoint, this.onCheckpoint);
-            signal.addEventListener("abort", () => {
-                this.chain.emitter.off(ChainEvent.forkChoiceFinalized, this.onFinalizedCheckpoint);
-                this.chain.emitter.off(ChainEvent.checkpoint, this.onCheckpoint);
-            }, { once: true });
-        }
-    }
-    /** Archive latest finalized state */
-    async persistToDisk() {
-        await this.statesArchiver.archiveState(this.chain.forkChoice.getFinalizedCheckpoint());
-    }
-}
+export * from "./archiver.js";
+export * from "./interface.js";
 //# sourceMappingURL=index.js.map

package/lib/chain/archiver/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chain/archiver/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chain/archiver/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC"}

package/lib/chain/archiver/interface.d.ts

@@ -0,0 +1,39 @@
+import { CheckpointWithHex } from "@lodestar/fork-choice";
+import { RootHex } from "@lodestar/types";
+import { Metrics } from "../../metrics/metrics.js";
+export declare enum StateArchiveMode {
+    Frequency = "frequency"
+}
+export interface StatesArchiverOpts {
+    /**
+     * Minimum number of epochs between archived states
+     */
+    archiveStateEpochFrequency: number;
+    /**
+     * Strategy to store archive states
+     */
+    stateArchiveMode: StateArchiveMode;
+}
+export type ArchiverOpts = StatesArchiverOpts & {
+    disableArchiveOnCheckpoint?: boolean;
+    archiveBlobEpochs?: number;
+};
+export type ProposalStats = {
+    total: number;
+    finalized: number;
+    orphaned: number;
+    missed: number;
+};
+export type FinalizedStats = {
+    allValidators: ProposalStats;
+    attachedValidators: ProposalStats;
+    finalizedCanonicalCheckpointsCount: number;
+    finalizedFoundCheckpointsInStateCache: number;
+    finalizedAttachedValidatorsCount: number;
+};
+export interface StateArchiveStrategy {
+    onCheckpoint(stateRoot: RootHex, metrics?: Metrics | null): Promise<void>;
+    onFinalizedCheckpoint(finalized: CheckpointWithHex, metrics?: Metrics | null): Promise<void>;
+    maybeArchiveState(finalized: CheckpointWithHex, metrics?: Metrics | null): Promise<void>;
+}
+//# sourceMappingURL=interface.d.ts.map

package/lib/chain/archiver/interface.js

@@ -0,0 +1,8 @@
+export var StateArchiveMode;
+(function (StateArchiveMode) {
+    StateArchiveMode["Frequency"] = "frequency";
+    // New strategy to be implemented
+    // WIP: https://github.com/ChainSafe/lodestar/pull/7005
+    // Differential = "diff",
+})(StateArchiveMode || (StateArchiveMode = {}));
+//# sourceMappingURL=interface.js.map

package/lib/chain/archiver/interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/chain/archiver/interface.ts"],"names":[],"mappings":"AAIA,MAAM,CAAN,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,2CAAuB,CAAA;IACvB,iCAAiC;IACjC,uDAAuD;IACvD,yBAAyB;AAC3B,CAAC,EALW,gBAAgB,KAAhB,gBAAgB,QAK3B"}

package/lib/chain/archiver/{archiveStates.d.ts → strategies/frequencyStateArchiveStrategy.d.ts}

@@ -1,27 +1,30 @@
-import { Logger } from "@lodestar/utils";
-import { Slot, Epoch } from "@lodestar/types";
 import { CheckpointWithHex } from "@lodestar/fork-choice";
-import { IBeaconDb } from "../../db/index.js";
-import { IStateRegenerator } from "../regen/interface.js";
-import { BufferPool } from "../../util/bufferPool.js";
-export interface StatesArchiverOpts {
-    /**
-     * Minimum number of epochs between archived states
-     */
-    archiveStateEpochFrequency: number;
-}
+import { Epoch, RootHex, Slot } from "@lodestar/types";
+import { Logger } from "@lodestar/utils";
+import { IBeaconDb } from "../../../db/index.js";
+import { Metrics } from "../../../metrics/metrics.js";
+import { BufferPool } from "../../../util/bufferPool.js";
+import { IStateRegenerator } from "../../regen/interface.js";
+import { StateArchiveStrategy, StatesArchiverOpts } from "../interface.js";
+/**
+ * Minimum number of epochs between single temp archived states
+ * These states will be pruned once a new state is persisted
+ */
+export declare const PERSIST_TEMP_STATE_EVERY_EPOCHS = 32;
 /**
  * Archives finalized states from active bucket to archive bucket.
  *
  * Only the new finalized state is stored to disk
  */
-export declare class StatesArchiver {
+export declare class FrequencyStateArchiveStrategy implements StateArchiveStrategy {
     private readonly regen;
     private readonly db;
     private readonly logger;
     private readonly opts;
     private readonly bufferPool?;
     constructor(regen: IStateRegenerator, db: IBeaconDb, logger: Logger, opts: StatesArchiverOpts, bufferPool?: BufferPool | null | undefined);
+    onFinalizedCheckpoint(_finalized: CheckpointWithHex, _metrics?: Metrics | null): Promise<void>;
+    onCheckpoint(_stateRoot: RootHex, _metrics?: Metrics | null): Promise<void>;
     /**
      * Persist states every some epochs to
      * - Minimize disk space, storing the least states possible
@@ -34,15 +37,15 @@ export declare class StatesArchiver {
      * epoch - 1024*2    epoch - 1024    epoch - 32    epoch
      * ```
      */
-    maybeArchiveState(finalized: CheckpointWithHex): Promise<void>;
+    maybeArchiveState(finalized: CheckpointWithHex, metrics?: Metrics | null): Promise<void>;
     /**
      * Archives finalized states from active bucket to archive bucket.
      * Only the new finalized state is stored to disk
      */
-    archiveState(finalized: CheckpointWithHex): Promise<void>;
+    private archiveState;
 }
 /**
  * Keeps first epoch per interval of persistEveryEpochs, deletes the rest
  */
 export declare function computeStateSlotsToDelete(storedStateSlots: Slot[], persistEveryEpochs: Epoch): Slot[];
-//# sourceMappingURL=archiveStates.d.ts.map
+//# sourceMappingURL=frequencyStateArchiveStrategy.d.ts.map

package/lib/chain/archiver/{archiveStates.js → strategies/frequencyStateArchiveStrategy.js}

@@ -1,19 +1,19 @@
 import { SLOTS_PER_EPOCH } from "@lodestar/params";
 import { computeEpochAtSlot, computeStartSlotAtEpoch } from "@lodestar/state-transition";
-import { getStateSlotFromBytes } from "../../util/multifork.js";
-import { serializeState } from "../serializeState.js";
-import { AllocSource } from "../../util/bufferPool.js";
+import { AllocSource } from "../../../util/bufferPool.js";
+import { getStateSlotFromBytes } from "../../../util/multifork.js";
+import { serializeState } from "../../serializeState.js";
 /**
  * Minimum number of epochs between single temp archived states
  * These states will be pruned once a new state is persisted
  */
-const PERSIST_TEMP_STATE_EVERY_EPOCHS = 32;
+export const PERSIST_TEMP_STATE_EVERY_EPOCHS = 32;
 /**
  * Archives finalized states from active bucket to archive bucket.
  *
  * Only the new finalized state is stored to disk
  */
-export class StatesArchiver {
+export class FrequencyStateArchiveStrategy {
     constructor(regen, db, logger, opts, bufferPool) {
         this.regen = regen;
         this.db = db;
@@ -21,6 +21,8 @@ export class StatesArchiver {
         this.opts = opts;
         this.bufferPool = bufferPool;
     }
+    async onFinalizedCheckpoint(_finalized, _metrics) { }
+    async onCheckpoint(_stateRoot, _metrics) { }
     /**
      * Persist states every some epochs to
      * - Minimize disk space, storing the least states possible
@@ -33,12 +35,12 @@ export class StatesArchiver {
      * epoch - 1024*2    epoch - 1024    epoch - 32    epoch
      * ```
      */
-    async maybeArchiveState(finalized) {
+    async maybeArchiveState(finalized, metrics) {
         const lastStoredSlot = await this.db.stateArchive.lastKey();
         const lastStoredEpoch = computeEpochAtSlot(lastStoredSlot ?? 0);
         const { archiveStateEpochFrequency } = this.opts;
         if (finalized.epoch - lastStoredEpoch >= Math.min(PERSIST_TEMP_STATE_EVERY_EPOCHS, archiveStateEpochFrequency)) {
-            await this.archiveState(finalized);
+            await this.archiveState(finalized, metrics);
             // Only check the current and previous intervals
             const minEpoch = Math.max(0, (Math.floor(finalized.epoch / archiveStateEpochFrequency) - 1) * archiveStateEpochFrequency);
             const storedStateSlots = await this.db.stateArchive.keys({
@@ -62,7 +64,7 @@ export class StatesArchiver {
      * Archives finalized states from active bucket to archive bucket.
      * Only the new finalized state is stored to disk
      */
-    async archiveState(finalized) {
+    async archiveState(finalized, metrics) {
         // starting from Mar 2024, the finalized state could be from disk or in memory
         const finalizedStateOrBytes = await this.regen.getCheckpointStateOrBytes(finalized);
         const { rootHex } = finalized;
@@ -76,7 +78,11 @@ export class StatesArchiver {
         }
         else {
             // serialize state using BufferPool if provided
-            await serializeState(finalizedStateOrBytes, AllocSource.ARCHIVE_STATE, (stateBytes) => this.db.stateArchive.putBinary(finalizedStateOrBytes.slot, stateBytes), this.bufferPool);
+            const timer = metrics?.stateSerializeDuration.startTimer({ source: AllocSource.ARCHIVE_STATE });
+            await serializeState(finalizedStateOrBytes, AllocSource.ARCHIVE_STATE, (stateBytes) => {
+                timer?.();
+                return this.db.stateArchive.putBinary(finalizedStateOrBytes.slot, stateBytes);
+            }, this.bufferPool);
             // don't delete states before the finalized state, auto-prune will take care of it
             this.logger.verbose("Archived finalized state", {
                 epoch: finalized.epoch,
@@ -104,4 +110,4 @@ export function computeStateSlotsToDelete(storedStateSlots, persistEveryEpochs)
     }
     return Array.from(stateSlotsToDelete.values());
 }
-//# sourceMappingURL=archiveStates.js.map
+//# sourceMappingURL=frequencyStateArchiveStrategy.js.map

package/lib/chain/archiver/strategies/frequencyStateArchiveStrategy.js.map

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

package/lib/chain/balancesCache.d.ts

@@ -1,5 +1,5 @@
-import { CachedBeaconStateAllForks, EffectiveBalanceIncrements } from "@lodestar/state-transition";
 import { CheckpointWithHex } from "@lodestar/fork-choice";
+import { CachedBeaconStateAllForks, EffectiveBalanceIncrements } from "@lodestar/state-transition";
 import { RootHex } from "@lodestar/types";
 /**
  * Cache EffectiveBalanceIncrements of checkpoint blocks

package/lib/chain/balancesCache.js

@@ -18,7 +18,7 @@ export class CheckpointBalancesCache {
         const epoch = state.epochCtx.epoch;
         const epochBoundarySlot = computeStartSlotAtEpoch(epoch);
         const epochBoundaryRoot = epochBoundarySlot === state.slot ? blockRootHex : toRootHex(getBlockRootAtSlot(state, epochBoundarySlot));
-        const index = this.items.findIndex((item) => item.epoch === epoch && item.rootHex == epochBoundaryRoot);
+        const index = this.items.findIndex((item) => item.epoch === epoch && item.rootHex === epochBoundaryRoot);
         if (index === -1) {
             if (this.items.length === MAX_BALANCE_CACHE_SIZE) {
                 this.items.shift();

package/lib/chain/balancesCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"balancesCache.js","sourceRoot":"","sources":["../../src/chain/balancesCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,uBAAuB,EAEvB,kBAAkB,EAClB,yCAAyC,GAC1C,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE1C,6FAA6F;AAC7F,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAQjC;;GAEG;AACH,MAAM,OAAO,uBAAuB;IAApC;QACmB,UAAK,GAAwB,EAAE,CAAC;IA2BnD,CAAC;IAzBC;;;;OAIG;IACH,YAAY,CAAC,YAAqB,EAAE,KAAgC;QAClE,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;QACnC,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACzD,MAAM,iBAAiB,GACrB,iBAAiB,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAE5G,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,KAAK,IAAI,IAAI,CAAC,OAAO,IAAI,iBAAiB,CAAC,CAAC;QACxG,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACjB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,sBAAsB,EAAE,CAAC;gBACjD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;YACD,sCAAsC;YACtC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,yCAAyC,CAAC,KAAK,CAAC,EAAC,CAAC,CAAC;QACnH,CAAC;IACH,CAAC;IAED,GAAG,CAAC,UAA6B;QAC/B,MAAM,EAAC,OAAO,EAAE,KAAK,EAAC,GAAG,UAAU,CAAC;QACpC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,KAAK,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,CAAC,EAAE,QAAQ,CAAC;IAC/F,CAAC;CACF"}
+{"version":3,"file":"balancesCache.js","sourceRoot":"","sources":["../../src/chain/balancesCache.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,uBAAuB,EACvB,kBAAkB,EAClB,yCAAyC,GAC1C,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE1C,6FAA6F;AAC7F,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAQjC;;GAEG;AACH,MAAM,OAAO,uBAAuB;IAApC;QACmB,UAAK,GAAwB,EAAE,CAAC;IA2BnD,CAAC;IAzBC;;;;OAIG;IACH,YAAY,CAAC,YAAqB,EAAE,KAAgC;QAClE,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;QACnC,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACzD,MAAM,iBAAiB,GACrB,iBAAiB,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAE5G,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,KAAK,IAAI,IAAI,CAAC,OAAO,KAAK,iBAAiB,CAAC,CAAC;QACzG,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACjB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,sBAAsB,EAAE,CAAC;gBACjD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;YACD,sCAAsC;YACtC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,yCAAyC,CAAC,KAAK,CAAC,EAAC,CAAC,CAAC;QACnH,CAAC;IACH,CAAC;IAED,GAAG,CAAC,UAA6B;QAC/B,MAAM,EAAC,OAAO,EAAE,KAAK,EAAC,GAAG,UAAU,CAAC;QACpC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,KAAK,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,CAAC,EAAE,QAAQ,CAAC;IAC/F,CAAC;CACF"}

package/lib/chain/beaconProposerCache.d.ts

@@ -1,5 +1,5 @@
-import { Epoch } from "@lodestar/types";
 import { routes } from "@lodestar/api";
+import { Epoch } from "@lodestar/types";
 import { Metrics } from "../metrics/index.js";
 export type ProposerPreparationData = routes.validator.ProposerPreparationData;
 export declare class BeaconProposerCache {

package/lib/chain/blocks/importBlock.js

@@ -1,18 +1,18 @@
-import { toHexString } from "@chainsafe/ssz";
-import { ssz } from "@lodestar/types";
-import { ForkSeq, INTERVALS_PER_SLOT, MAX_SEED_LOOKAHEAD, SLOTS_PER_EPOCH } from "@lodestar/params";
-import { computeEpochAtSlot, computeStartSlotAtEpoch, isStateValidatorsNodesPopulated, RootCache, } from "@lodestar/state-transition";
 import { routes } from "@lodestar/api";
-import { ForkChoiceError, ForkChoiceErrorCode, EpochDifference, AncestorStatus } from "@lodestar/fork-choice";
-import { isErrorAborted, toRootHex } from "@lodestar/utils";
+import { AncestorStatus, EpochDifference, ForkChoiceError, ForkChoiceErrorCode } from "@lodestar/fork-choice";
+import { ForkSeq, INTERVALS_PER_SLOT, MAX_SEED_LOOKAHEAD, SLOTS_PER_EPOCH } from "@lodestar/params";
+import { RootCache, computeEpochAtSlot, computeStartSlotAtEpoch, isStateValidatorsNodesPopulated, } from "@lodestar/state-transition";
+import { ssz } from "@lodestar/types";
+import { isErrorAborted, toHex, toRootHex } from "@lodestar/utils";
 import { ZERO_HASH_HEX } from "../../constants/index.js";
-import { toCheckpointHex } from "../stateCache/index.js";
+import { kzgCommitmentToVersionedHash } from "../../util/blobs.js";
+import { callInNextEventLoop } from "../../util/eventLoop.js";
 import { isOptimisticBlock } from "../../util/forkChoice.js";
 import { isQueueErrorAborted } from "../../util/queue/index.js";
-import { kzgCommitmentToVersionedHash } from "../../util/blobs.js";
 import { ChainEvent } from "../emitter.js";
+import { ForkchoiceCaller } from "../forkChoice/index.js";
 import { REPROCESS_MIN_TIME_TO_NEXT_SLOT_SEC } from "../reprocess.js";
-import { callInNextEventLoop } from "../../util/eventLoop.js";
+import { toCheckpointHex } from "../stateCache/index.js";
 import { AttestationImportOpt, BlockInputType } from "./types.js";
 import { getCheckpointFromState } from "./utils/checkpoint.js";
 import { writeBlockInputToDb } from "./writeBlockInputToDb.js";
@@ -52,7 +52,6 @@ export async function importBlock(fullyVerifiedBlock, opts) {
     const blockRootHex = toRootHex(blockRoot);
     const currentEpoch = computeEpochAtSlot(this.forkChoice.getTime());
     const blockEpoch = computeEpochAtSlot(blockSlot);
-    const parentEpoch = computeEpochAtSlot(parentBlockSlot);
     const prevFinalizedEpoch = this.forkChoice.getFinalizedCheckpoint().epoch;
     const blockDelaySec = (fullyVerifiedBlock.seenTimestampSec - postState.genesisTime) % this.config.SECONDS_PER_SLOT;
     const recvToValLatency = Date.now() / 1000 - (opts.seenTimestampSec ?? Date.now() / 1000);
@@ -150,7 +149,7 @@ export async function importBlock(fullyVerifiedBlock, opts) {
     }
     // 5. Compute head. If new head, immediately stateCache.setHeadState()
     const oldHead = this.forkChoice.getHead();
-    const newHead = this.recomputeForkChoiceHead();
+    const newHead = this.recomputeForkChoiceHead(ForkchoiceCaller.importBlock);
     const currFinalizedEpoch = this.forkChoice.getFinalizedCheckpoint().epoch;
     if (newHead.blockRoot !== oldHead.blockRoot) {
         // Set head state as strong reference
@@ -252,11 +251,6 @@ export async function importBlock(fullyVerifiedBlock, opts) {
     if (!isStateValidatorsNodesPopulated(postState)) {
         this.logger.verbose("After importBlock caching postState without SSZ cache", { slot: postState.slot });
     }
-    if (parentEpoch < blockEpoch) {
-        // current epoch and previous epoch are likely cached in previous states
-        this.shufflingCache.processState(postState, postState.epochCtx.nextShuffling.epoch);
-        this.logger.verbose("Processed shuffling for next epoch", { parentEpoch, blockEpoch, slot: blockSlot });
-    }
     if (blockSlot % SLOTS_PER_EPOCH === 0) {
         // Cache state to preserve epoch transition work
         const checkpointState = postState;
@@ -340,8 +334,8 @@ export async function importBlock(fullyVerifiedBlock, opts) {
                         blockRoot: blockRootHex,
                         slot: blockSlot,
                         index,
-                        kzgCommitment: toHexString(kzgCommitment),
-                        versionedHash: toHexString(kzgCommitmentToVersionedHash(kzgCommitment)),
+                        kzgCommitment: toHex(kzgCommitment),
+                        versionedHash: toHex(kzgCommitmentToVersionedHash(kzgCommitment)),
                     });
                 }
             }