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

Support token-2022 in RPC instruction parsing (backport #24537) #26953

Merged
merged 2 commits into from
Aug 5, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 5, 2022

This is an automatic backport of pull request #24537 done by Mergify.
Cherry-pick of a1b066a has failed:

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

You are currently cherry-picking commit a1b066a43.
  (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:   scripts/patch-crates.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   account-decoder/Cargo.toml
	both modified:   client/Cargo.toml
	both modified:   programs/bpf/Cargo.lock
	both modified:   rpc/Cargo.toml
	both modified:   transaction-status/Cargo.toml
	both modified:   transaction-status/src/parse_token.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

* Use token-2022 dependency in parse_token and add tests for new variants

* Remove test hack

* Bump spl-token-2022 and use new AuthorityType::CloseMint

* Add zk-token-sdk to patch-crates.sh

(cherry picked from commit a1b066a)

# Conflicts:
#	Cargo.lock
#	account-decoder/Cargo.toml
#	client/Cargo.toml
#	programs/bpf/Cargo.lock
#	rpc/Cargo.toml
#	transaction-status/Cargo.toml
#	transaction-status/src/parse_token.rs
@mergify mergify bot added the conflicts label Aug 5, 2022
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Aug 5, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Aug 5, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 5, 2022
@mergify mergify bot merged commit af13cf5 into v1.10 Aug 5, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-24537 branch August 5, 2022 21:17
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants