token 2022: add support for _reading_ repeating fixed-length extensions #5836
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
This was referenced Nov 14, 2023
|
Current dependencies on/for this PR:
This stack of pull requests is managed by Graphite. |
This was referenced Nov 14, 2023
buffalojoec
force-pushed
the
10-18-token_2022_add_UpdateGroupAuthority_instruction_from_SPL_Token_Group_interface
branch
from
3cf8ea8
to
9e3250a
Compare
Base automatically changed from
10-18-token_2022_add_UpdateGroupAuthority_instruction_from_SPL_Token_Group_interface
to
master
November 15, 2023 15:23
joncinque
reviewed
Nov 15, 2023
| /// Unpack a portion of the TLV data as the desired type | ||
| fn get_extension<V: Extension + Pod>(&self) -> Result<&V, ProgramError> { | ||
| pod_from_bytes::<V>(self.get_extension_bytes::<V>()?) | ||
| } | ||
|
|
||
| /// Unpack a portion of the TLV data as the desired type, where repetitions | ||
| /// are allowed | ||
| fn get_repeating_extension<V: Extension + Pod>( |
There was a problem hiding this comment.
nit: get_extension_with_repetition
Comment on lines
+453
to
+469
| /// Fetch the bytes for a TLV entry, where repetitions are allowed | ||
| fn get_repeating_extension_bytes<V: Extension>( | ||
| &self, | ||
| repetition: usize, | ||
| ) -> Result<&[u8], ProgramError> { | ||
| get_all_extension_bytes::<S, V>(self.get_tlv_data()).map(|x| { | ||
| *x.get(repetition.saturating_sub(1)) | ||
| .ok_or::<ProgramError>(ProgramError::InvalidAccountData) | ||
| .unwrap() | ||
| }) | ||
| } | ||
|
|
||
| /// Fetch all bytes for each entry of a particular TLV entry, where | ||
| /// repetitions are allowed | ||
| fn get_all_extension_bytes<V: Extension>(&self) -> Result<Vec<&[u8]>, ProgramError> { | ||
| get_all_extension_bytes::<S, V>(self.get_tlv_data()) | ||
| } |
There was a problem hiding this comment.
Are these needed? get_extension_bytes is only used for emitting a slice of bytes for token metadata, and we won't need to do that with the group interface, so I'd prefer to remove these functions if they're not needed
| repetition: usize, | ||
| ) -> Result<&[u8], ProgramError> { | ||
| get_all_extension_bytes::<S, V>(self.get_tlv_data()).map(|x| { | ||
| *x.get(repetition.saturating_sub(1)) |
There was a problem hiding this comment.
The TLV library is 0-indexed, so let's keep that consistent here
Comment on lines
+1598
to
+1611
| let state = | ||
| StateWithExtensions::<Mint>::unpack(MINT_WITH_DUPLICATED_EXTENSION_AND_ONE_EXTRA) | ||
| .unwrap(); | ||
| assert_eq!(state.base, TEST_MINT); | ||
| let all_extensions = state.get_all_extensions::<MintCloseAuthority>().unwrap(); | ||
| assert_eq!(all_extensions.len(), 3); | ||
| assert_eq!( | ||
| state.get_extension::<TransferFeeConfig>(), | ||
| Err(ProgramError::InvalidAccountData) | ||
| ); | ||
| assert_eq!( | ||
| StateWithExtensions::<Account>::unpack(MINT_WITH_DUPLICATED_EXTENSION_AND_ONE_EXTRA), | ||
| Err(ProgramError::InvalidAccountData) | ||
| ); |
There was a problem hiding this comment.
Can you also check that you can fetch the extra extension, just to be safe?
buffalojoec
deleted the
_token_2022_add_support_for__reading__repeating_fixed-length_extensions_
branch
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.
In order to support Token2022 extensions that can repeat, we need to add support
to read such extensions!
Almost every read function for Token2022 extensions is expecting one single
entry, so it will return the first encountered.
Here. we're introducing an adjacent API for reading repeating extensions,
specifically fixed-length extensions.