@lodestar/beacon-node 1.50.0-dev.67e8d54549 → 1.50.0-dev.6a7dbb4d5d

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.50.0-dev.67e8d54549",
+  "version": "1.50.0-dev.6a7dbb4d5d",
   "type": "module",
   "exports": {
     ".": {
@@ -127,17 +127,17 @@
     "@libp2p/prometheus-metrics": "^5.0.28",
     "@libp2p/tcp": "^11.0.27",
     "@libp2p/utils": "^7.4.0",
-    "@lodestar/api": "^1.50.0-dev.67e8d54549",
-    "@lodestar/config": "^1.50.0-dev.67e8d54549",
-    "@lodestar/db": "^1.50.0-dev.67e8d54549",
-    "@lodestar/fork-choice": "^1.50.0-dev.67e8d54549",
-    "@lodestar/logger": "^1.50.0-dev.67e8d54549",
-    "@lodestar/params": "^1.50.0-dev.67e8d54549",
-    "@lodestar/reqresp": "^1.50.0-dev.67e8d54549",
-    "@lodestar/state-transition": "^1.50.0-dev.67e8d54549",
-    "@lodestar/types": "^1.50.0-dev.67e8d54549",
-    "@lodestar/utils": "^1.50.0-dev.67e8d54549",
-    "@lodestar/validator": "^1.50.0-dev.67e8d54549",
+    "@lodestar/api": "^1.50.0-dev.6a7dbb4d5d",
+    "@lodestar/config": "^1.50.0-dev.6a7dbb4d5d",
+    "@lodestar/db": "^1.50.0-dev.6a7dbb4d5d",
+    "@lodestar/fork-choice": "^1.50.0-dev.6a7dbb4d5d",
+    "@lodestar/logger": "^1.50.0-dev.6a7dbb4d5d",
+    "@lodestar/params": "^1.50.0-dev.6a7dbb4d5d",
+    "@lodestar/reqresp": "^1.50.0-dev.6a7dbb4d5d",
+    "@lodestar/state-transition": "^1.50.0-dev.6a7dbb4d5d",
+    "@lodestar/types": "^1.50.0-dev.6a7dbb4d5d",
+    "@lodestar/utils": "^1.50.0-dev.6a7dbb4d5d",
+    "@lodestar/validator": "^1.50.0-dev.6a7dbb4d5d",
     "@multiformats/multiaddr": "^13.0.1",
     "datastore-core": "^12.0.1",
     "datastore-level": "^13.0.1",
@@ -159,8 +159,8 @@
     "@ethereumjs/rlp": "^4.0.1",
     "@libp2p/interface-internal": "^3.1.12",
     "@libp2p/logger": "^6.2.13",
-    "@lodestar/spec-test-util": "^1.50.0-dev.67e8d54549",
-    "@lodestar/test-utils": "^1.50.0-dev.67e8d54549",
+    "@lodestar/spec-test-util": "^1.50.0-dev.6a7dbb4d5d",
+    "@lodestar/test-utils": "^1.50.0-dev.6a7dbb4d5d",
     "@types/js-yaml": "^4.0.5",
     "@types/qs": "^6.9.7",
     "@types/tmp": "^0.2.3",
@@ -175,5 +175,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "dcb2dd45248feda5a6df84f617982ac298c9c8ac"
+  "gitHead": "e059d098420f9b8dc5fa7b16de95db114ff4ac62"
 }

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

@@ -692,8 +692,14 @@ export function getBeaconBlockApi({
     },
 
     async getBlockRoot({blockId}) {
-      // Fast path: From head state already available in memory get historical blockRoot
-      const slot = typeof blockId === "string" ? parseInt(blockId) : blockId;
+      // Fast path: From head state already available in memory get historical blockRoot.
+      // A 0x id is a root. parseInt() accepts that prefix as hex and can return a slot.
+      const slot =
+        typeof blockId === "number"
+          ? blockId
+          : blockId.toLowerCase().startsWith("0x")
+            ? Number.NaN
+            : parseInt(blockId, 10);
       if (!Number.isNaN(slot)) {
         const head = chain.forkChoice.getHead();
 

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

@@ -1940,7 +1940,7 @@ export function getValidatorApi(
           Array.from(new Set(subscriptions.map(({validatorIndex}) => validatorIndex)))
         );
       } catch (e) {
-        logger.error("Error tracking attached validators", {count: subscriptions.length}, e as Error);
+        logger.warn("Error tracking attached validators", {count: subscriptions.length}, e as Error);
       }
 
       notWhileSyncing(chain, sync.state);
@@ -2006,6 +2006,13 @@ export function getValidatorApi(
     },
 
     async prepareBeaconProposer({proposers}) {
+      if (isForkPostGloas(config.getForkName(chain.clock.currentSlot))) {
+        throw new ApiError(
+          410,
+          "prepareBeaconProposer is no longer supported from gloas, submit signed proposer preferences via POST /eth/v1/validator/proposer_preferences instead"
+        );
+      }
+
       await chain.updateBeaconProposerData(chain.clock.currentEpoch, proposers);
     },
 
@@ -2040,6 +2047,13 @@ export function getValidatorApi(
     },
 
     async registerValidator({registrations}) {
+      if (isForkPostGloas(config.getForkName(chain.clock.currentSlot))) {
+        throw new ApiError(
+          410,
+          "registerValidator is no longer supported from gloas, submit builder preferences via POST /eth/v1/validator/builder_preferences instead"
+        );
+      }
+
       if (!chain.executionBuilder) {
         throw Error("External builder not configured");
       }
@@ -2075,11 +2089,14 @@ export function getValidatorApi(
 
     async submitProposerPreferences({signedProposerPreferences}) {
       const failures: FailureList = [];
+      // Preferences submitted here are signed by validators using this node, gossiped ones are not
+      const attachedValidatorIndices: ValidatorIndex[] = [];
 
       await Promise.all(
         signedProposerPreferences.map(async (signed, i) => {
           try {
             await validateGossipProposerPreferences(chain, signed);
+            attachedValidatorIndices.push(signed.message.validatorIndex);
 
             chain.proposerPreferencesPool.add(signed);
             await network.publishProposerPreferences(signed);
@@ -2095,6 +2112,7 @@ export function getValidatorApi(
             };
 
             if (e instanceof ProposerPreferencesError && e.type.code === ProposerPreferencesErrorCode.ALREADY_KNOWN) {
+              attachedValidatorIndices.push(signed.message.validatorIndex);
               logger.debug("Ignoring known signed proposer preferences", logCtx);
               return;
             }
@@ -2108,6 +2126,14 @@ export function getValidatorApi(
         })
       );
 
+      if (attachedValidatorIndices.length > 0) {
+        try {
+          await chain.updateAttachedValidators(chain.clock.currentEpoch, attachedValidatorIndices);
+        } catch (e) {
+          logger.warn("Error tracking attached validators", {count: attachedValidatorIndices.length}, e as Error);
+        }
+      }
+
       if (failures.length > 0) {
         throw new IndexedError("Error processing signed proposer preferences", failures);
       }

package/src/chain/beaconProposerCache.ts

@@ -15,10 +15,18 @@ export class BeaconProposerCache {
     this.feeRecipientByValidatorIndex.set(validatorIndex, {epoch, feeRecipient});
   }
 
-  /** Track a validator that uses this node for duties, keeping the fee recipient it may have registered */
-  touch(epoch: Epoch, validatorIndex: number): void {
-    const feeRecipient = this.feeRecipientByValidatorIndex.get(validatorIndex)?.feeRecipient;
-    this.feeRecipientByValidatorIndex.set(validatorIndex, {epoch, feeRecipient});
+  /**
+   * Track a validator that uses this node for duties, keeping the fee recipient it may have
+   * registered. Returns true if the validator was not tracked before.
+   */
+  track(epoch: Epoch, validatorIndex: number): boolean {
+    const entry = this.feeRecipientByValidatorIndex.get(validatorIndex);
+    if (entry !== undefined) {
+      entry.epoch = epoch;
+      return false;
+    }
+    this.feeRecipientByValidatorIndex.set(validatorIndex, {epoch});
+    return true;
   }
 
   has(validatorIndex: number): boolean {

package/src/chain/chain.ts

@@ -1937,16 +1937,15 @@ export class BeaconChain implements IBeaconChain {
   }
 
   async updateAttachedValidators(epoch: Epoch, validatorIndices: ValidatorIndex[]): Promise<void> {
-    const previousValidatorCount = this.beaconProposerCache.getValidatorIndices().length;
-
+    let hasNewValidators = false;
     for (const validatorIndex of validatorIndices) {
-      this.beaconProposerCache.touch(epoch, validatorIndex);
+      if (this.beaconProposerCache.track(epoch, validatorIndex)) {
+        hasNewValidators = true;
+      }
     }
 
-    const newValidatorCount = this.beaconProposerCache.getValidatorIndices().length;
-
     // Only update validator custody if we discovered new validators
-    if (newValidatorCount > previousValidatorCount) {
+    if (hasNewValidators) {
       const finalizedCheckpoint = this.forkChoice.getFinalizedCheckpoint();
       await this.updateValidatorsCustodyRequirement(finalizedCheckpoint);
     }

package/src/chain/produceBlock/produceBlockBody.ts

@@ -77,6 +77,7 @@ import {IExecutionBuilder, IExecutionEngine, PayloadAttributes, PayloadId} from
 import {getShufflingDependentRoot} from "../../util/dependentRoot.js";
 import {fromGraffitiBytes} from "../../util/graffiti.js";
 import {kzg} from "../../util/kzg.js";
+import {BeaconProposerCache} from "../beaconProposerCache.js";
 import type {BeaconChain} from "../chain.js";
 import {CommonBlockBody} from "../interface.js";
 import {ProposerPreferencesPool} from "../opPools/index.js";
@@ -286,19 +287,12 @@ export async function produceBlockBody<T extends BlockType>(
     // this into a completely separate function and have pre/post gloas more separated
     const safeBlockHash = getSafeExecutionBlockHash(this.forkChoice, this.logger);
     const finalizedBlockHash = getFinalizedExecutionBlockHash(this.forkChoice);
-    const pooledPreferences = getPooledProposerPreferences(this, blockSlot, parentBlock.blockRoot);
-    const feeRecipient =
-      requestedFeeRecipient ??
-      (pooledPreferences !== null
-        ? toHex(pooledPreferences.feeRecipient)
-        : this.beaconProposerCache.getOrDefault(proposerIndex));
-    const feeRecipientType = requestedFeeRecipient
-      ? "requested"
-      : pooledPreferences !== null
-        ? "preferences"
-        : this.beaconProposerCache.get(proposerIndex)
-          ? "cached"
-          : "default";
+    const {feeRecipient, feeRecipientType} = getProposerFeeRecipient(
+      requestedFeeRecipient,
+      getPooledProposerPreferences(this, blockSlot, parentBlock.blockRoot),
+      this.beaconProposerCache,
+      proposerIndex
+    );
     Object.assign(logMeta, {feeRecipientType, feeRecipient});
 
     const endExecutionPayload = this.metrics?.executionBlockProductionTimeSteps.startTimer();
@@ -452,13 +446,12 @@ export async function produceBlockBody<T extends BlockType>(
 
     const safeBlockHash = getSafeExecutionBlockHash(this.forkChoice, this.logger);
     const finalizedBlockHash = getFinalizedExecutionBlockHash(this.forkChoice);
-    const feeRecipient = requestedFeeRecipient ?? this.beaconProposerCache.getOrDefault(proposerIndex);
-    const feeRecipientType = requestedFeeRecipient
-      ? "requested"
-      : this.beaconProposerCache.get(proposerIndex)
-        ? "cached"
-        : "default";
-
+    const {feeRecipient, feeRecipientType} = getProposerFeeRecipient(
+      requestedFeeRecipient,
+      null,
+      this.beaconProposerCache,
+      proposerIndex
+    );
     Object.assign(logMeta, {feeRecipientType, feeRecipient});
 
     if (blockType === BlockType.Blinded) {
@@ -1014,6 +1007,26 @@ function getProposerTargetGasLimit(
   return BigInt(parentPayloadVariant.executionPayloadGasLimit);
 }
 
+/** The proposer's request wins over its signed preferences, which win over its registered proposer data */
+function getProposerFeeRecipient(
+  requestedFeeRecipient: string | undefined,
+  pooledPreferences: gloas.ProposerPreferences | null,
+  beaconProposerCache: BeaconProposerCache,
+  proposerIndex: ValidatorIndex
+): {feeRecipient: string; feeRecipientType: "requested" | "preferences" | "cached" | "default"} {
+  if (requestedFeeRecipient !== undefined) {
+    return {feeRecipient: requestedFeeRecipient, feeRecipientType: "requested"};
+  }
+  if (pooledPreferences !== null) {
+    return {feeRecipient: toHex(pooledPreferences.feeRecipient), feeRecipientType: "preferences"};
+  }
+  const cachedFeeRecipient = beaconProposerCache.get(proposerIndex);
+  if (cachedFeeRecipient !== undefined) {
+    return {feeRecipient: cachedFeeRecipient, feeRecipientType: "cached"};
+  }
+  return {feeRecipient: beaconProposerCache.getOrDefault(proposerIndex), feeRecipientType: "default"};
+}
+
 /**
  * The preferences the proposer of `slot` signed for the branch of `parentBlockRoot`, the same
  * `(slot, dependent_root)` lookup as gossip bid validation. Null if none are pooled.