@lodestar/beacon-node 1.36.0-dev.797fa46c1b → 1.36.0-dev.801b1f4f52

package/lib/sync/utils/downloadByRoot.js

@@ -1,6 +1,6 @@
 import { routes } from "@lodestar/api";
 import { isForkPostDeneb, isForkPostFulu, } from "@lodestar/params";
-import { LodestarError, fromHex, prettyBytes, prettyPrintIndices, toHex, toRootHex } from "@lodestar/utils";
+import { LodestarError, fromHex, prettyPrintIndices, toHex, toRootHex } from "@lodestar/utils";
 import { isBlockInputBlobs, isBlockInputColumns } from "../../chain/blocks/blockInput/blockInput.js";
 import { BlockInputSource } from "../../chain/blocks/blockInput/types.js";
 import { validateBlockBlobSidecars } from "../../chain/validation/blobSidecar.js";
@@ -8,12 +8,13 @@ import { validateBlockDataColumnSidecars } from "../../chain/validation/dataColu
 import { prettyPrintPeerIdStr } from "../../network/util.js";
 import { byteArrayEquals } from "../../util/bytes.js";
 import { PendingBlockInputStatus, getBlockInputSyncCacheItemRootHex, isPendingBlockInput, } from "../types.js";
-export async function downloadByRoot({ config, seenCache, network, emitter, peerMeta, cacheItem, }) {
+export async function downloadByRoot({ config, chain, network, emitter, peerMeta, cacheItem, }) {
     const rootHex = getBlockInputSyncCacheItemRootHex(cacheItem);
     const blockRoot = fromHex(rootHex);
     const { peerId: peerIdStr } = peerMeta;
     const { result: { block, blobSidecars, columnSidecars }, warnings, } = await fetchByRoot({
         config,
+        chain,
         network,
         cacheItem,
         blockRoot,
@@ -33,7 +34,7 @@ export async function downloadByRoot({ config, seenCache, network, emitter, peer
         }
     }
     else {
-        blockInput = seenCache.getByBlock({
+        blockInput = chain.seenBlockInputCache.getByBlock({
             block,
             peerIdStr,
             blockRootHex: rootHex,
@@ -47,7 +48,7 @@ export async function downloadByRoot({ config, seenCache, network, emitter, peer
         if (!blobSidecars) {
             throw new DownloadByRootError({
                 code: DownloadByRootErrorCode.MISSING_BLOB_RESPONSE,
-                blockRoot: prettyBytes(rootHex),
+                blockRoot: rootHex,
                 peer: peerIdStr,
             });
         }
@@ -81,7 +82,7 @@ export async function downloadByRoot({ config, seenCache, network, emitter, peer
         if (!columnSidecars) {
             throw new DownloadByRootError({
                 code: DownloadByRootErrorCode.MISSING_COLUMN_RESPONSE,
-                blockRoot: prettyBytes(rootHex),
+                blockRoot: rootHex,
                 peer: peerIdStr,
             });
         }
@@ -128,7 +129,7 @@ export async function downloadByRoot({ config, seenCache, network, emitter, peer
         warnings,
     };
 }
-export async function fetchByRoot({ config, network, peerMeta, blockRoot, cacheItem, }) {
+export async function fetchByRoot({ config, chain, network, peerMeta, blockRoot, cacheItem, }) {
     let block;
     let blobSidecars;
     let columnSidecarResult;
@@ -150,6 +151,7 @@ export async function fetchByRoot({ config, network, peerMeta, blockRoot, cacheI
             if (isBlockInputBlobs(cacheItem.blockInput)) {
                 blobSidecars = await fetchAndValidateBlobs({
                     config,
+                    chain,
                     network,
                     peerIdStr,
                     forkName: forkName,
@@ -161,6 +163,7 @@ export async function fetchByRoot({ config, network, peerMeta, blockRoot, cacheI
             if (isBlockInputColumns(cacheItem.blockInput)) {
                 columnSidecarResult = await fetchAndValidateColumns({
                     config,
+                    chain,
                     network,
                     peerMeta,
                     forkName: forkName,
@@ -182,6 +185,7 @@ export async function fetchByRoot({ config, network, peerMeta, blockRoot, cacheI
         if (isForkPostFulu(forkName)) {
             columnSidecarResult = await fetchAndValidateColumns({
                 config,
+                chain,
                 network,
                 peerMeta,
                 forkName,
@@ -195,6 +199,7 @@ export async function fetchByRoot({ config, network, peerMeta, blockRoot, cacheI
             const blobCount = commitments.length;
             blobSidecars = await fetchAndValidateBlobs({
                 config,
+                chain,
                 network,
                 peerIdStr,
                 forkName: forkName,
@@ -220,7 +225,7 @@ export async function fetchAndValidateBlock({ config, network, peerIdStr, blockR
         throw new DownloadByRootError({
             code: DownloadByRootErrorCode.MISSING_BLOCK_RESPONSE,
             peer: prettyPrintPeerIdStr(peerIdStr),
-            blockRoot: prettyBytes(blockRoot),
+            blockRoot: toRootHex(blockRoot),
         });
     }
     const receivedRoot = config.getForkTypes(block.message.slot).BeaconBlock.hashTreeRoot(block.message);
@@ -228,20 +233,20 @@ export async function fetchAndValidateBlock({ config, network, peerIdStr, blockR
         throw new DownloadByRootError({
             code: DownloadByRootErrorCode.MISMATCH_BLOCK_ROOT,
             peer: prettyPrintPeerIdStr(peerIdStr),
-            requestedBlockRoot: prettyBytes(blockRoot),
-            receivedBlockRoot: prettyBytes(toRootHex(receivedRoot)),
+            requestedBlockRoot: toRootHex(blockRoot),
+            receivedBlockRoot: toRootHex(receivedRoot),
         }, "block does not match requested root");
     }
     return block;
 }
-export async function fetchAndValidateBlobs({ network, peerIdStr, blockRoot, block, missing, }) {
+export async function fetchAndValidateBlobs({ chain, network, peerIdStr, blockRoot, block, missing, }) {
     const blobSidecars = await fetchBlobsByRoot({
         network,
         peerIdStr,
         blockRoot,
         missing,
     });
-    await validateBlockBlobSidecars(block.message.slot, blockRoot, missing.length, blobSidecars);
+    await validateBlockBlobSidecars(chain, block.message.slot, blockRoot, missing.length, blobSidecars);
     return blobSidecars;
 }
 export async function fetchBlobsByRoot({ network, peerIdStr, blockRoot, missing, indicesInPossession = [], }) {
@@ -253,7 +258,7 @@ export async function fetchBlobsByRoot({ network, peerIdStr, blockRoot, missing,
     }
     return await network.sendBlobSidecarsByRoot(peerIdStr, blobsRequest);
 }
-export async function fetchAndValidateColumns({ network, peerMeta, block, blockRoot, missing, }) {
+export async function fetchAndValidateColumns({ chain, network, peerMeta, block, blockRoot, missing, }) {
     const { peerId: peerIdStr } = peerMeta;
     const slot = block.message.slot;
     // TODO GLOAS: Get blob count from somewhere else since blobKzgCommitments is absent from block body
@@ -302,33 +307,13 @@ export async function fetchAndValidateColumns({ network, peerMeta, block, blockR
             invalidIndices: prettyPrintIndices(extraIndices),
         }, "Received columnSidecars that were not requested"));
     }
-    await validateBlockDataColumnSidecars(slot, blockRoot, blobCount, columnSidecars);
+    await validateBlockDataColumnSidecars(chain, slot, blockRoot, blobCount, columnSidecars);
     return { result: columnSidecars, warnings: warnings.length > 0 ? warnings : null };
 }
 // TODO(fulu) not in use, remove?
 export async function fetchColumnsByRoot({ network, peerMeta, blockRoot, missing, }) {
     return await network.sendDataColumnSidecarsByRoot(peerMeta.peerId, [{ blockRoot, columns: missing }]);
 }
-// TODO(fulu) not in use, remove?
-export async function validateColumnSidecars({ peerMeta, slot, blockRoot, blobCount, missing, needed = [], needToPublish = [], }) {
-    const requestedIndices = missing;
-    const extraIndices = [];
-    for (const columnSidecar of needed) {
-        if (!requestedIndices.includes(columnSidecar.index)) {
-            extraIndices.push(columnSidecar.index);
-        }
-    }
-    if (extraIndices.length > 0) {
-        throw new DownloadByRootError({
-            code: DownloadByRootErrorCode.EXTRA_SIDECAR_RECEIVED,
-            peer: prettyPrintPeerIdStr(peerMeta.peerId),
-            slot,
-            blockRoot: prettyBytes(blockRoot),
-            invalidIndices: prettyPrintIndices(extraIndices),
-        }, "Received a columnSidecar that was not requested");
-    }
-    await validateBlockDataColumnSidecars(slot, blockRoot, blobCount, [...needed, ...needToPublish]);
-}
 export var DownloadByRootErrorCode;
 (function (DownloadByRootErrorCode) {
     DownloadByRootErrorCode["MISMATCH_BLOCK_ROOT"] = "DOWNLOAD_BY_ROOT_ERROR_MISMATCH_BLOCK_ROOT";

package/lib/sync/utils/downloadByRoot.js.map

@@ -1 +1 @@
-{"version":3,"file":"downloadByRoot.js","sourceRoot":"","sources":["../../../src/sync/utils/downloadByRoot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"downloadByRoot.js","sourceRoot":"","sources":["../../../src/sync/utils/downloadByRoot.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.36.0-dev.797fa46c1b",
+  "version": "1.36.0-dev.801b1f4f52",
   "type": "module",
   "exports": {
     ".": {
@@ -129,7 +129,7 @@
     "@chainsafe/pubkey-index-map": "^3.0.0",
     "@chainsafe/ssz": "^1.2.2",
     "@chainsafe/threads": "^1.11.3",
-    "@crate-crypto/node-eth-kzg": "0.8.0",
+    "@crate-crypto/node-eth-kzg": "0.9.1",
     "@ethersproject/abi": "^5.7.0",
     "@fastify/bearer-auth": "^10.0.1",
     "@fastify/cors": "^10.0.1",
@@ -144,19 +144,19 @@
     "@libp2p/peer-id": "^5.1.0",
     "@libp2p/prometheus-metrics": "^4.3.15",
     "@libp2p/tcp": "^10.1.8",
-    "@lodestar/api": "1.36.0-dev.797fa46c1b",
+    "@lodestar/api": "1.36.0-dev.801b1f4f52",
     "@lodestar/bun": "git+https://github.com/ChainSafe/lodestar-bun.git",
-    "@lodestar/config": "1.36.0-dev.797fa46c1b",
-    "@lodestar/db": "1.36.0-dev.797fa46c1b",
-    "@lodestar/fork-choice": "1.36.0-dev.797fa46c1b",
-    "@lodestar/light-client": "1.36.0-dev.797fa46c1b",
-    "@lodestar/logger": "1.36.0-dev.797fa46c1b",
-    "@lodestar/params": "1.36.0-dev.797fa46c1b",
-    "@lodestar/reqresp": "1.36.0-dev.797fa46c1b",
-    "@lodestar/state-transition": "1.36.0-dev.797fa46c1b",
-    "@lodestar/types": "1.36.0-dev.797fa46c1b",
-    "@lodestar/utils": "1.36.0-dev.797fa46c1b",
-    "@lodestar/validator": "1.36.0-dev.797fa46c1b",
+    "@lodestar/config": "1.36.0-dev.801b1f4f52",
+    "@lodestar/db": "1.36.0-dev.801b1f4f52",
+    "@lodestar/fork-choice": "1.36.0-dev.801b1f4f52",
+    "@lodestar/light-client": "1.36.0-dev.801b1f4f52",
+    "@lodestar/logger": "1.36.0-dev.801b1f4f52",
+    "@lodestar/params": "1.36.0-dev.801b1f4f52",
+    "@lodestar/reqresp": "1.36.0-dev.801b1f4f52",
+    "@lodestar/state-transition": "1.36.0-dev.801b1f4f52",
+    "@lodestar/types": "1.36.0-dev.801b1f4f52",
+    "@lodestar/utils": "1.36.0-dev.801b1f4f52",
+    "@lodestar/validator": "1.36.0-dev.801b1f4f52",
     "@multiformats/multiaddr": "^12.1.3",
     "datastore-core": "^10.0.2",
     "datastore-fs": "^10.0.6",
@@ -192,5 +192,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "fa8a9e32618a2e426f7dad0d1314ea0d87ac0cc7"
+  "gitHead": "fcebba1a22e7cf95f34d100cad2a8a224571ab97"
 }

package/src/chain/errors/blobSidecarError.ts

@@ -50,9 +50,19 @@ export type BlobSidecarErrorType =
   | {code: BlobSidecarErrorCode.FUTURE_SLOT; blockSlot: Slot; currentSlot: Slot}
   | {code: BlobSidecarErrorCode.WOULD_REVERT_FINALIZED_SLOT; blockSlot: Slot; finalizedSlot: Slot}
   | {code: BlobSidecarErrorCode.ALREADY_KNOWN; root: RootHex}
-  | {code: BlobSidecarErrorCode.PARENT_UNKNOWN; parentRoot: RootHex}
+  | {
+      code: BlobSidecarErrorCode.PARENT_UNKNOWN;
+      parentRoot: RootHex;
+      slot: Slot;
+      blockRoot: RootHex;
+    }
   | {code: BlobSidecarErrorCode.NOT_LATER_THAN_PARENT; parentSlot: Slot; slot: Slot}
-  | {code: BlobSidecarErrorCode.PROPOSAL_SIGNATURE_INVALID}
+  | {
+      code: BlobSidecarErrorCode.PROPOSAL_SIGNATURE_INVALID;
+      blockRoot: RootHex;
+      slot: Slot;
+      index: number;
+    }
   | {code: BlobSidecarErrorCode.INCLUSION_PROOF_INVALID; slot: Slot; blobIdx: number}
   | {code: BlobSidecarErrorCode.INCORRECT_PROPOSER; proposerIndex: ValidatorIndex};
 

package/src/chain/errors/blockError.ts

@@ -87,7 +87,7 @@ export type BlockErrorType =
   | {code: BlockErrorCode.REPEAT_PROPOSAL; proposerIndex: ValidatorIndex}
   | {code: BlockErrorCode.BLOCK_SLOT_LIMIT_REACHED}
   | {code: BlockErrorCode.INCORRECT_PROPOSER; proposerIndex: ValidatorIndex}
-  | {code: BlockErrorCode.PROPOSAL_SIGNATURE_INVALID}
+  | {code: BlockErrorCode.PROPOSAL_SIGNATURE_INVALID; blockSlot: Slot}
   | {code: BlockErrorCode.UNKNOWN_PROPOSER; proposerIndex: ValidatorIndex}
   | {code: BlockErrorCode.INVALID_SIGNATURE; state: CachedBeaconStateAllForks}
   | {

package/src/chain/errors/dataColumnSidecarError.ts

@@ -12,10 +12,14 @@ export enum DataColumnSidecarErrorCode {
 
   // Validation errors when validating against an existing block
 
+  /** Block and sidecars header root mismatch */
+  INCORRECT_HEADER_ROOT = "DATA_COLUMN_SIDECAR_ERROR_INCORRECT_HEADER_ROOT",
   /** Block and sidecars data column count mismatch */
   INCORRECT_SIDECAR_COUNT = "DATA_COLUMN_SIDECAR_ERROR_INCORRECT_SIDECAR_COUNT",
   /** Sidecar doesn't match block */
   INCORRECT_BLOCK = "DATA_COLUMN_SIDECAR_ERROR_INCORRECT_BLOCK",
+  /** Sidecar cell count not as expected */
+  INCORRECT_CELL_COUNT = "DATA_COLUMN_SIDECAR_ERROR_INCORRECT_CELL_COUNT",
   /** Sidecar kzg proof count not as expected */
   INCORRECT_KZG_COMMITMENTS_COUNT = "DATA_COLUMN_SIDECAR_ERROR_INCORRECT_KZG_COMMITMENTS_COUNT",
   /** Sidecar kzg proof count not as expected */
@@ -35,49 +39,60 @@ export enum DataColumnSidecarErrorCode {
 }
 
 export type DataColumnSidecarErrorType =
-  | {code: DataColumnSidecarErrorCode.INVALID_INDEX; slot: Slot; columnIdx: number}
-  | {code: DataColumnSidecarErrorCode.NO_COMMITMENTS; slot: Slot; columnIdx: number}
+  | {code: DataColumnSidecarErrorCode.INVALID_INDEX; slot: Slot; columnIndex: number}
+  | {code: DataColumnSidecarErrorCode.NO_COMMITMENTS; slot: Slot; columnIndex: number}
   | {
       code: DataColumnSidecarErrorCode.MISMATCHED_LENGTHS;
       columnLength: number;
       commitmentsLength: number;
       proofsLength: number;
     }
-  | {code: DataColumnSidecarErrorCode.INVALID_SUBNET; columnIdx: number; gossipSubnet: SubnetID}
+  | {code: DataColumnSidecarErrorCode.INVALID_SUBNET; columnIndex: number; gossipSubnet: SubnetID}
   | {
       code: DataColumnSidecarErrorCode.TOO_MANY_KZG_COMMITMENTS;
       slot: number;
-      columnIdx: number;
+      columnIndex: number;
       count: number;
       limit: number;
     }
-  | {code: DataColumnSidecarErrorCode.ALREADY_KNOWN; columnIdx: number; slot: Slot}
+  | {code: DataColumnSidecarErrorCode.ALREADY_KNOWN; columnIndex: number; slot: Slot}
   | {code: DataColumnSidecarErrorCode.FUTURE_SLOT; blockSlot: Slot; currentSlot: Slot}
   | {code: DataColumnSidecarErrorCode.WOULD_REVERT_FINALIZED_SLOT; blockSlot: Slot; finalizedSlot: Slot}
-  | {code: DataColumnSidecarErrorCode.PARENT_UNKNOWN; parentRoot: RootHex}
-  | {code: DataColumnSidecarErrorCode.PROPOSAL_SIGNATURE_INVALID}
+  | {
+      code: DataColumnSidecarErrorCode.PARENT_UNKNOWN;
+      parentRoot: RootHex;
+      slot: Slot;
+    }
+  | {
+      code: DataColumnSidecarErrorCode.PROPOSAL_SIGNATURE_INVALID;
+      slot: Slot;
+      blockRoot: RootHex;
+      index: number;
+    }
   | {code: DataColumnSidecarErrorCode.NOT_LATER_THAN_PARENT; parentSlot: Slot; slot: Slot}
-  | {code: DataColumnSidecarErrorCode.INCLUSION_PROOF_INVALID; slot: Slot; columnIdx: number}
-  | {code: DataColumnSidecarErrorCode.INVALID_KZG_PROOF; slot: Slot; columnIdx: number}
+  | {code: DataColumnSidecarErrorCode.INCLUSION_PROOF_INVALID; slot: Slot; columnIndex: number}
+  | {code: DataColumnSidecarErrorCode.INVALID_KZG_PROOF; slot: Slot; columnIndex: number}
   | {code: DataColumnSidecarErrorCode.INCORRECT_SIDECAR_COUNT; slot: number; expected: number; actual: number}
   | {
       code: DataColumnSidecarErrorCode.INCORRECT_BLOCK;
       slot: number;
-      columnIdx: number;
+      columnIndex: number;
       expected: string;
       actual: string;
     }
   | {
-      code: DataColumnSidecarErrorCode.INCORRECT_KZG_COMMITMENTS_COUNT;
+      code: DataColumnSidecarErrorCode.INCORRECT_HEADER_ROOT;
       slot: number;
-      columnIdx: number;
-      expected: number;
-      actual: number;
+      expected: string;
+      actual: string;
     }
   | {
-      code: DataColumnSidecarErrorCode.INCORRECT_KZG_PROOF_COUNT;
+      code:
+        | DataColumnSidecarErrorCode.INCORRECT_CELL_COUNT
+        | DataColumnSidecarErrorCode.INCORRECT_KZG_COMMITMENTS_COUNT
+        | DataColumnSidecarErrorCode.INCORRECT_KZG_PROOF_COUNT;
       slot: number;
-      columnIdx: number;
+      columnIndex: number;
       expected: number;
       actual: number;
     }

package/src/chain/options.ts

@@ -8,6 +8,7 @@ import {ShufflingCacheOpts} from "./shufflingCache.js";
 import {DEFAULT_MAX_BLOCK_STATES, FIFOBlockStateCacheOpts} from "./stateCache/fifoBlockStateCache.js";
 import {
   DEFAULT_MAX_CP_STATE_EPOCHS_IN_MEMORY,
+  DEFAULT_MAX_CP_STATE_ON_DISK,
   PersistentCheckpointStateCacheOpts,
 } from "./stateCache/persistentCheckpointsCache.js";
 import {ValidatorMonitorOpts} from "./validatorMonitor.js";
@@ -132,4 +133,5 @@ export const defaultChainOptions: IChainOptions = {
   nHistoricalStatesFileDataStore: true,
   maxBlockStates: DEFAULT_MAX_BLOCK_STATES,
   maxCPStateEpochsInMemory: DEFAULT_MAX_CP_STATE_EPOCHS_IN_MEMORY,
+  maxCPStateEpochsOnDisk: DEFAULT_MAX_CP_STATE_ON_DISK,
 };

package/src/chain/stateCache/persistentCheckpointsCache.ts

@@ -17,8 +17,10 @@ import {MapTracker} from "./mapMetrics.js";
 import {BlockStateCache, CacheItemType, CheckpointHex, CheckpointStateCache} from "./types.js";
 
 export type PersistentCheckpointStateCacheOpts = {
-  /** Keep max n states in memory, persist the rest to disk */
+  /** Keep max n state epochs in memory, persist the rest to disk */
   maxCPStateEpochsInMemory?: number;
+  /** Keep max n state epochs on disk */
+  maxCPStateEpochsOnDisk?: number;
 };
 
 type PersistentCheckpointStateCacheModules = {
@@ -58,6 +60,14 @@ type LoadedStateBytesData = {persistedKey: DatastoreKey; stateBytes: Uint8Array}
  */
 export const DEFAULT_MAX_CP_STATE_EPOCHS_IN_MEMORY = 3;
 
+/**
+ * By default we don't prune any persistent checkpoint states as it's not safe to delete them during
+ * long non-finality as we don't know the state of the chain and there could be a deep (hundreds of epochs) reorg
+ * if there two competing chains with similar weight but we wouldn't have a close enough state to pivot to this chain
+ * and instead require a resync from last finalized checkpoint state which could be very far in the past.
+ */
+export const DEFAULT_MAX_CP_STATE_ON_DISK = Infinity;
+
 // TODO GLOAS: re-evaluate this timing
 const PROCESS_CHECKPOINT_STATES_BPS = 6667;
 
@@ -104,6 +114,7 @@ export class PersistentCheckpointStateCache implements CheckpointStateCache {
   private preComputedCheckpoint: string | null = null;
   private preComputedCheckpointHits: number | null = null;
   private readonly maxEpochsInMemory: number;
+  private readonly maxEpochsOnDisk: number;
   private readonly datastore: CPStateDatastore;
   private readonly blockStateCache: BlockStateCache;
   private readonly bufferPool?: BufferPool | null;
@@ -139,10 +150,16 @@ export class PersistentCheckpointStateCache implements CheckpointStateCache {
     this.logger = logger;
     this.clock = clock;
     this.signal = signal;
+
     if (opts.maxCPStateEpochsInMemory !== undefined && opts.maxCPStateEpochsInMemory < 0) {
       throw new Error("maxEpochsInMemory must be >= 0");
     }
+    if (opts.maxCPStateEpochsOnDisk !== undefined && opts.maxCPStateEpochsOnDisk < 0) {
+      throw new Error("maxCPStateEpochsOnDisk must be >= 0");
+    }
+
     this.maxEpochsInMemory = opts.maxCPStateEpochsInMemory ?? DEFAULT_MAX_CP_STATE_EPOCHS_IN_MEMORY;
+    this.maxEpochsOnDisk = opts.maxCPStateEpochsOnDisk ?? DEFAULT_MAX_CP_STATE_ON_DISK;
     // Specify different datastore for testing
     this.datastore = datastore;
     this.blockStateCache = blockStateCache;
@@ -324,6 +341,7 @@ export class PersistentCheckpointStateCache implements CheckpointStateCache {
       this.logger.verbose("Added checkpoint state to memory", {epoch: cp.epoch, rootHex: cpHex.rootHex});
     }
     this.epochIndex.getOrDefault(cp.epoch).add(cpHex.rootHex);
+    this.prunePersistedStates();
   }
 
   /**
@@ -766,13 +784,38 @@ export class PersistentCheckpointStateCache implements CheckpointStateCache {
       this.cache.delete(key);
     }
     this.epochIndex.delete(epoch);
-    this.logger.verbose("Pruned finalized checkpoints states for epoch", {
+    this.logger.verbose("Pruned checkpoint states for epoch", {
       epoch,
       persistCount,
       rootHexes: Array.from(rootHexes).join(","),
     });
   }
 
+  /**
+   * Prune persisted checkpoint states from disk.
+   * Note that this should handle all possible errors and not throw.
+   */
+  private prunePersistedStates(): void {
+    //                epochsOnDisk                                   epochsInMemory
+    // |----------------------------------------------------------|----------------------|
+    const maxTrackedEpochs = this.maxEpochsOnDisk + this.maxEpochsInMemory;
+    if (this.epochIndex.size <= maxTrackedEpochs) {
+      return;
+    }
+
+    const sortedEpochs = Array.from(this.epochIndex.keys()).sort((a, b) => a - b);
+    const pruneEpochs = sortedEpochs.slice(0, sortedEpochs.length - maxTrackedEpochs);
+    for (const epoch of pruneEpochs) {
+      this.deleteAllEpochItems(epoch).catch((e) =>
+        this.logger.debug(
+          "Error delete all epoch items",
+          {epoch, maxEpochsOnDisk: this.maxEpochsOnDisk, maxEpochsInMemory: this.maxEpochsInMemory},
+          e as Error
+        )
+      );
+    }
+  }
+
   /**
    * Serialize validators to bytes leveraging the buffer pool to save memory allocation.
    *   - As monitored on holesky as of Jan 2024, it helps save ~500ms state reload time (4.3s vs 3.8s)

package/src/chain/validation/blobSidecar.ts

@@ -8,7 +8,8 @@ import {
 import {
   computeEpochAtSlot,
   computeStartSlotAtEpoch,
-  getBlockHeaderProposerSignatureSet,
+  getBlockHeaderProposerSignatureSetByHeaderSlot,
+  getBlockHeaderProposerSignatureSetByParentStateSlot,
 } from "@lodestar/state-transition";
 import {BlobIndex, Root, Slot, SubnetID, deneb, ssz} from "@lodestar/types";
 import {toRootHex, verifyMerkleBranch} from "@lodestar/utils";
@@ -100,7 +101,12 @@ export async function validateGossipBlobSidecar(
     //    descend from the finalized root.
     // (Non-Lighthouse): Since we prune all blocks non-descendant from finalized checking the `db.block` database won't be useful to guard
     // against known bad fork blocks, so we throw PARENT_UNKNOWN for cases (1) and (2)
-    throw new BlobSidecarGossipError(GossipAction.IGNORE, {code: BlobSidecarErrorCode.PARENT_UNKNOWN, parentRoot});
+    throw new BlobSidecarGossipError(GossipAction.IGNORE, {
+      code: BlobSidecarErrorCode.PARENT_UNKNOWN,
+      parentRoot,
+      blockRoot: blockHex,
+      slot: blobSlot,
+    });
   }
 
   // [REJECT] The blob is from a higher slot than its parent.
@@ -120,15 +126,23 @@ export async function validateGossipBlobSidecar(
   const blockState = await chain.regen
     .getBlockSlotState(parentRoot, blobSlot, {dontTransferCache: true}, RegenCaller.validateGossipBlock)
     .catch(() => {
-      throw new BlobSidecarGossipError(GossipAction.IGNORE, {code: BlobSidecarErrorCode.PARENT_UNKNOWN, parentRoot});
+      throw new BlobSidecarGossipError(GossipAction.IGNORE, {
+        code: BlobSidecarErrorCode.PARENT_UNKNOWN,
+        parentRoot,
+        blockRoot: blockHex,
+        slot: blobSlot,
+      });
     });
 
   // [REJECT] The proposer signature, signed_beacon_block.signature, is valid with respect to the proposer_index pubkey.
-  const signatureSet = getBlockHeaderProposerSignatureSet(blockState, blobSidecar.signedBlockHeader);
+  const signatureSet = getBlockHeaderProposerSignatureSetByParentStateSlot(blockState, blobSidecar.signedBlockHeader);
   // Don't batch so verification is not delayed
   if (!(await chain.bls.verifySignatureSets([signatureSet], {verifyOnMainThread: true}))) {
     throw new BlobSidecarGossipError(GossipAction.REJECT, {
       code: BlobSidecarErrorCode.PROPOSAL_SIGNATURE_INVALID,
+      blockRoot: blockHex,
+      index: blobSidecar.index,
+      slot: blobSlot,
     });
   }
 
@@ -175,8 +189,12 @@ export async function validateGossipBlobSidecar(
  * Validate some blob sidecars in a block
  *
  * Requires the block to be known to the node
+ *
+ * NOTE: chain is optional to skip signature verification. Helpful for testing purposes and so that can control whether
+ * signature gets checked depending on the reqresp method that is being checked
  */
 export async function validateBlockBlobSidecars(
+  chain: IBeaconChain | null,
   blockSlot: Slot,
   blockRoot: Root,
   blockBlobCount: number,
@@ -196,7 +214,8 @@ export async function validateBlockBlobSidecars(
   }
 
   // Hash the first sidecar block header and compare the rest via (cheaper) equality
-  const firstSidecarBlockHeader = blobSidecars[0].signedBlockHeader.message;
+  const firstSidecarSignedBlockHeader = blobSidecars[0].signedBlockHeader;
+  const firstSidecarBlockHeader = firstSidecarSignedBlockHeader.message;
   const firstBlockRoot = ssz.phase0.BeaconBlockHeader.hashTreeRoot(firstSidecarBlockHeader);
   if (Buffer.compare(blockRoot, firstBlockRoot) !== 0) {
     throw new BlobSidecarValidationError(
@@ -211,17 +230,42 @@ export async function validateBlockBlobSidecars(
     );
   }
 
+  if (chain !== null) {
+    const headState = await chain.getHeadState();
+    const signatureSet = getBlockHeaderProposerSignatureSetByHeaderSlot(headState, firstSidecarSignedBlockHeader);
+
+    if (
+      !(await chain.bls.verifySignatureSets([signatureSet], {
+        batchable: true,
+        priority: true,
+        verifyOnMainThread: false,
+      }))
+    ) {
+      throw new BlobSidecarValidationError({
+        code: BlobSidecarErrorCode.PROPOSAL_SIGNATURE_INVALID,
+        blockRoot: toRootHex(blockRoot),
+        slot: blockSlot,
+        index: blobSidecars[0].index,
+      });
+    }
+  }
+
   const commitments = [];
   const blobs = [];
   const proofs = [];
-  for (const blobSidecar of blobSidecars) {
-    const blobIdx = blobSidecar.index;
-    if (!ssz.phase0.BeaconBlockHeader.equals(blobSidecar.signedBlockHeader.message, firstSidecarBlockHeader)) {
+  for (let i = 0; i < blobSidecars.length; i++) {
+    const blobSidecar = blobSidecars[i];
+    const blobIndex = blobSidecar.index;
+
+    if (
+      i !== 0 &&
+      !ssz.phase0.SignedBeaconBlockHeader.equals(blobSidecar.signedBlockHeader, firstSidecarSignedBlockHeader)
+    ) {
       throw new BlobSidecarValidationError(
         {
           code: BlobSidecarErrorCode.INCORRECT_BLOCK,
           slot: blockSlot,
-          blobIdx,
+          blobIdx: blobIndex,
           expected: toRootHex(blockRoot),
           actual: "unknown - compared via equality",
         },
@@ -234,7 +278,7 @@ export async function validateBlockBlobSidecars(
         {
           code: BlobSidecarErrorCode.INCLUSION_PROOF_INVALID,
           slot: blockSlot,
-          blobIdx,
+          blobIdx: blobIndex,
         },
         "BlobSidecar inclusion proof invalid"
       );

package/src/chain/validation/block.ts

@@ -158,6 +158,7 @@ export async function validateGossipBlock(
   if (!(await chain.bls.verifySignatureSets([signatureSet], {verifyOnMainThread: true}))) {
     throw new BlockGossipError(GossipAction.REJECT, {
       code: BlockErrorCode.PROPOSAL_SIGNATURE_INVALID,
+      blockSlot,
     });
   }