Fix VC sends incorrect eth-consensus-version when publish attestations and aggregated attestations. (#7689)

Author: cheatfate

beacon_chain/spec/eth2_apis/rest_beacon_calls.nim

@@ -409,13 +409,13 @@ proc submitPoolAttestationsV2Plain*(
 
 proc submitPoolAttestationsV2*[T: ForkyAttestation](
     client: RestClientRef,
+    fork: ConsensusFork,
     body: seq[T]
 ): Future[RestPlainResponse] {.
    async: (raises: [CancelledError, RestEncodingError, RestDnsResolveError,
                     RestCommunicationError], raw: true).} =
-  let consensus = T.kind.toString()
   client.submitPoolAttestationsV2Plain(
-    body, extraHeaders = @[("eth-consensus-version", consensus)])
+    body, extraHeaders = @[("eth-consensus-version", fork.toString())])
 
 proc getPoolAttesterSlashingsV2Plain*(): RestPlainResponse {.
      rest, endpoint: "/eth/v2/beacon/pool/attester_slashings",

beacon_chain/spec/eth2_apis/rest_validator_calls.nim

@@ -80,15 +80,14 @@ proc publishAggregateAndProofsV2Plain*(
 
 proc publishAggregateAndProofsV2*[T: ForkySignedAggregateAndProof](
     client: RestClientRef,
+    fork: ConsensusFork,
     body: seq[T]
 ): Future[RestPlainResponse] {.
    async: (raises: [CancelledError, RestEncodingError, RestDnsResolveError,
                     RestCommunicationError], raw: true).} =
   ## https://ethereum.github.io/beacon-APIs/?urls.primaryName=dev#/Validator/publishAggregateAndProofsV2
-  let
-    consensus = T.kind.toString()
   client.publishAggregateAndProofsV2Plain(
-    body, extraHeaders = @[("eth-consensus-version", consensus)])
+    body, extraHeaders = @[("eth-consensus-version", fork.toString())])
 
 proc prepareBeaconCommitteeSubnet*(
        body: seq[RestCommitteeSubscription]

beacon_chain/validator_client/api.nim

@@ -1615,6 +1615,7 @@ proc produceAttestationData*(
 proc submitPoolAttestationsV2*(
     vc: ValidatorClientRef,
     data: seq[ForkyAttestation],
+    fork: ConsensusFork,
     strategy: ApiStrategyKind
 ): Future[bool] {.async: (raises: [CancelledError, ValidatorApiError]).} =
   const
@@ -1629,7 +1630,7 @@ proc submitPoolAttestationsV2*(
                                       vc.SlotDuration,
                                       ViableNodeStatus,
                                       {BeaconNodeRole.AttestationPublish},
-                                      submitPoolAttestationsV2(it, data)):
+                                      submitPoolAttestationsV2(it, fork, data)):
       if apiResponse.isErr():
         handleCommunicationError()
         ApiResponse[bool].err(apiResponse.error)
@@ -1657,7 +1658,7 @@ proc submitPoolAttestationsV2*(
                               vc.SlotDuration,
                               ViableNodeStatus,
                               {BeaconNodeRole.AttestationPublish},
-                              submitPoolAttestationsV2(it, data)):
+                              submitPoolAttestationsV2(it, fork, data)):
       if apiResponse.isErr():
         handleCommunicationError()
         false
@@ -2169,6 +2170,7 @@ proc produceSyncCommitteeContribution*(
 proc publishAggregateAndProofsV2*(
     vc: ValidatorClientRef,
     data: seq[ForkySignedAggregateAndProof],
+    fork: ConsensusFork,
     strategy: ApiStrategyKind
 ): Future[bool] {.async: (raises: [CancelledError, ValidatorApiError]).} =
   const
@@ -2178,12 +2180,10 @@ proc publishAggregateAndProofsV2*(
 
   case strategy
   of ApiStrategyKind.First, ApiStrategyKind.Best:
-    let res = vc.firstSuccessParallel(RestPlainResponse,
-                                      bool,
-                                      vc.SlotDuration,
-                                      ViableNodeStatus,
-                                      {BeaconNodeRole.AggregatedPublish},
-                                      publishAggregateAndProofsV2(it, data)):
+    let res = vc.firstSuccessParallel(
+      RestPlainResponse, bool, vc.SlotDuration, ViableNodeStatus,
+      {BeaconNodeRole.AggregatedPublish},
+      publishAggregateAndProofsV2(it, fork, data)):
       if apiResponse.isErr():
         handleCommunicationError()
         ApiResponse[bool].err(apiResponse.error)
@@ -2210,11 +2210,10 @@ proc publishAggregateAndProofsV2*(
     res.get()
 
   of ApiStrategyKind.Priority:
-    vc.firstSuccessSequential(RestPlainResponse,
-                              vc.SlotDuration,
-                              ViableNodeStatus,
-                              {BeaconNodeRole.AggregatedPublish},
-                              publishAggregateAndProofsV2(it, data)):
+    vc.firstSuccessSequential(
+      RestPlainResponse, vc.SlotDuration, ViableNodeStatus,
+      {BeaconNodeRole.AggregatedPublish},
+      publishAggregateAndProofsV2(it, fork, data)):
       if apiResponse.isErr():
         handleCommunicationError()
         false

beacon_chain/validator_client/attestation_service.nim

@@ -41,6 +41,7 @@ proc serveAttestation(
   let
     vc = service.client
     fork = vc.forkAtEpoch(registered.data.slot.epoch)
+    consensusFork = vc.getConsensusFork(fork)
     validator = registered.validator
     attestationSlot = registered.data.slot
     afterElectra = vc.isPastElectraFork(attestationSlot.epoch)
@@ -70,9 +71,11 @@ proc serveAttestation(
 
   template submitAttestation(atst: untyped): untyped =
     logScope:
+      fork = consensusFork
       attestation = shortLog(atst)
     try:
-      await vc.submitPoolAttestationsV2(@[atst], ApiStrategyKind.First)
+      await vc.submitPoolAttestationsV2(
+        @[atst], consensusFork, ApiStrategyKind.First)
     except ValidatorApiError as exc:
       warn "Unable to publish attestation", reason = exc.getFailureReason()
       return false
@@ -108,12 +111,13 @@ proc serveAggregateAndProofV2*(
     genesisRoot = vc.beaconGenesis.genesis_validators_root
     slot = proof.aggregate.data.slot
     fork = vc.forkAtEpoch(slot.epoch)
+    consensusFork = vc.getConsensusFork(fork)
 
   logScope:
     validator = validatorLog(validator)
     attestation = shortLog(proof.aggregate)
 
-  debug "Signing aggregate", fork = fork
+  debug "Signing aggregate", fork = consensusFork
 
   let signature =
     try:
@@ -142,14 +146,14 @@ proc serveAggregateAndProofV2*(
   logScope:
     delay = vc.getDelay(slot.aggregate_deadline(vc.timeParams))
 
-  debug "Sending aggregated attestation", fork = fork
+  debug "Sending aggregated attestation", fork = consensusFork
 
   validator.doppelgangerActivity(proof.aggregate.data.slot.epoch)
 
   let res =
     try:
-      await vc.publishAggregateAndProofsV2(@[signedProof],
-                                           ApiStrategyKind.First)
+      await vc.publishAggregateAndProofsV2(
+        @[signedProof], consensusFork, ApiStrategyKind.First)
     except ValidatorApiError as exc:
       warn "Unable to publish aggregated attestation",
             reason = exc.getFailureReason()

beacon_chain/validator_client/common.nim

@@ -955,6 +955,13 @@ proc forkAtEpoch*(vc: ValidatorClientRef, epoch: Epoch): Fork =
       break
   res
 
+proc getConsensusFork*(vc: ValidatorClientRef, fork: Fork): ConsensusFork =
+  doAssert(vc.forkConfig.isSome())
+  for key, value in vc.forkConfig.get().pairs():
+    if value.version == fork.current_version:
+      return key
+  raiseAssert "ForkConfig missing fork [" & $fork.current_version & "]"
+
 proc isPastElectraFork*(vc: ValidatorClientRef, epoch: Epoch): bool =
   doAssert(len(vc.forks) > 0)
   doAssert(vc.forkConfig.isSome())