From 2e921437cda72bf742b912a69e6e32043d12addc Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Fri, 4 Oct 2019 16:02:44 -0600 Subject: [PATCH] Rename solana-runtime to sealevel (#6239) automerge --- Cargo.lock | 69 ++++++++++--------- Cargo.toml | 1 + runtime/Cargo.toml | 34 +-------- runtime/lib.rs | 0 runtime/src/lib.rs | 44 ++---------- {runtime => sealevel}/.gitignore | 0 sealevel/Cargo.toml | 48 +++++++++++++ {runtime => sealevel}/benches/accounts.rs | 0 .../benches/accounts_index.rs | 0 {runtime => sealevel}/benches/append_vec.rs | 0 {runtime => sealevel}/benches/bank.rs | 0 {runtime => sealevel}/benches/bloom.rs | 0 .../benches/message_processor.rs | 0 {runtime => sealevel}/benches/status_cache.rs | 0 .../benches/transaction_utils.rs | 0 {runtime => sealevel}/src/accounts.rs | 0 {runtime => sealevel}/src/accounts_db.rs | 0 {runtime => sealevel}/src/accounts_index.rs | 0 {runtime => sealevel}/src/append_vec.rs | 0 {runtime => sealevel}/src/bank.rs | 0 {runtime => sealevel}/src/bank_client.rs | 0 {runtime => sealevel}/src/blockhash_queue.rs | 0 {runtime => sealevel}/src/bloom.rs | 0 {runtime => sealevel}/src/epoch_schedule.rs | 0 {runtime => sealevel}/src/genesis_utils.rs | 0 sealevel/src/lib.rs | 39 +++++++++++ {runtime => sealevel}/src/loader_utils.rs | 0 .../src/message_processor.rs | 0 {runtime => sealevel}/src/native_loader.rs | 0 {runtime => sealevel}/src/rent_collector.rs | 0 {runtime => sealevel}/src/serde_utils.rs | 0 {runtime => sealevel}/src/stakes.rs | 0 {runtime => sealevel}/src/status_cache.rs | 0 {runtime => sealevel}/src/storage_utils.rs | 0 .../src/system_instruction_processor.rs | 0 .../src/transaction_batch.rs | 0 .../src/transaction_utils.rs | 0 {runtime => sealevel}/tests/noop.rs | 6 +- 38 files changed, 135 insertions(+), 106 deletions(-) create mode 100644 runtime/lib.rs rename {runtime => sealevel}/.gitignore (100%) create mode 100644 sealevel/Cargo.toml rename {runtime => sealevel}/benches/accounts.rs (100%) rename {runtime => sealevel}/benches/accounts_index.rs (100%) rename {runtime => sealevel}/benches/append_vec.rs (100%) rename {runtime => sealevel}/benches/bank.rs (100%) rename {runtime => sealevel}/benches/bloom.rs (100%) rename {runtime => sealevel}/benches/message_processor.rs (100%) rename {runtime => sealevel}/benches/status_cache.rs (100%) rename {runtime => sealevel}/benches/transaction_utils.rs (100%) rename {runtime => sealevel}/src/accounts.rs (100%) rename {runtime => sealevel}/src/accounts_db.rs (100%) rename {runtime => sealevel}/src/accounts_index.rs (100%) rename {runtime => sealevel}/src/append_vec.rs (100%) rename {runtime => sealevel}/src/bank.rs (100%) rename {runtime => sealevel}/src/bank_client.rs (100%) rename {runtime => sealevel}/src/blockhash_queue.rs (100%) rename {runtime => sealevel}/src/bloom.rs (100%) rename {runtime => sealevel}/src/epoch_schedule.rs (100%) rename {runtime => sealevel}/src/genesis_utils.rs (100%) create mode 100644 sealevel/src/lib.rs rename {runtime => sealevel}/src/loader_utils.rs (100%) rename {runtime => sealevel}/src/message_processor.rs (100%) rename {runtime => sealevel}/src/native_loader.rs (100%) rename {runtime => sealevel}/src/rent_collector.rs (100%) rename {runtime => sealevel}/src/serde_utils.rs (100%) rename {runtime => sealevel}/src/stakes.rs (100%) rename {runtime => sealevel}/src/status_cache.rs (100%) rename {runtime => sealevel}/src/storage_utils.rs (100%) rename {runtime => sealevel}/src/system_instruction_processor.rs (100%) rename {runtime => sealevel}/src/transaction_batch.rs (100%) rename {runtime => sealevel}/src/transaction_utils.rs (100%) rename {runtime => sealevel}/tests/noop.rs (83%) diff --git a/Cargo.lock b/Cargo.lock index 0161539c1..f3b1574b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2772,6 +2772,43 @@ dependencies = [ "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "sealevel" +version = "0.20.0" +dependencies = [ + "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bv 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (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)", + "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-bpf-loader-api 0.20.0", + "solana-bpf-loader-program 0.20.0", + "solana-logger 0.20.0", + "solana-measure 0.20.0", + "solana-metrics 0.20.0", + "solana-noop-program 0.20.0", + "solana-rayon-threadlimit 0.20.0", + "solana-sdk 0.20.0", + "solana-stake-api 0.20.0", + "solana-stake-program 0.20.0", + "solana-storage-api 0.20.0", + "solana-vote-api 0.20.0", + "solana-vote-program 0.20.0", + "sys-info 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "semver" version = "0.9.0" @@ -3716,37 +3753,7 @@ dependencies = [ name = "solana-runtime" version = "0.20.0" dependencies = [ - "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bv 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (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)", - "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-bpf-loader-api 0.20.0", - "solana-bpf-loader-program 0.20.0", - "solana-logger 0.20.0", - "solana-measure 0.20.0", - "solana-metrics 0.20.0", - "solana-noop-program 0.20.0", - "solana-rayon-threadlimit 0.20.0", - "solana-sdk 0.20.0", - "solana-stake-api 0.20.0", - "solana-stake-program 0.20.0", - "solana-storage-api 0.20.0", - "solana-vote-api 0.20.0", - "solana-vote-program 0.20.0", - "sys-info 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sealevel 0.20.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index cdd3d9a19..84d099e84 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,6 +45,7 @@ members = [ "programs/vest_api", "programs/vote_api", "programs/vote_program", + "sealevel", "replicator", "runtime", "sdk", diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 6c8f55a34..851326250 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -9,40 +9,8 @@ homepage = "https://solana.com/" edition = "2018" [dependencies] -bincode = "1.2.0" -bv = { version = "0.11.0", features = ["serde"] } -byteorder = "1.3.2" -fnv = "1.0.6" -fs_extra = "1.1.0" -lazy_static = "1.4.0" -libc = "0.2.62" -libloading = "0.5.2" -log = "0.4.8" -memmap = "0.6.2" -rand = "0.6.5" -rayon = "1.2.0" -serde = { version = "1.0.101", features = ["rc"] } -serde_derive = "1.0.101" -serde_json = "1.0.41" -solana-logger = { path = "../logger", version = "0.20.0" } -solana-measure = { path = "../measure", version = "0.20.0" } -solana-metrics = { path = "../metrics", version = "0.20.0" } -solana-bpf-loader-api = { path = "../programs/bpf_loader_api", version = "0.20.0" } -solana-bpf-loader-program = { path = "../programs/bpf_loader_program", version = "0.20.0" } -solana-sdk = { path = "../sdk", version = "0.20.0" } -solana-stake-api = { path = "../programs/stake_api", version = "0.20.0" } -solana-stake-program = { path = "../programs/stake_program", version = "0.20.0" } -solana-storage-api = { path = "../programs/storage_api", version = "0.20.0" } -solana-vote-api = { path = "../programs/vote_api", version = "0.20.0" } -solana-vote-program = { path = "../programs/vote_program", version = "0.20.0" } -sys-info = "0.5.8" -tempfile = "3.1.0" -solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.20.0" } -itertools = "0.8.0" +sealevel = { path = "../sealevel", version = "0.20.0" } [lib] crate-type = ["lib"] name = "solana_runtime" - -[dev-dependencies] -solana-noop-program = { path = "../programs/noop_program", version = "0.20.0" } diff --git a/runtime/lib.rs b/runtime/lib.rs new file mode 100644 index 000000000..e69de29bb diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 2c2e454c0..673b95464 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -1,39 +1,5 @@ -pub mod accounts; -pub mod accounts_db; -pub mod accounts_index; -pub mod append_vec; -pub mod bank; -pub mod bank_client; -mod blockhash_queue; -pub mod bloom; -pub mod epoch_schedule; -pub mod genesis_utils; -pub mod loader_utils; -pub mod message_processor; -mod native_loader; -pub mod rent_collector; -mod serde_utils; -pub mod stakes; -pub mod status_cache; -pub mod storage_utils; -mod system_instruction_processor; -pub mod transaction_batch; -pub mod transaction_utils; - -#[macro_use] -extern crate solana_metrics; - -#[macro_use] -extern crate solana_vote_program; - -#[macro_use] -extern crate solana_stake_program; - -#[macro_use] -extern crate solana_bpf_loader_program; - -#[macro_use] -extern crate serde_derive; - -extern crate fs_extra; -extern crate tempfile; +pub use sealevel::{ + accounts, accounts_db, accounts_index, append_vec, bank, bank_client, bloom, epoch_schedule, + genesis_utils, loader_utils, message_processor, rent_collector, stakes, status_cache, + storage_utils, transaction_batch, transaction_utils, +}; diff --git a/runtime/.gitignore b/sealevel/.gitignore similarity index 100% rename from runtime/.gitignore rename to sealevel/.gitignore diff --git a/sealevel/Cargo.toml b/sealevel/Cargo.toml new file mode 100644 index 000000000..79285b2b1 --- /dev/null +++ b/sealevel/Cargo.toml @@ -0,0 +1,48 @@ +[package] +name = "sealevel" +version = "0.20.0" +description = "Sealevel, a deterministic, parallel runtime" +authors = ["Solana Maintainers "] +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" +homepage = "https://solana.com/" +edition = "2018" + +[dependencies] +bincode = "1.2.0" +bv = { version = "0.11.0", features = ["serde"] } +byteorder = "1.3.2" +fnv = "1.0.6" +fs_extra = "1.1.0" +lazy_static = "1.4.0" +libc = "0.2.62" +libloading = "0.5.2" +log = "0.4.8" +memmap = "0.6.2" +rand = "0.6.5" +rayon = "1.2.0" +serde = { version = "1.0.101", features = ["rc"] } +serde_derive = "1.0.101" +serde_json = "1.0.41" +solana-logger = { path = "../logger", version = "0.20.0" } +solana-measure = { path = "../measure", version = "0.20.0" } +solana-metrics = { path = "../metrics", version = "0.20.0" } +solana-bpf-loader-api = { path = "../programs/bpf_loader_api", version = "0.20.0" } +solana-bpf-loader-program = { path = "../programs/bpf_loader_program", version = "0.20.0" } +solana-sdk = { path = "../sdk", version = "0.20.0" } +solana-stake-api = { path = "../programs/stake_api", version = "0.20.0" } +solana-stake-program = { path = "../programs/stake_program", version = "0.20.0" } +solana-storage-api = { path = "../programs/storage_api", version = "0.20.0" } +solana-vote-api = { path = "../programs/vote_api", version = "0.20.0" } +solana-vote-program = { path = "../programs/vote_program", version = "0.20.0" } +sys-info = "0.5.8" +tempfile = "3.1.0" +solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.20.0" } +itertools = "0.8.0" + +[lib] +crate-type = ["lib"] +name = "sealevel" + +[dev-dependencies] +solana-noop-program = { path = "../programs/noop_program", version = "0.20.0" } diff --git a/runtime/benches/accounts.rs b/sealevel/benches/accounts.rs similarity index 100% rename from runtime/benches/accounts.rs rename to sealevel/benches/accounts.rs diff --git a/runtime/benches/accounts_index.rs b/sealevel/benches/accounts_index.rs similarity index 100% rename from runtime/benches/accounts_index.rs rename to sealevel/benches/accounts_index.rs diff --git a/runtime/benches/append_vec.rs b/sealevel/benches/append_vec.rs similarity index 100% rename from runtime/benches/append_vec.rs rename to sealevel/benches/append_vec.rs diff --git a/runtime/benches/bank.rs b/sealevel/benches/bank.rs similarity index 100% rename from runtime/benches/bank.rs rename to sealevel/benches/bank.rs diff --git a/runtime/benches/bloom.rs b/sealevel/benches/bloom.rs similarity index 100% rename from runtime/benches/bloom.rs rename to sealevel/benches/bloom.rs diff --git a/runtime/benches/message_processor.rs b/sealevel/benches/message_processor.rs similarity index 100% rename from runtime/benches/message_processor.rs rename to sealevel/benches/message_processor.rs diff --git a/runtime/benches/status_cache.rs b/sealevel/benches/status_cache.rs similarity index 100% rename from runtime/benches/status_cache.rs rename to sealevel/benches/status_cache.rs diff --git a/runtime/benches/transaction_utils.rs b/sealevel/benches/transaction_utils.rs similarity index 100% rename from runtime/benches/transaction_utils.rs rename to sealevel/benches/transaction_utils.rs diff --git a/runtime/src/accounts.rs b/sealevel/src/accounts.rs similarity index 100% rename from runtime/src/accounts.rs rename to sealevel/src/accounts.rs diff --git a/runtime/src/accounts_db.rs b/sealevel/src/accounts_db.rs similarity index 100% rename from runtime/src/accounts_db.rs rename to sealevel/src/accounts_db.rs diff --git a/runtime/src/accounts_index.rs b/sealevel/src/accounts_index.rs similarity index 100% rename from runtime/src/accounts_index.rs rename to sealevel/src/accounts_index.rs diff --git a/runtime/src/append_vec.rs b/sealevel/src/append_vec.rs similarity index 100% rename from runtime/src/append_vec.rs rename to sealevel/src/append_vec.rs diff --git a/runtime/src/bank.rs b/sealevel/src/bank.rs similarity index 100% rename from runtime/src/bank.rs rename to sealevel/src/bank.rs diff --git a/runtime/src/bank_client.rs b/sealevel/src/bank_client.rs similarity index 100% rename from runtime/src/bank_client.rs rename to sealevel/src/bank_client.rs diff --git a/runtime/src/blockhash_queue.rs b/sealevel/src/blockhash_queue.rs similarity index 100% rename from runtime/src/blockhash_queue.rs rename to sealevel/src/blockhash_queue.rs diff --git a/runtime/src/bloom.rs b/sealevel/src/bloom.rs similarity index 100% rename from runtime/src/bloom.rs rename to sealevel/src/bloom.rs diff --git a/runtime/src/epoch_schedule.rs b/sealevel/src/epoch_schedule.rs similarity index 100% rename from runtime/src/epoch_schedule.rs rename to sealevel/src/epoch_schedule.rs diff --git a/runtime/src/genesis_utils.rs b/sealevel/src/genesis_utils.rs similarity index 100% rename from runtime/src/genesis_utils.rs rename to sealevel/src/genesis_utils.rs diff --git a/sealevel/src/lib.rs b/sealevel/src/lib.rs new file mode 100644 index 000000000..2c2e454c0 --- /dev/null +++ b/sealevel/src/lib.rs @@ -0,0 +1,39 @@ +pub mod accounts; +pub mod accounts_db; +pub mod accounts_index; +pub mod append_vec; +pub mod bank; +pub mod bank_client; +mod blockhash_queue; +pub mod bloom; +pub mod epoch_schedule; +pub mod genesis_utils; +pub mod loader_utils; +pub mod message_processor; +mod native_loader; +pub mod rent_collector; +mod serde_utils; +pub mod stakes; +pub mod status_cache; +pub mod storage_utils; +mod system_instruction_processor; +pub mod transaction_batch; +pub mod transaction_utils; + +#[macro_use] +extern crate solana_metrics; + +#[macro_use] +extern crate solana_vote_program; + +#[macro_use] +extern crate solana_stake_program; + +#[macro_use] +extern crate solana_bpf_loader_program; + +#[macro_use] +extern crate serde_derive; + +extern crate fs_extra; +extern crate tempfile; diff --git a/runtime/src/loader_utils.rs b/sealevel/src/loader_utils.rs similarity index 100% rename from runtime/src/loader_utils.rs rename to sealevel/src/loader_utils.rs diff --git a/runtime/src/message_processor.rs b/sealevel/src/message_processor.rs similarity index 100% rename from runtime/src/message_processor.rs rename to sealevel/src/message_processor.rs diff --git a/runtime/src/native_loader.rs b/sealevel/src/native_loader.rs similarity index 100% rename from runtime/src/native_loader.rs rename to sealevel/src/native_loader.rs diff --git a/runtime/src/rent_collector.rs b/sealevel/src/rent_collector.rs similarity index 100% rename from runtime/src/rent_collector.rs rename to sealevel/src/rent_collector.rs diff --git a/runtime/src/serde_utils.rs b/sealevel/src/serde_utils.rs similarity index 100% rename from runtime/src/serde_utils.rs rename to sealevel/src/serde_utils.rs diff --git a/runtime/src/stakes.rs b/sealevel/src/stakes.rs similarity index 100% rename from runtime/src/stakes.rs rename to sealevel/src/stakes.rs diff --git a/runtime/src/status_cache.rs b/sealevel/src/status_cache.rs similarity index 100% rename from runtime/src/status_cache.rs rename to sealevel/src/status_cache.rs diff --git a/runtime/src/storage_utils.rs b/sealevel/src/storage_utils.rs similarity index 100% rename from runtime/src/storage_utils.rs rename to sealevel/src/storage_utils.rs diff --git a/runtime/src/system_instruction_processor.rs b/sealevel/src/system_instruction_processor.rs similarity index 100% rename from runtime/src/system_instruction_processor.rs rename to sealevel/src/system_instruction_processor.rs diff --git a/runtime/src/transaction_batch.rs b/sealevel/src/transaction_batch.rs similarity index 100% rename from runtime/src/transaction_batch.rs rename to sealevel/src/transaction_batch.rs diff --git a/runtime/src/transaction_utils.rs b/sealevel/src/transaction_utils.rs similarity index 100% rename from runtime/src/transaction_utils.rs rename to sealevel/src/transaction_utils.rs diff --git a/runtime/tests/noop.rs b/sealevel/tests/noop.rs similarity index 83% rename from runtime/tests/noop.rs rename to sealevel/tests/noop.rs index d7627fa4d..4985b1bed 100644 --- a/runtime/tests/noop.rs +++ b/sealevel/tests/noop.rs @@ -1,6 +1,6 @@ -use solana_runtime::bank::Bank; -use solana_runtime::bank_client::BankClient; -use solana_runtime::loader_utils::create_invoke_instruction; +use sealevel::bank::Bank; +use sealevel::bank_client::BankClient; +use sealevel::loader_utils::create_invoke_instruction; use solana_sdk::client::SyncClient; use solana_sdk::genesis_block::create_genesis_block; use solana_sdk::pubkey::Pubkey;