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

package/src/api/impl/beacon/state/index.ts

@@ -9,15 +9,13 @@ import {
   isStatePostAltair,
   isStatePostElectra,
   isStatePostFulu,
-  isStatePostGloas,
 } from "@lodestar/state-transition";
-import {ValidatorIndex, getBuilderStatus, getValidatorStatus, ssz} from "@lodestar/types";
+import {ValidatorIndex, getValidatorStatus, ssz} from "@lodestar/types";
 import {ApiError} from "../../errors.js";
 import {ApiModules} from "../../types.js";
 import {assertUniqueItems} from "../../utils.js";
 import {
   filterStateValidatorsByStatus,
-  getStateBuilderIndex,
   getStateResponseWithRegen,
   getStateValidatorIndex,
   toValidatorResponse,
@@ -145,55 +143,6 @@ export function getBeaconStateApi({
       return this.getStateValidators(args, context);
     },
 
-    async getStateBuilders({stateId, builderIds = [], statuses = []}) {
-      const {state, executionOptimistic, finalized} = await getState(stateId);
-      if (!isStatePostGloas(state)) {
-        throw new ApiError(400, `Builders are not supported for pre-gloas state fork=${state.forkName}`);
-      }
-      const finalizedEpoch = state.finalizedCheckpoint.epoch;
-
-      const builderResponses: routes.beacon.BuilderResponse[] = [];
-      if (builderIds.length) {
-        assertUniqueItems(builderIds, "Duplicate builder IDs provided");
-
-        for (const id of builderIds) {
-          const resp = getStateBuilderIndex(id, state);
-          if (resp.valid) {
-            const builderIndex = resp.builderIndex;
-            const builder = state.getBuilder(builderIndex);
-            const status = getBuilderStatus(builder, finalizedEpoch);
-            if (statuses.length && !statuses.includes(status)) {
-              continue;
-            }
-            builderResponses.push({index: builderIndex, status, builder});
-          }
-        }
-        return {
-          data: builderResponses,
-          meta: {executionOptimistic, finalized},
-        };
-      }
-
-      if (statuses.length) {
-        assertUniqueItems(statuses, "Duplicate statuses provided");
-      }
-
-      const buildersLength = state.getBuildersLength();
-      for (let builderIndex = 0; builderIndex < buildersLength; builderIndex++) {
-        const builder = state.getBuilder(builderIndex);
-        const status = getBuilderStatus(builder, finalizedEpoch);
-        if (statuses.length && !statuses.includes(status)) {
-          continue;
-        }
-        builderResponses.push({index: builderIndex, status, builder});
-      }
-
-      return {
-        data: builderResponses,
-        meta: {executionOptimistic, finalized},
-      };
-    },
-
     async postStateValidatorIdentities({stateId, validatorIds = []}) {
       const {state, executionOptimistic, finalized} = await getState(stateId);
       const {pubkeyCache} = chain;

package/src/api/impl/beacon/state/utils.ts

@@ -1,18 +1,9 @@
 import {routes} from "@lodestar/api";
 import {CheckpointWithHex, IForkChoice} from "@lodestar/fork-choice";
 import {GENESIS_SLOT} from "@lodestar/params";
-import {IBeaconStateView, IBeaconStateViewGloas, PubkeyCache} from "@lodestar/state-transition";
-import {
-  BLSPubkey,
-  BuilderIndex,
-  Epoch,
-  RootHex,
-  Slot,
-  ValidatorIndex,
-  getValidatorStatus,
-  phase0,
-} from "@lodestar/types";
-import {byteArrayEquals, fromHex} from "@lodestar/utils";
+import {IBeaconStateView, PubkeyCache} from "@lodestar/state-transition";
+import {BLSPubkey, Epoch, RootHex, Slot, ValidatorIndex, getValidatorStatus, phase0} from "@lodestar/types";
+import {fromHex} from "@lodestar/utils";
 import {IBeaconChain} from "../../../../chain/index.js";
 import {ApiError, ValidationError} from "../../errors.js";
 
@@ -87,50 +78,6 @@ export function toValidatorResponse(
   };
 }
 
-type StateBuilderIndexResponse =
-  | {valid: true; builderIndex: BuilderIndex}
-  | {valid: false; code: number; reason: string};
-
-export function getStateBuilderIndex(
-  id: routes.beacon.BuilderId | BLSPubkey,
-  state: IBeaconStateViewGloas
-): StateBuilderIndexResponse {
-  if (typeof id === "string") {
-    // mutate `id` and fallthrough to below
-    if (id.startsWith("0x")) {
-      try {
-        id = fromHex(id);
-      } catch (_e) {
-        return {valid: false, code: 400, reason: "Invalid pubkey hex encoding"};
-      }
-    } else {
-      id = Number(id);
-    }
-  }
-
-  if (typeof id === "number") {
-    const builderIndex = id;
-    // builder is invalid or added later than given stateId
-    if (!Number.isSafeInteger(builderIndex) || builderIndex < 0) {
-      return {valid: false, code: 400, reason: "Invalid builder index"};
-    }
-    if (builderIndex >= state.getBuildersLength()) {
-      return {valid: false, code: 404, reason: "Builder index from future state"};
-    }
-    return {valid: true, builderIndex};
-  }
-
-  // typeof id === Uint8Array
-  // There is no builder pubkey cache, linear scan over the registry
-  const buildersLength = state.getBuildersLength();
-  for (let builderIndex = 0; builderIndex < buildersLength; builderIndex++) {
-    if (byteArrayEquals(state.getBuilder(builderIndex).pubkey, id)) {
-      return {valid: true, builderIndex};
-    }
-  }
-  return {valid: false, code: 404, reason: "Builder pubkey not found in state"};
-}
-
 export function filterStateValidatorsByStatus(
   statuses: string[],
   state: IBeaconStateView,
@@ -175,7 +122,7 @@ export function getStateValidatorIndex(
   if (typeof id === "number") {
     const validatorIndex = id;
     // validator is invalid or added later than given stateId
-    if (!Number.isSafeInteger(validatorIndex) || validatorIndex < 0) {
+    if (!Number.isSafeInteger(validatorIndex)) {
       return {valid: false, code: 400, reason: "Invalid validator index"};
     }
     if (validatorIndex >= state.validatorCount) {

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

@@ -65,8 +65,6 @@ import {
   AttestationError,
   AttestationErrorCode,
   GossipAction,
-  ProposerPreferencesError,
-  ProposerPreferencesErrorCode,
   SyncCommitteeError,
   SyncCommitteeErrorCode,
 } from "../../../chain/errors/index.js";
@@ -76,7 +74,6 @@ import {BlockType, ProduceFullDeneb, ProduceFullGloas} from "../../../chain/prod
 import {RegenCaller} from "../../../chain/regen/index.js";
 import {CheckpointHex} from "../../../chain/stateCache/types.js";
 import {validateApiAggregateAndProof} from "../../../chain/validation/index.js";
-import {validateGossipProposerPreferences} from "../../../chain/validation/proposerPreferences.js";
 import {validateSyncCommitteeGossipContributionAndProof} from "../../../chain/validation/syncCommitteeContributionAndProof.js";
 import {ZERO_HASH} from "../../../constants/index.js";
 import {BuilderStatus, NoBidReceived} from "../../../execution/builder/http.js";
@@ -85,7 +82,7 @@ import {CommitteeSubscription} from "../../../network/subnets/index.js";
 import {SyncState} from "../../../sync/index.js";
 import {callInNextEventLoop} from "../../../util/eventLoop.js";
 import {isOptimisticBlock} from "../../../util/forkChoice.js";
-import {getBlockGraffiti, toGraffitiBytes} from "../../../util/graffiti.js";
+import {getDefaultGraffiti, toGraffitiBytes} from "../../../util/graffiti.js";
 import {getLodestarClientVersion} from "../../../util/metadata.js";
 import {ApiOptions} from "../../options.js";
 import {getStateResponseWithRegen} from "../beacon/state/utils.js";
@@ -614,10 +611,7 @@ export function getValidatorApi(
     }
 
     const graffitiBytes = toGraffitiBytes(
-      getBlockGraffiti(graffiti, getLodestarClientVersion(opts), chain.executionEngine.clientVersion, {
-        private: opts.private,
-        graffitiAppend: chain.opts.graffitiAppend,
-      })
+      graffiti ?? getDefaultGraffiti(getLodestarClientVersion(opts), chain.executionEngine.clientVersion, opts)
     );
 
     const loggerContext = {
@@ -927,10 +921,7 @@ export function getValidatorApi(
       metrics?.blockProductionSlotDelta.set(slot - parentSlot);
 
       const graffitiBytes = toGraffitiBytes(
-        getBlockGraffiti(graffiti, getLodestarClientVersion(opts), chain.executionEngine.clientVersion, {
-          private: opts.private,
-          graffitiAppend: chain.opts.graffitiAppend,
-        })
+        graffiti ?? getDefaultGraffiti(getLodestarClientVersion(opts), chain.executionEngine.clientVersion, opts)
       );
 
       // TODO GLOAS: respect builderSelection (MaxProfit, BuilderAlways, ExecutionAlways, etc.) to let
@@ -1121,8 +1112,8 @@ export function getValidatorApi(
 
       const block = chain.forkChoice.getCanonicalBlockAtSlot(slot);
       if (!block) {
-        // No canonical block is seen at slot. Return 204 so vc can skip casting payload attestation.
-        return {data: undefined, meta: {version: fork}, status: 204};
+        // No block is seen at slot. Return 404 so vc can skip casting payload attestation.
+        throw new ApiError(404, `No canonical block found at slot=${slot}`);
       }
 
       const payloadInput = chain.seenPayloadEnvelopeInputCache.get(block.blockRoot);
@@ -1774,46 +1765,6 @@ export function getValidatorApi(
       });
     },
 
-    async submitProposerPreferences({signedProposerPreferences}) {
-      const failures: FailureList = [];
-
-      await Promise.all(
-        signedProposerPreferences.map(async (signed, i) => {
-          try {
-            await validateGossipProposerPreferences(chain, signed);
-
-            chain.proposerPreferencesPool.add(signed);
-            await network.publishProposerPreferences(signed);
-            chain.emitter.emit(routes.events.EventType.proposerPreferences, {
-              version: config.getForkName(signed.message.proposalSlot),
-              data: signed,
-            });
-          } catch (e) {
-            const logCtx = {
-              slot: signed.message.proposalSlot,
-              validatorIndex: signed.message.validatorIndex,
-              dependentRoot: toRootHex(signed.message.dependentRoot),
-            };
-
-            if (e instanceof ProposerPreferencesError && e.type.code === ProposerPreferencesErrorCode.ALREADY_KNOWN) {
-              logger.debug("Ignoring known signed proposer preferences", logCtx);
-              return;
-            }
-
-            failures.push({index: i, message: (e as Error).message});
-            logger.verbose(`Error on submitProposerPreferences [${i}]`, logCtx, e as Error);
-            if (e instanceof ProposerPreferencesError && e.action === GossipAction.REJECT) {
-              chain.persistInvalidSszValue(ssz.gloas.SignedProposerPreferences, signed, "api_reject");
-            }
-          }
-        })
-      );
-
-      if (failures.length > 0) {
-        throw new IndexedError("Error processing signed proposer preferences", failures);
-      }
-    },
-
     async getExecutionPayloadEnvelope({slot, beaconBlockRoot}) {
       const fork = config.getForkName(slot);
 

package/src/chain/blocks/importBlock.ts

@@ -426,7 +426,7 @@ export async function importBlock(
       }
     } catch (e) {
       if (isStartSlotOfEpoch(proposalSlot)) {
-        notOverrideFcuReason = NotReorgedReason.AtEpochBoundary;
+        notOverrideFcuReason = NotReorgedReason.NotShufflingStable;
       } else {
         this.logger.warn("Unable to get beacon proposer. Do not override fcu.", {proposalSlot}, e as Error);
       }

package/src/chain/chain.ts

@@ -107,6 +107,7 @@ import {
   SeenExecutionPayloadBids,
   SeenPayloadAttesters,
   SeenPayloadEnvelopeInput,
+  SeenProposerPreferences,
   SeenSyncCommitteeMessages,
 } from "./seenCache/index.js";
 import {SeenAggregatedAttestations} from "./seenCache/seenAggregateAndProof.js";
@@ -188,6 +189,7 @@ export class BeaconChain implements IBeaconChain {
   readonly seenPayloadAttesters = new SeenPayloadAttesters();
   readonly seenAggregatedAttestations: SeenAggregatedAttestations;
   readonly seenExecutionPayloadBids = new SeenExecutionPayloadBids();
+  readonly seenProposerPreferences = new SeenProposerPreferences();
   readonly seenBlockProposers = new SeenBlockProposers();
   readonly seenSyncCommitteeMessages = new SeenSyncCommitteeMessages();
   readonly seenContributionAndProof: SeenContributionAndProof;
@@ -1471,6 +1473,7 @@ export class BeaconChain implements IBeaconChain {
     this.payloadAttestationPool.prune(slot);
     this.executionPayloadBidPool.prune(slot);
     this.seenExecutionPayloadBids.prune(slot);
+    this.seenProposerPreferences.prune(slot);
     this.proposerPreferencesPool.prune(slot);
     this.seenAttestationDatas.onSlot(slot);
     this.reprocessController.onSlot(slot);

package/src/chain/interface.ts

@@ -61,6 +61,7 @@ import {
   SeenContributionAndProof,
   SeenExecutionPayloadBids,
   SeenPayloadAttesters,
+  SeenProposerPreferences,
   SeenSyncCommitteeMessages,
 } from "./seenCache/index.js";
 import {SeenAggregatedAttestations} from "./seenCache/seenAggregateAndProof.js";
@@ -132,6 +133,7 @@ export interface IBeaconChain {
   readonly seenPayloadAttesters: SeenPayloadAttesters;
   readonly seenAggregatedAttestations: SeenAggregatedAttestations;
   readonly seenExecutionPayloadBids: SeenExecutionPayloadBids;
+  readonly seenProposerPreferences: SeenProposerPreferences;
   readonly seenBlockProposers: SeenBlockProposers;
   readonly seenSyncCommitteeMessages: SeenSyncCommitteeMessages;
   readonly seenContributionAndProof: SeenContributionAndProof;

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/gossip/gossipsub.ts

@@ -35,7 +35,7 @@ import {
   computeGossipPeerScoreParams,
   gossipScoreThresholds,
 } from "./scoringParameters.js";
-import {GossipTopicCache, getAllowedTopics, getCoreTopicsAtFork, stringifyGossipTopic} from "./topic.js";
+import {GossipTopicCache, getCoreTopicsAtFork, stringifyGossipTopic} from "./topic.js";
 
 /** As specified in https://github.com/ethereum/consensus-specs/blob/v1.1.10/specs/phase0/p2p-interface.md */
 const GOSSIPSUB_HEARTBEAT_INTERVAL = 0.7 * 1000;
@@ -140,7 +140,6 @@ export class Eth2Gossipsub {
     const gossipsubInstance = gossipsub({
       globalSignaturePolicy: StrictNoSign,
       allowPublishToZeroTopicPeers: allowPublishToZeroPeers,
-      allowedTopics: getAllowedTopics(networkConfig),
       D: gossipsubD ?? GOSSIP_D,
       Dlo: gossipsubDLow ?? GOSSIP_D_LOW,
       Dhi: gossipsubDHigh ?? GOSSIP_D_HIGH,

package/src/network/gossip/topic.ts

@@ -246,7 +246,7 @@ export function parseGossipTopic(forkDigestContext: ForkDigestContext, topicStr:
 export function getCoreTopicsAtFork(
   networkConfig: NetworkConfig,
   fork: ForkName,
-  opts: {subscribeAllSubnets?: boolean; subscribeAllColumnSubnets?: boolean; disableLightClientServer?: boolean}
+  opts: {subscribeAllSubnets?: boolean; disableLightClientServer?: boolean}
 ): GossipTopicTypeMap[keyof GossipTopicTypeMap][] {
   // Common topics for all forks
   const topics: GossipTopicTypeMap[keyof GossipTopicTypeMap][] = [
@@ -266,7 +266,7 @@ export function getCoreTopicsAtFork(
 
   // After fulu also track data_column_sidecar_{index}
   if (ForkSeq[fork] >= ForkSeq.fulu) {
-    topics.push(...getDataColumnSidecarTopics(networkConfig, opts.subscribeAllColumnSubnets));
+    topics.push(...getDataColumnSidecarTopics(networkConfig));
   }
 
   // After Deneb and before Fulu also track blob_sidecar_{subnet_id}
@@ -309,39 +309,15 @@ export function getCoreTopicsAtFork(
   return topics;
 }
 
-/**
- * Build the complete set of valid gossip topic strings across every fork boundary.
- */
-export function getAllowedTopics(networkConfig: NetworkConfig): Set<string> {
-  const {config} = networkConfig;
-  const allowedTopics = new Set<string>();
-
-  for (const boundary of config.forkBoundariesAscendingEpochOrder) {
-    const topics = getCoreTopicsAtFork(networkConfig, boundary.fork, {
-      subscribeAllSubnets: true,
-      subscribeAllColumnSubnets: true,
-      disableLightClientServer: false,
-    });
-    for (const topic of topics) {
-      allowedTopics.add(stringifyGossipTopic(config, {...topic, boundary}));
-    }
-  }
-
-  return allowedTopics;
-}
-
 /**
  * Pick data column subnets to subscribe to post-fulu.
  */
 export function getDataColumnSidecarTopics(
-  networkConfig: NetworkConfig,
-  subscribeAllColumnSubnets = false
+  networkConfig: NetworkConfig
 ): GossipTopicTypeMap[keyof GossipTopicTypeMap][] {
   const topics: GossipTopicTypeMap[keyof GossipTopicTypeMap][] = [];
 
-  const subnets = subscribeAllColumnSubnets
-    ? Array.from({length: networkConfig.config.DATA_COLUMN_SIDECAR_SUBNET_COUNT}, (_, i) => i)
-    : networkConfig.custodyConfig.sampledSubnets;
+  const subnets = networkConfig.custodyConfig.sampledSubnets;
   for (const subnet of subnets) {
     topics.push({type: GossipType.data_column_sidecar, subnet});
   }

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,
       });
     },

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);
-}