Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Separate the "program" feature of solana-sdk into a new crate called solana-program (bp #12989) #13131

Merged
merged 8 commits into from
Oct 24, 2020
Merged

Separate the "program" feature of solana-sdk into a new crate called solana-program (bp #12989) #13131

merged 8 commits into from
Oct 24, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 24, 2020

This is an automated backport of pull request #12989 done by Mergify

Cherry-pick of 3718771 has failed:

On branch mergify/bp/v1.4/pr-12989
Your branch is up to date with 'origin/v1.4'.

You are currently cherry-picking commit 3718771ff.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	new file:   sdk/program/Cargo.toml
	new file:   sdk/program/src/lib.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   sdk/Cargo.toml

Cherry-pick of 63db324 has failed:

On branch mergify/bp/v1.4/pr-12989
Your branch is ahead of 'origin/v1.4' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 63db32420.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   ci/nits.sh
	modified:   ci/test-stable.sh
	modified:   programs/bpf/Cargo.lock
	modified:   sdk/Cargo.toml
	new file:   sdk/Xargo.toml
	modified:   sdk/macro/src/lib.rs
	modified:   sdk/program/Cargo.toml
	new file:   sdk/program/Xargo.toml
	new file:   sdk/program/build.rs
	renamed:    sdk/src/account.rs -> sdk/program/src/account.rs
	renamed:    sdk/src/account_info.rs -> sdk/program/src/account_info.rs
	renamed:    sdk/src/account_utils.rs -> sdk/program/src/account_utils.rs
	renamed:    sdk/src/bpf_loader.rs -> sdk/program/src/bpf_loader.rs
	renamed:    sdk/src/bpf_loader_deprecated.rs -> sdk/program/src/bpf_loader_deprecated.rs
	renamed:    sdk/src/clock.rs -> sdk/program/src/clock.rs
	renamed:    sdk/src/decode_error.rs -> sdk/program/src/decode_error.rs
	copied:     sdk/src/entrypoint.rs -> sdk/program/src/entrypoint.rs
	copied:     sdk/src/entrypoint_deprecated.rs -> sdk/program/src/entrypoint_deprecated.rs
	renamed:    sdk/src/epoch_schedule.rs -> sdk/program/src/epoch_schedule.rs
	renamed:    sdk/src/fee_calculator.rs -> sdk/program/src/fee_calculator.rs
	copied:     sdk/src/hash.rs -> sdk/program/src/hash.rs
	renamed:    sdk/src/incinerator.rs -> sdk/program/src/incinerator.rs
	renamed:    sdk/src/instruction.rs -> sdk/program/src/instruction.rs
	modified:   sdk/program/src/lib.rs
	renamed:    sdk/src/loader_instruction.rs -> sdk/program/src/loader_instruction.rs
	copied:     sdk/src/log.rs -> sdk/program/src/log.rs
	renamed:    sdk/src/message.rs -> sdk/program/src/message.rs
	renamed:    sdk/src/native_token.rs -> sdk/program/src/native_token.rs
	renamed:    sdk/src/nonce/account.rs -> sdk/program/src/nonce/account.rs
	renamed:    sdk/src/nonce/mod.rs -> sdk/program/src/nonce/mod.rs
	renamed:    sdk/src/nonce/state/current.rs -> sdk/program/src/nonce/state/current.rs
	renamed:    sdk/src/nonce/state/mod.rs -> sdk/program/src/nonce/state/mod.rs
	renamed:    sdk/src/nonce/utils.rs -> sdk/program/src/nonce/utils.rs
	renamed:    sdk/src/program.rs -> sdk/program/src/program.rs
	renamed:    sdk/src/program_error.rs -> sdk/program/src/program_error.rs
	renamed:    sdk/src/program_option.rs -> sdk/program/src/program_option.rs
	renamed:    sdk/src/program_pack.rs -> sdk/program/src/program_pack.rs
	renamed:    sdk/src/program_stubs.rs -> sdk/program/src/program_stubs.rs
	copied:     sdk/src/pubkey.rs -> sdk/program/src/pubkey.rs
	renamed:    sdk/src/rent.rs -> sdk/program/src/rent.rs
	renamed:    sdk/src/sanitize.rs -> sdk/program/src/sanitize.rs
	new file:   sdk/program/src/secp256k1_program.rs
	renamed:    sdk/src/serialize_utils.rs -> sdk/program/src/serialize_utils.rs
	renamed:    sdk/src/short_vec.rs -> sdk/program/src/short_vec.rs
	renamed:    sdk/src/slot_hashes.rs -> sdk/program/src/slot_hashes.rs
	renamed:    sdk/src/slot_history.rs -> sdk/program/src/slot_history.rs
	renamed:    sdk/src/stake_history.rs -> sdk/program/src/stake_history.rs
	renamed:    sdk/src/system_instruction.rs -> sdk/program/src/system_instruction.rs
	renamed:    sdk/src/system_program.rs -> sdk/program/src/system_program.rs
	renamed:    sdk/src/sysvar/clock.rs -> sdk/program/src/sysvar/clock.rs
	renamed:    sdk/src/sysvar/epoch_schedule.rs -> sdk/program/src/sysvar/epoch_schedule.rs
	renamed:    sdk/src/sysvar/fees.rs -> sdk/program/src/sysvar/fees.rs
	renamed:    sdk/src/sysvar/instructions.rs -> sdk/program/src/sysvar/instructions.rs
	renamed:    sdk/src/sysvar/mod.rs -> sdk/program/src/sysvar/mod.rs
	renamed:    sdk/src/sysvar/recent_blockhashes.rs -> sdk/program/src/sysvar/recent_blockhashes.rs
	renamed:    sdk/src/sysvar/rent.rs -> sdk/program/src/sysvar/rent.rs
	renamed:    sdk/src/sysvar/rewards.rs -> sdk/program/src/sysvar/rewards.rs
	renamed:    sdk/src/sysvar/slot_hashes.rs -> sdk/program/src/sysvar/slot_hashes.rs
	renamed:    sdk/src/sysvar/slot_history.rs -> sdk/program/src/sysvar/slot_history.rs
	renamed:    sdk/src/sysvar/stake_history.rs -> sdk/program/src/sysvar/stake_history.rs
	new file:   sdk/src/.lib.rs.swo
	modified:   sdk/src/client.rs
	modified:   sdk/src/entrypoint.rs
	modified:   sdk/src/entrypoint_deprecated.rs
	modified:   sdk/src/genesis_config.rs
	modified:   sdk/src/hard_forks.rs
	modified:   sdk/src/hash.rs
	modified:   sdk/src/lib.rs
	modified:   sdk/src/log.rs
	modified:   sdk/src/pubkey.rs
	modified:   sdk/src/secp256k1.rs
	deleted:    sdk/src/secp256k1_program.rs
	modified:   sdk/src/shred_version.rs
	modified:   sdk/src/signature.rs
	modified:   sdk/src/signers.rs
	modified:   sdk/src/system_transaction.rs
	modified:   sdk/src/transaction.rs
	modified:   sdk/src/transport.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   Cargo.lock

Cherry-pick of fe68f7f has failed:

On branch mergify/bp/v1.4/pr-12989
Your branch is ahead of 'origin/v1.4' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit fe68f7f78.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   programs/bpf/build.rs
	modified:   programs/bpf/rust/128bit/src/lib.rs
	modified:   programs/bpf/rust/128bit_dep/src/lib.rs
	modified:   programs/bpf/rust/alloc/src/lib.rs
	modified:   programs/bpf/rust/call_depth/src/lib.rs
	modified:   programs/bpf/rust/custom_heap/src/lib.rs
	modified:   programs/bpf/rust/dep_crate/src/lib.rs
	modified:   programs/bpf/rust/deprecated_loader/src/lib.rs
	modified:   programs/bpf/rust/dup_accounts/src/lib.rs
	modified:   programs/bpf/rust/error_handling/src/lib.rs
	modified:   programs/bpf/rust/external_spend/src/lib.rs
	modified:   programs/bpf/rust/instruction_introspection/src/lib.rs
	modified:   programs/bpf/rust/invoke/src/lib.rs
	modified:   programs/bpf/rust/invoked/src/instruction.rs
	modified:   programs/bpf/rust/invoked/src/lib.rs
	modified:   programs/bpf/rust/invoked/src/processor.rs
	modified:   programs/bpf/rust/iter/src/lib.rs
	modified:   programs/bpf/rust/many_args/src/helper.rs
	modified:   programs/bpf/rust/many_args/src/lib.rs
	modified:   programs/bpf/rust/many_args_dep/src/lib.rs
	modified:   programs/bpf/rust/noop/src/lib.rs
	modified:   programs/bpf/rust/panic/src/lib.rs
	modified:   programs/bpf/rust/param_passing/src/lib.rs
	modified:   programs/bpf/rust/param_passing_dep/src/lib.rs
	modified:   programs/bpf/rust/rand/src/lib.rs
	modified:   programs/bpf/rust/ristretto/src/lib.rs
	modified:   programs/bpf/rust/ristretto/src/ristretto.rs
	modified:   programs/bpf/rust/sanity/src/lib.rs
	modified:   programs/bpf/rust/sha256/src/lib.rs
	modified:   programs/bpf/rust/sysval/src/lib.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   programs/bpf/Cargo.lock
	both modified:   programs/bpf/rust/128bit/Cargo.toml
	both modified:   programs/bpf/rust/128bit_dep/Cargo.toml
	both modified:   programs/bpf/rust/alloc/Cargo.toml
	both modified:   programs/bpf/rust/call_depth/Cargo.toml
	both modified:   programs/bpf/rust/custom_heap/Cargo.toml
	both modified:   programs/bpf/rust/dep_crate/Cargo.toml
	both modified:   programs/bpf/rust/deprecated_loader/Cargo.toml
	both modified:   programs/bpf/rust/dup_accounts/Cargo.toml
	both modified:   programs/bpf/rust/error_handling/Cargo.toml
	both modified:   programs/bpf/rust/external_spend/Cargo.toml
	both modified:   programs/bpf/rust/instruction_introspection/Cargo.toml
	both modified:   programs/bpf/rust/invoke/Cargo.toml
	both modified:   programs/bpf/rust/invoked/Cargo.toml
	both modified:   programs/bpf/rust/iter/Cargo.toml
	both modified:   programs/bpf/rust/many_args/Cargo.toml
	both modified:   programs/bpf/rust/many_args_dep/Cargo.toml
	both modified:   programs/bpf/rust/noop/Cargo.toml
	both modified:   programs/bpf/rust/panic/Cargo.toml
	both modified:   programs/bpf/rust/param_passing/Cargo.toml
	both modified:   programs/bpf/rust/param_passing_dep/Cargo.toml
	both modified:   programs/bpf/rust/rand/Cargo.toml
	both modified:   programs/bpf/rust/ristretto/Cargo.toml
	both modified:   programs/bpf/rust/sanity/Cargo.toml
	both modified:   programs/bpf/rust/sha256/Cargo.toml
	both modified:   programs/bpf/rust/sysval/Cargo.toml

Cherry-pick of dd711ab has failed:

On branch mergify/bp/v1.4/pr-12989
Your branch is ahead of 'origin/v1.4' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit dd711ab5f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   Cargo.lock
	modified:   programs/bpf/Cargo.lock
	modified:   programs/bpf/rust/128bit/src/lib.rs
	modified:   programs/bpf/rust/128bit_dep/src/lib.rs
	modified:   programs/bpf/rust/alloc/src/lib.rs
	modified:   programs/bpf/rust/call_depth/src/lib.rs
	modified:   programs/bpf/rust/custom_heap/src/lib.rs
	modified:   programs/bpf/rust/dep_crate/src/lib.rs
	modified:   programs/bpf/rust/deprecated_loader/src/lib.rs
	modified:   programs/bpf/rust/dup_accounts/src/lib.rs
	modified:   programs/bpf/rust/error_handling/src/lib.rs
	modified:   programs/bpf/rust/external_spend/src/lib.rs
	modified:   programs/bpf/rust/instruction_introspection/src/lib.rs
	modified:   programs/bpf/rust/invoke/src/lib.rs
	modified:   programs/bpf/rust/invoked/src/instruction.rs
	modified:   programs/bpf/rust/invoked/src/processor.rs
	modified:   programs/bpf/rust/iter/src/lib.rs
	modified:   programs/bpf/rust/many_args/src/helper.rs
	modified:   programs/bpf/rust/many_args/src/lib.rs
	modified:   programs/bpf/rust/many_args_dep/src/lib.rs
	modified:   programs/bpf/rust/noop/src/lib.rs
	modified:   programs/bpf/rust/panic/src/lib.rs
	modified:   programs/bpf/rust/param_passing/src/lib.rs
	modified:   programs/bpf/rust/param_passing_dep/src/lib.rs
	modified:   programs/bpf/rust/rand/src/lib.rs
	modified:   programs/bpf/rust/ristretto/src/lib.rs
	modified:   programs/bpf/rust/ristretto/src/ristretto.rs
	modified:   programs/bpf/rust/sanity/src/lib.rs
	modified:   programs/bpf/rust/sha256/src/lib.rs
	modified:   programs/bpf/rust/sysval/src/lib.rs
	modified:   sdk/Cargo.toml
	modified:   sdk/macro/src/lib.rs
	modified:   sdk/program/Cargo.toml
	modified:   sdk/program/src/lib.rs
	modified:   sdk/src/entrypoint.rs
	modified:   sdk/src/entrypoint_deprecated.rs
	modified:   sdk/src/hash.rs
	modified:   sdk/src/lib.rs
	modified:   sdk/src/log.rs
	modified:   sdk/src/pubkey.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   programs/bpf/rust/128bit/Cargo.toml
	both modified:   programs/bpf/rust/128bit_dep/Cargo.toml
	both modified:   programs/bpf/rust/alloc/Cargo.toml
	both modified:   programs/bpf/rust/call_depth/Cargo.toml
	both modified:   programs/bpf/rust/custom_heap/Cargo.toml
	both modified:   programs/bpf/rust/dep_crate/Cargo.toml
	both modified:   programs/bpf/rust/deprecated_loader/Cargo.toml
	both modified:   programs/bpf/rust/dup_accounts/Cargo.toml
	both modified:   programs/bpf/rust/error_handling/Cargo.toml
	both modified:   programs/bpf/rust/external_spend/Cargo.toml
	both modified:   programs/bpf/rust/instruction_introspection/Cargo.toml
	both modified:   programs/bpf/rust/invoke/Cargo.toml
	both modified:   programs/bpf/rust/invoked/Cargo.toml
	both modified:   programs/bpf/rust/iter/Cargo.toml
	both modified:   programs/bpf/rust/many_args/Cargo.toml
	both modified:   programs/bpf/rust/many_args_dep/Cargo.toml
	both modified:   programs/bpf/rust/noop/Cargo.toml
	both modified:   programs/bpf/rust/panic/Cargo.toml
	both modified:   programs/bpf/rust/param_passing/Cargo.toml
	both modified:   programs/bpf/rust/param_passing_dep/Cargo.toml
	both modified:   programs/bpf/rust/rand/Cargo.toml
	both modified:   programs/bpf/rust/ristretto/Cargo.toml
	both modified:   programs/bpf/rust/sanity/Cargo.toml
	both modified:   programs/bpf/rust/sha256/Cargo.toml
	both modified:   programs/bpf/rust/sysval/Cargo.toml

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

mvines added 7 commits October 24, 2020 15:42
@mvines
Add solana-program-sdk boilerplate
8e5ed74 
(cherry picked from commit 3718771)

# Conflicts:
#	sdk/Cargo.toml
@mvines
Initial population of solana-program-sdk
39f69ec 
(cherry picked from commit 63db324)

# Conflicts:
#	Cargo.lock
@mvines
Port programs to solana-program-sdk
6cdd9da 
(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
@mvines
Only activate legacy program feature for the solana-sdk crate
c52e9bc 
(cherry picked from commit 85c51f5)
@mvines
Run serum-dex unit tests
996aae0 
(cherry picked from commit 92ce381)
@mvines
Rename solana-program-sdk to solana-program
2eab59c 
(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
@mvines
Update frozen_abi hashes
0ebc07f 
The movement of files in sdk/ caused ABI hashes to change

(cherry picked from commit a495684)
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Oct 24, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Oct 24, 2020

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Oct 24, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Oct 24, 2020
@codecov
Copy link

codecov bot commented Oct 24, 2020

Codecov Report

Merging #13131 into v1.4 will decrease coverage by 0.0%.
The diff coverage is 76.8%.

@@           Coverage Diff            @@
##            v1.4   #13131     +/-   ##
========================================
- Coverage   82.1%    82.1%   -0.1%     
========================================
  Files        367      372      +5     
  Lines      86186    86302    +116     
========================================
+ Hits       70814    70855     +41     
- Misses     15372    15447     +75

@mergify mergify bot merged commit eb9cef0 into v1.4 Oct 24, 2020
@mergify mergify bot deleted the mergify/bp/v1.4/pr-12989 branch October 24, 2020 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@mvines