This repository has been archived by the owner on Jan 22, 2025. It is now read-only.
spl: Bump token-2022 and friends #33453
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #33453 +/- ##
=========================================
- Coverage 81.9% 81.8% -0.2%
=========================================
Files 799 802 +3
Lines 217344 218045 +701
=========================================
+ Hits 178169 178364 +195
- Misses 39175 39681 +506 |
CriesofCarrots
approved these changes
Sep 29, 2023
| @@ -13,8 +13,7 @@ edition = { workspace = true } | |||
| Inflector = { workspace = true } | |||
| base64 = { workspace = true } | |||
| bincode = { workspace = true } | |||
| # NOTE: Use the workspace version once spl-associated-token-account uses borsh 0.10. | |||
| borsh0-9 = { package = "borsh", version = "0.9.3" } | |||
mergify bot
pushed a commit
that referenced
this pull request
Sep 29, 2023
* 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
added a commit
that referenced
this pull request
Oct 2, 2023
* 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
added a commit
that referenced
this pull request
Oct 2, 2023
* 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
mergify bot
added a commit
that referenced
this pull request
Oct 3, 2023
* spl: Bump token-2022 and friends (#33453) * 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 * Fix toml conflicts * Update lockfiles * Bump proc-macro2 down to 1.0.60, lowest compatible version * Bump down hashbrown used by borsh --------- Co-authored-by: Jon Cinque <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
token-2022 is now up to version 0.9.0, but the monorepo still uses 0.6.0
Summary of Changes
It was a bit tough to split this up without leaving the repo in a broken state at a certain commit, but the idea is to bump all of the spl crates to their newer versions that use 1.16.
After that, token-2022 has a few new extensions and instructions, so we need to support those too. Note that the token-metadata interface implemented by token-2022 is not included here.
Fixes #