@lodestar/beacon-node 1.48.0-dev.9b2790203a → 1.48.0-dev.9e31f255e3

package/src/chain/validation/executionPayloadEnvelope.ts

@@ -1,11 +1,4 @@
 import {PayloadStatus} from "@lodestar/fork-choice";
-import {
-  MAX_BUILDER_DEPOSIT_REQUESTS_PER_PAYLOAD,
-  MAX_BUILDER_EXIT_REQUESTS_PER_PAYLOAD,
-  MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD,
-  MAX_WITHDRAWALS_PER_PAYLOAD,
-  MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD,
-} from "@lodestar/params";
 import {
   computeStartSlotAtEpoch,
   getExecutionPayloadEnvelopeSignatureSet,
@@ -89,6 +82,8 @@ async function validateExecutionPayloadEnvelope(
   if (block.slot !== payload.slotNumber) {
     throw new ExecutionPayloadEnvelopeError(GossipAction.REJECT, {
       code: ExecutionPayloadEnvelopeErrorCode.SLOT_MISMATCH,
+      slot: payload.slotNumber,
+      root: blockRootHex,
       envelopeSlot: payload.slotNumber,
       blockSlot: block.slot,
     });
@@ -98,6 +93,8 @@ async function validateExecutionPayloadEnvelope(
   if (envelope.builderIndex !== payloadInput.getBuilderIndex()) {
     throw new ExecutionPayloadEnvelopeError(GossipAction.REJECT, {
       code: ExecutionPayloadEnvelopeErrorCode.BUILDER_INDEX_MISMATCH,
+      slot: payload.slotNumber,
+      root: blockRootHex,
       envelopeBuilderIndex: envelope.builderIndex,
       bidBuilderIndex: payloadInput.getBuilderIndex(),
     });
@@ -107,6 +104,8 @@ async function validateExecutionPayloadEnvelope(
   if (toRootHex(payload.blockHash) !== payloadInput.getBlockHashHex()) {
     throw new ExecutionPayloadEnvelopeError(GossipAction.REJECT, {
       code: ExecutionPayloadEnvelopeErrorCode.BLOCK_HASH_MISMATCH,
+      slot: payload.slotNumber,
+      root: blockRootHex,
       envelopeBlockHash: toRootHex(payload.blockHash),
       bidBlockHash: payloadInput.getBlockHashHex(),
     });
@@ -117,41 +116,13 @@ async function validateExecutionPayloadEnvelope(
   if (!byteArrayEquals(requestsRoot, payloadInput.getBid().executionRequestsRoot)) {
     throw new ExecutionPayloadEnvelopeError(GossipAction.REJECT, {
       code: ExecutionPayloadEnvelopeErrorCode.EXECUTION_REQUESTS_ROOT_MISMATCH,
+      slot: payload.slotNumber,
+      root: blockRootHex,
       envelopeRequestsRoot: toRootHex(requestsRoot),
       bidRequestsRoot: toRootHex(payloadInput.getBid().executionRequestsRoot),
     });
   }
 
-  // [REJECT] The counts of `execution_requests` are within their respective limits.
-  // New in Gloas:EIP7688 — progressive lists are unbounded at the type level, so bounds
-  // are enforced here in gossip validation.
-  const {executionRequests} = envelope;
-  const requestCountLimits: [string, number, number][] = [
-    ["withdrawals", executionRequests.withdrawals.length, MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD],
-    ["consolidations", executionRequests.consolidations.length, MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD],
-    ["builderDeposits", executionRequests.builderDeposits.length, MAX_BUILDER_DEPOSIT_REQUESTS_PER_PAYLOAD],
-    ["builderExits", executionRequests.builderExits.length, MAX_BUILDER_EXIT_REQUESTS_PER_PAYLOAD],
-  ];
-  for (const [name, count, limit] of requestCountLimits) {
-    if (count > limit) {
-      throw new ExecutionPayloadEnvelopeError(GossipAction.REJECT, {
-        code: ExecutionPayloadEnvelopeErrorCode.EXECUTION_REQUESTS_COUNT_EXCEEDED,
-        name,
-        count,
-        limit,
-      });
-    }
-  }
-
-  // [REJECT] The number of withdrawals is within the limit.
-  if (payload.withdrawals.length > MAX_WITHDRAWALS_PER_PAYLOAD) {
-    throw new ExecutionPayloadEnvelopeError(GossipAction.REJECT, {
-      code: ExecutionPayloadEnvelopeErrorCode.WITHDRAWALS_COUNT_EXCEEDED,
-      count: payload.withdrawals.length,
-      limit: MAX_WITHDRAWALS_PER_PAYLOAD,
-    });
-  }
-
   // Get the block state to verify the builder's signature.
   const blockState = await chain.regen
     .getState(block.stateRoot, RegenCaller.validateGossipPayloadEnvelope)
@@ -178,6 +149,8 @@ async function validateExecutionPayloadEnvelope(
   if (!(await chain.bls.verifySignatureSets([signatureSet], {verifyOnMainThread: true}))) {
     throw new ExecutionPayloadEnvelopeError(GossipAction.REJECT, {
       code: ExecutionPayloadEnvelopeErrorCode.INVALID_SIGNATURE,
+      slot: payload.slotNumber,
+      root: blockRootHex,
     });
   }
 }

package/src/db/beacon.ts

@@ -1,6 +1,11 @@
 import {ChainForkConfig} from "@lodestar/config";
 import {Db, LevelDbControllerMetrics, encodeKey} from "@lodestar/db";
+import {Slot} from "@lodestar/types";
+import {Logger} from "@lodestar/utils";
 import {Bucket} from "./buckets.js";
+import {type IDataColumnStore, LegacyDataColumnStore} from "./dataColumnStore.js";
+import {FlatFileStore} from "./flatFileStore/flatFileStore.js";
+import type {FlatFileStoreMetrics} from "./flatFileStore/metrics.js";
 import {IBeaconDb} from "./interface.js";
 import {CheckpointStateRepository} from "./repositories/checkpointState.js";
 import {
@@ -24,9 +29,10 @@ import {
   VoluntaryExitRepository,
 } from "./repositories/index.js";
 
-export type BeaconDbModules = {
-  config: ChainForkConfig;
-  db: Db;
+export type BeaconDbOpts = {
+  dataColumnDir: string;
+  logger: Logger;
+  metrics?: FlatFileStoreMetrics | null;
 };
 
 export class BeaconDb implements IBeaconDb {
@@ -57,9 +63,14 @@ export class BeaconDb implements IBeaconDb {
 
   backfilledRanges: BackfilledRanges;
 
+  readonly dataColumns: IDataColumnStore;
+  lastLegacyArchiveSlot: Slot | null = null;
+  private readonly flatFileStore: FlatFileStore;
+
   constructor(
     config: ChainForkConfig,
-    protected readonly db: Db
+    protected readonly db: Db,
+    opts: BeaconDbOpts
   ) {
     // Warning: If code is ever run in the constructor, must change this stub to not extend 'packages/beacon-node/test/utils/stub/beaconDb.ts' -
     this.block = new BlockRepository(config, db);
@@ -87,14 +98,30 @@ export class BeaconDb implements IBeaconDb {
     this.syncCommitteeWitness = new SyncCommitteeWitnessRepository(config, db);
 
     this.backfilledRanges = new BackfilledRanges(config, db);
+
+    this.flatFileStore = new FlatFileStore(opts.dataColumnDir, config, opts.logger, opts.metrics);
+    this.dataColumns = new LegacyDataColumnStore(
+      this.flatFileStore,
+      this.dataColumnSidecar,
+      this.dataColumnSidecarArchive,
+      this.blockArchive
+    );
+  }
+
+  async init(): Promise<void> {
+    await this.flatFileStore.init();
+    const [lastLegacyKey] = await this.dataColumnSidecarArchive.keys({reverse: true, limit: 1});
+    this.lastLegacyArchiveSlot = lastLegacyKey?.prefix ?? null;
   }
 
-  close(): Promise<void> {
+  async close(): Promise<void> {
+    await this.flatFileStore.close();
     return this.db.close();
   }
 
-  setMetrics(metrics: LevelDbControllerMetrics): void {
+  setMetrics(metrics: LevelDbControllerMetrics, flatFileStoreMetrics: FlatFileStoreMetrics | null = null): void {
     this.db.setMetrics(metrics);
+    this.flatFileStore.setMetrics(flatFileStoreMetrics);
   }
 
   async pruneHotDb(): Promise<void> {

package/src/db/dataColumnStore.ts

@@ -0,0 +1,113 @@
+import {ColumnIndex, DataColumnSidecar, RootHex, Slot} from "@lodestar/types";
+import {fromHex} from "@lodestar/utils";
+import type {IFlatFileStore} from "./flatFileStore/interface.js";
+import type {
+  BlockArchiveRepository,
+  DataColumnSidecarArchiveRepository,
+  DataColumnSidecarRepository,
+} from "./repositories/index.js";
+
+export type DataColumnKey = {slot: Slot; blockRoot: RootHex};
+export type IndexedDataColumnBytes = {index: ColumnIndex; data: Uint8Array};
+
+type LegacyHotDataColumnStore = Pick<DataColumnSidecarRepository, "values" | "getManyBinary" | "deleteMany">;
+type LegacyArchiveDataColumnStore = Pick<
+  DataColumnSidecarArchiveRepository,
+  "values" | "getManyBinary" | "keys" | "deleteMany"
+>;
+type BlockRootIndex = Pick<BlockArchiveRepository, "getSlotByRoot">;
+
+export interface IDataColumnStore {
+  getAll(key: DataColumnKey): Promise<DataColumnSidecar[]>;
+  getManyBinary(key: DataColumnKey, indices: ColumnIndex[]): Promise<(Uint8Array | undefined)[]>;
+  putManyBinary(key: DataColumnKey, columns: IndexedDataColumnBytes[]): Promise<void>;
+  deleteMany(keys: DataColumnKey[]): Promise<void>;
+  pruneBefore(slot: Slot): Promise<Slot[]>;
+}
+
+/**
+ * Bridges pre-flat-file LevelDB columns during the supported in-place upgrade window.
+ * Remove the legacy repositories after upgrades from the last pre-flat-file release are no longer supported.
+ */
+export class LegacyDataColumnStore implements IDataColumnStore {
+  constructor(
+    private readonly flatFiles: IFlatFileStore,
+    private readonly legacyHot: LegacyHotDataColumnStore,
+    private readonly legacyArchive: LegacyArchiveDataColumnStore,
+    private readonly blockArchive: BlockRootIndex
+  ) {}
+
+  async getAll({slot, blockRoot}: DataColumnKey): Promise<DataColumnSidecar[]> {
+    const sidecars = await this.flatFiles.getDataColumns(slot, blockRoot);
+    if (sidecars.length > 0) return sidecars;
+
+    const sidecarsByIndex = new Map<ColumnIndex, DataColumnSidecar>();
+    const root = fromHex(blockRoot);
+    for (const sidecar of await this.legacyHot.values(root)) {
+      if (!sidecarsByIndex.has(sidecar.index)) sidecarsByIndex.set(sidecar.index, sidecar);
+    }
+
+    if ((await this.blockArchive.getSlotByRoot(root)) === slot) {
+      for (const sidecar of await this.legacyArchive.values(slot)) {
+        if (!sidecarsByIndex.has(sidecar.index)) sidecarsByIndex.set(sidecar.index, sidecar);
+      }
+    }
+
+    return [...sidecarsByIndex.values()].sort((a, b) => a.index - b.index);
+  }
+
+  async getManyBinary({slot, blockRoot}: DataColumnKey, indices: ColumnIndex[]): Promise<(Uint8Array | undefined)[]> {
+    const flatFileSidecars = await this.flatFiles.getDataColumnsBinary(slot, blockRoot, indices);
+    if (flatFileSidecars !== null) return flatFileSidecars;
+    if (indices.length === 0) return [];
+
+    const root = fromHex(blockRoot);
+    const result = await this.legacyHot.getManyBinary(root, indices);
+
+    const missingPositions = getMissingPositions(result);
+    if (missingPositions.length === 0 || (await this.blockArchive.getSlotByRoot(root)) !== slot) return result;
+
+    const archivedSidecars = await this.legacyArchive.getManyBinary(
+      slot,
+      missingPositions.map((position) => indices[position])
+    );
+    fillMissing(result, missingPositions, archivedSidecars);
+    return result;
+  }
+
+  async putManyBinary({slot, blockRoot}: DataColumnKey, columns: IndexedDataColumnBytes[]): Promise<void> {
+    await this.flatFiles.putDataColumnsBinary(slot, blockRoot, columns);
+  }
+
+  async deleteMany(keys: DataColumnKey[]): Promise<void> {
+    await this.flatFiles.deleteMany(keys);
+    await this.legacyHot.deleteMany(keys.map(({blockRoot}) => fromHex(blockRoot)));
+  }
+
+  async pruneBefore(slot: Slot): Promise<Slot[]> {
+    const flatFileSlots = await this.flatFiles.pruneBefore(slot);
+    const prefixedKeys = await this.legacyArchive.keys({lt: {prefix: slot, id: 0}});
+    const slots = [...new Set(prefixedKeys.map(({prefix}) => prefix))];
+    if (slots.length > 0) await this.legacyArchive.deleteMany(slots);
+    return [...new Set([...flatFileSlots, ...slots])].sort((a, b) => a - b);
+  }
+}
+
+function getMissingPositions(sidecars: (Uint8Array | undefined)[]): number[] {
+  const positions: number[] = [];
+  for (let i = 0; i < sidecars.length; i++) {
+    if (sidecars[i] === undefined) positions.push(i);
+  }
+  return positions;
+}
+
+function fillMissing(
+  result: (Uint8Array | undefined)[],
+  missingPositions: number[],
+  sidecars: (Uint8Array | null | undefined)[]
+): void {
+  for (let i = 0; i < missingPositions.length; i++) {
+    const sidecar = sidecars[i];
+    if (sidecar != null) result[missingPositions[i]] = sidecar;
+  }
+}

package/src/db/flatFileStore/atomicWrite.ts

@@ -0,0 +1,65 @@
+import {mkdir, open, rename, rm} from "node:fs/promises";
+import path from "node:path";
+
+const pendingDirectorySyncs = new Map<string, string[]>();
+
+/**
+ * Atomic write: write to `.part` temp file -> datasync -> rename to target.
+ * This guarantees crash-safe writes — if the process crashes mid-write,
+ * only the `.part` file is corrupted, never the target.
+ */
+export async function atomicWrite(targetPath: string, data: Uint8Array): Promise<void> {
+  const dir = path.dirname(targetPath);
+  const partPath = `${targetPath}.part-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
+  await mkdirDurable(dir);
+
+  try {
+    const fd = await open(partPath, "wx");
+    try {
+      await fd.writeFile(data);
+      await fd.datasync();
+    } finally {
+      await fd.close();
+    }
+
+    await rename(partPath, targetPath);
+
+    // Ensure rename metadata is durable on crash.
+    await syncDirectory(dir);
+  } catch (e) {
+    await rm(partPath, {force: true}).catch(() => {});
+    throw e;
+  }
+}
+
+export async function mkdirDurable(dir: string): Promise<void> {
+  const targetDir = path.resolve(dir);
+  let directoriesToSync = pendingDirectorySyncs.get(targetDir);
+  if (directoriesToSync === undefined) {
+    const firstCreatedDir = await mkdir(targetDir, {recursive: true});
+    if (firstCreatedDir === undefined) return;
+
+    let createdDir = path.resolve(firstCreatedDir);
+    directoriesToSync = [path.dirname(createdDir)];
+    while (createdDir !== targetDir) {
+      directoriesToSync.push(createdDir);
+      const [nextSegment] = path.relative(createdDir, targetDir).split(path.sep);
+      createdDir = path.join(createdDir, nextSegment);
+    }
+    pendingDirectorySyncs.set(targetDir, directoriesToSync);
+  }
+
+  for (const directory of directoriesToSync) {
+    await syncDirectory(directory);
+  }
+  pendingDirectorySyncs.delete(targetDir);
+}
+
+async function syncDirectory(dir: string): Promise<void> {
+  const dirFd = await open(dir, "r");
+  try {
+    await dirFd.sync();
+  } finally {
+    await dirFd.close();
+  }
+}