token-2022: Add Pod-compatible versions of StateWithExtensions
#6336
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
There was a problem hiding this comment.
Do you mind splitting this one into multiple commits? It looks like some of the changes are just renaming (mut), and it would be easier to ensure nothing's changed in the existing call sites if the addition of unpack_tlv_data() and check_account_type_matches_extension_type() were in their own commits as well.
|
Certainly, done! Let me know if there's anything else that needs more clarity |
| @@ -847,6 +834,17 @@ impl<'a, S: BaseState> BaseStateWithExtensionsMut<S> for StateWithExtensionsMut< | |||
| } | |||
| } | |||
|
|
|||
| fn unpack_tlv_data<S: BaseState>(rest: &[u8]) -> Result<&[u8], ProgramError> { | |||
| if let Some((account_type_index, tlv_start_index)) = type_and_tlv_indices::<S>(rest)? { | |||
| let account_type = AccountType::try_from(rest[account_type_index]) | |||
There was a problem hiding this comment.
Can you restore the comment here? I do think it was helpful so that we can feel confident indexing into rest.
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.
Problem
Towards zero-copy deserialization in token-2022 in #6316, we need a
Pod-compatible version ofStateWithExtensions, where the underlyingBaseStateimplementsPod. That way, we canunpacksomething in zero-copy.Solution
Add the new types. I tried to do as much dedupe as possible by introducing
unpack_tlv_data, but it's tough to reduce too much more than that.Also, the
unpackfunctions on the new types are extremely similar to their non-Podversions, and the only difference is callingpod_from_bytesinstead ofunpack.We could do this with a macro, but macros always feel a little more brittle / hacky. I don't feel too strongly though, so I'm happy to do whatever you think is best!
Also,
unpack_tlv_datais just an immutable version of the previousunpack_type_and_tlv_data, not sure how to reduce the copy-pasta there.