@lodestar/beacon-node 1.39.0-dev.84b481ddb5 → 1.39.0-dev.aceb5b7416

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 {
@@ -96,40 +95,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,13 @@ 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,
+  // phase0_eth1Data = 8, // DEPRECATED - eth1 deposit tracking is not required since electra
+  // index_depositDataRoot = 9, // DEPRECATED - eth1 deposit tracking is not required since electra
 
   // 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 - eth1 deposit tracking is not required since electra
   phase0_exit = 13, // ValidatorIndex -> VoluntaryExit
   phase0_proposerSlashing = 14, // ValidatorIndex -> ProposerSlashing
   allForks_attesterSlashing = 15, // Root -> AttesterSlashing
@@ -34,18 +31,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, // DEPRECATED - eth1 deposit tracking is not required since electra
 
   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, // DEPRECATED - genesis from eth1 is no longer supported
+  // phase0_preGenesisStateLastProcessedBlock = 31, // DEPRECATED - genesis from eth1 is no longer supported
 
   // Lightclient server
   // altair_bestUpdatePerCommitteePeriod = 30, // DEPRECATED on v0.32.0

package/src/db/interface.ts

@@ -56,8 +56,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/node/nodejs.ts

@@ -197,17 +197,6 @@ export class BeaconNode {
     // TODO: Should this call be awaited?
     await db.pruneHotDb();
 
-    // Delete deprecated eth1 data to free up disk space for users
-    logger.debug("Deleting deprecated eth1 data from database");
-    const startTime = Date.now();
-    db.deleteDeprecatedEth1Data()
-      .then(() => {
-        logger.debug("Deleted deprecated eth1 data", {durationMs: Date.now() - startTime});
-      })
-      .catch((e) => {
-        logger.error("Failed to delete deprecated eth1 data", {}, e);
-      });
-
     const monitoring = opts.monitoring.endpoint
       ? new MonitoringService(
           "beacon",

package/src/node/notifier.ts

@@ -6,7 +6,6 @@ import {
   computeEpochAtSlot,
   computeStartSlotAtEpoch,
   isExecutionCachedStateType,
-  isMergeTransitionComplete,
 } from "@lodestar/state-transition";
 import {Epoch} from "@lodestar/types";
 import {ErrorAborted, Logger, prettyBytes, prettyBytesShort, sleep} from "@lodestar/utils";
@@ -172,18 +171,13 @@ function getHeadExecutionInfo(
 
   // Add execution status to notifier only if head is on/post bellatrix
   if (isExecutionCachedStateType(headState)) {
-    if (isMergeTransitionComplete(headState)) {
-      const executionPayloadHashInfo =
-        headInfo.executionStatus !== ExecutionStatus.PreMerge ? headInfo.executionPayloadBlockHash : "empty";
-      const executionPayloadNumberInfo =
-        headInfo.executionStatus !== ExecutionStatus.PreMerge ? headInfo.executionPayloadNumber : NaN;
-      return [
-        `exec-block: ${executionStatusStr}(${executionPayloadNumberInfo} ${prettyBytesShort(
-          executionPayloadHashInfo
-        )})`,
-      ];
-    }
-    return [`exec-block: ${executionStatusStr}`];
+    const executionPayloadHashInfo =
+      headInfo.executionStatus !== ExecutionStatus.PreMerge ? headInfo.executionPayloadBlockHash : "empty";
+    const executionPayloadNumberInfo =
+      headInfo.executionStatus !== ExecutionStatus.PreMerge ? headInfo.executionPayloadNumber : NaN;
+    return [
+      `exec-block: ${executionStatusStr}(${executionPayloadNumberInfo} ${prettyBytesShort(executionPayloadHashInfo)})`,
+    ];
   }
 
   return [];

package/src/sync/backfill/backfill.ts

@@ -750,13 +750,9 @@ export class BackfillSync extends (EventEmitter as {new (): BackfillSyncEmitter}
 
     // GENESIS_SLOT doesn't has valid signature
     if (anchorBlock.message.slot === GENESIS_SLOT) return;
-    await verifyBlockProposerSignature(
-      this.chain.config,
-      this.chain.index2pubkey,
-      this.chain.bls,
-      this.chain.getHeadState(),
-      [anchorBlock]
-    );
+    await verifyBlockProposerSignature(this.chain.index2pubkey, this.chain.bls, this.chain.getHeadState(), [
+      anchorBlock,
+    ]);
 
     // We can write to the disk if this is ahead of prevFinalizedCheckpointBlock otherwise
     // we will need to go make checks on the top of sync loop before writing as it might
@@ -822,7 +818,6 @@ export class BackfillSync extends (EventEmitter as {new (): BackfillSyncEmitter}
     // If any of the block's proposer signature fail, we can't trust this peer at all
     if (verifiedBlocks.length > 0) {
       await verifyBlockProposerSignature(
-        this.chain.config,
         this.chain.index2pubkey,
         this.chain.bls,
         this.chain.getHeadState(),

package/src/sync/backfill/verify.ts

@@ -46,7 +46,6 @@ export function verifyBlockSequence(
 }
 
 export async function verifyBlockProposerSignature(
-  config: BeaconConfig,
   index2pubkey: Index2PubkeyCache,
   bls: IBlsVerifier,
   state: CachedBeaconStateAllForks,
@@ -55,8 +54,7 @@ export async function verifyBlockProposerSignature(
   if (blocks.length === 1 && blocks[0].message.slot === GENESIS_SLOT) return;
   const signatures = blocks.reduce((sigs: ISignatureSet[], block) => {
     // genesis block doesn't have valid signature
-    if (block.message.slot !== GENESIS_SLOT)
-      sigs.push(getBlockProposerSignatureSet(config, index2pubkey, state, block));
+    if (block.message.slot !== GENESIS_SLOT) sigs.push(getBlockProposerSignatureSet(index2pubkey, state, block));
     return sigs;
   }, []);