@lodestar/beacon-node 1.39.0-dev.882891d89c → 1.39.0-dev.b37f2bd1bd

package/src/chain/rewards/attestationsRewards.ts

@@ -1,6 +1,5 @@
 import {PubkeyIndexMap} from "@chainsafe/pubkey-index-map";
 import {routes} from "@lodestar/api";
-import {BeaconConfig} from "@lodestar/config";
 import {
   EFFECTIVE_BALANCE_INCREMENT,
   ForkName,
@@ -39,12 +38,11 @@ const defaultAttestationsReward = {head: 0, target: 0, source: 0, inclusionDelay
 const defaultAttestationsPenalty = {target: 0, source: 0};
 
 export async function computeAttestationsRewards(
-  config: BeaconConfig,
   pubkey2index: PubkeyIndexMap,
   state: CachedBeaconStateAllForks,
   validatorIds?: (ValidatorIndex | string)[]
 ): Promise<AttestationsRewards> {
-  const fork = config.getForkName(state.slot);
+  const fork = state.config.getForkName(state.slot);
   if (fork === ForkName.phase0) {
     throw Error("Unsupported fork. Attestations rewards calculation is not available in phase0");
   }
@@ -52,13 +50,8 @@ export async function computeAttestationsRewards(
   const stateAltair = state as CachedBeaconStateAltair;
   const transitionCache = beforeProcessEpoch(stateAltair);
 
-  const [idealRewards, penalties] = computeIdealAttestationsRewardsAndPenaltiesAltair(
-    config,
-    stateAltair,
-    transitionCache
-  );
+  const [idealRewards, penalties] = computeIdealAttestationsRewardsAndPenaltiesAltair(stateAltair, transitionCache);
   const totalRewards = computeTotalAttestationsRewardsAltair(
-    config,
     pubkey2index,
     stateAltair,
     transitionCache,
@@ -71,13 +64,12 @@ export async function computeAttestationsRewards(
 }
 
 function computeIdealAttestationsRewardsAndPenaltiesAltair(
-  config: BeaconConfig,
   state: CachedBeaconStateAllForks,
   transitionCache: EpochTransitionCache
 ): [IdealAttestationsReward[], AttestationsPenalty[]] {
   const baseRewardPerIncrement = transitionCache.baseRewardPerIncrement;
   const activeBalanceByIncrement = transitionCache.totalActiveStakeByIncrement;
-  const fork = config.getForkName(state.slot);
+  const fork = state.config.getForkName(state.slot);
   const maxEffectiveBalance = isForkPostElectra(fork) ? MAX_EFFECTIVE_BALANCE_ELECTRA : MAX_EFFECTIVE_BALANCE;
   const maxEffectiveBalanceByIncrement = Math.floor(maxEffectiveBalance / EFFECTIVE_BALANCE_INCREMENT);
 
@@ -147,7 +139,6 @@ function computeIdealAttestationsRewardsAndPenaltiesAltair(
 
 // Same calculation as `getRewardsAndPenaltiesAltair` but returns the breakdown of rewards instead of aggregated
 function computeTotalAttestationsRewardsAltair(
-  config: BeaconConfig,
   pubkey2index: PubkeyIndexMap,
   state: CachedBeaconStateAltair,
   transitionCache: EpochTransitionCache,
@@ -157,7 +148,7 @@ function computeTotalAttestationsRewardsAltair(
 ): TotalAttestationsReward[] {
   const rewards = [];
   const {flags} = transitionCache;
-  const {epochCtx} = state;
+  const {epochCtx, config} = state;
   const validatorIndices = validatorIds
     .map((id) => (typeof id === "number" ? id : pubkey2index.get(fromHex(id))))
     .filter((index) => index !== undefined); // Validator indices to include in the result

package/src/chain/rewards/blockRewards.ts

@@ -1,5 +1,4 @@
 import {routes} from "@lodestar/api";
-import {BeaconConfig} from "@lodestar/config";
 import {
   ForkName,
   WHISTLEBLOWER_REWARD_QUOTIENT,
@@ -27,12 +26,11 @@ type SubRewardValue = number; // All reward values should be integer
  *  3) Reporting slashable behaviours from proposer and attester
  */
 export async function computeBlockRewards(
-  config: BeaconConfig,
   block: BeaconBlock,
   preState: CachedBeaconStateAllForks,
   postState?: CachedBeaconStateAllForks
 ): Promise<BlockRewards> {
-  const fork = config.getForkName(block.slot);
+  const fork = preState.config.getForkName(block.slot);
   const {attestations: cachedAttestationsReward = 0, syncAggregate: cachedSyncAggregateReward = 0} =
     postState?.proposerRewards ?? {};
   let blockAttestationReward = cachedAttestationsReward;
@@ -42,7 +40,7 @@ export async function computeBlockRewards(
     blockAttestationReward =
       fork === ForkName.phase0
         ? computeBlockAttestationRewardPhase0(block as phase0.BeaconBlock, preState as CachedBeaconStatePhase0)
-        : computeBlockAttestationRewardAltair(config, block as altair.BeaconBlock, preState as CachedBeaconStateAltair);
+        : computeBlockAttestationRewardAltair(block as altair.BeaconBlock, preState as CachedBeaconStateAltair);
   }
 
   if (syncAggregateReward === 0) {
@@ -80,11 +78,10 @@ function computeBlockAttestationRewardPhase0(
  * Reuses `processAttestationsAltair()`. Has dependency on RewardCache
  */
 function computeBlockAttestationRewardAltair(
-  config: BeaconConfig,
   block: altair.BeaconBlock,
   preState: CachedBeaconStateAltair
 ): SubRewardValue {
-  const fork = config.getForkSeq(block.slot);
+  const fork = preState.config.getForkSeq(block.slot);
   const {attestations} = block.body;
 
   processAttestationsAltair(fork, preState, attestations, false);

package/src/chain/rewards/syncCommitteeRewards.ts

@@ -1,5 +1,4 @@
 import {routes} from "@lodestar/api";
-import {BeaconConfig} from "@lodestar/config";
 import {ForkName, SYNC_COMMITTEE_SIZE} from "@lodestar/params";
 import {CachedBeaconStateAllForks, CachedBeaconStateAltair, Index2PubkeyCache} from "@lodestar/state-transition";
 import {BeaconBlock, ValidatorIndex, altair} from "@lodestar/types";
@@ -8,13 +7,12 @@ export type SyncCommitteeRewards = routes.beacon.SyncCommitteeRewards;
 type BalanceRecord = {val: number}; // Use val for convenient way to increment/decrement balance
 
 export async function computeSyncCommitteeRewards(
-  config: BeaconConfig,
   index2pubkey: Index2PubkeyCache,
   block: BeaconBlock,
   preState: CachedBeaconStateAllForks,
   validatorIds: (ValidatorIndex | string)[] = []
 ): Promise<SyncCommitteeRewards> {
-  const fork = config.getForkName(block.slot);
+  const fork = preState.config.getForkName(block.slot);
   if (fork === ForkName.phase0) {
     throw Error("Cannot get sync rewards as phase0 block does not have sync committee");
   }

package/src/chain/stateCache/persistentCheckpointsCache.ts

@@ -1,5 +1,4 @@
 import {routes} from "@lodestar/api";
-import {BeaconConfig} from "@lodestar/config";
 import {
   CachedBeaconStateAllForks,
   computeStartSlotAtEpoch,
@@ -25,7 +24,6 @@ export type PersistentCheckpointStateCacheOpts = {
 };
 
 type PersistentCheckpointStateCacheModules = {
-  config: BeaconConfig;
   metrics?: Metrics | null;
   logger: Logger;
   clock?: IClock | null;
@@ -109,7 +107,6 @@ export class PersistentCheckpointStateCache implements CheckpointStateCache {
   private readonly cache: MapTracker<CacheKey, CacheItem>;
   /** Epoch -> Set<blockRoot> */
   private readonly epochIndex = new MapDef<Epoch, Set<RootHex>>(() => new Set<string>());
-  private readonly config: BeaconConfig;
   private readonly metrics: Metrics | null | undefined;
   private readonly logger: Logger;
   private readonly clock: IClock | null | undefined;
@@ -123,20 +120,10 @@ export class PersistentCheckpointStateCache implements CheckpointStateCache {
   private readonly bufferPool?: BufferPool | null;
 
   constructor(
-    {
-      config,
-      metrics,
-      logger,
-      clock,
-      signal,
-      datastore,
-      blockStateCache,
-      bufferPool,
-    }: PersistentCheckpointStateCacheModules,
+    {metrics, logger, clock, signal, datastore, blockStateCache, bufferPool}: PersistentCheckpointStateCacheModules,
     opts: PersistentCheckpointStateCacheOpts
   ) {
     this.cache = new MapTracker(metrics?.cpStateCache);
-    this.config = config;
     if (metrics) {
       this.metrics = metrics;
       metrics.cpStateCache.size.addCollect(() => {
@@ -497,7 +484,7 @@ export class PersistentCheckpointStateCache implements CheckpointStateCache {
     }
 
     const blockSlot = state.slot;
-    const processCPStatesTimeMs = this.config.getSlotComponentDurationMs(PROCESS_CHECKPOINT_STATES_BPS);
+    const processCPStatesTimeMs = state.config.getSlotComponentDurationMs(PROCESS_CHECKPOINT_STATES_BPS);
     // we always have clock in production, fallback value is only for test
     const msFromSlot = this.clock?.msFromSlot(blockSlot) ?? processCPStatesTimeMs;
     const msToProcessCPStates = processCPStatesTimeMs - msFromSlot;

package/src/chain/validation/attesterSlashing.ts

@@ -51,7 +51,7 @@ export async function validateAttesterSlashing(
     });
   }
 
-  const signatureSets = getAttesterSlashingSignatureSets(chain.config, chain.index2pubkey, state, attesterSlashing);
+  const signatureSets = getAttesterSlashingSignatureSets(chain.index2pubkey, state, attesterSlashing);
   if (!(await chain.bls.verifySignatureSets(signatureSets, {batchable: true, priority: prioritizeBls}))) {
     throw new AttesterSlashingError(GossipAction.REJECT, {
       code: AttesterSlashingErrorCode.INVALID,

package/src/chain/validation/block.ts

@@ -153,7 +153,7 @@ export async function validateGossipBlock(
 
   // [REJECT] The proposer signature, signed_beacon_block.signature, is valid with respect to the proposer_index pubkey.
   if (!chain.seenBlockInputCache.isVerifiedProposerSignature(blockSlot, blockRoot, signedBlock.signature)) {
-    const signatureSet = getBlockProposerSignatureSet(chain.config, chain.index2pubkey, blockState, signedBlock);
+    const signatureSet = getBlockProposerSignatureSet(chain.index2pubkey, blockState, signedBlock);
     // Don't batch so verification is not delayed
     if (!(await chain.bls.verifySignatureSets([signatureSet], {verifyOnMainThread: true}))) {
       throw new BlockGossipError(GossipAction.REJECT, {

package/src/chain/validation/blsToExecutionChange.ts

@@ -41,7 +41,7 @@ async function validateBlsToExecutionChange(
   // NOTE: No need to advance head state since the signature's fork is handled with `broadcastedOnFork`,
   // and chanes relevant to `isValidBlsToExecutionChange()` happen only on processBlock(), not processEpoch()
   const state = chain.getHeadState();
-  const {config} = chain;
+  const {config} = state;
 
   // [REJECT] All of the conditions within process_bls_to_execution_change pass validation.
   // verifySignature = false, verified in batch below

package/src/chain/validation/proposerSlashing.ts

@@ -44,7 +44,7 @@ async function validateProposerSlashing(
     });
   }
 
-  const signatureSets = getProposerSlashingSignatureSets(chain.config, chain.index2pubkey, state, proposerSlashing);
+  const signatureSets = getProposerSlashingSignatureSets(chain.index2pubkey, state, proposerSlashing);
   if (!(await chain.bls.verifySignatureSets(signatureSets, {batchable: true, priority: prioritizeBls}))) {
     throw new ProposerSlashingError(GossipAction.REJECT, {
       code: ProposerSlashingErrorCode.INVALID,

package/src/chain/validation/signatureSets/aggregateAndProof.ts

@@ -14,7 +14,7 @@ export function getAggregateAndProofSigningRoot(
   epoch: Epoch,
   aggregateAndProof: SignedAggregateAndProof
 ): Uint8Array {
-  // previously, we call `const aggregatorDomain = config.getDomain(state.slot, DOMAIN_AGGREGATE_AND_PROOF, slot);`
+  // previously, we call `const aggregatorDomain = state.config.getDomain(state.slot, DOMAIN_AGGREGATE_AND_PROOF, slot);`
   // at fork boundary, it's required to dial to target epoch https://github.com/ChainSafe/lodestar/blob/v1.11.3/packages/beacon-node/src/chain/validation/attestation.ts#L573
   // instead of that, just use the fork of slot in the attestation data
   const slot = computeStartSlotAtEpoch(epoch);

package/src/chain/validation/signatureSets/contributionAndProof.ts

@@ -1,4 +1,3 @@
-import {BeaconConfig} from "@lodestar/config";
 import {DOMAIN_CONTRIBUTION_AND_PROOF} from "@lodestar/params";
 import {
   CachedBeaconStateAllForks,
@@ -10,12 +9,11 @@ import {
 import {altair, ssz} from "@lodestar/types";
 
 export function getContributionAndProofSignatureSet(
-  config: BeaconConfig,
   index2pubkey: Index2PubkeyCache,
   state: CachedBeaconStateAllForks,
   signedContributionAndProof: altair.SignedContributionAndProof
 ): ISignatureSet {
-  const domain = config.getDomain(
+  const domain = state.config.getDomain(
     state.slot,
     DOMAIN_CONTRIBUTION_AND_PROOF,
     signedContributionAndProof.message.contribution.slot

package/src/chain/validation/signatureSets/syncCommittee.ts

@@ -1,4 +1,3 @@
-import {BeaconConfig} from "@lodestar/config";
 import {DOMAIN_SYNC_COMMITTEE} from "@lodestar/params";
 import {
   CachedBeaconStateAllForks,
@@ -10,12 +9,11 @@ import {
 import {altair, ssz} from "@lodestar/types";
 
 export function getSyncCommitteeSignatureSet(
-  config: BeaconConfig,
   index2pubkey: Index2PubkeyCache,
   state: CachedBeaconStateAllForks,
   syncCommittee: altair.SyncCommitteeMessage
 ): ISignatureSet {
-  const domain = config.getDomain(state.slot, DOMAIN_SYNC_COMMITTEE, syncCommittee.slot);
+  const domain = state.config.getDomain(state.slot, DOMAIN_SYNC_COMMITTEE, syncCommittee.slot);
 
   return {
     type: SignatureSetType.single,

package/src/chain/validation/signatureSets/syncCommitteeContribution.ts

@@ -1,16 +1,14 @@
 import {PublicKey} from "@chainsafe/blst";
-import {BeaconConfig} from "@lodestar/config";
 import {DOMAIN_SYNC_COMMITTEE} from "@lodestar/params";
 import {CachedBeaconStateAltair, ISignatureSet, SignatureSetType, computeSigningRoot} from "@lodestar/state-transition";
 import {altair, ssz} from "@lodestar/types";
 
 export function getSyncCommitteeContributionSignatureSet(
-  config: BeaconConfig,
   state: CachedBeaconStateAltair,
   contribution: altair.SyncCommitteeContribution,
   pubkeys: PublicKey[]
 ): ISignatureSet {
-  const domain = config.getDomain(state.slot, DOMAIN_SYNC_COMMITTEE, contribution.slot);
+  const domain = state.config.getDomain(state.slot, DOMAIN_SYNC_COMMITTEE, contribution.slot);
   return {
     type: SignatureSetType.aggregate,
     pubkeys,

package/src/chain/validation/signatureSets/syncCommitteeSelectionProof.ts

@@ -1,4 +1,3 @@
-import {BeaconConfig} from "@lodestar/config";
 import {DOMAIN_SYNC_COMMITTEE_SELECTION_PROOF} from "@lodestar/params";
 import {
   CachedBeaconStateAllForks,
@@ -10,11 +9,11 @@ import {
 import {altair, ssz} from "@lodestar/types";
 
 export function getSyncCommitteeSelectionProofSignatureSet(
-  config: BeaconConfig,
   index2pubkey: Index2PubkeyCache,
   state: CachedBeaconStateAllForks,
   contributionAndProof: altair.ContributionAndProof
 ): ISignatureSet {
+  const {config} = state;
   const slot = contributionAndProof.contribution.slot;
   const domain = config.getDomain(state.slot, DOMAIN_SYNC_COMMITTEE_SELECTION_PROOF, slot);
   const signingData: altair.SyncAggregatorSelectionData = {

package/src/chain/validation/syncCommittee.ts

@@ -89,7 +89,7 @@ async function validateSyncCommitteeSigOnly(
   syncCommittee: altair.SyncCommitteeMessage,
   prioritizeBls = false
 ): Promise<void> {
-  const signatureSet = getSyncCommitteeSignatureSet(chain.config, chain.index2pubkey, headState, syncCommittee);
+  const signatureSet = getSyncCommitteeSignatureSet(chain.index2pubkey, headState, syncCommittee);
   if (!(await chain.bls.verifySignatureSets([signatureSet], {batchable: true, priority: prioritizeBls}))) {
     throw new SyncCommitteeError(GossipAction.REJECT, {
       code: SyncCommitteeErrorCode.INVALID_SIGNATURE,

package/src/chain/validation/syncCommitteeContributionAndProof.ts

@@ -78,19 +78,14 @@ export async function validateSyncCommitteeGossipContributionAndProof(
   const signatureSets = [
     // [REJECT] The contribution_and_proof.selection_proof is a valid signature of the SyncAggregatorSelectionData
     // derived from the contribution by the validator with index contribution_and_proof.aggregator_index.
-    getSyncCommitteeSelectionProofSignatureSet(chain.config, index2pubkey, headState, contributionAndProof),
+    getSyncCommitteeSelectionProofSignatureSet(index2pubkey, headState, contributionAndProof),
 
     // [REJECT] The aggregator signature, signed_contribution_and_proof.signature, is valid.
-    getContributionAndProofSignatureSet(chain.config, index2pubkey, headState, signedContributionAndProof),
+    getContributionAndProofSignatureSet(index2pubkey, headState, signedContributionAndProof),
 
     // [REJECT] The aggregate signature is valid for the message beacon_block_root and aggregate pubkey derived from
     // the participation info in aggregation_bits for the subcommittee specified by the contribution.subcommittee_index.
-    getSyncCommitteeContributionSignatureSet(
-      chain.config,
-      headState as CachedBeaconStateAltair,
-      contribution,
-      participantPubkeys
-    ),
+    getSyncCommitteeContributionSignatureSet(headState as CachedBeaconStateAltair, contribution, participantPubkeys),
   ];
 
   if (!(await chain.bls.verifySignatureSets(signatureSets, {batchable: true}))) {

package/src/chain/validation/voluntaryExit.ts

@@ -59,7 +59,7 @@ async function validateVoluntaryExit(
     });
   }
 
-  const signatureSet = getVoluntaryExitSignatureSet(chain.config, chain.index2pubkey, state, voluntaryExit);
+  const signatureSet = getVoluntaryExitSignatureSet(chain.index2pubkey, state, voluntaryExit);
   if (!(await chain.bls.verifySignatureSets([signatureSet], {batchable: true, priority: prioritizeBls}))) {
     throw new VoluntaryExitError(GossipAction.REJECT, {
       code: VoluntaryExitErrorCode.INVALID_SIGNATURE,

package/src/db/beacon.ts

@@ -1,6 +1,5 @@
 import {ChainForkConfig} from "@lodestar/config";
-import {Db, LevelDbControllerMetrics, encodeKey} from "@lodestar/db";
-import {Bucket} from "./buckets.js";
+import {Db, LevelDbControllerMetrics} from "@lodestar/db";
 import {IBeaconDb} from "./interface.js";
 import {CheckpointStateRepository} from "./repositories/checkpointState.js";
 import {
@@ -15,12 +14,16 @@ import {
   CheckpointHeaderRepository,
   DataColumnSidecarArchiveRepository,
   DataColumnSidecarRepository,
+  DepositDataRootRepository,
+  DepositEventRepository,
+  Eth1DataRepository,
   ProposerSlashingRepository,
   StateArchiveRepository,
   SyncCommitteeRepository,
   SyncCommitteeWitnessRepository,
   VoluntaryExitRepository,
 } from "./repositories/index.js";
+import {PreGenesisState, PreGenesisStateLastProcessedBlock} from "./single/index.js";
 
 export type BeaconDbModules = {
   config: ChainForkConfig;
@@ -42,8 +45,14 @@ export class BeaconDb implements IBeaconDb {
   voluntaryExit: VoluntaryExitRepository;
   proposerSlashing: ProposerSlashingRepository;
   attesterSlashing: AttesterSlashingRepository;
+  depositEvent: DepositEventRepository;
   blsToExecutionChange: BLSToExecutionChangeRepository;
 
+  depositDataRoot: DepositDataRootRepository;
+  eth1Data: Eth1DataRepository;
+  preGenesisState: PreGenesisState;
+  preGenesisStateLastProcessedBlock: PreGenesisStateLastProcessedBlock;
+
   // lightclient
   bestLightClientUpdate: BestLightClientUpdateRepository;
   checkpointHeader: CheckpointHeaderRepository;
@@ -71,6 +80,11 @@ export class BeaconDb implements IBeaconDb {
     this.blsToExecutionChange = new BLSToExecutionChangeRepository(config, db);
     this.proposerSlashing = new ProposerSlashingRepository(config, db);
     this.attesterSlashing = new AttesterSlashingRepository(config, db);
+    this.depositEvent = new DepositEventRepository(config, db);
+    this.depositDataRoot = new DepositDataRootRepository(config, db);
+    this.eth1Data = new Eth1DataRepository(config, db);
+    this.preGenesisState = new PreGenesisState(config, db);
+    this.preGenesisStateLastProcessedBlock = new PreGenesisStateLastProcessedBlock(config, db);
 
     // lightclient
     this.bestLightClientUpdate = new BestLightClientUpdateRepository(config, db);
@@ -96,40 +110,4 @@ export class BeaconDb implements IBeaconDb {
     // TODO: Enable once it's deemed safe
     // await this.block.batchDelete(await this.block.keys());
   }
-
-  async deleteDeprecatedEth1Data(): Promise<void> {
-    const deprecatedBuckets = [
-      Bucket.phase0_eth1Data,
-      Bucket.index_depositDataRoot,
-      Bucket.phase0_depositData,
-      Bucket.phase0_depositEvent,
-      Bucket.phase0_preGenesisState,
-      Bucket.phase0_preGenesisStateLastProcessedBlock,
-    ];
-
-    for (const bucket of deprecatedBuckets) {
-      await this.deleteBucketData(bucket);
-    }
-  }
-
-  private async deleteBucketData(bucket: Bucket): Promise<void> {
-    const minKey = encodeKey(bucket, Buffer.alloc(0));
-    const maxKey = encodeKey(bucket + 1, Buffer.alloc(0));
-
-    // Batch delete to avoid loading all keys into memory at once
-    const BATCH_DELETE_SIZE = 1000;
-    let keysBatch: Uint8Array[] = [];
-
-    for await (const key of this.db.keysStream({gte: minKey, lt: maxKey})) {
-      keysBatch.push(key);
-      if (keysBatch.length >= BATCH_DELETE_SIZE) {
-        await this.db.batchDelete(keysBatch);
-        keysBatch = [];
-      }
-    }
-
-    if (keysBatch.length > 0) {
-      await this.db.batchDelete(keysBatch);
-    }
-  }
 }

package/src/db/buckets.ts

@@ -16,16 +16,14 @@ export enum Bucket {
   index_mainChain = 6, // Slot -> Root<BeaconBlock>
   // justified, finalized state and block hashes
   index_chainInfo = 7, // Key -> Number64 | stateHash | blockHash
-  /** @deprecated Eth1 deposit tracking is not required since electra, only kept around to delete data from existing databases */
-  phase0_eth1Data = 8,
-  /** @deprecated Eth1 deposit tracking is not required since electra, only kept around to delete data from existing databases */
-  index_depositDataRoot = 9,
+  // eth1 processing
+  phase0_eth1Data = 8, // timestamp -> Eth1Data
+  index_depositDataRoot = 9, // depositIndex -> Root<DepositData>
 
   // op pool
   // phase0_attestation = 10, // DEPRECATED on v0.25.0
   // phase0_aggregateAndProof = 11, // Root -> AggregateAndProof, DEPRECATED on v.27.0
-  /** @deprecated Eth1 deposit tracking is not required since electra, only kept around to delete data from existing databases */
-  phase0_depositData = 12,
+  phase0_depositData = 12, // [DEPRECATED] index -> DepositData
   phase0_exit = 13, // ValidatorIndex -> VoluntaryExit
   phase0_proposerSlashing = 14, // ValidatorIndex -> ProposerSlashing
   allForks_attesterSlashing = 15, // Root -> AttesterSlashing
@@ -34,18 +32,15 @@ export enum Bucket {
   allForks_checkpointState = 17, // Root -> BeaconState
 
   // allForks_pendingBlock = 25, // Root -> SignedBeaconBlock // DEPRECATED on v0.30.0
-  /** @deprecated Eth1 deposit tracking is not required since electra, only kept around to delete data from existing databases */
-  phase0_depositEvent = 19,
+  phase0_depositEvent = 19, // depositIndex -> DepositEvent
 
   index_stateArchiveRootIndex = 26, // State Root -> slot
 
   deneb_blobSidecars = 27, // DENEB BeaconBlockRoot -> BlobSidecars
   deneb_blobSidecarsArchive = 28, // DENEB BeaconBlockSlot -> BlobSidecars
 
-  /** @deprecated Genesis from eth1 is no longer supported, only kept around to delete data from existing databases */
-  phase0_preGenesisState = 30,
-  /** @deprecated Genesis from eth1 is no longer supported, only kept around to delete data from existing databases */
-  phase0_preGenesisStateLastProcessedBlock = 31,
+  phase0_preGenesisState = 30, // Single = phase0.BeaconState
+  phase0_preGenesisStateLastProcessedBlock = 31, // Single = Uint8
 
   // Lightclient server
   // altair_bestUpdatePerCommitteePeriod = 30, // DEPRECATED on v0.32.0

package/src/db/interface.ts

@@ -12,12 +12,16 @@ import {
   CheckpointHeaderRepository,
   DataColumnSidecarArchiveRepository,
   DataColumnSidecarRepository,
+  DepositDataRootRepository,
+  DepositEventRepository,
+  Eth1DataRepository,
   ProposerSlashingRepository,
   StateArchiveRepository,
   SyncCommitteeRepository,
   SyncCommitteeWitnessRepository,
   VoluntaryExitRepository,
 } from "./repositories/index.js";
+import {PreGenesisState, PreGenesisStateLastProcessedBlock} from "./single/index.js";
 
 /**
  * The DB service manages the data layer of the beacon chain
@@ -44,8 +48,17 @@ export interface IBeaconDb {
   voluntaryExit: VoluntaryExitRepository;
   proposerSlashing: ProposerSlashingRepository;
   attesterSlashing: AttesterSlashingRepository;
+  depositEvent: DepositEventRepository;
   blsToExecutionChange: BLSToExecutionChangeRepository;
 
+  // eth1 processing
+  preGenesisState: PreGenesisState;
+  preGenesisStateLastProcessedBlock: PreGenesisStateLastProcessedBlock;
+
+  // all deposit data roots and merkle tree
+  depositDataRoot: DepositDataRootRepository;
+  eth1Data: Eth1DataRepository;
+
   // lightclient
   bestLightClientUpdate: BestLightClientUpdateRepository;
   checkpointHeader: CheckpointHeaderRepository;
@@ -56,8 +69,6 @@ export interface IBeaconDb {
 
   pruneHotDb(): Promise<void>;
 
-  deleteDeprecatedEth1Data(): Promise<void>;
-
   /**  Close the connection to the db instance and close the db store. */
   close(): Promise<void>;
   /** To inject metrics after CLI initialization */

package/src/db/repositories/depositDataRoot.ts

@@ -0,0 +1,80 @@
+import {ByteVectorType, CompositeViewDU, ListCompositeType} from "@chainsafe/ssz";
+import {ChainForkConfig} from "@lodestar/config";
+import {Db, KeyValue, Repository} from "@lodestar/db";
+import {Root, ssz} from "@lodestar/types";
+import {bytesToInt} from "@lodestar/utils";
+import {Bucket, getBucketNameByValue} from "../buckets.js";
+
+// TODO: Review where is best to put this type
+export type DepositTree = CompositeViewDU<ListCompositeType<ByteVectorType>>;
+
+export class DepositDataRootRepository extends Repository<number, Root> {
+  private depositRootTree?: DepositTree;
+
+  constructor(config: ChainForkConfig, db: Db) {
+    const bucket = Bucket.index_depositDataRoot;
+    super(config, db, bucket, ssz.Root, getBucketNameByValue(bucket));
+  }
+
+  decodeKey(data: Buffer): number {
+    return bytesToInt(super.decodeKey(data) as unknown as Uint8Array, "be");
+  }
+
+  // depositDataRoots stored by depositData index
+  getId(_value: Root): number {
+    throw new Error("Unable to create depositIndex from root");
+  }
+
+  async put(index: number, value: Root): Promise<void> {
+    await super.put(index, value);
+    await this.depositRootTreeSet(index, value);
+  }
+
+  async batchPut(items: KeyValue<number, Root>[]): Promise<void> {
+    await super.batchPut(items);
+    for (const {key, value} of items) {
+      await this.depositRootTreeSet(key, value);
+    }
+  }
+
+  async putList(roots: Root[]): Promise<void> {
+    await this.batchPut(roots.map((root, index) => ({key: index, value: root})));
+  }
+
+  async batchPutValues(values: {index: number; root: Root}[]): Promise<void> {
+    await this.batchPut(
+      values.map(({index, root}) => ({
+        key: index,
+        value: root,
+      }))
+    );
+  }
+
+  async getDepositRootTree(): Promise<DepositTree> {
+    if (!this.depositRootTree) {
+      const values = await this.values();
+      this.depositRootTree = ssz.phase0.DepositDataRootList.toViewDU(values);
+    }
+    return this.depositRootTree;
+  }
+
+  async getDepositRootTreeAtIndex(depositIndex: number): Promise<DepositTree> {
+    const depositRootTree = await this.getDepositRootTree();
+    return depositRootTree.sliceTo(depositIndex);
+  }
+
+  private async depositRootTreeSet(index: number, value: Uint8Array): Promise<void> {
+    const depositRootTree = await this.getDepositRootTree();
+
+    // TODO: Review and fix properly
+    if (index > depositRootTree.length) {
+      throw Error(`Error setting depositRootTree index ${index} > length ${depositRootTree.length}`);
+    }
+
+    if (index === depositRootTree.length) {
+      depositRootTree.push(value);
+    } else {
+      depositRootTree.set(index, value);
+    }
+  }
+}

package/src/db/repositories/depositEvent.ts

@@ -0,0 +1,32 @@
+import {ChainForkConfig} from "@lodestar/config";
+import {Db, Repository} from "@lodestar/db";
+import {phase0, ssz} from "@lodestar/types";
+import {Bucket, getBucketNameByValue} from "../buckets.js";
+
+/**
+ * DepositData indexed by deposit index
+ * Removed when included on chain or old
+ */
+export class DepositEventRepository extends Repository<number, phase0.DepositEvent> {
+  constructor(config: ChainForkConfig, db: Db) {
+    const bucket = Bucket.phase0_depositEvent;
+    super(config, db, bucket, ssz.phase0.DepositEvent, getBucketNameByValue(bucket));
+  }
+
+  async deleteOld(depositCount: number): Promise<void> {
+    const firstDepositIndex = await this.firstKey();
+    if (firstDepositIndex === null) {
+      return;
+    }
+    await this.batchDelete(Array.from({length: depositCount - firstDepositIndex}, (_, i) => i + firstDepositIndex));
+  }
+
+  async batchPutValues(depositEvents: phase0.DepositEvent[]): Promise<void> {
+    await this.batchPut(
+      depositEvents.map((depositEvent) => ({
+        key: depositEvent.index,
+        value: depositEvent,
+      }))
+    );
+  }
+}