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.

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

v1.16: sdk: Limited Borsh 0.9 support (Pubkey and helpers) (backport of #32511) #32697

Merged
merged 2 commits into from
Aug 4, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 2, 2023

This is an automatic backport of pull request #32511 done by Mergify.
Cherry-pick of 8c14886 has failed:

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

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

Changes to be committed:
	modified:   Cargo.lock
	modified:   program-runtime/src/compute_budget.rs
	modified:   programs/sbf/Cargo.lock
	modified:   runtime/src/cost_model.rs
	modified:   sdk/program/Cargo.toml
	modified:   sdk/program/src/borsh.rs
	new file:   sdk/program/src/borsh0_10.rs
	new file:   sdk/program/src/borsh0_9.rs
	modified:   sdk/program/src/lib.rs
	modified:   sdk/program/src/pubkey.rs
	modified:   sdk/program/src/stake/state.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/src/lib.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

* sdk: Implement Borsh 0.9 traits on Pubkey

* Alphabetize cargo.toml

* Add backwards-compatible borsh file

* Add borsh0_10.rs for more clarity

* Deprecate `borsh` utils, use borsh0_10 everywhere

* Mark borsh 0.9 helpers as deprecated

* Add macros for deriving helper impls

* Add borsh 0.9 tests

* Refactor tests into macro

(cherry picked from commit 8c14886)

# Conflicts:
#	sdk/src/lib.rs
@mergify mergify bot added the conflicts label Aug 2, 2023
@codecov
Copy link

codecov bot commented Aug 2, 2023

Codecov Report

Merging #32697 (356921a) into v1.16 (79c8bac) will decrease coverage by 0.1%.
The diff coverage is 74.6%.

@@            Coverage Diff            @@
##            v1.16   #32697     +/-   ##
=========================================
- Coverage    81.9%    81.9%   -0.1%     
=========================================
  Files         762      762             
  Lines      207816   207789     -27     
=========================================
- Hits       170387   170352     -35     
- Misses      37429    37437      +8     

@joncinque joncinque merged commit 2eede8e into v1.16 Aug 4, 2023
4 checks passed
@joncinque joncinque deleted the mergify/bp/v1.16/pr-32511 branch August 4, 2023 00:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants