Remove unused attestation v1 code (#7693)

There are unused functions in VC for legacy attestation data API.

Author: etan-status

beacon_chain/spec/eth2_apis/rest_validator_calls.nim

@@ -54,14 +54,6 @@ proc produceAttestationDataPlain*(
      meth: MethodGet.}
   ## https://ethereum.github.io/beacon-APIs/#/Validator/produceAttestationData
 
-proc getAggregatedAttestationPlain*(
-       attestation_data_root: Eth2Digest,
-       slot: Slot
-     ): RestPlainResponse {.
-     rest, endpoint: "/eth/v1/validator/aggregate_attestation"
-     meth: MethodGet.}
-  ## https://ethereum.github.io/beacon-APIs/#/Validator/getAggregatedAttestation
-
 proc getAggregatedAttestationPlainV2*(
     attestation_data_root: Eth2Digest,
     slot: Slot,

beacon_chain/validator_client/api.nim

@@ -1756,146 +1756,6 @@ proc submitPoolSyncCommitteeSignature*(
     raise (ref ValidatorApiError)(
       msg: "Failed to submit sync committee message", data: failures)
 
-proc getAggregatedAttestation*(
-    vc: ValidatorClientRef,
-    slot: Slot,
-    root: Eth2Digest,
-    strategy: ApiStrategyKind
-): Future[phase0.Attestation] {.
-   async: (raises: [CancelledError, ValidatorApiError]).} =
-  const
-    RequestName = "getAggregatedAttestation"
-
-  var failures: seq[ApiNodeFailure]
-
-  case strategy
-  of ApiStrategyKind.First:
-    let res = vc.firstSuccessParallel(
-      RestPlainResponse,
-      GetAggregatedAttestationResponse,
-      vc.OneThirdDuration,
-      ViableNodeStatus,
-      {BeaconNodeRole.AggregatedData},
-      getAggregatedAttestationPlain(it, root, slot)):
-      if apiResponse.isErr():
-        handleCommunicationError()
-        ApiResponse[GetAggregatedAttestationResponse].err(apiResponse.error)
-      else:
-        let response = apiResponse.get()
-        case response.status:
-        of 200:
-          let res = decodeBytes(GetAggregatedAttestationResponse, response.data,
-                                response.contentType)
-          if res.isErr():
-            handleUnexpectedData()
-            ApiResponse[GetAggregatedAttestationResponse].err($res.error)
-          else:
-            ApiResponse[GetAggregatedAttestationResponse].ok(res.get())
-        of 400:
-          handle400()
-          ApiResponse[GetAggregatedAttestationResponse].err(
-            ResponseInvalidError)
-        of 404:
-          handle404()
-          ApiResponse[GetAggregatedAttestationResponse].err(
-            ResponseNotFoundError)
-        of 500:
-          handle500()
-          ApiResponse[GetAggregatedAttestationResponse].err(
-            ResponseInternalError)
-        else:
-          handleUnexpectedCode()
-          ApiResponse[GetAggregatedAttestationResponse].err(
-            ResponseUnexpectedError)
-
-    if res.isErr():
-      raise (ref ValidatorApiError)(msg: res.error, data: failures)
-    res.get().data
-
-  of ApiStrategyKind.Best:
-    let res = vc.bestSuccess(
-      RestPlainResponse,
-      GetAggregatedAttestationResponse,
-      float64,
-      vc.OneThirdDurationSoft,
-      vc.OneThirdDuration,
-      ViableNodeStatus,
-      {BeaconNodeRole.AggregatedData},
-      getAggregatedAttestationPlain(it, root, slot),
-      getAggregatedAttestationDataScore(itresponse)):
-      if apiResponse.isErr():
-        handleCommunicationError()
-        ApiResponse[GetAggregatedAttestationResponse].err(apiResponse.error)
-      else:
-        let response = apiResponse.get()
-        case response.status:
-        of 200:
-          let res = decodeBytes(GetAggregatedAttestationResponse, response.data,
-                                response.contentType)
-          if res.isErr():
-            handleUnexpectedData()
-            ApiResponse[GetAggregatedAttestationResponse].err($res.error)
-          else:
-            ApiResponse[GetAggregatedAttestationResponse].ok(res.get())
-        of 400:
-          handle400()
-          ApiResponse[GetAggregatedAttestationResponse].err(
-            ResponseInvalidError)
-        of 404:
-          # A 404 error must be returned if no attestation is available for the
-          # requested `attestation_data_root`. To address the issue #6184, we
-          # use empty GetAggregatedAttestationResponse.
-          ApiResponse[GetAggregatedAttestationResponse].ok(
-            GetAggregatedAttestationResponse(
-              data: LowestScoreAggregatedAttestation))
-        of 500:
-          handle500()
-          ApiResponse[GetAggregatedAttestationResponse].err(
-            ResponseInternalError)
-        else:
-          handleUnexpectedCode()
-          ApiResponse[GetAggregatedAttestationResponse].err(
-            ResponseUnexpectedError)
-
-    if res.isErr():
-      raise (ref ValidatorApiError)(msg: res.error, data: failures)
-    res.get().data
-
-  of ApiStrategyKind.Priority:
-    vc.firstSuccessSequential(
-      RestPlainResponse,
-      vc.OneThirdDuration,
-      ViableNodeStatus,
-      {BeaconNodeRole.AggregatedData},
-      getAggregatedAttestationPlain(it, root, slot)):
-      if apiResponse.isErr():
-        handleCommunicationError()
-        false
-      else:
-        let response = apiResponse.get()
-        case response.status:
-        of 200:
-          let res = decodeBytes(GetAggregatedAttestationResponse, response.data,
-                                response.contentType)
-          if res.isOk(): return res.get().data
-          handleUnexpectedData()
-          false
-        of 400:
-          handle400()
-          false
-        of 404:
-          handle404()
-          false
-        of 500:
-          handle500()
-          false
-        else:
-          handleUnexpectedCode()
-          false
-
-    raise (ref ValidatorApiError)(
-      msg: "Failed to get aggregated attestation", data: failures)
-
 proc getAggregatedAttestationV2*(
     vc: ValidatorClientRef,
     slot: Slot,

beacon_chain/validator_client/attestation_service.nim

@@ -169,103 +169,6 @@ proc serveAggregateAndProofV2*(
     warn "Aggregated attestation was not accepted by beacon node"
   res
 
-proc produceAndPublishAttestations*(
-    service: AttestationServiceRef,
-    slot: Slot,
-    committee_index: CommitteeIndex,
-    duties: seq[DutyAndProof]
-): Future[AttestationData] {.
-   async: (raises: [CancelledError, ValidatorApiError]).} =
-  doAssert(MAX_VALIDATORS_PER_COMMITTEE <= uint64(high(int)))
-  let
-    vc = service.client
-    fork = vc.forkAtEpoch(slot.epoch)
-
-  let data = await vc.produceAttestationData(slot, committee_index,
-                                             ApiStrategyKind.Best)
-
-  let registeredRes = vc.attachedValidators[].slashingProtection.withContext:
-    var tmp: seq[RegisteredAttestation]
-    for duty in duties:
-      if (duty.data.slot != data.slot) or
-          (uint64(duty.data.committee_index) != data.index):
-        warn "Inconsistent validator duties during attestation signing",
-              pubkey = shortLog(duty.data.pubkey),
-              duty_slot = duty.data.slot,
-              duty_index = duty.data.committee_index,
-              attestation_slot = data.slot, attestation_index = data.index
-        continue
-
-      let validator = vc.getValidatorForDuties(
-          duty.data.pubkey, duty.data.slot).valueOr:
-        continue
-
-      doAssert(validator.index.isSome())
-      let validator_index = validator.index.get()
-
-      logScope:
-        validator = validatorLog(validator)
-
-      # TODO: signing_root is recomputed in getAttestationSignature just after,
-      # but not for locally attached validators.
-      let
-        signingRoot = compute_attestation_signing_root(
-          fork, vc.beaconGenesis.genesis_validators_root, data)
-        registered = registerAttestationInContext(
-              validator_index, validator.pubkey, data.source.epoch,
-              data.target.epoch, signingRoot)
-      if registered.isErr():
-        warn "Slashing protection activated for attestation",
-            attestationData = shortLog(data),
-            signingRoot = shortLog(signingRoot),
-            badVoteDetails = $registered.error()
-        continue
-
-      tmp.add(RegisteredAttestation(
-        validator: validator,
-        validator_index: validator_index,
-        committee_index: duty.data.committee_index,
-        index_in_committee: duty.data.validator_committee_index,
-        committee_len: int duty.data.committee_length,
-        data: data
-      ))
-    tmp
-
-  if registeredRes.isErr():
-    warn "Could not update slashing database, skipping attestation duties",
-      error = registeredRes.error()
-  else:
-    let
-      pendingAttestations = registeredRes[].mapIt(service.serveAttestation(it))
-      statistics =
-        block:
-          var errored, succeed, failed = 0
-          try:
-            await allFutures(pendingAttestations)
-          except CancelledError as exc:
-            let pending = pendingAttestations
-              .filterIt(not(it.finished())).mapIt(it.cancelAndWait())
-            await noCancel allFutures(pending)
-            raise exc
-
-          for future in pendingAttestations:
-            if future.completed():
-              if future.value:
-                inc(succeed)
-              else:
-                inc(failed)
-            else:
-              inc(errored)
-          (succeed, errored, failed)
-
-    let delay = vc.getDelay(slot.attestation_deadline(vc.timeParams))
-    debug "Attestation statistics", total = len(pendingAttestations),
-          succeed = statistics[0], failed_to_deliver = statistics[1],
-          not_accepted = statistics[2], delay = delay, slot = slot,
-          committee_index = committee_index, duties_count = len(duties)
-
-  data
-
 proc produceAndPublishAttestationsV2*(
     service: AttestationServiceRef,
     slot: Slot,