gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-16 19:32:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into eth1-deploy

Browse Source
This commit is contained in:
Paul Hauner
2019-11-27 12:48:46 +11:00
parent aad68f9e88 bf2eeae3f2
commit 280bb455d0
42 changed files with 2516 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/rest_api/src/beacon.rs
View File

@@ -196,7 +196,7 @@ pub fn get_state<T: BeaconChainTypes>(
let state = beacon_chain
.store
.get(root)?
.get_state(root, None)?
.ok_or_else(|| ApiError::NotFound(format!("No state for root: {:?}", root)))?;
(*root, state)

2
beacon_node/rest_api/src/helpers.rs
View File

@@ -154,7 +154,7 @@ pub fn state_at_slot<T: BeaconChainTypes>(
let state: BeaconState<T::EthSpec> = beacon_chain
.store
.get(&root)?
.get_state(&root, Some(slot))?
.ok_or_else(|| ApiError::NotFound(format!("Unable to find state at root {}", root)))?;
Ok((root, state))

23
beacon_node/rest_api/src/validator.rs
View File

@@ -93,18 +93,19 @@ fn return_validator_duties<T: BeaconChainTypes>(
epoch: Epoch,
validator_pubkeys: Vec<PublicKey>,
) -> Result<Vec<ValidatorDuty>, ApiError> {
let mut state = beacon_chain
.state_at_slot(epoch.start_slot(T::EthSpec::slots_per_epoch()))
.map_err(|e| {
ApiError::ServerError(format!("Unable to load state for epoch {}: {:?}", epoch, e))
})?;
let head_state_slot = beacon_chain.head().beacon_state.slot;
let head_epoch = head_state_slot.current_epoch();
let current_epoch = state.current_epoch();
let relative_epoch = RelativeEpoch::from_epoch(current_epoch, epoch).map_err(|_| {
ApiError::BadRequest(format!(
"Epoch must be within one epoch of the current epoch",
))
})?;
let relative_epoch = RelativeEpoch::from_epoch(head_epoch, epoch);
let mut state = if relative_epoch.is_err() {
beacon_chain.head().beacon_state
} else {
beacon_chain
.state_at_slot(epoch.start_slot(T::EthSpec::slots_per_epoch()))
.map_err(|e| {
ApiError::ServerError(format!("Unable to load state for epoch {}: {:?}", epoch, e))
})?
};
state
.build_committee_cache(relative_epoch, &beacon_chain.spec)