@lodestar/beacon-node 1.45.0-dev.f2645825a8 → 1.45.0-dev.f535421f29

package/src/chain/opPools/proposerPreferencesPool.ts

@@ -1,4 +1,4 @@
-import {RootHex, Slot, ValidatorIndex, gloas} from "@lodestar/types";
+import {RootHex, Slot, gloas} from "@lodestar/types";
 import {toRootHex} from "@lodestar/utils";
 
 /**
@@ -22,10 +22,6 @@ export class ProposerPreferencesPool {
     return this.bySlot.get(slot)?.get(dependentRootHex) ?? null;
   }
 
-  isKnown(proposalSlot: Slot, dependentRoot: RootHex, validatorIndex: ValidatorIndex): boolean {
-    return this.get(proposalSlot, dependentRoot)?.message.validatorIndex === validatorIndex;
-  }
-
   add(signed: gloas.SignedProposerPreferences): void {
     const {proposalSlot, dependentRoot} = signed.message;
     const rootHex = toRootHex(dependentRoot);

package/src/chain/options.ts

@@ -35,7 +35,6 @@ export type IChainOptions = BlockProcessOpts &
     persistOrphanedBlocksDir?: string;
     skipCreateStateCacheIfAvailable?: boolean;
     suggestedFeeRecipient: string;
-    graffitiAppend?: boolean;
     maxSkipSlots?: number;
     /** Ensure blobs returned by the execution engine are valid */
     sanityCheckExecutionEngineBlobs?: boolean;
@@ -108,7 +107,6 @@ export const defaultChainOptions: IChainOptions = {
   computeUnrealized: true,
   fastConfirmation: false,
   suggestedFeeRecipient: defaultValidatorOptions.suggestedFeeRecipient,
-  graffitiAppend: true,
   serveHistoricalState: false,
   assertCorrectProgressiveBalances: false,
   archiveStateEpochFrequency: 1024,

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/seenCache/index.ts

@@ -5,3 +5,4 @@ export {SeenContributionAndProof} from "./seenCommitteeContribution.js";
 export {SeenExecutionPayloadBids} from "./seenExecutionPayloadBids.js";
 export {SeenBlockInput} from "./seenGossipBlockInput.js";
 export {PayloadEnvelopeInput, SeenPayloadEnvelopeInput} from "./seenPayloadEnvelopeInput.js";
+export {SeenProposerPreferences} from "./seenProposerPreferences.js";

package/src/chain/seenCache/seenProposerPreferences.ts

@@ -0,0 +1,32 @@
+import {RootHex, Slot, ValidatorIndex} from "@lodestar/types";
+import {MapDef} from "@lodestar/utils";
+
+/**
+ * Tracks signed proposer preferences we've already seen per (dependent_root, proposal_slot, validator_index).
+ */
+export class SeenProposerPreferences {
+  private readonly validatorByDependentRootBySlot = new MapDef<Slot, Map<RootHex, ValidatorIndex>>(
+    () => new Map<RootHex, ValidatorIndex>()
+  );
+
+  isKnown(dependentRoot: RootHex, proposalSlot: Slot, validatorIndex: ValidatorIndex): boolean {
+    return this.validatorByDependentRootBySlot.get(proposalSlot)?.get(dependentRoot) === validatorIndex;
+  }
+
+  add(dependentRoot: RootHex, proposalSlot: Slot, validatorIndex: ValidatorIndex): void {
+    this.validatorByDependentRootBySlot.getOrDefault(proposalSlot).set(dependentRoot, validatorIndex);
+  }
+
+  /**
+   * Entries are only load-bearing while `proposal_slot > current_slot`. Once the slot has
+   * passed the `[IGNORE] proposal_slot > current_slot` gossip rule takes over, so drop them
+   * on each slot tick.
+   */
+  prune(currentSlot: Slot): void {
+    for (const slot of this.validatorByDependentRootBySlot.keys()) {
+      if (slot < currentSlot) {
+        this.validatorByDependentRootBySlot.delete(slot);
+      }
+    }
+  }
+}

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.seenProposerPreferences.isKnown(dependentRootHex, proposalSlot, validatorIndex)) {
     throw new ProposerPreferencesError(GossipAction.IGNORE, {
       code: ProposerPreferencesErrorCode.ALREADY_KNOWN,
       proposalSlot,
@@ -105,15 +105,6 @@ export async function validateGossipProposerPreferences(
     });
   }
 
-  // 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);
+  // Valid
+  chain.seenProposerPreferences.add(dependentRootHex, proposalSlot, validatorIndex);
 }

package/src/network/processor/gossipHandlers.ts

@@ -1273,6 +1273,7 @@ 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: ForkName.gloas,
         data: signedProposerPreferences,

package/src/util/graffiti.ts

@@ -37,81 +37,3 @@ export function getDefaultGraffiti(
   // No EL client info available. We still want to include CL info albeit not spec compliant
   return `${consensusClientVersion.code}${consensusClientVersion.commit.slice(0, 4)}`;
 }
-
-function appendLongestFittingSuffix(userGraffiti: string, suffixes: string[]): string {
-  const userGraffitiBytes = Buffer.byteLength(userGraffiti, "utf8");
-  if (userGraffitiBytes >= GRAFFITI_SIZE) {
-    return userGraffiti;
-  }
-
-  const availableBytes = GRAFFITI_SIZE - userGraffitiBytes;
-
-  for (const suffix of suffixes) {
-    if (Buffer.byteLength(suffix, "utf8") <= availableBytes) {
-      return `${userGraffiti}${suffix}`;
-    }
-  }
-
-  return userGraffiti;
-}
-
-/**
- * Appends the richest available client watermark that fits after user graffiti.
- *
- * Tiers are:
- * - full EL/CL watermark, e.g. " BU9b0eLS80c2"
- * - EL/CL client codes, e.g. " BULS"
- * - CL client code, e.g. " LS"
- */
-export function appendClientInfoToGraffiti(
-  userGraffiti: string,
-  consensusClientVersion: ClientVersion,
-  executionClientVersion: ClientVersion | null | undefined,
-  opts: {private?: boolean} = {}
-): string {
-  if (opts.private) {
-    return userGraffiti;
-  }
-
-  // Graffiti supplied via the beacon API is decoded from a fixed 32-byte field (see
-  // fromGraffitiHex) and arrives right-padded with NUL bytes. Trim only trailing padding
-  // NULs; a NUL that appears in the middle of the string is data, not padding.
-  let end = userGraffiti.length;
-  while (end > 0 && userGraffiti.charCodeAt(end - 1) === 0) {
-    end--;
-  }
-  const graffiti = userGraffiti.slice(0, end);
-
-  const fullClientInfo = getDefaultGraffiti(consensusClientVersion, executionClientVersion, {private: false});
-  if (graffiti.length === 0) {
-    return fullClientInfo;
-  }
-
-  const suffixes =
-    executionClientVersion != null
-      ? [
-          ` ${fullClientInfo}`,
-          ` ${executionClientVersion.code}${consensusClientVersion.code}`,
-          ` ${consensusClientVersion.code}`,
-        ]
-      : [` ${fullClientInfo}`, ` ${consensusClientVersion.code}`];
-
-  return appendLongestFittingSuffix(graffiti, suffixes);
-}
-
-export function getBlockGraffiti(
-  userGraffiti: string | undefined,
-  consensusClientVersion: ClientVersion,
-  executionClientVersion: ClientVersion | null | undefined,
-  opts: {private?: boolean; graffitiAppend?: boolean}
-): string {
-  if (userGraffiti === undefined) {
-    return getDefaultGraffiti(consensusClientVersion, executionClientVersion, opts);
-  }
-
-  if (opts.graffitiAppend === false) {
-    return userGraffiti;
-  }
-
-  return appendClientInfoToGraffiti(userGraffiti, consensusClientVersion, executionClientVersion, opts);
-}