From fe68f7f786acf13e5b1f1fe4c54eb7af7b549391 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 22 Oct 2020 10:23:50 -0700
Subject: [PATCH] Port programs to solana-program-sdk

---
 programs/bpf/Cargo.lock                       | 54 ++++++++++---------
 programs/bpf/build.rs                         |  1 +
 programs/bpf/rust/128bit/Cargo.toml           | 10 +---
 programs/bpf/rust/128bit/src/lib.rs           |  4 +-
 programs/bpf/rust/128bit_dep/Cargo.toml       |  8 +--
 programs/bpf/rust/128bit_dep/src/lib.rs       |  2 +-
 programs/bpf/rust/alloc/Cargo.toml            |  8 +--
 programs/bpf/rust/alloc/src/lib.rs            |  3 +-
 programs/bpf/rust/call_depth/Cargo.toml       | 10 +---
 programs/bpf/rust/call_depth/src/lib.rs       |  2 +-
 programs/bpf/rust/custom_heap/Cargo.toml      |  7 +--
 programs/bpf/rust/custom_heap/src/lib.rs      |  2 +-
 programs/bpf/rust/dep_crate/Cargo.toml        |  8 +--
 programs/bpf/rust/dep_crate/src/lib.rs        |  4 +-
 .../bpf/rust/deprecated_loader/Cargo.toml     |  8 +--
 .../bpf/rust/deprecated_loader/src/lib.rs     |  4 +-
 programs/bpf/rust/dup_accounts/Cargo.toml     |  8 +--
 programs/bpf/rust/dup_accounts/src/lib.rs     |  4 +-
 programs/bpf/rust/error_handling/Cargo.toml   |  8 +--
 programs/bpf/rust/error_handling/src/lib.rs   |  4 +-
 programs/bpf/rust/external_spend/Cargo.toml   |  8 +--
 programs/bpf/rust/external_spend/src/lib.rs   |  4 +-
 .../rust/instruction_introspection/Cargo.toml |  8 +--
 .../rust/instruction_introspection/src/lib.rs |  4 +-
 programs/bpf/rust/invoke/Cargo.toml           |  8 +--
 programs/bpf/rust/invoke/src/lib.rs           |  6 +--
 programs/bpf/rust/invoked/Cargo.toml          |  6 +--
 programs/bpf/rust/invoked/src/instruction.rs  |  2 +-
 programs/bpf/rust/invoked/src/lib.rs          |  1 -
 programs/bpf/rust/invoked/src/processor.rs    |  4 +-
 programs/bpf/rust/iter/Cargo.toml             |  8 +--
 programs/bpf/rust/iter/src/lib.rs             |  4 +-
 programs/bpf/rust/many_args/Cargo.toml        | 10 +---
 programs/bpf/rust/many_args/src/helper.rs     |  4 +-
 programs/bpf/rust/many_args/src/lib.rs        |  4 +-
 programs/bpf/rust/many_args_dep/Cargo.toml    |  8 +--
 programs/bpf/rust/many_args_dep/src/lib.rs    |  4 +-
 programs/bpf/rust/noop/Cargo.toml             |  8 +--
 programs/bpf/rust/noop/src/lib.rs             |  4 +-
 programs/bpf/rust/panic/Cargo.toml            |  8 +--
 programs/bpf/rust/panic/src/lib.rs            |  2 +-
 programs/bpf/rust/param_passing/Cargo.toml    | 10 +---
 programs/bpf/rust/param_passing/src/lib.rs    |  4 +-
 .../bpf/rust/param_passing_dep/Cargo.toml     |  8 +--
 .../bpf/rust/param_passing_dep/src/lib.rs     |  2 +-
 programs/bpf/rust/rand/Cargo.toml             |  8 +--
 programs/bpf/rust/rand/src/lib.rs             |  4 +-
 programs/bpf/rust/ristretto/Cargo.toml        |  8 +--
 programs/bpf/rust/ristretto/src/lib.rs        |  2 +-
 programs/bpf/rust/ristretto/src/ristretto.rs  | 10 ++--
 programs/bpf/rust/sanity/Cargo.toml           |  8 +--
 programs/bpf/rust/sanity/src/lib.rs           |  4 +-
 programs/bpf/rust/sha256/Cargo.toml           |  8 +--
 programs/bpf/rust/sha256/src/lib.rs           |  4 +-
 programs/bpf/rust/sysval/Cargo.toml           |  8 +--
 programs/bpf/rust/sysval/src/lib.rs           |  4 +-
 56 files changed, 113 insertions(+), 253 deletions(-)

diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
index 78c21e4d29..41de494113 100644
--- a/programs/bpf/Cargo.lock
+++ b/programs/bpf/Cargo.lock
@@ -1833,35 +1833,35 @@ name = "solana-bpf-rust-128bit"
 version = "1.5.0"
 dependencies = [
  "solana-bpf-rust-128bit-dep",
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-128bit-dep"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-alloc"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-call-depth"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-custom-heap"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
@@ -1869,21 +1869,21 @@ name = "solana-bpf-rust-dep-crate"
 version = "1.5.0"
 dependencies = [
  "byteorder 1.3.4",
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-deprecated_loader"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-dup-accounts"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
@@ -1892,7 +1892,7 @@ version = "1.5.0"
 dependencies = [
  "num-derive 0.2.5",
  "num-traits",
- "solana-sdk",
+ "solana-program-sdk",
  "thiserror",
 ]
 
@@ -1900,14 +1900,14 @@ dependencies = [
 name = "solana-bpf-rust-external-spend"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-instruction-introspection"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
@@ -1915,21 +1915,21 @@ name = "solana-bpf-rust-invoke"
 version = "1.5.0"
 dependencies = [
  "solana-bpf-rust-invoked",
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-invoked"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-iter"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
@@ -1937,28 +1937,28 @@ name = "solana-bpf-rust-many-args"
 version = "1.5.0"
 dependencies = [
  "solana-bpf-rust-many-args-dep",
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-many-args-dep"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-noop"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-panic"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
@@ -1966,14 +1966,14 @@ name = "solana-bpf-rust-param-passing"
 version = "1.5.0"
 dependencies = [
  "solana-bpf-rust-param-passing-dep",
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-param-passing-dep"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
@@ -1982,7 +1982,7 @@ version = "1.5.0"
 dependencies = [
  "getrandom",
  "rand",
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
@@ -1991,28 +1991,28 @@ version = "1.5.0"
 dependencies = [
  "curve25519-dalek 3.0.0",
  "getrandom",
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-sanity"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-sha256"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
 name = "solana-bpf-rust-sysval"
 version = "1.5.0"
 dependencies = [
- "solana-sdk",
+ "solana-program-sdk",
 ]
 
 [[package]]
@@ -2116,8 +2116,10 @@ version = "1.5.0"
 dependencies = [
  "bincode",
  "bs58",
+ "bv",
  "curve25519-dalek 2.1.0",
  "hex",
+ "itertools",
  "lazy_static",
  "log",
  "num-derive 0.3.0",
diff --git a/programs/bpf/build.rs b/programs/bpf/build.rs
index 4305c170ce..89b8701859 100644
--- a/programs/bpf/build.rs
+++ b/programs/bpf/build.rs
@@ -60,6 +60,7 @@ fn main() {
         let rust_programs = [
             "128bit",
             "alloc",
+            "call_depth",
             "custom_heap",
             "dep_crate",
             "deprecated_loader",
diff --git a/programs/bpf/rust/128bit/Cargo.toml b/programs/bpf/rust/128bit/Cargo.toml
index 2652f0f3e4..4428a58c6b 100644
--- a/programs/bpf/rust/128bit/Cargo.toml
+++ b/programs/bpf/rust/128bit/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-128bit"
 version = "1.5.0"
@@ -11,12 +9,8 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
+solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_128bit"
diff --git a/programs/bpf/rust/128bit/src/lib.rs b/programs/bpf/rust/128bit/src/lib.rs
index 0ad5ba5c6b..d3ab6c62d5 100644
--- a/programs/bpf/rust/128bit/src/lib.rs
+++ b/programs/bpf/rust/128bit/src/lib.rs
@@ -1,7 +1,7 @@
 //! @brief Example Rust-based BPF program tests loop iteration
 
-extern crate solana_sdk;
-use solana_sdk::entrypoint::SUCCESS;
+extern crate solana_program_sdk;
+use solana_program_sdk::entrypoint::SUCCESS;
 
 #[no_mangle]
 pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
diff --git a/programs/bpf/rust/128bit_dep/Cargo.toml b/programs/bpf/rust/128bit_dep/Cargo.toml
index ac9dbd2063..4df7934853 100644
--- a/programs/bpf/rust/128bit_dep/Cargo.toml
+++ b/programs/bpf/rust/128bit_dep/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-128bit-dep"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/bpf/rust/128bit_dep/src/lib.rs b/programs/bpf/rust/128bit_dep/src/lib.rs
index 78900f994b..fcd5a84205 100644
--- a/programs/bpf/rust/128bit_dep/src/lib.rs
+++ b/programs/bpf/rust/128bit_dep/src/lib.rs
@@ -1,6 +1,6 @@
 //! @brief Solana Rust-based BPF program utility functions and types
 
-extern crate solana_sdk;
+extern crate solana_program_sdk;
 
 pub fn uadd(x: u128, y: u128) -> u128 {
     x + y
diff --git a/programs/bpf/rust/alloc/Cargo.toml b/programs/bpf/rust/alloc/Cargo.toml
index 1c41b347e4..a27b020329 100644
--- a/programs/bpf/rust/alloc/Cargo.toml
+++ b/programs/bpf/rust/alloc/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-alloc"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_alloc"
diff --git a/programs/bpf/rust/alloc/src/lib.rs b/programs/bpf/rust/alloc/src/lib.rs
index b627a1e6ed..e84e5c6ff9 100644
--- a/programs/bpf/rust/alloc/src/lib.rs
+++ b/programs/bpf/rust/alloc/src/lib.rs
@@ -2,8 +2,7 @@
 
 #[macro_use]
 extern crate alloc;
-extern crate solana_sdk;
-use solana_sdk::{entrypoint::SUCCESS, info};
+use solana_program_sdk::{entrypoint::SUCCESS, info};
 use std::{alloc::Layout, mem};
 
 #[no_mangle]
diff --git a/programs/bpf/rust/call_depth/Cargo.toml b/programs/bpf/rust/call_depth/Cargo.toml
index d911867141..dc4bd3dec5 100644
--- a/programs/bpf/rust/call_depth/Cargo.toml
+++ b/programs/bpf/rust/call_depth/Cargo.toml
@@ -1,8 +1,6 @@
-
-
 [package]
 name = "solana-bpf-rust-call-depth"
-version = "1.4.0"
+version = "1.5.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.4.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_call_depth"
diff --git a/programs/bpf/rust/call_depth/src/lib.rs b/programs/bpf/rust/call_depth/src/lib.rs
index a2a33e1d34..fcb820c724 100644
--- a/programs/bpf/rust/call_depth/src/lib.rs
+++ b/programs/bpf/rust/call_depth/src/lib.rs
@@ -1,6 +1,6 @@
 //! @brief Example Rust-based BPF program that tests call depth and stack usage
 
-use solana_sdk::{entrypoint::SUCCESS, info};
+use solana_program_sdk::{entrypoint::SUCCESS, info};
 
 #[inline(never)]
 pub fn recurse(data: &mut [u8]) {
diff --git a/programs/bpf/rust/custom_heap/Cargo.toml b/programs/bpf/rust/custom_heap/Cargo.toml
index 27e253f2a1..71b0789a4a 100644
--- a/programs/bpf/rust/custom_heap/Cargo.toml
+++ b/programs/bpf/rust/custom_heap/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-custom-heap"
 version = "1.5.0"
@@ -11,12 +9,11 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [features]
+default = ["custom-heap"]
 custom-heap = []
-program = ["custom-heap", "solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
 
 [lib]
 name = "solana_bpf_rust_custom_heap"
diff --git a/programs/bpf/rust/custom_heap/src/lib.rs b/programs/bpf/rust/custom_heap/src/lib.rs
index 81b27bc339..d8ddc7db53 100644
--- a/programs/bpf/rust/custom_heap/src/lib.rs
+++ b/programs/bpf/rust/custom_heap/src/lib.rs
@@ -1,6 +1,6 @@
 //! @brief Example Rust-based BPF that tests out using a custom heap
 
-use solana_sdk::{
+use solana_program_sdk::{
     account_info::AccountInfo,
     entrypoint,
     entrypoint::{ProgramResult, HEAP_LENGTH, HEAP_START_ADDRESS},
diff --git a/programs/bpf/rust/dep_crate/Cargo.toml b/programs/bpf/rust/dep_crate/Cargo.toml
index 2284f80441..2fc20c2f15 100644
--- a/programs/bpf/rust/dep_crate/Cargo.toml
+++ b/programs/bpf/rust/dep_crate/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-dep-crate"
 version = "1.5.0"
@@ -12,11 +10,7 @@ edition = "2018"
 
 [dependencies]
 byteorder = { version = "1", default-features = false }
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_dep_crate"
diff --git a/programs/bpf/rust/dep_crate/src/lib.rs b/programs/bpf/rust/dep_crate/src/lib.rs
index 98d5da0806..336962706b 100644
--- a/programs/bpf/rust/dep_crate/src/lib.rs
+++ b/programs/bpf/rust/dep_crate/src/lib.rs
@@ -1,8 +1,8 @@
 //! @brief Example Rust-based BPF program tests dependent crates
 
-extern crate solana_sdk;
+extern crate solana_program_sdk;
 use byteorder::{ByteOrder, LittleEndian};
-use solana_sdk::entrypoint::SUCCESS;
+use solana_program_sdk::entrypoint::SUCCESS;
 
 #[no_mangle]
 pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
diff --git a/programs/bpf/rust/deprecated_loader/Cargo.toml b/programs/bpf/rust/deprecated_loader/Cargo.toml
index 682e23cdaf..a7dc15a6d2 100644
--- a/programs/bpf/rust/deprecated_loader/Cargo.toml
+++ b/programs/bpf/rust/deprecated_loader/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-deprecated_loader"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_deprecated_loader"
diff --git a/programs/bpf/rust/deprecated_loader/src/lib.rs b/programs/bpf/rust/deprecated_loader/src/lib.rs
index 3698194a41..43b398c38d 100644
--- a/programs/bpf/rust/deprecated_loader/src/lib.rs
+++ b/programs/bpf/rust/deprecated_loader/src/lib.rs
@@ -2,8 +2,8 @@
 
 #![allow(unreachable_code)]
 
-extern crate solana_sdk;
-use solana_sdk::{
+extern crate solana_program_sdk;
+use solana_program_sdk::{
     account_info::AccountInfo, bpf_loader, entrypoint_deprecated,
     entrypoint_deprecated::ProgramResult, info, log::*, pubkey::Pubkey,
 };
diff --git a/programs/bpf/rust/dup_accounts/Cargo.toml b/programs/bpf/rust/dup_accounts/Cargo.toml
index 6667173461..75e32da916 100644
--- a/programs/bpf/rust/dup_accounts/Cargo.toml
+++ b/programs/bpf/rust/dup_accounts/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-dup-accounts"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_dup_accounts"
diff --git a/programs/bpf/rust/dup_accounts/src/lib.rs b/programs/bpf/rust/dup_accounts/src/lib.rs
index e0ade222b4..5d1c6a52ba 100644
--- a/programs/bpf/rust/dup_accounts/src/lib.rs
+++ b/programs/bpf/rust/dup_accounts/src/lib.rs
@@ -1,7 +1,7 @@
 //! @brief Example Rust-based BPF program that tests duplicate accounts passed via accounts
 
-extern crate solana_sdk;
-use solana_sdk::{
+extern crate solana_program_sdk;
+use solana_program_sdk::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, info,
     program_error::ProgramError, pubkey::Pubkey,
 };
diff --git a/programs/bpf/rust/error_handling/Cargo.toml b/programs/bpf/rust/error_handling/Cargo.toml
index e91f147d59..6962723487 100644
--- a/programs/bpf/rust/error_handling/Cargo.toml
+++ b/programs/bpf/rust/error_handling/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-error-handling"
 version = "1.5.0"
@@ -13,13 +11,9 @@ edition = "2018"
 [dependencies]
 num-derive = "0.2"
 num-traits = "0.2"
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 thiserror = "1.0"
 
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
-
 [lib]
 name = "solana_bpf_rust_error_handling"
 crate-type = ["cdylib"]
diff --git a/programs/bpf/rust/error_handling/src/lib.rs b/programs/bpf/rust/error_handling/src/lib.rs
index 25d792ade3..d9034773d2 100644
--- a/programs/bpf/rust/error_handling/src/lib.rs
+++ b/programs/bpf/rust/error_handling/src/lib.rs
@@ -1,9 +1,9 @@
 //! @brief Example Rust-based BPF program that exercises error handling
 
-extern crate solana_sdk;
+extern crate solana_program_sdk;
 use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;
-use solana_sdk::{
+use solana_program_sdk::{
     account_info::AccountInfo,
     decode_error::DecodeError,
     entrypoint,
diff --git a/programs/bpf/rust/external_spend/Cargo.toml b/programs/bpf/rust/external_spend/Cargo.toml
index 90e17ef615..e50e178e54 100644
--- a/programs/bpf/rust/external_spend/Cargo.toml
+++ b/programs/bpf/rust/external_spend/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-external-spend"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_external_spend"
diff --git a/programs/bpf/rust/external_spend/src/lib.rs b/programs/bpf/rust/external_spend/src/lib.rs
index 42aa4cff4b..16f80b7f97 100644
--- a/programs/bpf/rust/external_spend/src/lib.rs
+++ b/programs/bpf/rust/external_spend/src/lib.rs
@@ -1,7 +1,7 @@
 //! @brief Example Rust-based BPF program that moves a lamport from one account to another
 
-extern crate solana_sdk;
-use solana_sdk::{
+extern crate solana_program_sdk;
+use solana_program_sdk::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,
 };
 
diff --git a/programs/bpf/rust/instruction_introspection/Cargo.toml b/programs/bpf/rust/instruction_introspection/Cargo.toml
index e8adce8ee8..2be74b364a 100644
--- a/programs/bpf/rust/instruction_introspection/Cargo.toml
+++ b/programs/bpf/rust/instruction_introspection/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-instruction-introspection"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_instruction_introspection"
diff --git a/programs/bpf/rust/instruction_introspection/src/lib.rs b/programs/bpf/rust/instruction_introspection/src/lib.rs
index a4ec1ffd2a..bdf51c330b 100644
--- a/programs/bpf/rust/instruction_introspection/src/lib.rs
+++ b/programs/bpf/rust/instruction_introspection/src/lib.rs
@@ -1,7 +1,7 @@
 //! @brief Example Rust-based BPF program that exercises instruction introspection
 
-extern crate solana_sdk;
-use solana_sdk::{
+extern crate solana_program_sdk;
+use solana_program_sdk::{
     account_info::next_account_info, account_info::AccountInfo, entrypoint,
     entrypoint::ProgramResult, info, program_error::ProgramError, pubkey::Pubkey,
     sysvar::instructions,
diff --git a/programs/bpf/rust/invoke/Cargo.toml b/programs/bpf/rust/invoke/Cargo.toml
index 029914dbea..de2db9224a 100644
--- a/programs/bpf/rust/invoke/Cargo.toml
+++ b/programs/bpf/rust/invoke/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-invoke"
 version = "1.5.0"
@@ -12,11 +10,7 @@ edition = "2018"
 
 [dependencies]
 solana-bpf-rust-invoked = { path = "../invoked", default-features = false }
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_invoke"
diff --git a/programs/bpf/rust/invoke/src/lib.rs b/programs/bpf/rust/invoke/src/lib.rs
index e578f667c6..cc400e22f0 100644
--- a/programs/bpf/rust/invoke/src/lib.rs
+++ b/programs/bpf/rust/invoke/src/lib.rs
@@ -2,10 +2,10 @@
 
 #![allow(unreachable_code)]
 
-extern crate solana_sdk;
+extern crate solana_program_sdk;
 
 use solana_bpf_rust_invoked::instruction::*;
-use solana_sdk::{
+use solana_program_sdk::{
     account_info::AccountInfo,
     entrypoint,
     entrypoint::{ProgramResult, MAX_PERMITTED_DATA_INCREASE},
@@ -52,7 +52,7 @@ fn process_instruction(
                 let from_lamports = accounts[FROM_INDEX].lamports();
                 let to_lamports = accounts[DERIVED_KEY1_INDEX].lamports();
                 assert_eq!(accounts[DERIVED_KEY1_INDEX].data_len(), 0);
-                assert!(solana_sdk::system_program::check_id(
+                assert!(solana_program_sdk::system_program::check_id(
                     accounts[DERIVED_KEY1_INDEX].owner
                 ));
 
diff --git a/programs/bpf/rust/invoked/Cargo.toml b/programs/bpf/rust/invoked/Cargo.toml
index de37b19550..8d78993503 100644
--- a/programs/bpf/rust/invoked/Cargo.toml
+++ b/programs/bpf/rust/invoked/Cargo.toml
@@ -11,11 +11,11 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+default = ["program"]
+program = []
 
 [lib]
 name = "solana_bpf_rust_invoked"
diff --git a/programs/bpf/rust/invoked/src/instruction.rs b/programs/bpf/rust/invoked/src/instruction.rs
index a0599c0a52..aebca9e603 100644
--- a/programs/bpf/rust/invoked/src/instruction.rs
+++ b/programs/bpf/rust/invoked/src/instruction.rs
@@ -1,6 +1,6 @@
 //! @brief Example Rust-based BPF program that issues a cross-program-invocation
 
-use solana_sdk::{
+use solana_program_sdk::{
     instruction::{AccountMeta, Instruction},
     pubkey::Pubkey,
 };
diff --git a/programs/bpf/rust/invoked/src/lib.rs b/programs/bpf/rust/invoked/src/lib.rs
index 6f5ecbba15..80d92effa6 100644
--- a/programs/bpf/rust/invoked/src/lib.rs
+++ b/programs/bpf/rust/invoked/src/lib.rs
@@ -1,5 +1,4 @@
 //! @brief Example Rust-based BPF program that issues a cross-program-invocation
 
 pub mod instruction;
-#[cfg(feature = "program")]
 pub mod processor;
diff --git a/programs/bpf/rust/invoked/src/processor.rs b/programs/bpf/rust/invoked/src/processor.rs
index df6671acb5..3645e37d10 100644
--- a/programs/bpf/rust/invoked/src/processor.rs
+++ b/programs/bpf/rust/invoked/src/processor.rs
@@ -1,7 +1,9 @@
 //! @brief Example Rust-based BPF program that issues a cross-program-invocation
 
+#![cfg(feature = "program")]
+
 use crate::instruction::*;
-use solana_sdk::{
+use solana_program_sdk::{
     account_info::AccountInfo,
     bpf_loader, entrypoint,
     entrypoint::ProgramResult,
diff --git a/programs/bpf/rust/iter/Cargo.toml b/programs/bpf/rust/iter/Cargo.toml
index d6cc3ff046..b573000a60 100644
--- a/programs/bpf/rust/iter/Cargo.toml
+++ b/programs/bpf/rust/iter/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-iter"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_iter"
diff --git a/programs/bpf/rust/iter/src/lib.rs b/programs/bpf/rust/iter/src/lib.rs
index ec82f8f5a9..79a08171ac 100644
--- a/programs/bpf/rust/iter/src/lib.rs
+++ b/programs/bpf/rust/iter/src/lib.rs
@@ -1,7 +1,7 @@
 //! @brief Example Rust-based BPF program tests loop iteration
 
-extern crate solana_sdk;
-use solana_sdk::{entrypoint::SUCCESS, info};
+extern crate solana_program_sdk;
+use solana_program_sdk::{entrypoint::SUCCESS, info};
 
 #[no_mangle]
 pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
diff --git a/programs/bpf/rust/many_args/Cargo.toml b/programs/bpf/rust/many_args/Cargo.toml
index 9cd10f6f20..df76e4b80e 100644
--- a/programs/bpf/rust/many_args/Cargo.toml
+++ b/programs/bpf/rust/many_args/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-many-args"
 version = "1.5.0"
@@ -11,12 +9,8 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
+solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_many_args"
diff --git a/programs/bpf/rust/many_args/src/helper.rs b/programs/bpf/rust/many_args/src/helper.rs
index c313f6fc67..1e5351f32d 100644
--- a/programs/bpf/rust/many_args/src/helper.rs
+++ b/programs/bpf/rust/many_args/src/helper.rs
@@ -1,7 +1,7 @@
 //! @brief Example Rust-based BPF program tests loop iteration
 
-extern crate solana_sdk;
-use solana_sdk::log::*;
+extern crate solana_program_sdk;
+use solana_program_sdk::log::*;
 
 pub fn many_args(
     arg1: u64,
diff --git a/programs/bpf/rust/many_args/src/lib.rs b/programs/bpf/rust/many_args/src/lib.rs
index dfe9262f70..794fa1b5a3 100644
--- a/programs/bpf/rust/many_args/src/lib.rs
+++ b/programs/bpf/rust/many_args/src/lib.rs
@@ -1,8 +1,8 @@
 //! @brief Example Rust-based BPF program tests loop iteration
 
 mod helper;
-extern crate solana_sdk;
-use solana_sdk::{entrypoint::SUCCESS, info};
+extern crate solana_program_sdk;
+use solana_program_sdk::{entrypoint::SUCCESS, info};
 
 #[no_mangle]
 pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
diff --git a/programs/bpf/rust/many_args_dep/Cargo.toml b/programs/bpf/rust/many_args_dep/Cargo.toml
index 455fa1220c..88d27e62dc 100644
--- a/programs/bpf/rust/many_args_dep/Cargo.toml
+++ b/programs/bpf/rust/many_args_dep/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-many-args-dep"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/bpf/rust/many_args_dep/src/lib.rs b/programs/bpf/rust/many_args_dep/src/lib.rs
index 201a339dab..496567d37e 100644
--- a/programs/bpf/rust/many_args_dep/src/lib.rs
+++ b/programs/bpf/rust/many_args_dep/src/lib.rs
@@ -1,7 +1,7 @@
 //! @brief Solana Rust-based BPF program utility functions and types
 
-extern crate solana_sdk;
-use solana_sdk::info;
+extern crate solana_program_sdk;
+use solana_program_sdk::info;
 
 pub fn many_args(
     arg1: u64,
diff --git a/programs/bpf/rust/noop/Cargo.toml b/programs/bpf/rust/noop/Cargo.toml
index fef8b293be..ea586b30cf 100644
--- a/programs/bpf/rust/noop/Cargo.toml
+++ b/programs/bpf/rust/noop/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-noop"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_noop"
diff --git a/programs/bpf/rust/noop/src/lib.rs b/programs/bpf/rust/noop/src/lib.rs
index 206b5b1727..f09ccafb22 100644
--- a/programs/bpf/rust/noop/src/lib.rs
+++ b/programs/bpf/rust/noop/src/lib.rs
@@ -1,7 +1,7 @@
 //! @brief Example Rust-based BPF noop program
 
-extern crate solana_sdk;
-use solana_sdk::{
+extern crate solana_program_sdk;
+use solana_program_sdk::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,
 };
 
diff --git a/programs/bpf/rust/panic/Cargo.toml b/programs/bpf/rust/panic/Cargo.toml
index 0fb178e1ed..1f1413cc35 100644
--- a/programs/bpf/rust/panic/Cargo.toml
+++ b/programs/bpf/rust/panic/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-panic"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_panic"
diff --git a/programs/bpf/rust/panic/src/lib.rs b/programs/bpf/rust/panic/src/lib.rs
index f520e48432..d375ee2567 100644
--- a/programs/bpf/rust/panic/src/lib.rs
+++ b/programs/bpf/rust/panic/src/lib.rs
@@ -1,6 +1,6 @@
 //! @brief Example Rust-based BPF program that panics
 
-extern crate solana_sdk;
+extern crate solana_program_sdk;
 
 #[no_mangle]
 pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
diff --git a/programs/bpf/rust/param_passing/Cargo.toml b/programs/bpf/rust/param_passing/Cargo.toml
index 061674bdfe..66f32ea307 100644
--- a/programs/bpf/rust/param_passing/Cargo.toml
+++ b/programs/bpf/rust/param_passing/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-param-passing"
 version = "1.5.0"
@@ -11,12 +9,8 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
+solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_param_passing"
diff --git a/programs/bpf/rust/param_passing/src/lib.rs b/programs/bpf/rust/param_passing/src/lib.rs
index 65a536371f..e57220d894 100644
--- a/programs/bpf/rust/param_passing/src/lib.rs
+++ b/programs/bpf/rust/param_passing/src/lib.rs
@@ -1,8 +1,8 @@
 //! @brief Example Rust-based BPF program tests loop iteration
 
-extern crate solana_sdk;
+extern crate solana_program_sdk;
 use solana_bpf_rust_param_passing_dep::{Data, TestDep};
-use solana_sdk::{entrypoint::SUCCESS, info};
+use solana_program_sdk::{entrypoint::SUCCESS, info};
 
 #[no_mangle]
 pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
diff --git a/programs/bpf/rust/param_passing_dep/Cargo.toml b/programs/bpf/rust/param_passing_dep/Cargo.toml
index 40bcead2a3..141aafd58f 100644
--- a/programs/bpf/rust/param_passing_dep/Cargo.toml
+++ b/programs/bpf/rust/param_passing_dep/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-param-passing-dep"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/bpf/rust/param_passing_dep/src/lib.rs b/programs/bpf/rust/param_passing_dep/src/lib.rs
index caa6dc55a8..59c1a44ae4 100644
--- a/programs/bpf/rust/param_passing_dep/src/lib.rs
+++ b/programs/bpf/rust/param_passing_dep/src/lib.rs
@@ -1,6 +1,6 @@
 //! @brief Example Rust-based BPF program tests loop iteration
 
-extern crate solana_sdk;
+extern crate solana_program_sdk;
 
 #[derive(Debug)]
 pub struct Data<'a> {
diff --git a/programs/bpf/rust/rand/Cargo.toml b/programs/bpf/rust/rand/Cargo.toml
index 41c66726a8..d2ea64b548 100644
--- a/programs/bpf/rust/rand/Cargo.toml
+++ b/programs/bpf/rust/rand/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-rand"
 version = "1.5.0"
@@ -13,11 +11,7 @@ edition = "2018"
 [dependencies]
 getrandom = { version = "0.1.14", features = ["dummy"] }
 rand = "0.7"
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_rand"
diff --git a/programs/bpf/rust/rand/src/lib.rs b/programs/bpf/rust/rand/src/lib.rs
index 4424f3ad44..1d5ae61ab3 100644
--- a/programs/bpf/rust/rand/src/lib.rs
+++ b/programs/bpf/rust/rand/src/lib.rs
@@ -2,8 +2,8 @@
 
 #![allow(unreachable_code)]
 
-extern crate solana_sdk;
-use solana_sdk::{
+extern crate solana_program_sdk;
+use solana_program_sdk::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, info, pubkey::Pubkey,
 };
 
diff --git a/programs/bpf/rust/ristretto/Cargo.toml b/programs/bpf/rust/ristretto/Cargo.toml
index b46547df5a..7d64ae2ee1 100644
--- a/programs/bpf/rust/ristretto/Cargo.toml
+++ b/programs/bpf/rust/ristretto/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-ristretto"
 version = "1.5.0"
@@ -13,11 +11,7 @@ edition = "2018"
 [dependencies]
 curve25519-dalek = "3"
 getrandom = { version = "0.1.14", features = ["dummy"] }
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_ristretto"
diff --git a/programs/bpf/rust/ristretto/src/lib.rs b/programs/bpf/rust/ristretto/src/lib.rs
index 4eec95afc1..403d79a871 100644
--- a/programs/bpf/rust/ristretto/src/lib.rs
+++ b/programs/bpf/rust/ristretto/src/lib.rs
@@ -4,7 +4,7 @@ pub mod ristretto;
 
 use crate::ristretto::ristretto_mul;
 use curve25519_dalek::{constants::RISTRETTO_BASEPOINT_POINT, scalar::Scalar};
-use solana_sdk::{
+use solana_program_sdk::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, info, pubkey::Pubkey,
 };
 
diff --git a/programs/bpf/rust/ristretto/src/ristretto.rs b/programs/bpf/rust/ristretto/src/ristretto.rs
index 588685c5d9..76f652ad15 100644
--- a/programs/bpf/rust/ristretto/src/ristretto.rs
+++ b/programs/bpf/rust/ristretto/src/ristretto.rs
@@ -1,7 +1,5 @@
 use curve25519_dalek::{ristretto::RistrettoPoint, scalar::Scalar};
-#[cfg(all(feature = "program", target_arch = "bpf"))]
-use solana_sdk::entrypoint::SUCCESS;
-use solana_sdk::program_error::ProgramError;
+use solana_program_sdk::program_error::ProgramError;
 
 /// Multiply a ristretto point with a scalar
 ///
@@ -15,12 +13,12 @@ pub fn ristretto_mul(
 ) -> Result<RistrettoPoint, ProgramError> {
     // Perform the calculation inline, calling this from within a program is
     // not supported
-    #[cfg(not(all(feature = "program", target_arch = "bpf")))]
+    #[cfg(not(target_arch = "bpf"))]
     {
         Ok(point * scalar)
     }
     // Call via a system call to perform the calculation
-    #[cfg(all(feature = "program", target_arch = "bpf"))]
+    #[cfg(target_arch = "bpf")]
     {
         extern "C" {
             fn sol_ristretto_mul(
@@ -39,7 +37,7 @@ pub fn ristretto_mul(
             )
         };
         match status {
-            SUCCESS => Ok(result),
+            solana_program_sdk::entrypoint::SUCCESS => Ok(result),
             _ => Err(status.into()),
         }
     }
diff --git a/programs/bpf/rust/sanity/Cargo.toml b/programs/bpf/rust/sanity/Cargo.toml
index d3d3ff9196..7a4b4fd278 100644
--- a/programs/bpf/rust/sanity/Cargo.toml
+++ b/programs/bpf/rust/sanity/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-sanity"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_sanity"
diff --git a/programs/bpf/rust/sanity/src/lib.rs b/programs/bpf/rust/sanity/src/lib.rs
index e44a3d3f0d..54e258b2e9 100644
--- a/programs/bpf/rust/sanity/src/lib.rs
+++ b/programs/bpf/rust/sanity/src/lib.rs
@@ -2,8 +2,8 @@
 
 #![allow(unreachable_code)]
 
-extern crate solana_sdk;
-use solana_sdk::{
+extern crate solana_program_sdk;
+use solana_program_sdk::{
     account_info::AccountInfo, bpf_loader, entrypoint, entrypoint::ProgramResult, info, log::*,
     pubkey::Pubkey,
 };
diff --git a/programs/bpf/rust/sha256/Cargo.toml b/programs/bpf/rust/sha256/Cargo.toml
index 560f23d740..3a61b8d73c 100644
--- a/programs/bpf/rust/sha256/Cargo.toml
+++ b/programs/bpf/rust/sha256/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-sha256"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_sha256"
diff --git a/programs/bpf/rust/sha256/src/lib.rs b/programs/bpf/rust/sha256/src/lib.rs
index d239e8d7ec..e4aad6cd8a 100644
--- a/programs/bpf/rust/sha256/src/lib.rs
+++ b/programs/bpf/rust/sha256/src/lib.rs
@@ -1,7 +1,7 @@
 //! @brief SHA256 Syscall test
 
-extern crate solana_sdk;
-use solana_sdk::{
+extern crate solana_program_sdk;
+use solana_program_sdk::{
     hash::{hashv, Hasher},
     info,
 };
diff --git a/programs/bpf/rust/sysval/Cargo.toml b/programs/bpf/rust/sysval/Cargo.toml
index 202d6d3203..28787474f8 100644
--- a/programs/bpf/rust/sysval/Cargo.toml
+++ b/programs/bpf/rust/sysval/Cargo.toml
@@ -1,5 +1,3 @@
-
-
 [package]
 name = "solana-bpf-rust-sysval"
 version = "1.5.0"
@@ -11,11 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.5.0", default-features = false }
-
-[features]
-program = ["solana-sdk/program"]
-default = ["program", "solana-sdk/default"]
+solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
 
 [lib]
 name = "solana_bpf_rust_sysval"
diff --git a/programs/bpf/rust/sysval/src/lib.rs b/programs/bpf/rust/sysval/src/lib.rs
index a466bb0701..f7f5b5318d 100644
--- a/programs/bpf/rust/sysval/src/lib.rs
+++ b/programs/bpf/rust/sysval/src/lib.rs
@@ -1,7 +1,7 @@
 //! @brief Example Rust-based BPF program that tests sysval use
 
-extern crate solana_sdk;
-use solana_sdk::{
+extern crate solana_program_sdk;
+use solana_program_sdk::{
     account_info::AccountInfo,
     clock::DEFAULT_SLOTS_PER_EPOCH,
     entrypoint,