Merge branch 'main' into mariuszzak/10-require-upgrade-authority-in-initialize

Author: mariuszzak

programs/solana/programs/ift/src/helpers.rs

@@ -15,8 +15,8 @@ use crate::state::IFTAppMintState;
 pub fn mint_to_account<'info>(
     mint_state: &mut IFTAppMintState,
     clock: &Clock,
-    mint: &InterfaceAccount<'info, Mint>,
-    to: &InterfaceAccount<'info, TokenAccount>,
+    mint: &mut InterfaceAccount<'info, Mint>,
+    token_account: &mut InterfaceAccount<'info, TokenAccount>,
     mint_authority: &AccountInfo<'info>,
     token_program: &Interface<'info, TokenInterface>,
     amount: u64,
@@ -33,12 +33,16 @@ pub fn mint_to_account<'info>(
 
     let mint_accounts = MintTo {
         mint: mint.to_account_info(),
-        to: to.to_account_info(),
+        to: token_account.to_account_info(),
         authority: mint_authority.to_account_info(),
     };
     let mint_ctx =
         CpiContext::new_with_signer(token_program.to_account_info(), mint_accounts, signer_seeds);
-    token_interface::mint_to(mint_ctx, amount)
+    token_interface::mint_to(mint_ctx, amount)?;
+
+    mint.reload()?;
+    token_account.reload()?;
+    Ok(())
 }
 
 const fn current_day(clock: &Clock) -> u64 {

programs/solana/programs/ift/src/instructions/admin.rs

@@ -223,8 +223,8 @@ pub fn admin_mint(ctx: Context<AdminMint>, msg: AdminMintMsg) -> Result<()> {
     mint_to_account(
         &mut ctx.accounts.app_mint_state,
         &clock,
-        &ctx.accounts.mint,
-        &ctx.accounts.receiver_token_account,
+        &mut ctx.accounts.mint,
+        &mut ctx.accounts.receiver_token_account,
         &ctx.accounts.mint_authority,
         &ctx.accounts.token_program,
         msg.amount,

programs/solana/programs/ift/src/instructions/finalize_transfer.rs

@@ -145,14 +145,12 @@ pub fn finalize_transfer(
             mint_to_account(
                 &mut ctx.accounts.app_mint_state,
                 &clock,
-                &ctx.accounts.mint,
-                &ctx.accounts.sender_token_account,
+                &mut ctx.accounts.mint,
+                &mut ctx.accounts.sender_token_account,
                 &ctx.accounts.mint_authority,
                 &ctx.accounts.token_program,
                 pending.amount,
             )?;
-            ctx.accounts.mint.reload()?;
-            ctx.accounts.sender_token_account.reload()?;
 
             emit!(IFTTransferRefunded {
                 mint: ctx.accounts.app_mint_state.mint,
@@ -169,8 +167,8 @@ pub fn finalize_transfer(
                 mint_to_account(
                     &mut ctx.accounts.app_mint_state,
                     &clock,
-                    &ctx.accounts.mint,
-                    &ctx.accounts.sender_token_account,
+                    &mut ctx.accounts.mint,
+                    &mut ctx.accounts.sender_token_account,
                     &ctx.accounts.mint_authority,
                     &ctx.accounts.token_program,
                     pending.amount,

programs/solana/programs/ift/src/instructions/ift_mint.rs

@@ -106,14 +106,12 @@ pub fn ift_mint(ctx: Context<IFTMint>, msg: IFTMintMsg) -> Result<()> {
     mint_to_account(
         &mut ctx.accounts.app_mint_state,
         &clock,
-        &ctx.accounts.mint,
-        &ctx.accounts.receiver_token_account,
+        &mut ctx.accounts.mint,
+        &mut ctx.accounts.receiver_token_account,
         &ctx.accounts.mint_authority,
         &ctx.accounts.token_program,
         msg.amount,
     )?;
-    ctx.accounts.mint.reload()?;
-    ctx.accounts.receiver_token_account.reload()?;
 
     emit!(IFTMintReceived {
         mint: ctx.accounts.mint.key(),