Merge api/program into single units (#7061)

This commit is contained in:
Jack May 2019-11-20 16:32:19 -08:00 committed by GitHub
parent 186bf7ae32
commit 3415db9739
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
105 changed files with 224 additions and 4095 deletions

95
Cargo.lock generated
View File

@ -3088,7 +3088,6 @@ dependencies = [
"solana-client 0.21.0",
"solana-core 0.21.0",
"solana-drone 0.21.0",
"solana-exchange-api 0.21.0",
"solana-exchange-program 0.21.0",
"solana-genesis 0.21.0",
"solana-local-cluster 0.21.0",
@ -3136,7 +3135,6 @@ dependencies = [
"solana-logger 0.21.0",
"solana-measure 0.21.0",
"solana-metrics 0.21.0",
"solana-move-loader-api 0.21.0",
"solana-move-loader-program 0.21.0",
"solana-net-utils 0.21.0",
"solana-runtime 0.21.0",
@ -3144,22 +3142,7 @@ dependencies = [
]
[[package]]
name = "solana-bitcoin-spv-program"
version = "0.21.0"
dependencies = [
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-btc-spv-api 0.21.0",
"solana-sdk 0.21.0",
]
[[package]]
name = "solana-bpf-loader-api"
name = "solana-bpf-loader-program"
version = "0.21.0"
dependencies = [
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3173,17 +3156,7 @@ dependencies = [
]
[[package]]
name = "solana-bpf-loader-program"
version = "0.21.0"
dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-bpf-loader-api 0.21.0",
"solana-logger 0.21.0",
"solana-sdk 0.21.0",
]
[[package]]
name = "solana-btc-spv-api"
name = "solana-btc-spv-program"
version = "0.21.0"
dependencies = [
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3198,7 +3171,7 @@ dependencies = [
]
[[package]]
name = "solana-budget-api"
name = "solana-budget-program"
version = "0.21.0"
dependencies = [
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3212,16 +3185,6 @@ dependencies = [
"solana-sdk 0.21.0",
]
[[package]]
name = "solana-budget-program"
version = "0.21.0"
dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-budget-api 0.21.0",
"solana-logger 0.21.0",
"solana-sdk 0.21.0",
]
[[package]]
name = "solana-chacha-sys"
version = "0.21.0"
@ -3261,7 +3224,6 @@ dependencies = [
"serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-budget-api 0.21.0",
"solana-budget-program 0.21.0",
"solana-clap-utils 0.21.0",
"solana-client 0.21.0",
@ -3273,7 +3235,7 @@ dependencies = [
"solana-runtime 0.21.0",
"solana-sdk 0.21.0",
"solana-stake-program 0.21.0",
"solana-storage-api 0.21.0",
"solana-storage-program 0.21.0",
"solana-vote-program 0.21.0",
"solana-vote-signer 0.21.0",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3366,7 +3328,6 @@ dependencies = [
"serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
"serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-budget-api 0.21.0",
"solana-budget-program 0.21.0",
"solana-chacha-sys 0.21.0",
"solana-clap-utils 0.21.0",
@ -3384,7 +3345,6 @@ dependencies = [
"solana-runtime 0.21.0",
"solana-sdk 0.21.0",
"solana-stake-program 0.21.0",
"solana-storage-api 0.21.0",
"solana-storage-program 0.21.0",
"solana-vote-program 0.21.0",
"solana-vote-signer 0.21.0",
@ -3441,7 +3401,7 @@ dependencies = [
]
[[package]]
name = "solana-exchange-api"
name = "solana-exchange-program"
version = "0.21.0"
dependencies = [
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3454,16 +3414,6 @@ dependencies = [
"solana-sdk 0.21.0",
]
[[package]]
name = "solana-exchange-program"
version = "0.21.0"
dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-exchange-api 0.21.0",
"solana-logger 0.21.0",
"solana-sdk 0.21.0",
]
[[package]]
name = "solana-failure-program"
version = "0.21.0"
@ -3497,7 +3447,7 @@ dependencies = [
"solana-ledger 0.21.0",
"solana-sdk 0.21.0",
"solana-stake-program 0.21.0",
"solana-storage-api 0.21.0",
"solana-storage-program 0.21.0",
"solana-vote-program 0.21.0",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -3507,17 +3457,13 @@ name = "solana-genesis-programs"
version = "0.21.0"
dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-bpf-loader-api 0.21.0",
"solana-bpf-loader-program 0.21.0",
"solana-budget-api 0.21.0",
"solana-budget-program 0.21.0",
"solana-config-program 0.21.0",
"solana-exchange-api 0.21.0",
"solana-exchange-program 0.21.0",
"solana-runtime 0.21.0",
"solana-sdk 0.21.0",
"solana-stake-program 0.21.0",
"solana-storage-api 0.21.0",
"solana-storage-program 0.21.0",
"solana-vest-program 0.21.0",
"solana-vote-program 0.21.0",
@ -3609,7 +3555,7 @@ dependencies = [
"serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-budget-api 0.21.0",
"solana-budget-program 0.21.0",
"solana-client 0.21.0",
"solana-genesis-programs 0.21.0",
"solana-logger 0.21.0",
@ -3654,7 +3600,7 @@ dependencies = [
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 0.21.0",
"solana-move-loader-api 0.21.0",
"solana-move-loader-program 0.21.0",
"solana-runtime 0.21.0",
"solana-sdk 0.21.0",
"solana_libra_language_e2e_tests 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3673,7 +3619,6 @@ dependencies = [
"solana-config-program 0.21.0",
"solana-core 0.21.0",
"solana-drone 0.21.0",
"solana-exchange-api 0.21.0",
"solana-exchange-program 0.21.0",
"solana-genesis-programs 0.21.0",
"solana-ledger 0.21.0",
@ -3682,7 +3627,6 @@ dependencies = [
"solana-runtime 0.21.0",
"solana-sdk 0.21.0",
"solana-stake-program 0.21.0",
"solana-storage-api 0.21.0",
"solana-storage-program 0.21.0",
"solana-vest-program 0.21.0",
"solana-vote-program 0.21.0",
@ -3745,7 +3689,7 @@ dependencies = [
]
[[package]]
name = "solana-move-loader-api"
name = "solana-move-loader-program"
version = "0.21.0"
dependencies = [
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3773,16 +3717,6 @@ dependencies = [
"solana_libra_vm_runtime_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "solana-move-loader-program"
version = "0.21.0"
dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 0.21.0",
"solana-move-loader-api 0.21.0",
"solana-sdk 0.21.0",
]
[[package]]
name = "solana-net-shaper"
version = "0.1.0"
@ -3853,7 +3787,7 @@ dependencies = [
"rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-budget-api 0.21.0",
"solana-budget-program 0.21.0",
"solana-logger 0.21.0",
"solana-metrics 0.21.0",
"solana-rayon-threadlimit 0.21.0",
@ -3898,7 +3832,6 @@ dependencies = [
"serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.102 (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.21.0",
"solana-bpf-loader-program 0.21.0",
"solana-logger 0.21.0",
"solana-measure 0.21.0",
@ -3907,7 +3840,7 @@ dependencies = [
"solana-rayon-threadlimit 0.21.0",
"solana-sdk 0.21.0",
"solana-stake-program 0.21.0",
"solana-storage-api 0.21.0",
"solana-storage-program 0.21.0",
"solana-vote-program 0.21.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)",
@ -3987,7 +3920,7 @@ dependencies = [
]
[[package]]
name = "solana-storage-api"
name = "solana-storage-program"
version = "0.21.0"
dependencies = [
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -4002,7 +3935,7 @@ dependencies = [
]
[[package]]
name = "solana-storage-program"
name = "solana-storage-tests"
version = "0.21.0"
dependencies = [
"assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -4011,7 +3944,7 @@ dependencies = [
"solana-logger 0.21.0",
"solana-runtime 0.21.0",
"solana-sdk 0.21.0",
"solana-storage-api 0.21.0",
"solana-storage-program 0.21.0",
]
[[package]]

View File

@ -24,24 +24,20 @@ members = [
"measure",
"metrics",
"net-shaper",
"programs/bpf_loader_api",
"programs/bpf_loader_program",
"programs/budget_api",
"programs/budget_program",
"programs/btc_spv_program",
"programs/btc_spv_api",
"programs/bpf_loader",
"programs/budget",
"programs/btc_spv",
"programs/btc_spv_bin",
"programs/config",
"programs/config_tests",
"programs/exchange_api",
"programs/exchange_program",
"programs/failure_program",
"programs/noop_program",
"programs/exchange",
"programs/failure",
"programs/noop",
"programs/ownable_api",
"programs/stake",
"programs/stake_tests",
"programs/storage_api",
"programs/storage_program",
"programs/storage",
"programs/storage_tests",
"programs/vest",
"programs/vote",
"archiver",
@ -58,7 +54,6 @@ members = [
exclude = [
"programs/bpf",
"programs/move_loader_api",
"programs/move_loader_program",
"programs/move_loader",
"programs/librapay_api",
]

View File

@ -23,14 +23,12 @@ serde = "1.0.102"
serde_derive = "1.0.102"
serde_json = "1.0.41"
serde_yaml = "0.8.11"
# solana-runtime = { path = "../solana/runtime"}
solana-clap-utils = { path = "../clap-utils", version = "0.21.0" }
solana-core = { path = "../core", version = "0.21.0" }
solana-genesis = { path = "../genesis", version = "0.21.0" }
solana-client = { path = "../client", version = "0.21.0" }
solana-drone = { path = "../drone", version = "0.21.0" }
solana-exchange-api = { path = "../programs/exchange_api", version = "0.21.0" }
solana-exchange-program = { path = "../programs/exchange_program", version = "0.21.0" }
solana-exchange-program = { path = "../programs/exchange", version = "0.21.0" }
solana-logger = { path = "../logger", version = "0.21.0" }
solana-metrics = { path = "../metrics", version = "0.21.0" }
solana-net-utils = { path = "../net-utils", version = "0.21.0" }

View File

@ -8,7 +8,7 @@ use rayon::prelude::*;
use solana_client::perf_utils::{sample_txs, SampleStats};
use solana_core::gen_keys::GenKeys;
use solana_drone::drone::request_airdrop_transaction;
use solana_exchange_api::{exchange_instruction, exchange_state::*, id};
use solana_exchange_program::{exchange_instruction, exchange_state::*, id};
use solana_genesis::Base64Account;
use solana_metrics::datapoint_info;
use solana_sdk::{

View File

@ -1,7 +1,7 @@
use itertools::EitherOrBoth::{Both, Left, Right};
use itertools::Itertools;
use log::*;
use solana_exchange_api::exchange_state::*;
use solana_exchange_program::exchange_state::*;
use solana_sdk::pubkey::Pubkey;
use std::cmp::Ordering;
use std::collections::BinaryHeap;

View File

@ -3,8 +3,8 @@ use solana_bench_exchange::bench::{airdrop_lamports, do_bench_exchange, Config};
use solana_core::gossip_service::{discover_cluster, get_multi_client};
use solana_core::validator::ValidatorConfig;
use solana_drone::drone::run_local_drone;
use solana_exchange_api::exchange_processor::process_instruction;
use solana_exchange_api::id;
use solana_exchange_program::exchange_processor::process_instruction;
use solana_exchange_program::id;
use solana_exchange_program::solana_exchange_program;
use solana_local_cluster::local_cluster::{ClusterConfig, LocalCluster};
use solana_runtime::bank::Bank;

View File

@ -28,8 +28,7 @@ solana-measure = { path = "../measure", version = "0.21.0" }
solana-net-utils = { path = "../net-utils", version = "0.21.0" }
solana-runtime = { path = "../runtime", version = "0.21.0" }
solana-sdk = { path = "../sdk", version = "0.21.0" }
solana-move-loader-program = { path = "../programs/move_loader_program", version = "0.21.0", optional = true }
solana-move-loader-api = { path = "../programs/move_loader_api", version = "0.21.0", optional = true }
solana-move-loader-program = { path = "../programs/move_loader", version = "0.21.0", optional = true }
[dev-dependencies]
serial_test = "0.2.0"
@ -37,4 +36,4 @@ serial_test_derive = "0.2.0"
solana-local-cluster = { path = "../local-cluster", version = "0.21.0" }
[features]
move = ["solana-librapay-api", "solana-move-loader-program", "solana-move-loader-api"]
move = ["solana-librapay-api", "solana-move-loader-program"]

View File

@ -95,8 +95,7 @@ test-move)
^ci/rust-version.sh \
^ci/test-stable.sh \
^ci/test-move.sh \
^programs/move_loader_api \
^programs/move_loader_program \
^programs/move_loader \
^programs/librapay_api \
^logger/ \
^runtime/ \
@ -106,8 +105,7 @@ test-move)
"Skipped $testName as no relevant files were modified"
exit 0
}
_ cargo +"$rust_stable" test --manifest-path programs/move_loader_api/Cargo.toml ${V:+--verbose} -- --nocapture
_ cargo +"$rust_stable" test --manifest-path programs/move_loader_program/Cargo.toml ${V:+--verbose} -- --nocapture
_ cargo +"$rust_stable" test --manifest-path programs/move_loader/Cargo.toml ${V:+--verbose} -- --nocapture
_ cargo +"$rust_stable" test --manifest-path programs/librapay_api/Cargo.toml ${V:+--verbose} -- --nocapture
exit 0
;;

View File

@ -27,7 +27,7 @@ serde = "1.0.102"
serde_derive = "1.0.102"
serde_json = "1.0.41"
serde_yaml = "0.8.11"
solana-budget-api = { path = "../programs/budget_api", version = "0.21.0" }
solana-budget-program = { path = "../programs/budget", version = "0.21.0" }
solana-clap-utils = { path = "../clap-utils", version = "0.21.0" }
solana-client = { path = "../client", version = "0.21.0" }
solana-config-program = { path = "../programs/config", version = "0.21.0" }
@ -37,14 +37,14 @@ solana-net-utils = { path = "../net-utils", version = "0.21.0" }
solana-runtime = { path = "../runtime", version = "0.21.0" }
solana-sdk = { path = "../sdk", version = "0.21.0" }
solana-stake-program = { path = "../programs/stake", version = "0.21.0" }
solana-storage-api = { path = "../programs/storage_api", version = "0.21.0" }
solana-storage-program = { path = "../programs/storage", version = "0.21.0" }
solana-vote-program = { path = "../programs/vote", version = "0.21.0" }
solana-vote-signer = { path = "../vote-signer", version = "0.21.0" }
url = "2.1.0"
[dev-dependencies]
solana-core = { path = "../core", version = "0.21.0" }
solana-budget-program = { path = "../programs/budget_program", version = "0.21.0" }
solana-budget-program = { path = "../programs/budget", version = "0.21.0" }
tempfile = "3.1.0"
[[bin]]

View File

@ -6,7 +6,7 @@ use clap::{App, AppSettings, Arg, ArgMatches, SubCommand};
use log::*;
use num_traits::FromPrimitive;
use serde_json::{self, json, Value};
use solana_budget_api::budget_instruction::{self, BudgetError};
use solana_budget_program::budget_instruction::{self, BudgetError};
use solana_clap_utils::{input_parsers::*, input_validators::*};
use solana_client::{client_error::ClientError, rpc_client::RpcClient};
#[cfg(not(test))]
@ -30,7 +30,7 @@ use solana_sdk::{
transaction::{Transaction, TransactionError},
};
use solana_stake_program::stake_state::{Lockup, StakeAuthorize};
use solana_storage_api::storage_instruction::StorageAccountType;
use solana_storage_program::storage_instruction::StorageAccountType;
use solana_vote_program::vote_state::VoteAuthorize;
use std::{
fs::File,

View File

@ -10,7 +10,7 @@ use solana_sdk::{
account_utils::State, message::Message, pubkey::Pubkey, signature::KeypairUtil,
system_instruction::SystemError, transaction::Transaction,
};
use solana_storage_api::storage_instruction::{self, StorageAccountType};
use solana_storage_program::storage_instruction::{self, StorageAccountType};
pub trait StorageSubCommands {
fn storage_subcommands(self) -> Self;
@ -208,14 +208,14 @@ pub fn process_show_storage_account(
) -> ProcessResult {
let account = rpc_client.get_account(storage_account_pubkey)?;
if account.owner != solana_storage_api::id() {
if account.owner != solana_storage_program::id() {
return Err(CliError::RpcRequestError(
format!("{:?} is not a storage account", storage_account_pubkey).to_string(),
)
.into());
}
use solana_storage_api::storage_contract::StorageContract;
use solana_storage_program::storage_contract::StorageContract;
let storage_contract: StorageContract = account.state().map_err(|err| {
CliError::RpcRequestError(
format!("Unable to deserialize storage account: {:?}", err).to_string(),

View File

@ -41,8 +41,7 @@ rayon = "1.2.0"
serde = "1.0.102"
serde_derive = "1.0.102"
serde_json = "1.0.41"
solana-budget-api = { path = "../programs/budget_api", version = "0.21.0" }
solana-budget-program = { path = "../programs/budget_program", version = "0.21.0" }
solana-budget-program = { path = "../programs/budget", version = "0.21.0" }
solana-clap-utils = { path = "../clap-utils", version = "0.21.0" }
solana-chacha-sys = { path = "../chacha-sys", version = "0.21.0" }
solana-client = { path = "../client", version = "0.21.0" }
@ -58,8 +57,7 @@ solana-perf = { path = "../perf", version = "0.21.0" }
solana-runtime = { path = "../runtime", version = "0.21.0" }
solana-sdk = { path = "../sdk", version = "0.21.0" }
solana-stake-program = { path = "../programs/stake", version = "0.21.0" }
solana-storage-api = { path = "../programs/storage_api", version = "0.21.0" }
solana-storage-program = { path = "../programs/storage_program", version = "0.21.0" }
solana-storage-program = { path = "../programs/storage", version = "0.21.0" }
solana-vote-program = { path = "../programs/vote", version = "0.21.0" }
solana-vote-signer = { path = "../vote-signer", version = "0.21.0" }
symlink = "0.1.0"

View File

@ -37,7 +37,7 @@ use solana_sdk::{
transaction::Transaction,
transport::TransportError,
};
use solana_storage_api::{
use solana_storage_program::{
storage_contract::StorageContract,
storage_instruction::{self, StorageAccountType},
};

View File

@ -245,8 +245,8 @@ mod tests {
use jsonrpc_core::futures::sync::mpsc;
use jsonrpc_core::Response;
use jsonrpc_pubsub::{PubSubHandler, Session};
use solana_budget_api;
use solana_budget_api::budget_instruction;
use solana_budget_program;
use solana_budget_program::budget_instruction;
use solana_ledger::bank_forks::BankForks;
use solana_runtime::bank::Bank;
use solana_sdk::pubkey::Pubkey;
@ -378,7 +378,7 @@ mod tests {
let witness = Keypair::new();
let contract_funds = Keypair::new();
let contract_state = Keypair::new();
let budget_program_id = solana_budget_api::id();
let budget_program_id = solana_budget_program::id();
let bank = Bank::new(&genesis_config);
let blockhash = bank.last_blockhash();
let bank_forks = Arc::new(RwLock::new(BankForks::new(0, bank)));

View File

@ -298,7 +298,7 @@ mod tests {
use super::*;
use crate::genesis_utils::{create_genesis_config, GenesisConfigInfo};
use jsonrpc_pubsub::typed::Subscriber;
use solana_budget_api;
use solana_budget_program;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_transaction;
use tokio::prelude::{Async, Stream};
@ -320,7 +320,7 @@ mod tests {
blockhash,
1,
16,
&solana_budget_api::id(),
&solana_budget_program::id(),
);
bank_forks
.write()
@ -375,7 +375,7 @@ mod tests {
blockhash,
1,
16,
&solana_budget_api::id(),
&solana_budget_program::id(),
);
bank_forks
.write()
@ -390,15 +390,15 @@ mod tests {
let sub_id = SubscriptionId::Number(0 as u64);
let sink = subscriber.assign_id(sub_id.clone()).unwrap();
let subscriptions = RpcSubscriptions::default();
subscriptions.add_program_subscription(&solana_budget_api::id(), None, &sub_id, &sink);
subscriptions.add_program_subscription(&solana_budget_program::id(), None, &sub_id, &sink);
assert!(subscriptions
.program_subscriptions
.read()
.unwrap()
.contains_key(&solana_budget_api::id()));
.contains_key(&solana_budget_program::id()));
subscriptions.check_program(&solana_budget_api::id(), 0, &bank_forks);
subscriptions.check_program(&solana_budget_program::id(), 0, &bank_forks);
let string = transport_receiver.poll();
if let Async::Ready(Some(response)) = string.unwrap() {
let expected = format!(r#"{{"jsonrpc":"2.0","method":"programNotification","params":{{"result":["{:?}",{{"data":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"executable":false,"lamports":1,"owner":[2,203,81,223,225,24,34,35,203,214,138,130,144,208,35,77,63,16,87,51,47,198,115,123,98,188,19,160,0,0,0,0],"rent_epoch":1}}],"subscription":0}}}}"#, alice.pubkey());
@ -410,7 +410,7 @@ mod tests {
.program_subscriptions
.read()
.unwrap()
.contains_key(&solana_budget_api::id()));
.contains_key(&solana_budget_program::id()));
}
#[test]
fn test_check_signature_subscribe() {

View File

@ -23,7 +23,7 @@ use solana_sdk::{
signature::{Keypair, KeypairUtil, Signature},
transaction::Transaction,
};
use solana_storage_api::{
use solana_storage_program::{
storage_contract::{Proof, ProofStatus, StorageContract},
storage_instruction,
storage_instruction::proof_validation,

View File

@ -17,8 +17,8 @@ mod tests {
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::transaction::Transaction;
use solana_storage_api::storage_instruction;
use solana_storage_api::storage_instruction::StorageAccountType;
use solana_storage_program::storage_instruction;
use solana_storage_program::storage_instruction::StorageAccountType;
use std::fs::remove_dir_all;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::mpsc::channel;

View File

@ -10,18 +10,14 @@ edition = "2018"
[dependencies]
log = { version = "0.4.8" }
solana-bpf-loader-api = { path = "../programs/bpf_loader_api", version = "0.21.0" }
solana-bpf-loader-program = { path = "../programs/bpf_loader_program", version = "0.21.0" }
solana-budget-api = { path = "../programs/budget_api", version = "0.21.0" }
solana-budget-program = { path = "../programs/budget_program", version = "0.21.0" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "0.21.0" }
solana-budget-program = { path = "../programs/budget", version = "0.21.0" }
solana-config-program = { path = "../programs/config", version = "0.21.0" }
solana-exchange-api = { path = "../programs/exchange_api", version = "0.21.0" }
solana-exchange-program = { path = "../programs/exchange_program", version = "0.21.0" }
solana-exchange-program = { path = "../programs/exchange", version = "0.21.0" }
solana-runtime = { path = "../runtime", version = "0.21.0" }
solana-sdk = { path = "../sdk", version = "0.21.0" }
solana-stake-program = { path = "../programs/stake", version = "0.21.0" }
solana-storage-api = { path = "../programs/storage_api", version = "0.21.0" }
solana-storage-program = { path = "../programs/storage_program", version = "0.21.0" }
solana-storage-program = { path = "../programs/storage", version = "0.21.0" }
solana-vest-program = { path = "../programs/vest", version = "0.21.0" }
solana-vote-program = { path = "../programs/vote", version = "0.21.0" }

View File

@ -20,6 +20,6 @@ solana-genesis-programs = { path = "../genesis-programs", version = "0.21.0" }
solana-ledger = { path = "../ledger", version = "0.21.0" }
solana-sdk = { path = "../sdk", version = "0.21.0" }
solana-stake-program = { path = "../programs/stake", version = "0.21.0" }
solana-storage-api = { path = "../programs/storage_api", version = "0.21.0" }
solana-storage-program = { path = "../programs/storage", version = "0.21.0" }
solana-vote-program = { path = "../programs/vote", version = "0.21.0" }
tempfile = "3.1.0"

View File

@ -21,7 +21,7 @@ use solana_sdk::{
system_program, timing,
};
use solana_stake_program::stake_state;
use solana_storage_api::storage_contract;
use solana_storage_program::storage_contract;
use solana_vote_program::vote_state;
use std::{collections::HashMap, error, fs::File, io, path::PathBuf, str::FromStr, time::Duration};
@ -445,7 +445,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
}
// add genesis stuff from storage and stake
solana_storage_api::rewards_pools::add_genesis_accounts(&mut genesis_config);
solana_storage_program::rewards_pools::add_genesis_accounts(&mut genesis_config);
solana_stake_program::add_genesis_accounts(&mut genesis_config);
create_new_ledger(&ledger_path, &genesis_config)?;
@ -682,7 +682,7 @@ mod tests {
)
.expect("genesis");
solana_storage_api::rewards_pools::add_genesis_accounts(&mut genesis_config);
solana_storage_program::rewards_pools::add_genesis_accounts(&mut genesis_config);
remove_file(path).unwrap();

View File

@ -54,7 +54,7 @@ features = ["lz4"]
[dev-dependencies]
matches = "0.1.6"
solana-budget-api = { path = "../programs/budget_api", version = "0.21.0" }
solana-budget-program = { path = "../programs/budget", version = "0.21.0" }
[lib]
crate-type = ["lib"]

View File

@ -391,7 +391,7 @@ mod tests {
use super::*;
use crate::entry::Entry;
use chrono::prelude::Utc;
use solana_budget_api::budget_instruction;
use solana_budget_program::budget_instruction;
use solana_sdk::{
hash::{hash, Hash},
message::Message,

View File

@ -15,16 +15,14 @@ solana-config-program = { path = "../programs/config", version = "0.21.0" }
solana-core = { path = "../core", version = "0.21.0" }
solana-client = { path = "../client", version = "0.21.0" }
solana-drone = { path = "../drone", version = "0.21.0" }
solana-exchange-api = { path = "../programs/exchange_api", version = "0.21.0" }
solana-exchange-program = { path = "../programs/exchange_program", version = "0.21.0" }
solana-exchange-program = { path = "../programs/exchange", version = "0.21.0" }
solana-genesis-programs = { path = "../genesis-programs", version = "0.21.0" }
solana-ledger = { path = "../ledger", version = "0.21.0" }
solana-logger = { path = "../logger", version = "0.21.0" }
solana-runtime = { path = "../runtime", version = "0.21.0" }
solana-sdk = { path = "../sdk", version = "0.21.0" }
solana-stake-program = { path = "../programs/stake", version = "0.21.0" }
solana-storage-api = { path = "../programs/storage_api", version = "0.21.0" }
solana-storage-program = { path = "../programs/storage_program", version = "0.21.0" }
solana-storage-program = { path = "../programs/storage", version = "0.21.0" }
solana-vest-program = { path = "../programs/vest", version = "0.21.0" }
solana-vote-program = { path = "../programs/vote", version = "0.21.0" }
symlink = "0.1.0"

View File

@ -27,7 +27,7 @@ use solana_stake_program::{
config as stake_config, stake_instruction,
stake_state::{Authorized as StakeAuthorized, StakeState},
};
use solana_storage_api::{
use solana_storage_program::{
storage_contract,
storage_instruction::{self, StorageAccountType},
};

View File

@ -20,7 +20,7 @@ lazy_static = "1.4.0"
log = "0.4.8"
solana-sdk = { path = "../sdk", version = "0.21.0" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.21.0" }
solana-budget-api = { path = "../programs/budget_api", version = "0.21.0" }
solana-budget-program = { path = "../programs/budget", version = "0.21.0" }
solana-logger = { path = "../logger", version = "0.21.0" }
solana-metrics = { path = "../metrics", version = "0.21.0" }

View File

@ -22,7 +22,7 @@ pub fn test_multisig_tx() -> Transaction {
let transfer_instruction = SystemInstruction::Transfer { lamports };
let program_ids = vec![system_program::id(), solana_budget_api::id()];
let program_ids = vec![system_program::id(), solana_budget_program::id()];
let instructions = vec![CompiledInstruction::new(
0,

View File

@ -22,7 +22,7 @@ walkdir = "2"
bincode = "1.1.4"
byteorder = "1.3.2"
elf = "0.0.10"
solana-bpf-loader-api = { path = "../bpf_loader_api", version = "0.21.0" }
solana-bpf-loader-program = { path = "../bpf_loader", version = "0.21.0" }
solana-logger = { path = "../../logger", version = "0.21.0" }
solana-runtime = { path = "../../runtime", version = "0.21.0" }
solana-sdk = { path = "../../sdk", version = "0.21.0" }

View File

@ -60,7 +60,7 @@ fn bench_program_verify(bencher: &mut Bencher) {
vm.set_elf(&elf).unwrap();
bencher.iter(|| {
vm.set_verifier(solana_bpf_loader_api::bpf_verifier::check)
vm.set_verifier(solana_bpf_loader_program::bpf_verifier::check)
.unwrap();
});
}
@ -76,7 +76,7 @@ fn bench_program_alu(bencher: &mut Bencher) {
inner_iter.write_u64::<LittleEndian>(0).unwrap();
let elf = load_elf().unwrap();
let (mut vm, _) = solana_bpf_loader_api::create_vm(&elf).unwrap();
let (mut vm, _) = solana_bpf_loader_program::create_vm(&elf).unwrap();
println!("Interpreted:");
assert_eq!(

View File

@ -1,7 +1,7 @@
[package]
name = "solana-bpf-loader-program"
version = "0.21.0"
description = "Solana BPF Loader"
description = "Solana BPF loader"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
@ -9,10 +9,14 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
bincode = "1.2.0"
byteorder = "1.3.2"
libc = "0.2.65"
log = "0.4.8"
serde = "1.0.102"
solana-logger = { path = "../../logger", version = "0.21.0" }
solana-sdk = { path = "../../sdk", version = "0.21.0" }
solana-bpf-loader-api = { path = "../bpf_loader_api", version = "0.21.0" }
solana_rbpf = "=0.1.19"
[lib]
crate-type = ["lib", "cdylib"]

View File

@ -3,20 +3,11 @@ pub mod allocator_bump;
pub mod bpf_verifier;
pub mod helpers;
#[macro_export]
macro_rules! solana_bpf_loader {
() => {
(
"solana_bpf_loader".to_string(),
solana_sdk::bpf_loader::id(),
)
};
}
use byteorder::{ByteOrder, LittleEndian, WriteBytesExt};
use log::*;
use solana_rbpf::{memory_region::MemoryRegion, EbpfVm};
use solana_sdk::account::KeyedAccount;
use solana_sdk::bpf_loader::PROGRAM_ID;
use solana_sdk::instruction::InstructionError;
use solana_sdk::instruction_processor_utils::{limited_deserialize, next_keyed_account};
use solana_sdk::loader_instruction::LoaderInstruction;
@ -27,6 +18,13 @@ use std::io::prelude::*;
use std::io::Error;
use std::mem;
solana_sdk::declare_program!(
PROGRAM_ID,
"BPFLoader1111111111111111111111111111111111",
solana_bpf_loader_program,
process_instruction
);
pub fn create_vm(prog: &[u8]) -> Result<(EbpfVm, MemoryRegion), Error> {
let mut vm = EbpfVm::new(None)?;
vm.set_verifier(bpf_verifier::check)?;

View File

@ -1,23 +0,0 @@
[package]
name = "solana-bpf-loader-api"
version = "0.21.0"
description = "Solana BPF 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.2.0"
byteorder = "1.3.2"
libc = "0.2.65"
log = "0.4.8"
serde = "1.0.102"
solana-logger = { path = "../../logger", version = "0.21.0" }
solana-sdk = { path = "../../sdk", version = "0.21.0" }
solana_rbpf = "=0.1.19"
[lib]
crate-type = ["lib"]
name = "solana_bpf_loader_api"

View File

@ -1,12 +0,0 @@
#[macro_export]
macro_rules! solana_bpf_loader_program {
() => {
(
"solana_bpf_loader_program".to_string(),
solana_sdk::bpf_loader::id(),
)
};
}
use solana_bpf_loader_api::process_instruction;
solana_sdk::solana_entrypoint!(process_instruction);

View File

@ -1,5 +1,5 @@
[package]
name = "solana-bitcoin-spv-program"
name = "solana-btc-spv-program"
version = "0.21.0"
description = "Solana Bitcoin spv parsing program"
authors = ["Solana Maintainers <maintainers@solana.com>"]
@ -17,8 +17,7 @@ num-traits = "0.2"
serde = "1.0.102"
serde_derive = "1.0.102"
solana-sdk = { path = "../../sdk", version = "0.21.0"}
solana-btc-spv-api = { path = "../btc_spv_api", version = "0.21.0"}
hex = "0.3.2"
[lib]
crate-type = ["lib", "cdylib"]

View File

@ -9,12 +9,16 @@ pub mod spv_processor;
pub mod spv_state;
pub mod utils;
use crate::spv_processor::process_instruction;
pub const BTC_SPV_PROGRAM_ID: [u8; 32] = [
2, 202, 42, 59, 228, 51, 182, 147, 162, 245, 234, 78, 205, 37, 131, 154, 110, 252, 154, 254,
190, 13, 90, 231, 198, 144, 239, 96, 0, 0, 0, 0,
];
solana_sdk::solana_name_id!(
solana_sdk::declare_program!(
BTC_SPV_PROGRAM_ID,
"BtcSpv1111111111111111111111111111111111111"
"BtcSpv1111111111111111111111111111111111111",
solana_btc_spv_program,
process_instruction
);

View File

@ -1,24 +0,0 @@
[package]
name = "solana-btc-spv-api"
version = "0.21.0"
description = "Solana Bitcoin spv parsing program api"
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.2.0"
chrono = { version = "0.4.9", features = ["serde"] }
log = "0.4.2"
num-derive = "0.3"
num-traits = "0.2"
serde = "1.0.102"
serde_derive = "1.0.102"
solana-sdk = { path = "../../sdk", version = "0.21.0"}
hex = "0.3.2"
[lib]
crate-type = ["lib"]
name = "solana_btc_spv_api"

View File

@ -1,13 +0,0 @@
use solana_btc_spv_api::spv_processor::process_instruction;
#[macro_export]
macro_rules! solana_btc_spv_program {
() => {
(
"solana_btc_spv_program".to_string(),
solana_btc_spv_api::id(),
)
};
}
solana_sdk::solana_entrypoint!(process_instruction);

View File

@ -1,7 +1,7 @@
[package]
name = "solana-budget-api"
name = "solana-budget-program"
version = "0.21.0"
description = "Solana Budget program API"
description = "Solana Budget program"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
@ -22,5 +22,5 @@ solana-sdk = { path = "../../sdk", version = "0.21.0" }
solana-runtime = { path = "../../runtime", version = "0.21.0" }
[lib]
crate-type = ["lib"]
name = "solana_budget_api"
crate-type = ["lib", "cdylib"]
name = "solana_budget_program"

View File

@ -3,12 +3,16 @@ pub mod budget_instruction;
pub mod budget_processor;
pub mod budget_state;
use crate::budget_processor::process_instruction;
const BUDGET_PROGRAM_ID: [u8; 32] = [
2, 203, 81, 223, 225, 24, 34, 35, 203, 214, 138, 130, 144, 208, 35, 77, 63, 16, 87, 51, 47,
198, 115, 123, 98, 188, 19, 160, 0, 0, 0, 0,
];
solana_sdk::solana_name_id!(
solana_sdk::declare_program!(
BUDGET_PROGRAM_ID,
"Budget1111111111111111111111111111111111111"
"Budget1111111111111111111111111111111111111",
solana_budget_program,
process_instruction
);

View File

@ -1,19 +0,0 @@
[package]
name = "solana-budget-program"
version = "0.21.0"
description = "Solana budget program"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
edition = "2018"
[dependencies]
log = "0.4.8"
solana-budget-api = { path = "../budget_api", version = "0.21.0" }
solana-logger = { path = "../../logger", version = "0.21.0" }
solana-sdk = { path = "../../sdk", version = "0.21.0" }
[lib]
crate-type = ["lib", "cdylib"]
name = "solana_budget_program"

View File

@ -1,9 +0,0 @@
#[macro_export]
macro_rules! solana_budget_program {
() => {
("solana_budget_program".to_string(), solana_budget_api::id())
};
}
use solana_budget_api::budget_processor::process_instruction;
solana_sdk::solana_entrypoint!(process_instruction);

View File

@ -1,7 +1,7 @@
[package]
name = "solana-config-program"
version = "0.21.0"
description = "config program"
description = "Solana Config program"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"

View File

@ -1,7 +1,7 @@
[package]
name = "solana-exchange-api"
name = "solana-exchange-program"
version = "0.21.0"
description = "Solana Exchange program API"
description = "Solana Exchange program"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
@ -21,5 +21,5 @@ solana-sdk = { path = "../../sdk", version = "0.21.0" }
solana-runtime = { path = "../../runtime", version = "0.21.0" }
[lib]
crate-type = ["lib"]
name = "solana_exchange_api"
crate-type = ["lib", "cdylib"]
name = "solana_exchange_program"

View File

@ -5,14 +5,18 @@ pub mod exchange_state;
#[macro_use]
extern crate solana_metrics;
use crate::exchange_processor::process_instruction;
pub const EXCHANGE_PROGRAM_ID: [u8; 32] = [
3, 147, 111, 103, 210, 47, 14, 213, 108, 116, 49, 115, 232, 171, 14, 111, 167, 140, 221, 234,
33, 70, 185, 192, 42, 31, 141, 152, 0, 0, 0, 0,
];
solana_sdk::solana_name_id!(
solana_sdk::declare_program!(
EXCHANGE_PROGRAM_ID,
"Exchange11111111111111111111111111111111111"
"Exchange11111111111111111111111111111111111",
solana_exchange_program,
process_instruction
);
pub mod faucet {

View File

@ -1,19 +0,0 @@
[package]
name = "solana-exchange-program"
version = "0.21.0"
description = "Solana exchange program"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
edition = "2018"
[dependencies]
log = "0.4.8"
solana-exchange-api = { path = "../exchange_api", version = "0.21.0" }
solana-logger = { path = "../../logger", version = "0.21.0" }
solana-sdk = { path = "../../sdk", version = "0.21.0" }
[lib]
crate-type = ["lib", "cdylib"]
name = "solana_exchange_program"

View File

@ -1,12 +0,0 @@
#[macro_export]
macro_rules! solana_exchange_program {
() => {
(
"solana_exchange_program".to_string(),
solana_exchange_api::id(),
)
};
}
use solana_exchange_api::exchange_processor::process_instruction;
solana_sdk::solana_entrypoint!(process_instruction);

View File

@ -16,6 +16,6 @@ solana-sdk = { path = "../../sdk", version = "0.21.0" }
solana-runtime = { path = "../../runtime", version = "0.21.0" }
[lib]
crate-type = ["cdylib"]
crate-type = ["lib", "cdylib"]
name = "solana_failure_program"

View File

@ -0,0 +1,23 @@
use solana_sdk::account::KeyedAccount;
use solana_sdk::instruction::InstructionError;
use solana_sdk::pubkey::Pubkey;
pub const FAILURE_PROGRAM_ID: [u8; 32] = [
3, 188, 64, 34, 171, 255, 206, 240, 89, 4, 11, 161, 30, 250, 18, 135, 195, 82, 6, 72, 220, 142,
53, 26, 45, 144, 70, 112, 0, 0, 0, 0,
];
solana_sdk::declare_program!(
FAILURE_PROGRAM_ID,
"FaiLure111111111111111111111111111111111111",
solana_failure_program,
process_instruction
);
fn process_instruction(
_program_id: &Pubkey,
_keyed_accounts: &mut [KeyedAccount],
_data: &[u8],
) -> Result<(), InstructionError> {
Err(InstructionError::GenericError)
}

View File

@ -1,13 +0,0 @@
use solana_sdk::account::KeyedAccount;
use solana_sdk::instruction::InstructionError;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::solana_entrypoint;
solana_entrypoint!(entrypoint);
fn entrypoint(
_program_id: &Pubkey,
_keyed_accounts: &mut [KeyedAccount],
_data: &[u8],
) -> Result<(), InstructionError> {
Err(InstructionError::GenericError)
}

View File

@ -12,7 +12,7 @@ edition = "2018"
bincode = "1.2.0"
log = "0.4.8"
solana-logger = { path = "../../logger", version = "0.21.0" }
solana-move-loader-api = { path = "../move_loader_api", version = "0.21.0" }
solana-move-loader-program = { path = "../move_loader", version = "0.21.0" }
solana-runtime = { path = "../../runtime", version = "0.21.0" }
solana-sdk = { path = "../../sdk", version = "0.21.0" }
language_e2e_tests = { version = "0.0.1-sol4", package = "solana_libra_language_e2e_tests" }

View File

@ -11,9 +11,9 @@ solana_sdk::solana_name_id!(
pub mod librapay_instruction;
pub mod librapay_transaction;
extern crate solana_move_loader_api;
extern crate solana_move_loader_program;
use solana_move_loader_api::account_state::LibraAccountState;
use solana_move_loader_program::account_state::LibraAccountState;
use solana_runtime::loader_utils::load_program;
use solana_sdk::account::KeyedAccount;
use solana_sdk::client::Client;
@ -92,5 +92,5 @@ pub fn process_instruction(
keyed_accounts: &mut [KeyedAccount],
data: &[u8],
) -> Result<(), InstructionError> {
solana_move_loader_api::processor::process_instruction(program_id, keyed_accounts, data)
solana_move_loader_program::processor::process_instruction(program_id, keyed_accounts, data)
}

View File

@ -1,6 +1,6 @@
use bincode;
use solana_move_loader_api::account_state::pubkey_to_address;
use solana_move_loader_api::processor::InvokeCommand;
use solana_move_loader_program::account_state::pubkey_to_address;
use solana_move_loader_program::processor::InvokeCommand;
use solana_sdk::instruction::{AccountMeta, Instruction};
use solana_sdk::loader_instruction::LoaderInstruction;
use solana_sdk::pubkey::Pubkey;

View File

@ -1,7 +1,7 @@
use crate::librapay_instruction;
use log::*;
use solana_move_loader_api::account_state::{pubkey_to_address, LibraAccountState};
use solana_move_loader_api::data_store::DataStore;
use solana_move_loader_program::account_state::{pubkey_to_address, LibraAccountState};
use solana_move_loader_program::data_store::DataStore;
use solana_sdk::client::Client;
use solana_sdk::commitment_config::CommitmentConfig;
use solana_sdk::hash::Hash;
@ -160,7 +160,7 @@ mod tests {
let mut bank = Bank::new(&genesis_config);
bank.add_instruction_processor(
solana_sdk::move_loader::id(),
solana_move_loader_api::processor::process_instruction,
solana_move_loader_program::processor::process_instruction,
);
let shared_bank = Arc::new(bank);
let bank_client = BankClient::new_shared(&shared_bank);

View File

@ -1,7 +1,7 @@
[package]
name = "solana-move-loader-api"
name = "solana-move-loader-program"
version = "0.21.0"
description = "Solana Move Loader"
description = "Solana Move loader"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
@ -35,5 +35,5 @@ vm_runtime = { version = "0.0.1-sol4", package = "solana_libra_vm_runtime" }
vm_runtime_types = { version = "0.0.1-sol4", package = "solana_libra_vm_runtime_types" }
[lib]
crate-type = ["lib"]
name = "solana_move_loader_api"
crate-type = ["lib", "cdylib"]
name = "solana_move_loader_program"

View File

@ -0,0 +1,14 @@
pub mod account_state;
pub mod data_store;
pub mod error_mappers;
pub mod processor;
use crate::processor::process_instruction;
use solana_sdk::move_loader::PROGRAM_ID;
solana_sdk::declare_program!(
PROGRAM_ID,
"MoveLdr111111111111111111111111111111111111",
solana_move_loader_program,
process_instruction
);

View File

@ -1,4 +0,0 @@
pub mod account_state;
pub mod data_store;
pub mod error_mappers;
pub mod processor;

View File

@ -1 +0,0 @@
/target/

File diff suppressed because it is too large Load Diff

View File

@ -1,19 +0,0 @@
[package]
name = "solana-move-loader-program"
version = "0.21.0"
description = "Solana Move 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]
log = "0.4.8"
solana-logger = { path = "../../logger", version = "0.21.0" }
solana-sdk = { path = "../../sdk", version = "0.21.0" }
solana-move-loader-api = { path = "../move_loader_api", version = "0.21.0" }
[lib]
crate-type = ["lib", "cdylib"]
name = "solana_move_loader_program"

View File

@ -1,2 +0,0 @@
use solana_move_loader_api::processor::process_instruction;
solana_sdk::solana_entrypoint!(process_instruction);

View File

@ -1,7 +1,7 @@
[package]
name = "solana-noop-program"
version = "0.21.0"
description = "Solana noop program"
description = "Solana Noop program"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
@ -14,6 +14,6 @@ solana-logger = { path = "../../logger", version = "0.21.0" }
solana-sdk = { path = "../../sdk", version = "0.21.0" }
[lib]
crate-type = ["cdylib"]
crate-type = ["lib", "cdylib"]
name = "solana_noop_program"

View File

@ -2,10 +2,20 @@ use log::*;
use solana_sdk::account::KeyedAccount;
use solana_sdk::instruction::InstructionError;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::solana_entrypoint;
solana_entrypoint!(entrypoint);
fn entrypoint(
pub const NOOP_PROGRAM_ID: [u8; 32] = [
5, 150, 31, 54, 19, 205, 142, 201, 161, 38, 97, 31, 144, 212, 37, 82, 93, 58, 178, 5, 131, 178,
31, 101, 138, 251, 91, 128, 0, 0, 0, 0,
];
solana_sdk::declare_program!(
NOOP_PROGRAM_ID,
"Noop111111111111111111111111111111111111111",
solana_noop_program,
process_instruction
);
fn process_instruction(
program_id: &Pubkey,
keyed_accounts: &mut [KeyedAccount],
data: &[u8],

View File

@ -1,7 +1,7 @@
[package]
name = "solana-stake-program"
version = "0.21.0"
description = "Solana Stake program API"
description = "Solana Stake program"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"

View File

@ -1,7 +1,7 @@
[package]
name = "solana-stake-tests"
version = "0.21.0"
description = "Solana stake api tests"
description = "Solana stake tests"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"

View File

@ -1,7 +1,7 @@
[package]
name = "solana-storage-api"
name = "solana-storage-program"
version = "0.21.0"
description = "Solana Storage program API"
description = "Solana Storage program"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
@ -20,5 +20,5 @@ solana-logger = { path = "../../logger", version = "0.21.0" }
solana-sdk = { path = "../../sdk", version = "0.21.0" }
[lib]
crate-type = ["lib"]
name = "solana_storage_api"
crate-type = ["lib", "cdylib"]
name = "solana_storage_program"

View File

@ -3,11 +3,16 @@ pub mod storage_contract;
pub mod storage_instruction;
pub mod storage_processor;
use crate::storage_processor::process_instruction;
const STORAGE_PROGRAM_ID: [u8; 32] = [
6, 162, 25, 123, 127, 68, 233, 59, 131, 151, 21, 152, 162, 120, 90, 37, 154, 88, 86, 5, 156,
221, 182, 201, 142, 103, 151, 112, 0, 0, 0, 0,
];
solana_sdk::solana_name_id!(
solana_sdk::declare_program!(
STORAGE_PROGRAM_ID,
"Storage111111111111111111111111111111111111"
"Storage111111111111111111111111111111111111",
solana_storage_program,
process_instruction
);

View File

@ -1,12 +0,0 @@
#[macro_export]
macro_rules! solana_storage_program {
() => {
(
"solana_storage_program".to_string(),
solana_storage_api::id(),
)
};
}
use solana_storage_api::storage_processor::process_instruction;
solana_sdk::solana_entrypoint!(process_instruction);

View File

@ -1,7 +1,7 @@
[package]
name = "solana-storage-program"
name = "solana-storage-tests"
version = "0.21.0"
description = "Solana storage program"
description = "Solana storage tests"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
@ -12,13 +12,9 @@ edition = "2018"
log = "0.4.8"
solana-logger = { path = "../../logger", version = "0.21.0" }
solana-sdk = { path = "../../sdk", version = "0.21.0" }
solana-storage-api = { path = "../storage_api", version = "0.21.0" }
solana-storage-program = { path = "../storage", version = "0.21.0" }
[dev-dependencies]
solana-runtime = { path = "../../runtime", version = "0.21.0" }
assert_matches = "1.3.0"
bincode = "1.2.0"
[lib]
crate-type = ["lib", "cdylib"]
name = "solana_storage_program"

View File

@ -23,7 +23,7 @@ use solana_sdk::{
Sysvar,
},
};
use solana_storage_api::{
use solana_storage_program::{
id,
storage_contract::StorageAccount,
storage_contract::{ProofStatus, StorageContract, STORAGE_ACCOUNT_SPACE},

View File

@ -1,7 +1,7 @@
[package]
name = "solana-vest-program"
version = "0.21.0"
description = "Solana Vest program API"
description = "Solana Vest program"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"

View File

@ -1,7 +1,7 @@
[package]
name = "solana-vote-program"
version = "0.21.0"
description = "Solana Vote program API"
description = "Solana Vote program"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"

Some files were not shown because too many files have changed in this diff Show More