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

Add SPL Token 2022 to the list of known token ids (backport #23067) #24625

Merged
merged 2 commits into from
Apr 23, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 23, 2022

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

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

You are currently cherry-picking commit 413806684.
  (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:   account-decoder/Cargo.toml
	modified:   account-decoder/src/parse_token.rs
	modified:   transaction-status/Cargo.toml
	modified:   transaction-status/src/parse_associated_token.rs
	modified:   transaction-status/src/parse_token.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   programs/bpf/Cargo.lock

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

* Add SPL Token 2022 to the list of known token ids

* Fix tests to accommodate #23729

* Test parsing of basic token-2022 instructsions

Co-authored-by: Tyera Eulberg <tyera@solana.com>
(cherry picked from commit 4138066)

# Conflicts:
#	Cargo.lock
#	programs/bpf/Cargo.lock
@mergify mergify bot added the conflicts label Apr 23, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 23, 2022
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Apr 23, 2022
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@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 Apr 23, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Apr 23, 2022

automerge label removed due to a CI failure

@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.10/pr-23067 branch from 78cf333 to e1d157f Compare April 23, 2022 16:05
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 23, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Apr 23, 2022

automerge label removed due to a CI failure

@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 Apr 23, 2022
@CriesofCarrots CriesofCarrots merged commit 0b3bb54 into v1.10 Apr 23, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-23067 branch April 23, 2022 18:47
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.

3 participants