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

Removes bpf_loader_upgradeable_program feature gate. (#19102)

Browse Source
This commit is contained in:
Alexander Meißner
2021-08-11 00:08:57 +02:00
committed by GitHub
parent 8e1341c7ea
commit 85befbc8cd
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ledger/src/builtins.rs
View File

@ -2,7 +2,7 @@ use solana_runtime::{
bank::{Builtin, Builtins},
builtins::ActivationType,
};
use solana_sdk::{feature_set, pubkey::Pubkey};
use solana_sdk::pubkey::Pubkey;
macro_rules! to_builtin {
($b:expr) => {
@ -19,25 +19,22 @@ fn genesis_builtins(bpf_jit: bool) -> Vec<Builtin> {
} else {
to_builtin!(solana_bpf_loader_program!())
},
]
}
/// Builtin programs activated dynamically by feature
fn feature_builtins(bpf_jit: bool) -> Vec<(Builtin, Pubkey, ActivationType)> {
vec![(
if bpf_jit {
to_builtin!(solana_bpf_loader_upgradeable_program_with_jit!())
} else {
to_builtin!(solana_bpf_loader_upgradeable_program!())
},
feature_set::bpf_loader_upgradeable_program::id(),
ActivationType::NewProgram,
)]
]
}
/// Builtin programs activated dynamically by feature
fn feature_builtins() -> Vec<(Builtin, Pubkey, ActivationType)> {
vec![]
}
pub(crate) fn get(bpf_jit: bool) -> Builtins {
Builtins {
genesis_builtins: genesis_builtins(bpf_jit),
feature_builtins: feature_builtins(bpf_jit),
feature_builtins: feature_builtins(),
}
}