diff --git a/beacon_chain/spec/eth2_apis/rest_beacon_calls.nim b/beacon_chain/spec/eth2_apis/rest_beacon_calls.nim index 915f530a2..68af99627 100644 --- a/beacon_chain/spec/eth2_apis/rest_beacon_calls.nim +++ b/beacon_chain/spec/eth2_apis/rest_beacon_calls.nim @@ -1,4 +1,4 @@ -# Copyright (c) 2018-2023 Status Research & Development GmbH +# Copyright (c) 2018-2024 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -33,11 +33,6 @@ proc getStateRoot*(state_id: StateIdent): RestResponse[GetStateRootResponse] {. meth: MethodGet.} ## https://ethereum.github.io/beacon-APIs/#/Beacon/getStateRoot -proc getStateFork*(state_id: StateIdent): RestResponse[GetStateForkResponse] {. - rest, endpoint: "/eth/v1/beacon/states/{state_id}/fork", - meth: MethodGet.} - ## https://ethereum.github.io/beacon-APIs/#/Beacon/getStateFork - proc getStateForkPlain*(state_id: StateIdent): RestPlainResponse {. rest, endpoint: "/eth/v1/beacon/states/{state_id}/fork", meth: MethodGet.} @@ -49,13 +44,6 @@ proc getStateFinalityCheckpoints*(state_id: StateIdent meth: MethodGet.} ## https://ethereum.github.io/beacon-APIs/#/Beacon/getStateFinalityCheckpoints -proc getStateValidators*(state_id: StateIdent, - id: seq[ValidatorIdent] - ): RestResponse[GetStateValidatorsResponse] {. - rest, endpoint: "/eth/v1/beacon/states/{state_id}/validators", - meth: MethodGet.} - ## https://ethereum.github.io/beacon-APIs/#/Beacon/getStateValidators - proc getStateValidatorsPlain*( state_id: StateIdent, id: seq[ValidatorIdent] @@ -64,14 +52,6 @@ proc getStateValidatorsPlain*( meth: MethodGet.} ## https://ethereum.github.io/beacon-APIs/#/Beacon/getStateValidators -proc getStateValidator*(state_id: StateIdent, - validator_id: ValidatorIdent - ): RestResponse[GetStateValidatorResponse] {. - rest, - endpoint: "/eth/v1/beacon/states/{state_id}/validators/{validator_id}", - meth: MethodGet.} - ## https://ethereum.github.io/beacon-APIs/#/Beacon/getStateValidator - proc getStateValidatorPlain*(state_id: StateIdent, validator_id: ValidatorIdent ): RestPlainResponse {. @@ -110,11 +90,6 @@ proc getBlockHeaders*(slot: Option[Slot], parent_root: Option[Eth2Digest] meth: MethodGet.} ## https://ethereum.github.io/beacon-APIs/#/Beacon/getBlockHeaders -# proc getBlockHeader*(block_id: BlockIdent): RestResponse[GetBlockHeaderResponse] {. -# rest, endpoint: "/eth/v1/beacon/headers/{block_id}", -# meth: MethodGet.} -# ## https://ethereum.github.io/beacon-APIs/#/Beacon/getBlockHeader - proc getBlockHeaderPlain*(block_id: BlockIdent): RestPlainResponse {. rest, endpoint: "/eth/v1/beacon/headers/{block_id}", meth: MethodGet.} @@ -315,11 +290,6 @@ proc getBlockV2*(client: RestClientRef, block_id: BlockIdent, else: raiseRestResponseError(resp) -proc getBlockRoot*(block_id: BlockIdent): RestResponse[GetBlockRootResponse] {. - rest, endpoint: "/eth/v1/beacon/blocks/{block_id}/root", - meth: MethodGet.} - ## https://ethereum.github.io/beacon-APIs/#/Beacon/getBlockRoot - proc getBlockRootPlain*(block_id: BlockIdent): RestPlainResponse {. rest, endpoint: "/eth/v1/beacon/blocks/{block_id}/root", meth: MethodGet.} diff --git a/beacon_chain/spec/eth2_apis/rest_config_calls.nim b/beacon_chain/spec/eth2_apis/rest_config_calls.nim index 4987ba004..884c8b0be 100644 --- a/beacon_chain/spec/eth2_apis/rest_config_calls.nim +++ b/beacon_chain/spec/eth2_apis/rest_config_calls.nim @@ -1,4 +1,4 @@ -# Copyright (c) 2018-2023 Status Research & Development GmbH +# Copyright (c) 2018-2024 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -12,10 +12,6 @@ import export chronos, client, rest_types, eth2_rest_serialization -proc getForkSchedule*(): RestResponse[GetForkScheduleResponse] {. - rest, endpoint: "/eth/v1/config/fork_schedule", meth: MethodGet.} - ## https://ethereum.github.io/beacon-APIs/#/Config/getForkSchedule - proc getForkSchedulePlain*(): RestPlainResponse {. rest, endpoint: "/eth/v1/config/fork_schedule", meth: MethodGet.} ## https://ethereum.github.io/beacon-APIs/#/Config/getForkSchedule diff --git a/beacon_chain/spec/eth2_apis/rest_validator_calls.nim b/beacon_chain/spec/eth2_apis/rest_validator_calls.nim index 38f914d3a..4ee50e881 100644 --- a/beacon_chain/spec/eth2_apis/rest_validator_calls.nim +++ b/beacon_chain/spec/eth2_apis/rest_validator_calls.nim @@ -1,4 +1,4 @@ -# Copyright (c) 2018-2023 Status Research & Development GmbH +# Copyright (c) 2018-2024 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -12,14 +12,6 @@ import export chronos, client, rest_types, eth2_rest_serialization -proc getAttesterDuties*( - epoch: Epoch, - body: seq[ValidatorIndex] - ): RestResponse[GetAttesterDutiesResponse] {. - rest, endpoint: "/eth/v1/validator/duties/attester/{epoch}", - meth: MethodPost.} - ## https://ethereum.github.io/beacon-APIs/#/Validator/getAttesterDuties - proc getAttesterDutiesPlain*( epoch: Epoch, body: seq[ValidatorIndex] @@ -28,13 +20,6 @@ proc getAttesterDutiesPlain*( meth: MethodPost.} ## https://ethereum.github.io/beacon-APIs/#/Validator/getAttesterDuties -proc getProposerDuties*( - epoch: Epoch - ): RestResponse[GetProposerDutiesResponse] {. - rest, endpoint: "/eth/v1/validator/duties/proposer/{epoch}", - meth: MethodGet.} - ## https://ethereum.github.io/beacon-APIs/#/Validator/getProposerDuties - proc getProposerDutiesPlain*( epoch: Epoch ): RestPlainResponse {. @@ -42,14 +27,6 @@ proc getProposerDutiesPlain*( meth: MethodGet.} ## https://ethereum.github.io/beacon-APIs/#/Validator/getProposerDuties -proc getSyncCommitteeDuties*( - epoch: Epoch, - body: seq[ValidatorIndex] - ): RestResponse[GetSyncCommitteeDutiesResponse] {. - rest, endpoint: "/eth/v1/validator/duties/sync/{epoch}", - meth: MethodPost.} - ## https://ethereum.github.io/beacon-APIs/#/Validator/getSyncCommitteeDuties - proc getSyncCommitteeDutiesPlain*( epoch: Epoch, body: seq[ValidatorIndex] @@ -76,14 +53,6 @@ proc produceBlindedBlockPlain*( accept: preferSSZ, meth: MethodGet.} ## https://ethereum.github.io/beacon-APIs/#/Validator/produceBlindedBlock -proc produceAttestationData*( - slot: Slot, - committee_index: CommitteeIndex - ): RestResponse[ProduceAttestationDataResponse] {. - rest, endpoint: "/eth/v1/validator/attestation_data", - meth: MethodGet.} - ## https://ethereum.github.io/beacon-APIs/#/Validator/produceAttestationData - proc produceAttestationDataPlain*( slot: Slot, committee_index: CommitteeIndex @@ -92,14 +61,6 @@ proc produceAttestationDataPlain*( meth: MethodGet.} ## https://ethereum.github.io/beacon-APIs/#/Validator/produceAttestationData -proc getAggregatedAttestation*( - attestation_data_root: Eth2Digest, - slot: Slot - ): RestResponse[GetAggregatedAttestationResponse] {. - rest, endpoint: "/eth/v1/validator/aggregate_attestation" - meth: MethodGet.} - ## https://ethereum.github.io/beacon-APIs/#/Validator/getAggregatedAttestation - proc getAggregatedAttestationPlain*( attestation_data_root: Eth2Digest, slot: Slot @@ -129,15 +90,6 @@ proc prepareSyncCommitteeSubnets*( meth: MethodPost.} ## https://ethereum.github.io/beacon-APIs/#/Validator/prepareSyncCommitteeSubnets -proc produceSyncCommitteeContribution*( - slot: Slot, - subcommittee_index: SyncSubcommitteeIndex, - beacon_block_root: Eth2Digest - ): RestResponse[ProduceSyncCommitteeContributionResponse] {. - rest, endpoint: "/eth/v1/validator/sync_committee_contribution", - meth: MethodGet.} - ## https://ethereum.github.io/beacon-APIs/#/Validator/produceSyncCommitteeContribution - proc produceSyncCommitteeContributionPlain*( slot: Slot, subcommittee_index: SyncSubcommitteeIndex, @@ -181,4 +133,3 @@ proc submitSyncCommitteeSelectionsPlain*( rest, endpoint: "/eth/v1/validator/sync_committee_selections", meth: MethodPost.} ## https://ethereum.github.io/beacon-APIs/#/Validator/submitSyncCommitteeSelections - diff --git a/beacon_chain/validator_client/fallback_service.nim b/beacon_chain/validator_client/fallback_service.nim index 0471263e8..f7bab341e 100644 --- a/beacon_chain/validator_client/fallback_service.nim +++ b/beacon_chain/validator_client/fallback_service.nim @@ -1,5 +1,5 @@ # beacon_chain -# Copyright (c) 2021-2023 Status Research & Development GmbH +# Copyright (c) 2021-2024 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -376,7 +376,7 @@ proc checkOffsetStatus(node: BeaconNodeServerRef, offset: TimeOffset) = proc runTimeMonitor(service: FallbackServiceRef, node: BeaconNodeServerRef) {.async.} = - const NimbusExtensionsLog = "Beacon node do not support nimbus extensions" + const NimbusExtensionsLog = "Beacon node does not support Nimbus extensions" let vc = service.client roles = AllBeaconNodeRoles