s/solana_program_interface/solana[_-]sdk/g

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;

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";

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.

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> {

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};
 

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;
 

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};

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};

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;

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};
 

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;

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};

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;

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 {

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;

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;

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;

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)]

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)]

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;

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;

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;

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;

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)]

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;

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};
 

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;

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;
 

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;
 

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;
 

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::<Signature>();

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};

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};

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;

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;