@lodestar/validator 1.45.0 → 1.46.0-dev.20101a8cc1

package/src/services/block.ts

@@ -1,6 +1,7 @@
 import {ApiClient, routes} from "@lodestar/api";
 import {ChainForkConfig} from "@lodestar/config";
-import {BUILDER_INDEX_SELF_BUILD, isForkPostGloas} from "@lodestar/params";
+import {BUILDER_INDEX_SELF_BUILD, ForkPostGloas, isForkPostGloas} from "@lodestar/params";
+import {IClock} from "@lodestar/state-transition";
 import {
   BLSPubkey,
   BLSSignature,
@@ -16,7 +17,7 @@ import {
 import {extendError, prettyBytes, prettyWeiToEth, toPubkeyHex, toRootHex} from "@lodestar/utils";
 import {Metrics} from "../metrics.js";
 import {PubkeyHex} from "../types.js";
-import {IClock, LoggerVc} from "../util/index.js";
+import {LoggerVc} from "../util/index.js";
 import {BlockDutiesService, GENESIS_SLOT} from "./blockDuties.js";
 import {ValidatorStore} from "./validatorStore.js";
 
@@ -39,6 +40,7 @@ type DebugLogCtx = {debugLogCtx: Record<string, string | boolean | undefined>};
 type BlockProposalOpts = {
   broadcastValidation: routes.beacon.BroadcastValidation;
   blindedLocal: boolean;
+  payloadLocal: boolean;
 };
 /**
  * Service that sets up and handles validator block proposal duties.
@@ -166,11 +168,19 @@ export class BlockProposingService {
   }
 
   /**
-   * Gloas stateful block production flow:
-   * 1. Produce beacon block with execution payload bid
-   * 2. Sign and publish the beacon block
-   * 3. Get the execution payload envelope
-   * 4. Sign and publish the envelope
+   * Gloas block production flow:
+   * 1. Produce the beacon block, which commits to an execution payload bid. When self-building with
+   *    the stateless flow (`payloadLocal=false`), the response also includes the full block contents
+   *    (execution payload envelope, KZG proofs and blobs).
+   * 2. Sign and publish the beacon block.
+   * 3. Reveal the execution payload envelope:
+   *    - Self-build: the proposer signs and publishes the envelope
+   *      - Stateless (`payloadLocal=false`): envelope and blobs are already available from step 1,
+   *        publish `SignedExecutionPayloadEnvelopeContents` which can be sent via any beacon node
+   *      - Stateful (`payloadLocal=true`): fetch the envelope from the beacon node that produced the
+   *        block, then publish the bare `SignedExecutionPayloadEnvelope` back to it; that node
+   *        attaches the cached blobs and KZG proofs
+   *    - Builder bid: the builder reveals the envelope, so the proposer does nothing further
    */
   private async createAndPublishBlockGloas(pubkey: BLSPubkey, slot: Slot): Promise<void> {
     const pubkeyHex = toPubkeyHex(pubkey);
@@ -180,8 +190,11 @@ export class BlockProposingService {
     const randaoReveal = await this.validatorStore.signRandao(pubkey, slot);
     const graffiti = this.validatorStore.getGraffiti(pubkeyHex);
     const feeRecipient = this.validatorStore.getFeeRecipient(pubkeyHex);
+    const {broadcastValidation, payloadLocal} = this.opts;
+    const {selection: builderSelection, boostFactor: builderBoostFactor} =
+      this.validatorStore.getBuilderSelectionParams(pubkeyHex, slot);
 
-    this.logger.debug("Producing block", {...debugLogCtx, feeRecipient});
+    this.logger.debug("Producing block", {...debugLogCtx, feeRecipient, payloadLocal, builderSelection});
     this.metrics?.proposerStepCallProduceBlock.observe(this.clock.secFromSlot(slot));
 
     // Step 1: Produce beacon block with execution payload bid
@@ -191,19 +204,29 @@ export class BlockProposingService {
         randaoReveal,
         graffiti,
         feeRecipient,
+        includePayload: !payloadLocal,
+        builderSelection,
+        builderBoostFactor,
       })
       .catch((e: Error) => {
         this.metrics?.blockProposingErrors.inc({error: "produce"});
         throw extendError(e, "Failed to produce block");
       });
-    const block = blockRes.value();
+    const blockOrContents = blockRes.value();
     const blockMeta = blockRes.meta();
+    const {executionPayloadIncluded} = blockMeta;
+    const block = executionPayloadIncluded
+      ? (blockOrContents as BlockContents<ForkPostGloas>).block
+      : (blockOrContents as BeaconBlock<ForkPostGloas>);
     const beaconBlockRoot = this.config.getForkTypes(slot).BeaconBlock.hashTreeRoot(block);
     const blockRootHex = toRootHex(beaconBlockRoot);
 
     this.logger.debug("Produced block", {
       ...debugLogCtx,
+      executionPayloadValue: prettyWeiToEth(blockMeta.executionPayloadValue),
       consensusBlockValue: prettyWeiToEth(blockMeta.consensusBlockValue),
+      totalBlockValue: prettyWeiToEth(blockMeta.executionPayloadValue + blockMeta.consensusBlockValue),
+      executionPayloadIncluded,
       blockRoot: blockRootHex,
     });
     this.metrics?.blocksProduced.inc();
@@ -211,8 +234,6 @@ export class BlockProposingService {
     // Step 2: Sign and publish the beacon block
     const signedBlock = await this.validatorStore.signBlock(pubkey, block, slot, this.logger);
 
-    const {broadcastValidation} = this.opts;
-
     // Publish the block first so it propagates as soon as possible. This reduces the chance other nodes
     // see the payload envelope before the block over gossip and have to queue it. There's also plenty of
     // time left in the slot to propagate the payload, so publishing it in parallel is unnecessary.
@@ -224,63 +245,105 @@ export class BlockProposingService {
         })
         .catch((e: Error) => {
           this.metrics?.blockProposingErrors.inc({error: "publish"});
-          throw extendError(e, "Failed to publish block");
+          throw extendError(e, `Failed to publish block slot=${slot} blockRoot=${blockRootHex}`);
         })
     ).assertOk();
 
-    this.logger.debug("Published beacon block", {...debugLogCtx, broadcastValidation});
+    this.logger.info("Published beacon block", {
+      ...logCtx,
+      graffiti,
+      executionPayloadValue: prettyWeiToEth(blockMeta.executionPayloadValue),
+      consensusBlockValue: prettyWeiToEth(blockMeta.consensusBlockValue),
+      totalBlockValue: prettyWeiToEth(blockMeta.executionPayloadValue + blockMeta.consensusBlockValue),
+      blockRoot: blockRootHex,
+      broadcastValidation,
+    });
+    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
-      // Step 3: Get the execution payload envelope
-      const envelopeRes = await this.api.validator.getExecutionPayloadEnvelope({
-        slot,
-        beaconBlockRoot,
-      });
-      const envelope = envelopeRes.value();
-
-      this.logger.debug("Retrieved execution payload envelope", debugLogCtx);
-
-      // Step 4: Sign and publish the envelope
-      const signedEnvelope = await this.validatorStore.signExecutionPayloadEnvelope(
-        pubkey,
-        envelope,
-        slot,
-        this.logger
-      );
-
-      (
-        await this.api.beacon
-          .publishExecutionPayloadEnvelope({
-            signedExecutionPayloadEnvelope: signedEnvelope,
+      const flow = executionPayloadIncluded ? "stateless" : "stateful";
+      if (executionPayloadIncluded) {
+        // Stateless flow: envelope and blobs are already available from block production
+        const {executionPayloadEnvelope, kzgProofs, blobs} = blockOrContents as BlockContents<ForkPostGloas>;
+
+        // Step 3: Sign and publish the envelope with blobs and KZG proofs
+        const signedEnvelope = await this.validatorStore.signExecutionPayloadEnvelope(
+          pubkey,
+          executionPayloadEnvelope,
+          slot,
+          this.logger
+        );
+
+        (
+          await this.api.beacon
+            .publishExecutionPayloadEnvelope({
+              signedEnvelopeOrContents: {signedExecutionPayloadEnvelope: signedEnvelope, kzgProofs, blobs},
+              broadcastValidation,
+            })
+            .catch((e: Error) => {
+              this.metrics?.payloadEnvelopeProposingErrors.inc({error: "publish"});
+              throw extendError(
+                e,
+                `Failed to publish execution payload envelope slot=${slot} blockRoot=${blockRootHex} flow=${flow}`
+              );
+            })
+        ).assertOk();
+      } else {
+        // Stateful flow: fetch the envelope from the same beacon node that produced the block
+        const envelopeRes = await this.api.validator
+          .getExecutionPayloadEnvelope({
+            slot,
+            beaconBlockRoot,
           })
           .catch((e: Error) => {
-            this.metrics?.blockProposingErrors.inc({error: "publish"});
-            throw extendError(e, "Failed to publish execution payload envelope");
-          })
-      ).assertOk();
+            this.metrics?.payloadEnvelopeProposingErrors.inc({error: "produce"});
+            throw extendError(e, `Failed to get execution payload envelope slot=${slot} blockRoot=${blockRootHex}`);
+          });
+        const envelope = envelopeRes.value();
+
+        this.logger.debug("Retrieved execution payload envelope", debugLogCtx);
+
+        // Step 3: Sign and publish the envelope, beacon node attaches blobs and KZG proofs from its cache
+        const signedEnvelope = await this.validatorStore.signExecutionPayloadEnvelope(
+          pubkey,
+          envelope,
+          slot,
+          this.logger
+        );
+
+        (
+          await this.api.beacon
+            .publishExecutionPayloadEnvelope({
+              signedEnvelopeOrContents: signedEnvelope,
+              broadcastValidation,
+            })
+            .catch((e: Error) => {
+              this.metrics?.payloadEnvelopeProposingErrors.inc({error: "publish"});
+              throw extendError(
+                e,
+                `Failed to publish execution payload envelope slot=${slot} blockRoot=${blockRootHex} flow=${flow}`
+              );
+            })
+        ).assertOk();
+      }
 
-      this.logger.info("Published block and execution payload envelope", {
+      this.logger.info("Published execution payload envelope", {
         ...logCtx,
-        graffiti,
-        consensusBlockValue: prettyWeiToEth(blockMeta.consensusBlockValue),
         blockRoot: blockRootHex,
+        flow,
       });
     } else {
-      // Builder is responsible for broadcasting the execution payload envelope
-      this.logger.info("Published block with builder bid, envelope expected from builder", {
+      // Committed to a builder bid, the builder is responsible for revealing the execution payload envelope
+      this.logger.info("Execution payload envelope to be revealed by builder", {
         ...logCtx,
-        graffiti,
         builderIndex: block.body.signedExecutionPayloadBid.message.builderIndex,
-        consensusBlockValue: prettyWeiToEth(blockMeta.consensusBlockValue),
         blockRoot: blockRootHex,
       });
     }
-
-    this.metrics?.proposerStepCallPublishBlock.observe(this.clock.secFromSlot(slot));
-    this.metrics?.blocksPublished.inc();
   }
 
   private publishBlockWrapper = async (
@@ -353,10 +416,8 @@ function parseProduceBlockResponse(
   const executionPayloadSource = response.executionPayloadSource;
 
   if (
-    (builderSelection === routes.validator.BuilderSelection.BuilderOnly &&
-      executionPayloadSource === ProducedBlockSource.engine) ||
-    (builderSelection === routes.validator.BuilderSelection.ExecutionOnly &&
-      executionPayloadSource === ProducedBlockSource.builder)
+    builderSelection === routes.validator.BuilderSelection.ExecutionOnly &&
+    executionPayloadSource === ProducedBlockSource.builder
   ) {
     throw Error(
       `Block not produced as per desired builderSelection=${builderSelection} executionPayloadSource=${executionPayloadSource}`

package/src/services/blockDuties.ts

@@ -1,12 +1,12 @@
 import {ApiClient, routes} from "@lodestar/api";
 import {ChainForkConfig} from "@lodestar/config";
 import {isForkPostGloas} from "@lodestar/params";
-import {computeEpochAtSlot, computeStartSlotAtEpoch} from "@lodestar/state-transition";
+import {IClock, computeEpochAtSlot, computeStartSlotAtEpoch} from "@lodestar/state-transition";
 import {BLSPubkey, Epoch, RootHex, Slot} from "@lodestar/types";
 import {sleep, toPubkeyHex} from "@lodestar/utils";
 import {Metrics} from "../metrics.js";
 import {PubkeyHex} from "../types.js";
-import {IClock, LoggerVc} from "../util/index.js";
+import {LoggerVc} from "../util/index.js";
 import {ChainHeaderTracker, HeadEventData} from "./chainHeaderTracker.js";
 import {ValidatorStore} from "./validatorStore.js";
 

package/src/services/doppelgangerService.ts

@@ -1,11 +1,10 @@
 import {ApiClient, routes} from "@lodestar/api";
-import {computeStartSlotAtEpoch} from "@lodestar/state-transition";
+import {IClock, computeStartSlotAtEpoch} from "@lodestar/state-transition";
 import {Epoch, ValidatorIndex} from "@lodestar/types";
 import {Logger, fromHex, sleep, truncBytes} from "@lodestar/utils";
 import {Metrics} from "../metrics.js";
 import {ISlashingProtection} from "../slashingProtection/index.js";
 import {ProcessShutdownCallback, PubkeyHex} from "../types.js";
-import {IClock} from "../util/index.js";
 import {IndicesService} from "./indices.js";
 
 // The number of epochs that must be checked before we assume that there are

package/src/services/prepareBeaconProposer.ts

@@ -1,9 +1,10 @@
 import {ApiClient, routes} from "@lodestar/api";
 import {BeaconConfig} from "@lodestar/config";
 import {GENESIS_EPOCH, SLOTS_PER_EPOCH} from "@lodestar/params";
+import {IClock} from "@lodestar/state-transition";
 import {Epoch, bellatrix} from "@lodestar/types";
 import {Metrics} from "../metrics.js";
-import {IClock, LoggerVc, batchItems} from "../util/index.js";
+import {LoggerVc, batchItems} from "../util/index.js";
 import {ValidatorStore} from "./validatorStore.js";
 
 const REGISTRATION_CHUNK_SIZE = 512;

package/src/services/proposerPreferences.ts

@@ -1,11 +1,11 @@
 import {ApiClient} from "@lodestar/api";
 import {ChainForkConfig} from "@lodestar/config";
 import {SLOTS_PER_EPOCH, isForkPostGloas} from "@lodestar/params";
-import {computeEpochAtSlot} from "@lodestar/state-transition";
+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 {IClock, LoggerVc} from "../util/index.js";
+import {LoggerVc} from "../util/index.js";
 import {BlockDutiesService} from "./blockDuties.js";
 import {ValidatorStore} from "./validatorStore.js";
 

package/src/services/ptc.ts

@@ -1,11 +1,12 @@
 import {ApiClient, routes} from "@lodestar/api";
 import {ChainForkConfig} from "@lodestar/config";
 import {isForkPostGloas} from "@lodestar/params";
+import {IClock} from "@lodestar/state-transition";
 import {Slot, gloas} from "@lodestar/types";
 import {prettyBytes, sleep, toRootHex} from "@lodestar/utils";
 import {Metrics} from "../metrics.js";
 import {PubkeyHex} from "../types.js";
-import {IClock, LoggerVc} from "../util/index.js";
+import {LoggerVc} from "../util/index.js";
 import {ChainHeaderTracker} from "./chainHeaderTracker.js";
 import {ExecutionPayloadAvailableEventData, ValidatorEvent, ValidatorEventEmitter} from "./emitter.js";
 import {PtcDutiesService} from "./ptcDuties.js";

package/src/services/ptcDuties.ts

@@ -1,12 +1,12 @@
 import {ApiClient, routes} from "@lodestar/api";
 import {ChainForkConfig} from "@lodestar/config";
 import {SLOTS_PER_EPOCH, isForkPostGloas} from "@lodestar/params";
-import {computeEpochAtSlot, isStartSlotOfEpoch} from "@lodestar/state-transition";
+import {IClock, computeEpochAtSlot, isStartSlotOfEpoch} from "@lodestar/state-transition";
 import {Epoch, RootHex, Slot, ValidatorIndex} from "@lodestar/types";
 import {toPubkeyHex} from "@lodestar/utils";
 import {Metrics} from "../metrics.js";
 import {PubkeyHex} from "../types.js";
-import {IClock, LoggerVc} from "../util/index.js";
+import {LoggerVc} from "../util/index.js";
 import {ChainHeaderTracker, HeadEventData} from "./chainHeaderTracker.js";
 import {SyncingStatusTracker} from "./syncingStatusTracker.js";
 import {ValidatorStore} from "./validatorStore.js";

package/src/services/syncCommittee.ts

@@ -1,11 +1,12 @@
 import {ApiClient} from "@lodestar/api";
 import {ChainForkConfig} from "@lodestar/config";
 import {ForkName, isForkPostAltair} from "@lodestar/params";
+import {IClock} from "@lodestar/state-transition";
 import {CommitteeIndex, Root, Slot, altair} from "@lodestar/types";
 import {sleep} from "@lodestar/utils";
 import {Metrics} from "../metrics.js";
 import {PubkeyHex} from "../types.js";
-import {IClock, LoggerVc} from "../util/index.js";
+import {LoggerVc} from "../util/index.js";
 import {ChainHeaderTracker} from "./chainHeaderTracker.js";
 import {ValidatorEventEmitter} from "./emitter.js";
 import {SyncCommitteeDutiesService, SyncDutyAndProofs} from "./syncCommitteeDuties.js";

package/src/services/syncCommitteeDuties.ts

@@ -2,6 +2,7 @@ import {ApiClient, routes} from "@lodestar/api";
 import {ChainForkConfig} from "@lodestar/config";
 import {EPOCHS_PER_SYNC_COMMITTEE_PERIOD, SYNC_COMMITTEE_SUBNET_SIZE} from "@lodestar/params";
 import {
+  IClock,
   computeEpochAtSlot,
   computeSyncPeriodAtEpoch,
   computeSyncPeriodAtSlot,
@@ -12,7 +13,7 @@ import {BLSSignature, Epoch, Slot, SyncPeriod, ValidatorIndex} from "@lodestar/t
 import {toPubkeyHex} from "@lodestar/utils";
 import {Metrics} from "../metrics.js";
 import {PubkeyHex} from "../types.js";
-import {IClock, LoggerVc} from "../util/index.js";
+import {LoggerVc} from "../util/index.js";
 import {SyncingStatusTracker} from "./syncingStatusTracker.js";
 import {syncCommitteeIndicesToSubnets} from "./utils.js";
 import {ValidatorStore} from "./validatorStore.js";

package/src/services/syncingStatusTracker.ts

@@ -1,8 +1,8 @@
 import {ApiClient, routes} from "@lodestar/api";
+import {IClock} from "@lodestar/state-transition";
 import {Slot} from "@lodestar/types";
 import {Logger} from "@lodestar/utils";
 import {BeaconHealth, Metrics} from "../metrics.js";
-import {IClock} from "../util/clock.js";
 
 export type SyncingStatus = routes.node.SyncingStatus;
 

package/src/services/validatorStore.ts

@@ -81,7 +81,8 @@ type DefaultProposerConfig = {
   feeRecipient: ExecutionAddress;
   builder: {
     gasLimit: number;
-    selection: routes.validator.BuilderSelection;
+    // Left undefined when not configured so the fork-appropriate default can be resolved per slot
+    selection?: routes.validator.BuilderSelection;
     boostFactor: bigint;
   };
 };
@@ -182,7 +183,7 @@ export class ValidatorStore {
       feeRecipient: defaultConfig.feeRecipient ?? defaultOptions.suggestedFeeRecipient,
       builder: {
         gasLimit: defaultConfig.builder?.gasLimit ?? defaultOptions.defaultGasLimit,
-        selection: defaultConfig.builder?.selection ?? defaultOptions.builderSelection,
+        selection: defaultConfig.builder?.selection,
         boostFactor: builderBoostFactor,
       },
     };
@@ -278,9 +279,21 @@ export class ValidatorStore {
     delete validatorData.graffiti;
   }
 
-  getBuilderSelectionParams(pubkeyHex: PubkeyHex): {selection: routes.validator.BuilderSelection; boostFactor: bigint} {
+  getBuilderSelectionParams(
+    pubkeyHex: PubkeyHex,
+    slot?: Slot
+  ): {selection: routes.validator.BuilderSelection; boostFactor: bigint} {
+    // Builder bids post-gloas are in-protocol over p2p, so the default strategy uses them
+    // (as if `--builder` was set), unless the validator explicitly opted out. Pre-gloas
+    // there is no in-protocol builder, so the default remains local-only (executiononly).
+    const defaultSelection =
+      slot !== undefined && this.config.getForkSeq(slot) >= ForkSeq.gloas
+        ? defaultOptions.builderAliasSelection
+        : defaultOptions.builderSelection;
     const selection =
-      this.validators.get(pubkeyHex)?.builder?.selection ?? this.defaultProposerConfig.builder.selection;
+      this.validators.get(pubkeyHex)?.builder?.selection ??
+      this.defaultProposerConfig.builder.selection ??
+      defaultSelection;
 
     let boostFactor: bigint;
     switch (selection) {
@@ -607,9 +620,11 @@ export class ValidatorStore {
     const signingSlot = aggregate.data.slot;
     const domain = this.config.getDomain(signingSlot, DOMAIN_AGGREGATE_AND_PROOF);
     const isPostElectra = this.config.getForkSeq(signingSlot) >= ForkSeq.electra;
-    const signingRoot = isPostElectra
-      ? computeSigningRoot(ssz.electra.AggregateAndProof, aggregateAndProof, domain)
-      : computeSigningRoot(ssz.phase0.AggregateAndProof, aggregateAndProof, domain);
+    const signingRoot = computeSigningRoot(
+      this.config.getForkTypes(signingSlot).AggregateAndProof,
+      aggregateAndProof,
+      domain
+    );
 
     const signableMessage: SignableMessage = {
       type: isPostElectra ? SignableMessageType.AGGREGATE_AND_PROOF_V2 : SignableMessageType.AGGREGATE_AND_PROOF,

package/src/util/index.ts

@@ -1,6 +1,4 @@
 export * from "./batch.js";
-export * from "./clock.js";
 export * from "./difference.js";
 export * from "./logger.js";
-export * from "./params.js";
 export * from "./url.js";

package/src/util/logger.ts

@@ -1,6 +1,6 @@
 import {ApiError} from "@lodestar/api";
+import {IClock} from "@lodestar/state-transition";
 import {LogData, Logger, isErrorAborted} from "@lodestar/utils";
-import {IClock} from "./clock.js";
 
 export type LoggerVc = Logger & {
   isSyncing(e: Error): void;

package/src/validator.ts

@@ -1,6 +1,12 @@
 import {ApiClient, ApiRequestInit, defaultInit, getClient, routes} from "@lodestar/api";
-import {BeaconConfig, ChainForkConfig, createBeaconConfig} from "@lodestar/config";
-import {computeEpochAtSlot, getCurrentSlot} from "@lodestar/state-transition";
+import {
+  BeaconConfig,
+  ChainForkConfig,
+  NotEqualParamsError,
+  assertEqualParams,
+  createBeaconConfig,
+} from "@lodestar/config";
+import {Clock, ClockOptions, IClock, computeEpochAtSlot, getCurrentSlot} from "@lodestar/state-transition";
 import {BLSPubkey, phase0, ssz} from "@lodestar/types";
 import {Genesis} from "@lodestar/types/phase0";
 import {Logger, toPrintableUrl, toRootHex} from "@lodestar/utils";
@@ -23,8 +29,7 @@ import {SyncingStatusTracker} from "./services/syncingStatusTracker.js";
 import {Signer, ValidatorProposerConfig, ValidatorStore, defaultOptions} from "./services/validatorStore.js";
 import {ISlashingProtection, Interchange, InterchangeFormatVersion} from "./slashingProtection/index.js";
 import {LodestarValidatorDatabaseController, ProcessShutdownCallback, PubkeyHex} from "./types.js";
-import {Clock, ClockOptions, IClock} from "./util/clock.js";
-import {NotEqualParamsError, assertEqualParams, getLoggerVc} from "./util/index.js";
+import {getLoggerVc} from "./util/index.js";
 
 export type ValidatorModules = {
   opts: ValidatorOptions;
@@ -66,6 +71,7 @@ export type ValidatorOptions = {
   distributed?: boolean;
   broadcastValidation?: routes.beacon.BroadcastValidation;
   blindedLocal?: boolean;
+  payloadLocal?: boolean;
   externalSigner?: ExternalSignerOptions;
   clock?: ClockOptions;
 };
@@ -256,6 +262,9 @@ export class Validator {
       {
         broadcastValidation: opts.broadcastValidation ?? defaultOptions.broadcastValidation,
         blindedLocal: opts.blindedLocal ?? defaultOptions.blindedLocal,
+        // Default to keeping the payload local to the beacon node if only a single node is
+        // configured, with multiple nodes the stateless flow allows publishing via any of them
+        payloadLocal: opts.payloadLocal ?? api.httpClient.urlsInits.length <= 1,
       }
     );
 
@@ -352,7 +361,7 @@ export class Validator {
 
     const res = await api.config.getSpec();
     assertEqualParams(config, res.value());
-    logger.info("Verified connected beacon node and validator have same the config");
+    logger.info("Verified connected beacon node and validator have the same config");
 
     await assertEqualGenesis(opts, genesis);
     logger.info("Verified connected beacon node and validator have the same genesisValidatorRoot");

package/lib/util/clock.d.ts

@@ -1,55 +0,0 @@
-import { ChainForkConfig } from "@lodestar/config";
-import { Epoch, Slot, TimeSeconds } from "@lodestar/types";
-import { Logger } from "@lodestar/utils";
-type RunEveryFn = (slot: Slot, signal: AbortSignal) => Promise<void>;
-export type ClockOptions = {
-    skipSlots?: boolean;
-};
-export interface IClock {
-    readonly genesisTime: number;
-    readonly secondsPerSlot: number;
-    readonly currentEpoch: number;
-    start(signal: AbortSignal): void;
-    runEverySlot(fn: (slot: Slot, signal: AbortSignal) => Promise<void>): void;
-    runEveryEpoch(fn: (epoch: Epoch, signal: AbortSignal) => Promise<void>): void;
-    msToSlot(slot: Slot): number;
-    msFromSlot(slot: Slot): number;
-    secFromSlot(slot: Slot): number;
-    getCurrentSlot(): Slot;
-    getCurrentEpoch(): Epoch;
-}
-export declare enum TimeItem {
-    Slot = 0,
-    Epoch = 1
-}
-export declare class Clock implements IClock {
-    private readonly opts;
-    readonly genesisTime: number;
-    readonly secondsPerSlot: number;
-    private readonly config;
-    private readonly logger;
-    private readonly fns;
-    constructor(config: ChainForkConfig, logger: Logger, opts: {
-        genesisTime: number;
-    } & ClockOptions);
-    get currentEpoch(): Epoch;
-    start(signal: AbortSignal): void;
-    getCurrentSlot(): Slot;
-    getCurrentEpoch(): Epoch;
-    runEverySlot(fn: RunEveryFn): void;
-    runEveryEpoch(fn: RunEveryFn): void;
-    /** Milliseconds from now to a specific slot */
-    msToSlot(slot: Slot): number;
-    /** Milliseconds elapsed from a specific slot to now */
-    msFromSlot(slot: Slot): number;
-    /** Seconds elapsed from a specific slot to now */
-    secFromSlot(slot: Slot): number;
-    private runAtMostEvery;
-    private timeUntilNext;
-}
-/**
- * Same to the spec but we use Math.round instead of Math.floor.
- */
-export declare function getCurrentSlotAround(config: ChainForkConfig, genesisTime: TimeSeconds): Slot;
-export {};
-//# sourceMappingURL=clock.d.ts.map

package/lib/util/clock.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"clock.d.ts","sourceRoot":"","sources":["../../src/util/clock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,WAAW,EAAC,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAe,MAAM,EAAwB,MAAM,iBAAiB,CAAC;AAE5E,KAAK,UAAU,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAErE,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAEhC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAE9B,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,YAAY,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC3E,aAAa,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC9E,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC;IAC7B,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC;IAC/B,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC;IAChC,cAAc,IAAI,IAAI,CAAC;IACvB,eAAe,IAAI,KAAK,CAAC;CAC1B;AAED,oBAAY,QAAQ;IAClB,IAAI,IAAA;IACJ,KAAK,IAAA;CACN;AAED,qBAAa,KAAM,YAAW,MAAM;IAUhC,OAAO,CAAC,QAAQ,CAAC,IAAI;IATvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA8C;IAElE,YACE,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,EACG,IAAI,EAAE;QAAC,WAAW,EAAE,MAAM,CAAA;KAAC,GAAG,YAAY,EAM5D;IAED,IAAI,YAAY,IAAI,KAAK,CAExB;IAED,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAQ/B;IAED,cAAc,IAAI,IAAI,CAErB;IAED,eAAe,IAAI,KAAK,CAEvB;IAED,YAAY,CAAC,EAAE,EAAE,UAAU,GAAG,IAAI,CAEjC;IAED,aAAa,CAAC,EAAE,EAAE,UAAU,GAAG,IAAI,CAElC;IAED,+CAA+C;IAC/C,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE3B;IAED,uDAAuD;IACvD,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE7B;IAED,kDAAkD;IAClD,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE9B;YAQa,cAAc;IA2C5B,OAAO,CAAC,aAAa;CAgBtB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAI5F"}