Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

runtime: migrate stake program to core bpf #3655

Merged
merged 2 commits into from
Nov 20, 2024
Merged

runtime: migrate stake program to core bpf #3655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e67650b
runtime: migrate stake program to core bpf
2501babe Nov 15, 2024
5862de2
Update sdk/feature-set/src/lib.rs
2501babe Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 15 additions & 27 deletions runtime/src/bank/builtins/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,19 @@ pub static BUILTINS: &[BuiltinPrototype] = &[
program_id: solana_vote_program::id(),
entrypoint: solana_vote_program::vote_processor::Entrypoint::vm,
}),
testable_prototype!(BuiltinPrototype {
core_bpf_migration_config: None,
name: stake_program,
BuiltinPrototype {
core_bpf_migration_config: Some(CoreBpfMigrationConfig {
source_buffer_address: buffer_accounts::stake_program::id(),
upgrade_authority_address: None,
feature_id: solana_feature_set::migrate_stake_program_to_core_bpf::id(),
migration_target: core_bpf_migration::CoreBpfMigrationTargetType::Builtin,
datapoint_name: "migrate_builtin_to_core_bpf_stake_program",
}),
name: "stake_program",
enable_feature_id: None,
program_id: solana_stake_program::id(),
entrypoint: solana_stake_program::stake_instruction::Entrypoint::vm,
}),
},
BuiltinPrototype {
core_bpf_migration_config: Some(CoreBpfMigrationConfig {
source_buffer_address: buffer_accounts::config_program::id(),
Expand Down Expand Up @@ -153,6 +159,9 @@ mod buffer_accounts {
pub mod feature_gate_program {
solana_sdk::declare_id!("3D3ydPWvmEszrSjrickCtnyRSJm1rzbbSsZog8Ub6vLh");
}
pub mod stake_program {
solana_sdk::declare_id!("8t3vv6v99tQA6Gp7fVdsBH66hQMaswH5qsJVqJqo8xvG");
}
}

// This module contains a number of arbitrary addresses used for testing Core
Expand Down Expand Up @@ -203,25 +212,6 @@ mod test_only {
};
}

pub mod stake_program {
pub mod feature {
solana_sdk::declare_id!("5gp5YKtNEirX45igBvp39bN6nEwhkNMRS7m2c63D1xPM");
}
pub mod source_buffer {
solana_sdk::declare_id!("2a3XnUr4Xfxd8hBST8wd4D3Qbiu339XKessYsDwabCED");
}
pub mod upgrade_authority {
solana_sdk::declare_id!("F7K7ADSDzReQAgXYL1KE3u1UBjBtytxQ8bke7BF1Uegg");
}
pub const CONFIG: super::CoreBpfMigrationConfig = super::CoreBpfMigrationConfig {
source_buffer_address: source_buffer::id(),
upgrade_authority_address: Some(upgrade_authority::id()),
feature_id: feature::id(),
migration_target: super::CoreBpfMigrationTargetType::Builtin,
datapoint_name: "migrate_builtin_to_core_bpf_stake_program",
};
}

pub mod solana_bpf_loader_deprecated_program {
pub mod feature {
solana_sdk::declare_id!("8gpakCv5Pk5PZGv9RUjzdkk2GVQPGx12cNRUDMQ3bP86");
Expand Down Expand Up @@ -371,10 +361,8 @@ mod tests {
&super::BUILTINS[1].core_bpf_migration_config,
&Some(super::test_only::vote_program::CONFIG)
);
assert_eq!(
&super::BUILTINS[2].core_bpf_migration_config,
&Some(super::test_only::stake_program::CONFIG)
);
// Stake has a live migration config, so it has no test-only configs
// to test here.
// Config has a live migration config, so it has no test-only configs
// to test here.
assert_eq!(
Expand Down
5 changes: 5 additions & 0 deletions sdk/feature-set/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,10 @@ pub mod accounts_lt_hash {
solana_pubkey::declare_id!("LtHaSHHsUge7EWTPVrmpuexKz6uVHZXZL6cgJa7W7Zn");
}

pub mod migrate_stake_program_to_core_bpf {
solana_pubkey::declare_id!("6M4oQ6eXneVhtLoiAr4yRYQY43eVLjrKbiDZDJc892yk");
}

lazy_static! {
/// Map of feature identifiers to user-visible description
pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
Expand Down Expand Up @@ -1104,6 +1108,7 @@ lazy_static! {
(disable_account_loader_special_case::id(), "Disable account loader special case #3513"),
(accounts_lt_hash::id(), "enables lattice-based accounts hash #3333"),
(enable_secp256r1_precompile::id(), "Enable secp256r1 precompile SIMD-0075"),
(migrate_stake_program_to_core_bpf::id(), "Migrate Stake program to Core BPF SIMD-0196 #3655"),
/*************** ADD NEW FEATURES HERE ***************/
]
.iter()
Expand Down
Loading