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

Restore bank feature used to deprecate Rewards sysvar (#13786)

Browse Source
This commit is contained in:
Tyera Eulberg
2020-11-24 10:22:31 -07:00
committed by GitHub
parent 4c4c6572e7
commit c930f92411
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/src/bank.rs
View File

@ -1396,7 +1396,7 @@ impl Bank {
if !self if !self
.feature_set .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 // this sysvar can be retired once `pico_inflation` is enabled on all clusters
self.update_sysvar_account(&sysvar::rewards::id(), |account| { self.update_sysvar_account(&sysvar::rewards::id(), |account| {

5
sdk/src/feature_set.rs
View File

@ -18,6 +18,10 @@ pub mod consistent_recent_blockhashes_sysvar {
solana_sdk::declare_id!("3h1BQWPDS5veRsq6mDBWruEpgPxRJkfwGexg5iiQ9mYg"); solana_sdk::declare_id!("3h1BQWPDS5veRsq6mDBWruEpgPxRJkfwGexg5iiQ9mYg");
} }
pub mod deprecate_rewards_sysvar {
solana_sdk::declare_id!("GaBtBJvmS4Arjj5W1NmFcyvPjsHN38UGYDq2MDwbs9Qu");
}
pub mod pico_inflation { pub mod pico_inflation {
solana_sdk::declare_id!("4RWNif6C2WCNiKVW7otP4G7dkmkHGyKQWRpuZ1pxKU5m"); solana_sdk::declare_id!("4RWNif6C2WCNiKVW7otP4G7dkmkHGyKQWRpuZ1pxKU5m");
} }
@ -96,6 +100,7 @@ lazy_static! {
(instructions_sysvar_enabled::id(), "instructions sysvar"), (instructions_sysvar_enabled::id(), "instructions sysvar"),
(secp256k1_program_enabled::id(), "secp256k1 program"), (secp256k1_program_enabled::id(), "secp256k1 program"),
(consistent_recent_blockhashes_sysvar::id(), "consistent recentblockhashes sysvar"), (consistent_recent_blockhashes_sysvar::id(), "consistent recentblockhashes sysvar"),
(deprecate_rewards_sysvar::id(), "deprecate unused rewards sysvar"),
(pico_inflation::id(), "pico-inflation"), (pico_inflation::id(), "pico-inflation"),
(full_inflation::id(), "full-inflation"), (full_inflation::id(), "full-inflation"),
(spl_token_v2_multisig_fix::id(), "spl-token multisig fix"), (spl_token_v2_multisig_fix::id(), "spl-token multisig fix"),