gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-15 10:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge unstable (needs a few more fixes)

Browse Source
This commit is contained in:
Michael Sproul
2023-01-17 13:15:41 +11:00
parent 868d40e3c8 6ac1c5b439
commit 8d8df17551
156 changed files with 6766 additions and 2387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
consensus/state_processing/src/per_block_processing/altair/sync_committee.rs
View File

@@ -52,11 +52,12 @@ pub fn process_sync_aggregate<T: EthSpec>(
.into_iter()
.zip(aggregate.sync_committee_bits.iter())
{
// FIXME(sproul): double-check this for Capella, proposer shouldn't have 0 effective balance
if participation_bit {
increase_balance(state, participant_index as usize, participant_reward)?;
increase_balance(state, participant_index, participant_reward)?;
total_proposer_reward.safe_add_assign(proposer_reward)?;
} else {
decrease_balance(state, participant_index as usize, participant_reward)?;
decrease_balance(state, participant_index, participant_reward)?;
}
}
increase_balance(state, proposer_index as usize, total_proposer_reward)?;

2
consensus/state_processing/src/per_epoch_processing/base/rewards_and_penalties.rs
View File

@@ -242,7 +242,7 @@ fn get_inclusion_delay_delta(
let max_attester_reward = base_reward.safe_sub(proposer_reward)?;
delta.reward(max_attester_reward.safe_div(inclusion_info.delay)?)?;
let proposer_index = inclusion_info.proposer_index as usize;
let proposer_index = inclusion_info.proposer_index;
Ok((delta, Some((proposer_index, proposer_delta))))
} else {
Ok((Delta::default(), None))