Make default programs static (#9717)

(cherry picked from commit efad193) # Conflicts: # Cargo.lock # genesis-programs/Cargo.toml # programs/bpf/Cargo.lock # programs/librapay/Cargo.lock # programs/librapay/src/librapay_transaction.rs # runtime/Cargo.toml # runtime/src/genesis_utils.rs # runtime/src/message_processor.rs
solana-labs · Apr 30, 2020 · 1476344 · 1476344
1 parent a8eb935
commit 1476344
Show file tree

Hide file tree

Showing 34 changed files with 631 additions and 146 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bench-exchange/tests/bench_exchange.rs b/bench-exchange/tests/bench_exchange.rs
@@ -86,7 +86,7 @@ fn test_exchange_bank_client() {
     solana_logger::setup();
     let (genesis_config, identity) = create_genesis_config(100_000_000_000_000);
     let mut bank = Bank::new(&genesis_config);
-    bank.add_instruction_processor(id(), process_instruction);
+    bank.add_static_program("exchange_program", id(), process_instruction);
     let clients = vec![BankClient::new(bank)];
 
     let mut config = Config::default();

diff --git a/genesis-programs/Cargo.toml b/genesis-programs/Cargo.toml
@@ -10,6 +10,7 @@ edition = "2018"
 
 [dependencies]
 log = { version = "0.4.8" }
+<<<<<<< HEAD
 solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.1.8" }
 solana-budget-program = { path = "../programs/budget", version = "1.1.8" }
 solana-config-program = { path = "../programs/config", version = "1.1.8" }
@@ -20,6 +21,15 @@ solana-stake-program = { path = "../programs/stake", version = "1.1.8" }
 solana-storage-program = { path = "../programs/storage", version = "1.1.8" }
 solana-vest-program = { path = "../programs/vest", version = "1.1.8" }
 solana-vote-program = { path = "../programs/vote", version = "1.1.8" }
+=======
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.2.0" }
+solana-budget-program = { path = "../programs/budget", version = "1.2.0" }
+solana-exchange-program = { path = "../programs/exchange", version = "1.2.0" }
+solana-runtime = { path = "../runtime", version = "1.2.0" }
+solana-sdk = { path = "../sdk", version = "1.2.0" }
+solana-storage-program = { path = "../programs/storage", version = "1.2.0" }
+solana-vest-program = { path = "../programs/vest", version = "1.2.0" }
+>>>>>>> efad19318... Make default programs static (#9717)
 
 [lib]
 crate-type = ["lib"]

diff --git a/genesis-programs/src/lib.rs b/genesis-programs/src/lib.rs
@@ -1,24 +1,18 @@
 use solana_sdk::{
     clock::Epoch, genesis_config::OperatingMode, inflation::Inflation,
-    move_loader::solana_move_loader_program, pubkey::Pubkey, system_program::solana_system_program,
+    move_loader::solana_move_loader_program, pubkey::Pubkey,
 };
 
 #[macro_use]
 extern crate solana_bpf_loader_program;
 #[macro_use]
 extern crate solana_budget_program;
 #[macro_use]
-extern crate solana_config_program;
-#[macro_use]
 extern crate solana_exchange_program;
 #[macro_use]
-extern crate solana_stake_program;
-#[macro_use]
 extern crate solana_storage_program;
 #[macro_use]
 extern crate solana_vest_program;
-#[macro_use]
-extern crate solana_vote_program;
 
 use log::*;
 use solana_runtime::bank::{Bank, EnteredEpochCallback};
@@ -56,12 +50,8 @@ pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(
                 Some(vec![
                     // Enable all Stable programs
                     solana_bpf_loader_program!(),
-                    solana_config_program!(),
-                    solana_stake_program!(),
                     solana_storage_program!(),
-                    solana_system_program(),
                     solana_vest_program!(),
-                    solana_vote_program!(),
                     // Programs that are only available in Development mode
                     solana_budget_program!(),
                     solana_exchange_program!(),
@@ -72,14 +62,7 @@ pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(
             }
         }
         OperatingMode::Stable => {
-            if epoch == 0 {
-                Some(vec![
-                    solana_config_program!(),
-                    solana_stake_program!(),
-                    solana_system_program(),
-                    solana_vote_program!(),
-                ])
-            } else if epoch == std::u64::MAX - 1 {
+            if epoch == std::u64::MAX - 1 {
                 // The epoch of std::u64::MAX - 1 is a placeholder and is expected to be reduced in
                 // a future hard fork.
                 Some(vec![solana_bpf_loader_program!()])
@@ -93,13 +76,7 @@ pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(
         }
         OperatingMode::Preview => {
             if epoch == 0 {
-                Some(vec![
-                    solana_config_program!(),
-                    solana_stake_program!(),
-                    solana_system_program(),
-                    solana_vote_program!(),
-                    solana_bpf_loader_program!(),
-                ])
+                Some(vec![solana_bpf_loader_program!()])
             } else if epoch == std::u64::MAX {
                 // The epoch of std::u64::MAX is a placeholder and is expected to be reduced in a
                 // future hard fork.
@@ -124,7 +101,7 @@ pub fn get_entered_epoch_callback(operating_mode: OperatingMode) -> EnteredEpoch
         if let Some(new_programs) = get_programs(operating_mode, bank.epoch()) {
             for (name, program_id) in new_programs.iter() {
                 info!("Registering {} at {}", name, program_id);
-                bank.register_native_instruction_processor(name, program_id);
+                bank.add_native_program(name, program_id);
             }
         }
     })
@@ -155,7 +132,7 @@ mod tests {
     fn test_development_programs() {
         assert_eq!(
             get_programs(OperatingMode::Development, 0).unwrap().len(),
-            10
+            6
         );
         assert_eq!(get_programs(OperatingMode::Development, 1), None);
     }
@@ -175,15 +152,6 @@ mod tests {
 
     #[test]
     fn test_softlaunch_programs() {
-        assert_eq!(
-            get_programs(OperatingMode::Stable, 0),
-            Some(vec![
-                solana_config_program!(),
-                solana_stake_program!(),
-                solana_system_program(),
-                solana_vote_program!(),
-            ])
-        );
         assert_eq!(get_programs(OperatingMode::Stable, 1), None);
         assert!(get_programs(OperatingMode::Stable, std::u64::MAX - 1).is_some());
         assert!(get_programs(OperatingMode::Stable, std::u64::MAX).is_some());

diff --git a/genesis/src/main.rs b/genesis/src/main.rs
@@ -438,7 +438,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
     );
 
     let native_instruction_processors =
-        solana_genesis_programs::get_programs(operating_mode, 0).unwrap();
+        solana_genesis_programs::get_programs(operating_mode, 0).unwrap_or_else(|| vec![]);
     let inflation = solana_genesis_programs::get_inflation(operating_mode, 0).unwrap();
 
     let mut genesis_config = GenesisConfig {

diff --git a/ledger/src/snapshot_utils.rs b/ledger/src/snapshot_utils.rs
@@ -621,8 +621,8 @@ where
                 stream.by_ref(),
                 &append_vecs_path,
             )?;
-
             bank.set_bank_rc(rc, bank::StatusCacheRc::default());
+            bank.finish_init();
             Ok(bank)
         },
     )?;

diff --git a/local-cluster/src/local_cluster.rs b/local-cluster/src/local_cluster.rs
@@ -169,9 +169,7 @@ impl LocalCluster {
             OperatingMode::Stable | OperatingMode::Preview => {
                 genesis_config.native_instruction_processors =
                     solana_genesis_programs::get_programs(genesis_config.operating_mode, 0)
-                        .unwrap()
-                        .into_iter()
-                        .collect()
+                        .unwrap_or_else(|| vec![])
             }
             OperatingMode::Development => {
                 genesis_config

diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/programs/budget/src/budget_processor.rs b/programs/budget/src/budget_processor.rs
@@ -238,7 +238,7 @@ mod tests {
     fn create_bank(lamports: u64) -> (Bank, Keypair) {
         let (genesis_config, mint_keypair) = create_genesis_config(lamports);
         let mut bank = Bank::new(&genesis_config);
-        bank.add_instruction_processor(id(), process_instruction);
+        bank.add_static_program("budget_program", id(), process_instruction);
         (bank, mint_keypair)
     }
 

diff --git a/programs/config/Cargo.toml b/programs/config/Cargo.toml
@@ -18,7 +18,7 @@ solana-logger = { path = "../../logger", version = "1.1.8" }
 solana-sdk = { path = "../../sdk", version = "1.1.8" }
 
 [lib]
-crate-type = ["lib", "cdylib"]
+crate-type = ["lib"]
 name = "solana_config_program"
 
 [package.metadata.docs.rs]

diff --git a/programs/config/src/lib.rs b/programs/config/src/lib.rs
@@ -2,16 +2,11 @@ pub mod config_instruction;
 pub mod config_processor;
 pub mod date_instruction;
 
-use crate::config_processor::process_instruction;
 use bincode::{deserialize, serialize, serialized_size};
 use serde_derive::{Deserialize, Serialize};
 use solana_sdk::{account::Account, pubkey::Pubkey, short_vec};
 
-solana_sdk::declare_program!(
-    "Config1111111111111111111111111111111111111",
-    solana_config_program,
-    process_instruction
-);
+solana_sdk::declare_id!("Config1111111111111111111111111111111111111");
 
 pub trait ConfigState: serde::Serialize + Default {
     /// Maximum space that the serialized representation will require

diff --git a/programs/exchange/src/exchange_processor.rs b/programs/exchange/src/exchange_processor.rs
@@ -577,7 +577,7 @@ mod test {
     fn create_bank(lamports: u64) -> (Bank, Keypair) {
         let (genesis_config, mint_keypair) = create_genesis_config(lamports);
         let mut bank = Bank::new(&genesis_config);
-        bank.add_instruction_processor(id(), process_instruction);
+        bank.add_static_program("excahnge_program", id(), process_instruction);
         (bank, mint_keypair)
     }
 

diff --git a/programs/failure/tests/failure.rs b/programs/failure/tests/failure.rs
@@ -13,7 +13,7 @@ fn test_program_native_failure() {
     let (genesis_config, alice_keypair) = create_genesis_config(50);
     let program_id = Pubkey::new_rand();
     let bank = Bank::new(&genesis_config);
-    bank.register_native_instruction_processor("solana_failure_program", &program_id);
+    bank.add_native_program("solana_failure_program", &program_id);
 
     // Call user program
     let instruction = create_invoke_instruction(alice_keypair.pubkey(), program_id, &1u8);

diff --git a/programs/librapay/Cargo.lock b/programs/librapay/Cargo.lock
diff --git a/programs/librapay/src/librapay_transaction.rs b/programs/librapay/src/librapay_transaction.rs
@@ -161,11 +161,16 @@ mod tests {
     fn create_bank(lamports: u64) -> (Arc<Bank>, Keypair, Keypair, Pubkey, Pubkey) {
         let (mut genesis_config, mint) = create_genesis_config(lamports);
         genesis_config.rent.lamports_per_byte_year = 0;
+<<<<<<< HEAD
         let mut bank = Bank::new(&genesis_config);
         bank.add_instruction_processor(
             solana_sdk::move_loader::id(),
             MoveProcessor::process_instruction,
         );
+=======
+        let bank = Bank::new(&genesis_config);
+        bank.add_native_program("solana_move_loader_program", &solana_sdk::move_loader::id());
+>>>>>>> efad19318... Make default programs static (#9717)
         let shared_bank = Arc::new(bank);
         let bank_client = BankClient::new_shared(&shared_bank);
         let genesis_pubkey = create_genesis(&mint, &bank_client, 1_000_000);

diff --git a/programs/ownable/src/ownable_processor.rs b/programs/ownable/src/ownable_processor.rs
@@ -71,7 +71,7 @@ mod tests {
     fn create_bank(lamports: u64) -> (Bank, Keypair) {
         let (genesis_config, mint_keypair) = create_genesis_config(lamports);
         let mut bank = Bank::new(&genesis_config);
-        bank.add_instruction_processor(crate::id(), process_instruction);
+        bank.add_static_program("ownable_program", crate::id(), process_instruction);
         (bank, mint_keypair)
     }
 

diff --git a/programs/stake/Cargo.toml b/programs/stake/Cargo.toml
@@ -23,7 +23,7 @@ solana-config-program = { path = "../config", version = "1.1.8" }
 thiserror = "1.0"
 
 [lib]
-crate-type = ["lib", "cdylib"]
+crate-type = ["lib"]
 name = "solana_stake_program"
 
 [package.metadata.docs.rs]

diff --git a/programs/stake/src/lib.rs b/programs/stake/src/lib.rs
@@ -4,11 +4,7 @@ pub mod config;
 pub mod stake_instruction;
 pub mod stake_state;
 
-solana_sdk::declare_program!(
-    "Stake11111111111111111111111111111111111111",
-    solana_stake_program,
-    stake_instruction::process_instruction
-);
+solana_sdk::declare_id!("Stake11111111111111111111111111111111111111");
 
 pub fn add_genesis_accounts(genesis_config: &mut GenesisConfig) -> u64 {
     config::add_genesis_account(genesis_config)

diff --git a/programs/vest/src/vest_processor.rs b/programs/vest/src/vest_processor.rs
@@ -161,11 +161,7 @@ mod tests {
     fn create_bank(lamports: u64) -> (Bank, Keypair) {
         let (genesis_config, mint_keypair) = create_genesis_config(lamports);
         let mut bank = Bank::new(&genesis_config);
-        bank.add_instruction_processor(
-            solana_config_program::id(),
-            solana_config_program::config_processor::process_instruction,
-        );
-        bank.add_instruction_processor(id(), process_instruction);
+        bank.add_static_program("vest_program", id(), process_instruction);
         (bank, mint_keypair)
     }
 
@@ -472,7 +468,7 @@ mod tests {
         )
         .unwrap_err();
 
-        // Ensure bob can update which account he wants vested funds transfered to.
+        // Ensure bob can update which account he wants vested funds transferred to.
         bank_client
             .transfer(1, &alice_keypair, &bob_pubkey)
             .unwrap();

diff --git a/programs/vote/Cargo.toml b/programs/vote/Cargo.toml
@@ -21,7 +21,7 @@ solana-sdk = { path = "../../sdk", version = "1.1.8" }
 thiserror = "1.0"
 
 [lib]
-crate-type = ["lib", "cdylib"]
+crate-type = ["lib"]
 name = "solana_vote_program"
 
 [package.metadata.docs.rs]

diff --git a/programs/vote/src/lib.rs b/programs/vote/src/lib.rs
@@ -6,10 +6,4 @@ pub mod vote_transaction;
 #[macro_use]
 extern crate solana_metrics;
 
-use crate::vote_instruction::process_instruction;
-
-solana_sdk::declare_program!(
-    "Vote111111111111111111111111111111111111111",
-    solana_vote_program,
-    process_instruction
-);
+solana_sdk::declare_id!("Vote111111111111111111111111111111111111111");