gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove activated feature for filtering invalid stakes from rewards (#21641) (#21650)

Browse Source 
(cherry picked from commit a1adcb23b6)

Co-authored-by: Justin Starry <justin@solana.com>
This commit is contained in:
mergify[bot]
2021-12-07 00:54:41 +00:00
committed by GitHub
parent 6d1e1287bc
commit 9959ede9ce
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/src/bank.rs
View File

@@ -2074,10 +2074,6 @@ impl Bank {
thread_pool: &ThreadPool,
reward_calc_tracer: Option<impl Fn(&RewardCalculationEvent) + Send + Sync>,
) -> DashMap<Pubkey, VoteWithStakeDelegations> {
let filter_stake_delegation_accounts = self
.feature_set
.is_active(&feature_set::filter_stake_delegation_accounts::id());
let stakes = self.stakes.read().unwrap();
let accounts = DashMap::with_capacity(stakes.vote_accounts().len());
@@ -2133,10 +2129,9 @@ impl Bank {
}
// filter invalid delegation accounts
if filter_stake_delegation_accounts
&& (stake_account.owner() != &solana_stake_program::id()
if stake_account.owner() != &solana_stake_program::id()
|| (fetched_vote_account_owner.is_some()
&& fetched_vote_account_owner != Some(&solana_vote_program::id())))
&& fetched_vote_account_owner != Some(&solana_vote_program::id()))
{
datapoint_warn!(
"bank-stake_delegation_accounts-invalid-account",