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

feature: add new token program feature (backport #18780) #18803

Merged
merged 3 commits into from
Jul 21, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 21, 2021

This is an automatic backport of pull request #18780 done by Mergify.
Cherry-pick of 51f3b9a has failed:

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

You are currently cherry-picking commit 51f3b9aa7.
  (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:   fetch-spl.sh
	modified:   program-test/src/programs.rs
	deleted:    program-test/src/programs/spl_associated-token-account-1.0.1.so
	new file:   program-test/src/programs/spl_associated-token-account-1.0.3.so
	deleted:    program-test/src/programs/spl_token-3.1.0.so
	new file:   program-test/src/programs/spl_token-3.2.0.so
	modified:   runtime/src/bank.rs
	modified:   runtime/src/inline_spl_token_v2_0.rs
	modified:   transaction-status/src/parse_token.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   account-decoder/Cargo.toml
	both modified:   accounts-cluster-bench/Cargo.toml
	both modified:   programs/bpf/Cargo.lock
	both modified:   rpc/Cargo.toml
	both modified:   sdk/src/feature_set.rs
	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.io/

* feature: add new token program feature

* Fixup test

* Update to spl-token v3.2.0

* Update Cargo.lock + fmt

* Update token program version in fetch-spl.sh

* Bump associated token program to 1.0.3

* Add aToken so

(cherry picked from commit 51f3b9a)

# Conflicts:
#	Cargo.lock
#	account-decoder/Cargo.toml
#	accounts-cluster-bench/Cargo.toml
#	programs/bpf/Cargo.lock
#	rpc/Cargo.toml
#	sdk/src/feature_set.rs
#	tokens/Cargo.toml
#	transaction-status/Cargo.toml
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jul 21, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 21, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 21, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 21, 2021

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 Jul 21, 2021
@codecov
Copy link

codecov bot commented Jul 21, 2021

Codecov Report

Merging #18803 (d367e4b) into v1.7 (1cdcabf) will decrease coverage by 0.0%.
The diff coverage is 90.0%.

@@            Coverage Diff            @@
##             v1.7   #18803     +/-   ##
=========================================
- Coverage    82.3%    82.3%   -0.1%     
=========================================
  Files         434      434             
  Lines      122614   122633     +19     
=========================================
- Hits       100987   100967     -20     
- Misses      21627    21666     +39     

@mergify mergify bot merged commit 7427daf into v1.7 Jul 21, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18780 branch July 21, 2021 15:05
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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