feat: proposer boost reorg

packages/api/src/beacon/routes/debug.ts

@@ -34,6 +34,7 @@ const protoNodeSszType = new ContainerType(
     parentRoot: stringType,
     stateRoot: stringType,
     targetRoot: stringType,
+    timeliness: ssz.Boolean,
     justifiedEpoch: ssz.Epoch,
     justifiedRoot: stringType,
     finalizedEpoch: ssz.Epoch,

packages/api/test/unit/beacon/testData/debug.ts

@@ -40,6 +40,7 @@ export const testData: GenericServerTestCases<Api> = {
           weight: 1,
           bestChild: "1",
           bestDescendant: "1",
+          timeliness: false,
         },
       ],
     },

packages/beacon-node/src/api/impl/validator/index.ts

@@ -34,7 +34,7 @@ import {
   isBlockContents,
   phase0,
 } from "@lodestar/types";
-import {ExecutionStatus} from "@lodestar/fork-choice";
+import {ExecutionStatus, UpdateHeadOpt} from "@lodestar/fork-choice";
 import {toHex, racePromisesWithCutoff, RaceEvent, gweiToWei} from "@lodestar/utils";
 import {AttestationError, AttestationErrorCode, GossipAction, SyncCommitteeError} from "../../../chain/errors/index.js";
 import {validateApiAggregateAndProof} from "../../../chain/validation/index.js";
@@ -317,7 +317,7 @@ export function getValidatorApi({
       // forkChoice.updateTime() might have already been called by the onSlot clock
       // handler, in which case this should just return.
       chain.forkChoice.updateTime(slot);
-      chain.recomputeForkChoiceHead();
+      chain.recomputeForkChoiceHead(UpdateHeadOpt.GetProposerHead, slot);
     }
 
     let timer;
@@ -374,7 +374,7 @@ export function getValidatorApi({
       // forkChoice.updateTime() might have already been called by the onSlot clock
       // handler, in which case this should just return.
       chain.forkChoice.updateTime(slot);
-      chain.recomputeForkChoiceHead();
+      chain.recomputeForkChoiceHead(UpdateHeadOpt.GetProposerHead, slot);
     }
 
     let timer;
@@ -449,7 +449,7 @@ export function getValidatorApi({
       // forkChoice.updateTime() might have already been called by the onSlot clock
       // handler, in which case this should just return.
       chain.forkChoice.updateTime(slot);
-      chain.recomputeForkChoiceHead();
+      chain.recomputeForkChoiceHead(UpdateHeadOpt.GetProposerHead, slot);
 
       const fork = config.getForkName(slot);
       // set some sensible opts

packages/beacon-node/src/chain/blocks/importBlock.ts

@@ -9,7 +9,13 @@ import {
   RootCache,
 } from "@lodestar/state-transition";
 import {routes} from "@lodestar/api";
-import {ForkChoiceError, ForkChoiceErrorCode, EpochDifference, AncestorStatus} from "@lodestar/fork-choice";
+import {
+  ForkChoiceError,
+  ForkChoiceErrorCode,
+  EpochDifference,
+  AncestorStatus,
+  UpdateHeadOpt,
+} from "@lodestar/fork-choice";
 import {isErrorAborted} from "@lodestar/utils";
 import {ZERO_HASH_HEX} from "../../constants/index.js";
 import {toCheckpointHex} from "../stateCache/index.js";
@@ -221,8 +227,12 @@ export async function importBlock(
 
   // 5. Compute head. If new head, immediately stateCache.setHeadState()
 
+  const {proposerIndex, slot} = block.message;
+  const useProposerHead = this.beaconProposerCache.get(proposerIndex) !== undefined; // If the block is proposed by us, we calculate newHead using GetProposerHead, else GetCanonicialHead
   const oldHead = this.forkChoice.getHead();
-  const newHead = this.recomputeForkChoiceHead();
+  const newHead = useProposerHead
+    ? this.recomputeForkChoiceHead(UpdateHeadOpt.GetPredictedProposerHead, slot)
+    : this.recomputeForkChoiceHead();
   const currFinalizedEpoch = this.forkChoice.getFinalizedCheckpoint().epoch;
 
   if (newHead.blockRoot !== oldHead.blockRoot) {

packages/beacon-node/src/chain/chain.ts

@@ -29,7 +29,7 @@ import {
   isBlindedBeaconBlock,
   Gwei,
 } from "@lodestar/types";
-import {CheckpointWithHex, ExecutionStatus, IForkChoice, ProtoBlock} from "@lodestar/fork-choice";
+import {CheckpointWithHex, ExecutionStatus, IForkChoice, ProtoBlock, UpdateHeadOpt} from "@lodestar/fork-choice";
 import {ProcessShutdownCallback} from "@lodestar/validator";
 import {Logger, isErrorAborted, pruneSetToMax, sleep, toHex} from "@lodestar/utils";
 import {ForkSeq, SLOTS_PER_EPOCH} from "@lodestar/params";
@@ -252,7 +252,8 @@ export class BeaconChain implements IBeaconChain {
       clock.currentSlot,
       cachedState,
       opts,
-      this.justifiedBalancesGetter.bind(this)
+      this.justifiedBalancesGetter.bind(this),
+      logger
     );
     const regen = new QueuedStateRegenerator({
       config,
@@ -642,12 +643,12 @@ export class BeaconChain implements IBeaconChain {
     };
   }
 
-  recomputeForkChoiceHead(): ProtoBlock {
+  recomputeForkChoiceHead(mode: UpdateHeadOpt = UpdateHeadOpt.GetCanonicialHead, slot?: Slot): ProtoBlock {
     this.metrics?.forkChoice.requests.inc();
     const timer = this.metrics?.forkChoice.findHead.startTimer();
 
     try {
-      return this.forkChoice.updateHead();
+      return this.forkChoice.updateAndGetHead(mode, slot);
     } catch (e) {
       this.metrics?.forkChoice.errors.inc();
       throw e;

packages/beacon-node/src/chain/forkChoice/index.ts

@@ -16,6 +16,7 @@ import {
   isMergeTransitionComplete,
 } from "@lodestar/state-transition";
 
+import {Logger} from "@lodestar/utils";
 import {computeAnchorCheckpoint} from "../initState.js";
 import {ChainEventEmitter} from "../emitter.js";
 import {ChainEvent} from "../emitter.js";
@@ -32,7 +33,8 @@ export function initializeForkChoice(
   currentSlot: Slot,
   state: CachedBeaconStateAllForks,
   opts: ForkChoiceOpts,
-  justifiedBalancesGetter: JustifiedBalancesGetter
+  justifiedBalancesGetter: JustifiedBalancesGetter,
+  logger?: Logger
 ): ForkChoice {
   const {blockHeader, checkpoint} = computeAnchorCheckpoint(config, state);
   const finalizedCheckpoint = {...checkpoint};
@@ -68,6 +70,7 @@ export function initializeForkChoice(
         parentRoot: toHexString(blockHeader.parentRoot),
         stateRoot: toHexString(blockHeader.stateRoot),
         blockRoot: toHexString(checkpoint.root),
+        timeliness: true, // Optimisitcally assume is timely
 
         justifiedEpoch: justifiedCheckpoint.epoch,
         justifiedRoot: toHexString(justifiedCheckpoint.root),
@@ -89,6 +92,7 @@ export function initializeForkChoice(
       currentSlot
     ),
 
+    logger,
     opts
   );
 }

packages/beacon-node/src/chain/interface.ts

@@ -24,7 +24,7 @@ import {
 import {BeaconConfig} from "@lodestar/config";
 import {Logger} from "@lodestar/utils";
 
-import {IForkChoice, ProtoBlock} from "@lodestar/fork-choice";
+import {IForkChoice, ProtoBlock, UpdateHeadOpt} from "@lodestar/fork-choice";
 import {IEth1ForBlockProduction} from "../eth1/index.js";
 import {IExecutionEngine, IExecutionBuilder} from "../execution/index.js";
 import {Metrics} from "../metrics/metrics.js";
@@ -176,7 +176,7 @@ export interface IBeaconChain {
 
   getStatus(): phase0.Status;
 
-  recomputeForkChoiceHead(): ProtoBlock;
+  recomputeForkChoiceHead(mode?: UpdateHeadOpt, slot?: Slot): ProtoBlock;
 
   waitForBlock(slot: Slot, root: RootHex): Promise<boolean>;
 

packages/beacon-node/src/chain/options.ts

@@ -88,6 +88,7 @@ export const defaultChainOptions: IChainOptions = {
   blsVerifyAllMultiThread: false,
   disableBlsBatchVerify: false,
   proposerBoostEnabled: true,
+  proposerBoostReorgEnabled: true,
   computeUnrealized: true,
   safeSlotsToImportOptimistically: SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY,
   suggestedFeeRecipient: defaultValidatorOptions.suggestedFeeRecipient,

packages/beacon-node/src/chain/prepareNextSlot.ts

@@ -2,13 +2,15 @@ import {
   computeEpochAtSlot,
   isExecutionStateType,
   computeTimeAtSlot,
+  CachedBeaconStateExecutions,
   StateHashTreeRootSource,
 } from "@lodestar/state-transition";
 import {ChainForkConfig} from "@lodestar/config";
 import {ForkSeq, SLOTS_PER_EPOCH, ForkExecution} from "@lodestar/params";
 import {Slot} from "@lodestar/types";
 import {Logger, sleep, fromHex, isErrorAborted} from "@lodestar/utils";
 import {routes} from "@lodestar/api";
+import {UpdateHeadOpt} from "@lodestar/fork-choice";
 import {GENESIS_SLOT, ZERO_HASH_HEX} from "../constants/constants.js";
 import {Metrics} from "../metrics/index.js";
 import {ClockEvent} from "../util/clock.js";
@@ -143,7 +145,29 @@ export class PrepareNextSlotScheduler {
       if (isExecutionStateType(prepareState)) {
         const proposerIndex = prepareState.epochCtx.getBeaconProposer(prepareSlot);
         const feeRecipient = this.chain.beaconProposerCache.get(proposerIndex);
+        let updatedPrepareState = prepareState;
+
         if (feeRecipient) {
+          // If we are proposing next slot, we need to predict if we can proposer-boost-reorg or not
+          const {slot: proposerHeadSlot, blockRoot: proposerHeadRoot} = this.chain.recomputeForkChoiceHead(
+            UpdateHeadOpt.GetPredictedProposerHead,
+            clockSlot
+          );
+
+          // If we predict we can reorg, update prepareState with proposer head block
+          if (proposerHeadRoot !== headRoot || proposerHeadSlot !== headSlot) {
+            this.logger.verbose("Weak head detected. May build on this block instead:", {
+              proposerHeadSlot,
+              proposerHeadRoot,
+            });
+            updatedPrepareState = (await this.chain.regen.getBlockSlotState(
+              proposerHeadRoot,
+              prepareSlot,
+              {dontTransferCache: !isEpochTransition},
+              RegenCaller.precomputeEpoch
+            )) as CachedBeaconStateExecutions;
+          }
+
           // Update the builder status, if enabled shoot an api call to check status
           this.chain.updateBuilderStatus(clockSlot);
           if (this.chain.executionBuilder?.status) {
@@ -169,7 +193,7 @@ export class PrepareNextSlotScheduler {
             fromHex(headRoot),
             safeBlockHash,
             finalizedBlockHash,
-            prepareState,
+            updatedPrepareState,
             feeRecipient
           );
           this.logger.verbose("PrepareNextSlotScheduler prepared new payload", {
@@ -182,7 +206,7 @@ export class PrepareNextSlotScheduler {
         // If emitPayloadAttributes is true emit a SSE payloadAttributes event
         if (this.chain.opts.emitPayloadAttributes === true) {
           const data = await getPayloadAttributesForSSE(fork as ForkExecution, this.chain, {
-            prepareState,
+            prepareState: updatedPrepareState,
             prepareSlot,
             parentBlockRoot: fromHex(headRoot),
             // The likely consumers of this API are builders and will anyway ignore the

packages/beacon-node/test/perf/chain/opPools/aggregatedAttestationPool.test.ts

@@ -75,6 +75,8 @@ describe("getAttestationsForBlock", () => {
         unrealizedFinalizedRoot: toHexString(finalizedCheckpoint.root),
         executionPayloadBlockHash: null,
         executionStatus: ExecutionStatus.PreMerge,
+
+        timeliness: false,
       },
       originalState.slot
     );
@@ -98,6 +100,7 @@ describe("getAttestationsForBlock", () => {
           unrealizedFinalizedRoot: toHexString(finalizedCheckpoint.root),
           executionPayloadBlockHash: null,
           executionStatus: ExecutionStatus.PreMerge,
+          timeliness: false,
         },
         slot
       );

packages/beacon-node/test/perf/chain/produceBlock/produceBlockBody.test.ts

@@ -29,6 +29,7 @@ describe("produceBlockBody", () => {
     chain = new BeaconChain(
       {
         proposerBoostEnabled: true,
+        proposerBoostReorgEnabled: true,
         computeUnrealized: false,
         safeSlotsToImportOptimistically: SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY,
         disableArchiveOnCheckpoint: true,

packages/beacon-node/test/perf/chain/verifyImportBlocks.test.ts

@@ -85,6 +85,7 @@ describe.skip("verify+import blocks - range sync perf test", () => {
       const chain = new BeaconChain(
         {
           proposerBoostEnabled: true,
+          proposerBoostReorgEnabled: true,
           computeUnrealized: false,
           safeSlotsToImportOptimistically: SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY,
           disableArchiveOnCheckpoint: true,

packages/beacon-node/test/utils/mocks/chain.ts

@@ -29,5 +29,7 @@ export const zeroProtoBlock: ProtoBlock = {
   unrealizedFinalizedEpoch: 0,
   unrealizedFinalizedRoot: ZERO_HASH_HEX,
 
+  timeliness: false,
+
   ...{executionPayloadBlockHash: null, executionStatus: ExecutionStatus.PreMerge},
 };

packages/beacon-node/test/utils/typeGenerator.ts

@@ -40,6 +40,8 @@ export function generateProtoBlock(overrides: Partial<ProtoBlock> = {}): ProtoBl
     unrealizedFinalizedEpoch: 0,
     unrealizedFinalizedRoot: ZERO_HASH_HEX,
 
+    timeliness: false,
+
     ...{executionPayloadBlockHash: null, executionStatus: ExecutionStatus.PreMerge},
 
     ...overrides,

packages/beacon-node/test/utils/validationData/attestation.ts

@@ -75,6 +75,8 @@ export function getAttestationValidData(opts: AttestationValidDataOpts): {
     unrealizedFinalizedEpoch: 0,
     unrealizedFinalizedRoot: ZERO_HASH_HEX,
 
+    timeliness: false,
+
     ...{executionPayloadBlockHash: null, executionStatus: ExecutionStatus.PreMerge},
   };
 

packages/cli/src/options/beaconNodeOptions/chain.ts

@@ -13,6 +13,7 @@ export type ChainArgs = {
   // as this is defined as part of BeaconPaths
   // "chain.persistInvalidSszObjectsDir": string;
   "chain.proposerBoostEnabled"?: boolean;
+  "chain.proposerBoostReorgEnabled"?: boolean;
   "chain.disableImportExecutionFcU"?: boolean;
   "chain.preaggregateSlotDistance"?: number;
   "chain.attDataCacheSlotDistance"?: number;
@@ -39,6 +40,7 @@ export function parseArgs(args: ChainArgs): IBeaconNodeOptions["chain"] {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-explicit-any
     persistInvalidSszObjectsDir: undefined as any,
     proposerBoostEnabled: args["chain.proposerBoostEnabled"],
+    proposerBoostReorgEnabled: args["chain.proposerBoostReorgEnabled"],
     disableImportExecutionFcU: args["chain.disableImportExecutionFcU"],
     preaggregateSlotDistance: args["chain.preaggregateSlotDistance"],
     attDataCacheSlotDistance: args["chain.attDataCacheSlotDistance"],
@@ -120,6 +122,14 @@ Will double processing times. Use only for debugging purposes.",
     group: "chain",
   },
 
+  "chain.proposerBoostReorgEnabled": {
+    hidden: true,
+    type: "boolean",
+    description: "Enable proposer boost reorg to reorg out a late block",
+    defaultDescription: String(defaultOptions.chain.proposerBoostReorgEnabled),
+    group: "chain",
+  },
+
   "chain.disableImportExecutionFcU": {
     hidden: true,
     type: "boolean",

packages/cli/test/unit/options/beaconNodeOptions.test.ts

@@ -24,6 +24,7 @@ describe("options / beaconNodeOptions", () => {
       "chain.persistProducedBlocks": true,
       "chain.persistInvalidSszObjects": true,
       "chain.proposerBoostEnabled": false,
+      "chain.proposerBoostReorgEnabled": false,
       "chain.disableImportExecutionFcU": false,
       "chain.preaggregateSlotDistance": 1,
       "chain.attDataCacheSlotDistance": 2,
@@ -126,6 +127,7 @@ describe("options / beaconNodeOptions", () => {
         persistProducedBlocks: true,
         persistInvalidSszObjects: true,
         proposerBoostEnabled: false,
+        proposerBoostReorgEnabled: false,
         disableImportExecutionFcU: false,
         preaggregateSlotDistance: 1,
         attDataCacheSlotDistance: 2,

packages/config/src/chainConfig/presets/mainnet.ts

@@ -72,6 +72,9 @@ export const chainConfig: ChainConfig = {
   // 2**16 (= 65,536)
   CHURN_LIMIT_QUOTIENT: 65536,
   PROPOSER_SCORE_BOOST: 40,
+  REORG_HEAD_WEIGHT_THRESHOLD: 20,
+  REORG_PARENT_WEIGHT_THRESHOLD: 160,
+  REORG_MAX_EPOCHS_SINCE_FINALIZATION: 2,
 
   // Deposit contract
   // ---------------------------------------------------------------

packages/config/src/chainConfig/presets/minimal.ts

@@ -70,6 +70,9 @@ export const chainConfig: ChainConfig = {
   // [customized] scale queue churn at much lower validator counts for testing
   CHURN_LIMIT_QUOTIENT: 32,
   PROPOSER_SCORE_BOOST: 40,
+  REORG_HEAD_WEIGHT_THRESHOLD: 20,
+  REORG_PARENT_WEIGHT_THRESHOLD: 160,
+  REORG_MAX_EPOCHS_SINCE_FINALIZATION: 2,
 
   // Deposit contract
   // ---------------------------------------------------------------

packages/config/src/chainConfig/types.ts

@@ -58,6 +58,9 @@ export type ChainConfig = {
 
   // Proposer boost
   PROPOSER_SCORE_BOOST: number;
+  REORG_HEAD_WEIGHT_THRESHOLD: number;
+  REORG_PARENT_WEIGHT_THRESHOLD: number;
+  REORG_MAX_EPOCHS_SINCE_FINALIZATION: number;
 
   // Deposit contract
   DEPOSIT_CHAIN_ID: number;
@@ -111,6 +114,9 @@ export const chainConfigTypes: SpecTypes<ChainConfig> = {
 
   // Proposer boost
   PROPOSER_SCORE_BOOST: "number",
+  REORG_HEAD_WEIGHT_THRESHOLD: "number",
+  REORG_PARENT_WEIGHT_THRESHOLD: "number",
+  REORG_MAX_EPOCHS_SINCE_FINALIZATION: "number",
 
   // Deposit contract
   DEPOSIT_CHAIN_ID: "number",