Added spl prelude

Author: Buzzec

example_programs/marketplace/src/instructions/mod.rs

@@ -12,7 +12,7 @@ use star_frame_spl::associated_token::FindAtaSeeds;
 use star_frame_spl::{
     associated_token::state::{AssociatedTokenAccount, ValidateAta},
     token::{
-        instructions::{Transfer, TransferCpiAccounts},
+        instructions::{TokenTransfer, TokenTransferCpiAccounts},
         state::{MintAccount, TokenAccount, ValidateToken},
         Token,
     },
@@ -80,10 +80,10 @@ impl ManageOrderAccounts {
         let signer_seeds = signer_seeds.as_ref().map(|seeds| seeds.seeds_with_bump());
         if market_tokens > ZERO_QUANTITY {
             Token::cpi(
-                Transfer {
+                TokenTransfer {
                     amount: market_tokens.val().0,
                 },
-                TransferCpiAccounts {
+                TokenTransferCpiAccounts {
                     source: *self.market_token_vault.account_info(),
                     destination: *self.user_market_token_vault.account_info(),
                     owner: *self.market.account_info(),
@@ -94,10 +94,10 @@ impl ManageOrderAccounts {
         }
         if currency > ZERO_PRICE {
             Token::cpi(
-                Transfer {
+                TokenTransfer {
                     amount: currency.val().0,
                 },
-                TransferCpiAccounts {
+                TokenTransferCpiAccounts {
                     source: *self.currency_vault.account_info(),
                     destination: *self.user_currency_vault.account_info(),
                     owner: *self.market.account_info(),
@@ -116,10 +116,10 @@ impl ManageOrderAccounts {
         } = totals;
         if market_tokens > ZERO_QUANTITY {
             Token::cpi(
-                Transfer {
+                TokenTransfer {
                     amount: market_tokens.val().0,
                 },
-                TransferCpiAccounts {
+                TokenTransferCpiAccounts {
                     source: *self.user_market_token_vault.account_info(),
                     destination: *self.market_token_vault.account_info(),
                     owner: *self.user.account_info(),
@@ -130,10 +130,10 @@ impl ManageOrderAccounts {
         }
         if currency > ZERO_PRICE {
             Token::cpi(
-                Transfer {
+                TokenTransfer {
                     amount: currency.val().0,
                 },
-                TransferCpiAccounts {
+                TokenTransferCpiAccounts {
                     source: *self.user_currency_vault.account_info(),
                     destination: *self.currency_vault.account_info(),
                     owner: *self.user.account_info(),

star_frame_spl/src/associated_token.rs

@@ -138,7 +138,7 @@ pub mod instructions {
     #[ix_set(use_repr)]
     #[repr(u8)]
     pub enum AssociatedTokenInstructionSet {
-        Create(Create),
+        CreateAssociatedToken(CreateAssociatedToken),
         CreateIdempotent(CreateIdempotent),
         RecoverNested(RecoverNested),
     }
@@ -149,10 +149,10 @@ pub mod instructions {
         Copy, Clone, Debug, Eq, PartialEq, InstructionArgs, BorshDeserialize, BorshSerialize,
     )]
     #[type_to_idl(program = AssociatedToken)]
-    pub struct Create;
-    /// Accounts for the [`Create`] instruction.
+    pub struct CreateAssociatedToken;
+    /// Accounts for the [`CreateAssociatedToken`] instruction.
     #[derive(Debug, Clone, AccountSet)]
-    pub struct CreateAccounts {
+    pub struct CreateAssociatedTokenAccounts {
         pub funder: Mut<Signer>,
         #[idl(arg =
             Seeds(FindAtaSeeds {
@@ -166,18 +166,18 @@ pub mod instructions {
         pub system_program: Program<System>,
         pub token_program: Program<Token>,
     }
-    empty_star_frame_instruction!(Create, CreateAccounts);
+    empty_star_frame_instruction!(CreateAssociatedToken, CreateAssociatedTokenAccounts);
 
     // create idempotent
     /// See [`spl_associated_token_account::instruction::AssociatedTokenAccountInstruction::CreateIdempotent`].
     ///
-    /// This instruction has an identical AccountSet to [`Create`].
+    /// This instruction has an identical AccountSet to [`CreateAssociatedToken`].
     #[derive(
         Copy, Clone, Debug, Eq, PartialEq, InstructionArgs, BorshDeserialize, BorshSerialize,
     )]
     #[type_to_idl(program = AssociatedToken)]
     pub struct CreateIdempotent;
-    empty_star_frame_instruction!(CreateIdempotent, CreateAccounts);
+    empty_star_frame_instruction!(CreateIdempotent, CreateAssociatedTokenAccounts);
 
     // recover nested
     /// See [`spl_associated_token_account::instruction::AssociatedTokenAccountInstruction::RecoverNested`].
@@ -392,8 +392,8 @@ pub mod state {
             };
 
             AssociatedToken::cpi(
-                instructions::Create,
-                instructions::CreateCpiAccounts {
+                instructions::CreateAssociatedToken,
+                instructions::CreateAssociatedTokenCpiAccounts {
                     funder: funder.account_to_modify(),
                     token_account: *self.account_info(),
                     wallet: *init_ata.wallet.account_info(),

star_frame_spl/src/lib.rs

@@ -2,5 +2,6 @@
 #[cfg(feature = "token")]
 pub mod associated_token;
 pub mod pod;
+pub mod prelude;
 #[cfg(feature = "token")]
 pub mod token;

star_frame_spl/src/prelude.rs

@@ -0,0 +1,5 @@
+pub use crate::{
+    associated_token::{instructions::*, state::*, AssociatedToken},
+    pod::*,
+    token::{instructions::*, state::*, Token},
+};