@lodestar/beacon-node 1.45.0-dev.85227cfbe5 → 1.45.0-dev.905415417a

package/src/chain/produceBlock/produceBlockBody.ts

@@ -43,7 +43,6 @@ import {
   ValidatorIndex,
   Wei,
   altair,
-  bellatrix,
   capella,
   deneb,
   electra,
@@ -831,19 +830,28 @@ export function getPayloadAttributesForSSE(
     feeRecipient,
   });
 
-  const ssePayloadAttributes = {
+  let parentBlockNumber: number;
+  if (isForkPostGloas(fork)) {
+    const parentBlock = chain.forkChoice.getBlockHexAndBlockHash(
+      toRootHex(parentBlockRoot),
+      toRootHex(parentBlockHash)
+    );
+    if (parentBlock?.executionPayloadBlockHash == null) {
+      throw Error(`Parent block not found in fork choice root=${toRootHex(parentBlockRoot)}`);
+    }
+    parentBlockNumber = parentBlock.executionPayloadNumber;
+  } else {
+    parentBlockNumber = prepareState.payloadBlockNumber;
+  }
+
+  const ssePayloadAttributes: SSEPayloadAttributes = {
     proposerIndex: prepareState.getBeaconProposer(prepareSlot),
     proposalSlot: prepareSlot,
+    parentBlockNumber,
     parentBlockRoot,
     parentBlockHash,
     payloadAttributes,
-  } as SSEPayloadAttributes;
-
-  if (!isForkPostGloas(fork)) {
-    // Removed in Gloas, builders can get the block number from the EL via the block hash if required
-    (ssePayloadAttributes as bellatrix.SSEPayloadAttributes).parentBlockNumber = prepareState.payloadBlockNumber;
-  }
-
+  };
   return ssePayloadAttributes;
 }
 

package/src/chain/validation/proposerPreferences.ts

@@ -81,7 +81,7 @@ export async function validateGossipProposerPreferences(
   }
 
   // [IGNORE] First valid message for (dependent_root, proposal_slot, validator_index).
-  if (chain.proposerPreferencesPool.isKnown(proposalSlot, dependentRootHex, validatorIndex)) {
+  if (chain.proposerPreferencesPool.get(proposalSlot, dependentRootHex)?.message.validatorIndex === validatorIndex) {
     throw new ProposerPreferencesError(GossipAction.IGNORE, {
       code: ProposerPreferencesErrorCode.ALREADY_KNOWN,
       proposalSlot,
@@ -104,16 +104,4 @@ export async function validateGossipProposerPreferences(
       validatorIndex,
     });
   }
-
-  // Repeated check - deals with race-condition between preferences submissions
-  if (chain.proposerPreferencesPool.isKnown(proposalSlot, dependentRootHex, validatorIndex)) {
-    throw new ProposerPreferencesError(GossipAction.IGNORE, {
-      code: ProposerPreferencesErrorCode.ALREADY_KNOWN,
-      proposalSlot,
-      validatorIndex,
-      dependentRoot: dependentRootHex,
-    });
-  }
-
-  chain.proposerPreferencesPool.add(signedProposerPreferences);
 }

package/src/network/processor/gossipHandlers.ts

@@ -1273,8 +1273,9 @@ function getSequentialHandlers(modules: ValidatorFnsModules, options: GossipHand
       const signedProposerPreferences = sszDeserialize(topic, serializedData);
       await validateGossipProposerPreferences(chain, signedProposerPreferences);
 
+      chain.proposerPreferencesPool.add(signedProposerPreferences);
       chain.emitter.emit(routes.events.EventType.proposerPreferences, {
-        version: config.getForkName(signedProposerPreferences.message.proposalSlot),
+        version: ForkName.gloas,
         data: signedProposerPreferences,
       });
     },