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

Resolve conflicts (#22905)

Browse Source 
Co-authored-by: carllin <carl@solana.com>
This commit is contained in:
mergify[bot]
2022-02-05 06:47:18 +00:00
committed by GitHub
parent 9ea025315e
commit dd6c365bd9
5 changed files with 646 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sdk/src/feature_set.rs
View File

@ -303,6 +303,10 @@ pub mod reject_vote_account_close_unless_zero_credit_epoch {
solana_sdk::declare_id!("ALBk3EWdeAg2WAGf6GPDUf1nynyNqCdEVmgouG7rpuCj");
}
pub mod bank_tranaction_count_fix {
solana_sdk::declare_id!("Vo5siZ442SaZBKPXNocthiXysNviW4UYPwRFggmbgAp");
}
lazy_static! {
/// Map of feature identifiers to user-visible description
pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
@ -373,6 +377,7 @@ lazy_static! {
(spl_associated_token_account_v1_0_4::id(), "SPL Associated Token Account Program release version 1.0.4, tied to token 3.3.0 #22648"),
(update_syscall_base_costs::id(), "Update syscall base costs"),
(reject_vote_account_close_unless_zero_credit_epoch::id(), "fail vote account withdraw to 0 unless account earned 0 credits in last completed epoch"),
(bank_tranaction_count_fix::id(), "Fixes Bank::transaction_count to include all committed transactions, not just successful ones"),
/*************** ADD NEW FEATURES HERE ***************/
]
.iter()