Move native_loader into solana_runtime
This commit is contained in:
parent
33496ffea2
commit
fc5fcd6cd4
|
@ -2034,7 +2034,6 @@ dependencies = [
|
||||||
"solana 0.12.0",
|
"solana 0.12.0",
|
||||||
"solana-bpfloader 0.12.0",
|
"solana-bpfloader 0.12.0",
|
||||||
"solana-logger 0.12.0",
|
"solana-logger 0.12.0",
|
||||||
"solana-native-loader 0.12.0",
|
|
||||||
"solana-runtime 0.12.0",
|
"solana-runtime 0.12.0",
|
||||||
"solana-sdk 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)",
|
"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]]
|
[[package]]
|
||||||
name = "solana-netutil"
|
name = "solana-netutil"
|
||||||
version = "0.12.0"
|
version = "0.12.0"
|
||||||
|
@ -2272,6 +2260,8 @@ dependencies = [
|
||||||
"bv 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"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)",
|
"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)",
|
"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)",
|
"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)",
|
"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)",
|
"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-budget-api 0.12.0",
|
||||||
"solana-logger 0.12.0",
|
"solana-logger 0.12.0",
|
||||||
"solana-metrics 0.12.0",
|
"solana-metrics 0.12.0",
|
||||||
"solana-native-loader 0.12.0",
|
|
||||||
"solana-sdk 0.12.0",
|
"solana-sdk 0.12.0",
|
||||||
"solana-system-program 0.12.0",
|
"solana-system-program 0.12.0",
|
||||||
"solana-vote-api 0.12.0",
|
"solana-vote-api 0.12.0",
|
||||||
|
|
|
@ -76,7 +76,6 @@ members = [
|
||||||
"programs/budget_api",
|
"programs/budget_api",
|
||||||
"programs/token",
|
"programs/token",
|
||||||
"programs/failure",
|
"programs/failure",
|
||||||
"programs/native_loader",
|
|
||||||
"programs/noop",
|
"programs/noop",
|
||||||
"programs/rewards",
|
"programs/rewards",
|
||||||
"programs/rewards_api",
|
"programs/rewards_api",
|
||||||
|
|
|
@ -21,6 +21,5 @@ erasure = ["solana/erasure"]
|
||||||
solana = { path = "../../core", version = "0.12.0" }
|
solana = { path = "../../core", version = "0.12.0" }
|
||||||
solana-bpfloader = { path = "../bpf_loader", version = "0.12.0" }
|
solana-bpfloader = { path = "../bpf_loader", version = "0.12.0" }
|
||||||
solana-logger = { path = "../../logger", 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-runtime = { path = "../../runtime", version = "0.12.0" }
|
||||||
solana-sdk = { path = "../../sdk", version = "0.12.0" }
|
solana-sdk = { path = "../../sdk", version = "0.12.0" }
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
[package]
|
|
||||||
name = "solana-native-loader"
|
|
||||||
version = "0.12.0"
|
|
||||||
description = "Solana Native Loader"
|
|
||||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
|
||||||
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"]
|
|
|
@ -13,6 +13,8 @@ bincode = "1.1.2"
|
||||||
bv = { version = "0.11.0", features = ["serde"] }
|
bv = { version = "0.11.0", features = ["serde"] }
|
||||||
fnv = "1.0.6"
|
fnv = "1.0.6"
|
||||||
hashbrown = "0.1.8"
|
hashbrown = "0.1.8"
|
||||||
|
libc = "0.2.49"
|
||||||
|
libloading = "0.5.0"
|
||||||
log = "0.4.2"
|
log = "0.4.2"
|
||||||
memmap = "0.6.2"
|
memmap = "0.6.2"
|
||||||
rand = "0.6.5"
|
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-logger = { path = "../logger", version = "0.12.0" }
|
||||||
solana-metrics = { path = "../metrics", version = "0.12.0" }
|
solana-metrics = { path = "../metrics", version = "0.12.0" }
|
||||||
solana-sdk = { path = "../sdk", 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-system-program = { path = "../programs/system", version = "0.12.0" }
|
||||||
solana-vote-api = { path = "../programs/vote_api", version = "0.12.0" }
|
solana-vote-api = { path = "../programs/vote_api", version = "0.12.0" }
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@ pub mod bank;
|
||||||
pub mod bloom;
|
pub mod bloom;
|
||||||
mod hash_queue;
|
mod hash_queue;
|
||||||
pub mod loader_utils;
|
pub mod loader_utils;
|
||||||
|
mod native_loader;
|
||||||
mod runtime;
|
mod runtime;
|
||||||
mod status_cache;
|
mod status_cache;
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
use solana_native_loader;
|
use crate::native_loader;
|
||||||
use solana_sdk::account::{create_keyed_accounts, Account, KeyedAccount};
|
use solana_sdk::account::{create_keyed_accounts, Account, KeyedAccount};
|
||||||
use solana_sdk::native_program::ProgramError;
|
use solana_sdk::native_program::ProgramError;
|
||||||
use solana_sdk::pubkey::Pubkey;
|
use solana_sdk::pubkey::Pubkey;
|
||||||
use solana_sdk::system_program;
|
use solana_sdk::system_program;
|
||||||
use solana_sdk::transaction::Transaction;
|
use solana_sdk::transaction::Transaction;
|
||||||
use solana_system_program;
|
|
||||||
|
|
||||||
/// Reasons the runtime might have rejected a transaction.
|
/// Reasons the runtime might have rejected a transaction.
|
||||||
#[derive(Debug, PartialEq, Eq, Clone)]
|
#[derive(Debug, PartialEq, Eq, Clone)]
|
||||||
|
@ -46,7 +45,7 @@ fn process_instruction(
|
||||||
tick_height,
|
tick_height,
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
solana_native_loader::entrypoint(
|
native_loader::entrypoint(
|
||||||
&program_id,
|
&program_id,
|
||||||
&mut keyed_accounts,
|
&mut keyed_accounts,
|
||||||
&tx.instructions[instruction_index].userdata,
|
&tx.instructions[instruction_index].userdata,
|
||||||
|
|
Loading…
Reference in New Issue