github/lodestar
1
1
Fork 0
mirror of https://github.com/ChainSafe/lodestar.git synced 2026-01-09 15:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: fulu fork guards (#8125)

Browse Source 
**Motivation**

Address peerDAS PR comments
https://github.com/ChainSafe/lodestar/pull/6353#discussion_r2257781772
https://github.com/ChainSafe/lodestar/pull/6353#discussion_r2255212093
https://github.com/ChainSafe/lodestar/pull/6353#discussion_r2255234191
This commit is contained in:
Matthew Keil
2025-08-07 09:23:31 -04:00
committed by GitHub
parent 3928be9bd0
commit 3e833908c8
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/beacon-node/src/api/impl/beacon/blocks/index.ts
View File

@@ -304,9 +304,9 @@ export function getBeaconBlockApi({
}
} else if (
chain.emitter.listenerCount(routes.events.EventType.dataColumnSidecar) &&
blockForImport.blockData.fork === ForkName.fulu
isForkPostFulu(blockForImport.blockData.fork)
) {
const {dataColumns} = blockForImport.blockData;
const {dataColumns} = blockForImport.blockData as BlockInputDataColumns;
metrics?.dataColumns.bySource.inc({source: DataColumnsSource.api}, dataColumns.length);
for (const dataColumnSidecar of dataColumns) {

4
packages/beacon-node/src/chain/blocks/verifyBlocksDataAvailability.ts
View File

@@ -1,5 +1,5 @@
import {ChainForkConfig} from "@lodestar/config";
import {ForkName} from "@lodestar/params";
import {ForkName, isForkPostFulu} from "@lodestar/params";
import {DataAvailabilityStatus, computeTimeAtSlot} from "@lodestar/state-transition";
import {UintNum64, deneb} from "@lodestar/types";
import {ErrorAborted, Logger} from "@lodestar/utils";
@@ -122,7 +122,7 @@ async function maybeValidateBlobs(
// but other checks to match blobs with block data still need to be performed
const skipProofsCheck = opts.validBlobSidecars === BlobSidecarValidation.Individual;
await validateBlobSidecars(blockSlot, beaconBlockRoot, blobKzgCommitments, blobs, {skipProofsCheck});
} else if (blockData.fork === ForkName.fulu) {
} else if (isForkPostFulu(blockData.fork)) {
const {dataColumns} = blockData as BlockInputDataColumns;
const skipProofsCheck = opts.validBlobSidecars === BlobSidecarValidation.Individual;
await validateDataColumnsSidecars(blockSlot, beaconBlockRoot, blobKzgCommitments, dataColumns, chain.metrics, {

8
packages/params/src/forkName.ts
View File

@@ -110,14 +110,6 @@ export function isForkPostFulu(fork: ForkName): fork is ForkPostFulu {
return isForkPostElectra(fork) && fork !== ForkName.electra;
}
export type ForkPreBlobs = ForkPreDeneb;
export type ForkPostBlobs = ForkPostFulu;
export type ForkBlobs = ForkName.deneb | ForkName.electra;
export const forkBlobs = [ForkName.deneb, ForkName.electra];
export function isForkBlobs(fork: ForkName): fork is ForkBlobs {
return fork === ForkName.deneb || fork === ForkName.electra;
}
/*
* Aliases only exported for backwards compatibility. This will be removed in
* lodestar v2.0. The types and guards above should be used in all places as