Update code as per feedback

packages/types/src/sszTypes.ts

@@ -143,17 +143,17 @@ export type SSZBlindedTypesFor<
   ? // It compiles fine, need to debug the error
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
-    {[K2 in keyof SSZBlindedTypesByFork[F]]: UnionForksTypeOf<SSZBlindedTypesByFork[F][K2]>}
+    {[K2 in keyof SSZBlindedTypesByFork[F]]: UnionSSZForksTypeOf<SSZBlindedTypesByFork[F][K2]>}
   : // It compiles fine, need to debug the error
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
-    UnionForksTypeOf<SSZBlindedTypesByFork[F][Exclude<K, void>]>;
+    UnionSSZForksTypeOf<SSZBlindedTypesByFork[F][Exclude<K, void>]>;
 
 /**
  * A type of union of forks must accept as any parameter the UNION of all fork types.
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-type UnionForksTypeOf<UnionOfForkTypes extends ContainerType<any>> = CompositeType<
+type UnionSSZForksTypeOf<UnionOfForkTypes extends ContainerType<any>> = CompositeType<
   ValueOf<UnionOfForkTypes>,
   CompositeView<UnionOfForkTypes>,
   CompositeViewDU<UnionOfForkTypes>
@@ -169,11 +169,11 @@ export type SSZTypesFor<F extends ForkName, K extends keyof SSZTypesByFork[F] |
   ? // It compiles fine, need to debug the error
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
-    {[K2 in keyof SSZTypesByFork[F]]: UnionForksTypeOf<SSZTypesByFork[F][K2]>}
+    {[K2 in keyof SSZTypesByFork[F]]: UnionSSZForksTypeOf<SSZTypesByFork[F][K2]>}
   : // It compiles fine, need to debug the error
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
-    UnionForksTypeOf<SSZTypesByFork[F][Exclude<K, void>]>;
+    UnionSSZForksTypeOf<SSZTypesByFork[F][Exclude<K, void>]>;
 
 export function sszTypesFor<F extends ForkName, K extends keyof SSZTypesByFork[F] | void = void>(
   fork: F,

packages/types/src/types.ts

@@ -1,4 +1,4 @@
-import {ForkAll, ForkBlobs, ForkExecution, ForkLightClient, ForkName} from "@lodestar/params";
+import {ForkAll, ForkBlobs, ForkExecution, ForkLightClient, ForkName, ForkPreBlobs} from "@lodestar/params";
 import {ts as phase0} from "./phase0/index.js";
 import {ts as altair} from "./altair/index.js";
 import {ts as bellatrix} from "./bellatrix/index.js";
@@ -159,11 +159,11 @@ export type BlockContents<F extends ForkBlobs = ForkBlobs> = TypesByFork[F]["Blo
 export type SignedBlockContents<F extends ForkBlobs = ForkBlobs> = TypesByFork[F]["SignedBlockContents"];
 export type SignedOrUnsignedBlockContents<F extends ForkBlobs = ForkBlobs> = BlockContents<F> | SignedBlockContents<F>;
 
-export type BeaconBlockOrContents<FB extends ForkAll = ForkAll, FC extends ForkBlobs = ForkBlobs> =
+export type BeaconBlockOrContents<FB extends ForkPreBlobs = ForkPreBlobs, FC extends ForkBlobs = ForkBlobs> =
   | BeaconBlock<FB>
   | BlockContents<FC>;
 
-export type SignedBeaconBlockOrContents<FB extends ForkAll = ForkAll, FC extends ForkBlobs = ForkBlobs> =
+export type SignedBeaconBlockOrContents<FB extends ForkPreBlobs = ForkPreBlobs, FC extends ForkBlobs = ForkBlobs> =
   | SignedBeaconBlock<FB>
   | SignedBlockContents<FC>;