@lodestar/validator 1.38.0 → 1.39.0-dev.39dac0f03d

package/src/services/syncCommitteeDuties.ts

@@ -85,7 +85,7 @@ export class SyncCommitteeDutiesService {
     private readonly config: ChainForkConfig,
     private readonly logger: LoggerVc,
     private readonly api: ApiClient,
-    clock: IClock,
+    private readonly clock: IClock,
     private readonly validatorStore: ValidatorStore,
     syncingStatusTracker: SyncingStatusTracker,
     metrics: Metrics | null,
@@ -134,6 +134,18 @@ export class SyncCommitteeDutiesService {
           selectionProofs: await this.getSelectionProofs(slot, dutyAtPeriod.duty),
         });
       }
+
+      if (this.opts?.distributedAggregationSelection) {
+        // Validator in distributed cluster only has a key share, not the full private key.
+        // The partial selection proofs must be exchanged for combined selection proofs by
+        // calling submitSyncCommitteeSelections on the distributed validator middleware client.
+        // This will run in parallel to other sync committee tasks but must be finished before starting
+        // sync committee contributions as it is required to correctly determine if validator is aggregator
+        // and to produce a ContributionAndProof that can be threshold aggregated by the middleware client.
+        this.runDistributedAggregationSelectionTasks(duties, slot).catch((e) =>
+          this.logger.error("Error on sync committee aggregation selection", {slot}, e)
+        );
+      }
     }
 
     return duties;
@@ -307,8 +319,8 @@ export class SyncCommitteeDutiesService {
       if (this.opts?.distributedAggregationSelection) {
         // Validator in distributed cluster only has a key share, not the full private key.
         // Passing a partial selection proof to `is_sync_committee_aggregator` would produce incorrect result.
-        // SyncCommitteeService will exchange partial for combined selection proofs retrieved from
-        // distributed validator middleware client and determine aggregators at beginning of every slot.
+        // For all duties in the slot, aggregators are determined by exchanging partial for combined selection
+        // proofs retrieved from distributed validator middleware client at beginning of every slot.
         dutiesAndProofs.push({
           selectionProof: null,
           partialSelectionProof: selectionProof,
@@ -334,4 +346,74 @@ export class SyncCommitteeDutiesService {
       }
     }
   }
+
+  /**
+   * Performs additional sync committee contribution tasks required if validator is part of distributed cluster
+   *
+   * 1. Exchange partial for combined selection proofs
+   * 2. Determine validators that should produce sync committee contribution
+   * 3. Mutate duty objects to set selection proofs for aggregators
+   */
+  private async runDistributedAggregationSelectionTasks(duties: SyncDutyAndProofs[], slot: number): Promise<void> {
+    if (duties.length === 0) {
+      return;
+    }
+
+    const partialSelections: routes.validator.SyncCommitteeSelection[] = [];
+
+    for (const {duty, selectionProofs} of duties) {
+      const validatorSelections: routes.validator.SyncCommitteeSelection[] = selectionProofs.map(
+        ({subcommitteeIndex, partialSelectionProof}) => ({
+          validatorIndex: duty.validatorIndex,
+          slot,
+          subcommitteeIndex,
+          selectionProof: partialSelectionProof as BLSSignature,
+        })
+      );
+      partialSelections.push(...validatorSelections);
+    }
+
+    this.logger.debug("Submitting partial sync committee selection proofs", {slot, count: partialSelections.length});
+
+    const res = await this.api.validator.submitSyncCommitteeSelections(
+      {selections: partialSelections},
+      {
+        // Exit sync committee contributions flow if there is no response until CONTRIBUTION_DUE_BPS of the slot.
+        // Note that the sync committee contributions flow is not explicitly exited but rather will be skipped
+        // due to the fact that calculation of `is_sync_committee_aggregator` in SyncCommitteeDutiesService is not done
+        // and selectionProof is set to null, meaning no validator will be considered an aggregator.
+        timeoutMs: this.config.getSyncContributionDueMs(this.config.getForkName(slot)) - this.clock.msFromSlot(slot),
+      }
+    );
+
+    const combinedSelections = res.value();
+    this.logger.debug("Received combined sync committee selection proofs", {slot, count: combinedSelections.length});
+
+    for (const dutyAndProofs of duties) {
+      const {validatorIndex, subnets} = dutyAndProofs.duty;
+
+      for (const subnet of subnets) {
+        const logCtxValidator = {slot, index: subnet, validatorIndex};
+
+        const combinedSelection = combinedSelections.find(
+          (s) => s.validatorIndex === validatorIndex && s.slot === slot && s.subcommitteeIndex === subnet
+        );
+
+        if (!combinedSelection) {
+          this.logger.warn("Did not receive combined sync committee selection proof", logCtxValidator);
+          continue;
+        }
+
+        const isAggregator = isSyncCommitteeAggregator(combinedSelection.selectionProof);
+
+        if (isAggregator) {
+          const selectionProofObject = dutyAndProofs.selectionProofs.find((p) => p.subcommitteeIndex === subnet);
+          if (selectionProofObject) {
+            // Update selection proof by mutating proof objects in duty object
+            selectionProofObject.selectionProof = combinedSelection.selectionProof;
+          }
+        }
+      }
+    }
+  }
 }

package/src/services/validatorStore.ts

@@ -53,7 +53,7 @@ import {DoppelgangerService} from "./doppelgangerService.js";
 import {IndicesService} from "./indices.js";
 
 type BLSPubkeyMaybeHex = BLSPubkey | PubkeyHex;
-type Eth1Address = string;
+type ExecutionAddress = string;
 
 export enum SignerType {
   Local,
@@ -74,7 +74,7 @@ export type SignerRemote = {
 type DefaultProposerConfig = {
   graffiti?: string;
   strictFeeRecipientCheck: boolean;
-  feeRecipient: Eth1Address;
+  feeRecipient: ExecutionAddress;
   builder: {
     gasLimit: number;
     selection: routes.validator.BuilderSelection;
@@ -85,7 +85,7 @@ type DefaultProposerConfig = {
 export type ProposerConfig = {
   graffiti?: string;
   strictFeeRecipientCheck?: boolean;
-  feeRecipient?: Eth1Address;
+  feeRecipient?: ExecutionAddress;
   builder?: {
     gasLimit?: number;
     selection?: routes.validator.BuilderSelection;
@@ -219,7 +219,7 @@ export class ValidatorStore {
       : this.indicesService.pollValidatorIndices(Array.from(this.validators.keys()));
   }
 
-  getFeeRecipient(pubkeyHex: PubkeyHex): Eth1Address {
+  getFeeRecipient(pubkeyHex: PubkeyHex): ExecutionAddress {
     const validatorData = this.validators.get(pubkeyHex);
     if (validatorData === undefined) {
       throw Error(`Validator pubkey ${pubkeyHex} not known`);
@@ -227,12 +227,12 @@ export class ValidatorStore {
     return validatorData.feeRecipient ?? this.defaultProposerConfig.feeRecipient;
   }
 
-  getFeeRecipientByIndex(index: ValidatorIndex): Eth1Address {
+  getFeeRecipientByIndex(index: ValidatorIndex): ExecutionAddress {
     const pubkey = this.indicesService.index2pubkey.get(index);
     return pubkey ? this.getFeeRecipient(pubkey) : this.defaultProposerConfig.feeRecipient;
   }
 
-  setFeeRecipient(pubkeyHex: PubkeyHex, feeRecipient: Eth1Address): void {
+  setFeeRecipient(pubkeyHex: PubkeyHex, feeRecipient: ExecutionAddress): void {
     const validatorData = this.validators.get(pubkeyHex);
     if (validatorData === undefined) {
       throw Error(`Validator pubkey ${pubkeyHex} not known`);
@@ -696,7 +696,7 @@ export class ValidatorStore {
 
   async signValidatorRegistration(
     pubkeyMaybeHex: BLSPubkeyMaybeHex,
-    regAttributes: {feeRecipient: Eth1Address; gasLimit: number},
+    regAttributes: {feeRecipient: ExecutionAddress; gasLimit: number},
     _slot: Slot
   ): Promise<bellatrix.SignedValidatorRegistrationV1> {
     const pubkey = typeof pubkeyMaybeHex === "string" ? fromHex(pubkeyMaybeHex) : pubkeyMaybeHex;
@@ -727,7 +727,7 @@ export class ValidatorStore {
 
   async getValidatorRegistration(
     pubkeyMaybeHex: BLSPubkeyMaybeHex,
-    regAttributes: {feeRecipient: Eth1Address; gasLimit: number},
+    regAttributes: {feeRecipient: ExecutionAddress; gasLimit: number},
     slot: Slot
   ): Promise<bellatrix.SignedValidatorRegistrationV1> {
     const pubkeyHex = typeof pubkeyMaybeHex === "string" ? pubkeyMaybeHex : toPubkeyHex(pubkeyMaybeHex);

package/src/util/params.ts

@@ -110,8 +110,8 @@ function getSpecCriticalParams(localConfig: ChainConfig): Record<keyof ConfigWit
 
     PRESET_BASE: false, // Not relevant, each preset value is checked below
     CONFIG_NAME: false, // Arbitrary string, not relevant
-    // validator client behaviour does not change with this parameters, so it's not concerned about them.
-    // However, with the override ttd flag, the validator and beacon could be out of sync and prevent it from running.
+
+    // Deprecated - All networks have completed the merge transition
     TERMINAL_TOTAL_DIFFICULTY: false,
     TERMINAL_BLOCK_HASH: false,
     TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: false,