From e47fcb196b9cf6d2a296703a25141c76ef8b307b Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 25 Oct 2018 11:13:08 -0700 Subject: [PATCH] s/solana_program_interface/solana[_-]sdk/g --- Cargo.toml | 8 ++++---- benches/banking_stage.rs | 4 ++-- common/Cargo.toml | 5 ++++- programs/bpf/noop_rust/Cargo.toml | 5 ++++- programs/native/bpf_loader/Cargo.toml | 7 +++++-- programs/native/bpf_loader/src/lib.rs | 8 ++++---- programs/native/lua_loader/Cargo.toml | 7 +++++-- programs/native/lua_loader/src/lib.rs | 10 +++++----- programs/native/noop/Cargo.toml | 7 +++++-- programs/native/noop/src/lib.rs | 4 ++-- scripts/increment-cargo-version.sh | 4 ++-- src/bank.rs | 4 ++-- src/bpf_loader.rs | 4 ++-- src/budget.rs | 2 +- src/budget_program.rs | 8 ++++---- src/budget_transaction.rs | 2 +- src/choose_gossip_peer_strategy.rs | 4 ++-- src/cluster_info.rs | 4 ++-- src/drone.rs | 2 +- src/entry.rs | 2 +- src/erasure.rs | 4 ++-- src/leader_scheduler.rs | 6 +++--- src/ledger.rs | 2 +- src/lib.rs | 2 +- src/loader_transaction.rs | 4 ++-- src/mint.rs | 2 +- src/native_loader.rs | 6 +++--- src/packet.rs | 2 +- src/payment_plan.rs | 2 +- src/request.rs | 4 ++-- src/rpc.rs | 4 ++-- src/rpc_pubsub.rs | 4 ++-- src/signature.rs | 2 +- src/sigverify.rs | 2 +- src/storage_program.rs | 4 ++-- src/system_program.rs | 8 ++++---- src/system_transaction.rs | 2 +- src/thin_client.rs | 4 ++-- src/tictactoe_dashboard_program.rs | 4 ++-- src/tictactoe_program.rs | 4 ++-- src/token_program.rs | 4 ++-- src/transaction.rs | 2 +- src/vote_stage.rs | 2 +- src/wallet.rs | 2 +- src/window.rs | 4 ++-- src/window_service.rs | 2 +- tests/multinode.rs | 4 ++-- tests/programs.rs | 4 ++-- 48 files changed, 106 insertions(+), 91 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4baa0a063..b66cc59b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -104,14 +104,14 @@ serde_cbor = "0.9.0" serde_derive = "1.0.27" serde_json = "1.0.10" socket2 = "0.3.8" -solana_program_interface = { path = "common", version = "0.10.0" } +solana-sdk = { path = "common", version = "0.10.0" } sys-info = "0.5.6" tokio = "0.1" tokio-codec = "0.1" untrusted = "0.6.2" -noop = { path = "programs/native/noop" } -bpf_loader = { path = "programs/native/bpf_loader" } -lua_loader = { path = "programs/native/lua_loader" } +solana-noop = { path = "programs/native/noop" } +solana-bpfloader = { path = "programs/native/bpf_loader" } +solana-lualoader = { path = "programs/native/lua_loader" } [[bench]] name = "bank" diff --git a/benches/banking_stage.rs b/benches/banking_stage.rs index 992d5851d..bbf9df902 100644 --- a/benches/banking_stage.rs +++ b/benches/banking_stage.rs @@ -3,7 +3,7 @@ extern crate bincode; extern crate rand; extern crate rayon; extern crate solana; -extern crate solana_program_interface; +extern crate solana_sdk; extern crate test; use rand::{thread_rng, Rng}; @@ -17,7 +17,7 @@ use solana::packet::to_packets_chunked; use solana::signature::{KeypairUtil, Signature}; use solana::system_transaction::SystemTransaction; use solana::transaction::Transaction; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::iter; use std::sync::mpsc::{channel, Receiver}; use std::sync::Arc; diff --git a/common/Cargo.toml b/common/Cargo.toml index 15965278f..755f78b99 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -1,7 +1,10 @@ [package] -name = "solana_program_interface" +name = "solana-sdk" version = "0.10.0" +description = "Solana SDK" authors = ["Solana Maintainers "] +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" [dependencies] bincode = "1.0.0" diff --git a/programs/bpf/noop_rust/Cargo.toml b/programs/bpf/noop_rust/Cargo.toml index 616da446a..39e045547 100644 --- a/programs/bpf/noop_rust/Cargo.toml +++ b/programs/bpf/noop_rust/Cargo.toml @@ -1,7 +1,10 @@ [package] -name = "noop_rust" +name = "solana-bpf-noop" version = "0.10.0" +description = "Solana BPF noop program" authors = ["Solana Maintainers "] +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" [dependencies] rbpf = { git = "https://github.com/qmonnet/rbpf", rev="bc41ec47d9b51751585f6ddcde1d1eb1afe2be69" } diff --git a/programs/native/bpf_loader/Cargo.toml b/programs/native/bpf_loader/Cargo.toml index fae401b2b..8d853360f 100644 --- a/programs/native/bpf_loader/Cargo.toml +++ b/programs/native/bpf_loader/Cargo.toml @@ -1,7 +1,10 @@ [package] -name = "bpf_loader" +name = "solana-bpfloader" version = "0.10.0" +description = "Solana BPF Loader" authors = ["Solana Maintainers "] +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" [dependencies] bincode = "1.0.0" @@ -13,7 +16,7 @@ log = "0.4.2" rbpf = "0.1.0" serde = "1.0.27" serde_derive = "1.0.27" -solana_program_interface = { path = "../../../common", version = "0.10.0" } +solana-sdk = { path = "../../../common", version = "0.10.0" } [lib] name = "bpf_loader" diff --git a/programs/native/bpf_loader/src/lib.rs b/programs/native/bpf_loader/src/lib.rs index 4daa1c589..81870d17b 100644 --- a/programs/native/bpf_loader/src/lib.rs +++ b/programs/native/bpf_loader/src/lib.rs @@ -6,13 +6,13 @@ extern crate env_logger; #[macro_use] extern crate log; extern crate rbpf; -extern crate solana_program_interface; +extern crate solana_sdk; use bincode::deserialize; use byteorder::{ByteOrder, LittleEndian, WriteBytesExt}; -use solana_program_interface::account::KeyedAccount; -use solana_program_interface::loader_instruction::LoaderInstruction; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::KeyedAccount; +use solana_sdk::loader_instruction::LoaderInstruction; +use solana_sdk::pubkey::Pubkey; use std::io::prelude::*; use std::io::Error; use std::mem; diff --git a/programs/native/lua_loader/Cargo.toml b/programs/native/lua_loader/Cargo.toml index 6830d00b9..ce36cf455 100644 --- a/programs/native/lua_loader/Cargo.toml +++ b/programs/native/lua_loader/Cargo.toml @@ -1,7 +1,10 @@ [package] -name = "lua_loader" +name = "solana-lualoader" version = "0.10.0" +description = "Solana Lua Loader" authors = ["Solana Maintainers "] +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" [dependencies] bincode = "1.0.0" @@ -10,7 +13,7 @@ log = "0.4.2" rlua = "0.15.2" serde = "1.0.27" serde_derive = "1.0.27" -solana_program_interface = { path = "../../../common", version = "0.10.0" } +solana-sdk = { path = "../../../common", version = "0.10.0" } [dev-dependencies] bincode = "1.0.0" diff --git a/programs/native/lua_loader/src/lib.rs b/programs/native/lua_loader/src/lib.rs index 1fab099ee..5a6997d02 100644 --- a/programs/native/lua_loader/src/lib.rs +++ b/programs/native/lua_loader/src/lib.rs @@ -3,12 +3,12 @@ extern crate env_logger; #[macro_use] extern crate log; extern crate rlua; -extern crate solana_program_interface; +extern crate solana_sdk; use bincode::deserialize; use rlua::{Lua, Result, Table}; -use solana_program_interface::account::KeyedAccount; -use solana_program_interface::loader_instruction::LoaderInstruction; +use solana_sdk::account::KeyedAccount; +use solana_sdk::loader_instruction::LoaderInstruction; use std::str; use std::sync::{Once, ONCE_INIT}; @@ -107,8 +107,8 @@ mod tests { use self::bincode::serialize; use super::*; - use solana_program_interface::account::{create_keyed_accounts, Account}; - use solana_program_interface::pubkey::Pubkey; + use solana_sdk::account::{create_keyed_accounts, Account}; + use solana_sdk::pubkey::Pubkey; use std::fs::File; use std::io::prelude::*; use std::path::PathBuf; diff --git a/programs/native/noop/Cargo.toml b/programs/native/noop/Cargo.toml index bf9b07486..e47c6fbc1 100644 --- a/programs/native/noop/Cargo.toml +++ b/programs/native/noop/Cargo.toml @@ -1,10 +1,13 @@ [package] -name = "noop" +name = "solana-noop" version = "0.10.0" +description = "Solana noop program" authors = ["Solana Maintainers "] +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" [dependencies] -solana_program_interface = { path = "../../../common", version = "0.10.0" } +solana-sdk = { path = "../../../common", version = "0.10.0" } [lib] name = "noop" diff --git a/programs/native/noop/src/lib.rs b/programs/native/noop/src/lib.rs index 7ae37a4ed..e54b1a70e 100644 --- a/programs/native/noop/src/lib.rs +++ b/programs/native/noop/src/lib.rs @@ -1,6 +1,6 @@ -extern crate solana_program_interface; +extern crate solana_sdk; -use solana_program_interface::account::KeyedAccount; +use solana_sdk::account::KeyedAccount; #[no_mangle] pub extern "C" fn process(keyed_accounts: &mut [KeyedAccount], data: &[u8]) -> bool { diff --git a/scripts/increment-cargo-version.sh b/scripts/increment-cargo-version.sh index 066f33425..1b7019317 100755 --- a/scripts/increment-cargo-version.sh +++ b/scripts/increment-cargo-version.sh @@ -65,11 +65,11 @@ for Cargo_toml in $(find . -name Cargo.toml); do sed -i "$Cargo_toml" -e "s/^version = \"[^\"]*\"$/version = \"$newVersion\"/" ) - # Fix up the internal references to the solana_program_interface crate + # Fix up the internal references to the solana_sdk crate ( set -x sed -i "$Cargo_toml" -e " - s/^solana_program_interface.*\(\"[^\"]*common\"\).*\$/solana_program_interface = \{ path = \1, version = \"$newVersion\" \}/ + s/^solana-sdk.*\(\"[^\"]*common\"\).*\$/solana-sdk = \{ path = \1, version = \"$newVersion\" \}/ " ) done diff --git a/src/bank.rs b/src/bank.rs index 6d4ddf76a..a7b6fb3b3 100644 --- a/src/bank.rs +++ b/src/bank.rs @@ -24,8 +24,8 @@ use rayon::prelude::*; use rpc::RpcSignatureStatus; use signature::Keypair; use signature::Signature; -use solana_program_interface::account::{Account, KeyedAccount}; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::{Account, KeyedAccount}; +use solana_sdk::pubkey::Pubkey; use std; use std::collections::{BTreeMap, HashMap, HashSet}; use std::result; diff --git a/src/bpf_loader.rs b/src/bpf_loader.rs index e8d983b3f..789c58a51 100644 --- a/src/bpf_loader.rs +++ b/src/bpf_loader.rs @@ -1,7 +1,7 @@ //! BPF loader use native_loader; -use solana_program_interface::account::Account; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::Account; +use solana_sdk::pubkey::Pubkey; pub const BPF_LOADER_PROGRAM_ID: [u8; 32] = [6u8; 32]; pub const BPF_LOADER_NAME: &str = "bpf_loader"; diff --git a/src/budget.rs b/src/budget.rs index 0f316547e..76d3e14b9 100644 --- a/src/budget.rs +++ b/src/budget.rs @@ -5,7 +5,7 @@ use chrono::prelude::*; use payment_plan::{Payment, Witness}; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::mem; /// A data type representing a `Witness` that the payment plan is waiting on. diff --git a/src/budget_program.rs b/src/budget_program.rs index a0793cdca..d6a2827bc 100644 --- a/src/budget_program.rs +++ b/src/budget_program.rs @@ -4,8 +4,8 @@ use budget::Budget; use budget_instruction::Instruction; use chrono::prelude::{DateTime, Utc}; use payment_plan::Witness; -use solana_program_interface::account::Account; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::Account; +use solana_sdk::pubkey::Pubkey; use std::io; use transaction::Transaction; @@ -259,8 +259,8 @@ mod test { use chrono::prelude::{DateTime, NaiveDate, Utc}; use hash::Hash; use signature::{GenKeys, Keypair, KeypairUtil}; - use solana_program_interface::account::Account; - use solana_program_interface::pubkey::Pubkey; + use solana_sdk::account::Account; + use solana_sdk::pubkey::Pubkey; use transaction::Transaction; fn process_transaction(tx: &Transaction, accounts: &mut [Account]) -> Result<(), BudgetError> { diff --git a/src/budget_transaction.rs b/src/budget_transaction.rs index 3c5c72113..87e2a293d 100644 --- a/src/budget_transaction.rs +++ b/src/budget_transaction.rs @@ -8,7 +8,7 @@ use chrono::prelude::*; use hash::Hash; use payment_plan::Payment; use signature::{Keypair, KeypairUtil}; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use system_program::SystemProgram; use transaction::{self, Transaction}; diff --git a/src/choose_gossip_peer_strategy.rs b/src/choose_gossip_peer_strategy.rs index 7a79ab444..cd7bf1b24 100644 --- a/src/choose_gossip_peer_strategy.rs +++ b/src/choose_gossip_peer_strategy.rs @@ -2,7 +2,7 @@ use cluster_info::{ClusterInfoError, NodeInfo}; use rand::distributions::{Distribution, Weighted, WeightedChoice}; use rand::thread_rng; use result::Result; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std; use std::collections::HashMap; @@ -193,7 +193,7 @@ mod tests { use choose_gossip_peer_strategy::{ChooseWeightedPeerStrategy, DEFAULT_WEIGHT}; use logger; use signature::{Keypair, KeypairUtil}; - use solana_program_interface::pubkey::Pubkey; + use solana_sdk::pubkey::Pubkey; use std; use std::collections::HashMap; diff --git a/src/cluster_info.rs b/src/cluster_info.rs index 44f6433c0..633066d6d 100644 --- a/src/cluster_info.rs +++ b/src/cluster_info.rs @@ -26,7 +26,7 @@ use rand::{thread_rng, Rng}; use rayon::prelude::*; use result::{Error, Result}; use signature::{Keypair, KeypairUtil}; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std; use std::collections::HashMap; use std::net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket}; @@ -1400,7 +1400,7 @@ mod tests { use packet::SharedBlob; use result::Error; use signature::{Keypair, KeypairUtil}; - use solana_program_interface::pubkey::Pubkey; + use solana_sdk::pubkey::Pubkey; use std::fs::remove_dir_all; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use std::sync::atomic::{AtomicBool, Ordering}; diff --git a/src/drone.rs b/src/drone.rs index 2c8ba0bfc..311298508 100644 --- a/src/drone.rs +++ b/src/drone.rs @@ -9,7 +9,7 @@ use bytes::Bytes; use influx_db_client as influxdb; use metrics; use signature::{Keypair, Signature}; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::io; use std::io::{Error, ErrorKind}; use std::net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket}; diff --git a/src/entry.rs b/src/entry.rs index 3f4209f8a..3a1ec67c1 100644 --- a/src/entry.rs +++ b/src/entry.rs @@ -6,7 +6,7 @@ use bincode::{serialize_into, serialized_size}; use hash::Hash; use packet::{SharedBlob, BLOB_DATA_SIZE}; use poh::Poh; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::io::Cursor; use std::mem::size_of; use std::net::SocketAddr; diff --git a/src/erasure.rs b/src/erasure.rs index 37bb1fe2d..79adfdfc9 100644 --- a/src/erasure.rs +++ b/src/erasure.rs @@ -1,6 +1,6 @@ // Support erasure coding use packet::{SharedBlob, BLOB_DATA_SIZE, BLOB_HEADER_SIZE}; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::cmp; use std::mem; use std::result; @@ -597,7 +597,7 @@ mod test { use packet::{SharedBlob, BLOB_DATA_SIZE, BLOB_HEADER_SIZE, BLOB_SIZE}; use rand::{thread_rng, Rng}; use signature::{Keypair, KeypairUtil}; - use solana_program_interface::pubkey::Pubkey; + use solana_sdk::pubkey::Pubkey; // use std::sync::{Arc, RwLock}; use window::{index_blobs, WindowSlot}; diff --git a/src/leader_scheduler.rs b/src/leader_scheduler.rs index cb8b3d9fa..58f93a5f2 100644 --- a/src/leader_scheduler.rs +++ b/src/leader_scheduler.rs @@ -12,8 +12,8 @@ use hash::{hash, Hash}; use ledger::create_ticks; use signature::{Keypair, KeypairUtil}; #[cfg(test)] -use solana_program_interface::account::Account; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::Account; +use solana_sdk::pubkey::Pubkey; use std::collections::HashMap; use std::io::Cursor; use system_transaction::SystemTransaction; @@ -538,7 +538,7 @@ mod tests { }; use mint::Mint; use signature::{Keypair, KeypairUtil}; - use solana_program_interface::pubkey::Pubkey; + use solana_sdk::pubkey::Pubkey; use std::collections::HashSet; use std::hash::Hash; use std::iter::FromIterator; diff --git a/src/ledger.rs b/src/ledger.rs index a18076413..0e11dd7dc 100644 --- a/src/ledger.rs +++ b/src/ledger.rs @@ -17,7 +17,7 @@ use packet::{SharedBlob, BLOB_DATA_SIZE}; use rayon::prelude::*; use result::{Error, Result}; use signature::{Keypair, KeypairUtil}; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::fs::{create_dir_all, remove_dir_all, File, OpenOptions}; use std::io::prelude::*; use std::io::{self, BufReader, BufWriter, Seek, SeekFrom}; diff --git a/src/lib.rs b/src/lib.rs index 0636cbdb5..6f3f0f180 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -121,7 +121,7 @@ extern crate solana_jsonrpc_http_server as jsonrpc_http_server; extern crate solana_jsonrpc_macros as jsonrpc_macros; extern crate solana_jsonrpc_pubsub as jsonrpc_pubsub; extern crate solana_jsonrpc_ws_server as jsonrpc_ws_server; -extern crate solana_program_interface; +extern crate solana_sdk; extern crate sys_info; extern crate tokio; extern crate tokio_codec; diff --git a/src/loader_transaction.rs b/src/loader_transaction.rs index 20a897ada..bfdd06498 100644 --- a/src/loader_transaction.rs +++ b/src/loader_transaction.rs @@ -3,8 +3,8 @@ use bincode::serialize; use hash::Hash; use signature::{Keypair, KeypairUtil}; -use solana_program_interface::loader_instruction::LoaderInstruction; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::loader_instruction::LoaderInstruction; +use solana_sdk::pubkey::Pubkey; use transaction::Transaction; pub trait LoaderTransaction { diff --git a/src/mint.rs b/src/mint.rs index 74e92ad1d..12ac3a7a2 100644 --- a/src/mint.rs +++ b/src/mint.rs @@ -4,7 +4,7 @@ use entry::Entry; use hash::{hash, Hash}; use ring::rand::SystemRandom; use signature::{Keypair, KeypairUtil}; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use system_transaction::SystemTransaction; use transaction::Transaction; use untrusted::Input; diff --git a/src/native_loader.rs b/src/native_loader.rs index 27508f682..8e9949039 100644 --- a/src/native_loader.rs +++ b/src/native_loader.rs @@ -5,9 +5,9 @@ use libc; use libloading::os::unix::*; #[cfg(windows)] use libloading::os::windows::*; -use solana_program_interface::account::KeyedAccount; -use solana_program_interface::loader_instruction::LoaderInstruction; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::KeyedAccount; +use solana_sdk::loader_instruction::LoaderInstruction; +use solana_sdk::pubkey::Pubkey; use std::env; use std::path::PathBuf; use std::str; diff --git a/src/packet.rs b/src/packet.rs index e054a70b4..157ba6b1d 100644 --- a/src/packet.rs +++ b/src/packet.rs @@ -12,7 +12,7 @@ use log::Level; use recvmmsg::{recv_mmsg, NUM_RCVMMSGS}; use result::{Error, Result}; use serde::Serialize; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::fmt; use std::io; use std::mem::size_of; diff --git a/src/payment_plan.rs b/src/payment_plan.rs index 62c89ca9f..7f44d75e0 100644 --- a/src/payment_plan.rs +++ b/src/payment_plan.rs @@ -4,7 +4,7 @@ //! `Payment`, the payment is executed. use chrono::prelude::*; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; /// The types of events a payment plan can process. #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)] diff --git a/src/request.rs b/src/request.rs index ec96d7a0e..27dd579da 100644 --- a/src/request.rs +++ b/src/request.rs @@ -2,8 +2,8 @@ use hash::Hash; use signature::Signature; -use solana_program_interface::account::Account; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::Account; +use solana_sdk::pubkey::Pubkey; #[cfg_attr(feature = "cargo-clippy", allow(large_enum_variant))] #[derive(Serialize, Deserialize, Debug, Clone, Copy)] diff --git a/src/rpc.rs b/src/rpc.rs index c682a773a..c898bbec4 100644 --- a/src/rpc.rs +++ b/src/rpc.rs @@ -10,8 +10,8 @@ use jsonrpc_http_server::*; use packet::PACKET_DATA_SIZE; use service::Service; use signature::Signature; -use solana_program_interface::account::Account; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::Account; +use solana_sdk::pubkey::Pubkey; use std::mem; use std::net::{SocketAddr, UdpSocket}; use std::result; diff --git a/src/rpc_pubsub.rs b/src/rpc_pubsub.rs index 02c5213c9..f5de442e9 100644 --- a/src/rpc_pubsub.rs +++ b/src/rpc_pubsub.rs @@ -10,8 +10,8 @@ use jsonrpc_ws_server::{RequestContext, Sender, ServerBuilder}; use rpc::{JsonRpcRequestProcessor, RpcSignatureStatus}; use service::Service; use signature::{Keypair, KeypairUtil, Signature}; -use solana_program_interface::account::Account; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::Account; +use solana_sdk::pubkey::Pubkey; use std::collections::HashMap; use std::mem; use std::net::SocketAddr; diff --git a/src/signature.rs b/src/signature.rs index b67d38dd3..cdc30853e 100644 --- a/src/signature.rs +++ b/src/signature.rs @@ -8,7 +8,7 @@ use rayon::prelude::*; use ring::signature::Ed25519KeyPair; use ring::{rand, signature}; use serde_json; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::error; use std::fmt; use std::fs::File; diff --git a/src/sigverify.rs b/src/sigverify.rs index 6c8042dc3..2ab5618f1 100644 --- a/src/sigverify.rs +++ b/src/sigverify.rs @@ -61,7 +61,7 @@ pub fn init() { fn verify_packet(packet: &Packet) -> u8 { use ring::signature; use signature::Signature; - use solana_program_interface::pubkey::Pubkey; + use solana_sdk::pubkey::Pubkey; use untrusted; let msg_start = TX_OFFSET + SIGNED_DATA_OFFSET; diff --git a/src/storage_program.rs b/src/storage_program.rs index dc3565192..9f1c877e5 100644 --- a/src/storage_program.rs +++ b/src/storage_program.rs @@ -4,8 +4,8 @@ use bincode::deserialize; use hash::Hash; -use solana_program_interface::account::Account; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::Account; +use solana_sdk::pubkey::Pubkey; use transaction::Transaction; #[derive(Serialize, Deserialize, Debug, Clone)] diff --git a/src/system_program.rs b/src/system_program.rs index 37ac33550..61801731b 100644 --- a/src/system_program.rs +++ b/src/system_program.rs @@ -1,8 +1,8 @@ //! system program use bincode::deserialize; -use solana_program_interface::account::Account; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::Account; +use solana_sdk::pubkey::Pubkey; use std; use transaction::Transaction; @@ -123,8 +123,8 @@ mod test { use super::*; use hash::Hash; use signature::{Keypair, KeypairUtil}; - use solana_program_interface::account::Account; - use solana_program_interface::pubkey::Pubkey; + use solana_sdk::account::Account; + use solana_sdk::pubkey::Pubkey; use system_program::SystemProgram; use system_transaction::SystemTransaction; use transaction::Transaction; diff --git a/src/system_transaction.rs b/src/system_transaction.rs index e28615d5b..bab6bd42c 100644 --- a/src/system_transaction.rs +++ b/src/system_transaction.rs @@ -3,7 +3,7 @@ use bincode::serialize; use hash::Hash; use signature::{Keypair, KeypairUtil}; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use system_program::SystemProgram; use transaction::{Instruction, Transaction}; diff --git a/src/thin_client.rs b/src/thin_client.rs index f32fcf375..fa8f1b829 100644 --- a/src/thin_client.rs +++ b/src/thin_client.rs @@ -12,8 +12,8 @@ use ncp::Ncp; use request::{Request, Response}; use result::{Error, Result}; use signature::{Keypair, Signature}; -use solana_program_interface::account::Account; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::Account; +use solana_sdk::pubkey::Pubkey; use std; use std::collections::HashMap; use std::io; diff --git a/src/tictactoe_dashboard_program.rs b/src/tictactoe_dashboard_program.rs index cd0815864..2cb981f9c 100644 --- a/src/tictactoe_dashboard_program.rs +++ b/src/tictactoe_dashboard_program.rs @@ -1,8 +1,8 @@ //! tic-tac-toe dashboard program use serde_cbor; -use solana_program_interface::account::Account; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::Account; +use solana_sdk::pubkey::Pubkey; use tictactoe_program::{Error, Game, Result, State, TicTacToeProgram}; use transaction::Transaction; diff --git a/src/tictactoe_program.rs b/src/tictactoe_program.rs index 422f77830..b2002c7d6 100644 --- a/src/tictactoe_program.rs +++ b/src/tictactoe_program.rs @@ -1,8 +1,8 @@ //! tic-tac-toe program use serde_cbor; -use solana_program_interface::account::Account; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::Account; +use solana_sdk::pubkey::Pubkey; use std; use transaction::Transaction; diff --git a/src/token_program.rs b/src/token_program.rs index 7391c7a75..c918fc3cf 100644 --- a/src/token_program.rs +++ b/src/token_program.rs @@ -2,8 +2,8 @@ use bincode; -use solana_program_interface::account::Account; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::account::Account; +use solana_sdk::pubkey::Pubkey; use std; use transaction::Transaction; diff --git a/src/transaction.rs b/src/transaction.rs index f1715b9dd..1ac24e725 100644 --- a/src/transaction.rs +++ b/src/transaction.rs @@ -3,7 +3,7 @@ use bincode::serialize; use hash::{Hash, Hasher}; use signature::{Keypair, KeypairUtil, Signature}; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::mem::size_of; pub const SIGNED_DATA_OFFSET: usize = size_of::(); diff --git a/src/vote_stage.rs b/src/vote_stage.rs index 6e9fb1050..ce07fb11e 100644 --- a/src/vote_stage.rs +++ b/src/vote_stage.rs @@ -12,7 +12,7 @@ use metrics; use packet::SharedBlob; use result::Result; use signature::Keypair; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::result; use std::sync::atomic::AtomicUsize; use std::sync::{Arc, RwLock}; diff --git a/src/wallet.rs b/src/wallet.rs index 732a63834..88ddbbb61 100644 --- a/src/wallet.rs +++ b/src/wallet.rs @@ -17,7 +17,7 @@ use rpc::RpcSignatureStatus; use rpc_request::RpcRequest; use serde_json; use signature::{Keypair, KeypairUtil, Signature}; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::fs::{self, File}; use std::io::prelude::*; use std::io::{Error, ErrorKind, Write}; diff --git a/src/window.rs b/src/window.rs index 609e75361..d5f3c97c1 100644 --- a/src/window.rs +++ b/src/window.rs @@ -10,7 +10,7 @@ use ledger::{reconstruct_entries_from_blobs, Block}; use log::Level; use packet::SharedBlob; use result::Result; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::cmp; use std::mem; use std::net::SocketAddr; @@ -459,7 +459,7 @@ pub fn new_window_from_entries( #[cfg(test)] mod test { use packet::{Blob, Packet, Packets, SharedBlob, PACKET_DATA_SIZE}; - use solana_program_interface::pubkey::Pubkey; + use solana_sdk::pubkey::Pubkey; use std::io; use std::io::Write; use std::net::UdpSocket; diff --git a/src/window_service.rs b/src/window_service.rs index 98ba645b7..af90ed6c8 100644 --- a/src/window_service.rs +++ b/src/window_service.rs @@ -10,7 +10,7 @@ use metrics; use packet::SharedBlob; use rand::{thread_rng, Rng}; use result::{Error, Result}; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::net::UdpSocket; use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; use std::sync::mpsc::RecvTimeoutError; diff --git a/tests/multinode.rs b/tests/multinode.rs index 5634330cf..03606ff18 100644 --- a/tests/multinode.rs +++ b/tests/multinode.rs @@ -4,7 +4,7 @@ extern crate bincode; extern crate chrono; extern crate serde_json; extern crate solana; -extern crate solana_program_interface; +extern crate solana_sdk; use solana::cluster_info::{ClusterInfo, Node, NodeInfo}; use solana::entry::Entry; @@ -25,7 +25,7 @@ use solana::thin_client::ThinClient; use solana::timing::{duration_as_ms, duration_as_s}; use solana::transaction::Transaction; use solana::window::{default_window, WINDOW_SIZE}; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; use std::collections::{HashSet, VecDeque}; use std::env; use std::fs::{copy, create_dir_all, remove_dir_all}; diff --git a/tests/programs.rs b/tests/programs.rs index 905ce82a1..54b58ae96 100644 --- a/tests/programs.rs +++ b/tests/programs.rs @@ -1,7 +1,7 @@ extern crate bincode; extern crate elf; extern crate solana; -extern crate solana_program_interface; +extern crate solana_sdk; use bincode::serialize; use solana::bank::Bank; @@ -16,7 +16,7 @@ use solana::system_transaction::SystemTransaction; #[cfg(feature = "bpf_c")] use solana::tictactoe_program::Command; use solana::transaction::Transaction; -use solana_program_interface::pubkey::Pubkey; +use solana_sdk::pubkey::Pubkey; #[cfg(feature = "bpf_c")] use std::env; #[cfg(feature = "bpf_c")]