From 9959ede9ce63404575abe6c20927995aad1bacef Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 00:54:41 +0000 Subject: [PATCH] Remove activated feature for filtering invalid stakes from rewards (#21641) (#21650) (cherry picked from commit a1adcb23b6d62c5fc0b08193a2d2c8106448c87f) Co-authored-by: Justin Starry --- runtime/src/bank.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 38132355c5..8c6b158a11 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -2074,10 +2074,6 @@ impl Bank { thread_pool: &ThreadPool, reward_calc_tracer: Option, ) -> DashMap { - 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() - || (fetched_vote_account_owner.is_some() - && fetched_vote_account_owner != Some(&solana_vote_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())) { datapoint_warn!( "bank-stake_delegation_accounts-invalid-account",