Refactor - Merges BuiltinPrograms into LoadedPrograms (#31654)

* Merges BuiltinPrograms into LoadedPrograms. * Prevents built-ins from being pruned.
solana-labs · May 18, 2023 · 520c647 · 520c647
1 parent a57fe0c
commit 520c647
Show file tree

Hide file tree

Showing 16 changed files with 369 additions and 551 deletions.
diff --git a/ledger-tool/src/program.rs b/ledger-tool/src/program.rs
@@ -531,12 +531,7 @@ pub fn program(ledger_path: &Path, matches: &ArgMatches<'_>) {
         AccountSharedData::new(0, 0, &loader_id),
     ));
     let interpreted = matches.value_of("mode").unwrap() != "jit";
-    with_mock_invoke_context!(
-        invoke_context,
-        transaction_context,
-        transaction_accounts,
-        bank.get_builtin_programs()
-    );
+    with_mock_invoke_context!(invoke_context, transaction_context, transaction_accounts);
 
     // Adding `DELAY_VISIBILITY_SLOT_OFFSET` to slots to accommodate for delay visibility of the program
     let mut loaded_programs =

diff --git a/ledger/src/blockstore_processor.rs b/ledger/src/blockstore_processor.rs
@@ -1840,7 +1840,7 @@ pub mod tests {
         matches::assert_matches,
         rand::{thread_rng, Rng},
         solana_entry::entry::{create_ticks, next_entry, next_entry_mut},
-        solana_program_runtime::{builtin_program::create_builtin, declare_process_instruction},
+        solana_program_runtime::declare_process_instruction,
         solana_runtime::{
             genesis_utils::{
                 self, create_genesis_config_with_vote_accounts, ValidatorVoteKeypairs,
@@ -3002,10 +3002,7 @@ pub mod tests {
         let mock_program_id = solana_sdk::pubkey::new_rand();
 
         let mut bank = Bank::new_for_tests(&genesis_config);
-        bank.add_builtin(
-            mock_program_id,
-            create_builtin("mockup".to_string(), mock_processor_ok),
-        );
+        bank.add_mockup_builtin(mock_program_id, mock_processor_ok);
 
         let tx = Transaction::new_signed_with_payer(
             &[Instruction::new_with_bincode(
@@ -3046,10 +3043,7 @@ pub mod tests {
 
         (0..get_instruction_errors().len()).for_each(|err| {
             let mut bank = Bank::new_for_tests(&genesis_config);
-            bank.add_builtin(
-                mock_program_id,
-                create_builtin("mockup".to_string(), mock_processor_err),
-            );
+            bank.add_mockup_builtin(mock_program_id, mock_processor_err);
 
             let tx = Transaction::new_signed_with_payer(
                 &[Instruction::new_with_bincode(

diff --git a/program-runtime/src/builtin_program.rs b/program-runtime/src/builtin_program.rs