chore: move programs/bpf to programs/sbf

Cargo.toml

@@ -98,7 +98,7 @@ members = [
 ]
 
 exclude = [
-    "programs/bpf",
+    "programs/sbf",
 ]
 
 # This prevents a Travis CI error when building for Windows.

cargo-build-sbf

@@ -2,7 +2,7 @@
 
 here=$(dirname "$0")
 
-maybe_sbf_sdk="--sbf-sdk $here/sdk/bpf"
+maybe_sbf_sdk="--sbf-sdk $here/sdk/sbf"
 for a in "$@"; do
   if [[ $a = --sbf-sdk ]]; then
     maybe_sbf_sdk=
@@ -10,7 +10,7 @@ for a in "$@"; do
 done
 
 set -ex
-if [[ ! -f "$here"/sdk/bpf/syscalls.txt ]]; then
+if [[ ! -f "$here"/sdk/sbf/syscalls.txt ]]; then
   "$here"/cargo build --manifest-path "$here"/programs/bpf_loader/gen-syscall-list/Cargo.toml
 fi
 exec "$here"/cargo run --manifest-path "$here"/sdk/cargo-build-sbf/Cargo.toml -- $maybe_sbf_sdk "$@"

cargo-test-sbf

@@ -2,7 +2,7 @@
 
 here=$(dirname "$0")
 
-maybe_sbf_sdk="--sbf-sdk $here/sdk/bpf"
+maybe_sbf_sdk="--sbf-sdk $here/sdk/sbf"
 for a in "$@"; do
   if [[ $a = --sbf-sdk ]]; then
     maybe_sbf_sdk=

ci/test-bench.sh

@@ -58,7 +58,7 @@ _ "$cargo" nightly bench --manifest-path core/Cargo.toml ${V:+--verbose} \
   -- -Z unstable-options --format=json | tee -a "$BENCH_FILE"
 
 # Run sbf benches
-_ "$cargo" nightly bench --manifest-path programs/bpf/Cargo.toml ${V:+--verbose} --features=bpf_c \
+_ "$cargo" nightly bench --manifest-path programs/sbf/Cargo.toml ${V:+--verbose} --features=sbf_c \
   -- -Z unstable-options --format=json --nocapture | tee -a "$BENCH_FILE"
 
 # Run banking/accounts bench. Doesn't require nightly, but use since it is already built.

ci/test-stable.sh

@@ -87,20 +87,20 @@ test-stable-sbf)
   "$cargo_build_sbf" --manifest-path sdk/Cargo.toml
 
   # SBF C program system tests
-  _ make -C programs/bpf/c tests
+  _ make -C programs/sbf/c tests
   if need_to_generate_test_result; then
     _ "$cargo" stable test \
-      --manifest-path programs/bpf/Cargo.toml \
-      --no-default-features --features=bpf_c,bpf_rust -- -Z unstable-options --format json --report-time | tee results.json
+      --manifest-path programs/sbf/Cargo.toml \
+      --no-default-features --features=sbf_c,sbf_rust -- -Z unstable-options --format json --report-time | tee results.json
     exit_if_error "${PIPESTATUS[0]}"
   else
     _ "$cargo" stable test \
-      --manifest-path programs/bpf/Cargo.toml \
-      --no-default-features --features=bpf_c,bpf_rust -- --nocapture
+      --manifest-path programs/sbf/Cargo.toml \
+      --no-default-features --features=sbf_c,sbf_rust -- --nocapture
   fi
 
   # SBF Rust program unit tests
-  for sbf_test in programs/bpf/rust/*; do
+  for sbf_test in programs/sbf/rust/*; do
     if pushd "$sbf_test"; then
       "$cargo" test
       "$cargo_build_sbf" --sbf-sdk ../../../../sdk/sbf --dump
@@ -129,17 +129,17 @@ test-stable-sbf)
   "$cargo_build_sbf" -V
 
   # SBF program instruction count assertion
-  sbf_target_path=programs/bpf/target
+  sbf_target_path=programs/sbf/target
   if need_to_generate_test_result; then
     _ "$cargo" stable test \
-      --manifest-path programs/bpf/Cargo.toml \
-      --no-default-features --features=bpf_c,bpf_rust assert_instruction_count \
+      --manifest-path programs/sbf/Cargo.toml \
+      --no-default-features --features=sbf_c,sbf_rust assert_instruction_count \
       -- -Z unstable-options --format json --report-time |& tee results.json
     awk '!/{ "type": .* }/' results.json >"${sbf_target_path}"/deploy/instuction_counts.txt
   else
     _ "$cargo" stable test \
-      --manifest-path programs/bpf/Cargo.toml \
-      --no-default-features --features=bpf_c,bpf_rust assert_instruction_count \
+      --manifest-path programs/sbf/Cargo.toml \
+      --no-default-features --features=sbf_c,sbf_rust assert_instruction_count \
       -- --nocapture &> "${sbf_target_path}"/deploy/instuction_counts.txt
   fi
 

cli/tests/fixtures/build.sh

@@ -3,6 +3,6 @@ set -ex
 
 cd "$(dirname "$0")"
 
-make -C ../../../programs/bpf/c/
-cp ../../../programs/bpf/c/out/noop.so .
+make -C ../../../programs/sbf/c/
+cp ../../../programs/sbf/c/out/noop.so .
 cat noop.so noop.so noop.so > noop_large.so

programs/bpf/rust/invoke_and_ok/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "solana-bpf-rust-invoke-and-ok"
-version = "1.15.0"
-description = "Solana BPF test program written in Rust"
-authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-repository = "https://github.com/solana-labs/solana"
-license = "Apache-2.0"
-homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-invoke-and-ok"
-edition = "2021"
-
-[dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.15.0" }
-
-[lib]
-crate-type = ["cdylib"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

programs/bpf/rust/ro_account_modify/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "solana-bpf-rust-ro-account_modify"
-version = "1.15.0"
-description = "Solana BPF test program written in Rust"
-authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-repository = "https://github.com/solana-labs/solana"
-license = "Apache-2.0"
-homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-ro-modify"
-edition = "2021"
-
-[dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.15.0" }
-
-[lib]
-crate-type = ["cdylib"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

programs/bpf/rust/ro_modify/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "solana-bpf-rust-ro-modify"
-version = "1.15.0"
-description = "Solana BPF test program written in Rust"
-authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-repository = "https://github.com/solana-labs/solana"
-license = "Apache-2.0"
-homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-ro-modify"
-edition = "2021"
-
-[dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.15.0" }
-
-[lib]
-crate-type = ["cdylib"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

programs/bpf/rust/spoof1_system/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "solana-bpf-rust-spoof1-system"
-version = "1.15.0"
-description = "Solana BPF test program written in Rust"
-authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-repository = "https://github.com/solana-labs/solana"
-license = "Apache-2.0"
-homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-spoof1-system"
-edition = "2021"
-
-[dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.15.0" }
-
-[lib]
-crate-type = ["cdylib"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

programs/bpf/rust/upgradeable/Cargo.toml

@@ -1,20 +0,0 @@
-[package]
-name = "solana-bpf-rust-upgradeable"
-version = "1.15.0"
-description = "Solana BPF test program written in Rust"
-authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-repository = "https://github.com/solana-labs/solana"
-license = "Apache-2.0"
-homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-upgradeable"
-edition = "2021"
-
-[dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.15.0" }
-
-[lib]
-name = "solana_bpf_rust_upgradeable"
-crate-type = ["cdylib"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

programs/bpf/rust/upgraded/Cargo.toml

@@ -1,20 +0,0 @@
-[package]
-name = "solana-bpf-rust-upgraded"
-version = "1.15.0"
-description = "Solana BPF test program written in Rust"
-authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-repository = "https://github.com/solana-labs/solana"
-license = "Apache-2.0"
-homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-upgraded"
-edition = "2021"
-
-[dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.15.0" }
-
-[lib]
-name = "solana_bpf_rust_upgraded"
-crate-type = ["cdylib"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

programs/bpf_loader/gen-syscall-list/build.rs

@@ -10,12 +10,12 @@ use {
 
 /**
  * Extract a list of registered syscall names and save it in a file
- * for distribution with the SDK.  This file is read by cargo-build-bpf
- * to verify undefined symbols in a .so module that cargo-build-bpf has built.
+ * for distribution with the SDK.  This file is read by cargo-build-sbf
+ * to verify undefined symbols in a .so module that cargo-build-sbf has built.
  */
 fn main() {
     let syscalls_rs_path = PathBuf::from("../src/syscalls/mod.rs");
-    let syscalls_txt_path = PathBuf::from("../../../sdk/bpf/syscalls.txt");
+    let syscalls_txt_path = PathBuf::from("../../../sdk/sbf/syscalls.txt");
     println!(
         "cargo:warning=(not a warning) Generating {1} from {0}",
         syscalls_rs_path.display(),

programs/sbf/Cargo.lock

@@ -4191,392 +4191,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "solana-bpf-programs"
-version = "1.15.0"
-dependencies = [
- "bincode",
- "byteorder 1.4.3",
- "elf",
- "itertools",
- "log",
- "miow",
- "net2",
- "solana-account-decoder",
- "solana-bpf-loader-program",
- "solana-bpf-rust-invoke",
- "solana-bpf-rust-realloc",
- "solana-bpf-rust-realloc-invoke",
- "solana-cli-output",
- "solana-ledger",
- "solana-logger 1.15.0",
- "solana-measure",
- "solana-program-runtime",
- "solana-runtime",
- "solana-sdk 1.15.0",
- "solana-transaction-status",
- "solana_rbpf",
- "walkdir",
-]
-
-[[package]]
-name = "solana-bpf-rust-128bit"
-version = "1.15.0"
-dependencies = [
- "solana-bpf-rust-128bit-dep",
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-128bit-dep"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-alloc"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-call-depth"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-caller-access"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-curve25519"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
- "solana-zk-token-sdk 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-custom-heap"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-dep-crate"
-version = "1.15.0"
-dependencies = [
- "byteorder 1.4.3",
- "solana-address-lookup-table-program",
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-deprecated-loader"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-dup-accounts"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-error-handling"
-version = "1.15.0"
-dependencies = [
- "num-derive",
- "num-traits",
- "solana-program 1.15.0",
- "thiserror",
-]
-
-[[package]]
-name = "solana-bpf-rust-external-spend"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-finalize"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-get-minimum-delegation"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-inner_instruction_alignment_check"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-instruction-introspection"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-invoke"
-version = "1.15.0"
-dependencies = [
- "solana-bpf-rust-invoked",
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-invoke-and-error"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-invoke-and-ok"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-invoke-and-return"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-invoked"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-iter"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-log-data"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-many-args"
-version = "1.15.0"
-dependencies = [
- "solana-bpf-rust-many-args-dep",
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-many-args-dep"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-mem"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
- "solana-program-runtime",
- "solana-program-test",
- "solana-sdk 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-membuiltins"
-version = "1.15.0"
-dependencies = [
- "solana-bpf-rust-mem",
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-noop"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-panic"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-param-passing"
-version = "1.15.0"
-dependencies = [
- "solana-bpf-rust-param-passing-dep",
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-param-passing-dep"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-rand"
-version = "1.15.0"
-dependencies = [
- "getrandom 0.1.14",
- "rand 0.7.3",
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-realloc"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-realloc-invoke"
-version = "1.15.0"
-dependencies = [
- "solana-bpf-rust-realloc",
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-ro-account_modify"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-ro-modify"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-sanity"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
- "solana-program-runtime",
- "solana-program-test",
- "solana-sdk 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-secp256k1-recover"
-version = "1.15.0"
-dependencies = [
- "libsecp256k1 0.7.0",
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-sha"
-version = "1.15.0"
-dependencies = [
- "blake3",
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-sibling-instructions"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-sibling_inner-instructions"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-simulation"
-version = "1.15.0"
-dependencies = [
- "solana-logger 1.15.0",
- "solana-program 1.15.0",
- "solana-program-test",
- "solana-sdk 1.15.0",
- "solana-validator",
-]
-
-[[package]]
-name = "solana-bpf-rust-spoof1"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-spoof1-system"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-sysvar"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
- "solana-program-runtime",
- "solana-program-test",
- "solana-sdk 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-upgradeable"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
-[[package]]
-name = "solana-bpf-rust-upgraded"
-version = "1.15.0"
-dependencies = [
- "solana-program 1.15.0",
-]
-
 [[package]]
 name = "solana-bucket-map"
 version = "1.15.0"
@@ -5494,6 +5108,392 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "solana-sbf-programs"
+version = "1.15.0"
+dependencies = [
+ "bincode",
+ "byteorder 1.4.3",
+ "elf",
+ "itertools",
+ "log",
+ "miow",
+ "net2",
+ "solana-account-decoder",
+ "solana-bpf-loader-program",
+ "solana-cli-output",
+ "solana-ledger",
+ "solana-logger 1.15.0",
+ "solana-measure",
+ "solana-program-runtime",
+ "solana-runtime",
+ "solana-sbf-rust-invoke",
+ "solana-sbf-rust-realloc",
+ "solana-sbf-rust-realloc-invoke",
+ "solana-sdk 1.15.0",
+ "solana-transaction-status",
+ "solana_rbpf",
+ "walkdir",
+]
+
+[[package]]
+name = "solana-sbf-rust-128bit"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+ "solana-sbf-rust-128bit-dep",
+]
+
+[[package]]
+name = "solana-sbf-rust-128bit-dep"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-alloc"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-call-depth"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-caller-access"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-curve25519"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+ "solana-zk-token-sdk 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-custom-heap"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-dep-crate"
+version = "1.15.0"
+dependencies = [
+ "byteorder 1.4.3",
+ "solana-address-lookup-table-program",
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-deprecated-loader"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-dup-accounts"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-error-handling"
+version = "1.15.0"
+dependencies = [
+ "num-derive",
+ "num-traits",
+ "solana-program 1.15.0",
+ "thiserror",
+]
+
+[[package]]
+name = "solana-sbf-rust-external-spend"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-finalize"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-get-minimum-delegation"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-inner_instruction_alignment_check"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-instruction-introspection"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-invoke"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+ "solana-sbf-rust-invoked",
+]
+
+[[package]]
+name = "solana-sbf-rust-invoke-and-error"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-invoke-and-ok"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-invoke-and-return"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-invoked"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-iter"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-log-data"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-many-args"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+ "solana-sbf-rust-many-args-dep",
+]
+
+[[package]]
+name = "solana-sbf-rust-many-args-dep"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-mem"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+ "solana-program-runtime",
+ "solana-program-test",
+ "solana-sdk 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-membuiltins"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+ "solana-sbf-rust-mem",
+]
+
+[[package]]
+name = "solana-sbf-rust-noop"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-panic"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-param-passing"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+ "solana-sbf-rust-param-passing-dep",
+]
+
+[[package]]
+name = "solana-sbf-rust-param-passing-dep"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-rand"
+version = "1.15.0"
+dependencies = [
+ "getrandom 0.1.14",
+ "rand 0.7.3",
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-realloc"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-realloc-invoke"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+ "solana-sbf-rust-realloc",
+]
+
+[[package]]
+name = "solana-sbf-rust-ro-account_modify"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-ro-modify"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-sanity"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+ "solana-program-runtime",
+ "solana-program-test",
+ "solana-sdk 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-secp256k1-recover"
+version = "1.15.0"
+dependencies = [
+ "libsecp256k1 0.7.0",
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-sha"
+version = "1.15.0"
+dependencies = [
+ "blake3",
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-sibling-instructions"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-sibling_inner-instructions"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-simulation"
+version = "1.15.0"
+dependencies = [
+ "solana-logger 1.15.0",
+ "solana-program 1.15.0",
+ "solana-program-test",
+ "solana-sdk 1.15.0",
+ "solana-validator",
+]
+
+[[package]]
+name = "solana-sbf-rust-spoof1"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-spoof1-system"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-sysvar"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+ "solana-program-runtime",
+ "solana-program-test",
+ "solana-sdk 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-upgradeable"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
+[[package]]
+name = "solana-sbf-rust-upgraded"
+version = "1.15.0"
+dependencies = [
+ "solana-program 1.15.0",
+]
+
 [[package]]
 name = "solana-sdk"
 version = "1.11.5"

programs/sbf/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "solana-bpf-programs"
+name = "solana-sbf-programs"
 description = "Blockchain, Rebuilt for Scale"
 version = "1.15.0"
 documentation = "https://docs.rs/solana"
@@ -12,8 +12,8 @@ edition = "2021"
 publish = false
 
 [features]
-bpf_c = []
-bpf_rust = []
+sbf_c = []
+sbf_rust = []
 
 [build-dependencies]
 walkdir = "2"
@@ -28,14 +28,14 @@ miow = "0.3.6"
 net2 = "0.2.37"
 solana-account-decoder = { path = "../../account-decoder", version = "=1.15.0" }
 solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.15.0" }
-solana-bpf-rust-invoke = { path = "rust/invoke", version = "=1.15.0" }
-solana-bpf-rust-realloc = { path = "rust/realloc", version = "=1.15.0" }
-solana-bpf-rust-realloc-invoke = { path = "rust/realloc_invoke", version = "=1.15.0" }
 solana-cli-output = { path = "../../cli-output", version = "=1.15.0" }
 solana-logger = { path = "../../logger", version = "=1.15.0" }
 solana-measure = { path = "../../measure", version = "=1.15.0" }
 solana-program-runtime = { path = "../../program-runtime", version = "=1.15.0" }
 solana-runtime = { path = "../../runtime", version = "=1.15.0" }
+solana-sbf-rust-invoke = { path = "rust/invoke", version = "=1.15.0" }
+solana-sbf-rust-realloc = { path = "rust/realloc", version = "=1.15.0" }
+solana-sbf-rust-realloc-invoke = { path = "rust/realloc_invoke", version = "=1.15.0" }
 solana-sdk = { path = "../../sdk", version = "=1.15.0" }
 solana-transaction-status = { path = "../../transaction-status", version = "=1.15.0" }
 solana_rbpf = "=0.2.34"

programs/sbf/benches/bpf_loader.rs

@@ -1,5 +1,5 @@
 #![feature(test)]
-#![cfg(feature = "bpf_c")]
+#![cfg(feature = "sbf_c")]
 
 extern crate test;
 #[macro_use]
@@ -39,35 +39,35 @@ use {
     test::Bencher,
 };
 
-/// BPF program file extension
-const PLATFORM_FILE_EXTENSION_BPF: &str = "so";
-/// Create a BPF program file name
-fn create_bpf_path(name: &str) -> PathBuf {
+/// SBF program file extension
+const PLATFORM_FILE_EXTENSION_SBF: &str = "so";
+/// Create a SBF program file name
+fn create_sbf_path(name: &str) -> PathBuf {
     let mut pathbuf = {
         let current_exe = env::current_exe().unwrap();
         PathBuf::from(current_exe.parent().unwrap().parent().unwrap())
     };
-    pathbuf.push("bpf/");
+    pathbuf.push("sbf/");
     pathbuf.push(name);
-    pathbuf.set_extension(PLATFORM_FILE_EXTENSION_BPF);
+    pathbuf.set_extension(PLATFORM_FILE_EXTENSION_SBF);
     pathbuf
 }
 
 fn load_elf(name: &str) -> Result<Vec<u8>, std::io::Error> {
-    let path = create_bpf_path(name);
+    let path = create_sbf_path(name);
     let mut file = File::open(&path).expect(&format!("Unable to open {:?}", path));
     let mut elf = Vec::new();
     file.read_to_end(&mut elf).unwrap();
     Ok(elf)
 }
 
-fn load_bpf_program(
+fn load_sbf_program(
     bank_client: &BankClient,
     loader_id: &Pubkey,
     payer_keypair: &Keypair,
     name: &str,
 ) -> Pubkey {
-    let path = create_bpf_path(name);
+    let path = create_sbf_path(name);
     let mut file = File::open(path).unwrap();
     let mut elf = Vec::new();
     file.read_to_end(&mut elf).unwrap();
@@ -192,7 +192,7 @@ fn bench_program_execute_noop(bencher: &mut Bencher) {
     let bank_client = BankClient::new_shared(&bank);
 
     let invoke_program_id =
-        load_bpf_program(&bank_client, &bpf_loader::id(), &mint_keypair, "noop");
+        load_sbf_program(&bank_client, &bpf_loader::id(), &mint_keypair, "noop");
 
     let mint_pubkey = mint_keypair.pubkey();
     let account_metas = vec![AccountMeta::new(mint_pubkey, true)];

programs/sbf/build.rs

@@ -37,9 +37,9 @@ fn rerun_if_changed(files: &[&str], directories: &[&str], excludes: &[&str]) {
 }
 
 fn main() {
-    let bpf_c = env::var("CARGO_FEATURE_BPF_C").is_ok();
-    if bpf_c {
-        let install_dir = "OUT_DIR=../target/".to_string() + &env::var("PROFILE").unwrap() + "/bpf";
+    let sbf_c = env::var("CARGO_FEATURE_SBF_C").is_ok();
+    if sbf_c {
+        let install_dir = "OUT_DIR=../target/".to_string() + &env::var("PROFILE").unwrap() + "/sbf";
 
         println!("cargo:warning=(not a warning) Building C-based SBF programs");
         assert!(Command::new("make")
@@ -53,9 +53,9 @@ fn main() {
         rerun_if_changed(&["c/makefile"], &["c/src", "../../sdk"], &["/target/"]);
     }
 
-    let bpf_rust = env::var("CARGO_FEATURE_BPF_RUST").is_ok();
-    if bpf_rust {
-        let install_dir = "target/".to_string() + &env::var("PROFILE").unwrap() + "/bpf";
+    let sbf_rust = env::var("CARGO_FEATURE_SBF_RUST").is_ok();
+    if sbf_rust {
+        let install_dir = "target/".to_string() + &env::var("PROFILE").unwrap() + "/sbf";
 
         let rust_programs = [
             "128bit",
@@ -104,7 +104,7 @@ fn main() {
         ];
         for program in rust_programs.iter() {
             println!(
-                "cargo:warning=(not a warning) Building Rust-based SBF programs: solana_bpf_rust_{}",
+                "cargo:warning=(not a warning) Building Rust-based SBF programs: solana_sbf_rust_{}",
                 program
             );
             assert!(Command::new("../../cargo-build-sbf")

programs/sbf/c/src/alloc/alloc.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF sanity rogram that prints out the parameters
+ * @brief Example C-based SBF sanity rogram that prints out the parameters
  * passed to it
  */
 #include <solana_sdk.h>

programs/sbf/c/src/deprecated_loader/deprecated_loader.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF program that prints out the parameters
+ * @brief Example C-based SBF program that prints out the parameters
  * passed to it
  */
 #include <sol/types.h>

programs/sbf/c/src/dup_accounts/dup_accounts.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF program that exercises duplicate keyed accounts
+ * @brief Example C-based SBF program that exercises duplicate keyed accounts
  * passed to it
  */
 #include <solana_sdk.h>

programs/sbf/c/src/error_handling/error_handling.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF program that exercises duplicate keyed ka
+ * @brief Example C-based SBF program that exercises duplicate keyed ka
  * passed to it
  */
 #include <solana_sdk.h>

programs/sbf/c/src/float/float.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C based BPF program that performs operations
+ * @brief Example C based SBF program that performs operations
  * on floating point values.  The test fails if floating point
  * emulation functions were not linked to the module.
  */

programs/sbf/c/src/invoke/invoke.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF program that tests cross-program invocations
+ * @brief Example C-based SBF program that tests cross-program invocations
  */
 #include "../invoked/instruction.h"
 #include <sol/entrypoint.h>

programs/sbf/c/src/invoked/invoked.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF program that tests cross-program invocations
+ * @brief Example C-based SBF program that tests cross-program invocations
  */
 #include "instruction.h"
 #include <solana_sdk.h>
@@ -31,16 +31,11 @@ extern uint64_t entrypoint(const uint8_t *input) {
     static const int INVOKED_PROGRAM_DUP_INDEX = 3;
     sol_assert(sol_deserialize(input, &params, 4));
 
-    SolPubkey bpf_loader_id =
+    SolPubkey sbf_loader_id =
         (SolPubkey){.x = {2,  168, 246, 145, 78,  136, 161, 110, 57,  90, 225,
                           40, 148, 143, 250, 105, 86,  147, 55,  104, 24, 221,
                           71, 67,  82,  33,  243, 198, 0,   0,   0,   0}};
 
-    SolPubkey bpf_loader_deprecated_id =
-        (SolPubkey){.x = {2,   168, 246, 145, 78,  136, 161, 107, 189, 35,  149,
-                          133, 95,  100, 4,   217, 180, 244, 86,  183, 130, 27,
-                          176, 20,  87,  73,  66,  140, 0,   0,   0,   0}};
-
     for (int i = 0; i < params.data_len; i++) {
       sol_assert(params.data[i] == i);
     }
@@ -68,7 +63,7 @@ extern uint64_t entrypoint(const uint8_t *input) {
     sol_assert(
         SolPubkey_same(accounts[INVOKED_PROGRAM_INDEX].key, params.program_id))
         sol_assert(SolPubkey_same(accounts[INVOKED_PROGRAM_INDEX].owner,
-                                  &bpf_loader_id));
+                                  &sbf_loader_id));
     sol_assert(!accounts[INVOKED_PROGRAM_INDEX].is_signer);
     sol_assert(!accounts[INVOKED_PROGRAM_INDEX].is_writable);
     sol_assert(accounts[INVOKED_PROGRAM_INDEX].rent_epoch == 0);

programs/sbf/c/src/log_data/log_data.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF program uses sol_log_data
+ * @brief Example C-based SBF program uses sol_log_data
  */
 #include <solana_sdk.h>
 

programs/sbf/c/src/move_funds/move_funds.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF program that moves funds from one account to
+ * @brief Example C-based SBF program that moves funds from one account to
  * another
  */
 #include <solana_sdk.h>

programs/sbf/c/src/noop++/noop++.cc

@@ -1,5 +1,5 @@
 /**
- * @brief Example C++ based BPF program that prints out the parameters
+ * @brief Example C++ based SBF program that prints out the parameters
  * passed to it
  */
 #include <solana_sdk.h>

programs/sbf/c/src/noop/noop.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C based BPF program that prints out the parameters
+ * @brief Example C based SBF program that prints out the parameters
  * passed to it
  */
 #include <sol/deserialize.h>

programs/sbf/c/src/panic/panic.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF program that prints out the parameters
+ * @brief Example C-based SBF program that prints out the parameters
  * passed to it
  */
 #include <solana_sdk.h>

programs/sbf/c/src/relative_call/relative_call.c

@@ -1,5 +1,5 @@
 /**
- * @brief test program that generates BPF PC relative call instructions
+ * @brief test program that generates SBF PC relative call instructions
  */
 #include <solana_sdk.h>
 

programs/sbf/c/src/sanity++/sanity++.cc

@@ -1,5 +1,5 @@
 /**
- * @brief Example C++-based BPF program that prints out the parameters
+ * @brief Example C++-based SBF program that prints out the parameters
  * passed to it
  */
 #include <solana_sdk.h>

programs/sbf/c/src/sanity/sanity.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF sanity rogram that prints out the parameters
+ * @brief Example C-based SBF sanity rogram that prints out the parameters
  * passed to it
  */
 #include <solana_sdk.h>

programs/sbf/c/src/sbf_to_sbf/entrypoint.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF program that prints out the parameters
+ * @brief Example C-based SBF program that prints out the parameters
  * passed to it
  */
 #include <solana_sdk.h>

programs/sbf/c/src/sbf_to_sbf/helper.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF program that prints out the parameters
+ * @brief Example C-based SBF program that prints out the parameters
  * passed to it
  */
 #include <solana_sdk.h>

programs/sbf/c/src/sbf_to_sbf/helper.h

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF program that prints out the parameters
+ * @brief Example C-based SBF program that prints out the parameters
  * passed to it
  */
 #include <solana_sdk.h>

programs/sbf/c/src/ser/ser.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C-based BPF sanity rogram that prints out the parameters
+ * @brief Example C-based SBF sanity rogram that prints out the parameters
  * passed to it
  */
 #include <solana_sdk.h>

programs/sbf/c/src/stdlib/stdlib.c

@@ -1,5 +1,5 @@
 /**
- * @brief Example C based BPF program that uses C standard
+ * @brief Example C based SBF program that uses C standard
  * library functions.  The test fails if the C standard
  * library is not available.
  *

programs/sbf/rust/128bit/Cargo.toml

@@ -1,17 +1,17 @@
 [package]
-name = "solana-bpf-rust-128bit"
+name = "solana-sbf-rust-128bit"
 version = "1.15.0"
-description = "Solana BPF test program written in Rust"
+description = "Solana SBF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-128bit"
+documentation = "https://docs.rs/solana-sbf-rust-128bit"
 edition = "2021"
 
 [dependencies]
-solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.15.0" }
 solana-program = { path = "../../../../sdk/program", version = "=1.15.0" }
+solana-sbf-rust-128bit-dep = { path = "../128bit_dep", version = "=1.15.0" }
 
 [lib]
 crate-type = ["cdylib"]

programs/sbf/rust/128bit/src/lib.rs

@@ -1,4 +1,4 @@
-//! Example Rust-based BPF program tests loop iteration
+//! Example Rust-based SBF program tests loop iteration
 
 extern crate solana_program;
 use solana_program::{custom_heap_default, custom_panic_default, entrypoint::SUCCESS};
@@ -21,22 +21,22 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
     assert_eq!(u128::from(1u32.to_le()), 1);
     assert_eq!(u128::from(1u32.to_be()), 0x0100_0000);
 
-    assert_eq!(solana_bpf_rust_128bit_dep::uadd(10, 20), 30u128);
-    assert_eq!(solana_bpf_rust_128bit_dep::usubtract(30, 20), 10u128);
-    assert_eq!(solana_bpf_rust_128bit_dep::umultiply(30, 20), 600u128);
-    assert_eq!(solana_bpf_rust_128bit_dep::udivide(20, 10), 2u128);
-    assert_eq!(solana_bpf_rust_128bit_dep::umodulo(20, 3), 2u128);
+    assert_eq!(solana_sbf_rust_128bit_dep::uadd(10, 20), 30u128);
+    assert_eq!(solana_sbf_rust_128bit_dep::usubtract(30, 20), 10u128);
+    assert_eq!(solana_sbf_rust_128bit_dep::umultiply(30, 20), 600u128);
+    assert_eq!(solana_sbf_rust_128bit_dep::udivide(20, 10), 2u128);
+    assert_eq!(solana_sbf_rust_128bit_dep::umodulo(20, 3), 2u128);
 
-    assert_eq!(solana_bpf_rust_128bit_dep::add(-10, -20), -30i128);
-    assert_eq!(solana_bpf_rust_128bit_dep::subtract(-30, -20), -10i128);
-    assert_eq!(solana_bpf_rust_128bit_dep::multiply(-30, -20), 600i128);
-    assert_eq!(solana_bpf_rust_128bit_dep::divide(-20, -10), 2i128);
-    assert_eq!(solana_bpf_rust_128bit_dep::modulo(-20, -3), -2i128);
+    assert_eq!(solana_sbf_rust_128bit_dep::add(-10, -20), -30i128);
+    assert_eq!(solana_sbf_rust_128bit_dep::subtract(-30, -20), -10i128);
+    assert_eq!(solana_sbf_rust_128bit_dep::multiply(-30, -20), 600i128);
+    assert_eq!(solana_sbf_rust_128bit_dep::divide(-20, -10), 2i128);
+    assert_eq!(solana_sbf_rust_128bit_dep::modulo(-20, -3), -2i128);
 
     let x = u64::max_value();
     assert_eq!(u128::from(x) + u128::from(x), 36_893_488_147_419_103_230);
 
-    let x = solana_bpf_rust_128bit_dep::uadd(
+    let x = solana_sbf_rust_128bit_dep::uadd(
         u128::from(u64::max_value()),
         u128::from(u64::max_value()),
     );

programs/sbf/rust/128bit_dep/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-128bit-dep"
+name = "solana-sbf-rust-128bit-dep"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-128bit-dep"
+documentation = "https://docs.rs/solana-sbf-rust-128bit-dep"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/128bit_dep/src/lib.rs

@@ -1,4 +1,4 @@
-//! Solana Rust-based BPF program utility functions and types
+//! Solana Rust-based SBF program utility functions and types
 
 extern crate solana_program;
 

programs/sbf/rust/alloc/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-alloc"
+name = "solana-sbf-rust-alloc"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-alloc"
+documentation = "https://docs.rs/solana-sbf-rust-alloc"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/call_depth/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-call-depth"
+name = "solana-sbf-rust-call-depth"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-call-depth"
+documentation = "https://docs.rs/solana-sbf-rust-call-depth"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/caller_access/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-caller-access"
+name = "solana-sbf-rust-caller-access"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-caller-access"
+documentation = "https://docs.rs/solana-sbf-rust-caller-access"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/curve25519/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-curve25519"
+name = "solana-sbf-rust-curve25519"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-zktoken_crypto"
+documentation = "https://docs.rs/solana-sbf-rust-zktoken_crypto"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/custom_heap/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-custom-heap"
+name = "solana-sbf-rust-custom-heap"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-custom-heap"
+documentation = "https://docs.rs/solana-sbf-rust-custom-heap"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/dep_crate/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-dep-crate"
+name = "solana-sbf-rust-dep-crate"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-dep-crate"
+documentation = "https://docs.rs/solana-sbf-rust-dep-crate"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/deprecated_loader/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-deprecated-loader"
+name = "solana-sbf-rust-deprecated-loader"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-deprecated-loader"
+documentation = "https://docs.rs/solana-sbf-rust-deprecated-loader"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/dup_accounts/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-dup-accounts"
+name = "solana-sbf-rust-dup-accounts"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-dup-accounts"
+documentation = "https://docs.rs/solana-sbf-rust-dup-accounts"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/error_handling/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-error-handling"
+name = "solana-sbf-rust-error-handling"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-error-handling"
+documentation = "https://docs.rs/solana-sbf-rust-error-handling"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/external_spend/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-external-spend"
+name = "solana-sbf-rust-external-spend"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-external-spend"
+documentation = "https://docs.rs/solana-sbf-rust-external-spend"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/finalize/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-finalize"
+name = "solana-sbf-rust-finalize"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-finalize"
+documentation = "https://docs.rs/solana-sbf-rust-finalize"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/get_minimum_delegation/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-get-minimum-delegation"
+name = "solana-sbf-rust-get-minimum-delegation"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-get-minimum-delegation"
+documentation = "https://docs.rs/solana-sbf-rust-get-minimum-delegation"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/inner_instruction_alignment_check/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-inner_instruction_alignment_check"
+name = "solana-sbf-rust-inner_instruction_alignment_check"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-inner_instruction_alignment_check"
+documentation = "https://docs.rs/solana-sbf-rust-inner_instruction_alignment_check"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/instruction_introspection/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-instruction-introspection"
+name = "solana-sbf-rust-instruction-introspection"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-instruction-introspection"
+documentation = "https://docs.rs/solana-sbf-rust-instruction-introspection"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/invoke/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-invoke"
+name = "solana-sbf-rust-invoke"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-invoke"
+documentation = "https://docs.rs/solana-sbf-rust-invoke"
 edition = "2021"
 
 [features]
@@ -14,8 +14,8 @@ default = ["program"]
 program = []
 
 [dependencies]
-solana-bpf-rust-invoked = { path = "../invoked", default-features = false }
 solana-program = { path = "../../../../sdk/program", version = "=1.15.0" }
+solana-sbf-rust-invoked = { path = "../invoked", default-features = false }
 
 [lib]
 crate-type = ["lib", "cdylib"]

programs/sbf/rust/invoke/src/processor.rs

@@ -5,7 +5,6 @@
 
 use {
     crate::instructions::*,
-    solana_bpf_rust_invoked::instructions::*,
     solana_program::{
         account_info::AccountInfo,
         entrypoint::{ProgramResult, MAX_PERMITTED_DATA_INCREASE},
@@ -19,6 +18,7 @@ use {
         },
         system_instruction,
     },
+    solana_sbf_rust_invoked::instructions::*,
 };
 
 fn do_nested_invokes(num_nested_invokes: u64, accounts: &[AccountInfo]) -> ProgramResult {

programs/sbf/rust/invoke_and_error/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-invoke-and-error"
+name = "solana-sbf-rust-invoke-and-error"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-invoke-and-error"
+documentation = "https://docs.rs/solana-sbf-rust-invoke-and-error"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/invoke_and_ok/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "solana-sbf-rust-invoke-and-ok"
+version = "1.15.0"
+description = "Solana BPF test program written in Rust"
+authors = ["Solana Maintainers <maintainers@solana.foundation>"]
+repository = "https://github.com/solana-labs/solana"
+license = "Apache-2.0"
+homepage = "https://solana.com/"
+documentation = "https://docs.rs/solana-sbf-rust-invoke-and-ok"
+edition = "2021"
+
+[dependencies]
+solana-program = { path = "../../../../sdk/program", version = "=1.15.0" }
+
+[lib]
+crate-type = ["cdylib"]
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]

programs/sbf/rust/invoke_and_return/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-invoke-and-return"
+name = "solana-sbf-rust-invoke-and-return"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-invoke-and-return"
+documentation = "https://docs.rs/solana-sbf-rust-invoke-and-return"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/invoked/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-realloc"
+name = "solana-sbf-rust-invoked"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-realloc"
+documentation = "https://docs.rs/solana-sbf-rust-invoked"
 edition = "2021"
 
 [features]

programs/sbf/rust/iter/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-iter"
+name = "solana-sbf-rust-iter"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-iter"
+documentation = "https://docs.rs/solana-sbf-rust-iter"
 edition = "2021"
 
 [dependencies]

programs/sbf/rust/log_data/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "solana-bpf-rust-log-data"
+name = "solana-sbf-rust-log-data"
 version = "1.15.0"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-documentation = "https://docs.rs/solana-bpf-rust-log-data"
+documentation = "https://docs.rs/solana-sbf-rust-log-data"
 edition = "2021"
 
 [dependencies]