rebase fixes

Author: g11tech

packages/beacon-node/src/chain/blocks/types.ts

@@ -48,7 +48,7 @@ export type DataColumnsCacheMap = Map<
   {dataColumnSidecar: electra.DataColumnSidecar; dataColumnBytes: Uint8Array | null}
 >;
 
-type ForkBlobsInfo = {fork: ForkName.deneb | ForkName.electra};
+type ForkBlobsInfo = {fork: ForkName.deneb};
 type BlobsData = {blobs: deneb.BlobSidecars; blobsBytes: (Uint8Array | null)[]; blobsSource: BlobsSource};
 export type BlockInputDataBlobs = ForkBlobsInfo & BlobsData;
 

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

@@ -163,7 +163,7 @@ export function matchBlockWithDataColumns(
   peerId: PeerIdStr,
   config: ChainForkConfig,
   custodyConfig: CustodyConfig,
-  allBlocks: WithBytes<allForks.SignedBeaconBlock>[],
+  allBlocks: WithBytes<SignedBeaconBlock>[],
   allDataColumnSidecars: electra.DataColumnSidecar[],
   endSlot: Slot,
   blockSource: BlockSource,

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

@@ -1,7 +1,7 @@
 import {digest as sha256Digest} from "@chainsafe/as-sha256";
 import {Tree} from "@chainsafe/persistent-merkle-tree";
 import {VERSIONED_HASH_VERSION_KZG, KZG_COMMITMENT_GINDEX0, KZG_COMMITMENTS_GINDEX, ForkName, ForkAll, NUMBER_OF_COLUMNS} from "@lodestar/params";
-import {deneb, ssz, BeaconBlockBody, SignedBeaconBlock, SSZTypesFor} from "@lodestar/types";
+import {deneb, ssz, BeaconBlockBody, SignedBeaconBlock, SSZTypesFor, electra} from "@lodestar/types";
 import {ChainForkConfig} from "@lodestar/config";
 import {signedBlockToSignedHeader} from "@lodestar/state-transition";
 import {ckzg} from "./kzg.js";