Separate the "program" feature of `solana-sdk` into a new crate called `solana-program` by mvines · Pull Request #12989 · solana-labs/solana

mvines · 2020-10-19T20:45:19Z

The "program" feature of solana-sdk needs to go away.

Source backwards compatibility is retained by making solana-sdk re-export solana-program definitions, and the solana-sdk "program" feature becomes vestigial.

This work will allow a program to declare solana-program as a [dependency] and then the full-blown solana-sdk as a [dev-dependency], enabling access to useful things like BanksClient directly from program unit tests.

codecov · 2020-10-22T19:41:33Z

Codecov Report

Merging #12989 into master will decrease coverage by 0.0%.
The diff coverage is 76.8%.

@@            Coverage Diff            @@
##           master   #12989     +/-   ##
=========================================
- Coverage    82.1%    82.1%   -0.1%     
=========================================
  Files         367      372      +5     
  Lines       86406    86522    +116     
=========================================
+ Hits        71023    71066     +43     
- Misses      15383    15456     +73

mvines · 2020-10-22T19:45:58Z

Getting close! The program feature is now basically purged from all monorepo programs by switching from solana-sdk to solana-program-sdk

mvines · 2020-10-23T16:40:47Z

@@ -4,47 +4,36 @@
 // Allows macro expansion of `use ::solana_sdk::*` to work within this crate
 extern crate self as solana_sdk;



Changes to sdk/src/lib.rs are interesting to review

mvines · 2020-10-23T16:41:15Z

-pub mod serialize_utils;
-
-// Modules not usable by on-chain programs
-#[cfg(feature = "everything")]


I moved the #[cfg(feature = "everything")]s into inner cfgs in each file to clean up lib.rs

Though does require searching through all the files to figure out if everything.

mvines · 2020-10-23T16:42:06Z

+    since = "1.4.3",
+    note = "use solana_program_sdk::entrypoint::entrypoint instead"
+)]
 macro_rules! entrypoint {


This sucks a little. I had to keep an entrypoint macro in here to avoid breaking users

Which users are you worried about, wouldn't anyone picking this sdk need to start using solana-program-sdk anyway?

wouldn't anyone picking this sdk need to start using solana-program-sdk anyway?

Currently you can just upgrade solana-sdk and it'll work (with some deprecated compiler warning). I expect this will be the normal upgrade path for downstream:

Next year upgrade to a new solana-sdk

Notice the deprecated compiler warnings

Switch to solana-program-sdk in 5 years

mvines · 2020-10-23T16:43:39Z

 }

-#[frozen_abi(digest = "2ZUeCLMVQxmHYbeqMH7M97ifVSKoVErGvRHzyxcQRjgU")]
+#[frozen_abi(digest = "31bz55FBVWtVQjPWz8eeyduFXMCFhVZx5uL8wyLk3hht")]


A bunch of frozen_abi digest updates due to files moving around, not an issue....

mvines · 2020-10-23T18:07:17Z

This is ready to land. Steps:

Land ci: Add downstream project build testing #13112 to establish a baseline
Rebase this PR on ci: Add downstream project build testing #13112. Land if still green, and backport to v1.4

The movement of files in sdk/ caused ABI hashes to change

…d `solana-program` (bp #12989) (#13131) * Add solana-program-sdk boilerplate (cherry picked from commit 3718771) # Conflicts: # sdk/Cargo.toml * Initial population of solana-program-sdk (cherry picked from commit 63db324) # Conflicts: # Cargo.lock * Port programs to solana-program-sdk (cherry picked from commit fe68f7f) # Conflicts: # programs/bpf/Cargo.lock # programs/bpf/rust/128bit/Cargo.toml # programs/bpf/rust/128bit_dep/Cargo.toml # programs/bpf/rust/alloc/Cargo.toml # programs/bpf/rust/call_depth/Cargo.toml # programs/bpf/rust/custom_heap/Cargo.toml # programs/bpf/rust/dep_crate/Cargo.toml # programs/bpf/rust/deprecated_loader/Cargo.toml # programs/bpf/rust/dup_accounts/Cargo.toml # programs/bpf/rust/error_handling/Cargo.toml # programs/bpf/rust/external_spend/Cargo.toml # programs/bpf/rust/instruction_introspection/Cargo.toml # programs/bpf/rust/invoke/Cargo.toml # programs/bpf/rust/invoked/Cargo.toml # programs/bpf/rust/iter/Cargo.toml # programs/bpf/rust/many_args/Cargo.toml # programs/bpf/rust/many_args_dep/Cargo.toml # programs/bpf/rust/noop/Cargo.toml # programs/bpf/rust/panic/Cargo.toml # programs/bpf/rust/param_passing/Cargo.toml # programs/bpf/rust/param_passing_dep/Cargo.toml # programs/bpf/rust/rand/Cargo.toml # programs/bpf/rust/ristretto/Cargo.toml # programs/bpf/rust/sanity/Cargo.toml # programs/bpf/rust/sha256/Cargo.toml # programs/bpf/rust/sysval/Cargo.toml * Only activate legacy program feature for the solana-sdk crate (cherry picked from commit 85c51f5) * Run serum-dex unit tests (cherry picked from commit 92ce381) * Rename solana-program-sdk to solana-program (cherry picked from commit dd711ab) # Conflicts: # programs/bpf/rust/128bit/Cargo.toml # programs/bpf/rust/128bit_dep/Cargo.toml # programs/bpf/rust/alloc/Cargo.toml # programs/bpf/rust/call_depth/Cargo.toml # programs/bpf/rust/custom_heap/Cargo.toml # programs/bpf/rust/dep_crate/Cargo.toml # programs/bpf/rust/deprecated_loader/Cargo.toml # programs/bpf/rust/dup_accounts/Cargo.toml # programs/bpf/rust/error_handling/Cargo.toml # programs/bpf/rust/external_spend/Cargo.toml # programs/bpf/rust/instruction_introspection/Cargo.toml # programs/bpf/rust/invoke/Cargo.toml # programs/bpf/rust/invoked/Cargo.toml # programs/bpf/rust/iter/Cargo.toml # programs/bpf/rust/many_args/Cargo.toml # programs/bpf/rust/many_args_dep/Cargo.toml # programs/bpf/rust/noop/Cargo.toml # programs/bpf/rust/panic/Cargo.toml # programs/bpf/rust/param_passing/Cargo.toml # programs/bpf/rust/param_passing_dep/Cargo.toml # programs/bpf/rust/rand/Cargo.toml # programs/bpf/rust/ristretto/Cargo.toml # programs/bpf/rust/sanity/Cargo.toml # programs/bpf/rust/sha256/Cargo.toml # programs/bpf/rust/sysval/Cargo.toml * Update frozen_abi hashes The movement of files in sdk/ caused ABI hashes to change (cherry picked from commit a495684) * Resolve merge conflicts Co-authored-by: Michael Vines <mvines@gmail.com>

mvines added the noCI Suppress CI on this Pull Request label Oct 19, 2020

mvines commented Oct 19, 2020

View reviewed changes

Comment thread sdk/program/src/hash.rs

mvines mentioned this pull request Oct 19, 2020

sdk: add "everything" feature #12985

Merged

mvines force-pushed the ps branch 4 times, most recently from a809c2b to 1038cdd Compare October 20, 2020 03:07

This was referenced Oct 20, 2020

Remove frozen ABI modules from solana-sdk #13008

Merged

Add cargo-build-bpf #13040

Merged

mvines force-pushed the ps branch 2 times, most recently from de9cbc2 to f158914 Compare October 21, 2020 04:21

mvines removed the noCI Suppress CI on this Pull Request label Oct 22, 2020

mvines force-pushed the ps branch 10 times, most recently from f3f417a to b66cf1c Compare October 22, 2020 18:24

mvines force-pushed the ps branch from b66cf1c to 3531d69 Compare October 22, 2020 19:43

mvines mentioned this pull request Oct 22, 2020

v1.3: Add Pubkey::new_unique()/Hash::new_unique() #13092

Merged

mvines force-pushed the ps branch 3 times, most recently from 10911d2 to d831670 Compare October 23, 2020 00:50

mvines mentioned this pull request Oct 23, 2020

cargo-build-bpf: Remove legacy program feature support #13094

Closed

mvines commented Oct 23, 2020

View reviewed changes