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

spl: Bump token to v3.3.0 and ATA to v1.0.5 (backport #22649) #24688

Merged
merged 3 commits into from
Apr 26, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 26, 2022

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

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

You are currently cherry-picking commit c43afe2d7.
  (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:   ci/do-audit.sh
	modified:   fetch-spl.sh
	modified:   program-test/src/programs.rs
	deleted:    program-test/src/programs/spl_associated-token-account-1.0.3.so
	new file:   program-test/src/programs/spl_associated_token_account-1.0.5.so
	deleted:    program-test/src/programs/spl_token-3.2.0.so
	new file:   program-test/src/programs/spl_token-3.3.0.so
	modified:   programs/bpf/Cargo.lock
	modified:   tokens/src/spl_token.rs
	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:   account-decoder/Cargo.toml
	both modified:   accounts-cluster-bench/Cargo.toml
	both modified:   rpc/Cargo.toml
	both modified:   tokens/Cargo.toml
	both modified:   transaction-status/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

* Bump spl-token and ATA to v3.3.0

* Add parsers for new token instructions
* Update parser for modified associated-token-account instruction

* Update to use 1.0.5 once it's released

* Update Cargo.lock in programs/bpf

(cherry picked from commit c43afe2)

# Conflicts:
#	account-decoder/Cargo.toml
#	accounts-cluster-bench/Cargo.toml
#	rpc/Cargo.toml
#	tokens/Cargo.toml
#	transaction-status/Cargo.toml
@mergify mergify bot added the conflicts label Apr 26, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 26, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Apr 26, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Apr 26, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 26, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Apr 26, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Apr 26, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 26, 2022
@mergify
Copy link
Contributor Author

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

mergify bot commented Apr 26, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 26, 2022
@mergify mergify bot merged commit 2742449 into v1.10 Apr 26, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-22649 branch April 26, 2022 15:10
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.

1 participant