token-2022: Add mint close authority support everywhere #2754
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
mvines
reviewed
Jan 19, 2022
token/program-2022/src/processor.rs
Outdated
| expected_owner: &Pubkey, | ||
| owner_account_info: &AccountInfo, | ||
| owner_account_len: usize, |
There was a problem hiding this comment.
I think it'd be better to include "_data" here, to make it more clear what the length is from. Also same comment for all the call sites (eg. authority_info_len -> authority_info_data_len)
Suggested change
| owner_account_len: usize, | |
| owner_account_data_len: usize, |
token/program-2022/src/processor.rs
Outdated
| } | ||
| _ => { | ||
| return Err(TokenError::AuthorityTypeNotSupported.into()); | ||
| } | ||
| } | ||
| Mint::pack(mint, &mut account_info.data.borrow_mut())?; | ||
| mint.pack_base(); |
There was a problem hiding this comment.
I guess technically the pack_base() is unnecessary for AuthorityType::CloseAccount but trying to avoid this is probably more trouble than it's worth
There was a problem hiding this comment.
that's a good point, I'll move this up for freeze and mint and avoid this call, for sure
mvines
approved these changes
Jan 19, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Builds on #2744 , only need to look at 4904516
Problem
The mint close authority must be properly supported in
set_authorityandclose_account.Solution
Add the support.
Also, update
validate_ownerto accept the data length from the outside, since there were still double-borrow issues. Now, we pull out the data length right at the beginning, and use that later to see if the authority account is a multisig. Thankfully, if the authority is a multisig, then it can't be used for anything else in processing logic, meaning all double-borrows are avoided.