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

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.39.0-dev.3bf4734ba9",
+  "version": "1.39.0-dev.882891d89c",
   "type": "module",
   "exports": {
     ".": {
@@ -39,11 +39,6 @@
       "types": "./lib/db/index.d.ts",
       "import": "./lib/db/index.js"
     },
-    "./eth1": {
-      "bun": "./src/eth1/index.ts",
-      "types": "./lib/eth1/index.d.ts",
-      "import": "./lib/eth1/index.js"
-    },
     "./metrics": {
       "bun": "./src/metrics/index.ts",
       "types": "./lib/metrics/index.d.ts",
@@ -126,7 +121,6 @@
     "@chainsafe/ssz": "^1.2.2",
     "@chainsafe/threads": "^1.11.3",
     "@crate-crypto/node-eth-kzg": "0.9.1",
-    "@ethersproject/abi": "^5.7.0",
     "@fastify/bearer-auth": "^10.0.1",
     "@fastify/cors": "^10.0.1",
     "@fastify/swagger": "^9.0.0",
@@ -140,18 +134,18 @@
     "@libp2p/peer-id": "^5.1.0",
     "@libp2p/prometheus-metrics": "^4.3.15",
     "@libp2p/tcp": "^10.1.8",
-    "@lodestar/api": "1.39.0-dev.3bf4734ba9",
-    "@lodestar/config": "1.39.0-dev.3bf4734ba9",
-    "@lodestar/db": "1.39.0-dev.3bf4734ba9",
-    "@lodestar/fork-choice": "1.39.0-dev.3bf4734ba9",
-    "@lodestar/light-client": "1.39.0-dev.3bf4734ba9",
-    "@lodestar/logger": "1.39.0-dev.3bf4734ba9",
-    "@lodestar/params": "1.39.0-dev.3bf4734ba9",
-    "@lodestar/reqresp": "1.39.0-dev.3bf4734ba9",
-    "@lodestar/state-transition": "1.39.0-dev.3bf4734ba9",
-    "@lodestar/types": "1.39.0-dev.3bf4734ba9",
-    "@lodestar/utils": "1.39.0-dev.3bf4734ba9",
-    "@lodestar/validator": "1.39.0-dev.3bf4734ba9",
+    "@lodestar/api": "1.39.0-dev.882891d89c",
+    "@lodestar/config": "1.39.0-dev.882891d89c",
+    "@lodestar/db": "1.39.0-dev.882891d89c",
+    "@lodestar/fork-choice": "1.39.0-dev.882891d89c",
+    "@lodestar/light-client": "1.39.0-dev.882891d89c",
+    "@lodestar/logger": "1.39.0-dev.882891d89c",
+    "@lodestar/params": "1.39.0-dev.882891d89c",
+    "@lodestar/reqresp": "1.39.0-dev.882891d89c",
+    "@lodestar/state-transition": "1.39.0-dev.882891d89c",
+    "@lodestar/types": "1.39.0-dev.882891d89c",
+    "@lodestar/utils": "1.39.0-dev.882891d89c",
+    "@lodestar/validator": "1.39.0-dev.882891d89c",
     "@multiformats/multiaddr": "^12.1.3",
     "datastore-core": "^10.0.2",
     "datastore-fs": "^10.0.6",
@@ -186,5 +180,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "890675f6ac97591d1111b6f61ed0e2079f264906"
+  "gitHead": "d61f386f2dfd87549476c464c05867b0d740c366"
 }

package/src/api/impl/beacon/blocks/utils.ts

@@ -5,7 +5,7 @@ import {blockToHeader} from "@lodestar/state-transition";
 import {RootHex, SignedBeaconBlock, Slot} from "@lodestar/types";
 import {IBeaconChain} from "../../../../chain/interface.js";
 import {GENESIS_SLOT} from "../../../../constants/index.js";
-import {rootHexRegex} from "../../../../eth1/provider/utils.js";
+import {rootHexRegex} from "../../../../execution/engine/utils.js";
 import {ApiError, ValidationError} from "../../errors.js";
 
 export function toBeaconHeaderResponse(

package/src/chain/blocks/verifyBlock.ts

@@ -139,6 +139,7 @@ export async function verifyBlocksInEpoch(
       // All signatures at once
       opts.skipVerifyBlockSignatures !== true
         ? verifyBlocksSignatures(
+            this.config,
             this.index2pubkey,
             this.bls,
             this.logger,

package/src/chain/blocks/verifyBlocksSignatures.ts

@@ -1,3 +1,4 @@
+import {BeaconConfig} from "@lodestar/config";
 import {CachedBeaconStateAllForks, Index2PubkeyCache, getBlockSignatureSets} from "@lodestar/state-transition";
 import {IndexedAttestation, SignedBeaconBlock} from "@lodestar/types";
 import {Logger} from "@lodestar/utils";
@@ -15,6 +16,7 @@ import {ImportBlockOpts} from "./types.js";
  * Since all data is known in advance all signatures are verified at once in parallel.
  */
 export async function verifyBlocksSignatures(
+  config: BeaconConfig,
   index2pubkey: Index2PubkeyCache,
   bls: IBlsVerifier,
   logger: Logger,
@@ -39,7 +41,7 @@ export async function verifyBlocksSignatures(
       : //
         // Verify signatures per block to track which block is invalid
         bls.verifySignatureSets(
-          getBlockSignatureSets(index2pubkey, preState0, block, indexedAttestationsByBlock[i], {
+          getBlockSignatureSets(config, index2pubkey, preState0, block, indexedAttestationsByBlock[i], {
             skipProposerSignature: opts.validProposerSignature,
           })
         );

package/src/chain/chain.ts

@@ -43,7 +43,6 @@ import {Logger, fromHex, gweiToWei, isErrorAborted, pruneSetToMax, sleep, toRoot
 import {ProcessShutdownCallback} from "@lodestar/validator";
 import {GENESIS_EPOCH, ZERO_HASH} from "../constants/index.js";
 import {IBeaconDb} from "../db/index.js";
-import {IEth1ForBlockProduction} from "../eth1/index.js";
 import {BuilderStatus} from "../execution/builder/http.js";
 import {IExecutionBuilder, IExecutionEngine} from "../execution/index.js";
 import {Metrics} from "../metrics/index.js";
@@ -117,7 +116,6 @@ const DEFAULT_MAX_CACHED_PRODUCED_RESULTS = 4;
 export class BeaconChain implements IBeaconChain {
   readonly genesisTime: UintNum64;
   readonly genesisValidatorsRoot: Root;
-  readonly eth1: IEth1ForBlockProduction;
   readonly executionEngine: IExecutionEngine;
   readonly executionBuilder?: IExecutionBuilder;
   // Expose config for convenience in modularized functions
@@ -144,7 +142,7 @@ export class BeaconChain implements IBeaconChain {
   readonly aggregatedAttestationPool: AggregatedAttestationPool;
   readonly syncCommitteeMessagePool: SyncCommitteeMessagePool;
   readonly syncContributionAndProofPool;
-  readonly opPool = new OpPool();
+  readonly opPool: OpPool;
 
   // Gossip seen cache
   readonly seenAttesters = new SeenAttesters();
@@ -216,7 +214,6 @@ export class BeaconChain implements IBeaconChain {
       validatorMonitor,
       anchorState,
       isAnchorStateFinalized,
-      eth1,
       executionEngine,
       executionBuilder,
     }: {
@@ -233,7 +230,6 @@ export class BeaconChain implements IBeaconChain {
       validatorMonitor: ValidatorMonitor | null;
       anchorState: BeaconStateAllForks;
       isAnchorStateFinalized: boolean;
-      eth1: IEth1ForBlockProduction;
       executionEngine: IExecutionEngine;
       executionBuilder?: IExecutionBuilder;
     }
@@ -248,7 +244,6 @@ export class BeaconChain implements IBeaconChain {
     this.genesisTime = anchorState.genesisTime;
     this.anchorStateLatestBlockSlot = anchorState.latestBlockHeader.slot;
     this.genesisValidatorsRoot = anchorState.genesisValidatorsRoot;
-    this.eth1 = eth1;
     this.executionEngine = executionEngine;
     this.executionBuilder = executionBuilder;
     const signal = this.abortController.signal;
@@ -265,6 +260,7 @@ export class BeaconChain implements IBeaconChain {
     this.aggregatedAttestationPool = new AggregatedAttestationPool(this.config, metrics);
     this.syncCommitteeMessagePool = new SyncCommitteeMessagePool(config, clock, this.opts?.preaggregateSlotDistance);
     this.syncContributionAndProofPool = new SyncContributionAndProofPool(config, clock, metrics, logger);
+    this.opPool = new OpPool(config);
 
     this.seenAggregatedAttestations = new SeenAggregatedAttestations(metrics);
     this.seenContributionAndProof = new SeenContributionAndProof(metrics);
@@ -294,7 +290,7 @@ export class BeaconChain implements IBeaconChain {
     // Restore state caches
     // anchorState may already by a CachedBeaconState. If so, don't create the cache again, since deserializing all
     // pubkeys takes ~30 seconds for 350k keys (mainnet 2022Q2).
-    // When the BeaconStateCache is created in eth1 genesis builder it may be incorrect. Until we can ensure that
+    // When the BeaconStateCache is created in initializeBeaconStateFromEth1 it may be incorrect. Until we can ensure that
     // it's safe to re-use _ANY_ BeaconStateCache, this option is disabled by default and only used in tests.
     const cachedState =
       isCachedBeaconState(anchorState) && opts.skipCreateStateCacheIfAvailable
@@ -339,6 +335,7 @@ export class BeaconChain implements IBeaconChain {
       this.cpStateDatastore = fileDataStore ? new FileCPStateDatastore(dataDir) : new DbCPStateDatastore(this.db);
       checkpointStateCache = new PersistentCheckpointStateCache(
         {
+          config,
           metrics,
           logger,
           clock,
@@ -417,15 +414,6 @@ export class BeaconChain implements IBeaconChain {
       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)) {
-      const {eth1DepositIndex, depositRequestsStartIndex} = anchorState as BeaconStateElectra;
-      if (eth1DepositIndex === Number(depositRequestsStartIndex)) {
-        this.eth1.stopPollingEth1Data();
-      }
-    }
-
     // always run PrepareNextSlotScheduler except for fork_choice spec tests
     if (!opts?.disablePrepareNextSlot) {
       new PrepareNextSlotScheduler(this, this.config, metrics, this.logger, signal);
@@ -1320,7 +1308,7 @@ export class BeaconChain implements IBeaconChain {
 
     const postState = this.regen.getStateSync(toRootHex(block.stateRoot)) ?? undefined;
 
-    return computeBlockRewards(block, preState.clone(), postState?.clone());
+    return computeBlockRewards(this.config, block, preState.clone(), postState?.clone());
   }
 
   async getAttestationsRewards(
@@ -1344,7 +1332,7 @@ export class BeaconChain implements IBeaconChain {
       throw Error(`State is not in cache for slot ${slot}`);
     }
 
-    const rewards = await computeAttestationsRewards(this.pubkey2index, cachedState, validatorIds);
+    const rewards = await computeAttestationsRewards(this.config, this.pubkey2index, cachedState, validatorIds);
 
     return {rewards, executionOptimistic, finalized};
   }
@@ -1361,6 +1349,6 @@ export class BeaconChain implements IBeaconChain {
 
     preState = processSlots(preState, block.slot); // Dial preState's slot to block.slot
 
-    return computeSyncCommitteeRewards(this.index2pubkey, block, preState.clone(), validatorIds);
+    return computeSyncCommitteeRewards(this.config, this.index2pubkey, block, preState.clone(), validatorIds);
   }
 }

package/src/chain/initState.ts

@@ -1,37 +1,11 @@
 import {ChainForkConfig} from "@lodestar/config";
 import {ZERO_HASH} from "@lodestar/params";
-import {
-  BeaconStateAllForks,
-  CachedBeaconStateAllForks,
-  computeEpochAtSlot,
-  computeStartSlotAtEpoch,
-} from "@lodestar/state-transition";
+import {BeaconStateAllForks, computeEpochAtSlot, computeStartSlotAtEpoch} from "@lodestar/state-transition";
 import {SignedBeaconBlock, ssz} from "@lodestar/types";
 import {Logger, toHex, toRootHex} from "@lodestar/utils";
 import {GENESIS_SLOT} from "../constants/index.js";
 import {IBeaconDb} from "../db/index.js";
-import {Eth1Provider} from "../eth1/index.js";
-import {Eth1Options} from "../eth1/options.js";
 import {Metrics} from "../metrics/index.js";
-import {GenesisBuilder} from "./genesis/genesis.js";
-import {GenesisResult} from "./genesis/interface.js";
-
-export async function persistGenesisResult(
-  db: IBeaconDb,
-  genesisResult: GenesisResult,
-  genesisBlock: SignedBeaconBlock
-): Promise<void> {
-  await Promise.all([
-    db.stateArchive.add(genesisResult.state),
-    db.blockArchive.add(genesisBlock),
-    db.depositDataRoot.putList(genesisResult.depositTree.getAllReadonlyValues()),
-    db.eth1Data.put(genesisResult.block.timestamp, {
-      ...genesisResult.block,
-      depositCount: genesisResult.depositTree.length,
-      depositRoot: genesisResult.depositTree.hashTreeRoot(),
-    }),
-  ]);
-}
 
 export async function persistAnchorState(
   config: ChainForkConfig,
@@ -75,76 +49,6 @@ export function createGenesisBlock(config: ChainForkConfig, genesisState: Beacon
   return genesisBlock;
 }
 
-/**
- * Initialize and persist a genesis state and related data
- */
-export async function initStateFromEth1({
-  config,
-  db,
-  logger,
-  opts,
-  signal,
-}: {
-  config: ChainForkConfig;
-  db: IBeaconDb;
-  logger: Logger;
-  opts: Eth1Options;
-  signal: AbortSignal;
-}): Promise<CachedBeaconStateAllForks> {
-  logger.info("Listening to eth1 for genesis state");
-
-  const statePreGenesis = await db.preGenesisState.get();
-  const depositTree = await db.depositDataRoot.getDepositRootTree();
-  const lastProcessedBlockNumber = await db.preGenesisStateLastProcessedBlock.get();
-
-  const builder = new GenesisBuilder({
-    config,
-    eth1Provider: new Eth1Provider(config, {...opts, logger}, signal),
-    logger,
-    signal,
-    pendingStatus:
-      statePreGenesis && depositTree !== undefined && lastProcessedBlockNumber != null
-        ? {state: statePreGenesis, depositTree, lastProcessedBlockNumber}
-        : undefined,
-  });
-
-  try {
-    const genesisResult = await builder.waitForGenesis();
-
-    // Note: .hashTreeRoot() automatically commits()
-    const genesisBlock = createGenesisBlock(config, genesisResult.state);
-    const types = config.getForkTypes(GENESIS_SLOT);
-    const stateRoot = genesisResult.state.hashTreeRoot();
-    const blockRoot = types.BeaconBlock.hashTreeRoot(genesisBlock.message);
-
-    logger.info("Initializing genesis state", {
-      stateRoot: toRootHex(stateRoot),
-      blockRoot: toRootHex(blockRoot),
-      validatorCount: genesisResult.state.validators.length,
-    });
-
-    await persistGenesisResult(db, genesisResult, genesisBlock);
-
-    logger.verbose("Clearing pending genesis state if any");
-    await db.preGenesisState.delete();
-    await db.preGenesisStateLastProcessedBlock.delete();
-
-    return genesisResult.state;
-  } catch (e) {
-    if (builder.lastProcessedBlockNumber != null) {
-      logger.info("Persisting genesis state", {block: builder.lastProcessedBlockNumber});
-
-      // Commit changed before serializing
-      builder.state.commit();
-
-      await db.preGenesisState.put(builder.state);
-      await db.depositDataRoot.putList(builder.depositTree.getAllReadonlyValues());
-      await db.preGenesisStateLastProcessedBlock.put(builder.lastProcessedBlockNumber);
-    }
-    throw e;
-  }
-}
-
 /**
  * Restore the latest beacon state from db
  */

package/src/chain/interface.ts

@@ -25,7 +25,6 @@ import {
   phase0,
 } from "@lodestar/types";
 import {Logger} from "@lodestar/utils";
-import {IEth1ForBlockProduction} from "../eth1/index.js";
 import {IExecutionBuilder, IExecutionEngine} from "../execution/index.js";
 import {Metrics} from "../metrics/metrics.js";
 import {BufferPool} from "../util/bufferPool.js";
@@ -88,7 +87,6 @@ export interface IBeaconChain {
   readonly genesisTime: UintNum64;
   readonly genesisValidatorsRoot: Root;
   readonly earliestAvailableSlot: Slot;
-  readonly eth1: IEth1ForBlockProduction;
   readonly executionEngine: IExecutionEngine;
   readonly executionBuilder?: IExecutionBuilder;
   // Expose config for convenience in modularized functions

package/src/chain/opPools/aggregatedAttestationPool.ts

@@ -1,6 +1,6 @@
 import {Signature, aggregateSignatures} from "@chainsafe/blst";
 import {BitArray} from "@chainsafe/ssz";
-import {ChainForkConfig} from "@lodestar/config";
+import {BeaconConfig} from "@lodestar/config";
 import {IForkChoice} from "@lodestar/fork-choice";
 import {
   ForkName,
@@ -162,7 +162,7 @@ export class AggregatedAttestationPool {
   private lowestPermissibleSlot = 0;
 
   constructor(
-    private readonly config: ChainForkConfig,
+    private readonly config: BeaconConfig,
     private readonly metrics: Metrics | null = null
   ) {
     metrics?.opPool.aggregatedAttestationPool.attDataPerSlot.addCollect(() => this.onScrapeMetrics(metrics));
@@ -249,7 +249,7 @@ export class AggregatedAttestationPool {
     const stateEpoch = state.epochCtx.epoch;
     const statePrevEpoch = stateEpoch - 1;
 
-    const notSeenValidatorsFn = getNotSeenValidatorsFn(state);
+    const notSeenValidatorsFn = getNotSeenValidatorsFn(this.config, state);
     const validateAttestationDataFn = getValidateAttestationDataFn(forkChoice, state);
 
     const attestationsByScore: AttestationWithScore[] = [];
@@ -362,7 +362,7 @@ export class AggregatedAttestationPool {
     const statePrevEpoch = stateEpoch - 1;
     const rootCache = new RootCache(state);
 
-    const notSeenValidatorsFn = getNotSeenValidatorsFn(state);
+    const notSeenValidatorsFn = getNotSeenValidatorsFn(this.config, state);
     const validateAttestationDataFn = getValidateAttestationDataFn(forkChoice, state);
 
     const slots = Array.from(this.attestationGroupByIndexByDataHexBySlot.keys()).sort((a, b) => b - a);
@@ -656,7 +656,7 @@ export class MatchingDataAttestationGroup {
   private readonly attestations: AttestationWithIndex[] = [];
 
   constructor(
-    private readonly config: ChainForkConfig,
+    private readonly config: BeaconConfig,
     readonly committee: Uint32Array,
     readonly data: phase0.AttestationData
   ) {}
@@ -864,9 +864,9 @@ export function aggregateConsolidation({byCommittee, attData}: AttestationsConso
  * Pre-compute participation from a CachedBeaconStateAllForks, for use to check if an attestation's committee
  * has already attested or not.
  */
-export function getNotSeenValidatorsFn(state: CachedBeaconStateAllForks): GetNotSeenValidatorsFn {
+export function getNotSeenValidatorsFn(config: BeaconConfig, state: CachedBeaconStateAllForks): GetNotSeenValidatorsFn {
   const stateSlot = state.slot;
-  if (state.config.getForkName(stateSlot) === ForkName.phase0) {
+  if (config.getForkName(stateSlot) === ForkName.phase0) {
     // Get attestations to be included in a phase0 block.
     // As we are close to altair, this is not really important, it's mainly for e2e.
     // The performance is not great due to the different BeaconState data structure to altair.

package/src/chain/opPools/opPool.ts

@@ -1,3 +1,4 @@
+import {BeaconConfig} from "@lodestar/config";
 import {Id, Repository} from "@lodestar/db";
 import {
   BLS_WITHDRAWAL_PREFIX,
@@ -51,6 +52,8 @@ export class OpPool {
   /** Map of validator index -> SignedBLSToExecutionChange */
   private readonly blsToExecutionChanges = new Map<ValidatorIndex, SignedBLSToExecutionChangeVersioned>();
 
+  constructor(private readonly config: BeaconConfig) {}
+
   // Getters for metrics
 
   get attesterSlashingsSize(): number {
@@ -191,9 +194,8 @@ export class OpPool {
     phase0.SignedVoluntaryExit[],
     capella.SignedBLSToExecutionChange[],
   ] {
-    const {config} = state;
     const stateEpoch = computeEpochAtSlot(state.slot);
-    const stateFork = config.getForkSeq(state.slot);
+    const stateFork = this.config.getForkSeq(state.slot);
     const toBeSlashedIndices = new Set<ValidatorIndex>();
     const proposerSlashings: phase0.ProposerSlashing[] = [];
 
@@ -265,7 +267,7 @@ export class OpPool {
         // a future fork.
         isVoluntaryExitSignatureIncludable(
           stateFork,
-          config.getForkSeq(computeStartSlotAtEpoch(voluntaryExit.message.epoch))
+          this.config.getForkSeq(computeStartSlotAtEpoch(voluntaryExit.message.epoch))
         )
       ) {
         voluntaryExits.push(voluntaryExit);
@@ -368,14 +370,13 @@ export class OpPool {
    * Prune if validator has already exited at or before the finalized checkpoint of the head.
    */
   private pruneVoluntaryExits(headState: CachedBeaconStateAllForks): void {
-    const {config} = headState;
-    const headStateFork = config.getForkSeq(headState.slot);
+    const headStateFork = this.config.getForkSeq(headState.slot);
     const finalizedEpoch = headState.finalizedCheckpoint.epoch;
 
     for (const [key, voluntaryExit] of this.voluntaryExits.entries()) {
       // VoluntaryExit messages signed in the previous fork become invalid and can never be included in any future
       // block, so just drop as the head state advances into the next fork.
-      if (config.getForkSeq(computeStartSlotAtEpoch(voluntaryExit.message.epoch)) < headStateFork) {
+      if (this.config.getForkSeq(computeStartSlotAtEpoch(voluntaryExit.message.epoch)) < headStateFork) {
         this.voluntaryExits.delete(key);
       }
 
@@ -392,9 +393,8 @@ export class OpPool {
    * to opPool once gossipsub seen cache TTL passes.
    */
   private pruneBlsToExecutionChanges(headBlock: SignedBeaconBlock, headState: CachedBeaconStateAllForks): void {
-    const {config} = headState;
     const recentBlsToExecutionChanges =
-      config.getForkSeq(headBlock.message.slot) >= ForkSeq.capella
+      this.config.getForkSeq(headBlock.message.slot) >= ForkSeq.capella
         ? (headBlock as capella.SignedBeaconBlock).message.body.blsToExecutionChanges
         : [];
 

package/src/chain/prepareNextSlot.ts

@@ -1,9 +1,8 @@
 import {routes} from "@lodestar/api";
 import {ChainForkConfig} from "@lodestar/config";
 import {getSafeExecutionBlockHash} from "@lodestar/fork-choice";
-import {ForkPostBellatrix, ForkSeq, SLOTS_PER_EPOCH, isForkPostElectra} from "@lodestar/params";
+import {ForkPostBellatrix, ForkSeq, SLOTS_PER_EPOCH} from "@lodestar/params";
 import {
-  BeaconStateElectra,
   CachedBeaconStateAllForks,
   CachedBeaconStateExecutions,
   StateHashTreeRootSource,
@@ -222,9 +221,6 @@ export class PrepareNextSlotScheduler {
         }
         this.metrics?.precomputeNextEpochTransition.hits.set(previousHits ?? 0);
 
-        // Check if we can stop polling eth1 data
-        this.stopEth1Polling();
-
         this.logger.verbose("Completed PrepareNextSlotScheduler epoch transition", {
           nextEpoch,
           headSlot,
@@ -252,27 +248,4 @@ export class PrepareNextSlotScheduler {
     state.hashTreeRoot();
     hashTreeRootTimer?.();
   }
-
-  /**
-   * Stop eth1 data polling after eth1_deposit_index has reached deposit_requests_start_index in Electra as described in EIP-6110
-   */
-  stopEth1Polling(): void {
-    // Only continue if eth1 is still polling and finalized checkpoint is in Electra. State regen is expensive
-    if (this.chain.eth1.isPollingEth1Data()) {
-      const finalizedCheckpoint = this.chain.forkChoice.getFinalizedCheckpoint();
-      const checkpointFork = this.config.getForkInfoAtEpoch(finalizedCheckpoint.epoch).name;
-
-      if (isForkPostElectra(checkpointFork)) {
-        const finalizedState = this.chain.getStateByCheckpoint(finalizedCheckpoint)?.state;
-
-        if (
-          finalizedState !== undefined &&
-          finalizedState.eth1DepositIndex === Number((finalizedState as BeaconStateElectra).depositRequestsStartIndex)
-        ) {
-          // Signal eth1 to stop polling eth1Data
-          this.chain.eth1.stopPollingEth1Data();
-        }
-      }
-    }
-  }
 }

package/src/chain/produceBlock/produceBlockBody.ts

@@ -45,7 +45,7 @@ import {
 } from "@lodestar/types";
 import {Logger, sleep, toHex, toPubkeyHex, toRootHex} from "@lodestar/utils";
 import {ZERO_HASH_HEX} from "../../constants/index.js";
-import {numToQuantity} from "../../eth1/provider/utils.js";
+import {numToQuantity} from "../../execution/engine/utils.js";
 import {
   IExecutionBuilder,
   IExecutionEngine,
@@ -78,7 +78,6 @@ export enum BlockProductionStep {
   voluntaryExits = "voluntaryExits",
   blsToExecutionChanges = "blsToExecutionChanges",
   attestations = "attestations",
-  eth1DataAndDeposits = "eth1DataAndDeposits",
   syncAggregate = "syncAggregate",
   executionPayload = "executionPayload",
 }
@@ -166,7 +165,7 @@ export async function produceBlockBody<T extends BlockType>(
   // even though shouldOverrideBuilder is relevant for the engine response, for simplicity of typing
   // we just return it undefined for the builder which anyway doesn't get consumed downstream
   let shouldOverrideBuilder: boolean | undefined;
-  const fork = currentState.config.getForkName(blockSlot);
+  const fork = this.config.getForkName(blockSlot);
   const produceResult = {
     type: blockType,
     fork,
@@ -645,7 +644,7 @@ export async function produceCommonBlockBody<T extends BlockType>(
       ? this.metrics?.executionBlockProductionTimeSteps
       : this.metrics?.builderBlockProductionTimeSteps;
 
-  const fork = currentState.config.getForkName(slot);
+  const fork = this.config.getForkName(slot);
 
   // TODO:
   // Iterate through the naive aggregation pool and ensure all the attestations from there
@@ -667,20 +666,17 @@ export async function produceCommonBlockBody<T extends BlockType>(
     step: BlockProductionStep.attestations,
   });
 
-  const endEth1DataAndDeposits = stepsMetrics?.startTimer();
-  const {eth1Data, deposits} = await this.eth1.getEth1DataAndDeposits(currentState);
-  endEth1DataAndDeposits?.({
-    step: BlockProductionStep.eth1DataAndDeposits,
-  });
-
   const blockBody: Omit<CommonBlockBody, "blsToExecutionChanges" | "syncAggregate"> = {
     randaoReveal,
     graffiti,
-    eth1Data,
+    // Eth1 data voting is no longer required since electra
+    eth1Data: currentState.eth1Data,
     proposerSlashings,
     attesterSlashings,
     attestations,
-    deposits,
+    // Since electra, deposits are processed by the execution layer,
+    // we no longer support handling deposits from earlier forks.
+    deposits: [],
     voluntaryExits,
   };
 

package/src/chain/rewards/attestationsRewards.ts

@@ -1,5 +1,6 @@
 import {PubkeyIndexMap} from "@chainsafe/pubkey-index-map";
 import {routes} from "@lodestar/api";
+import {BeaconConfig} from "@lodestar/config";
 import {
   EFFECTIVE_BALANCE_INCREMENT,
   ForkName,
@@ -38,11 +39,12 @@ 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 = state.config.getForkName(state.slot);
+  const fork = config.getForkName(state.slot);
   if (fork === ForkName.phase0) {
     throw Error("Unsupported fork. Attestations rewards calculation is not available in phase0");
   }
@@ -50,8 +52,13 @@ export async function computeAttestationsRewards(
   const stateAltair = state as CachedBeaconStateAltair;
   const transitionCache = beforeProcessEpoch(stateAltair);
 
-  const [idealRewards, penalties] = computeIdealAttestationsRewardsAndPenaltiesAltair(stateAltair, transitionCache);
+  const [idealRewards, penalties] = computeIdealAttestationsRewardsAndPenaltiesAltair(
+    config,
+    stateAltair,
+    transitionCache
+  );
   const totalRewards = computeTotalAttestationsRewardsAltair(
+    config,
     pubkey2index,
     stateAltair,
     transitionCache,
@@ -64,12 +71,13 @@ export async function computeAttestationsRewards(
 }
 
 function computeIdealAttestationsRewardsAndPenaltiesAltair(
+  config: BeaconConfig,
   state: CachedBeaconStateAllForks,
   transitionCache: EpochTransitionCache
 ): [IdealAttestationsReward[], AttestationsPenalty[]] {
   const baseRewardPerIncrement = transitionCache.baseRewardPerIncrement;
   const activeBalanceByIncrement = transitionCache.totalActiveStakeByIncrement;
-  const fork = state.config.getForkName(state.slot);
+  const fork = config.getForkName(state.slot);
   const maxEffectiveBalance = isForkPostElectra(fork) ? MAX_EFFECTIVE_BALANCE_ELECTRA : MAX_EFFECTIVE_BALANCE;
   const maxEffectiveBalanceByIncrement = Math.floor(maxEffectiveBalance / EFFECTIVE_BALANCE_INCREMENT);
 
@@ -139,6 +147,7 @@ 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,
@@ -148,7 +157,7 @@ function computeTotalAttestationsRewardsAltair(
 ): TotalAttestationsReward[] {
   const rewards = [];
   const {flags} = transitionCache;
-  const {epochCtx, config} = state;
+  const {epochCtx} = 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