rebaseing to the refactored prepare beacon proposer

Author: g11tech

packages/lodestar/src/chain/beaconProposerCache.ts

@@ -31,7 +31,11 @@ export class BeaconProposerCache {
     }
   }
 
-  get(proposerIndex: number | string): string {
+  getOrDefault(proposerIndex: number | string): string {
     return this.feeRecipientByValidatorIndex.getOrDefault(`${proposerIndex}`).feeRecipient;
   }
+
+  get(proposerIndex: number | string): string | undefined {
+    return this.feeRecipientByValidatorIndex.get(`${proposerIndex}`)?.feeRecipient;
+  }
 }

packages/lodestar/src/chain/blocks/importBlock.ts

@@ -8,6 +8,7 @@ import {
   getEffectiveBalanceIncrementsZeroInactive,
   altair,
   computeEpochAtSlot,
+  bellatrix,
   allForks,
 } from "@chainsafe/lodestar-beacon-state-transition";
 import {IForkChoice, OnBlockPrecachedData, ForkChoiceError, ForkChoiceErrorCode} from "@chainsafe/lodestar-fork-choice";
@@ -26,7 +27,8 @@ import {PendingEvents} from "./utils/pendingEvents";
 import {FullyVerifiedBlock} from "./types";
 import {SeenAggregatedAttestations} from "../seenCache/seenAggregateAndProof";
 import {prepareExecutionPayload} from "../factory/block/body";
-
+import {IEth1ForBlockProduction} from "../../eth1";
+import {BeaconProposerCache} from "../beaconProposerCache";
 /**
  * Fork-choice allows to import attestations from current (0) or past (1) epoch.
  */
@@ -38,7 +40,9 @@ export type ImportBlockModules = {
   stateCache: StateContextCache;
   checkpointStateCache: CheckpointStateCache;
   seenAggregatedAttestations: SeenAggregatedAttestations;
+  beaconProposerCache: BeaconProposerCache;
   lightClientServer: LightClientServer;
+  eth1: IEth1ForBlockProduction;
   executionEngine: IExecutionEngine;
   emitter: ChainEventEmitter;
   config: IChainForkConfig;
@@ -270,7 +274,7 @@ export async function issueNextProposerEngineFcU(
   if (bellatrix.isBellatrixStateType(prepareState)) {
     try {
       const proposerIndex = prepareState.epochCtx.getBeaconProposer(prepareSlot);
-      const feeRecipient = chain.executionEngine.proposers.get(proposerIndex)?.feeRecipient;
+      const feeRecipient = chain.beaconProposerCache.get(proposerIndex);
       if (feeRecipient) {
         const finalizedBlockHash = chain.forkChoice.getFinalizedBlock().executionPayloadBlockHash ?? ZERO_HASH_HEX;
         return prepareExecutionPayload(chain, finalizedBlockHash, prepareState, feeRecipient);

packages/lodestar/src/chain/chain.ts

@@ -199,6 +199,7 @@ export class BeaconChain implements IBeaconChain {
         stateCache,
         checkpointStateCache,
         seenAggregatedAttestations: this.seenAggregatedAttestations,
+        beaconProposerCache: this.beaconProposerCache,
         emitter,
         config,
         logger,

packages/lodestar/src/chain/factory/block/body.ts

@@ -93,7 +93,7 @@ export async function assembleBody(
     // - Call prepareExecutionPayload again if parameters change
 
     const finalizedBlockHash = chain.forkChoice.getFinalizedBlock().executionPayloadBlockHash;
-    const feeRecipient = chain.beaconProposerCache.get(proposerIndex);
+    const feeRecipient = chain.beaconProposerCache.getOrDefault(proposerIndex);
 
     // prepareExecutionPayload will throw error via notifyForkchoiceUpdate if
     // the EL returns Syncing on this request to prepare a payload