gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-07-01 20:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts between untstable and release-v7.0.0

Browse Source
This commit is contained in:
Eitan Seri-Levi
2025-03-23 11:09:02 -06:00
parent d323699fde 04868027a6
commit cbf1c04a14
63 changed files with 1422 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
beacon_node/beacon_chain/src/attestation_rewards.rs
View File

@@ -51,8 +51,10 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
.state_root_at_slot(state_slot)?
.ok_or(BeaconChainError::NoStateForSlot(state_slot))?;
// This branch is reached from the HTTP API. We assume the user wants
// to cache states so that future calls are faster.
let state = self
.get_state(&state_root, Some(state_slot))?
.get_state(&state_root, Some(state_slot), true)?
.ok_or(BeaconChainError::MissingBeaconState(state_root))?;
if state.fork_name_unchecked().altair_enabled() {