add token 2022 support

programs/strategy/src/instructions/deploy_funds.rs

@@ -1,8 +1,5 @@
 use anchor_lang::prelude::*;
-use anchor_spl::{
-    token::Token,
-    token_interface::TokenAccount,
-};
+use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
 use crate::utils::unchecked_strategy::UncheckedStrategy;
 use crate::error::ErrorCode;
@@ -17,10 +14,13 @@ pub struct DeployFunds<'info> {
     #[account(mut, seeds = [UNDERLYING_SEED.as_bytes(), strategy.key().as_ref()], bump)]
     pub underlying_token_account: InterfaceAccount<'info, TokenAccount>,
 
+    #[account(mut, constraint = underlying_mint.key() == strategy.underlying_mint())]
+    pub underlying_mint: InterfaceAccount<'info, Mint>,
+
     #[account(mut, constraint = signer.key() == strategy.manager() @ErrorCode::AccessDenied)]
     pub signer: Signer<'info>,
 
-    pub token_program: Program<'info, Token>,
+    pub token_program: Interface<'info, TokenInterface>,
 }
 
 pub fn handle_deploy_funds<'info>(ctx: Context<'_, '_, '_, 'info, DeployFunds<'info>>, amount: u64) -> Result<()> {

programs/strategy/src/instructions/deposit.rs

@@ -1,8 +1,5 @@
 use anchor_lang::prelude::*;
-use anchor_spl::{
-    token::Token,
-    token_interface::TokenAccount,
-};
+use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
 use crate::error::ErrorCode;
 use crate::utils::token::transfer;
@@ -21,10 +18,13 @@ pub struct Deposit<'info> {
     #[account(mut)]
     pub vault_token_account: InterfaceAccount<'info, TokenAccount>,
 
+    #[account(mut, constraint = underlying_mint.key() == strategy.underlying_mint())]
+    pub underlying_mint: InterfaceAccount<'info, Mint>,
+
     #[account(constraint = signer.key() == strategy.vault() @ErrorCode::AccessDenied)]
     pub signer: Signer<'info>,
 
-    pub token_program: Program<'info, Token>,
+    pub token_program: Interface<'info, TokenInterface>,
 }
 
 pub fn handle_deposit<'info>(
@@ -47,6 +47,7 @@ pub fn handle_deposit<'info>(
         ctx.accounts.vault_token_account.to_account_info(), 
         ctx.accounts.underlying_token_account.to_account_info(), 
         ctx.accounts.signer.to_account_info(), 
+        &ctx.accounts.underlying_mint,
         amount
     )
 }

programs/strategy/src/instructions/free_funds.rs

@@ -1,8 +1,5 @@
 use anchor_lang::prelude::*;
-use anchor_spl::{
-    token::Token,
-    token_interface::TokenAccount,
-};
+use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
 use crate::utils::unchecked_strategy::UncheckedStrategy;
 use crate::error::ErrorCode;
@@ -17,10 +14,13 @@ pub struct FreeFunds<'info> {
     #[account(mut, seeds = [UNDERLYING_SEED.as_bytes(), strategy.key().as_ref()], bump)]
     pub underlying_token_account: InterfaceAccount<'info, TokenAccount>,
 
+    #[account(mut, constraint = underlying_mint.key() == strategy.underlying_mint())]
+    pub underlying_mint: InterfaceAccount<'info, Mint>,
+
     #[account(mut, constraint = signer.key() == strategy.manager() @ErrorCode::AccessDenied)]
     pub signer: Signer<'info>,
 
-    pub token_program: Program<'info, Token>,
+    pub token_program: Interface<'info, TokenInterface>,
 }
 
 // difference between freed and actual is the loss or gain

programs/strategy/src/instructions/init_strategy.rs

@@ -1,9 +1,6 @@
 use anchor_lang::prelude::*;
 use anchor_lang::Discriminator;
-use anchor_spl::{
-    token::{ Token, TokenAccount},
-    token_interface::Mint,
-};
+use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 use access_control::{
     constants::USER_ROLE_SEED,
     program::AccessControl,
@@ -40,7 +37,7 @@ pub struct InitStrategy<'info> {
         token::mint = underlying_mint, 
         token::authority = strategy,
     )]
-    pub token_account: Box<Account<'info, TokenAccount>>,
+    pub token_account: Box<InterfaceAccount<'info, TokenAccount>>,
 
     #[account(seeds = [CONFIG_SEED.as_bytes()], bump)]
     pub config: Account<'info, Config>,
@@ -66,7 +63,7 @@ pub struct InitStrategy<'info> {
     #[account(mut, constraint = roles.check_role()?)]
     pub signer: Signer<'info>,
 
-    pub token_program: Program<'info, Token>,
+    pub token_program: Interface<'info, TokenInterface>,
     pub system_program: Program<'info, System>,
     pub rent: Sysvar<'info, Rent>,
     pub access_control: Program<'info, AccessControl>,

programs/strategy/src/instructions/report.rs

@@ -1,8 +1,5 @@
 use anchor_lang::prelude::*;
-use anchor_spl::{
-    token::Token,
-    token_interface::TokenAccount,
-};
+use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
 use crate::utils::unchecked_strategy::UncheckedStrategy;
 use crate::error::ErrorCode;
@@ -17,10 +14,13 @@ pub struct Report<'info> {
     #[account(mut, seeds = [UNDERLYING_SEED.as_bytes(), strategy.key().as_ref()], bump)]
     pub underlying_token_account: InterfaceAccount<'info, TokenAccount>,
 
+    #[account(mut, constraint = underlying_mint.key() == strategy.underlying_mint())]
+    pub underlying_mint: InterfaceAccount<'info, Mint>,
+
     #[account(mut, constraint = signer.key() == strategy.manager() @ErrorCode::AccessDenied)]
     pub signer: Signer<'info>,
 
-    pub token_program: Program<'info, Token>,
+    pub token_program: Interface<'info, TokenInterface>,
 }
 
 pub fn handle_report<'info>(ctx: Context<'_, '_, '_, 'info, Report<'info>>) -> Result<()> {

programs/strategy/src/instructions/report_loss.rs

@@ -1,8 +1,5 @@
 use anchor_lang::prelude::*;
-use anchor_spl::{
-    token::Token,
-    token_interface::TokenAccount,
-};
+use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
 use crate::utils::unchecked_strategy::UncheckedStrategy;
 use crate::error::ErrorCode;
@@ -17,10 +14,13 @@ pub struct ReportLoss<'info> {
     #[account(mut, seeds = [UNDERLYING_SEED.as_bytes(), strategy.key().as_ref()], bump)]
     pub underlying_token_account: InterfaceAccount<'info, TokenAccount>,
 
+    #[account(mut, constraint = underlying_mint.key() == strategy.underlying_mint())]
+    pub underlying_mint: InterfaceAccount<'info, Mint>,
+
     #[account(mut, constraint = signer.key() == strategy.manager() @ErrorCode::AccessDenied)]
     pub signer: Signer<'info>,
 
-    pub token_program: Program<'info, Token>,
+    pub token_program: Interface<'info, TokenInterface>,
 }
 
 pub fn handle_report_loss<'info>(ctx: Context<'_, '_, '_, 'info, ReportLoss<'info>>, loss: u64) -> Result<()> {

programs/strategy/src/instructions/report_profit.rs

@@ -1,8 +1,5 @@
 use anchor_lang::prelude::*;
-use anchor_spl::{
-    token::Token,
-    token_interface::TokenAccount,
-};
+use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
 use crate::utils::unchecked_strategy::UncheckedStrategy;
 use crate::error::ErrorCode;
@@ -17,10 +14,13 @@ pub struct ReportProfit<'info> {
     #[account(mut, seeds = [UNDERLYING_SEED.as_bytes(), strategy.key().as_ref()], bump)]
     pub underlying_token_account: InterfaceAccount<'info, TokenAccount>,
 
+    #[account(mut, constraint = underlying_mint.key() == strategy.underlying_mint())]
+    pub underlying_mint: InterfaceAccount<'info, Mint>,
+
     #[account(mut, constraint = signer.key() == strategy.manager() @ErrorCode::AccessDenied)]
     pub signer: Signer<'info>,
 
-    pub token_program: Program<'info, Token>,
+    pub token_program: Interface<'info, TokenInterface>,
 }
 
 pub fn handle_report_profit<'info>(ctx: Context<'_, '_, '_, 'info, ReportProfit<'info>>, profit: u64) -> Result<()> {

programs/strategy/src/instructions/withdraw.rs

@@ -1,8 +1,5 @@
 use anchor_lang::prelude::*;
-use anchor_spl::{
-    token::Token,
-    token_interface::TokenAccount,
-};
+use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
 use crate::error::ErrorCode;
 use crate::utils::unchecked_strategy::UncheckedStrategy;
@@ -19,13 +16,16 @@ pub struct Withdraw<'info> {
     #[account(mut, seeds = [UNDERLYING_SEED.as_bytes(), strategy.key().as_ref()], bump)]
     pub underlying_token_account: InterfaceAccount<'info, TokenAccount>,
 
+    #[account(mut, constraint = underlying_mint.key() == strategy.underlying_mint())]
+    pub underlying_mint: InterfaceAccount<'info, Mint>,
+
     #[account(constraint = signer.key() == strategy.vault() @ErrorCode::AccessDenied)]
     pub signer: Signer<'info>,
 
     #[account(mut)]
     pub vault_token_account: InterfaceAccount<'info, TokenAccount>,
 
-    pub token_program: Program<'info, Token>,
+    pub token_program: Interface<'info, TokenInterface>,
 }
 
 pub fn handle_withdraw<'info>(
@@ -43,6 +43,7 @@ pub fn handle_withdraw<'info>(
         let free_funds = &mut FreeFunds {
             strategy: ctx.accounts.strategy.clone(),
             underlying_token_account: ctx.accounts.underlying_token_account.clone(),
+            underlying_mint: ctx.accounts.underlying_mint.clone(),
             signer: ctx.accounts.signer.clone(),
             token_program: ctx.accounts.token_program.clone(),
         };
@@ -57,6 +58,7 @@ pub fn handle_withdraw<'info>(
         ctx.accounts.underlying_token_account.to_account_info(), 
         ctx.accounts.vault_token_account.to_account_info(), 
         ctx.accounts.strategy.to_account_info(), 
+        &ctx.accounts.underlying_mint,
         amount, 
         &strategy.seeds()
     )

programs/strategy/src/instructions/withdraw_fee.rs

@@ -1,8 +1,5 @@
 use anchor_lang::prelude::*;
-use anchor_spl::{
-    token::Token,
-    token_interface::TokenAccount,
-};
+use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
 use crate::error::ErrorCode;
 use crate::utils::unchecked_strategy::UncheckedStrategy;
@@ -19,14 +16,17 @@ pub struct WithdrawFee<'info> {
 
     #[account(mut, seeds = [UNDERLYING_SEED.as_bytes(), strategy.key().as_ref()], bump)]
     pub underlying_token_account: InterfaceAccount<'info, TokenAccount>,
+
+    #[account(mut, constraint = underlying_mint.key() == strategy.underlying_mint())]
+    pub underlying_mint: InterfaceAccount<'info, Mint>,
 
     #[account(mut)]
     pub signer: Signer<'info>,
 
     #[account(mut)]
     pub recipient: InterfaceAccount<'info, TokenAccount>,
 
-    pub token_program: Program<'info, Token>,
+    pub token_program: Interface<'info, TokenInterface>,
 }
 
 pub fn handle_withdraw_fee<'info>(
@@ -51,6 +51,7 @@ pub fn handle_withdraw_fee<'info>(
         let free_funds = &mut FreeFunds {
             strategy: ctx.accounts.strategy.clone(),
             underlying_token_account: ctx.accounts.underlying_token_account.clone(),
+            underlying_mint: ctx.accounts.underlying_mint.clone(),
             signer: ctx.accounts.signer.clone(),
             token_program: ctx.accounts.token_program.clone(),
         };
@@ -65,6 +66,7 @@ pub fn handle_withdraw_fee<'info>(
         ctx.accounts.underlying_token_account.to_account_info(), 
         ctx.accounts.recipient.to_account_info(), 
         ctx.accounts.strategy.to_account_info(), 
+        &ctx.accounts.underlying_mint,
         amount, 
         &strategy.seeds()
     )

programs/strategy/src/state/simple_strategy.rs

@@ -112,6 +112,7 @@ impl Strategy for SimpleStrategy {
             remaining[0].to_account_info(),
             accounts.underlying_token_account.to_account_info(),
             accounts.signer.to_account_info(),
+            &accounts.underlying_mint,
             profit,
         )?;
 
@@ -122,6 +123,7 @@ impl Strategy for SimpleStrategy {
             &mut Report {
             strategy: accounts.strategy.clone(),
             underlying_token_account: underlying_token_account.clone(),
+            underlying_mint: accounts.underlying_mint.clone(),
             token_program: accounts.token_program.clone(),
             signer: accounts.signer.clone(),
             }, 
@@ -142,6 +144,7 @@ impl Strategy for SimpleStrategy {
             accounts.underlying_token_account.to_account_info(),
             remaining[0].to_account_info(),
             accounts.strategy.to_account_info(),
+            &accounts.underlying_mint,
             loss,
             &self.seeds(),
         )?;
@@ -153,6 +156,7 @@ impl Strategy for SimpleStrategy {
             &mut Report {
             strategy: accounts.strategy.clone(),
             underlying_token_account: underlying_token_account.clone(),
+            underlying_mint: accounts.underlying_mint.clone(),
             token_program: accounts.token_program.clone(),
             signer: accounts.signer.clone(),
             }, 
@@ -199,6 +203,7 @@ impl Strategy for SimpleStrategy {
             accounts.underlying_token_account.to_account_info(),
             remaining[0].to_account_info(),
             accounts.strategy.to_account_info(),
+            &accounts.underlying_mint,
             amount,
             &seeds
         )?;
@@ -218,6 +223,7 @@ impl Strategy for SimpleStrategy {
             remaining[0].to_account_info(),
             accounts.underlying_token_account.to_account_info(),
             accounts.signer.to_account_info(),
+            &accounts.underlying_mint,
             amount,
         )
     }

programs/strategy/src/state/trade_fintech_strategy.rs

@@ -112,6 +112,7 @@ impl Strategy for TradeFintechStrategy {
             remaining[0].to_account_info(),
             accounts.underlying_token_account.to_account_info(),
             accounts.signer.to_account_info(),
+            &accounts.underlying_mint,
             amount_to_repay,
         )?;
 
@@ -122,6 +123,7 @@ impl Strategy for TradeFintechStrategy {
             &mut Report {
             strategy: accounts.strategy.clone(),
             underlying_token_account: underlying_token_account.clone(),
+            underlying_mint: accounts.underlying_mint.clone(),
             token_program: accounts.token_program.clone(),
             signer: accounts.signer.clone(),
             }, 
@@ -150,6 +152,7 @@ impl Strategy for TradeFintechStrategy {
             remaining[0].to_account_info(),
             accounts.underlying_token_account.to_account_info(),
             accounts.signer.to_account_info(),
+            &accounts.underlying_mint,
             amount_to_repay,
         )?;
 
@@ -160,6 +163,7 @@ impl Strategy for TradeFintechStrategy {
             &mut Report {
             strategy: accounts.strategy.clone(),
             underlying_token_account: underlying_token_account.clone(),
+            underlying_mint: accounts.underlying_mint.clone(),
             token_program: accounts.token_program.clone(),
             signer: accounts.signer.clone(),
             }, 
@@ -196,6 +200,7 @@ impl Strategy for TradeFintechStrategy {
             accounts.underlying_token_account.to_account_info(),
             remaining[0].to_account_info(),
             accounts.strategy.to_account_info(),
+            &accounts.underlying_mint,
             amount,
             &seeds
         )?;