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

Cleanup ledger builtins (#14083) (#14130)

Browse Source 
(cherry picked from commit 582418de5e)

Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
mergify[bot]
2020-12-15 21:45:44 +00:00
committed by GitHub
parent 03fc031611
commit 8d0b102b44
2 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
ledger/src/builtins.rs
View File

@ -12,41 +12,31 @@ macro_rules! to_builtin {
/// Builtin programs that are always available /// Builtin programs that are always available
fn genesis_builtins(cluster_type: ClusterType, bpf_jit: bool) -> Vec<Builtin> { fn genesis_builtins(cluster_type: ClusterType, bpf_jit: bool) -> Vec<Builtin> {
let mut builtins = vec![
to_builtin!(solana_bpf_loader_deprecated_program!()),
if bpf_jit {
to_builtin!(solana_bpf_loader_program_with_jit!())
} else {
to_builtin!(solana_bpf_loader_program!())
},
];
if cluster_type != ClusterType::MainnetBeta { if cluster_type != ClusterType::MainnetBeta {
vec![ builtins.push(if bpf_jit {
to_builtin!(solana_bpf_loader_deprecated_program!()), to_builtin!(solana_bpf_loader_upgradeable_program_with_jit!())
if bpf_jit { } else {
to_builtin!(solana_bpf_loader_program_with_jit!()) to_builtin!(solana_bpf_loader_upgradeable_program!())
} else { });
to_builtin!(solana_bpf_loader_program!())
},
if bpf_jit {
to_builtin!(solana_bpf_loader_upgradeable_program_with_jit!())
} else {
to_builtin!(solana_bpf_loader_upgradeable_program!())
},
]
} else {
// Remove this `else` block and the `cluster_type` argument to this function once
// `feature_set::bpf_loader2_program::id()` is active on Mainnet Beta
vec![to_builtin!(solana_bpf_loader_deprecated_program!())]
} }
builtins
} }
/// Builtin programs activated dynamically by feature /// Builtin programs activated dynamically by feature
fn feature_builtins() -> Vec<(Builtin, Pubkey, ActivationType)> { fn feature_builtins() -> Vec<(Builtin, Pubkey, ActivationType)> {
vec![ vec![(
( to_builtin!(solana_bpf_loader_upgradeable_program!()),
to_builtin!(solana_bpf_loader_program!()), feature_set::bpf_loader_upgradeable_program::id(),
feature_set::bpf_loader2_program::id(), ActivationType::NewProgram,
ActivationType::NewProgram, )]
),
(
to_builtin!(solana_bpf_loader_upgradeable_program!()),
feature_set::bpf_loader_upgradeable_program::id(),
ActivationType::NewProgram,
),
]
} }
pub(crate) fn get(cluster_type: ClusterType, bpf_jit: bool) -> Builtins { pub(crate) fn get(cluster_type: ClusterType, bpf_jit: bool) -> Builtins {

8
local-cluster/tests/local_cluster.rs
View File

@ -783,6 +783,7 @@ fn test_mainnet_beta_cluster_type() {
&solana_stake_program::id(), &solana_stake_program::id(),
&solana_vote_program::id(), &solana_vote_program::id(),
&solana_sdk::bpf_loader_deprecated::id(), &solana_sdk::bpf_loader_deprecated::id(),
&solana_sdk::bpf_loader::id(),
] ]
.iter() .iter()
{ {
@ -798,7 +799,12 @@ fn test_mainnet_beta_cluster_type() {
} }
// Programs that are not available at epoch 0 // Programs that are not available at epoch 0
for program_id in [&solana_sdk::bpf_loader::id(), &solana_vest_program::id()].iter() { for program_id in [
&solana_sdk::bpf_loader_upgradeable::id(),
&solana_vest_program::id(),
]
.iter()
{
assert_eq!( assert_eq!(
( (
program_id, program_id,