Skip to content

Address review feedback: update remaining vote rewards references #3453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jstarry merged 1 commit into from
Feb 4, 2026
Merged

Address review feedback: update remaining vote rewards references #3453

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions runtime/src/bank/partitioned_epoch_rewards/calculation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ impl RewardsAccumulator {
.saturating_add(stakers_reward);
}

/// Merges two instances by combining their vote rewards and stake rewards.
/// Merges two instances by combining their reward commissions and stake rewards.
///
/// To minimize reallocations, the instance with more vote rewards is used
/// To minimize reallocations, the instance with more reward commissions is used
/// as the base and the smaller instance is merged into it.
fn accumulate_into_larger(self, rhs: Self) -> Self {
// Check which instance has more vote rewards. Treat the bigger one
// Check which instance has more reward commissions. Treat the bigger one
// as a destination, which is going to be extended. This way we make
// the reallocation as small as possible.
let (mut dst, src) = if self.reward_commissions.len() >= rhs.reward_commissions.len() {
Expand Down Expand Up @@ -498,7 +498,7 @@ impl Bank {
new_rate_activation_epoch,
commission_rate_in_basis_points,
) {
Ok((stake_reward, vote_rewards, stake)) => {
Ok((stake_reward, commission_lamports, stake)) => {
let stake_reward = PartitionedStakeReward {
stake_pubkey,
stake,
Expand All @@ -509,7 +509,7 @@ impl Bank {
let reward_commission = RewardCommission {
commission_bps,
commission_account: vote_account,
commission_lamports: vote_rewards,
commission_lamports,
};
Some(DelegationRewards {
stake_reward,
Expand Down Expand Up @@ -691,9 +691,9 @@ impl Bank {
}

/// If rewards are still active, recalculates partitioned stake rewards and
/// updates Bank::epoch_reward_status. This method assumes that vote rewards
/// have already been calculated and delivered, and *only* recalculates
/// stake rewards
/// updates Bank::epoch_reward_status. This method assumes that reward
/// commissions have already been calculated and delivered, and *only*
/// recalculates stake rewards
pub(in crate::bank) fn recalculate_partitioned_rewards_if_active<F, TP>(
&mut self,
thread_pool_builder: F,
Expand Down