@lodestar/validator 1.50.0-dev.db953a4f93 → 1.50.0-dev.dff4197219

package/src/services/ptcDuties.ts

@@ -95,8 +95,8 @@ export class PtcDutiesService {
   }
 
   private runDutiesTasks = async (epoch: Epoch): Promise<void> => {
-    const nextEpoch = epoch + 1;
-    if (!isForkPostGloas(this.config.getForkName(nextEpoch * SLOTS_PER_EPOCH))) {
+    // PTC duties of the first Gloas epoch only exist after the fork upgrade, they can't be polled one epoch ahead
+    if (!isForkPostGloas(this.config.getForkName(epoch * SLOTS_PER_EPOCH))) {
       return;
     }
 

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/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,7 @@ 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, 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"}

package/lib/services/builderPreferences.js

@@ -1,127 +0,0 @@
-import { routes } from "@lodestar/api";
-import { SLOTS_PER_EPOCH, isForkPostGloas } from "@lodestar/params";
-import { computeEpochAtSlot } from "@lodestar/state-transition";
-import { toPubkeyHex } from "@lodestar/utils";
-/**
- * Submit a proposer's builder preferences this many slots before the proposal slot.
- * Same pacing as `ProposerPreferencesService`, builders must have the preferences
- * before the bid request arrives at proposal time.
- */
-const SUBMIT_BEFORE_PROPOSAL_SLOTS = Math.floor(SLOTS_PER_EPOCH / 4);
-/**
- * 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 class BuilderPreferencesService {
-    config;
-    logger;
-    api;
-    validatorStore;
-    blockDutiesService;
-    submitted = new Map();
-    constructor(config, logger, api, clock, validatorStore, blockDutiesService, _metrics) {
-        this.config = config;
-        this.logger = logger;
-        this.api = api;
-        this.validatorStore = validatorStore;
-        this.blockDutiesService = blockDutiesService;
-        clock.runEverySlot(this.runBuilderPreferencesTask);
-    }
-    runBuilderPreferencesTask = async (slot) => {
-        // 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 currentEpoch = computeEpochAtSlot(slot);
-        const entries = [];
-        // 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 = [];
-        for (const epoch of [currentEpoch, currentEpoch + 1]) {
-            const dutiesAtEpoch = this.blockDutiesService.getProposersAtEpoch(epoch);
-            if (!dutiesAtEpoch)
-                continue;
-            // Reset submission tracking if the dependent root for this epoch has shifted
-            // (e.g. due to a reorg). The proposer for a slot may have changed.
-            let submission = this.submitted.get(epoch);
-            if (submission === undefined || submission.dependentRoot !== dutiesAtEpoch.dependentRoot) {
-                if (submission !== undefined) {
-                    this.logger.info("Proposer-shuffling dependent root shifted; resubmitting builder preferences", {
-                        epoch,
-                        priorDependentRoot: submission.dependentRoot,
-                        dependentRoot: dutiesAtEpoch.dependentRoot,
-                    });
-                }
-                submission = { dependentRoot: dutiesAtEpoch.dependentRoot, slots: new Set() };
-                this.submitted.set(epoch, submission);
-            }
-            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;
-                if (submission.slots.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 = [];
-                    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,
-                        });
-                    }
-                    entries.push(...dutyEntries);
-                    pending.push({ submission, slot: duty.slot });
-                }
-                catch (e) {
-                    this.logger.error("Error signing builder preferences", { slot: duty.slot, validatorIndex: duty.validatorIndex }, e);
-                }
-            }
-        }
-        // Prune tracking for past epochs
-        for (const epoch of this.submitted.keys()) {
-            if (epoch < currentEpoch) {
-                this.submitted.delete(epoch);
-            }
-        }
-        if (entries.length === 0) {
-            return;
-        }
-        try {
-            (await this.api.validator.submitBuilderPreferences({ builderPreferences: entries })).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.slots.add(submittedSlot);
-            }
-            this.logger.debug("Submitted builder preferences", { count: entries.length });
-        }
-        catch (e) {
-            this.logger.warn("Error submitting builder preferences", { count: entries.length }, e);
-        }
-    };
-}
-//# sourceMappingURL=builderPreferences.js.map

package/lib/services/builderPreferences.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"builderPreferences.js","sourceRoot":"","sources":["../../src/services/builderPreferences.ts"],"names":[],"mappings":"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"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"proposerPreferences.d.ts","sourceRoot":"","sources":["../../src/services/proposerPreferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,eAAe,CAAC;AACxC,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;AAgBnD;;;;;;;;;;GAUG;AACH,qBAAa,0BAA0B;IAKnC,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;IATrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsC;IAChE,OAAO,CAAC,uBAAuB,CAAqB;IAEpD,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,EAIzB;IAED,OAAO,CAAC,0BAA0B,CA8EhC;IAEF,OAAO,CAAC,iBAAiB,CAmBvB;CACH"}

package/lib/services/proposerPreferences.js

@@ -1,130 +0,0 @@
-import { SLOTS_PER_EPOCH, isForkPostGloas } from "@lodestar/params";
-import { computeEpochAtSlot } from "@lodestar/state-transition";
-import { fromHex, toPubkeyHex } from "@lodestar/utils";
-/**
- * Submit a proposer's `SignedProposerPreferences` 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);
-/**
- * Signs and submits `SignedProposerPreferences` for any local validator that will propose
- * within the next `SUBMIT_BEFORE_PROPOSAL_SLOTS`. Re-submits automatically when the proposer
- * dependent root for an epoch shifts (e.g. after a reorg) — 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 ProposerPreferencesService {
-    config;
-    logger;
-    api;
-    validatorStore;
-    blockDutiesService;
-    submitted = new Map();
-    activeScheduledGasLimit;
-    constructor(config, logger, api, clock, validatorStore, blockDutiesService, _metrics) {
-        this.config = config;
-        this.logger = logger;
-        this.api = api;
-        this.validatorStore = validatorStore;
-        this.blockDutiesService = blockDutiesService;
-        clock.runEverySlot(this.runProposerPreferencesTask);
-        clock.runEveryEpoch(this.runEveryEpochTask);
-    }
-    runProposerPreferencesTask = async (slot) => {
-        // 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 currentEpoch = computeEpochAtSlot(slot);
-        const batch = [];
-        // 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 = [];
-        for (const epoch of [currentEpoch, currentEpoch + 1]) {
-            const dutiesAtEpoch = this.blockDutiesService.getProposersAtEpoch(epoch);
-            if (!dutiesAtEpoch)
-                continue;
-            // Reset submission tracking if the dependent root for this epoch has shifted
-            // (e.g. due to a reorg). Any previously-submitted preferences are now stale.
-            let submission = this.submitted.get(epoch);
-            if (submission === undefined || submission.dependentRoot !== dutiesAtEpoch.dependentRoot) {
-                if (submission !== undefined) {
-                    this.logger.info("Proposer-shuffling dependent root shifted; resubmitting preferences", {
-                        epoch,
-                        priorDependentRoot: submission.dependentRoot,
-                        dependentRoot: dutiesAtEpoch.dependentRoot,
-                    });
-                }
-                submission = { dependentRoot: dutiesAtEpoch.dependentRoot, slots: new Set() };
-                this.submitted.set(epoch, submission);
-            }
-            const dependentRootBytes = fromHex(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;
-                if (submission.slots.has(duty.slot))
-                    continue;
-                try {
-                    const pubkeyHex = toPubkeyHex(duty.pubkey);
-                    const signed = await this.validatorStore.signProposerPreferences(duty, dependentRootBytes, this.validatorStore.getFeeRecipient(pubkeyHex), this.validatorStore.getGasLimit(pubkeyHex, duty.slot, this.logger), slot);
-                    batch.push(signed);
-                    pending.push({ submission, slot: duty.slot });
-                }
-                catch (e) {
-                    this.logger.error("Error signing proposer preferences", { slot: duty.slot, validatorIndex: duty.validatorIndex }, e);
-                }
-            }
-        }
-        if (batch.length === 0) {
-            return;
-        }
-        try {
-            await this.api.validator.submitProposerPreferences({ signedProposerPreferences: batch });
-            // 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.slots.add(submittedSlot);
-            }
-            this.logger.debug("Submitted signed proposer preferences", { count: batch.length });
-        }
-        catch (e) {
-            this.logger.error("Error submitting signed proposer preferences", { count: batch.length }, e);
-        }
-    };
-    runEveryEpochTask = async (epoch) => {
-        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);
-            }
-        }
-    };
-}
-//# sourceMappingURL=proposerPreferences.js.map

package/lib/services/proposerPreferences.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"proposerPreferences.js","sourceRoot":"","sources":["../../src/services/proposerPreferences.ts"],"names":[],"mappings":"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"}

package/src/services/builderPreferences.ts

@@ -1,142 +0,0 @@
-import {ApiClient, 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} from "@lodestar/types";
-import {toPubkeyHex} from "@lodestar/utils";
-import {Metrics} from "../metrics.js";
-import {LoggerVc} from "../util/index.js";
-import {BlockDutiesService} from "./blockDuties.js";
-import {ValidatorStore} from "./validatorStore.js";
-
-/**
- * Submit a proposer's builder preferences this many slots before the proposal slot.
- * Same pacing as `ProposerPreferencesService`, builders must have the preferences
- * before the bid request arrives at proposal time.
- */
-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; slots: Set<Slot>};
-
-/**
- * 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 class BuilderPreferencesService {
-  private readonly submitted = new Map<Epoch, SubmittedAtEpoch>();
-
-  constructor(
-    private readonly config: ChainForkConfig,
-    private readonly logger: LoggerVc,
-    private readonly api: ApiClient,
-    clock: IClock,
-    private readonly validatorStore: ValidatorStore,
-    private readonly blockDutiesService: BlockDutiesService,
-    _metrics: Metrics | null
-  ) {
-    clock.runEverySlot(this.runBuilderPreferencesTask);
-  }
-
-  private runBuilderPreferencesTask = 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 currentEpoch = computeEpochAtSlot(slot);
-    const entries: routes.validator.BuilderPreferencesEntry[] = [];
-    // 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: {submission: SubmittedAtEpoch; slot: Slot}[] = [];
-
-    for (const epoch of [currentEpoch, currentEpoch + 1]) {
-      const dutiesAtEpoch = this.blockDutiesService.getProposersAtEpoch(epoch);
-      if (!dutiesAtEpoch) continue;
-
-      // Reset submission tracking if the dependent root for this epoch has shifted
-      // (e.g. due to a reorg). The proposer for a slot may have changed.
-      let submission = this.submitted.get(epoch);
-      if (submission === undefined || submission.dependentRoot !== dutiesAtEpoch.dependentRoot) {
-        if (submission !== undefined) {
-          this.logger.info("Proposer-shuffling dependent root shifted; resubmitting builder preferences", {
-            epoch,
-            priorDependentRoot: submission.dependentRoot,
-            dependentRoot: dutiesAtEpoch.dependentRoot,
-          });
-        }
-        submission = {dependentRoot: dutiesAtEpoch.dependentRoot, slots: new Set()};
-        this.submitted.set(epoch, submission);
-      }
-
-      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;
-        if (submission.slots.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,
-            });
-          }
-          entries.push(...dutyEntries);
-          pending.push({submission, slot: duty.slot});
-        } catch (e) {
-          this.logger.error(
-            "Error signing builder preferences",
-            {slot: duty.slot, validatorIndex: duty.validatorIndex},
-            e as Error
-          );
-        }
-      }
-    }
-
-    // Prune tracking for past epochs
-    for (const epoch of this.submitted.keys()) {
-      if (epoch < currentEpoch) {
-        this.submitted.delete(epoch);
-      }
-    }
-
-    if (entries.length === 0) {
-      return;
-    }
-
-    try {
-      (await this.api.validator.submitBuilderPreferences({builderPreferences: entries})).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.slots.add(submittedSlot);
-      }
-      this.logger.debug("Submitted builder preferences", {count: entries.length});
-    } catch (e) {
-      this.logger.warn("Error submitting builder preferences", {count: entries.length}, e as Error);
-    }
-  };
-}