From fdcf589f7cc164615e051158bd847f12fe62d91c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 24 Nov 2020 18:57:26 +0000 Subject: [PATCH] Restore bank feature used to deprecate Rewards sysvar (#13786) (#13788) (cherry picked from commit c930f92411a11e794f584d4500a7c2b0118a86cb) Co-authored-by: Tyera Eulberg --- runtime/src/bank.rs | 2 +- sdk/src/feature_set.rs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index c59db335b7..ac7d3a9fdd 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -1398,7 +1398,7 @@ impl Bank { if !self .feature_set - .is_active(&feature_set::pico_inflation::id()) + .is_active(&feature_set::deprecate_rewards_sysvar::id()) { // this sysvar can be retired once `pico_inflation` is enabled on all clusters self.update_sysvar_account(&sysvar::rewards::id(), |account| { diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs index 0b8ed82d98..32a768518a 100644 --- a/sdk/src/feature_set.rs +++ b/sdk/src/feature_set.rs @@ -18,6 +18,10 @@ pub mod consistent_recent_blockhashes_sysvar { solana_sdk::declare_id!("3h1BQWPDS5veRsq6mDBWruEpgPxRJkfwGexg5iiQ9mYg"); } +pub mod deprecate_rewards_sysvar { + solana_sdk::declare_id!("GaBtBJvmS4Arjj5W1NmFcyvPjsHN38UGYDq2MDwbs9Qu"); +} + pub mod pico_inflation { solana_sdk::declare_id!("4RWNif6C2WCNiKVW7otP4G7dkmkHGyKQWRpuZ1pxKU5m"); } @@ -96,6 +100,7 @@ lazy_static! { (instructions_sysvar_enabled::id(), "instructions sysvar"), (secp256k1_program_enabled::id(), "secp256k1 program"), (consistent_recent_blockhashes_sysvar::id(), "consistent recentblockhashes sysvar"), + (deprecate_rewards_sysvar::id(), "deprecate unused rewards sysvar"), (pico_inflation::id(), "pico-inflation"), (full_inflation::id(), "full-inflation"), (spl_token_v2_multisig_fix::id(), "spl-token multisig fix"),