From 7bc9da3a974ee445265856cf3cf1330d14b68b80 Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Mon, 13 Dec 2021 08:48:38 -0700 Subject: [PATCH] Revert "Remove activated feature for filtering invalid stakes from rewards (#21641) (#21650)" This reverts commit 9959ede9ce63404575abe6c20927995aad1bacef. --- runtime/src/bank.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 8c6b158a11..38132355c5 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -2074,6 +2074,10 @@ 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()); @@ -2129,9 +2133,10 @@ impl Bank { } // filter invalid delegation accounts - if stake_account.owner() != &solana_stake_program::id() - || (fetched_vote_account_owner.is_some() - && fetched_vote_account_owner != Some(&solana_vote_program::id())) + 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()))) { datapoint_warn!( "bank-stake_delegation_accounts-invalid-account",