@lodestar/beacon-node 1.47.0-dev.0bcaaaebb5 → 1.47.0-dev.268215c3da

package/src/api/impl/validator/utils.ts

@@ -59,39 +59,24 @@ export function selectBlockProductionSource({
       return {source: ProducedBlockSource.engine, reason: EngineBlockSelectionReason.EnginePreferred};
 
     case routes.validator.BuilderSelection.Default:
-    case routes.validator.BuilderSelection.MaxProfit:
-      return selectBlockProductionSourceByBoostFactor({
-        engineExecutionPayloadValue,
-        builderExecutionPayloadValue,
-        builderBoostFactor,
-      });
+    case routes.validator.BuilderSelection.MaxProfit: {
+      if (builderBoostFactor === BigInt(0)) {
+        return {source: ProducedBlockSource.engine, reason: EngineBlockSelectionReason.EnginePreferred};
+      }
 
-    case routes.validator.BuilderSelection.BuilderAlways:
-    case routes.validator.BuilderSelection.BuilderOnly:
-      return {source: ProducedBlockSource.builder, reason: BuilderBlockSelectionReason.BuilderPreferred};
-  }
-}
+      if (builderBoostFactor === MAX_BUILDER_BOOST_FACTOR) {
+        return {source: ProducedBlockSource.builder, reason: BuilderBlockSelectionReason.BuilderPreferred};
+      }
 
-export function selectBlockProductionSourceByBoostFactor({
-  engineExecutionPayloadValue,
-  builderExecutionPayloadValue,
-  builderBoostFactor,
-}: {
-  engineExecutionPayloadValue: bigint;
-  builderExecutionPayloadValue: bigint;
-  builderBoostFactor: bigint;
-}): BlockSelectionResult {
-  if (builderBoostFactor === BigInt(0)) {
-    return {source: ProducedBlockSource.engine, reason: EngineBlockSelectionReason.EnginePreferred};
-  }
+      if (engineExecutionPayloadValue >= (builderExecutionPayloadValue * builderBoostFactor) / BigInt(100)) {
+        return {source: ProducedBlockSource.engine, reason: EngineBlockSelectionReason.BlockValue};
+      }
 
-  if (builderBoostFactor === MAX_BUILDER_BOOST_FACTOR) {
-    return {source: ProducedBlockSource.builder, reason: BuilderBlockSelectionReason.BuilderPreferred};
-  }
+      return {source: ProducedBlockSource.builder, reason: BuilderBlockSelectionReason.BlockValue};
+    }
 
-  if (engineExecutionPayloadValue >= (builderExecutionPayloadValue * builderBoostFactor) / BigInt(100)) {
-    return {source: ProducedBlockSource.engine, reason: EngineBlockSelectionReason.BlockValue};
+    case routes.validator.BuilderSelection.BuilderAlways:
+    case routes.validator.BuilderSelection.BuilderOnly:
+      return {source: ProducedBlockSource.builder, reason: BuilderBlockSelectionReason.BuilderPreferred};
   }
-
-  return {source: ProducedBlockSource.builder, reason: BuilderBlockSelectionReason.BlockValue};
 }

package/src/chain/chain.ts

@@ -1072,7 +1072,6 @@ export class BeaconChain implements IBeaconChain {
       graffiti,
       slot,
       feeRecipient,
-      strictFeeRecipientCheck,
       commonBlockBodyPromise,
       parentBlock,
       builderBid,
@@ -1101,7 +1100,6 @@ export class BeaconChain implements IBeaconChain {
         graffiti,
         slot,
         feeRecipient,
-        strictFeeRecipientCheck,
         parentBlock,
         proposerIndex,
         proposerPubKey,

package/src/chain/produceBlock/produceBlockBody.ts

@@ -100,8 +100,6 @@ export type BlockAttributes = {
   slot: Slot;
   parentBlock: ProtoBlock;
   feeRecipient?: string;
-  /** Verify that a locally produced execution payload uses `feeRecipient`. */
-  strictFeeRecipientCheck?: boolean;
   /** When provided, build block with this builder bid instead of a self-build bid */
   builderBid?: gloas.SignedExecutionPayloadBid;
 };
@@ -203,7 +201,6 @@ export async function produceBlockBody<T extends BlockType>(
   const {
     slot: blockSlot,
     feeRecipient: requestedFeeRecipient,
-    strictFeeRecipientCheck,
     parentBlock,
     proposerIndex,
     proposerPubKey,
@@ -337,16 +334,6 @@ export async function produceBlockBody<T extends BlockType>(
     executionPayloadValue = payloadRes.executionPayloadValue;
     shouldOverrideBuilder = payloadRes.shouldOverrideBuilder;
 
-    if (
-      strictFeeRecipientCheck &&
-      requestedFeeRecipient &&
-      !byteArrayEquals(executionPayload.feeRecipient, fromHex(requestedFeeRecipient))
-    ) {
-      throw Error(
-        `Invalid feeRecipient set in engine payload expected=${requestedFeeRecipient} actual=${toHex(executionPayload.feeRecipient)}`
-      );
-    }
-
     if (blobsBundle === undefined) {
       throw Error(`Missing blobsBundle response from getPayload at fork=${fork}`);
     }