cdec3cec18
- Resolves #1550 - Resolves #824 - Resolves #825 - Resolves #1131 - Resolves #1411 - Resolves #1256 - Resolve #1177 - Includes the `ShufflingId` struct initially defined in #1492. That PR is now closed and the changes are included here, with significant bug fixes. - Implement the https://github.com/ethereum/eth2.0-APIs in a new `http_api` crate using `warp`. This replaces the `rest_api` crate. - Add a new `common/eth2` crate which provides a wrapper around `reqwest`, providing the HTTP client that is used by the validator client and for testing. This replaces the `common/remote_beacon_node` crate. - Create a `http_metrics` crate which is a dedicated server for Prometheus metrics (they are no longer served on the same port as the REST API). We now have flags for `--metrics`, `--metrics-address`, etc. - Allow the `subnet_id` to be an optional parameter for `VerifiedUnaggregatedAttestation::verify`. This means it does not need to be provided unnecessarily by the validator client. - Move `fn map_attestation_committee` in `mod beacon_chain::attestation_verification` to a new `fn with_committee_cache` on the `BeaconChain` so the same cache can be used for obtaining validator duties. - Add some other helpers to `BeaconChain` to assist with common API duties (e.g., `block_root_at_slot`, `head_beacon_block_root`). - Change the `NaiveAggregationPool` so it can index attestations by `hash_tree_root(attestation.data)`. This is a requirement of the API. - Add functions to `BeaconChainHarness` to allow it to create slashings and exits. - Allow for `eth1::Eth1NetworkId` to go to/from a `String`. - Add functions to the `OperationPool` to allow getting all objects in the pool. - Add function to `BeaconState` to check if a committee cache is initialized. - Fix bug where `seconds_per_eth1_block` was not transferring over from `YamlConfig` to `ChainSpec`. - Add the `deposit_contract_address` to `YamlConfig` and `ChainSpec`. We needed to be able to return it in an API response. - Change some uses of serde `serialize_with` and `deserialize_with` to a single use of `with` (code quality). - Impl `Display` and `FromStr` for several BLS fields. - Check for clock discrepancy when VC polls BN for sync state (with +/- 1 slot tolerance). This is not intended to be comprehensive, it was just easy to do. - See #1434 for a per-endpoint overview. - Seeking clarity here: https://github.com/ethereum/eth2.0-APIs/issues/75 - [x] Add docs for prom port to close #1256 - [x] Follow up on this #1177 - [x] ~~Follow up with #1424~~ Will fix in future PR. - [x] Follow up with #1411 - [x] ~~Follow up with #1260~~ Will fix in future PR. - [x] Add quotes to all integers. - [x] Remove `rest_types` - [x] Address missing beacon block error. (#1629) - [x] ~~Add tests for lighthouse/peers endpoints~~ Wontfix - [x] ~~Follow up with validator status proposal~~ Tracked in #1434 - [x] Unify graffiti structs - [x] ~~Start server when waiting for genesis?~~ Will fix in future PR. - [x] TODO in http_api tests - [x] Move lighthouse endpoints off /eth/v1 - [x] Update docs to link to standard - ~~Blocked on #1586~~ Co-authored-by: Michael Sproul <michael@sigmaprime.io>
89 lines
3.6 KiB
Rust
89 lines
3.6 KiB
Rust
use crate::state_id::StateId;
|
|
use beacon_chain::{BeaconChain, BeaconChainTypes};
|
|
use eth2::{
|
|
lighthouse::{GlobalValidatorInclusionData, ValidatorInclusionData},
|
|
types::ValidatorId,
|
|
};
|
|
use state_processing::per_epoch_processing::ValidatorStatuses;
|
|
use types::{Epoch, EthSpec};
|
|
|
|
/// Returns information about *all validators* (i.e., global) and how they performed during a given
|
|
/// epoch.
|
|
pub fn global_validator_inclusion_data<T: BeaconChainTypes>(
|
|
epoch: Epoch,
|
|
chain: &BeaconChain<T>,
|
|
) -> Result<GlobalValidatorInclusionData, warp::Rejection> {
|
|
let target_slot = epoch.end_slot(T::EthSpec::slots_per_epoch());
|
|
|
|
let state = StateId::slot(target_slot).state(chain)?;
|
|
|
|
let mut validator_statuses = ValidatorStatuses::new(&state, &chain.spec)
|
|
.map_err(warp_utils::reject::beacon_state_error)?;
|
|
validator_statuses
|
|
.process_attestations(&state, &chain.spec)
|
|
.map_err(warp_utils::reject::beacon_state_error)?;
|
|
|
|
let totals = validator_statuses.total_balances;
|
|
|
|
Ok(GlobalValidatorInclusionData {
|
|
current_epoch_active_gwei: totals.current_epoch(),
|
|
previous_epoch_active_gwei: totals.previous_epoch(),
|
|
current_epoch_attesting_gwei: totals.current_epoch_attesters(),
|
|
current_epoch_target_attesting_gwei: totals.current_epoch_target_attesters(),
|
|
previous_epoch_attesting_gwei: totals.previous_epoch_attesters(),
|
|
previous_epoch_target_attesting_gwei: totals.previous_epoch_target_attesters(),
|
|
previous_epoch_head_attesting_gwei: totals.previous_epoch_head_attesters(),
|
|
})
|
|
}
|
|
|
|
/// Returns information about a single validator and how it performed during a given epoch.
|
|
pub fn validator_inclusion_data<T: BeaconChainTypes>(
|
|
epoch: Epoch,
|
|
validator_id: &ValidatorId,
|
|
chain: &BeaconChain<T>,
|
|
) -> Result<Option<ValidatorInclusionData>, warp::Rejection> {
|
|
let target_slot = epoch.end_slot(T::EthSpec::slots_per_epoch());
|
|
|
|
let mut state = StateId::slot(target_slot).state(chain)?;
|
|
|
|
let mut validator_statuses = ValidatorStatuses::new(&state, &chain.spec)
|
|
.map_err(warp_utils::reject::beacon_state_error)?;
|
|
validator_statuses
|
|
.process_attestations(&state, &chain.spec)
|
|
.map_err(warp_utils::reject::beacon_state_error)?;
|
|
|
|
state
|
|
.update_pubkey_cache()
|
|
.map_err(warp_utils::reject::beacon_state_error)?;
|
|
|
|
let validator_index = match validator_id {
|
|
ValidatorId::Index(index) => *index as usize,
|
|
ValidatorId::PublicKey(pubkey) => {
|
|
if let Some(index) = state
|
|
.get_validator_index(pubkey)
|
|
.map_err(warp_utils::reject::beacon_state_error)?
|
|
{
|
|
index
|
|
} else {
|
|
return Ok(None);
|
|
}
|
|
}
|
|
};
|
|
|
|
Ok(validator_statuses
|
|
.statuses
|
|
.get(validator_index)
|
|
.map(|vote| ValidatorInclusionData {
|
|
is_slashed: vote.is_slashed,
|
|
is_withdrawable_in_current_epoch: vote.is_withdrawable_in_current_epoch,
|
|
is_active_in_current_epoch: vote.is_active_in_current_epoch,
|
|
is_active_in_previous_epoch: vote.is_active_in_previous_epoch,
|
|
current_epoch_effective_balance_gwei: vote.current_epoch_effective_balance,
|
|
is_current_epoch_attester: vote.is_current_epoch_attester,
|
|
is_current_epoch_target_attester: vote.is_current_epoch_target_attester,
|
|
is_previous_epoch_attester: vote.is_previous_epoch_attester,
|
|
is_previous_epoch_target_attester: vote.is_previous_epoch_target_attester,
|
|
is_previous_epoch_head_attester: vote.is_previous_epoch_head_attester,
|
|
}))
|
|
}
|