@lodestar/beacon-node 1.45.0-dev.85227cfbe5 → 1.45.0-dev.8d73a6a8cb

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.45.0-dev.85227cfbe5",
+  "version": "1.45.0-dev.8d73a6a8cb",
   "type": "module",
   "exports": {
     ".": {
@@ -134,17 +134,17 @@
     "@libp2p/peer-id": "^6.0.4",
     "@libp2p/prometheus-metrics": "^5.0.14",
     "@libp2p/tcp": "^11.0.13",
-    "@lodestar/api": "^1.45.0-dev.85227cfbe5",
-    "@lodestar/config": "^1.45.0-dev.85227cfbe5",
-    "@lodestar/db": "^1.45.0-dev.85227cfbe5",
-    "@lodestar/fork-choice": "^1.45.0-dev.85227cfbe5",
-    "@lodestar/logger": "^1.45.0-dev.85227cfbe5",
-    "@lodestar/params": "^1.45.0-dev.85227cfbe5",
-    "@lodestar/reqresp": "^1.45.0-dev.85227cfbe5",
-    "@lodestar/state-transition": "^1.45.0-dev.85227cfbe5",
-    "@lodestar/types": "^1.45.0-dev.85227cfbe5",
-    "@lodestar/utils": "^1.45.0-dev.85227cfbe5",
-    "@lodestar/validator": "^1.45.0-dev.85227cfbe5",
+    "@lodestar/api": "^1.45.0-dev.8d73a6a8cb",
+    "@lodestar/config": "^1.45.0-dev.8d73a6a8cb",
+    "@lodestar/db": "^1.45.0-dev.8d73a6a8cb",
+    "@lodestar/fork-choice": "^1.45.0-dev.8d73a6a8cb",
+    "@lodestar/logger": "^1.45.0-dev.8d73a6a8cb",
+    "@lodestar/params": "^1.45.0-dev.8d73a6a8cb",
+    "@lodestar/reqresp": "^1.45.0-dev.8d73a6a8cb",
+    "@lodestar/state-transition": "^1.45.0-dev.8d73a6a8cb",
+    "@lodestar/types": "^1.45.0-dev.8d73a6a8cb",
+    "@lodestar/utils": "^1.45.0-dev.8d73a6a8cb",
+    "@lodestar/validator": "^1.45.0-dev.8d73a6a8cb",
     "@multiformats/multiaddr": "^13.0.1",
     "datastore-core": "^11.0.2",
     "datastore-fs": "^11.0.2",
@@ -167,7 +167,7 @@
     "@libp2p/interface-internal": "^3.0.13",
     "@libp2p/logger": "^6.2.2",
     "@libp2p/utils": "^7.0.13",
-    "@lodestar/spec-test-util": "^1.45.0-dev.85227cfbe5",
+    "@lodestar/spec-test-util": "^1.45.0-dev.8d73a6a8cb",
     "@types/js-yaml": "^4.0.5",
     "@types/qs": "^6.9.7",
     "@types/tmp": "^0.2.3",
@@ -184,5 +184,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "bd183bff2666327a75b389254a812a5f729c836f"
+  "gitHead": "0537390960812671bc4a513d0c47f5fe2ef1ae30"
 }

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

@@ -1,6 +1,7 @@
 import {routes} from "@lodestar/api";
 import {ApplicationMethods} from "@lodestar/api/server";
 import {
+  ForkName,
   ForkPostElectra,
   ForkPreElectra,
   SYNC_COMMITTEE_SUBNET_SIZE,
@@ -16,12 +17,15 @@ import {
   GossipAction,
   PayloadAttestationError,
   PayloadAttestationErrorCode,
+  ProposerPreferencesError,
+  ProposerPreferencesErrorCode,
   SyncCommitteeError,
 } from "../../../../chain/errors/index.js";
 import {validateApiAttesterSlashing} from "../../../../chain/validation/attesterSlashing.js";
 import {validateApiBlsToExecutionChange} from "../../../../chain/validation/blsToExecutionChange.js";
 import {toElectraSingleAttestation, validateApiAttestation} from "../../../../chain/validation/index.js";
 import {validateApiPayloadAttestationMessage} from "../../../../chain/validation/payloadAttestationMessage.js";
+import {validateGossipProposerPreferences} from "../../../../chain/validation/proposerPreferences.js";
 import {validateApiProposerSlashing} from "../../../../chain/validation/proposerSlashing.js";
 import {validateApiSyncCommittee} from "../../../../chain/validation/syncCommittee.js";
 import {validateApiVoluntaryExit} from "../../../../chain/validation/voluntaryExit.js";
@@ -62,6 +66,54 @@ export function getBeaconPoolApi({
       return {data: chain.payloadAttestationPool.getAll(slot), meta: {version: fork}};
     },
 
+    async getPoolProposerPreferences({slot}) {
+      const fork = chain.config.getForkName(slot ?? chain.clock.currentSlot);
+      if (!isForkPostGloas(fork)) {
+        throw new ApiError(400, `Proposer preferences pool is not supported before Gloas fork=${fork}`);
+      }
+
+      return {data: chain.proposerPreferencesPool.getAll(slot), meta: {version: fork}};
+    },
+
+    async submitSignedProposerPreferences({signedProposerPreferences}) {
+      const failures: FailureList = [];
+
+      await Promise.all(
+        signedProposerPreferences.map(async (signed, i) => {
+          try {
+            await validateGossipProposerPreferences(chain, signed);
+
+            await network.publishProposerPreferences(signed);
+            chain.emitter.emit(routes.events.EventType.proposerPreferences, {
+              version: ForkName.gloas,
+              data: signed,
+            });
+          } catch (e) {
+            const logCtx = {
+              slot: signed.message.proposalSlot,
+              validatorIndex: signed.message.validatorIndex,
+              dependentRoot: toRootHex(signed.message.dependentRoot),
+            };
+
+            if (e instanceof ProposerPreferencesError && e.type.code === ProposerPreferencesErrorCode.ALREADY_KNOWN) {
+              logger.debug("Ignoring known signed proposer preferences", logCtx);
+              return;
+            }
+
+            failures.push({index: i, message: (e as Error).message});
+            logger.verbose(`Error on submitSignedProposerPreferences [${i}]`, logCtx, e as Error);
+            if (e instanceof ProposerPreferencesError && e.action === GossipAction.REJECT) {
+              chain.persistInvalidSszValue(ssz.gloas.SignedProposerPreferences, signed, "api_reject");
+            }
+          }
+        })
+      );
+
+      if (failures.length > 0) {
+        throw new IndexedError("Error processing signed proposer preferences", failures);
+      }
+    },
+
     async getPoolAttesterSlashingsV2() {
       const fork = chain.config.getForkName(chain.clock.currentSlot);
       return {data: chain.opPool.getAllAttesterSlashings(), meta: {version: fork}};

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

@@ -9,15 +9,13 @@ import {
   isStatePostAltair,
   isStatePostElectra,
   isStatePostFulu,
-  isStatePostGloas,
 } from "@lodestar/state-transition";
-import {ValidatorIndex, getBuilderStatus, getValidatorStatus, ssz} from "@lodestar/types";
+import {ValidatorIndex, getValidatorStatus, ssz} from "@lodestar/types";
 import {ApiError} from "../../errors.js";
 import {ApiModules} from "../../types.js";
 import {assertUniqueItems} from "../../utils.js";
 import {
   filterStateValidatorsByStatus,
-  getStateBuilderIndex,
   getStateResponseWithRegen,
   getStateValidatorIndex,
   toValidatorResponse,
@@ -145,55 +143,6 @@ export function getBeaconStateApi({
       return this.getStateValidators(args, context);
     },
 
-    async getStateBuilders({stateId, builderIds = [], statuses = []}) {
-      const {state, executionOptimistic, finalized} = await getState(stateId);
-      if (!isStatePostGloas(state)) {
-        throw new ApiError(400, `Builders are not supported for pre-gloas state fork=${state.forkName}`);
-      }
-      const finalizedEpoch = state.finalizedCheckpoint.epoch;
-
-      const builderResponses: routes.beacon.BuilderResponse[] = [];
-      if (builderIds.length) {
-        assertUniqueItems(builderIds, "Duplicate builder IDs provided");
-
-        for (const id of builderIds) {
-          const resp = getStateBuilderIndex(id, state);
-          if (resp.valid) {
-            const builderIndex = resp.builderIndex;
-            const builder = state.getBuilder(builderIndex);
-            const status = getBuilderStatus(builder, finalizedEpoch);
-            if (statuses.length && !statuses.includes(status)) {
-              continue;
-            }
-            builderResponses.push({index: builderIndex, status, builder});
-          }
-        }
-        return {
-          data: builderResponses,
-          meta: {executionOptimistic, finalized},
-        };
-      }
-
-      if (statuses.length) {
-        assertUniqueItems(statuses, "Duplicate statuses provided");
-      }
-
-      const buildersLength = state.getBuildersLength();
-      for (let builderIndex = 0; builderIndex < buildersLength; builderIndex++) {
-        const builder = state.getBuilder(builderIndex);
-        const status = getBuilderStatus(builder, finalizedEpoch);
-        if (statuses.length && !statuses.includes(status)) {
-          continue;
-        }
-        builderResponses.push({index: builderIndex, status, builder});
-      }
-
-      return {
-        data: builderResponses,
-        meta: {executionOptimistic, finalized},
-      };
-    },
-
     async postStateValidatorIdentities({stateId, validatorIds = []}) {
       const {state, executionOptimistic, finalized} = await getState(stateId);
       const {pubkeyCache} = chain;

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

@@ -1,18 +1,9 @@
 import {routes} from "@lodestar/api";
 import {CheckpointWithHex, IForkChoice} from "@lodestar/fork-choice";
 import {GENESIS_SLOT} from "@lodestar/params";
-import {IBeaconStateView, IBeaconStateViewGloas, PubkeyCache} from "@lodestar/state-transition";
-import {
-  BLSPubkey,
-  BuilderIndex,
-  Epoch,
-  RootHex,
-  Slot,
-  ValidatorIndex,
-  getValidatorStatus,
-  phase0,
-} from "@lodestar/types";
-import {byteArrayEquals, fromHex} from "@lodestar/utils";
+import {IBeaconStateView, PubkeyCache} from "@lodestar/state-transition";
+import {BLSPubkey, Epoch, RootHex, Slot, ValidatorIndex, getValidatorStatus, phase0} from "@lodestar/types";
+import {fromHex} from "@lodestar/utils";
 import {IBeaconChain} from "../../../../chain/index.js";
 import {ApiError, ValidationError} from "../../errors.js";
 
@@ -87,50 +78,6 @@ export function toValidatorResponse(
   };
 }
 
-type StateBuilderIndexResponse =
-  | {valid: true; builderIndex: BuilderIndex}
-  | {valid: false; code: number; reason: string};
-
-export function getStateBuilderIndex(
-  id: routes.beacon.BuilderId | BLSPubkey,
-  state: IBeaconStateViewGloas
-): StateBuilderIndexResponse {
-  if (typeof id === "string") {
-    // mutate `id` and fallthrough to below
-    if (id.startsWith("0x")) {
-      try {
-        id = fromHex(id);
-      } catch (_e) {
-        return {valid: false, code: 400, reason: "Invalid pubkey hex encoding"};
-      }
-    } else {
-      id = Number(id);
-    }
-  }
-
-  if (typeof id === "number") {
-    const builderIndex = id;
-    // builder is invalid or added later than given stateId
-    if (!Number.isSafeInteger(builderIndex) || builderIndex < 0) {
-      return {valid: false, code: 400, reason: "Invalid builder index"};
-    }
-    if (builderIndex >= state.getBuildersLength()) {
-      return {valid: false, code: 404, reason: "Builder index from future state"};
-    }
-    return {valid: true, builderIndex};
-  }
-
-  // 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};
-    }
-  }
-  return {valid: false, code: 404, reason: "Builder pubkey not found in state"};
-}
-
 export function filterStateValidatorsByStatus(
   statuses: string[],
   state: IBeaconStateView,
@@ -175,7 +122,7 @@ export function getStateValidatorIndex(
   if (typeof id === "number") {
     const validatorIndex = id;
     // validator is invalid or added later than given stateId
-    if (!Number.isSafeInteger(validatorIndex) || validatorIndex < 0) {
+    if (!Number.isSafeInteger(validatorIndex)) {
       return {valid: false, code: 400, reason: "Invalid validator index"};
     }
     if (validatorIndex >= state.validatorCount) {

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

@@ -65,8 +65,6 @@ import {
   AttestationError,
   AttestationErrorCode,
   GossipAction,
-  ProposerPreferencesError,
-  ProposerPreferencesErrorCode,
   SyncCommitteeError,
   SyncCommitteeErrorCode,
 } from "../../../chain/errors/index.js";
@@ -76,7 +74,6 @@ import {BlockType, ProduceFullDeneb, ProduceFullGloas} from "../../../chain/prod
 import {RegenCaller} from "../../../chain/regen/index.js";
 import {CheckpointHex} from "../../../chain/stateCache/types.js";
 import {validateApiAggregateAndProof} from "../../../chain/validation/index.js";
-import {validateGossipProposerPreferences} from "../../../chain/validation/proposerPreferences.js";
 import {validateSyncCommitteeGossipContributionAndProof} from "../../../chain/validation/syncCommitteeContributionAndProof.js";
 import {ZERO_HASH} from "../../../constants/index.js";
 import {BuilderStatus, NoBidReceived} from "../../../execution/builder/http.js";
@@ -1121,8 +1118,8 @@ export function getValidatorApi(
 
       const block = chain.forkChoice.getCanonicalBlockAtSlot(slot);
       if (!block) {
-        // No canonical block is seen at slot. Return 204 so vc can skip casting payload attestation.
-        return {data: undefined, meta: {version: fork}, status: 204};
+        // No block is seen at slot. Return 404 so vc can skip casting payload attestation.
+        throw new ApiError(404, `No canonical block found at slot=${slot}`);
       }
 
       const payloadInput = chain.seenPayloadEnvelopeInputCache.get(block.blockRoot);
@@ -1774,46 +1771,6 @@ export function getValidatorApi(
       });
     },
 
-    async submitProposerPreferences({signedProposerPreferences}) {
-      const failures: FailureList = [];
-
-      await Promise.all(
-        signedProposerPreferences.map(async (signed, i) => {
-          try {
-            await validateGossipProposerPreferences(chain, signed);
-
-            chain.proposerPreferencesPool.add(signed);
-            await network.publishProposerPreferences(signed);
-            chain.emitter.emit(routes.events.EventType.proposerPreferences, {
-              version: config.getForkName(signed.message.proposalSlot),
-              data: signed,
-            });
-          } catch (e) {
-            const logCtx = {
-              slot: signed.message.proposalSlot,
-              validatorIndex: signed.message.validatorIndex,
-              dependentRoot: toRootHex(signed.message.dependentRoot),
-            };
-
-            if (e instanceof ProposerPreferencesError && e.type.code === ProposerPreferencesErrorCode.ALREADY_KNOWN) {
-              logger.debug("Ignoring known signed proposer preferences", logCtx);
-              return;
-            }
-
-            failures.push({index: i, message: (e as Error).message});
-            logger.verbose(`Error on submitProposerPreferences [${i}]`, logCtx, e as Error);
-            if (e instanceof ProposerPreferencesError && e.action === GossipAction.REJECT) {
-              chain.persistInvalidSszValue(ssz.gloas.SignedProposerPreferences, signed, "api_reject");
-            }
-          }
-        })
-      );
-
-      if (failures.length > 0) {
-        throw new IndexedError("Error processing signed proposer preferences", failures);
-      }
-    },
-
     async getExecutionPayloadEnvelope({slot, beaconBlockRoot}) {
       const fork = config.getForkName(slot);
 

package/src/chain/produceBlock/produceBlockBody.ts

@@ -43,7 +43,6 @@ import {
   ValidatorIndex,
   Wei,
   altair,
-  bellatrix,
   capella,
   deneb,
   electra,
@@ -831,19 +830,28 @@ export function getPayloadAttributesForSSE(
     feeRecipient,
   });
 
-  const ssePayloadAttributes = {
+  let parentBlockNumber: number;
+  if (isForkPostGloas(fork)) {
+    const parentBlock = chain.forkChoice.getBlockHexAndBlockHash(
+      toRootHex(parentBlockRoot),
+      toRootHex(parentBlockHash)
+    );
+    if (parentBlock?.executionPayloadBlockHash == null) {
+      throw Error(`Parent block not found in fork choice root=${toRootHex(parentBlockRoot)}`);
+    }
+    parentBlockNumber = parentBlock.executionPayloadNumber;
+  } else {
+    parentBlockNumber = prepareState.payloadBlockNumber;
+  }
+
+  const ssePayloadAttributes: SSEPayloadAttributes = {
     proposerIndex: prepareState.getBeaconProposer(prepareSlot),
     proposalSlot: prepareSlot,
+    parentBlockNumber,
     parentBlockRoot,
     parentBlockHash,
     payloadAttributes,
-  } as SSEPayloadAttributes;
-
-  if (!isForkPostGloas(fork)) {
-    // Removed in Gloas, builders can get the block number from the EL via the block hash if required
-    (ssePayloadAttributes as bellatrix.SSEPayloadAttributes).parentBlockNumber = prepareState.payloadBlockNumber;
-  }
-
+  };
   return ssePayloadAttributes;
 }
 

package/src/network/processor/gossipHandlers.ts

@@ -1274,7 +1274,7 @@ function getSequentialHandlers(modules: ValidatorFnsModules, options: GossipHand
       await validateGossipProposerPreferences(chain, signedProposerPreferences);
 
       chain.emitter.emit(routes.events.EventType.proposerPreferences, {
-        version: config.getForkName(signedProposerPreferences.message.proposalSlot),
+        version: ForkName.gloas,
         data: signedProposerPreferences,
       });
     },