Separate the "program" feature of solana-sdk into a new crate called solana-program
#12989
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mvines
commented
Oct 19, 2020
mvines
force-pushed
the
ps
branch
4 times, most recently
from
a809c2b to
1038cdd
Compare
This was referenced Oct 20, 2020
Merged
mvines
force-pushed
the
ps
branch
2 times, most recently
from
de9cbc2 to
f158914
Compare
mvines
force-pushed
the
ps
branch
10 times, most recently
from
f3f417a to
b66cf1c
Compare
Codecov Report
@@ 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 |
|
Getting close! The |
mvines
force-pushed
the
ps
branch
3 times, most recently
from
10911d2 to
d831670
Compare
mvines
commented
Oct 23, 2020
| @@ -4,47 +4,36 @@ | |||
| // Allows macro expansion of `use ::solana_sdk::*` to work within this crate | |||
| extern crate self as solana_sdk; | |||
|
|
|||
There was a problem hiding this comment.
Changes to sdk/src/lib.rs are interesting to review
mvines
commented
Oct 23, 2020
| pub mod serialize_utils; | ||
|
|
||
| // Modules not usable by on-chain programs | ||
| #[cfg(feature = "everything")] |
There was a problem hiding this comment.
I moved the #[cfg(feature = "everything")]s into inner cfgs in each file to clean up lib.rs
There was a problem hiding this comment.
Though does require searching through all the files to figure out if everything.
mvines
commented
Oct 23, 2020
| #[deprecated( | ||
| since = "1.4.3", | ||
| note = "use solana_program_sdk::entrypoint::entrypoint instead" | ||
| )] | ||
| macro_rules! entrypoint { |
There was a problem hiding this comment.
This sucks a little. I had to keep an entrypoint macro in here to avoid breaking users
There was a problem hiding this comment.
Which users are you worried about, wouldn't anyone picking this sdk need to start using solana-program-sdk anyway?
There was a problem hiding this comment.
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
commented
Oct 23, 2020
core/src/consensus.rs
Outdated
| @@ -89,7 +89,7 @@ pub(crate) struct ComputedBankState { | |||
| pub pubkey_votes: Arc<PubkeyVotes>, | |||
| } | |||
|
|
|||
| #[frozen_abi(digest = "2ZUeCLMVQxmHYbeqMH7M97ifVSKoVErGvRHzyxcQRjgU")] | |||
| #[frozen_abi(digest = "31bz55FBVWtVQjPWz8eeyduFXMCFhVZx5uL8wyLk3hht")] | |||
There was a problem hiding this comment.
A bunch of frozen_abi digest updates due to files moving around, not an issue....
|
This is ready to land. Steps:
|
jackcmay
reviewed
Oct 23, 2020
jackcmay
reviewed
Oct 23, 2020
jackcmay
reviewed
Oct 23, 2020
jackcmay
reviewed
Oct 23, 2020
jackcmay
reviewed
Oct 23, 2020
mvines
force-pushed
the
ps
branch
4 times, most recently
from
9384a50 to
18c73e1
Compare
The movement of files in sdk/ caused ABI hashes to change
mvines
changed the title
solana-sdk into a new crate called solana-program-sdksolana-sdk into a new crate called solana-program
mergify bot
added a commit
that referenced
this pull request
Oct 24, 2020
…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 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The "program" feature of
solana-sdkneeds to go away.Source backwards compatibility is retained by making
solana-sdkre-exportsolana-programdefinitions, and thesolana-sdk"program" feature becomes vestigial.This work will allow a program to declare
solana-programas a[dependency]and then the full-blownsolana-sdkas a[dev-dependency], enabling access to useful things likeBanksClientdirectly from program unit tests.