@lodestar/beacon-node 1.29.0-dev.300bed85d8 → 1.29.0-dev.38876e1a06

package/lib/chain/archiveStore/historicalState/historicalStateRegen.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"historicalStateRegen.js","sourceRoot":"","sources":["../../../../src/chain/archiveStore/historicalState/historicalStateRegen.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAe,MAAM,EAAE,MAAM,EAAE,KAAK,EAAC,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AASnD,iFAAiF;AACjF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,oDAAoD,CAAC,CAAC,CAAC,IAAI,CAAC;AAEjH;;;GAGG;AACH,MAAM,OAAO,oBAAoB;IAI/B,YAAY,OAAoC;QAC9C,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,OAAO,CAAC,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAwC;QACxD,MAAM,UAAU,GAA8B;YAC5C,eAAe,EAAE,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC;YAClD,qBAAqB,EAAE,OAAO,CAAC,MAAM,CAAC,qBAAqB;YAC3D,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,WAAW;YACrC,cAAc,EAAE,CAAC;YACjB,SAAS,EAAE,EAAE;YACb,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,UAAU;YACnC,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;YACxC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;SACpC,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,EAAE;YAC5D,UAAU;SACgC,CAAC,CAAC;QAE9C,MAAM,GAAG,GAAG,MAAM,KAAK,CAA2B,MAAM,EAAE;YACxD,0FAA0F;YAC1F,8FAA8F;YAC9F,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;SACvB,CAAC,CAAC;QAEH,OAAO,IAAI,oBAAoB,CAAC,EAAC,GAAG,OAAO,EAAE,GAAG,EAAC,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACzD,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAAY;QACnC,OAAO,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;CACF"}

package/lib/chain/{historicalState → archiveStore/historicalState}/types.d.ts

@@ -3,7 +3,7 @@ import { BeaconConfig } from "@lodestar/config";
 import { LoggerNode, LoggerNodeOpts } from "@lodestar/logger/node";
 import { BeaconStateTransitionMetrics } from "@lodestar/state-transition";
 import { Gauge, Histogram } from "@lodestar/utils";
-import { Metrics } from "../../metrics/index.js";
+import { Metrics } from "../../../metrics/index.js";
 export type HistoricalStateRegenInitModules = {
     opts: {
         genesisTime: number;

package/lib/chain/archiveStore/historicalState/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/chain/archiveStore/historicalState/types.ts"],"names":[],"mappings":"AAsCA,MAAM,CAAN,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,0CAAwB,CAAA;IACxB,yDAAuC,CAAA;IACvC,sDAAoC,CAAA;AACtC,CAAC,EAJW,cAAc,KAAd,cAAc,QAIzB"}

package/lib/chain/{historicalState → archiveStore/historicalState}/worker.js

@@ -4,9 +4,9 @@ import { Transfer, expose } from "@chainsafe/threads/worker";
 import { chainConfigFromJson, createBeaconConfig } from "@lodestar/config";
 import { LevelDbController } from "@lodestar/db";
 import { getNodeLogger } from "@lodestar/logger/node";
-import { BeaconDb } from "../../db/index.js";
-import { RegistryMetricCreator, collectNodeJSMetrics } from "../../metrics/index.js";
-import { JobFnQueue } from "../../util/queue/fnQueue.js";
+import { BeaconDb } from "../../../db/index.js";
+import { RegistryMetricCreator, collectNodeJSMetrics } from "../../../metrics/index.js";
+import { JobFnQueue } from "../../../util/queue/fnQueue.js";
 import { getHistoricalState } from "./getHistoricalState.js";
 // most of this setup copied from networkCoreWorker.ts
 const workerData = worker.workerData;
@@ -106,6 +106,18 @@ if (metricsRegister) {
             name: "lodestar_historical_state_stfn_post_state_validators_nodes_populated_miss_total",
             help: "Total count state.validators nodesPopulated is false on stfn for post state",
         }),
+        newSeenAttestersPerBlock: metricsRegister.gauge({
+            name: "lodestar_historical_state_stfn_new_seen_attesters_per_block_total",
+            help: "Count of new seen attesters in epoch transition",
+        }),
+        newSeenAttestersEffectiveBalancePerBlock: metricsRegister.gauge({
+            name: "lodestar_historical_state_stfn_new_seen_attesters_effective_balance_per_block_total",
+            help: "Total effective balance increment of new seen attesters per block",
+        }),
+        attestationsPerBlock: metricsRegister.gauge({
+            name: "lodestar_historical_state_stfn_attestations_per_block_total",
+            help: "Count of attestations per block",
+        }),
         registerValidatorStatuses: () => { },
         // historical state regen metrics
         regenTime: metricsRegister.histogram({

package/lib/chain/archiveStore/historicalState/worker.js.map

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

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

@@ -0,0 +1,4 @@
+export * from "./archiveStore.js";
+export * from "./interface.js";
+export * from "./constants.js";
+//# sourceMappingURL=index.d.ts.map

package/lib/chain/archiveStore/index.js

@@ -0,0 +1,4 @@
+export * from "./archiveStore.js";
+export * from "./interface.js";
+export * from "./constants.js";
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chain/archiveStore/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC"}

package/lib/chain/{archiver → archiveStore}/interface.d.ts

@@ -1,10 +1,10 @@
 import { CheckpointWithHex } from "@lodestar/fork-choice";
 import { RootHex } from "@lodestar/types";
 import { Metrics } from "../../metrics/metrics.js";
-export declare enum StateArchiveMode {
+export declare enum ArchiveMode {
     Frequency = "frequency"
 }
-export interface StatesArchiverOpts {
+export interface StatesArchiveOpts {
     /**
      * Minimum number of epochs between archived states
      */
@@ -12,9 +12,9 @@ export interface StatesArchiverOpts {
     /**
      * Strategy to store archive states
      */
-    stateArchiveMode: StateArchiveMode;
+    archiveMode: ArchiveMode;
 }
-export type ArchiverOpts = StatesArchiverOpts & {
+export type ArchiveStoreOpts = StatesArchiveOpts & {
     disableArchiveOnCheckpoint?: boolean;
     archiveBlobEpochs?: number;
     pruneHistory?: boolean;
@@ -38,4 +38,30 @@ export interface StateArchiveStrategy {
     maybeArchiveState(finalized: CheckpointWithHex, metrics?: Metrics | null): Promise<void>;
     archiveState(finalized: CheckpointWithHex, metrics?: Metrics | null): Promise<void>;
 }
+export interface IArchiveStore {
+    /**
+     * Initialize archive store and load any worker required
+     */
+    init(): Promise<void>;
+    /**
+     * Cleanup and close any worker
+     */
+    close(): Promise<void>;
+    /**
+     * Scrape metrics from the archive store
+     */
+    scrapeMetrics(): Promise<string>;
+    /**
+     * Get historical state by slot
+     */
+    getHistoricalStateBySlot(slot: number): Promise<{
+        state: Uint8Array;
+        executionOptimistic: boolean;
+        finalized: boolean;
+    } | null>;
+    /**
+     * Archive latest finalized state
+     */
+    persistToDisk(): Promise<void>;
+}
 //# sourceMappingURL=interface.d.ts.map

package/lib/chain/archiveStore/interface.js

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/chain/archiveStore/interface.ts"],"names":[],"mappings":"AAIA,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,sCAAuB,CAAA;IACvB,iCAAiC;IACjC,uDAAuD;IACvD,yBAAyB;AAC3B,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB"}

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

@@ -5,7 +5,7 @@ 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";
+import { StateArchiveStrategy, StatesArchiveOpts } from "../interface.js";
 /**
  * Minimum number of epochs between single temp archived states
  * These states will be pruned once a new state is persisted
@@ -22,7 +22,7 @@ export declare class FrequencyStateArchiveStrategy implements StateArchiveStrate
     private readonly logger;
     private readonly opts;
     private readonly bufferPool?;
-    constructor(regen: IStateRegenerator, db: IBeaconDb, logger: Logger, opts: StatesArchiverOpts, bufferPool?: (BufferPool | null) | undefined);
+    constructor(regen: IStateRegenerator, db: IBeaconDb, logger: Logger, opts: StatesArchiveOpts, bufferPool?: (BufferPool | null) | undefined);
     onFinalizedCheckpoint(_finalized: CheckpointWithHex, _metrics?: Metrics | null): Promise<void>;
     onCheckpoint(_stateRoot: RootHex, _metrics?: Metrics | null): Promise<void>;
     /**

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

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

package/lib/chain/{archiver → archiveStore/utils}/archiveBlocks.d.ts

@@ -2,8 +2,8 @@ import { ChainForkConfig } from "@lodestar/config";
 import { IForkChoice } from "@lodestar/fork-choice";
 import { Epoch, RootHex, Slot } from "@lodestar/types";
 import { Logger } from "@lodestar/utils";
-import { IBeaconDb } from "../../db/index.js";
-import { LightClientServer } from "../lightClient/index.js";
+import { IBeaconDb } from "../../../db/index.js";
+import { LightClientServer } from "../../lightClient/index.js";
 type CheckpointHex = {
     epoch: Epoch;
     rootHex: RootHex;

package/lib/chain/archiveStore/utils/archiveBlocks.js.map

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

package/lib/chain/{archiver → archiveStore/utils}/pruneHistory.d.ts

@@ -1,7 +1,7 @@
 import { ChainConfig } from "@lodestar/config";
 import { Epoch } from "@lodestar/types";
 import { Logger } from "@lodestar/utils";
-import { IBeaconDb } from "../../db/interface.js";
-import { Metrics } from "../../metrics/index.js";
+import { IBeaconDb } from "../../../db/interface.js";
+import { Metrics } from "../../../metrics/index.js";
 export declare function pruneHistory(config: ChainConfig, db: IBeaconDb, logger: Logger, metrics: Metrics | null | undefined, finalizedEpoch: Epoch, currentEpoch: Epoch): Promise<void>;
 //# sourceMappingURL=pruneHistory.d.ts.map

package/lib/chain/archiveStore/utils/pruneHistory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pruneHistory.js","sourceRoot":"","sources":["../../../../src/chain/archiveStore/utils/pruneHistory.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AAMnE,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAAmB,EACnB,EAAa,EACb,MAAc,EACd,OAAmC,EACnC,cAAqB,EACrB,YAAmB;IAEnB,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG;IAC/B,2CAA2C;IAC3C,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC,6BAA6B,EAAE,CAAC,CAAC;IAChE,yGAAyG;IACzG,cAAc,CACf,CAAC;IACF,MAAM,eAAe,GAAG,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAElE,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE;QACzC,YAAY;QACZ,cAAc;QACd,gBAAgB;KACjB,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;IAC3D,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACzC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,eAAe,EAAC,CAAC;QACnD,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,cAAc,EAAC,CAAC;KACnD,CAAC,CAAC;IACH,KAAK,EAAE,EAAE,CAAC;IAEV,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE;QAC9B,YAAY;QACZ,aAAa,EAAE,MAAM,CAAC,MAAM;QAC5B,aAAa,EAAE,MAAM,CAAC,MAAM;KAC7B,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;IAC3D,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,KAAK;QACL,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC;QACnC,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC;KACpC,CAAC,CAAC;IACH,KAAK,EAAE,EAAE,CAAC;IAEV,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE;QAC7B,YAAY;KACb,CAAC,CAAC;IAEH,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;AACzC,CAAC"}

package/lib/chain/archiveStore/utils/updateBackfillRange.d.ts

@@ -0,0 +1,20 @@
+import { CheckpointWithHex } from "@lodestar/fork-choice";
+import { Logger } from "@lodestar/logger";
+import { IBeaconDb } from "../../../db/interface.js";
+import { IBeaconChain } from "../../interface.js";
+/**
+ * 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.
+ */
+export declare function updateBackfillRange({ chain, db, logger }: {
+    chain: IBeaconChain;
+    db: IBeaconDb;
+    logger: Logger;
+}, finalized: CheckpointWithHex): Promise<void>;
+//# sourceMappingURL=updateBackfillRange.d.ts.map

package/lib/chain/archiveStore/utils/updateBackfillRange.js

@@ -0,0 +1,40 @@
+/**
+ * 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.
+ */
+export async function updateBackfillRange({ chain, db, logger }, finalized) {
+    try {
+        // Mark the sequence in backfill db from finalized block's slot till anchor slot as
+        // filled.
+        const finalizedBlockFC = chain.forkChoice.getBlockHex(finalized.rootHex);
+        if (finalizedBlockFC && finalizedBlockFC.slot > chain.anchorStateLatestBlockSlot) {
+            await db.backfilledRanges.put(finalizedBlockFC.slot, 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 db.backfilledRanges.entries({
+                gt: chain.anchorStateLatestBlockSlot,
+                lt: finalizedBlockFC.slot,
+            });
+            logger.debug("updated backfilledRanges", {
+                key: finalizedBlockFC.slot,
+                value: chain.anchorStateLatestBlockSlot,
+            });
+            if (filteredSeqs.length > 0) {
+                await db.backfilledRanges.batchDelete(filteredSeqs.map((entry) => entry.key));
+                logger.debug(`Forward Sync - cleaned up backfilledRanges between ${finalizedBlockFC.slot},${chain.anchorStateLatestBlockSlot}`, { seqs: JSON.stringify(filteredSeqs) });
+            }
+        }
+    }
+    catch (e) {
+        logger.error("Error updating backfilledRanges on finalization", { epoch: finalized.epoch }, e);
+    }
+}
+//# sourceMappingURL=updateBackfillRange.js.map

package/lib/chain/archiveStore/utils/updateBackfillRange.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"updateBackfillRange.js","sourceRoot":"","sources":["../../../../src/chain/archiveStore/utils/updateBackfillRange.ts"],"names":[],"mappings":"AAKA;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,EAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAuD,EACzE,SAA4B;IAE5B,IAAI,CAAC;QACH,mFAAmF;QACnF,UAAU;QACV,MAAM,gBAAgB,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzE,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,IAAI,GAAG,KAAK,CAAC,0BAA0B,EAAE,CAAC;YACjF,MAAM,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,0BAA0B,CAAC,CAAC;YAEvF,4EAA4E;YAC5E,uDAAuD;YACvD,sEAAsE;YACtE,oBAAoB;YACpB,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC;gBACrD,EAAE,EAAE,KAAK,CAAC,0BAA0B;gBACpC,EAAE,EAAE,gBAAgB,CAAC,IAAI;aAC1B,CAAC,CAAC;YACH,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE;gBACvC,GAAG,EAAE,gBAAgB,CAAC,IAAI;gBAC1B,KAAK,EAAE,KAAK,CAAC,0BAA0B;aACxC,CAAC,CAAC;YACH,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5B,MAAM,EAAE,CAAC,gBAAgB,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC9E,MAAM,CAAC,KAAK,CACV,sDAAsD,gBAAgB,CAAC,IAAI,IAAI,KAAK,CAAC,0BAA0B,EAAE,EACjH,EAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAC,CACrC,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE,EAAC,KAAK,EAAE,SAAS,CAAC,KAAK,EAAC,EAAE,CAAU,CAAC,CAAC;IACxG,CAAC;AACH,CAAC"}

package/lib/chain/chain.d.ts

@@ -13,6 +13,7 @@ import { Metrics } from "../metrics/index.js";
 import { BufferPool } from "../util/bufferPool.js";
 import { IClock } from "../util/clock.js";
 import { SerializedCache } from "../util/serializedCache.js";
+import { ArchiveStore } from "./archiveStore/archiveStore.js";
 import { CheckpointBalancesCache } from "./balancesCache.js";
 import { BeaconProposerCache } from "./beaconProposerCache.js";
 import { BlockProcessor, ImportBlockOpts } from "./blocks/index.js";
@@ -20,7 +21,6 @@ import { BlockInput } from "./blocks/types.js";
 import { IBlsVerifier } from "./bls/index.js";
 import { ChainEventEmitter } from "./emitter.js";
 import { ForkchoiceCaller } from "./forkChoice/index.js";
-import { HistoricalStateRegen } from "./historicalState/index.js";
 import { CommonBlockBody, IBeaconChain, ProposerPreparationData, StateGetOpts } from "./interface.js";
 import { LightClientServer } from "./lightClient/index.js";
 import { AggregatedAttestationPool, AttestationPool, OpPool, SyncCommitteeMessagePool, SyncContributionAndProofPool } from "./opPools/index.js";
@@ -56,7 +56,7 @@ export declare class BeaconChain implements IBeaconChain {
     readonly regen: QueuedStateRegenerator;
     readonly lightClientServer?: LightClientServer;
     readonly reprocessController: ReprocessController;
-    readonly historicalStateRegen?: HistoricalStateRegen;
+    readonly archiveStore: ArchiveStore;
     readonly attestationPool: AttestationPool;
     readonly aggregatedAttestationPool: AggregatedAttestationPool;
     readonly syncCommitteeMessagePool: SyncCommitteeMessagePool;
@@ -144,12 +144,12 @@ export declare class BeaconChain implements IBeaconChain {
     readonly opts: IChainOptions;
     protected readonly blockProcessor: BlockProcessor;
     protected readonly db: IBeaconDb;
-    private readonly archiver;
     private abortController;
     private processShutdownCallback;
-    constructor(opts: IChainOptions, { config, db, dataDir, logger, processShutdownCallback, clock, metrics, anchorState, eth1, executionEngine, executionBuilder, historicalStateRegen, }: {
+    constructor(opts: IChainOptions, { config, db, dbName, dataDir, logger, processShutdownCallback, clock, metrics, anchorState, eth1, executionEngine, executionBuilder, }: {
         config: BeaconConfig;
         db: IBeaconDb;
+        dbName: string;
         dataDir: string;
         logger: Logger;
         processShutdownCallback: ProcessShutdownCallback;
@@ -160,8 +160,8 @@ export declare class BeaconChain implements IBeaconChain {
         eth1: IEth1ForBlockProduction;
         executionEngine: IExecutionEngine;
         executionBuilder?: IExecutionBuilder;
-        historicalStateRegen?: HistoricalStateRegen;
     });
+    init(): Promise<void>;
     close(): Promise<void>;
     seenBlock(blockRoot: RootHex): boolean;
     regenCanAcceptWork(): boolean;

package/lib/chain/chain.js

@@ -11,7 +11,7 @@ import { Clock, ClockEvent } from "../util/clock.js";
 import { ensureDir, writeIfNotExist } from "../util/file.js";
 import { isOptimisticBlock } from "../util/forkChoice.js";
 import { SerializedCache } from "../util/serializedCache.js";
-import { Archiver } from "./archiver/archiver.js";
+import { ArchiveStore } from "./archiveStore/archiveStore.js";
 import { CheckpointBalancesCache } from "./balancesCache.js";
 import { BeaconProposerCache } from "./beaconProposerCache.js";
 import { BlockProcessor } from "./blocks/index.js";
@@ -49,7 +49,7 @@ import { PersistentCheckpointStateCache } from "./stateCache/persistentCheckpoin
  */
 const DEFAULT_MAX_CACHED_PRODUCED_ROOTS = 4;
 export class BeaconChain {
-    constructor(opts, { config, db, dataDir, logger, processShutdownCallback, clock, metrics, anchorState, eth1, executionEngine, executionBuilder, historicalStateRegen, }) {
+    constructor(opts, { config, db, dbName, dataDir, logger, processShutdownCallback, clock, metrics, anchorState, eth1, executionEngine, executionBuilder, }) {
         this.syncContributionAndProofPool = new SyncContributionAndProofPool();
         this.opPool = new OpPool();
         // Gossip seen cache
@@ -80,7 +80,6 @@ export class BeaconChain {
         this.eth1 = eth1;
         this.executionEngine = executionEngine;
         this.executionBuilder = executionBuilder;
-        this.historicalStateRegen = historicalStateRegen;
         const signal = this.abortController.signal;
         const emitter = new ChainEventEmitter();
         // by default, verify signatures on both main threads and worker threads
@@ -91,8 +90,8 @@ export class BeaconChain {
             clock = new Clock({ config, genesisTime: this.genesisTime, signal });
         this.blacklistedBlocks = new Map((opts.blacklistedBlocks ?? []).map((hex) => [hex, null]));
         const preAggregateCutOffTime = (2 / 3) * this.config.SECONDS_PER_SLOT;
-        this.attestationPool = new AttestationPool(config, clock, preAggregateCutOffTime, this.opts?.preaggregateSlotDistance);
-        this.aggregatedAttestationPool = new AggregatedAttestationPool(this.config);
+        this.attestationPool = new AttestationPool(config, clock, preAggregateCutOffTime, this.opts?.preaggregateSlotDistance, metrics);
+        this.aggregatedAttestationPool = new AggregatedAttestationPool(this.config, metrics);
         this.syncCommitteeMessagePool = new SyncCommitteeMessagePool(clock, preAggregateCutOffTime, this.opts?.preaggregateSlotDistance);
         this.seenAggregatedAttestations = new SeenAggregatedAttestations(metrics);
         this.seenContributionAndProof = new SeenContributionAndProof(metrics);
@@ -176,7 +175,7 @@ export class BeaconChain {
         this.bls = bls;
         this.emitter = emitter;
         this.serializedCache = new SerializedCache();
-        this.archiver = new Archiver(db, this, logger, signal, opts, metrics);
+        this.archiveStore = new ArchiveStore({ db, chain: this, logger: logger, metrics }, { ...opts, dbName, anchorState: { finalizedCheckpoint: anchorState.finalizedCheckpoint } }, signal);
         // Stop polling eth1 data if anchor state is in Electra AND deposit_requests_start_index is reached
         const anchorStateFork = this.config.getForkName(anchorState.slot);
         if (isForkPostElectra(anchorStateFork)) {
@@ -190,7 +189,7 @@ export class BeaconChain {
             new PrepareNextSlotScheduler(this, this.config, metrics, this.logger, signal);
         }
         if (metrics) {
-            metrics.opPool.aggregatedAttestationPoolSize.addCollect(() => this.onScrapeMetrics(metrics));
+            metrics.clockSlot.addCollect(() => this.onScrapeMetrics(metrics));
         }
         // Event handlers. emitter is created internally and dropped on close(). Not need to .removeListener()
         clock.addListener(ClockEvent.slot, this.onClockSlot.bind(this));
@@ -198,9 +197,14 @@ export class BeaconChain {
         emitter.addListener(ChainEvent.forkChoiceFinalized, this.onForkChoiceFinalized.bind(this));
         emitter.addListener(ChainEvent.forkChoiceJustified, this.onForkChoiceJustified.bind(this));
     }
+    async init() {
+        await this.archiveStore.init();
+        await this.loadFromDisk();
+    }
     async close() {
-        this.abortController.abort();
+        await this.archiveStore.close();
         await this.bls.close();
+        this.abortController.abort();
     }
     seenBlock(blockRoot) {
         return this.seenGossipBlockInput.hasBlock(blockRoot) || this.forkChoice.hasBlockHex(blockRoot);
@@ -234,7 +238,7 @@ export class BeaconChain {
     }
     /** Persist in-memory data to the DB. Call at least once before stopping the process */
     async persistToDisk() {
-        await this.archiver.persistToDisk();
+        await this.archiveStore.persistToDisk();
         await this.opPool.toPersisted(this.db);
     }
     getHeadState() {
@@ -293,16 +297,7 @@ export class BeaconChain {
         });
     }
     async getHistoricalStateBySlot(slot) {
-        const finalizedBlock = this.forkChoice.getFinalizedBlock();
-        if (slot >= finalizedBlock.slot) {
-            return null;
-        }
-        // request for finalized state using historical state regen
-        const stateSerialized = await this.historicalStateRegen?.getHistoricalState(slot);
-        if (!stateSerialized) {
-            return null;
-        }
-        return { state: stateSerialized, executionOptimistic: false, finalized: true };
+        return this.archiveStore.getHistoricalStateBySlot(slot);
     }
     async getStateByStateRoot(stateRoot, opts) {
         if (opts?.allowRegen) {
@@ -726,10 +721,8 @@ export class BeaconChain {
         this.logger.debug("Persisted invalid ssz object", { id: logStr, filepath });
     }
     onScrapeMetrics(metrics) {
-        const { attestationCount, attestationDataCount } = this.aggregatedAttestationPool.getAttestationCount();
-        metrics.opPool.aggregatedAttestationPoolSize.set(attestationCount);
-        metrics.opPool.aggregatedAttestationPoolUniqueData.set(attestationDataCount);
-        metrics.opPool.attestationPoolSize.set(this.attestationPool.getAttestationCount());
+        // aggregatedAttestationPool tracks metrics on its own
+        metrics.opPool.attestationPool.size.set(this.attestationPool.getAttestationCount());
         metrics.opPool.attesterSlashingPoolSize.set(this.opPool.attesterSlashingsSize);
         metrics.opPool.proposerSlashingPoolSize.set(this.opPool.proposerSlashingsSize);
         metrics.opPool.voluntaryExitPoolSize.set(this.opPool.voluntaryExitsSize);