@lodestar/beacon-node 1.40.0-dev.737da5eee3 → 1.40.0-dev.787d0f5eee

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.40.0-dev.737da5eee3",
+  "version": "1.40.0-dev.787d0f5eee",
   "type": "module",
   "exports": {
     ".": {
@@ -134,18 +134,18 @@
     "@libp2p/peer-id": "^5.1.0",
     "@libp2p/prometheus-metrics": "^4.3.15",
     "@libp2p/tcp": "^10.1.8",
-    "@lodestar/api": "^1.40.0-dev.737da5eee3",
-    "@lodestar/config": "^1.40.0-dev.737da5eee3",
-    "@lodestar/db": "^1.40.0-dev.737da5eee3",
-    "@lodestar/fork-choice": "^1.40.0-dev.737da5eee3",
-    "@lodestar/light-client": "^1.40.0-dev.737da5eee3",
-    "@lodestar/logger": "^1.40.0-dev.737da5eee3",
-    "@lodestar/params": "^1.40.0-dev.737da5eee3",
-    "@lodestar/reqresp": "^1.40.0-dev.737da5eee3",
-    "@lodestar/state-transition": "^1.40.0-dev.737da5eee3",
-    "@lodestar/types": "^1.40.0-dev.737da5eee3",
-    "@lodestar/utils": "^1.40.0-dev.737da5eee3",
-    "@lodestar/validator": "^1.40.0-dev.737da5eee3",
+    "@lodestar/api": "^1.40.0-dev.787d0f5eee",
+    "@lodestar/config": "^1.40.0-dev.787d0f5eee",
+    "@lodestar/db": "^1.40.0-dev.787d0f5eee",
+    "@lodestar/fork-choice": "^1.40.0-dev.787d0f5eee",
+    "@lodestar/light-client": "^1.40.0-dev.787d0f5eee",
+    "@lodestar/logger": "^1.40.0-dev.787d0f5eee",
+    "@lodestar/params": "^1.40.0-dev.787d0f5eee",
+    "@lodestar/reqresp": "^1.40.0-dev.787d0f5eee",
+    "@lodestar/state-transition": "^1.40.0-dev.787d0f5eee",
+    "@lodestar/types": "^1.40.0-dev.787d0f5eee",
+    "@lodestar/utils": "^1.40.0-dev.787d0f5eee",
+    "@lodestar/validator": "^1.40.0-dev.787d0f5eee",
     "@multiformats/multiaddr": "^12.1.3",
     "datastore-core": "^10.0.2",
     "datastore-fs": "^10.0.6",
@@ -169,7 +169,7 @@
     "@chainsafe/swap-or-not-shuffle": "^1.2.1",
     "@libp2p/interface-internal": "^2.3.18",
     "@libp2p/logger": "^5.1.21",
-    "@lodestar/spec-test-util": "^1.40.0-dev.737da5eee3",
+    "@lodestar/spec-test-util": "^1.40.0-dev.787d0f5eee",
     "@types/js-yaml": "^4.0.5",
     "@types/qs": "^6.9.7",
     "@types/tmp": "^0.2.3",
@@ -188,5 +188,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "253ac39a389f4da3c98760a1f80876cfaef9ac5b"
+  "gitHead": "652021e4737c3fcce4b03f730fef446fb1883061"
 }

package/src/api/impl/beacon/blocks/index.ts

@@ -133,31 +133,21 @@ export function getBeaconBlockApi({
 
     if (isBlockInputColumns(blockForImport)) {
       for (const dataColumnSidecar of dataColumnSidecars) {
-        blockForImport.addColumn(
-          {
-            blockRootHex: blockRoot,
-            columnSidecar: dataColumnSidecar,
-            source: BlockInputSource.api,
-            seenTimestampSec,
-          },
-          // In multi-BN setups (DVT, fallback), the same block may be published to multiple nodes.
-          // Data columns may arrive via gossip from another node before the API publish completes,
-          // so we allow duplicates here instead of throwing an error.
-          {throwOnDuplicateAdd: false}
-        );
+        blockForImport.addColumn({
+          blockRootHex: blockRoot,
+          columnSidecar: dataColumnSidecar,
+          source: BlockInputSource.api,
+          seenTimestampSec,
+        });
       }
     } else if (isBlockInputBlobs(blockForImport)) {
       for (const blobSidecar of blobSidecars) {
-        blockForImport.addBlob(
-          {
-            blockRootHex: blockRoot,
-            blobSidecar,
-            source: BlockInputSource.api,
-            seenTimestampSec,
-          },
-          // Same as above for columns
-          {throwOnDuplicateAdd: false}
-        );
+        blockForImport.addBlob({
+          blockRootHex: blockRoot,
+          blobSidecar,
+          source: BlockInputSource.api,
+          seenTimestampSec,
+        });
       }
     }
 

package/src/chain/blocks/blockInput/blockInput.ts

@@ -1,4 +1,4 @@
-import {ForkName, ForkPostFulu, ForkPreDeneb, ForkPreGloas, NUMBER_OF_COLUMNS} from "@lodestar/params";
+import {ForkName, ForkPostFulu, ForkPreDeneb, ForkPreGloas} from "@lodestar/params";
 import {BeaconBlockBody, BlobIndex, ColumnIndex, SignedBeaconBlock, Slot, deneb, fulu} from "@lodestar/types";
 import {fromHex, prettyBytes, toRootHex, withTimeout} from "@lodestar/utils";
 import {VersionedHashes} from "../../../execution/index.js";
@@ -561,7 +561,6 @@ type BlockInputColumnsState =
   | {
       hasBlock: true;
       hasAllData: true;
-      hasComputedAllData: boolean;
       versionedHashes: VersionedHashes;
       block: SignedBeaconBlock<ForkColumnsDA>;
       source: SourceMeta;
@@ -570,7 +569,6 @@ type BlockInputColumnsState =
   | {
       hasBlock: true;
       hasAllData: false;
-      hasComputedAllData: false;
       versionedHashes: VersionedHashes;
       block: SignedBeaconBlock<ForkColumnsDA>;
       source: SourceMeta;
@@ -578,13 +576,11 @@ type BlockInputColumnsState =
   | {
       hasBlock: false;
       hasAllData: true;
-      hasComputedAllData: boolean;
       versionedHashes: VersionedHashes;
     }
   | {
       hasBlock: false;
       hasAllData: false;
-      hasComputedAllData: false;
       versionedHashes: VersionedHashes;
     };
 /**
@@ -602,12 +598,6 @@ export class BlockInputColumns extends AbstractBlockInput<ForkColumnsDA, fulu.Da
   private columnsCache = new Map<ColumnIndex, ColumnWithSource>();
   private readonly sampledColumns: ColumnIndex[];
   private readonly custodyColumns: ColumnIndex[];
-  /**
-   * This promise resolves when all sampled columns are available
-   *
-   * This is different from `dataPromise` which resolves when all data is available or could become available (e.g. through reconstruction)
-   */
-  protected computedDataPromise = createPromise<fulu.DataColumnSidecars>();
 
   private constructor(
     init: BlockInputInit,
@@ -636,7 +626,6 @@ export class BlockInputColumns extends AbstractBlockInput<ForkColumnsDA, fulu.Da
     const state = {
       hasBlock: true,
       hasAllData,
-      hasComputedAllData: hasAllData,
       versionedHashes: props.block.message.body.blobKzgCommitments.map(kzgCommitmentToVersionedHash),
       block: props.block,
       source: {
@@ -660,7 +649,6 @@ export class BlockInputColumns extends AbstractBlockInput<ForkColumnsDA, fulu.Da
     blockInput.blockPromise.resolve(props.block);
     if (hasAllData) {
       blockInput.dataPromise.resolve([]);
-      blockInput.computedDataPromise.resolve([]);
     }
     return blockInput;
   }
@@ -673,7 +661,6 @@ export class BlockInputColumns extends AbstractBlockInput<ForkColumnsDA, fulu.Da
     const state: BlockInputColumnsState = {
       hasBlock: false,
       hasAllData,
-      hasComputedAllData: hasAllData as false,
       versionedHashes: props.columnSidecar.kzgCommitments.map(kzgCommitmentToVersionedHash),
     };
     const init: BlockInputInit = {
@@ -687,7 +674,6 @@ export class BlockInputColumns extends AbstractBlockInput<ForkColumnsDA, fulu.Da
     const blockInput = new BlockInputColumns(init, state, props.sampledColumns, props.custodyColumns);
     if (hasAllData) {
       blockInput.dataPromise.resolve([]);
-      blockInput.computedDataPromise.resolve([]);
     }
     return blockInput;
   }
@@ -736,14 +722,11 @@ export class BlockInputColumns extends AbstractBlockInput<ForkColumnsDA, fulu.Da
     const hasAllData =
       (props.block.message.body as BeaconBlockBody<ForkPostFulu & ForkPreGloas>).blobKzgCommitments.length === 0 ||
       this.state.hasAllData;
-    const hasComputedAllData =
-      props.block.message.body.blobKzgCommitments.length === 0 || this.state.hasComputedAllData;
 
     this.state = {
       ...this.state,
       hasBlock: true,
       hasAllData,
-      hasComputedAllData,
       block: props.block,
       source: {
         source: props.source,
@@ -791,32 +774,17 @@ export class BlockInputColumns extends AbstractBlockInput<ForkColumnsDA, fulu.Da
     this.columnsCache.set(columnSidecar.index, {columnSidecar, source, seenTimestampSec, peerIdStr});
 
     const sampledColumns = this.getSampledColumns();
-    const hasAllData =
-      // already hasAllData
-      this.state.hasAllData ||
-      // has all sampled columns
-      sampledColumns.length === this.sampledColumns.length ||
-      // has enough columns to reconstruct the rest
-      this.columnsCache.size >= NUMBER_OF_COLUMNS / 2;
-
-    const hasComputedAllData =
-      // has all sampled columns
-      sampledColumns.length === this.sampledColumns.length;
+    const hasAllData = this.state.hasAllData || sampledColumns.length === this.sampledColumns.length;
 
     this.state = {
       ...this.state,
       hasAllData: hasAllData || this.state.hasAllData,
-      hasComputedAllData: hasComputedAllData || this.state.hasComputedAllData,
       timeCompleteSec: hasAllData ? seenTimestampSec : undefined,
     } as BlockInputColumnsState;
 
     if (hasAllData && sampledColumns !== null) {
       this.dataPromise.resolve(sampledColumns);
     }
-
-    if (hasComputedAllData && sampledColumns !== null) {
-      this.computedDataPromise.resolve(sampledColumns);
-    }
   }
 
   hasColumn(columnIndex: number): boolean {
@@ -891,15 +859,4 @@ export class BlockInputColumns extends AbstractBlockInput<ForkColumnsDA, fulu.Da
       versionedHashes: this.state.versionedHashes,
     };
   }
-
-  hasComputedAllData(): boolean {
-    return this.state.hasComputedAllData;
-  }
-
-  waitForComputedAllData(timeout: number, signal?: AbortSignal): Promise<fulu.DataColumnSidecars> {
-    if (!this.state.hasComputedAllData) {
-      return withTimeout(() => this.computedDataPromise.promise, timeout, signal);
-    }
-    return Promise.resolve(this.getSampledColumns());
-  }
 }

package/src/chain/blocks/writeBlockInputToDb.ts

@@ -44,15 +44,6 @@ export async function writeBlockInputToDb(this: BeaconChain, blocksInputs: IBloc
 
     // NOTE: Old data is pruned on archive
     if (isBlockInputColumns(blockInput)) {
-      if (!blockInput.hasComputedAllData()) {
-        // Supernodes may only have a subset of the data columns by the time the block begins to be imported
-        // because full data availability can be assumed after NUMBER_OF_COLUMNS / 2 columns are available.
-        // Here, however, all data columns must be fully available/reconstructed before persisting to the DB.
-        await blockInput.waitForComputedAllData(BLOB_AVAILABILITY_TIMEOUT).catch(() => {
-          this.logger.debug("Failed to wait for computed all data", {slot, blockRoot: blockRootHex});
-        });
-      }
-
       const {custodyColumns} = this.custodyConfig;
       const blobsLen = (block.message as fulu.BeaconBlock).body.blobKzgCommitments.length;
       let dataColumnsLen: number;

package/src/chain/chain.ts

@@ -340,8 +340,9 @@ export class BeaconChain implements IBeaconChain {
     const blockStateCache = new FIFOBlockStateCache(this.opts, {metrics});
     this.bufferPool = new BufferPool(anchorState.type.tree_serializedSize(anchorState.node), metrics);
 
+    let checkpointStateCache: CheckpointStateCache;
     this.cpStateDatastore = fileDataStore ? new FileCPStateDatastore(dataDir) : new DbCPStateDatastore(this.db);
-    const checkpointStateCache: CheckpointStateCache = new PersistentCheckpointStateCache(
+    checkpointStateCache = new PersistentCheckpointStateCache(
       {
         config,
         metrics,

package/src/network/gossip/gossipsub.ts

@@ -1,10 +1,7 @@
-import {peerIdFromString} from "@libp2p/peer-id";
-import {multiaddr} from "@multiformats/multiaddr";
-import {ENR} from "@chainsafe/enr";
 import {GossipSub, GossipsubEvents} from "@chainsafe/libp2p-gossipsub";
 import {MetricsRegister, TopicLabel, TopicStrToLabel} from "@chainsafe/libp2p-gossipsub/metrics";
 import {PeerScoreParams} from "@chainsafe/libp2p-gossipsub/score";
-import {AddrInfo, SignaturePolicy, TopicStr} from "@chainsafe/libp2p-gossipsub/types";
+import {SignaturePolicy, TopicStr} from "@chainsafe/libp2p-gossipsub/types";
 import {BeaconConfig, ForkBoundary} from "@lodestar/config";
 import {ATTESTATION_SUBNET_COUNT, SLOTS_PER_EPOCH, SYNC_COMMITTEE_SUBNET_COUNT} from "@lodestar/params";
 import {SubnetID} from "@lodestar/types";
@@ -58,12 +55,6 @@ export type Eth2GossipsubOpts = {
   disableFloodPublish?: boolean;
   skipParamsLog?: boolean;
   disableLightClientServer?: boolean;
-  /**
-   * Direct peers for GossipSub - these peers maintain permanent mesh connections without GRAFT/PRUNE.
-   * Supports multiaddr strings with peer ID (e.g., "/ip4/192.168.1.1/tcp/9000/p2p/16Uiu2HAmKLhW7...")
-   * or ENR strings (e.g., "enr:-IS4QHCYrYZbAKWCBRlAy5zzaDZXJBGkcnh4MHcBFZntXNFrdvJjX04jRzjzCBOo...")
-   */
-  directPeers?: string[];
 };
 
 export type ForkBoundaryLabel = string;
@@ -106,9 +97,6 @@ export class Eth2Gossipsub extends GossipSub {
       );
     }
 
-    // Parse direct peers from multiaddr strings to AddrInfo objects
-    const directPeers = parseDirectPeers(opts.directPeers ?? [], logger);
-
     // Gossipsub parameters defined here:
     // https://github.com/ethereum/consensus-specs/blob/v1.1.10/specs/phase0/p2p-interface.md#the-gossip-domain-gossipsub
     super(modules.libp2p.services.components, {
@@ -118,7 +106,6 @@ export class Eth2Gossipsub extends GossipSub {
       Dlo: gossipsubDLow ?? GOSSIP_D_LOW,
       Dhi: gossipsubDHigh ?? GOSSIP_D_HIGH,
       Dlazy: 6,
-      directPeers,
       heartbeatInterval: GOSSIPSUB_HEARTBEAT_INTERVAL,
       fanoutTTL: 60 * 1000,
       mcacheLength: 6,
@@ -394,75 +381,3 @@ function getForkBoundaryLabel(boundary: ForkBoundary): ForkBoundaryLabel {
 
   return label;
 }
-
-/**
- * Parse direct peer strings into AddrInfo objects for GossipSub.
- * Direct peers maintain permanent mesh connections without GRAFT/PRUNE negotiation.
- *
- * Supported formats:
- * - Multiaddr with peer ID: `/ip4/192.168.1.1/tcp/9000/p2p/16Uiu2HAmKLhW7...`
- * - ENR: `enr:-IS4QHCYrYZbAKWCBRlAy5zzaDZXJBGkcnh4MHcBFZntXNFrdvJjX04jRzjzCBOo...`
- *
- * For multiaddrs, the string must contain a /p2p/ component with the peer ID.
- * For ENRs, the TCP multiaddr and peer ID are extracted from the encoded record.
- */
-export function parseDirectPeers(directPeerStrs: string[], logger: Logger): AddrInfo[] {
-  const directPeers: AddrInfo[] = [];
-
-  for (const peerStr of directPeerStrs) {
-    // Check if this is an ENR (starts with "enr:")
-    if (peerStr.startsWith("enr:")) {
-      try {
-        const enr = ENR.decodeTxt(peerStr);
-        const peerId = enr.peerId;
-
-        // Get TCP multiaddr from ENR
-        const multiaddrTCP = enr.getLocationMultiaddr("tcp");
-        if (!multiaddrTCP) {
-          logger.warn("ENR does not contain TCP multiaddr", {enr: peerStr});
-          continue;
-        }
-
-        directPeers.push({
-          id: peerId,
-          addrs: [multiaddrTCP],
-        });
-
-        logger.info("Added direct peer from ENR", {peerId: peerId.toString(), addr: multiaddrTCP.toString()});
-      } catch (e) {
-        logger.warn("Failed to parse direct peer ENR", {enr: peerStr}, e as Error);
-      }
-    } else {
-      // Parse as multiaddr
-      try {
-        const ma = multiaddr(peerStr);
-
-        const peerIdStr = ma.getPeerId();
-        if (!peerIdStr) {
-          logger.warn("Direct peer multiaddr must contain /p2p/ component with peer ID", {multiaddr: peerStr});
-          continue;
-        }
-
-        try {
-          const peerId = peerIdFromString(peerIdStr);
-
-          // Get the address without the /p2p/ component
-          const addr = ma.decapsulate("/p2p/" + peerIdStr);
-
-          directPeers.push({
-            id: peerId,
-            addrs: [addr],
-          });
-
-          logger.info("Added direct peer", {peerId: peerIdStr, addr: addr.toString()});
-        } catch (e) {
-          logger.warn("Invalid peer ID in direct peer multiaddr", {multiaddr: peerStr, peerId: peerIdStr}, e as Error);
-        }
-      } catch (e) {
-        logger.warn("Failed to parse direct peer multiaddr", {multiaddr: peerStr}, e as Error);
-      }
-    }
-  }
-
-  return directPeers;
-}

package/src/network/options.ts

@@ -15,12 +15,6 @@ export interface NetworkOptions
     Omit<Eth2GossipsubOpts, "disableLightClientServer"> {
   localMultiaddrs: string[];
   bootMultiaddrs?: string[];
-  /**
-   * Direct peers for GossipSub - these peers maintain permanent mesh connections without GRAFT/PRUNE.
-   * Format: multiaddr strings with peer ID, e.g., "/ip4/192.168.1.1/tcp/9000/p2p/16Uiu2HAmKLhW7..."
-   * Both peers must configure each other as direct peers for the feature to work properly.
-   */
-  directPeers?: string[];
   subscribeAllSubnets?: boolean;
   mdns?: boolean;
   connectToDiscv5Bootnodes?: boolean;

package/src/network/processor/gossipHandlers.ts

@@ -579,7 +579,7 @@ function getSequentialHandlers(modules: ValidatorFnsModules, options: GossipHand
           break;
       }
 
-      if (!blockInput.hasComputedAllData()) {
+      if (!blockInput.hasAllData()) {
         // immediately attempt fetch of data columns from execution engine
         chain.getBlobsTracker.triggerGetBlobs(blockInput);
         // if we've received at least half of the columns, trigger reconstruction of the rest