@lodestar/validator 1.50.0-dev.456b75a81e → 1.50.0-dev.4b00f7bf39

package/src/services/block.ts

@@ -1,6 +1,6 @@
 import {ApiClient, routes} from "@lodestar/api";
 import {ChainForkConfig} from "@lodestar/config";
-import {BUILDER_INDEX_SELF_BUILD, ForkPostGloas, isForkPostGloas} from "@lodestar/params";
+import {BUILDER_INDEX_SELF_BUILD, ForkPostGloas, ForkPreGloas, isForkPostGloas} from "@lodestar/params";
 import {IClock} from "@lodestar/state-transition";
 import {
   BLSPubkey,
@@ -9,6 +9,7 @@ import {
   BlindedBeaconBlock,
   BlockContents,
   ProducedBlockSource,
+  SignedBeaconBlock,
   SignedBlindedBeaconBlock,
   SignedBlockContents,
   Slot,
@@ -42,6 +43,10 @@ type BlockProposalOpts = {
   blindedLocal: boolean;
   payloadLocal: boolean;
 };
+
+/** Excludes all p2p bids, builder API bids are excluded by not sending any builder entries */
+const EXECUTION_ONLY_MIN_BID = 2n ** 64n - 1n;
+
 /**
  * Service that sets up and handles validator block proposal duties.
  */
@@ -144,7 +149,9 @@ export class BlockProposingService {
       const block = blockContentsWrapper.executionPayloadBlinded
         ? blockContentsWrapper.block
         : blockContentsWrapper.blockContents.block;
-      const signedBlock = await this.validatorStore.signBlock(pubkey, block, slot, this.logger);
+      const signedBlock = (await this.validatorStore.signBlock(pubkey, block, slot, this.logger)) as
+        | SignedBeaconBlock<ForkPreGloas>
+        | SignedBlindedBeaconBlock;
 
       const {broadcastValidation} = this.opts;
       const publishOpts = {broadcastValidation};
@@ -194,8 +201,12 @@ export class BlockProposingService {
     const {broadcastValidation, payloadLocal} = this.opts;
     const {selection: builderSelection, boostFactor: builderBoostFactor} =
       this.validatorStore.getBuilderSelectionParams(pubkeyHex, slot);
-    const builderMinBid = this.validatorStore.getBuilderMinBid(pubkeyHex);
-    const builderEntries = this.validatorStore.getResolvedBuilderEntries(pubkeyHex, builderBoostFactor);
+    // `executiononly` never uses a builder bid, neither from builder APIs nor received over p2p
+    const isExecutionOnly = builderSelection === routes.validator.BuilderSelection.ExecutionOnly;
+    const builderMinBid = isExecutionOnly ? EXECUTION_ONLY_MIN_BID : this.validatorStore.getBuilderMinBid(pubkeyHex);
+    const builderEntries = isExecutionOnly
+      ? []
+      : this.validatorStore.getResolvedBuilderEntries(pubkeyHex, builderBoostFactor);
 
     this.logger.debug("Producing block", {
       ...debugLogCtx,
@@ -258,6 +269,14 @@ export class BlockProposingService {
     const block = executionPayloadIncluded
       ? (blockOrContents as BlockContents<ForkPostGloas>).block
       : (blockOrContents as BeaconBlock<ForkPostGloas>);
+    const {builderIndex} = block.body.signedExecutionPayloadBid.message;
+    const isSelfBuild = builderIndex === BUILDER_INDEX_SELF_BUILD;
+    if (isExecutionOnly && !isSelfBuild) {
+      this.metrics?.blockProposingErrors.inc({error: "produce"});
+      throw Error(
+        `Block not produced as per desired builderSelection=${builderSelection} builderIndex=${builderIndex}`
+      );
+    }
     const beaconBlockRoot = this.config.getForkTypes(slot).BeaconBlock.hashTreeRoot(block);
     const blockRootHex = toRootHex(beaconBlockRoot);
 
@@ -280,7 +299,7 @@ export class BlockProposingService {
     (
       await this.api.beacon
         .publishBlockV2({
-          signedBlockContents: {signedBlock},
+          signedBlockContents: {signedBlock} as SignedBlockContents<ForkPostGloas>,
           broadcastValidation,
           // Echo the winning builder url so any beacon node can forward the block to the builder
           builderUrl: blockMeta.builderUrl,
@@ -303,8 +322,6 @@ export class BlockProposingService {
     this.metrics?.proposerStepCallPublishBlock.observe(this.clock.secFromSlot(slot));
     this.metrics?.blocksPublished.inc();
 
-    const isSelfBuild = block.body.signedExecutionPayloadBid.message.builderIndex === BUILDER_INDEX_SELF_BUILD;
-
     if (isSelfBuild) {
       // Self-build: proposer is responsible for building and publishing the execution payload envelope
       const flow = executionPayloadIncluded ? "stateless" : "stateful";

package/src/services/blockDuties.ts

@@ -248,8 +248,10 @@ export class BlockDutiesService {
     signal: AbortSignal
   ): Promise<void> {
     const nextSlot = currentSlot + 1;
+    const currentFork = this.config.getForkName(currentSlot);
     const lookAheadMs =
-      this.config.SLOT_DURATION_MS - this.config.getSlotComponentDurationMs(BLOCK_DUTIES_LOOKAHEAD_BPS);
+      this.config.getSlotDurationMs(currentFork) -
+      this.config.getSlotComponentDurationMs(currentFork, BLOCK_DUTIES_LOOKAHEAD_BPS);
     await sleep(this.clock.msToSlot(nextSlot) - lookAheadMs, signal);
     this.logger.debug("Polling proposers for the next epoch", {nextEpoch, currentSlot});
     await this.pollBeaconProposers(nextEpoch);

package/src/services/prepareBeaconProposer.ts

@@ -14,7 +14,8 @@ const REGISTRATION_CHUNK_SIZE = 512;
  * the engine for building execution payload with transactions.
  *
  * This needs to be done every epoch because the BN will cache it at most for
- * two epochs.
+ * two epochs. From gloas the beacon node takes the fee recipient from the signed
+ * proposer preferences and the validators using it from the committee subscriptions.
  */
 export function pollPrepareBeaconProposer(
   config: BeaconConfig,
@@ -28,6 +29,9 @@ export function pollPrepareBeaconProposer(
     // Before bellatrix we don't need to update this data on bn/builder
     if (epoch < config.BELLATRIX_FORK_EPOCH - 1) return;
 
+    // Proposer data is pre-gloas only, replaced by proposer preferences and committee subscriptions
+    if (config.getForkSeq(epoch * SLOTS_PER_EPOCH) >= ForkSeq.gloas) return;
+
     // prepareBeaconProposer is not as time sensitive as attesting.
     // Poll indices first, then call api.validator.prepareBeaconProposer once
     await validatorStore.pollValidatorIndices().catch((e: Error) => {

package/src/services/proposalPreferences.ts

@@ -0,0 +1,308 @@
+import {ApiClient, ApiError, routes} from "@lodestar/api";
+import {ChainForkConfig} from "@lodestar/config";
+import {SLOTS_PER_EPOCH, isForkPostGloas} from "@lodestar/params";
+import {IClock, computeEpochAtSlot} from "@lodestar/state-transition";
+import {Epoch, RootHex, Slot, gloas} from "@lodestar/types";
+import {fromHex, toPubkeyHex} from "@lodestar/utils";
+import {Metrics} from "../metrics.js";
+import {LoggerVc} from "../util/index.js";
+import {BlockDutiesService} from "./blockDuties.js";
+import {SyncingStatusTracker} from "./syncingStatusTracker.js";
+import {ValidatorStore} from "./validatorStore.js";
+
+/**
+ * Submit the preferences of a proposal this many slots before the proposal slot.
+ *
+ * Earlier submission means more reorg-triggered resubmits (and gossip flood); later
+ * submission risks missing the bid-auction window for this proposal slot. The bid for
+ * slot S typically arrives at slot S-1, so we want preferences propagated to the network
+ * and consumed by builders before then. SLOTS_PER_EPOCH / 4 (8 slots @ 32 SPE, ~96s @ 12s
+ * slots) gives ample margin while bounding redundant resubmits.
+ */
+const SUBMIT_BEFORE_PROPOSAL_SLOTS = Math.floor(SLOTS_PER_EPOCH / 4);
+
+/** Per-epoch tracking of preferences already submitted under the current dependent_root. */
+type SubmittedAtEpoch = {dependentRoot: RootHex; proposerSlots: Set<Slot>; builderSlots: Set<Slot>};
+type PendingSubmission = {submission: SubmittedAtEpoch; slot: Slot};
+/** A local proposal within the submission window along with the tracking of its epoch */
+type UpcomingProposal = {duty: routes.validator.ProposerDuty; submission: SubmittedAtEpoch};
+
+/**
+ * Signs and submits the preferences of local proposals within the next `SUBMIT_BEFORE_PROPOSAL_SLOTS`:
+ * the `SignedProposerPreferences` the beacon node broadcasts on gossip and the builder preferences
+ * it forwards to the builders configured for the validator. Signing the builder request auths here
+ * also pre-fills the auth cache used at proposal time.
+ *
+ * Re-submits automatically when the proposer dependent root for an epoch shifts (e.g. after a reorg)
+ * since the proposer for a slot may have changed. Detected by comparing the cached `dependentRoot`
+ * reported by `BlockDutiesService` against the one we last submitted under.
+ *
+ * Proposers should broadcast their preferences before the fork so the proposer preference caches
+ * of beacon nodes and builders are warm for the first Gloas slots. We start submitting
+ * as soon as a duty's proposal slot is in Gloas, which is up to `SUBMIT_BEFORE_PROPOSAL_SLOTS`
+ * before the fork, so only the first few Gloas slots are affected by this pre-fork submission.
+ */
+export class ProposalPreferencesService {
+  private readonly submitted = new Map<Epoch, SubmittedAtEpoch>();
+  private activeScheduledGasLimit: number | undefined;
+
+  constructor(
+    private readonly config: ChainForkConfig,
+    private readonly logger: LoggerVc,
+    private readonly api: ApiClient,
+    clock: IClock,
+    private readonly validatorStore: ValidatorStore,
+    private readonly blockDutiesService: BlockDutiesService,
+    syncingStatusTracker: SyncingStatusTracker,
+    _metrics: Metrics | null
+  ) {
+    clock.runEverySlot(this.runPreferencesTask);
+    clock.runEveryEpoch(this.runEveryEpochTask);
+    syncingStatusTracker.runOnResynced(this.onResynced);
+  }
+
+  /**
+   * A beacon node that was unreachable or syncing may have restarted and lost the preferences it
+   * accepted, it keeps them in memory only. Submit everything within the window again, the beacon
+   * node ignores preferences it still has.
+   */
+  private onResynced = async (slot: Slot): Promise<void> => {
+    if (this.submitted.size === 0) {
+      return;
+    }
+
+    this.logger.verbose("Beacon node resynced; resubmitting preferences", {slot});
+    this.submitted.clear();
+    await this.runPreferencesTask(slot);
+  };
+
+  private runPreferencesTask = async (slot: Slot): Promise<void> => {
+    // Start running once the submission window (`slot + SUBMIT_BEFORE_PROPOSAL_SLOTS`) reaches
+    // Gloas, i.e. already in the epoch before the fork. This allows builders to prepare and
+    // submit bids for the first Gloas slots.
+    if (!isForkPostGloas(this.config.getForkName(slot + SUBMIT_BEFORE_PROPOSAL_SLOTS))) {
+      return;
+    }
+
+    const proposals = this.getUpcomingProposals(slot);
+    if (proposals.length === 0) {
+      return;
+    }
+
+    // Signed and submitted independently, a slow signer for one must not delay the other
+    await Promise.all([
+      this.submitProposerPreferences(proposals, slot),
+      this.submitBuilderPreferences(proposals, slot),
+    ]);
+  };
+
+  private runEveryEpochTask = async (epoch: Epoch): Promise<void> => {
+    const scheduledGasLimit = this.config.getScheduledGasLimit(epoch);
+    if (scheduledGasLimit !== undefined && scheduledGasLimit !== this.activeScheduledGasLimit) {
+      const configuredDefaultGasLimit = this.validatorStore.getConfiguredDefaultGasLimit();
+      this.logger.info("Gas limit schedule active", {
+        epoch,
+        recommendedGasLimit: scheduledGasLimit,
+        effectiveDefaultGasLimit: configuredDefaultGasLimit ?? scheduledGasLimit,
+        defaultGasLimitSource: configuredDefaultGasLimit === undefined ? "schedule" : "operator",
+      });
+      this.activeScheduledGasLimit = scheduledGasLimit;
+    }
+
+    // Drop tracking for past epochs; only currentEpoch and currentEpoch + 1 are ever processed.
+    for (const trackedEpoch of this.submitted.keys()) {
+      if (trackedEpoch < epoch) {
+        this.submitted.delete(trackedEpoch);
+      }
+    }
+  };
+
+  /** Resets the tracking of `epoch` if the dependent root shifted, previously submitted preferences are stale. */
+  private getSubmissionAtEpoch(epoch: Epoch, dependentRoot: RootHex): SubmittedAtEpoch {
+    let submission = this.submitted.get(epoch);
+    if (submission === undefined || submission.dependentRoot !== dependentRoot) {
+      if (submission !== undefined) {
+        this.logger.info("Proposer-shuffling dependent root shifted; resubmitting preferences", {
+          epoch,
+          priorDependentRoot: submission.dependentRoot,
+          dependentRoot,
+        });
+      }
+      submission = {dependentRoot, proposerSlots: new Set(), builderSlots: new Set()};
+      this.submitted.set(epoch, submission);
+    }
+    return submission;
+  }
+
+  private getUpcomingProposals(slot: Slot): UpcomingProposal[] {
+    const currentEpoch = computeEpochAtSlot(slot);
+    const proposals: UpcomingProposal[] = [];
+
+    for (const epoch of [currentEpoch, currentEpoch + 1]) {
+      const dutiesAtEpoch = this.blockDutiesService.getProposersAtEpoch(epoch);
+      if (!dutiesAtEpoch) continue;
+
+      const submission = this.getSubmissionAtEpoch(epoch, dutiesAtEpoch.dependentRoot);
+
+      for (const duty of dutiesAtEpoch.data) {
+        if (duty.slot <= slot) continue;
+        if (duty.slot > slot + SUBMIT_BEFORE_PROPOSAL_SLOTS) continue;
+        if (!isForkPostGloas(this.config.getForkName(duty.slot))) continue;
+
+        proposals.push({duty, submission});
+      }
+    }
+
+    return proposals;
+  }
+
+  private async submitProposerPreferences(proposals: UpcomingProposal[], slot: Slot): Promise<void> {
+    const signedProposerPreferences: gloas.SignedProposerPreferences[] = [];
+    // Track which `(submission, slot)` pairs are pending an API submission so we can mark
+    // them only after the network call succeeds. Marking before would silently drop a
+    // preference on transient API failure (no retry until dependent_root shifts).
+    const pending: PendingSubmission[] = [];
+
+    for (const {duty, submission} of proposals) {
+      if (submission.proposerSlots.has(duty.slot)) continue;
+
+      try {
+        const pubkeyHex = toPubkeyHex(duty.pubkey);
+        const signed = await this.validatorStore.signProposerPreferences(
+          duty,
+          fromHex(submission.dependentRoot),
+          this.validatorStore.getFeeRecipient(pubkeyHex),
+          this.validatorStore.getGasLimit(pubkeyHex, duty.slot, this.logger),
+          slot
+        );
+        signedProposerPreferences.push(signed);
+        pending.push({submission, slot: duty.slot});
+      } catch (e) {
+        this.logger.error(
+          "Error signing proposer preferences",
+          {slot: duty.slot, validatorIndex: duty.validatorIndex},
+          e as Error
+        );
+      }
+    }
+
+    if (signedProposerPreferences.length === 0) {
+      return;
+    }
+
+    try {
+      (await this.api.validator.submitProposerPreferences({signedProposerPreferences})).assertOk();
+      // Only mark as submitted after the API call succeeds; a thrown error leaves the
+      // slot eligible for retry on the next tick.
+      for (const {submission, slot: submittedSlot} of pending) {
+        submission.proposerSlots.add(submittedSlot);
+      }
+      this.logger.debug("Submitted signed proposer preferences", {count: signedProposerPreferences.length});
+    } catch (e) {
+      const failures = e instanceof ApiError ? e.failures : undefined;
+      if (failures === undefined) {
+        this.logger.error(
+          "Error submitting signed proposer preferences",
+          {count: signedProposerPreferences.length},
+          e as Error
+        );
+        return;
+      }
+
+      // The beacon node rejected some of the preferences, reported by index into the batch.
+      // Mark the accepted ones, the rejected ones are retried on the next tick.
+      const failedIndices = new Set(failures.map(({index}) => index));
+      pending.forEach(({submission, slot: submittedSlot}, index) => {
+        if (!failedIndices.has(index)) {
+          submission.proposerSlots.add(submittedSlot);
+        }
+      });
+      for (const {index, message} of failures) {
+        this.logger.error("Error submitting signed proposer preferences", {
+          slot: pending[index]?.slot,
+          validatorIndex: signedProposerPreferences[index]?.message.validatorIndex,
+          message,
+        });
+      }
+    }
+  }
+
+  private async submitBuilderPreferences(proposals: UpcomingProposal[], slot: Slot): Promise<void> {
+    const builderPreferences: routes.validator.BuilderPreferencesEntry[] = [];
+    const pending: PendingSubmission[] = [];
+    // Index into `pending` of each entry in `builderPreferences`, a proposal has one entry per builder
+    const pendingIndexByEntry: number[] = [];
+
+    for (const {duty, submission} of proposals) {
+      if (submission.builderSlots.has(duty.slot)) continue;
+
+      const pubkeyHex = toPubkeyHex(duty.pubkey);
+      const {selection} = this.validatorStore.getBuilderSelectionParams(pubkeyHex, duty.slot);
+      if (selection === routes.validator.BuilderSelection.ExecutionOnly) continue;
+
+      const builderEntries = this.validatorStore.getResolvedBuilderEntries(pubkeyHex);
+      if (builderEntries.length === 0) continue;
+
+      try {
+        // Collect entries per duty and only add them to the batch if signing
+        // succeeded for all builders, else the duty is retried on the next tick
+        const dutyEntries: routes.validator.BuilderPreferencesEntry[] = [];
+        for (const entry of builderEntries) {
+          const auth = await this.validatorStore.getBuilderRequestAuth(duty.pubkey, entry.authData, duty.slot, slot);
+          dutyEntries.push({
+            proposerPubkey: duty.pubkey,
+            url: new TextEncoder().encode(entry.url),
+            auth,
+            maxExecutionPayment: entry.maxExecutionPayment,
+          });
+        }
+        builderPreferences.push(...dutyEntries);
+        pendingIndexByEntry.push(...dutyEntries.map(() => pending.length));
+        pending.push({submission, slot: duty.slot});
+      } catch (e) {
+        this.logger.error(
+          "Error signing builder preferences",
+          {slot: duty.slot, validatorIndex: duty.validatorIndex},
+          e as Error
+        );
+      }
+    }
+
+    if (builderPreferences.length === 0) {
+      return;
+    }
+
+    try {
+      (await this.api.validator.submitBuilderPreferences({builderPreferences})).assertOk();
+      // Only mark as submitted after the API call succeeds; a thrown error, including per-entry
+      // failures reported by index, leaves all slots eligible for retry on the next tick.
+      // Re-submitting preferences a builder already accepted is harmless.
+      for (const {submission, slot: submittedSlot} of pending) {
+        submission.builderSlots.add(submittedSlot);
+      }
+      this.logger.debug("Submitted builder preferences", {count: builderPreferences.length});
+    } catch (e) {
+      const failures = e instanceof ApiError ? e.failures : undefined;
+      if (failures === undefined) {
+        this.logger.warn("Error submitting builder preferences", {count: builderPreferences.length}, e as Error);
+        return;
+      }
+
+      // Some entries were not accepted by their builder, reported by index into the batch. Mark the
+      // proposals whose entries were all accepted, the others are retried with all their builders.
+      const failedPendingIndices = new Set(failures.map(({index}) => pendingIndexByEntry[index]));
+      pending.forEach(({submission, slot: submittedSlot}, index) => {
+        if (!failedPendingIndices.has(index)) {
+          submission.builderSlots.add(submittedSlot);
+        }
+      });
+      for (const {index, message} of failures) {
+        this.logger.warn("Error submitting builder preferences", {
+          slot: pending[pendingIndexByEntry[index]]?.slot,
+          builder: builderPreferences[index] ? new TextDecoder().decode(builderPreferences[index].url) : undefined,
+          message,
+        });
+      }
+    }
+  }
+}

package/src/services/ptc.ts

@@ -61,7 +61,10 @@ export class PtcService {
       return;
     }
 
-    const payloadAttestationDueMs = this.config.getSlotComponentDurationMs(this.config.PAYLOAD_ATTESTATION_DUE_BPS);
+    const payloadAttestationDueMs = this.config.getSlotComponentDurationMs(
+      fork,
+      this.config.PAYLOAD_ATTESTATION_DUE_BPS
+    );
     // Submit as soon as the canonical head block's payload is available, or at the deadline
     const payloadAvailable = new AbortController();
     try {
@@ -149,7 +152,8 @@ export class PtcService {
 
     this.metrics?.ptcStepCallPublishPayloadAttestation.observe(
       this.clock.secFromSlot(slot) -
-        this.config.getSlotComponentDurationMs(this.config.PAYLOAD_ATTESTATION_DUE_BPS) / 1000
+        this.config.getSlotComponentDurationMs(this.config.getForkName(slot), this.config.PAYLOAD_ATTESTATION_DUE_BPS) /
+          1000
     );
 
     if (payloadAttestationMessages.length > 0) {

package/src/services/syncCommittee.ts

@@ -174,7 +174,7 @@ export class SyncCommitteeService {
     // SyncCommitteeSignature gossip validation.
     const syncMessageDueMs = this.config.getSyncMessageDueMs(fork);
     const msToCutoffTime = syncMessageDueMs - this.clock.msFromSlot(slot);
-    const afterBlockDelayMs = 1000 * this.clock.secondsPerSlot * (this.opts?.scAfterBlockDelaySlotFraction ?? 0);
+    const afterBlockDelayMs = this.clock.getSlotDurationMs(slot) * (this.opts?.scAfterBlockDelaySlotFraction ?? 0);
     const toDelayMs = Math.min(msToCutoffTime, afterBlockDelayMs);
     if (toDelayMs > 0) {
       await sleep(toDelayMs);

package/src/services/validatorStore.ts

@@ -359,14 +359,10 @@ export class ValidatorStore {
     }
 
     // Post-Gloas block production uses standard builder boost factor. Need to normalize the
-    // gloas-deprecated "builderonly" and "executiononly" to the gloas fallback "builderalways"
-    // and "executionalways" equivalent before deriving the boost factor.
-    if (isPostGloas) {
-      if (selection === routes.validator.BuilderSelection.BuilderOnly) {
-        selection = routes.validator.BuilderSelection.BuilderAlways;
-      } else if (selection === routes.validator.BuilderSelection.ExecutionOnly) {
-        selection = routes.validator.BuilderSelection.ExecutionAlways;
-      }
+    // gloas-deprecated "builderonly" to the gloas fallback "builderalways" equivalent before
+    // deriving the boost factor.
+    if (isPostGloas && selection === routes.validator.BuilderSelection.BuilderOnly) {
+      selection = routes.validator.BuilderSelection.BuilderAlways;
     }
 
     const boostFactor = getBuilderBoostFactor(

package/src/util/externalSignerClient.ts

@@ -1,6 +1,6 @@
 import {ContainerType, ValueOf} from "@chainsafe/ssz";
 import {BeaconConfig} from "@lodestar/config";
-import {ForkName, ForkPostGloas, ForkPreBellatrix, ForkSeq, isForkPostDeneb} from "@lodestar/params";
+import {ForkName, ForkPostGloas, ForkSeq, isForkPostDeneb} from "@lodestar/params";
 import {blindedOrFullBlockToHeader, computeEpochAtSlot} from "@lodestar/state-transition";
 import {
   AggregateAndProof,
@@ -78,7 +78,7 @@ export type SignableMessage =
   | {type: SignableMessageType.AGGREGATE_AND_PROOF; data: phase0.AggregateAndProof}
   | {type: SignableMessageType.AGGREGATE_AND_PROOF_V2; data: AggregateAndProof}
   | {type: SignableMessageType.ATTESTATION; data: phase0.AttestationData}
-  | {type: SignableMessageType.BLOCK_V2; data: BeaconBlock<ForkPreBellatrix> | BlindedBeaconBlock}
+  | {type: SignableMessageType.BLOCK_V2; data: BeaconBlock | BlindedBeaconBlock}
   | {type: SignableMessageType.DEPOSIT; data: ValueOf<typeof DepositType>}
   | {type: SignableMessageType.RANDAO_REVEAL; data: {epoch: Epoch}}
   | {type: SignableMessageType.VOLUNTARY_EXIT; data: phase0.VoluntaryExit}

package/src/validator.ts

@@ -16,14 +16,13 @@ import {MetaDataRepository} from "./repositories/metaDataRepository.js";
 import {AttestationService} from "./services/attestation.js";
 import {BlockProposingService} from "./services/block.js";
 import {BlockDutiesService} from "./services/blockDuties.js";
-import {BuilderPreferencesService} from "./services/builderPreferences.js";
 import {ChainHeaderTracker} from "./services/chainHeaderTracker.js";
 import {DoppelgangerService} from "./services/doppelgangerService.js";
 import {ValidatorEventEmitter} from "./services/emitter.js";
 import {ExternalSignerOptions, pollExternalSignerPubkeys} from "./services/externalSignerSync.js";
 import {IndicesService} from "./services/indices.js";
 import {pollBuilderValidatorRegistration, pollPrepareBeaconProposer} from "./services/prepareBeaconProposer.js";
-import {ProposerPreferencesService} from "./services/proposerPreferences.js";
+import {ProposalPreferencesService} from "./services/proposalPreferences.js";
 import {PtcService} from "./services/ptc.js";
 import {SyncCommitteeService} from "./services/syncCommittee.js";
 import {SyncingStatusTracker} from "./services/syncingStatusTracker.js";
@@ -320,8 +319,16 @@ export class Validator {
       }
     );
 
-    new ProposerPreferencesService(config, loggerVc, api, clock, validatorStore, blockDutiesService, metrics);
-    new BuilderPreferencesService(config, loggerVc, api, clock, validatorStore, blockDutiesService, metrics);
+    new ProposalPreferencesService(
+      config,
+      loggerVc,
+      api,
+      clock,
+      validatorStore,
+      blockDutiesService,
+      syncingStatusTracker,
+      metrics
+    );
 
     return new Validator({
       opts,

package/lib/services/builderPreferences.d.ts

@@ -1,27 +0,0 @@
-import { ApiClient } from "@lodestar/api";
-import { ChainForkConfig } from "@lodestar/config";
-import { IClock } from "@lodestar/state-transition";
-import { Metrics } from "../metrics.js";
-import { LoggerVc } from "../util/index.js";
-import { BlockDutiesService } from "./blockDuties.js";
-import { ValidatorStore } from "./validatorStore.js";
-/**
- * Signs and submits builder preferences for any local validator that will propose within the
- * next `SUBMIT_BEFORE_PROPOSAL_SLOTS` and has external builders configured. Signing the request
- * auths here also pre-fills the auth cache used at proposal time.
- *
- * The beacon node submits each entry to the builder at the entry's url. Re-submits automatically
- * when the proposer dependent root for an epoch shifts (e.g. after a reorg) since the proposer
- * for a slot may have changed.
- */
-export declare class BuilderPreferencesService {
-    private readonly config;
-    private readonly logger;
-    private readonly api;
-    private readonly validatorStore;
-    private readonly blockDutiesService;
-    private readonly submitted;
-    constructor(config: ChainForkConfig, logger: LoggerVc, api: ApiClient, clock: IClock, validatorStore: ValidatorStore, blockDutiesService: BlockDutiesService, _metrics: Metrics | null);
-    private runBuilderPreferencesTask;
-}
-//# sourceMappingURL=builderPreferences.d.ts.map

package/lib/services/builderPreferences.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"builderPreferences.d.ts","sourceRoot":"","sources":["../../src/services/builderPreferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAS,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAC,MAAM,EAAqB,MAAM,4BAA4B,CAAC;AAGtE,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAC,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAYnD;;;;;;;;GAQG;AACH,qBAAa,yBAAyB;IAIlC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAEpB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IARrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsC;IAEhE,YACmB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,QAAQ,EAChB,GAAG,EAAE,SAAS,EAC/B,KAAK,EAAE,MAAM,EACI,cAAc,EAAE,cAAc,EAC9B,kBAAkB,EAAE,kBAAkB,EACvD,QAAQ,EAAE,OAAO,GAAG,IAAI,EAGzB;IAED,OAAO,CAAC,yBAAyB,CA+F/B;CACH"}