From fc5fcd6cd4f71623caba9c0d702e1c13340beb57 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Sun, 3 Mar 2019 10:12:36 -0700 Subject: [PATCH] Move native_loader into solana_runtime --- Cargo.lock | 15 ++------------ Cargo.toml | 1 - programs/bpf/Cargo.toml | 1 - programs/native_loader/Cargo.toml | 20 ------------------- runtime/Cargo.toml | 3 ++- runtime/src/lib.rs | 1 + .../lib.rs => runtime/src/native_loader.rs | 0 runtime/src/runtime.rs | 5 ++--- 8 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 programs/native_loader/Cargo.toml rename programs/native_loader/src/lib.rs => runtime/src/native_loader.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index f1fb54c03..c17773926 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2034,7 +2034,6 @@ dependencies = [ "solana 0.12.0", "solana-bpfloader 0.12.0", "solana-logger 0.12.0", - "solana-native-loader 0.12.0", "solana-runtime 0.12.0", "solana-sdk 0.12.0", ] @@ -2193,17 +2192,6 @@ dependencies = [ "sys-info 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "solana-native-loader" -version = "0.12.0" -dependencies = [ - "bincode 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)", - "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 0.12.0", -] - [[package]] name = "solana-netutil" version = "0.12.0" @@ -2272,6 +2260,8 @@ dependencies = [ "bv 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)", + "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2281,7 +2271,6 @@ dependencies = [ "solana-budget-api 0.12.0", "solana-logger 0.12.0", "solana-metrics 0.12.0", - "solana-native-loader 0.12.0", "solana-sdk 0.12.0", "solana-system-program 0.12.0", "solana-vote-api 0.12.0", diff --git a/Cargo.toml b/Cargo.toml index 7d36111cd..bf6329aaf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,7 +76,6 @@ members = [ "programs/budget_api", "programs/token", "programs/failure", - "programs/native_loader", "programs/noop", "programs/rewards", "programs/rewards_api", diff --git a/programs/bpf/Cargo.toml b/programs/bpf/Cargo.toml index 0f1da2c9d..d9cd67298 100644 --- a/programs/bpf/Cargo.toml +++ b/programs/bpf/Cargo.toml @@ -21,6 +21,5 @@ erasure = ["solana/erasure"] solana = { path = "../../core", version = "0.12.0" } solana-bpfloader = { path = "../bpf_loader", version = "0.12.0" } solana-logger = { path = "../../logger", version = "0.12.0" } -solana-native-loader = { path = "../native_loader", version = "0.12.0" } solana-runtime = { path = "../../runtime", version = "0.12.0" } solana-sdk = { path = "../../sdk", version = "0.12.0" } diff --git a/programs/native_loader/Cargo.toml b/programs/native_loader/Cargo.toml deleted file mode 100644 index 50590b485..000000000 --- a/programs/native_loader/Cargo.toml +++ /dev/null @@ -1,20 +0,0 @@ -[package] -name = "solana-native-loader" -version = "0.12.0" -description = "Solana Native Loader" -authors = ["Solana Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solana.com/" -edition = "2018" - -[dependencies] -bincode = "1.1.2" -libc = "0.2.49" -libloading = "0.5.0" -log = "0.4.2" -solana-sdk = { path = "../../sdk", version = "0.12.0" } - -[lib] -name = "solana_native_loader" -crate-type = ["lib"] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 549d3aa3b..f32582b09 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -13,6 +13,8 @@ bincode = "1.1.2" bv = { version = "0.11.0", features = ["serde"] } fnv = "1.0.6" hashbrown = "0.1.8" +libc = "0.2.49" +libloading = "0.5.0" log = "0.4.2" memmap = "0.6.2" rand = "0.6.5" @@ -23,7 +25,6 @@ solana-budget-api = { path = "../programs/budget_api", version = "0.12.0" } solana-logger = { path = "../logger", version = "0.12.0" } solana-metrics = { path = "../metrics", version = "0.12.0" } solana-sdk = { path = "../sdk", version = "0.12.0" } -solana-native-loader = { path = "../programs/native_loader", version = "0.12.0" } solana-system-program = { path = "../programs/system", version = "0.12.0" } solana-vote-api = { path = "../programs/vote_api", version = "0.12.0" } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 06876f3c3..32fdf10e0 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -4,6 +4,7 @@ pub mod bank; pub mod bloom; mod hash_queue; pub mod loader_utils; +mod native_loader; mod runtime; mod status_cache; diff --git a/programs/native_loader/src/lib.rs b/runtime/src/native_loader.rs similarity index 100% rename from programs/native_loader/src/lib.rs rename to runtime/src/native_loader.rs diff --git a/runtime/src/runtime.rs b/runtime/src/runtime.rs index 6d0d9d4de..ba806df4c 100644 --- a/runtime/src/runtime.rs +++ b/runtime/src/runtime.rs @@ -1,10 +1,9 @@ -use solana_native_loader; +use crate::native_loader; use solana_sdk::account::{create_keyed_accounts, Account, KeyedAccount}; use solana_sdk::native_program::ProgramError; use solana_sdk::pubkey::Pubkey; use solana_sdk::system_program; use solana_sdk::transaction::Transaction; -use solana_system_program; /// Reasons the runtime might have rejected a transaction. #[derive(Debug, PartialEq, Eq, Clone)] @@ -46,7 +45,7 @@ fn process_instruction( tick_height, ) } else { - solana_native_loader::entrypoint( + native_loader::entrypoint( &program_id, &mut keyed_accounts, &tx.instructions[instruction_index].userdata,