Make BPF Loader static (#11516)

(cherry picked from commit 7c736f7) # Conflicts: # Cargo.lock # core/Cargo.toml # core/src/lib.rs # core/src/validator.rs # genesis-programs/src/lib.rs # programs/bpf_loader/src/deprecated.rs # programs/bpf_loader/src/lib.rs # sdk/src/entrypoint_native.rs # sdk/src/lib.rs
solana-labs · Aug 21, 2020 · 1e74584 · 1e74584
1 parent cdf6ff7
commit 1e74584
Show file tree

Hide file tree

Showing 21 changed files with 837 additions and 516 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -43,6 +43,7 @@ regex = "1.3.9"
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
+<<<<<<< HEAD
 solana-account-decoder = { path = "../account-decoder", version = "1.3.5" }
 solana-banks-server = { path = "../banks-server", version = "1.3.5" }
 solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.3.5" }
@@ -70,6 +71,33 @@ solana-version = { path = "../version", version = "1.3.5" }
 solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
 solana-vote-signer = { path = "../vote-signer", version = "1.3.5" }
 spl-token-v1-0 = { package = "spl-token", version = "1.0.8", features = ["skip-no-mangle"] }
+=======
+solana-account-decoder = { path = "../account-decoder", version = "1.4.0" }
+solana-banks-server = { path = "../banks-server", version = "1.4.0" }
+solana-clap-utils = { path = "../clap-utils", version = "1.4.0" }
+solana-client = { path = "../client", version = "1.4.0" }
+solana-faucet = { path = "../faucet", version = "1.4.0" }
+solana-genesis-programs = { path = "../genesis-programs", version = "1.4.0" }
+solana-ledger = { path = "../ledger", version = "1.4.0" }
+solana-logger = { path = "../logger", version = "1.4.0" }
+solana-merkle-tree = { path = "../merkle-tree", version = "1.4.0" }
+solana-metrics = { path = "../metrics", version = "1.4.0" }
+solana-measure = { path = "../measure", version = "1.4.0" }
+solana-net-utils = { path = "../net-utils", version = "1.4.0" }
+solana-perf = { path = "../perf", version = "1.4.0" }
+solana-runtime = { path = "../runtime", version = "1.4.0" }
+solana-sdk = { path = "../sdk", version = "1.4.0" }
+solana-sdk-macro-frozen-abi = { path = "../sdk/macro-frozen-abi", version = "1.4.0" }
+solana-stake-program = { path = "../programs/stake", version = "1.4.0" }
+solana-storage-bigtable = { path = "../storage-bigtable", version = "1.4.0" }
+solana-streamer = { path = "../streamer", version = "1.4.0" }
+solana-sys-tuner = { path = "../sys-tuner", version = "1.4.0" }
+solana-transaction-status = { path = "../transaction-status", version = "1.4.0" }
+solana-version = { path = "../version", version = "1.4.0" }
+solana-vote-program = { path = "../programs/vote", version = "1.4.0" }
+solana-vote-signer = { path = "../vote-signer", version = "1.4.0" }
+spl-token-v1-0 = { package = "spl-token", version = "1.0.6", features = ["skip-no-mangle"] }
+>>>>>>> 7c736f71f... Make BPF Loader static (#11516)
 tempfile = "3.1.0"
 thiserror = "1.0"
 tokio_01 = { version = "0.1", package = "tokio" }

diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -73,12 +73,15 @@ pub mod weighted_shuffle;
 pub mod window_service;
 
 #[macro_use]
+<<<<<<< HEAD
 extern crate solana_bpf_loader_program;
 
 #[macro_use]
 extern crate solana_budget_program;
 
 #[macro_use]
+=======
+>>>>>>> 7c736f71f... Make BPF Loader static (#11516)
 extern crate log;
 
 #[macro_use]

diff --git a/core/src/validator.rs b/core/src/validator.rs
@@ -868,13 +868,16 @@ impl TestValidator {
             42,
             bootstrap_validator_lamports,
         );
+<<<<<<< HEAD
         genesis_config
             .native_instruction_processors
             .push(solana_budget_program!());
         genesis_config
             .native_instruction_processors
             .push(solana_bpf_loader_program!());
 
+=======
+>>>>>>> 7c736f71f... Make BPF Loader static (#11516)
         genesis_config.rent.lamports_per_byte_year = 1;
         genesis_config.rent.exemption_threshold = 1.0;
         genesis_config.fee_rate_governor = FeeRateGovernor::new(fees, 0);

diff --git a/genesis-programs/src/lib.rs b/genesis-programs/src/lib.rs
@@ -1,7 +1,3 @@
-use solana_sdk::{
-    clock::Epoch, genesis_config::OperatingMode, inflation::Inflation, pubkey::Pubkey,
-};
-
 #[macro_use]
 extern crate solana_bpf_loader_program;
 #[macro_use]
@@ -13,6 +9,10 @@ extern crate solana_vest_program;
 
 use log::*;
 use solana_runtime::bank::{Bank, EnteredEpochCallback};
+use solana_sdk::{
+    clock::Epoch, entrypoint_native::ProcessInstructionWithContext, genesis_config::OperatingMode,
+    inflation::Inflation, pubkey::Pubkey,
+};
 
 pub fn get_inflation(operating_mode: OperatingMode, epoch: Epoch) -> Option<Inflation> {
     match operating_mode {
@@ -45,23 +45,42 @@ pub fn get_inflation(operating_mode: OperatingMode, epoch: Epoch) -> Option<Infl
     }
 }
 
-pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(String, Pubkey)>> {
+enum Program {
+    Native((String, Pubkey)),
+    BuiltinLoader((String, Pubkey, ProcessInstructionWithContext)),
+}
+
+fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<Program>> {
     match operating_mode {
         OperatingMode::Development => {
             if epoch == 0 {
                 Some(vec![
+<<<<<<< HEAD
                     // Enable all Stable programs
                     solana_bpf_loader_program!(),
                     solana_vest_program!(),
                     // Programs that are only available in Development mode
                     solana_budget_program!(),
                     solana_exchange_program!(),
                 ])
+=======
+                    Program::BuiltinLoader(solana_bpf_loader_program!()),
+                    Program::BuiltinLoader(solana_bpf_loader_deprecated_program!()),
+                    Program::Native(solana_vest_program!()),
+                    Program::Native(solana_budget_program!()),
+                    Program::Native(solana_exchange_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 network update.
+                Some(vec![Program::BuiltinLoader(solana_bpf_loader_program!())])
+>>>>>>> 7c736f71f... Make BPF Loader static (#11516)
             } else {
                 None
             }
         }
         OperatingMode::Stable => {
+<<<<<<< HEAD
             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.
@@ -70,39 +89,85 @@ pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(
                 // The epoch of std::u64::MAX is a placeholder and is expected to be reduced in a
                 // future hard fork.
                 Some(vec![solana_vest_program!()])
+=======
+            if epoch == std::u64::MAX {
+                // The epoch of std::u64::MAX is a placeholder and is expected
+                // to be reduced in a future network update.
+                Some(vec![
+                    Program::BuiltinLoader(solana_bpf_loader_program!()),
+                    Program::Native(solana_vest_program!()),
+                ])
+>>>>>>> 7c736f71f... Make BPF Loader static (#11516)
             } else {
                 None
             }
         }
         OperatingMode::Preview => {
+<<<<<<< HEAD
             if epoch == 0 {
                 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.
                 Some(vec![solana_vest_program!()])
+=======
+            if epoch == std::u64::MAX {
+                // The epoch of std::u64::MAX is a placeholder and is expected
+                // to be reduced in a future network update.
+                Some(vec![
+                    Program::BuiltinLoader(solana_bpf_loader_program!()),
+                    Program::Native(solana_vest_program!()),
+                ])
+>>>>>>> 7c736f71f... Make BPF Loader static (#11516)
             } else {
                 None
             }
         }
     }
 }
 
+pub fn get_native_programs(
+    operating_mode: OperatingMode,
+    epoch: Epoch,
+) -> Option<Vec<(String, Pubkey)>> {
+    match get_programs(operating_mode, epoch) {
+        Some(programs) => {
+            let mut native_programs = vec![];
+            for program in programs {
+                if let Program::Native((string, key)) = program {
+                    native_programs.push((string, key));
+                }
+            }
+            Some(native_programs)
+        }
+        None => None,
+    }
+}
+
 pub fn get_entered_epoch_callback(operating_mode: OperatingMode) -> EnteredEpochCallback {
     Box::new(move |bank: &mut Bank| {
-        info!(
-            "Entering epoch {} with operating_mode {:?}",
-            bank.epoch(),
-            operating_mode
-        );
         if let Some(inflation) = get_inflation(operating_mode, bank.epoch()) {
             info!("Entering new epoch with inflation {:?}", inflation);
             bank.set_inflation(inflation);
         }
-        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.add_native_program(name, program_id);
+        if let Some(programs) = get_programs(operating_mode, bank.epoch()) {
+            for program in programs {
+                match program {
+                    Program::Native((name, program_id)) => {
+                        bank.add_native_program(&name, &program_id);
+                    }
+                    Program::BuiltinLoader((
+                        name,
+                        program_id,
+                        process_instruction_with_context,
+                    )) => {
+                        bank.add_builtin_loader(
+                            &name,
+                            program_id,
+                            process_instruction_with_context,
+                        );
+                    }
+                }
             }
         }
         if OperatingMode::Stable == operating_mode {
@@ -121,8 +186,13 @@ mod tests {
     #[test]
     fn test_id_uniqueness() {
         let mut unique = HashSet::new();
-        let ids = get_programs(OperatingMode::Development, 0).unwrap();
-        assert!(ids.into_iter().all(move |id| unique.insert(id)));
+        let programs = get_programs(OperatingMode::Development, 0).unwrap();
+        for program in programs {
+            match program {
+                Program::Native((name, id)) => assert!(unique.insert((name, id))),
+                Program::BuiltinLoader((name, id, _)) => assert!(unique.insert((name, id))),
+            }
+        }
     }
 
     #[test]
@@ -140,7 +210,18 @@ mod tests {
             get_programs(OperatingMode::Development, 0).unwrap().len(),
             4
         );
-        assert_eq!(get_programs(OperatingMode::Development, 1), None);
+        assert!(get_programs(OperatingMode::Development, 1).is_none());
+    }
+
+    #[test]
+    fn test_native_development_programs() {
+        assert_eq!(
+            get_native_programs(OperatingMode::Development, 0)
+                .unwrap()
+                .len(),
+            3
+        );
+        assert!(get_native_programs(OperatingMode::Development, 1).is_none());
     }
 
     #[test]
@@ -158,8 +239,12 @@ mod tests {
 
     #[test]
     fn test_softlaunch_programs() {
+<<<<<<< HEAD
         assert_eq!(get_programs(OperatingMode::Stable, 1), None);
         assert!(get_programs(OperatingMode::Stable, std::u64::MAX - 1).is_some());
+=======
+        assert!(get_programs(OperatingMode::Stable, 1).is_none());
+>>>>>>> 7c736f71f... Make BPF Loader static (#11516)
         assert!(get_programs(OperatingMode::Stable, std::u64::MAX).is_some());
     }
 }
diff --git a/genesis/src/main.rs b/genesis/src/main.rs
@@ -468,7 +468,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
     );
 
     let native_instruction_processors =
-        solana_genesis_programs::get_programs(operating_mode, 0).unwrap_or_else(Vec::new);
+        solana_genesis_programs::get_native_programs(operating_mode, 0).unwrap_or_else(Vec::new);
     let inflation = solana_genesis_programs::get_inflation(operating_mode, 0).unwrap();
 
     let mut genesis_config = GenesisConfig {

diff --git a/ledger/src/blockstore_processor.rs b/ledger/src/blockstore_processor.rs
@@ -325,11 +325,11 @@ pub fn process_blockstore(
     }
 
     // Setup bank for slot 0
-    let bank0 = Arc::new(Bank::new_with_paths(
-        &genesis_config,
-        account_paths,
-        &opts.frozen_accounts,
-    ));
+    let mut bank0 = Bank::new_with_paths(&genesis_config, account_paths, &opts.frozen_accounts);
+    let callback =
+        solana_genesis_programs::get_entered_epoch_callback(genesis_config.operating_mode);
+    callback(&mut bank0);
+    let bank0 = Arc::new(bank0);
     info!("processing ledger for slot 0...");
     let recyclers = VerifyRecyclers::default();
     process_bank_0(&bank0, blockstore, &opts, &recyclers)?;

diff --git a/local-cluster/src/local_cluster.rs b/local-cluster/src/local_cluster.rs
@@ -172,7 +172,7 @@ impl LocalCluster {
         match genesis_config.operating_mode {
             OperatingMode::Stable | OperatingMode::Preview => {
                 genesis_config.native_instruction_processors =
-                    solana_genesis_programs::get_programs(genesis_config.operating_mode, 0)
+                    solana_genesis_programs::get_native_programs(genesis_config.operating_mode, 0)
                         .unwrap_or_default()
             }
             _ => (),

diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock