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

v1.16: spl: Bump token-2022 and friends (backport of #33453) #33465

Merged
merged 5 commits into from
Oct 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 29, 2023

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

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

You are currently cherry-picking commit de38b05ad1.
  (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/src/parse_token.rs
	modified:   account-decoder/src/parse_token_extension.rs
	modified:   fetch-spl.sh
	modified:   ledger/Cargo.toml
	modified:   ledger/src/token_balances.rs
	modified:   program-test/src/programs.rs
	deleted:    program-test/src/programs/spl_token_2022-0.6.0.so
	new file:   program-test/src/programs/spl_token_2022-0.9.0.so
	modified:   programs/sbf/Cargo.toml
	modified:   rpc/Cargo.toml
	modified:   rpc/src/rpc.rs
	modified:   transaction-status/Cargo.toml
	modified:   transaction-status/src/parse_associated_token.rs
	modified:   transaction-status/src/parse_token.rs
	modified:   transaction-status/src/parse_token/extension/confidential_transfer.rs
	new file:   transaction-status/src/parse_token/extension/confidential_transfer_fee.rs
	new file:   transaction-status/src/parse_token/extension/metadata_pointer.rs
	modified:   transaction-status/src/parse_token/extension/mod.rs
	new file:   transaction-status/src/parse_token/extension/transfer_hook.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   Cargo.toml
	both modified:   account-decoder/Cargo.toml
	both modified:   programs/sbf/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

@codecov
Copy link

codecov bot commented Sep 29, 2023

Codecov Report

Merging #33465 (10cd10c) into v1.16 (d5adf45) will decrease coverage by 0.1%.
The diff coverage is n/a.

❗ Current head 10cd10c differs from pull request most recent head 547cf05. Consider uploading reports for the commit 547cf05 to get more accurate results

@@            Coverage Diff            @@
##            v1.16   #33465     +/-   ##
=========================================
- Coverage    81.9%    81.9%   -0.1%     
=========================================
  Files         763      763             
  Lines      208424   208424             
=========================================
- Hits       170898   170882     -16     
- Misses      37526    37542     +16     

@joncinque
Copy link
Contributor

Since the spl crates have started using newer versions of dependencies, this backport also bumps some dependencies. I was able to reduce this down to:

If this isn't acceptable, we can probably drop it.

CriesofCarrots
CriesofCarrots previously approved these changes Sep 30, 2023
Copy link
Contributor

@CriesofCarrots CriesofCarrots left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems reasonable to me. Ping me after you rebase on the monorepo version bump and I'll reapprove for merge

@joncinque joncinque force-pushed the mergify/bp/v1.16/pr-33453 branch from b63c985 to 6acd129 Compare October 2, 2023 12:14
* token: Update to 4.0.0

* token-2022: Bump and support new account and instruction types

* Update token-2022 in fetch_spl / program-test

* Fixup downstream uses

* Mint and destination were flipped in 0.9.0

* Don't use `convert_pubkey`

* Bump spl dependencies to versions which avoid recompilations

(cherry picked from commit de38b05)

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	account-decoder/Cargo.toml
#	programs/sbf/Cargo.lock
@joncinque
Copy link
Contributor

@CriesofCarrots ping!

@joncinque joncinque added the automerge Merge this Pull Request automatically once CI passes label Oct 3, 2023
@mergify mergify bot merged commit 1526c74 into v1.16 Oct 3, 2023
@mergify mergify bot deleted the mergify/bp/v1.16/pr-33453 branch October 3, 2023 00:37
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