gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-19 05:48:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge issues

Browse Source
This commit is contained in:
realbigsean
2023-07-07 10:17:04 -04:00
parent cfe2452533
commit c4da1ba450
14 changed files with 143 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
consensus/types/src/beacon_state.rs
View File

@@ -1207,7 +1207,7 @@ impl<T: EthSpec> BeaconState<T> {
&mut state.balances,
&mut state.progressive_balances_cache,
),
BeaconState::Deneb(state) => (
BeaconState::Deneb(state) => (
&mut state.validators,
&mut state.balances,
&mut state.progressive_balances_cache,

5
consensus/types/src/beacon_state/progressive_balances_cache.rs
View File

@@ -179,6 +179,9 @@ impl ProgressiveBalancesMode {
pub fn is_progressive_balances_enabled<E: EthSpec>(state: &BeaconState<E>) -> bool {
match state {
BeaconState::Base(_) => false,
BeaconState::Altair(_) | BeaconState::Merge(_) | BeaconState::Capella(_) => true,
BeaconState::Altair(_)
| BeaconState::Merge(_)
| BeaconState::Capella(_)
| BeaconState::Deneb(_) => true,
}
}