parent
c576a707b0
commit
57bf618627
|
@ -55,11 +55,11 @@ pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(
|
||||||
if epoch == 0 {
|
if epoch == 0 {
|
||||||
Some(vec![
|
Some(vec![
|
||||||
// Enable all SoftLaunch programs
|
// Enable all SoftLaunch programs
|
||||||
solana_system_program(),
|
|
||||||
solana_bpf_loader_program!(),
|
solana_bpf_loader_program!(),
|
||||||
solana_config_program!(),
|
solana_config_program!(),
|
||||||
solana_stake_program!(),
|
solana_stake_program!(),
|
||||||
solana_storage_program!(),
|
solana_storage_program!(),
|
||||||
|
solana_system_program(),
|
||||||
solana_vest_program!(),
|
solana_vest_program!(),
|
||||||
solana_vote_program!(),
|
solana_vote_program!(),
|
||||||
// Programs that are only available in Development mode
|
// Programs that are only available in Development mode
|
||||||
|
@ -73,25 +73,17 @@ pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(
|
||||||
}
|
}
|
||||||
OperatingMode::SoftLaunch => {
|
OperatingMode::SoftLaunch => {
|
||||||
if epoch == 0 {
|
if epoch == 0 {
|
||||||
// Nonce, Voting, Staking and System Program only at epoch 0
|
|
||||||
Some(vec![
|
Some(vec![
|
||||||
|
solana_config_program!(),
|
||||||
solana_stake_program!(),
|
solana_stake_program!(),
|
||||||
solana_system_program(),
|
solana_system_program(),
|
||||||
solana_vote_program!(),
|
solana_vote_program!(),
|
||||||
])
|
])
|
||||||
} else if epoch == std::u64::MAX - 1 {
|
} else if epoch == std::u64::MAX - 1 {
|
||||||
// Archivers are activated next
|
|
||||||
//
|
|
||||||
// The epoch of std::u64::MAX - 1 is a placeholder and is expected to be reduced in
|
// The epoch of std::u64::MAX - 1 is a placeholder and is expected to be reduced in
|
||||||
// a future hard fork.
|
// a future hard fork.
|
||||||
Some(vec![
|
Some(vec![solana_storage_program!(), solana_vest_program!()])
|
||||||
solana_config_program!(),
|
|
||||||
solana_storage_program!(),
|
|
||||||
solana_vest_program!(),
|
|
||||||
])
|
|
||||||
} else if epoch == std::u64::MAX {
|
} else if epoch == std::u64::MAX {
|
||||||
// Finally 3rd party BPF programs are available
|
|
||||||
//
|
|
||||||
// The epoch of std::u64::MAX is a placeholder and is expected to be reduced in a
|
// The epoch of std::u64::MAX is a placeholder and is expected to be reduced in a
|
||||||
// future hard fork.
|
// future hard fork.
|
||||||
Some(vec![solana_bpf_loader_program!()])
|
Some(vec![solana_bpf_loader_program!()])
|
||||||
|
@ -169,6 +161,7 @@ mod tests {
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
get_programs(OperatingMode::SoftLaunch, 0),
|
get_programs(OperatingMode::SoftLaunch, 0),
|
||||||
Some(vec![
|
Some(vec![
|
||||||
|
solana_config_program!(),
|
||||||
solana_stake_program!(),
|
solana_stake_program!(),
|
||||||
solana_system_program(),
|
solana_system_program(),
|
||||||
solana_vote_program!(),
|
solana_vote_program!(),
|
||||||
|
|
|
@ -572,9 +572,10 @@ fn test_softlaunch_operating_mode() {
|
||||||
|
|
||||||
// Programs that are available at soft launch epoch 0
|
// Programs that are available at soft launch epoch 0
|
||||||
for program_id in [
|
for program_id in [
|
||||||
|
&solana_config_program::id(),
|
||||||
&solana_sdk::system_program::id(),
|
&solana_sdk::system_program::id(),
|
||||||
&solana_vote_program::id(),
|
|
||||||
&solana_stake_program::id(),
|
&solana_stake_program::id(),
|
||||||
|
&solana_vote_program::id(),
|
||||||
]
|
]
|
||||||
.iter()
|
.iter()
|
||||||
{
|
{
|
||||||
|
@ -591,7 +592,6 @@ fn test_softlaunch_operating_mode() {
|
||||||
|
|
||||||
// Programs that are not available at soft launch epoch 0
|
// Programs that are not available at soft launch epoch 0
|
||||||
for program_id in [
|
for program_id in [
|
||||||
&solana_config_program::id(),
|
|
||||||
&solana_sdk::bpf_loader::id(),
|
&solana_sdk::bpf_loader::id(),
|
||||||
&solana_storage_program::id(),
|
&solana_storage_program::id(),
|
||||||
&solana_vest_program::id(),
|
&solana_vest_program::id(),
|
||||||
|
|
Loading…
Reference in New Issue