Skip to content

Move sysvar submodule; reorg partitioned epoch rewards runtime code, 2 of 5 #520

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
mergify merged 5 commits into from
Apr 2, 2024
Merged

Move sysvar submodule; reorg partitioned epoch rewards runtime code, 2 of 5 #520

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e515dbd
Add sysvar sub-submodule
CriesofCarrots Mar 29, 2024
efdd64b
Move sysvar methods to sub-submodule
CriesofCarrots Mar 29, 2024
86c4ce8
Move unit test to sysvar sub-submodule
CriesofCarrots Mar 29, 2024
5663ba6
Add new partitioned_epoch_rewards::sysvar method
CriesofCarrots Mar 29, 2024
af20203
Remove superfluous method
CriesofCarrots Mar 29, 2024
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
Prev Previous commit
Next Next commit
Add new partitioned_epoch_rewards::sysvar method
  • Loading branch information
@CriesofCarrots
CriesofCarrots committed Apr 2, 2024
commit 5663ba6c6b4991d56520f77c220a0efac4afdecd
12 changes: 1 addition & 11 deletions runtime/src/bank.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1485,17 +1485,7 @@ impl Bank {
EpochRewardStatus::Active(_)
));
self.epoch_reward_status = EpochRewardStatus::Inactive;
if let Some(account) = self.get_account(&sysvar::epoch_rewards::id()) {
if account.lamports() > 0 {
info!(
"burning {} extra lamports in EpochRewards sysvar account at slot {}",
account.lamports(),
self.slot()
);
self.log_epoch_rewards_sysvar("burn");
self.burn_and_purge_account(&sysvar::epoch_rewards::id(), account);
}
}
self.destroy_epoch_rewards_sysvar();
}

/// Begin the process of calculating and distributing rewards.
Expand Down
14 changes: 14 additions & 0 deletions runtime/src/bank/partitioned_epoch_rewards/sysvar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,20 @@ impl Bank {

self.log_epoch_rewards_sysvar("update");
}

pub(in crate::bank) fn destroy_epoch_rewards_sysvar(&self) {
if let Some(account) = self.get_account(&sysvar::epoch_rewards::id()) {
if account.lamports() > 0 {
info!(
"burning {} extra lamports in EpochRewards sysvar account at slot {}",
account.lamports(),
self.slot()
);
self.log_epoch_rewards_sysvar("burn");
self.burn_and_purge_account(&sysvar::epoch_rewards::id(), account);
}
}
}
}

#[cfg(test)]
Expand Down