Revert "Add a more generic getter to fork config"

This reverts commit 40b51d2.

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

@@ -25,7 +25,7 @@ export async function validateGossipBlobSidecar(
   const blobSlot = blobSidecar.signedBlockHeader.message.slot;
 
   // [REJECT] The sidecar's index is consistent with `MAX_BLOBS_PER_BLOCK` -- i.e. `blob_sidecar.index < MAX_BLOBS_PER_BLOCK`.
-  const maxBlobsPerBlock = chain.config.getValue(fork, "MAX_BLOBS_PER_BLOCK");
+  const maxBlobsPerBlock = chain.config.getMaxBlobsPerBlock(fork);
   if (blobSidecar.index >= maxBlobsPerBlock) {
     throw new BlobSidecarGossipError(GossipAction.REJECT, {
       code: BlobSidecarErrorCode.INDEX_TOO_LARGE,

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

@@ -113,7 +113,7 @@ export async function validateGossipBlock(
   // [REJECT] The length of KZG commitments is less than or equal to the limitation defined in Consensus Layer -- i.e. validate that len(body.signed_beacon_block.message.blob_kzg_commitments) <= MAX_BLOBS_PER_BLOCK
   if (isForkBlobs(fork)) {
     const blobKzgCommitmentsLen = (block as deneb.BeaconBlock).body.blobKzgCommitments.length;
-    const maxBlobsPerBlock = chain.config.getValue(fork, "MAX_BLOBS_PER_BLOCK");
+    const maxBlobsPerBlock = chain.config.getMaxBlobsPerBlock(fork);
     if (blobKzgCommitmentsLen > maxBlobsPerBlock) {
       throw new BlockGossipError(GossipAction.REJECT, {
         code: BlockErrorCode.TOO_MANY_KZG_COMMITMENTS,

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

@@ -506,7 +506,7 @@ export class Network implements INetwork {
     return collectMaxResponseTyped(
       this.sendReqRespRequest(peerId, ReqRespMethod.BlobSidecarsByRange, [Version.V1], request),
       // request's count represent the slots, so the actual max count received could be slots * blobs per slot
-      request.count * this.config.getValue(fork, "MAX_BLOBS_PER_BLOCK"),
+      request.count * this.config.getMaxBlobsPerBlock(fork),
       responseSszTypeByMethod[ReqRespMethod.BlobSidecarsByRange]
     );
   }

packages/beacon-node/src/network/reqresp/handlers/blobSidecarsByRange.ts

@@ -105,7 +105,7 @@ export function validateBlobSidecarsByRangeRequest(
     throw new ResponseError(RespStatus.INVALID_REQUEST, "startSlot < genesis");
   }
 
-  const maxRequestBlobSidecars = config.getValue(config.getForkName(startSlot), "MAX_REQUEST_BLOB_SIDECARS");
+  const maxRequestBlobSidecars = config.getMaxRequestBlobSidecars(config.getForkName(startSlot));
 
   if (count > maxRequestBlobSidecars) {
     count = maxRequestBlobSidecars;

packages/beacon-node/src/util/types.ts

@@ -16,5 +16,5 @@ export const signedBLSToExecutionChangeVersionedType = new ContainerType(
 export type SignedBLSToExecutionChangeVersioned = ValueOf<typeof signedBLSToExecutionChangeVersionedType>;
 
 export const BlobSidecarsByRootRequestType = (fork: ForkName, config: BeaconConfig) =>
-  new ListCompositeType(ssz.deneb.BlobIdentifier, config.getValue(fork, "MAX_REQUEST_BLOB_SIDECARS"));
+  new ListCompositeType(ssz.deneb.BlobIdentifier, config.getMaxRequestBlobSidecars(fork));
 export type BlobSidecarsByRootRequest = ValueOf<ReturnType<typeof BlobSidecarsByRootRequestType>>;

packages/config/src/forkConfig/index.ts

@@ -14,7 +14,7 @@ import {
 } from "@lodestar/params";
 import {Epoch, SSZTypesFor, Slot, Version, sszTypesFor} from "@lodestar/types";
 import {ChainConfig} from "../chainConfig/index.js";
-import {ConfigValue, ForkConfig, ForkInfo} from "./types.js";
+import {ForkConfig, ForkInfo} from "./types.js";
 
 export * from "./types.js";
 
@@ -130,15 +130,11 @@ export function createForkConfig(config: ChainConfig): ForkConfig {
       }
       return sszTypesFor(forkName);
     },
-    getValue<K extends keyof ConfigValue>(fork: ForkName, name: K): ConfigValue[K] {
-      switch (name) {
-        case "MAX_BLOBS_PER_BLOCK":
-          return isForkPostElectra(fork) ? config.MAX_BLOBS_PER_BLOCK_ELECTRA : config.MAX_BLOBS_PER_BLOCK;
-        case "MAX_REQUEST_BLOB_SIDECARS":
-          return isForkPostElectra(fork) ? config.MAX_REQUEST_BLOB_SIDECARS_ELECTRA : config.MAX_REQUEST_BLOB_SIDECARS;
-        default:
-          throw Error(`Config value "${name}" does not exist`);
-      }
+    getMaxBlobsPerBlock(fork: ForkName): number {
+      return isForkPostElectra(fork) ? config.MAX_BLOBS_PER_BLOCK_ELECTRA : config.MAX_BLOBS_PER_BLOCK;
+    },
+    getMaxRequestBlobSidecars(fork: ForkName): number {
+      return isForkPostElectra(fork) ? config.MAX_REQUEST_BLOB_SIDECARS_ELECTRA : config.MAX_REQUEST_BLOB_SIDECARS;
     },
   };
 }

packages/config/src/forkConfig/types.ts

@@ -10,12 +10,6 @@ export type ForkInfo = {
   prevForkName: ForkName;
 };
 
-/** Set of config values that frequently change across hard-forks */
-export type ConfigValue = {
-  MAX_BLOBS_PER_BLOCK: number;
-  MAX_REQUEST_BLOB_SIDECARS: number;
-};
-
 /**
  * Fork schedule and helper methods
  */
@@ -45,6 +39,8 @@ export type ForkConfig = {
   getExecutionForkTypes(slot: Slot): SSZTypesFor<ForkExecution>;
   /** Get blobs SSZ types by hard-fork*/
   getBlobsForkTypes(slot: Slot): SSZTypesFor<ForkBlobs>;
-  /** Get config value by hard-fork */
-  getValue<K extends keyof ConfigValue>(fork: ForkName, name: K): ConfigValue[K];
+  /** Get max blobs per block by hard-fork */
+  getMaxBlobsPerBlock(fork: ForkName): number;
+  /** Get max request blob sidecars by hard-fork */
+  getMaxRequestBlobSidecars(fork: ForkName): number;
 };

packages/state-transition/src/block/processExecutionPayload.ts

@@ -49,7 +49,7 @@ export function processExecutionPayload(
   }
 
   if (isForkBlobs(forkName)) {
-    const maxBlobsPerBlock = state.config.getValue(forkName, "MAX_BLOBS_PER_BLOCK");
+    const maxBlobsPerBlock = state.config.getMaxBlobsPerBlock(forkName);
     const blobKzgCommitmentsLen = (body as deneb.BeaconBlockBody).blobKzgCommitments?.length ?? 0;
     if (blobKzgCommitmentsLen > maxBlobsPerBlock) {
       throw Error(`blobKzgCommitmentsLen exceeds limit=${maxBlobsPerBlock}`);