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 #22649
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
joncinque
changed the title
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. |
stale
bot
added
the
stale
joncinque
force-pushed
the
spl-token-bump
branch
from
07ff8fe to
6b4b6bd
Compare
stale
bot
removed
the
stale
joncinque
changed the title
|
@joncinque Can you also remove this audit exception as part of these changes, bumping spl-token also pulls in a safe |
This was referenced Mar 22, 2022
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. |
stale
bot
added
the
stale
joncinque
removed
the
stale
joncinque
force-pushed
the
spl-token-bump
branch
from
4f2b56e to
8c7c238
Compare
|
@CriesofCarrots Once you merge the test fixes in #23067, i'll just need to update the keys in the tests here, but otherwise, this should be good to go! |
CriesofCarrots
previously approved these changes
Apr 20, 2022
Comment on lines
592
to
603
| let initialize_mint_ix = initialize_mint2( | ||
| &spl_token::id(), | ||
| &convert_pubkey(keys[0]), | ||
| &convert_pubkey(keys[2]), | ||
| Some(&convert_pubkey(keys[3])), | ||
| 2, | ||
| ) | ||
| .unwrap(); | ||
| let message = Message::new(&[initialize_mint_ix], None); | ||
| let compiled_instruction = convert_compiled_instruction(&message.instructions[0]); | ||
| assert_eq!( | ||
| parse_token(&compiled_instruction, &keys).unwrap(), |
There was a problem hiding this comment.
Just an example of the new handling from #23067 :
Suggested change
| let initialize_mint_ix = initialize_mint2( | |
| &spl_token::id(), | |
| &convert_pubkey(keys[0]), | |
| &convert_pubkey(keys[2]), | |
| Some(&convert_pubkey(keys[3])), | |
| 2, | |
| ) | |
| .unwrap(); | |
| let message = Message::new(&[initialize_mint_ix], None); | |
| let compiled_instruction = convert_compiled_instruction(&message.instructions[0]); | |
| assert_eq!( | |
| parse_token(&compiled_instruction, &keys).unwrap(), | |
| let initialize_mint_ix = initialize_mint2( | |
| &spl_token::id(), // TODO: replace with `program_id` | |
| &convert_pubkey(mint_pubkey), | |
| &convert_pubkey(mint_authority), | |
| Some(&convert_pubkey(freeze_authority)), | |
| 2, | |
| ) | |
| .unwrap(); | |
| let message = make_coerced_message(initialize_mint_ix, program_id); | |
| let compiled_instruction = convert_compiled_instruction(&message.instructions[0]); | |
| assert_eq!( | |
| parse_token(&compiled_instruction, &convert_account_keys(&message)).unwrap(), |
* Add parsers for new token instructions * Update parser for modified associated-token-account instruction
joncinque
force-pushed
the
spl-token-bump
branch
from
8c7c238 to
c2483f2
Compare
mergify
bot
dismissed
CriesofCarrots’s stale review
Pull request has been modified.
|
🎉🎉 |
|
Ready to add v1.10 label? |
|
Yes! Sorry, didn't get around to it yesterday -- thanks for backporting #23067 |
mergify bot
pushed a commit
that referenced
this pull request
Apr 26, 2022
* 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 bot
added a commit
that referenced
this pull request
Apr 26, 2022
* spl: Bump token to v3.3.0 and ATA to v1.0.5 (#22649) * 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 * Fix merge conflicts * Re-add audit ignore to avoid bumping more crates Co-authored-by: Jon Cinque <[email protected]>
jeffwashington
pushed a commit
to jeffwashington/solana
that referenced
this pull request
Jun 29, 2022
* 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
jeffwashington
pushed a commit
to jeffwashington/solana
that referenced
this pull request
Jun 30, 2022
* 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
jeffwashington
pushed a commit
to jeffwashington/solana
that referenced
this pull request
Jun 30, 2022
* 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
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
The new token program was deployed, but the monorepo isn't using the new packages.
Summary of Changes
Fixes #
NOTE: Only merge this once the associated token program version 1.0.5 is released on all clusters, tracked by the feature introduced in #22648