* Allow feature builtins to overwrite existing builtins * Add feature_builtin ActivationType * Correctly retain idempotent for replacing case * Fix test Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
46 lines
1.4 KiB
Rust
46 lines
1.4 KiB
Rust
use solana_runtime::{
|
|
bank::{Builtin, Builtins},
|
|
builtins::ActivationType,
|
|
};
|
|
use solana_sdk::{feature_set, genesis_config::ClusterType, pubkey::Pubkey};
|
|
|
|
/// Builtin programs that are always available
|
|
fn genesis_builtins(cluster_type: ClusterType) -> Vec<Builtin> {
|
|
let builtins = if cluster_type != ClusterType::MainnetBeta {
|
|
vec![
|
|
solana_bpf_loader_deprecated_program!(),
|
|
solana_bpf_loader_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![solana_bpf_loader_deprecated_program!()]
|
|
};
|
|
|
|
builtins
|
|
.into_iter()
|
|
.map(|b| Builtin::new(&b.0, b.1, b.2))
|
|
.collect()
|
|
}
|
|
|
|
/// Builtin programs activated dynamically by feature
|
|
fn feature_builtins() -> Vec<(Builtin, Pubkey, ActivationType)> {
|
|
let builtins = vec![(
|
|
solana_bpf_loader_program!(),
|
|
feature_set::bpf_loader2_program::id(),
|
|
ActivationType::NewProgram,
|
|
)];
|
|
|
|
builtins
|
|
.into_iter()
|
|
.map(|(b, p, t)| (Builtin::new(&b.0, b.1, b.2), p, t))
|
|
.collect()
|
|
}
|
|
|
|
pub(crate) fn get(cluster_type: ClusterType) -> Builtins {
|
|
Builtins {
|
|
genesis_builtins: genesis_builtins(cluster_type),
|
|
feature_builtins: feature_builtins(),
|
|
}
|
|
}
|