Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions packages/beacon-node/src/api/impl/beacon/blocks/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
signedBlockToSignedHeader,
} from "@lodestar/state-transition";
import {
DataColumnSidecars,
ProducedBlockSource,
SignedBeaconBlock,
SignedBlindedBeaconBlock,
Expand All @@ -30,6 +31,7 @@ import {
fulu,
gloas,
isDenebBlockContents,
isGloasDataColumnSidecar,
sszTypesFor,
} from "@lodestar/types";
import {fromHex, sleep, toHex, toRootHex} from "@lodestar/utils";
Expand Down Expand Up @@ -103,7 +105,7 @@ export function getBeaconBlockApi({
seenTimestampSec,
blockRootHex: blockRoot,
});
let blobSidecars: deneb.BlobSidecars, dataColumnSidecars: fulu.DataColumnSidecars;
let blobSidecars: deneb.BlobSidecars, dataColumnSidecars: DataColumnSidecars;

if (isDenebBlockContents(signedBlockContents)) {
if (isForkPostFulu(fork)) {
Expand Down Expand Up @@ -140,7 +142,8 @@ export function getBeaconBlockApi({
blockForImport.addColumn(
{
blockRootHex: blockRoot,
columnSidecar: dataColumnSidecar,
// BlockInputColumns is fulu-only, safe to narrow
columnSidecar: dataColumnSidecar as fulu.DataColumnSidecar,
source: BlockInputSource.api,
seenTimestampSec,
},
Expand Down Expand Up @@ -350,7 +353,9 @@ export function getBeaconBlockApi({
blockRoot,
slot,
index: dataColumnSidecar.index,
kzgCommitments: dataColumnSidecar.kzgCommitments.map(toHex),
kzgCommitments: isGloasDataColumnSidecar(dataColumnSidecar)
? []
: dataColumnSidecar.kzgCommitments.map(toHex),
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/beacon-node/src/chain/chain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ export class BeaconChain implements IBeaconChain {
if (!isBlockInputColumns(blockInput)) {
throw new Error(`Expected block input to have columns: slot=${blockSlot} root=${blockRootHex}`);
}
return blockInput.getAllColumns();
return blockInput.getAllColumns() as DataColumnSidecars;
}
const sidecarsUnfinalized = await this.db.dataColumnSidecar.values(fromHex(blockRootHex));
if (sidecarsUnfinalized.length > 0) {
Expand Down
4 changes: 2 additions & 2 deletions packages/beacon-node/src/chain/emitter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {StrictEventEmitter} from "strict-event-emitter-types";
import {routes} from "@lodestar/api";
import {CheckpointWithHex} from "@lodestar/fork-choice";
import {CachedBeaconStateAllForks} from "@lodestar/state-transition";
import {DataColumnSidecars, RootHex, deneb, phase0} from "@lodestar/types";
import {DataColumnSidecar, RootHex, deneb, phase0} from "@lodestar/types";
import {PeerIdStr} from "../util/peerId.js";
import {BlockInputSource, IBlockInput} from "./blocks/blockInput/types.js";

Expand Down Expand Up @@ -88,7 +88,7 @@ export type IChainEvents = ApiEvents & {

[ChainEvent.updateTargetCustodyGroupCount]: (targetGroupCount: number) => void;

[ChainEvent.publishDataColumns]: (sidecars: DataColumnSidecars) => void;
[ChainEvent.publishDataColumns]: (sidecars: DataColumnSidecar[]) => void;

[ChainEvent.publishBlobSidecars]: (sidecars: deneb.BlobSidecar[]) => void;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {LodestarError, Logger, byteArrayEquals, pruneSetToMax} from "@lodestar/u
import {Metrics} from "../../metrics/metrics.js";
import {MAX_LOOK_AHEAD_EPOCHS} from "../../sync/constants.js";
import {IClock} from "../../util/clock.js";
import {CustodyConfig} from "../../util/dataColumns.js";
import {CustodyConfig, getDataColumnSidecarSlot} from "../../util/dataColumns.js";
import {
BlockInput,
BlockInputBlobs,
Expand Down Expand Up @@ -315,7 +315,7 @@ export class SeenBlockInput {
let created = false;
if (!blockInput) {
created = true;
const {forkName, daOutOfRange} = this.buildCommonProps(columnSidecar.signedBlockHeader.message.slot);
const {forkName, daOutOfRange} = this.buildCommonProps(getDataColumnSidecarSlot(columnSidecar));
blockInput = BlockInputColumns.createFromColumn({
columnSidecar,
blockRootHex,
Expand Down
Loading
Loading