Removes bpf_loader_upgradeable_program feature gate. (#19102)
This commit is contained in:
parent
8e1341c7ea
commit
85befbc8cd
|
@ -2,7 +2,7 @@ use solana_runtime::{
|
||||||
bank::{Builtin, Builtins},
|
bank::{Builtin, Builtins},
|
||||||
builtins::ActivationType,
|
builtins::ActivationType,
|
||||||
};
|
};
|
||||||
use solana_sdk::{feature_set, pubkey::Pubkey};
|
use solana_sdk::pubkey::Pubkey;
|
||||||
|
|
||||||
macro_rules! to_builtin {
|
macro_rules! to_builtin {
|
||||||
($b:expr) => {
|
($b:expr) => {
|
||||||
|
@ -19,25 +19,22 @@ fn genesis_builtins(bpf_jit: bool) -> Vec<Builtin> {
|
||||||
} else {
|
} else {
|
||||||
to_builtin!(solana_bpf_loader_program!())
|
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 {
|
if bpf_jit {
|
||||||
to_builtin!(solana_bpf_loader_upgradeable_program_with_jit!())
|
to_builtin!(solana_bpf_loader_upgradeable_program_with_jit!())
|
||||||
} else {
|
} else {
|
||||||
to_builtin!(solana_bpf_loader_upgradeable_program!())
|
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 {
|
pub(crate) fn get(bpf_jit: bool) -> Builtins {
|
||||||
Builtins {
|
Builtins {
|
||||||
genesis_builtins: genesis_builtins(bpf_jit),
|
genesis_builtins: genesis_builtins(bpf_jit),
|
||||||
feature_builtins: feature_builtins(bpf_jit),
|
feature_builtins: feature_builtins(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1425,6 +1425,7 @@ fn test_mainnet_beta_cluster_type() {
|
||||||
&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(),
|
&solana_sdk::bpf_loader::id(),
|
||||||
|
&solana_sdk::bpf_loader_upgradeable::id(),
|
||||||
]
|
]
|
||||||
.iter()
|
.iter()
|
||||||
{
|
{
|
||||||
|
@ -1440,7 +1441,7 @@ 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_upgradeable::id()].iter() {
|
for program_id in [].iter() {
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
(
|
(
|
||||||
program_id,
|
program_id,
|
||||||
|
|
|
@ -75,10 +75,6 @@ pub mod filter_stake_delegation_accounts {
|
||||||
solana_sdk::declare_id!("GE7fRxmW46K6EmCD9AMZSbnaJ2e3LfqCZzdHi9hmYAgi");
|
solana_sdk::declare_id!("GE7fRxmW46K6EmCD9AMZSbnaJ2e3LfqCZzdHi9hmYAgi");
|
||||||
}
|
}
|
||||||
|
|
||||||
pub mod bpf_loader_upgradeable_program {
|
|
||||||
solana_sdk::declare_id!("FbhK8HN9qvNHvJcoFVHAEUCNkagHvu7DTWzdnLuVQ5u4");
|
|
||||||
}
|
|
||||||
|
|
||||||
pub mod stake_program_v3 {
|
pub mod stake_program_v3 {
|
||||||
solana_sdk::declare_id!("Ego6nTu7WsBcZBvVqJQKp6Yku2N3mrfG8oYCfaLZkAeK");
|
solana_sdk::declare_id!("Ego6nTu7WsBcZBvVqJQKp6Yku2N3mrfG8oYCfaLZkAeK");
|
||||||
}
|
}
|
||||||
|
@ -203,7 +199,6 @@ lazy_static! {
|
||||||
(stake_program_v2::id(), "solana_stake_program v2"),
|
(stake_program_v2::id(), "solana_stake_program v2"),
|
||||||
(rewrite_stake::id(), "rewrite stake"),
|
(rewrite_stake::id(), "rewrite stake"),
|
||||||
(filter_stake_delegation_accounts::id(), "filter stake_delegation_accounts #14062"),
|
(filter_stake_delegation_accounts::id(), "filter stake_delegation_accounts #14062"),
|
||||||
(bpf_loader_upgradeable_program::id(), "upgradeable bpf loader"),
|
|
||||||
(stake_program_v3::id(), "solana_stake_program v3"),
|
(stake_program_v3::id(), "solana_stake_program v3"),
|
||||||
(require_custodian_for_locked_stake_authorize::id(), "require custodian to authorize withdrawer change for locked stake"),
|
(require_custodian_for_locked_stake_authorize::id(), "require custodian to authorize withdrawer change for locked stake"),
|
||||||
(spl_token_v2_self_transfer_fix::id(), "spl-token self-transfer fix"),
|
(spl_token_v2_self_transfer_fix::id(), "spl-token self-transfer fix"),
|
||||||
|
|
Loading…
Reference in New Issue