@lodestar/beacon-node 1.51.0-dev.a1662c7de7 → 1.51.0-dev.a1ecd6c34f

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.51.0-dev.a1662c7de7",
+  "version": "1.51.0-dev.a1ecd6c34f",
   "type": "module",
   "exports": {
     ".": {
@@ -116,28 +116,28 @@
     "@fastify/cors": "^10.0.1",
     "@fastify/swagger": "^9.0.0",
     "@fastify/swagger-ui": "^5.0.1",
-    "@libp2p/bootstrap": "^12.0.30",
-    "@libp2p/crypto": "^5.1.23",
-    "@libp2p/gossipsub": "^17.1.2",
-    "@libp2p/identify": "^4.1.13",
-    "@libp2p/interface": "^3.3.0",
-    "@libp2p/mdns": "^12.0.30",
-    "@libp2p/mplex": "^12.0.30",
-    "@libp2p/peer-id": "^6.0.15",
-    "@libp2p/prometheus-metrics": "^5.0.28",
-    "@libp2p/tcp": "^11.0.27",
-    "@libp2p/utils": "^7.4.0",
-    "@lodestar/api": "^1.51.0-dev.a1662c7de7",
-    "@lodestar/config": "^1.51.0-dev.a1662c7de7",
-    "@lodestar/db": "^1.51.0-dev.a1662c7de7",
-    "@lodestar/fork-choice": "^1.51.0-dev.a1662c7de7",
-    "@lodestar/logger": "^1.51.0-dev.a1662c7de7",
-    "@lodestar/params": "^1.51.0-dev.a1662c7de7",
-    "@lodestar/reqresp": "^1.51.0-dev.a1662c7de7",
-    "@lodestar/state-transition": "^1.51.0-dev.a1662c7de7",
-    "@lodestar/types": "^1.51.0-dev.a1662c7de7",
-    "@lodestar/utils": "^1.51.0-dev.a1662c7de7",
-    "@lodestar/validator": "^1.51.0-dev.a1662c7de7",
+    "@libp2p/bootstrap": "^12.0.34",
+    "@libp2p/crypto": "^5.1.25",
+    "@libp2p/gossipsub": "^17.1.4",
+    "@libp2p/identify": "^4.1.16",
+    "@libp2p/interface": "^3.4.0",
+    "@libp2p/mdns": "^12.0.34",
+    "@libp2p/mplex": "^12.0.34",
+    "@libp2p/peer-id": "^6.0.17",
+    "@libp2p/prometheus-metrics": "^5.0.31",
+    "@libp2p/tcp": "^11.0.30",
+    "@libp2p/utils": "^7.4.3",
+    "@lodestar/api": "^1.51.0-dev.a1ecd6c34f",
+    "@lodestar/config": "^1.51.0-dev.a1ecd6c34f",
+    "@lodestar/db": "^1.51.0-dev.a1ecd6c34f",
+    "@lodestar/fork-choice": "^1.51.0-dev.a1ecd6c34f",
+    "@lodestar/logger": "^1.51.0-dev.a1ecd6c34f",
+    "@lodestar/params": "^1.51.0-dev.a1ecd6c34f",
+    "@lodestar/reqresp": "^1.51.0-dev.a1ecd6c34f",
+    "@lodestar/state-transition": "^1.51.0-dev.a1ecd6c34f",
+    "@lodestar/types": "^1.51.0-dev.a1ecd6c34f",
+    "@lodestar/utils": "^1.51.0-dev.a1ecd6c34f",
+    "@lodestar/validator": "^1.51.0-dev.a1ecd6c34f",
     "@multiformats/multiaddr": "^13.0.1",
     "datastore-core": "^12.0.1",
     "datastore-level": "^13.0.1",
@@ -145,7 +145,7 @@
     "fastify": "^5.8.1",
     "interface-datastore": "^10.0.1",
     "jwt-simple": "0.5.6",
-    "libp2p": "3.3.9",
+    "libp2p": "3.4.0",
     "multiformats": "^13.4.2",
     "prom-client": "^15.1.0",
     "qs": "^6.14.2",
@@ -157,10 +157,10 @@
   },
   "devDependencies": {
     "@ethereumjs/rlp": "^4.0.1",
-    "@libp2p/interface-internal": "^3.1.12",
-    "@libp2p/logger": "^6.2.13",
-    "@lodestar/spec-test-util": "^1.51.0-dev.a1662c7de7",
-    "@lodestar/test-utils": "^1.51.0-dev.a1662c7de7",
+    "@libp2p/interface-internal": "^3.2.0",
+    "@libp2p/logger": "^6.2.15",
+    "@lodestar/spec-test-util": "^1.51.0-dev.a1ecd6c34f",
+    "@lodestar/test-utils": "^1.51.0-dev.a1ecd6c34f",
     "@types/js-yaml": "^4.0.5",
     "@types/qs": "^6.9.7",
     "@types/tmp": "^0.2.3",
@@ -175,5 +175,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "4049cf7c7999c6cabf363e7243520a3ba3cb691e"
+  "gitHead": "42cc5a38cbffc5d4d9c25418c3189f58571e7e9c"
 }

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

@@ -17,6 +17,7 @@ import {
   isStatePostGloas,
 } from "@lodestar/state-transition";
 import {
+  BuilderIndex,
   ValidatorIndex,
   getBuilderStatus,
   getValidatorStatus,
@@ -29,6 +30,7 @@ import {ApiModules} from "../../types.js";
 import {assertUniqueItems} from "../../utils.js";
 import {
   filterStateValidatorsByStatus,
+  getBuilderIndexByPubkey,
   getStateBuilderIndex,
   getStateResponseWithRegen,
   getStateValidatorIndex,
@@ -170,8 +172,15 @@ export function getBeaconStateApi({
       if (builderIds.length) {
         assertUniqueItems(builderIds, "Duplicate builder IDs provided");
 
+        // There is no builder pubkey cache, scan the registry at most once per request
+        let builderIndexByPubkey: Map<string, BuilderIndex> | null = null;
+        const getBuilderIndexByPubkeyMap = () => {
+          builderIndexByPubkey ??= getBuilderIndexByPubkey(state);
+          return builderIndexByPubkey;
+        };
+
         for (const id of builderIds) {
-          const resp = getStateBuilderIndex(id, state);
+          const resp = getStateBuilderIndex(id, state, getBuilderIndexByPubkeyMap);
           if (resp.valid) {
             const builderIndex = resp.builderIndex;
             const builder = state.getBuilder(builderIndex);

package/src/api/impl/beacon/state/utils.ts

@@ -13,7 +13,7 @@ import {
   getValidatorStatus,
   phase0,
 } from "@lodestar/types";
-import {byteArrayEquals, fromHex} from "@lodestar/utils";
+import {fromHex, toHex} from "@lodestar/utils";
 import {IBeaconChain} from "../../../../chain/index.js";
 import {GENESIS_EPOCH} from "../../../../constants/index.js";
 import {IBeaconSync} from "../../../../sync/index.js";
@@ -118,9 +118,22 @@ type StateBuilderIndexResponse =
   | {valid: true; builderIndex: BuilderIndex}
   | {valid: false; code: number; reason: string};
 
+export function getBuilderIndexByPubkey(state: IBeaconStateViewGloas): Map<string, BuilderIndex> {
+  const builderIndexByPubkey = new Map<string, BuilderIndex>();
+  const buildersLength = state.getBuildersLength();
+  for (let builderIndex = 0; builderIndex < buildersLength; builderIndex++) {
+    const pubkeyHex = toHex(state.getBuilder(builderIndex).pubkey);
+    if (!builderIndexByPubkey.has(pubkeyHex)) {
+      builderIndexByPubkey.set(pubkeyHex, builderIndex);
+    }
+  }
+  return builderIndexByPubkey;
+}
+
 export function getStateBuilderIndex(
   id: routes.beacon.BuilderId | BLSPubkey,
-  state: IBeaconStateViewGloas
+  state: IBeaconStateViewGloas,
+  getBuilderIndexByPubkeyMap: () => Map<string, BuilderIndex>
 ): StateBuilderIndexResponse {
   if (typeof id === "string") {
     // mutate `id` and fallthrough to below
@@ -148,14 +161,11 @@ export function getStateBuilderIndex(
   }
 
   // typeof id === Uint8Array
-  // There is no builder pubkey cache, linear scan over the registry
-  const buildersLength = state.getBuildersLength();
-  for (let builderIndex = 0; builderIndex < buildersLength; builderIndex++) {
-    if (byteArrayEquals(state.getBuilder(builderIndex).pubkey, id)) {
-      return {valid: true, builderIndex};
-    }
+  const builderIndex = getBuilderIndexByPubkeyMap().get(toHex(id));
+  if (builderIndex === undefined) {
+    return {valid: false, code: 404, reason: "Builder pubkey not found in state"};
   }
-  return {valid: false, code: 404, reason: "Builder pubkey not found in state"};
+  return {valid: true, builderIndex};
 }
 
 export function filterStateValidatorsByStatus(

package/src/api/impl/validator/index.ts

@@ -254,13 +254,13 @@ export function getValidatorApi(
         genesisBlockRoot = state.computeAnchorCheckpoint().checkpoint.root;
       } else if (state.slot < SLOTS_PER_HISTORICAL_ROOT) {
         genesisBlockRoot = state.getBlockRootAtSlot(GENESIS_SLOT);
-      }
-
-      const blockRes = await chain.getCanonicalBlockAtSlot(GENESIS_SLOT);
-      if (blockRes) {
-        genesisBlockRoot = config
-          .getForkTypes(blockRes.block.message.slot)
-          .SignedBeaconBlock.hashTreeRoot(blockRes.block);
+      } else {
+        const blockRes = await chain.getCanonicalBlockAtSlot(GENESIS_SLOT);
+        if (blockRes) {
+          genesisBlockRoot = config
+            .getForkTypes(blockRes.block.message.slot)
+            .BeaconBlock.hashTreeRoot(blockRes.block.message);
+        }
       }
     }
 

package/src/chain/produceBlock/produceBlockBody.ts

@@ -781,7 +781,6 @@ export async function prepareExecutionPayload(
 
   const payloadIdCached = chain.executionEngine.payloadIdCache.get({
     headBlockHash: toRootHex(parentBlockHash),
-    finalizedBlockHash,
     timestamp: numToQuantity(timestamp),
     prevRandao: toHex(prevRandao),
     suggestedFeeRecipient,

package/src/execution/engine/http.ts

@@ -367,7 +367,6 @@ export class ExecutionEngineHttp implements IExecutionEngine {
           this.payloadIdCache.add(
             {
               headBlockHash,
-              finalizedBlockHash,
               ...payloadAttributesRpc,
               inclusionListTransactions: payloadAttributes.inclusionListTransactions,
             },

package/src/execution/engine/payloadIdCache.ts

@@ -19,10 +19,9 @@ export type WithdrawalV1 = {
   amount: QUANTITY;
 };
 
-type FcuAttributes = {headBlockHash: DATA; finalizedBlockHash: DATA} & Omit<
-  PayloadAttributesRpc,
-  "withdrawals" | "inclusionListTransactions"
-> & {inclusionListTransactions?: bellatrix.Transactions};
+type FcuAttributes = {headBlockHash: DATA} & Omit<PayloadAttributesRpc, "withdrawals" | "inclusionListTransactions"> & {
+    inclusionListTransactions?: bellatrix.Transactions;
+  };
 
 export class PayloadIdCache {
   private readonly payloadIdByFcuAttributes = new Map<
@@ -30,8 +29,8 @@ export class PayloadIdCache {
     {payloadId: PayloadId; fullKey: string; inclusionListTransactions?: bellatrix.Transactions}
   >();
 
-  getFullKey({headBlockHash, finalizedBlockHash, timestamp, prevRandao, suggestedFeeRecipient}: FcuAttributes): string {
-    return `${headBlockHash}-${finalizedBlockHash}-${timestamp}-${prevRandao}-${suggestedFeeRecipient}`;
+  getFullKey({headBlockHash, timestamp, prevRandao, suggestedFeeRecipient}: FcuAttributes): string {
+    return `${headBlockHash}-${timestamp}-${prevRandao}-${suggestedFeeRecipient}`;
   }
   getKey({timestamp}: Pick<FcuAttributes, "timestamp">): string {
     return timestamp;

package/src/network/processor/index.ts

@@ -867,19 +867,20 @@ export class NetworkProcessor {
     const nowSec = Date.now() / 1000;
     const minSlot = clockSlot - MAX_UNKNOWN_ROOTS_SLOT_CACHE_SIZE;
 
-    for (const [slot, searchedRoots] of this.searchedRootsBySlot) {
+    for (const [slot, bufferedRoots] of this.bufferedRootsBySlot) {
       if (slot > minSlot) continue;
 
-      // expire messages awaiting an unknown block for these roots. Only roots this slot did a BLOCK search
-      // for (blockPeerIds set) have block waits keyed here; skipping the rest avoids deleting a payload wait
-      // that a newer slot created for the same root (block/envelope searches share searchedRootsBySlot).
-      for (const [rootHex, entry] of searchedRoots) {
-        if (entry.blockPeerIds === undefined) continue;
+      for (const rootHex of bufferedRoots) {
         const messagesByTopic = this.awaitingMessagesByBlockRoot.get(rootHex);
         if (messagesByTopic === undefined) continue;
-        let removed = 0;
+        let remaining = 0;
         for (const messages of messagesByTopic.values()) {
           for (const message of messages) {
+            // the same root may be buffered again from a newer slot, keep those messages.
+            // msgSlot is always set before buffering, a missing one expires rather than leaks
+            if ((message.msgSlot ?? minSlot) > minSlot) continue;
+            messages.delete(message);
+            this.awaitingBlockMessageCount--;
             const topicType = message.topic.type;
             this.metrics?.awaitingBlockGossipMessages.reject.inc({
               topic: topicType,
@@ -891,22 +892,22 @@ export class NetworkProcessor {
             );
             // No need to report the dropped job to gossip. It will be eventually pruned from the mcache
           }
-          removed += messages.size;
-        }
-        if (this.awaitingMessagesByBlockRoot.delete(rootHex)) {
-          this.awaitingBlockMessageCount -= removed;
+          remaining += messages.size;
         }
+        if (remaining === 0) this.awaitingMessagesByBlockRoot.delete(rootHex);
       }
 
-      // expire messages awaiting an unknown payload envelope for these roots. Symmetric to the block pass:
-      // only roots this slot did an ENVELOPE search for (envelopePeerIds set) have payload waits keyed here.
-      for (const [rootHex, entry] of searchedRoots) {
-        if (entry.envelopePeerIds === undefined) continue;
+      for (const rootHex of bufferedRoots) {
         const messagesByTopic = this.awaitingMessagesByPayloadBlockRoot.get(rootHex);
         if (messagesByTopic === undefined) continue;
-        let removed = 0;
+        let remaining = 0;
         for (const messages of messagesByTopic.values()) {
           for (const message of messages) {
+            // the same root may be buffered again from a newer slot, keep those messages.
+            // msgSlot is always set before buffering, a missing one expires rather than leaks
+            if ((message.msgSlot ?? minSlot) > minSlot) continue;
+            messages.delete(message);
+            this.awaitingPayloadMessageCount--;
             const topicType = message.topic.type;
             this.metrics?.awaitingPayloadGossipMessages.reject.inc({
               topic: topicType,
@@ -918,18 +919,16 @@ export class NetworkProcessor {
             );
             // No need to report the dropped job to gossip. It will be eventually pruned from the mcache
           }
-          removed += messages.size;
-        }
-        if (this.awaitingMessagesByPayloadBlockRoot.delete(rootHex)) {
-          this.awaitingPayloadMessageCount -= removed;
+          remaining += messages.size;
         }
+        if (remaining === 0) this.awaitingMessagesByPayloadBlockRoot.delete(rootHex);
       }
 
-      this.searchedRootsBySlot.delete(slot);
+      this.bufferedRootsBySlot.delete(slot);
     }
 
-    for (const slot of this.bufferedRootsBySlot.keys()) {
-      if (slot <= minSlot) this.bufferedRootsBySlot.delete(slot);
+    for (const slot of this.searchedRootsBySlot.keys()) {
+      if (slot <= minSlot) this.searchedRootsBySlot.delete(slot);
     }
 
     for (const [peer, slot] of this.fatalPeers) {

package/src/network/processor/types.ts

@@ -11,7 +11,7 @@ export type GossipAttestationsWork = {
 export type PendingGossipsubMessage = {
   topic: GossipTopic;
   msg: Message;
-  // only available for beacon_attestation and aggregate_and_proof
+  // set for every topic with a slot, held messages expire by it
   msgSlot?: Slot;
   msgId: string;
   propagationSource: PeerIdStr;