Add MintBuilder & TokenAccountBuilder #143
Merged
Conversation
This file contains hidden or 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
grod220
commented
Jun 23, 2025
Comment on lines
+17
to
+55
| #[derive(Default, Debug, Clone)] | ||
| pub struct KeyedAccount { | ||
| pub key: Pubkey, | ||
| pub account: Account, | ||
| } | ||
|
|
||
| impl KeyedAccount { | ||
| pub fn pair(&self) -> (Pubkey, Account) { | ||
| (self.key, self.account.clone()) | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Clone, Copy, PartialEq)] | ||
| pub enum TokenProgram { | ||
| SplToken, | ||
| SplToken2022, | ||
| } | ||
|
|
||
| impl TokenProgram { | ||
| pub fn id(&self) -> Pubkey { | ||
| match self { | ||
| TokenProgram::SplToken => spl_token::id(), | ||
| TokenProgram::SplToken2022 => spl_token_2022::id(), | ||
| } | ||
| } | ||
|
|
||
| pub fn keyed_account(&self) -> (Pubkey, Account) { | ||
| match self { | ||
| TokenProgram::SplToken => mollusk_svm_programs_token::token::keyed_account(), | ||
| TokenProgram::SplToken2022 => mollusk_svm_programs_token::token2022::keyed_account(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Clone, Default)] | ||
| pub struct TransferAuthority { | ||
| pub keyed_account: KeyedAccount, | ||
| pub signers: Vec<Pubkey>, | ||
| } |
There was a problem hiding this comment.
Moved to common.rs and out of the suite-specific files
grod220
commented
Jun 23, 2025
Comment on lines
-48
to
-49
| pub const FREEZE_AUTHORITY: Pubkey = | ||
| Pubkey::from_str_const("11111115q4EpJaTXAZWpCg3J2zppWGSZ46KXozzo9"); |
There was a problem hiding this comment.
I found the freeze authority as a global to be strange as it really only should pertain to a few CreateMint assertions. So moved this locally to those tests.
grod220
commented
Jun 23, 2025
|
|
||
| // Only add extensions for SPL Token 2022 | ||
| if unwrapped_token_program == TokenProgram::SplToken2022 { | ||
| builder = builder.with_extension(ImmutableOwnerExtension); |
There was a problem hiding this comment.
Important as this was not formerly being added to the escrow ATA in tests
grod220
commented
Jun 23, 2025
| pub const FREEZE_AUTHORITY: Pubkey = | ||
| Pubkey::from_str_const("11111115q4EpJaTXAZWpCg3J2zppWGSZ46KXozzo9"); | ||
|
|
||
| fn token_2022_with_extension_data(supply: u64) -> Vec<u8> { |
There was a problem hiding this comment.
Here and down represents all of the individual mint and token account creators that are now replaced
joncinque
approved these changes
Jun 23, 2025
buffalojoec
approved these changes
Jun 24, 2025
grod220
force-pushed
the
account-mint-builders
branch
from
ca5b3af to
901e91c
Compare
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.
This PR introduces a builder-pattern API for mints and token accounts in tests. Inspired by https://github.com/solana-program/token-wrap/pull/139/files#r2159332672 seeing that ATA accounts were not being properly set up. Main new structs added:
Benefits: tests are more declarative, bugs with ATAs are fixed, and duplication is reduced.