@lodestar/beacon-node 1.48.0-dev.e9c9b8835d → 1.48.0-dev.fd70e5fc15

package/src/chain/validation/dataColumnSidecar.ts

@@ -11,7 +11,7 @@ import {
   computeStartSlotAtEpoch,
   getBlockHeaderProposerSignatureSetByHeaderSlot,
 } from "@lodestar/state-transition";
-import {DataColumnSidecar, Root, RootHex, Slot, SubnetID, ValidatorIndex, fulu, gloas, ssz} from "@lodestar/types";
+import {DataColumnSidecar, Root, Slot, SubnetID, ValidatorIndex, fulu, gloas, ssz} from "@lodestar/types";
 import {byteArrayEquals, toRootHex, verifyMerkleBranch} from "@lodestar/utils";
 import {BeaconMetrics} from "../../metrics/metrics/beacon.js";
 import {Metrics} from "../../metrics/metrics.js";
@@ -39,14 +39,12 @@ export async function validateGossipFuluDataColumnSidecar(
   const blockRootHex = toRootHex(ssz.phase0.BeaconBlockHeader.hashTreeRoot(blockHeader));
 
   // 1) [REJECT] The sidecar is valid as verified by verify_data_column_sidecar
-  verifyFuluDataColumnSidecar(chain.config, dataColumnSidecar, blockRootHex);
+  verifyFuluDataColumnSidecar(chain.config, dataColumnSidecar);
 
   // 2) [REJECT] The sidecar is for the correct subnet -- i.e. compute_subnet_for_data_column_sidecar(sidecar.index) == subnet_id
   if (computeSubnetForDataColumnSidecar(chain.config, dataColumnSidecar) !== gossipSubnet) {
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.INVALID_SUBNET,
-      slot: blockHeader.slot,
-      root: blockRootHex,
       columnIndex: dataColumnSidecar.index,
       gossipSubnet: gossipSubnet,
     });
@@ -102,9 +100,8 @@ export async function validateGossipFuluDataColumnSidecar(
   if (parentBlock.slot >= blockHeader.slot) {
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.NOT_LATER_THAN_PARENT,
-      slot: blockHeader.slot,
-      root: blockRootHex,
       parentSlot: parentBlock.slot,
+      slot: blockHeader.slot,
     });
   }
 
@@ -143,8 +140,6 @@ export async function validateGossipFuluDataColumnSidecar(
   if (proposerIndex !== expectedProposerIndex) {
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.INCORRECT_PROPOSER,
-      slot: blockHeader.slot,
-      root: blockRootHex,
       actualProposerIndex: proposerIndex,
       expectedProposerIndex,
     });
@@ -166,9 +161,9 @@ export async function validateGossipFuluDataColumnSidecar(
     ) {
       throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
         code: DataColumnSidecarErrorCode.PROPOSAL_SIGNATURE_INVALID,
-        slot: blockHeader.slot,
-        root: blockRootHex,
+        blockRoot: blockRootHex,
         index: dataColumnSidecar.index,
+        slot: blockHeader.slot,
       });
     }
 
@@ -190,8 +185,7 @@ export async function validateGossipFuluDataColumnSidecar(
   if (!valid) {
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.INCLUSION_PROOF_INVALID,
-      slot: blockHeader.slot,
-      root: blockRootHex,
+      slot: dataColumnSidecar.signedBlockHeader.message.slot,
       columnIndex: dataColumnSidecar.index,
     });
   }
@@ -210,7 +204,6 @@ export async function validateGossipFuluDataColumnSidecar(
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.INVALID_KZG_PROOF,
       slot: blockHeader.slot,
-      root: blockRootHex,
       columnIndex: dataColumnSidecar.index,
     });
   } finally {
@@ -247,7 +240,6 @@ export async function validateGossipGloasDataColumnSidecar(
   if (block.slot !== dataColumnSidecar.slot) {
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.INCORRECT_SIDECAR_SLOT,
-      root: blockRootHex,
       columnIndex: dataColumnSidecar.index,
       expected: block.slot,
       actual: dataColumnSidecar.slot,
@@ -256,14 +248,12 @@ export async function validateGossipGloasDataColumnSidecar(
 
   // [REJECT] The sidecar must pass verify_data_column_sidecar against the block commitments
   const kzgCommitments = payloadInput.getBlobKzgCommitments();
-  verifyGloasDataColumnSidecar(dataColumnSidecar, kzgCommitments, blockRootHex);
+  verifyGloasDataColumnSidecar(dataColumnSidecar, kzgCommitments);
 
   // [REJECT] The sidecar must be on the correct subnet
   if (computeSubnetForDataColumnSidecar(chain.config, dataColumnSidecar) !== gossipSubnet) {
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.INVALID_SUBNET,
-      slot: dataColumnSidecar.slot,
-      root: blockRootHex,
       columnIndex: dataColumnSidecar.index,
       gossipSubnet,
     });
@@ -282,7 +272,6 @@ export async function validateGossipGloasDataColumnSidecar(
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.INVALID_KZG_PROOF,
       slot: dataColumnSidecar.slot,
-      root: blockRootHex,
       columnIndex: dataColumnSidecar.index,
     });
   } finally {
@@ -294,17 +283,11 @@ export async function validateGossipGloasDataColumnSidecar(
  * SPEC FUNCTION
  * https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.4/specs/fulu/p2p-interface.md#verify_data_column_sidecar
  */
-function verifyFuluDataColumnSidecar(
-  config: ChainForkConfig,
-  dataColumnSidecar: fulu.DataColumnSidecar,
-  blockRootHex: RootHex
-): void {
-  const slot = dataColumnSidecar.signedBlockHeader.message.slot;
+function verifyFuluDataColumnSidecar(config: ChainForkConfig, dataColumnSidecar: fulu.DataColumnSidecar): void {
   if (dataColumnSidecar.index >= NUMBER_OF_COLUMNS) {
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.INVALID_INDEX,
-      slot,
-      root: blockRootHex,
+      slot: dataColumnSidecar.signedBlockHeader.message.slot,
       columnIndex: dataColumnSidecar.index,
     });
   }
@@ -312,20 +295,18 @@ function verifyFuluDataColumnSidecar(
   if (dataColumnSidecar.kzgCommitments.length === 0) {
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.NO_COMMITMENTS,
-      slot,
-      root: blockRootHex,
+      slot: dataColumnSidecar.signedBlockHeader.message.slot,
       columnIndex: dataColumnSidecar.index,
     });
   }
 
-  const epoch = computeEpochAtSlot(slot);
+  const epoch = computeEpochAtSlot(dataColumnSidecar.signedBlockHeader.message.slot);
   const maxBlobsPerBlock = config.getMaxBlobsPerBlock(epoch);
 
   if (dataColumnSidecar.kzgCommitments.length > maxBlobsPerBlock) {
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.TOO_MANY_KZG_COMMITMENTS,
-      slot,
-      root: blockRootHex,
+      slot: dataColumnSidecar.signedBlockHeader.message.slot,
       columnIndex: dataColumnSidecar.index,
       count: dataColumnSidecar.kzgCommitments.length,
       limit: maxBlobsPerBlock,
@@ -338,8 +319,6 @@ function verifyFuluDataColumnSidecar(
   ) {
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.MISMATCHED_LENGTHS,
-      slot,
-      root: blockRootHex,
       columnLength: dataColumnSidecar.column.length,
       commitmentsLength: dataColumnSidecar.kzgCommitments.length,
       proofsLength: dataColumnSidecar.kzgProofs.length,
@@ -351,17 +330,12 @@ function verifyFuluDataColumnSidecar(
  * SPEC FUNCTION
  * https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.3/specs/gloas/p2p-interface.md#modified-verify_data_column_sidecar
  */
-function verifyGloasDataColumnSidecar(
-  dataColumnSidecar: gloas.DataColumnSidecar,
-  kzgCommitments: Uint8Array[],
-  blockRootHex: RootHex
-): void {
+function verifyGloasDataColumnSidecar(dataColumnSidecar: gloas.DataColumnSidecar, kzgCommitments: Uint8Array[]): void {
   const slot = getDataColumnSidecarSlot(dataColumnSidecar);
   if (dataColumnSidecar.index >= NUMBER_OF_COLUMNS) {
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.INVALID_INDEX,
       slot,
-      root: blockRootHex,
       columnIndex: dataColumnSidecar.index,
     });
   }
@@ -370,7 +344,6 @@ function verifyGloasDataColumnSidecar(
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.NO_COMMITMENTS,
       slot,
-      root: blockRootHex,
       columnIndex: dataColumnSidecar.index,
     });
   }
@@ -381,8 +354,6 @@ function verifyGloasDataColumnSidecar(
   ) {
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.MISMATCHED_LENGTHS,
-      slot,
-      root: blockRootHex,
       columnLength: dataColumnSidecar.column.length,
       commitmentsLength: kzgCommitments.length,
       proofsLength: dataColumnSidecar.kzgProofs.length,
@@ -494,8 +465,8 @@ export async function validateFuluBlockDataColumnSidecars(
         ) {
           throw new DataColumnSidecarValidationError({
             code: DataColumnSidecarErrorCode.PROPOSAL_SIGNATURE_INVALID,
+            blockRoot: rootHex,
             slot: blockSlot,
-            root: rootHex,
             index: dataColumnSidecars[0].index,
           });
         }
@@ -528,7 +499,6 @@ export async function validateFuluBlockDataColumnSidecars(
           {
             code: DataColumnSidecarErrorCode.INVALID_INDEX,
             slot: blockSlot,
-            root: toRootHex(blockRoot),
             columnIndex: columnSidecar.index,
           },
           "DataColumnSidecar has invalid index"
@@ -573,7 +543,6 @@ export async function validateFuluBlockDataColumnSidecars(
           {
             code: DataColumnSidecarErrorCode.INCLUSION_PROOF_INVALID,
             slot: blockSlot,
-            root: toRootHex(blockRoot),
             columnIndex: columnSidecar.index,
           },
           "DataColumnSidecar has invalid inclusion proof"
@@ -654,7 +623,6 @@ export async function validateGloasBlockDataColumnSidecars(
       if (columnSidecar.slot !== blockSlot) {
         throw new DataColumnSidecarValidationError({
           code: DataColumnSidecarErrorCode.INCORRECT_SIDECAR_SLOT,
-          root: toRootHex(blockRoot),
           columnIndex: columnSidecar.index,
           expected: blockSlot,
           actual: columnSidecar.slot,
@@ -676,7 +644,6 @@ export async function validateGloasBlockDataColumnSidecars(
           {
             code: DataColumnSidecarErrorCode.INVALID_INDEX,
             slot: blockSlot,
-            root: toRootHex(blockRoot),
             columnIndex: columnSidecar.index,
           },
           "DataColumnSidecar has invalid index"

package/src/chain/validation/executionPayloadEnvelope.ts

@@ -82,8 +82,6 @@ async function validateExecutionPayloadEnvelope(
   if (block.slot !== payload.slotNumber) {
     throw new ExecutionPayloadEnvelopeError(GossipAction.REJECT, {
       code: ExecutionPayloadEnvelopeErrorCode.SLOT_MISMATCH,
-      slot: payload.slotNumber,
-      root: blockRootHex,
       envelopeSlot: payload.slotNumber,
       blockSlot: block.slot,
     });
@@ -93,8 +91,6 @@ async function validateExecutionPayloadEnvelope(
   if (envelope.builderIndex !== payloadInput.getBuilderIndex()) {
     throw new ExecutionPayloadEnvelopeError(GossipAction.REJECT, {
       code: ExecutionPayloadEnvelopeErrorCode.BUILDER_INDEX_MISMATCH,
-      slot: payload.slotNumber,
-      root: blockRootHex,
       envelopeBuilderIndex: envelope.builderIndex,
       bidBuilderIndex: payloadInput.getBuilderIndex(),
     });
@@ -104,8 +100,6 @@ async function validateExecutionPayloadEnvelope(
   if (toRootHex(payload.blockHash) !== payloadInput.getBlockHashHex()) {
     throw new ExecutionPayloadEnvelopeError(GossipAction.REJECT, {
       code: ExecutionPayloadEnvelopeErrorCode.BLOCK_HASH_MISMATCH,
-      slot: payload.slotNumber,
-      root: blockRootHex,
       envelopeBlockHash: toRootHex(payload.blockHash),
       bidBlockHash: payloadInput.getBlockHashHex(),
     });
@@ -116,8 +110,6 @@ async function validateExecutionPayloadEnvelope(
   if (!byteArrayEquals(requestsRoot, payloadInput.getBid().executionRequestsRoot)) {
     throw new ExecutionPayloadEnvelopeError(GossipAction.REJECT, {
       code: ExecutionPayloadEnvelopeErrorCode.EXECUTION_REQUESTS_ROOT_MISMATCH,
-      slot: payload.slotNumber,
-      root: blockRootHex,
       envelopeRequestsRoot: toRootHex(requestsRoot),
       bidRequestsRoot: toRootHex(payloadInput.getBid().executionRequestsRoot),
     });
@@ -149,8 +141,6 @@ async function validateExecutionPayloadEnvelope(
   if (!(await chain.bls.verifySignatureSets([signatureSet], {verifyOnMainThread: true}))) {
     throw new ExecutionPayloadEnvelopeError(GossipAction.REJECT, {
       code: ExecutionPayloadEnvelopeErrorCode.INVALID_SIGNATURE,
-      slot: payload.slotNumber,
-      root: blockRootHex,
     });
   }
 }

package/src/db/beacon.ts

@@ -1,11 +1,6 @@
 import {ChainForkConfig} from "@lodestar/config";
 import {Db, LevelDbControllerMetrics, encodeKey} from "@lodestar/db";
-import {Slot} from "@lodestar/types";
-import {Logger} from "@lodestar/utils";
 import {Bucket} from "./buckets.js";
-import {type IDataColumnStore, LegacyDataColumnStore} from "./dataColumnStore.js";
-import {FlatFileStore} from "./flatFileStore/flatFileStore.js";
-import type {FlatFileStoreMetrics} from "./flatFileStore/metrics.js";
 import {IBeaconDb} from "./interface.js";
 import {CheckpointStateRepository} from "./repositories/checkpointState.js";
 import {
@@ -29,10 +24,9 @@ import {
   VoluntaryExitRepository,
 } from "./repositories/index.js";
 
-export type BeaconDbOpts = {
-  dataColumnDir: string;
-  logger: Logger;
-  metrics?: FlatFileStoreMetrics | null;
+export type BeaconDbModules = {
+  config: ChainForkConfig;
+  db: Db;
 };
 
 export class BeaconDb implements IBeaconDb {
@@ -63,14 +57,9 @@ export class BeaconDb implements IBeaconDb {
 
   backfilledRanges: BackfilledRanges;
 
-  readonly dataColumns: IDataColumnStore;
-  lastLegacyArchiveSlot: Slot | null = null;
-  private readonly flatFileStore: FlatFileStore;
-
   constructor(
     config: ChainForkConfig,
-    protected readonly db: Db,
-    opts: BeaconDbOpts
+    protected readonly db: Db
   ) {
     // Warning: If code is ever run in the constructor, must change this stub to not extend 'packages/beacon-node/test/utils/stub/beaconDb.ts' -
     this.block = new BlockRepository(config, db);
@@ -98,30 +87,14 @@ export class BeaconDb implements IBeaconDb {
     this.syncCommitteeWitness = new SyncCommitteeWitnessRepository(config, db);
 
     this.backfilledRanges = new BackfilledRanges(config, db);
-
-    this.flatFileStore = new FlatFileStore(opts.dataColumnDir, config, opts.logger, opts.metrics);
-    this.dataColumns = new LegacyDataColumnStore(
-      this.flatFileStore,
-      this.dataColumnSidecar,
-      this.dataColumnSidecarArchive,
-      this.blockArchive
-    );
-  }
-
-  async init(): Promise<void> {
-    await this.flatFileStore.init();
-    const [lastLegacyKey] = await this.dataColumnSidecarArchive.keys({reverse: true, limit: 1});
-    this.lastLegacyArchiveSlot = lastLegacyKey?.prefix ?? null;
   }
 
-  async close(): Promise<void> {
-    await this.flatFileStore.close();
+  close(): Promise<void> {
     return this.db.close();
   }
 
-  setMetrics(metrics: LevelDbControllerMetrics, flatFileStoreMetrics: FlatFileStoreMetrics | null = null): void {
+  setMetrics(metrics: LevelDbControllerMetrics): void {
     this.db.setMetrics(metrics);
-    this.flatFileStore.setMetrics(flatFileStoreMetrics);
   }
 
   async pruneHotDb(): Promise<void> {

package/src/db/index.ts

@@ -1,4 +1,3 @@
 export {BeaconDb} from "./beacon.js";
 export {Bucket} from "./buckets.js";
-export type {DataColumnKey, IDataColumnStore, IndexedDataColumnBytes} from "./dataColumnStore.js";
 export type {IBeaconDb} from "./interface.js";

package/src/db/interface.ts

@@ -1,7 +1,4 @@
 import {LevelDbControllerMetrics} from "@lodestar/db";
-import {Slot} from "@lodestar/types";
-import type {IDataColumnStore} from "./dataColumnStore.js";
-import type {FlatFileStoreMetrics} from "./flatFileStore/metrics.js";
 import {CheckpointStateRepository} from "./repositories/checkpointState.js";
 import {
   AttesterSlashingRepository,
@@ -62,11 +59,6 @@ export interface IBeaconDb {
 
   backfilledRanges: BackfilledRanges;
 
-  dataColumns: IDataColumnStore;
-  /** Highest legacy column slot at startup; later archival writes the block-root index first. */
-  readonly lastLegacyArchiveSlot: Slot | null;
-  init(): Promise<void>;
-
   pruneHotDb(): Promise<void>;
 
   deleteDeprecatedEth1Data(): Promise<void>;
@@ -74,5 +66,5 @@ export interface IBeaconDb {
   /**  Close the connection to the db instance and close the db store. */
   close(): Promise<void>;
   /** To inject metrics after CLI initialization */
-  setMetrics(metrics: LevelDbControllerMetrics, flatFileStoreMetrics?: FlatFileStoreMetrics | null): void;
+  setMetrics(metrics: LevelDbControllerMetrics): void;
 }

package/src/db/repositories/blockArchive.ts

@@ -1,17 +1,16 @@
 import {ChainForkConfig} from "@lodestar/config";
-import {Db, DbBatch, FilterOptions, KeyValue, Repository} from "@lodestar/db";
+import {Db, FilterOptions, KeyValue, Repository} from "@lodestar/db";
 import {Root, SignedBeaconBlock, Slot, ssz} from "@lodestar/types";
-import {bytesToInt, intToBytes} from "@lodestar/utils";
+import {bytesToInt} from "@lodestar/utils";
 import {getSignedBlockTypeFromBytes} from "../../util/multifork.js";
 import {Bucket, getBucketNameByValue} from "../buckets.js";
 import {
   deleteParentRootIndex,
   deleteRootIndex,
   getParentRootIndex,
-  getParentRootIndexKey,
   getRootIndex,
-  getRootIndexKey,
-  getSlotIndexKey,
+  storeParentRootIndex,
+  storeRootIndex,
 } from "./blockArchiveIndex.js";
 
 export interface BlockFilterOptions extends FilterOptions<Slot> {
@@ -57,91 +56,37 @@ export class BlockArchiveRepository extends Repository<Slot, SignedBeaconBlock>
   // Overrides to index
 
   async put(key: Slot, value: SignedBeaconBlock): Promise<void> {
-    await this.batchPut([{key, value}]);
-  }
-
-  async putBinary(key: Slot, value: Uint8Array): Promise<void> {
-    const block = this.decodeValue(value);
-    await this.batchPutBinary([
-      {
-        key,
-        value,
-        slot: block.message.slot,
-        blockRoot: this.config.getForkTypes(block.message.slot).BeaconBlock.hashTreeRoot(block.message),
-        parentRoot: block.message.parentRoot,
-      },
+    const blockRoot = this.config.getForkTypes(value.message.slot).BeaconBlock.hashTreeRoot(value.message);
+    const slot = value.message.slot;
+    await Promise.all([
+      super.put(key, value),
+      storeRootIndex(this.db, slot, blockRoot),
+      storeParentRootIndex(this.db, slot, value.message.parentRoot),
     ]);
   }
 
   async batchPut(items: KeyValue<Slot, SignedBeaconBlock>[]): Promise<void> {
-    await this.batchPutBinary(
-      items.map(({key, value}) => ({
-        key,
-        value: this.encodeValue(value),
-        slot: value.message.slot,
-        blockRoot: this.config.getForkTypes(value.message.slot).BeaconBlock.hashTreeRoot(value.message),
-        parentRoot: value.message.parentRoot,
-      }))
-    );
+    await Promise.all([
+      super.batchPut(items),
+      Array.from(items).map((item) => {
+        const slot = item.value.message.slot;
+        const blockRoot = this.config.getForkTypes(slot).BeaconBlock.hashTreeRoot(item.value.message);
+        return storeRootIndex(this.db, slot, blockRoot);
+      }),
+      Array.from(items).map((item) => {
+        const slot = item.value.message.slot;
+        const parentRoot = item.value.message.parentRoot;
+        return storeParentRootIndex(this.db, slot, parentRoot);
+      }),
+    ]);
   }
 
   async batchPutBinary(items: BlockArchiveBatchPutBinaryItem[]): Promise<void> {
-    await this.db.batchPut(
-      items.flatMap((item) => this.indexedBlockEntries(item)),
-      this.dbReqOpts
-    );
-  }
-
-  async delete(slot: Slot): Promise<void> {
-    await this.batchDelete([slot]);
-  }
-
-  async batchDelete(slots: Slot[]): Promise<void> {
-    await this.db.batchDelete(
-      slots.flatMap((slot) => [this.encodeKey(slot), getSlotIndexKey(slot)]),
-      this.dbReqOpts
-    );
-  }
-
-  async batch(operations: DbBatch<Slot, SignedBeaconBlock>): Promise<void> {
-    await this.batchBinary(
-      operations.map((operation) =>
-        operation.type === "put" ? {...operation, value: this.encodeValue(operation.value)} : operation
-      )
-    );
-  }
-
-  async batchBinary(operations: DbBatch<Slot, Uint8Array>): Promise<void> {
-    const batch: DbBatch<Uint8Array, Uint8Array> = [];
-    for (const operation of operations) {
-      if (operation.type === "del") {
-        batch.push(
-          {type: "del", key: this.encodeKey(operation.key)},
-          {type: "del", key: getSlotIndexKey(operation.key)}
-        );
-      } else {
-        const block = this.decodeValue(operation.value);
-        const entries = this.indexedBlockEntries({
-          key: operation.key,
-          value: operation.value,
-          slot: block.message.slot,
-          blockRoot: this.config.getForkTypes(block.message.slot).BeaconBlock.hashTreeRoot(block.message),
-          parentRoot: block.message.parentRoot,
-        });
-        batch.push(...entries.map((entry) => ({type: "put" as const, ...entry})));
-      }
-    }
-    await this.db.batch(batch, this.dbReqOpts);
-  }
-
-  private indexedBlockEntries(item: BlockArchiveBatchPutBinaryItem): KeyValue<Uint8Array, Uint8Array>[] {
-    const slotBytes = intToBytes(item.slot, 8, "be");
-    return [
-      {key: this.encodeKey(item.key), value: item.value},
-      {key: getRootIndexKey(item.blockRoot), value: slotBytes},
-      {key: getParentRootIndexKey(item.parentRoot), value: slotBytes},
-      {key: getSlotIndexKey(item.key), value: item.blockRoot},
-    ];
+    await Promise.all([
+      super.batchPutBinary(items),
+      Array.from(items).map((item) => storeRootIndex(this.db, item.slot, item.blockRoot)),
+      Array.from(items).map((item) => storeParentRootIndex(this.db, item.slot, item.parentRoot)),
+    ]);
   }
 
   async remove(value: SignedBeaconBlock): Promise<void> {
@@ -155,10 +100,10 @@ export class BlockArchiveRepository extends Repository<Slot, SignedBeaconBlock>
   async batchRemove(values: SignedBeaconBlock[]): Promise<void> {
     await Promise.all([
       super.batchRemove(values),
-      ...values.map((value) =>
+      Array.from(values).map((value) =>
         deleteRootIndex(this.db, this.config.getForkTypes(value.message.slot).SignedBeaconBlock, value)
       ),
-      ...values.map((value) => deleteParentRootIndex(this.db, value)),
+      Array.from(values).map((value) => deleteParentRootIndex(this.db, value)),
     ]);
   }
 
@@ -195,10 +140,6 @@ export class BlockArchiveRepository extends Repository<Slot, SignedBeaconBlock>
     return slot !== null ? this.get(slot) : null;
   }
 
-  async getRootBySlot(slot: Slot): Promise<Root | null> {
-    return this.db.get(getSlotIndexKey(slot), {bucketId: getBucketNameByValue(Bucket.index_mainChain)});
-  }
-
   async getSlotByRoot(root: Root): Promise<Slot | null> {
     return this.parseSlot(await getRootIndex(this.db, root));
   }

package/src/db/repositories/blockArchiveIndex.ts

@@ -1,6 +1,7 @@
 import {Db, encodeKey} from "@lodestar/db";
 import {ForkAll} from "@lodestar/params";
 import {Root, SSZTypesFor, SignedBeaconBlock, Slot, ssz} from "@lodestar/types";
+import {intToBytes} from "@lodestar/utils";
 import {Bucket, getBucketNameByValue} from "../buckets.js";
 
 export const rootIndexBucketId = getBucketNameByValue(Bucket.index_blockArchiveRootIndex);
@@ -14,6 +15,14 @@ export async function getParentRootIndex(db: Db, parentRoot: Root): Promise<Uint
   return db.get(getParentRootIndexKey(parentRoot), {bucketId: parentRootIndexBucketId});
 }
 
+export async function storeRootIndex(db: Db, slot: Slot, blockRoot: Root): Promise<void> {
+  return db.put(getRootIndexKey(blockRoot), intToBytes(slot, 8, "be"), {bucketId: rootIndexBucketId});
+}
+
+export async function storeParentRootIndex(db: Db, slot: Slot, parentRoot: Root): Promise<void> {
+  return db.put(getParentRootIndexKey(parentRoot), intToBytes(slot, 8, "be"), {bucketId: parentRootIndexBucketId});
+}
+
 export async function deleteRootIndex(
   db: Db,
   signedBeaconBlockType: SSZTypesFor<ForkAll, "SignedBeaconBlock">,
@@ -34,7 +43,3 @@ export function getParentRootIndexKey(parentRoot: Root): Uint8Array {
 export function getRootIndexKey(root: Root): Uint8Array {
   return encodeKey(Bucket.index_blockArchiveRootIndex, root);
 }
-
-export function getSlotIndexKey(slot: Slot): Uint8Array {
-  return encodeKey(Bucket.index_mainChain, slot);
-}

package/src/metrics/metrics/lodestar.ts

@@ -21,7 +21,6 @@ import {ReprocessStatus} from "../../chain/reprocess.js";
 import {RejectReason} from "../../chain/seenCache/seenAttestationData.js";
 import {CacheItemType} from "../../chain/stateCache/types.js";
 import {OpSource} from "../../chain/validatorMonitor.js";
-import type {FlatFileStoreOperation} from "../../db/flatFileStore/metrics.js";
 import {ExecutionPayloadStatus} from "../../execution/index.js";
 import {GossipType} from "../../network/index.js";
 import {CannotAcceptWorkReason, ReprocessRejectReason} from "../../network/processor/index.js";
@@ -2100,7 +2099,7 @@ export function createLodestarMetrics(
       }),
       dbSizeTotal: register.gauge({
         name: "lodestar_db_size_bytes_total",
-        help: "Approximate number of bytes of file system space used by LevelDB",
+        help: "Approximate number of bytes of file system space used by db",
       }),
       dbApproximateSizeTime: register.histogram({
         name: "lodestar_db_approximate_size_time_seconds",
@@ -2109,61 +2108,6 @@ export function createLodestarMetrics(
       }),
     },
 
-    flatFileStore: {
-      operationDuration: {
-        read: register.histogram({
-          name: "lodestar_flat_file_store_read_duration_seconds",
-          help: "Duration of flat file store reads in seconds",
-          buckets: [0.0001, 0.0005, 0.001, 0.005, 0.01, 0.05],
-        }),
-        write: register.histogram({
-          name: "lodestar_flat_file_store_write_duration_seconds",
-          help: "Duration of flat file store writes in seconds",
-          buckets: [0.005, 0.01, 0.05, 0.1, 0.5, 1],
-        }),
-        delete: register.histogram({
-          name: "lodestar_flat_file_store_delete_duration_seconds",
-          help: "Duration of flat file store deletions in seconds",
-          buckets: [0.0001, 0.0005, 0.001, 0.005, 0.01, 0.05],
-        }),
-        prune: register.histogram({
-          name: "lodestar_flat_file_store_prune_duration_seconds",
-          help: "Duration of flat file store pruning in seconds",
-          buckets: [0.0005, 0.01, 0.05, 0.5, 5, 30],
-        }),
-      },
-      operationErrors: register.counter<{operation: FlatFileStoreOperation}>({
-        name: "lodestar_flat_file_store_operation_errors_total",
-        help: "Total count of failed flat file store operations",
-        labelNames: ["operation"],
-      }),
-      readBytes: register.counter({
-        name: "lodestar_flat_file_store_read_bytes_total",
-        help: "Total bytes read from flat file storage",
-      }),
-      writeBytes: register.counter({
-        name: "lodestar_flat_file_store_write_bytes_total",
-        help: "Total bytes written to flat file storage",
-      }),
-      prunedDirectories: register.counter({
-        name: "lodestar_flat_file_store_pruned_directories_total",
-        help: "Total count of slot directories pruned from flat file storage",
-      }),
-      slotIndexSize: register.gauge({
-        name: "lodestar_flat_file_store_indexed_slots",
-        help: "Count of indexed flat file slot directories, including empty directories awaiting pruning",
-      }),
-      startupDuration: register.histogram({
-        name: "lodestar_flat_file_store_startup_duration_seconds",
-        help: "Duration of flat file store slot index reconstruction in seconds",
-        buckets: [0.1, 0.5, 1, 5, 10, 30, 60, 300],
-      }),
-      startupErrors: register.counter({
-        name: "lodestar_flat_file_store_startup_errors_total",
-        help: "Total count of flat file store startup failures",
-      }),
-    },
-
     pruneHistory: {
       pruneCount: register.gauge({
         name: "lodestar_prune_history_prune_count_total",

package/src/monitoring/clientStats.ts

@@ -107,7 +107,7 @@ function createBeaconNodeStats(): ClientStats {
       metricName: "lodestar_db_size_bytes_total",
       jsonType: JsonType.Number,
       defaultValue: 0,
-      description: "Amount of bytes consumed on disk by the beacon node's LevelDB database",
+      description: "Amount of bytes consumed on disk by the beacon node's database",
     }),
     networkLibp2pBytesTotalReceive: new MetricProperty({
       jsonKey: "network_libp2p_bytes_total_receive",