Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

v1.17: spl: Bump token-2022 to v1 (backport of #34412) #34572

Merged
merged 2 commits into from
Dec 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 22, 2023

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

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

You are currently cherry-picking commit 8a8466cd86.
  (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:   account-decoder/Cargo.toml
	modified:   account-decoder/src/parse_token_extension.rs
	modified:   program-test/src/programs.rs
	deleted:    program-test/src/programs/spl_token_2022-0.9.0.so
	new file:   program-test/src/programs/spl_token_2022-1.0.0.so
	modified:   programs/sbf/Cargo.lock
	modified:   transaction-status/src/parse_token.rs
	new file:   transaction-status/src/parse_token/extension/group_member_pointer.rs
	new file:   transaction-status/src/parse_token/extension/group_pointer.rs
	modified:   transaction-status/src/parse_token/extension/mod.rs

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

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

* Update toml and lockfiles

* account-decoder: Add group and group member extensions

* transaction-status: Add token group + pointer extensions

* program-test: Update token-2022 binary

(cherry picked from commit 8a8466c)

# Conflicts:
#	Cargo.toml
Copy link

codecov bot commented Dec 22, 2023

Codecov Report

Attention: 91 lines in your changes are missing coverage. Please review.

Comparison is base (32c8963) 81.8% compared to head (3e57634) 81.7%.

Additional details and impacted files
@@            Coverage Diff            @@
##            v1.17   #34572     +/-   ##
=========================================
- Coverage    81.8%    81.7%   -0.1%     
=========================================
  Files         803      805      +2     
  Lines      218237   218594    +357     
=========================================
+ Hits       178552   178718    +166     
- Misses      39685    39876    +191     

@joncinque joncinque merged commit bbdce0f into v1.17 Dec 22, 2023
18 checks passed
@joncinque joncinque deleted the mergify/bp/v1.17/pr-34412 branch December 22, 2023 03:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants