Use token::Token instead of token_interface::TokenInterface

Author: zpoken

solana/programs/staking/src/contexts/cancel_vesting.rs

@@ -1,7 +1,7 @@
 use anchor_lang::prelude::*;
 use anchor_spl::associated_token::AssociatedToken;
-use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
-
+use anchor_spl::token_interface::{Mint, TokenAccount};
+use anchor_spl::token::Token;
 use crate::context::{VESTING_BALANCE_SEED, VESTING_CONFIG_SEED, VEST_SEED, CONFIG_SEED};
 use crate::error::VestingError;
 use crate::state::{Vesting, VestingBalance, VestingConfig};
@@ -51,7 +51,7 @@ pub struct CancelVesting<'info> {
     )]
     pub global_config: Box<Account<'info, GlobalConfig>>,
     associated_token_program: Program<'info, AssociatedToken>,
-    token_program: Interface<'info, TokenInterface>,
+    token_program: Program<'info, Token>,
     system_program: Program<'info, System>,
 }
 

solana/programs/staking/src/contexts/claim_vesting.rs

@@ -9,8 +9,9 @@ use crate::{
 use anchor_lang::prelude::*;
 use anchor_spl::associated_token::AssociatedToken;
 use anchor_spl::token_interface::{
-    transfer_checked, Mint, TokenAccount, TokenInterface, TransferChecked,
+    transfer_checked, Mint, TokenAccount, TransferChecked,
 };
+use anchor_spl::token::Token;
 use std::convert::TryInto;
 
 #[event_cpi]
@@ -77,7 +78,7 @@ pub struct ClaimVesting<'info> {
     )]
     admin: AccountInfo<'info>,
     associated_token_program: Program<'info, AssociatedToken>,
-    token_program: Interface<'info, TokenInterface>,
+    token_program: Program<'info, Token>,
     system_program: Program<'info, System>,
 }
 

solana/programs/staking/src/contexts/create_vesting.rs

@@ -1,7 +1,7 @@
 use anchor_lang::prelude::*;
 use anchor_spl::associated_token::AssociatedToken;
-use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
-
+use anchor_spl::token_interface::{Mint, TokenAccount};
+use anchor_spl::token::Token;
 use crate::context::{CONFIG_SEED, VESTING_BALANCE_SEED, VESTING_CONFIG_SEED, VEST_SEED};
 use crate::error::VestingError;
 use crate::state::global_config::GlobalConfig;
@@ -51,7 +51,7 @@ pub struct CreateVesting<'info> {
     )]
     pub global_config: Box<Account<'info, GlobalConfig>>,
     associated_token_program: Program<'info, AssociatedToken>,
-    token_program: Interface<'info, TokenInterface>,
+    token_program: Program<'info, Token>,
     system_program: Program<'info, System>,
 }
 

solana/programs/staking/src/contexts/create_vesting_balance.rs

@@ -4,7 +4,8 @@ use crate::state::global_config::GlobalConfig;
 use crate::state::{VestingBalance, VestingConfig};
 use anchor_lang::prelude::*;
 use anchor_spl::associated_token::AssociatedToken;
-use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
+use anchor_spl::token_interface::{Mint, TokenAccount};
+use anchor_spl::token::Token;
 
 #[derive(Accounts)]
 #[instruction()]
@@ -42,7 +43,7 @@ pub struct CreateVestingBalance<'info> {
     )]
     pub global_config: Box<Account<'info, GlobalConfig>>,
     associated_token_program: Program<'info, AssociatedToken>,
-    token_program: Interface<'info, TokenInterface>,
+    token_program: Program<'info, Token>,
     system_program: Program<'info, System>,
 }
 

solana/programs/staking/src/contexts/finalize.rs

@@ -2,7 +2,8 @@ use crate::context::{VESTING_CONFIG_SEED, CONFIG_SEED};
 use crate::error::VestingError;
 use crate::state::VestingConfig;
 use anchor_lang::prelude::*;
-use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
+use anchor_spl::token_interface::{Mint, TokenAccount};
+use anchor_spl::token::Token;
 use crate::state::global_config::GlobalConfig;
 
 #[derive(Accounts)]
@@ -33,7 +34,7 @@ pub struct Finalize<'info> {
         bump = global_config.bump,
     )]
     pub global_config: Box<Account<'info, GlobalConfig>>,
-    token_program: Interface<'info, TokenInterface>,
+    token_program: Program<'info, Token>,
 }
 
 impl<'info> Finalize<'info> {

solana/programs/staking/src/contexts/initialize.rs

@@ -4,7 +4,8 @@ use crate::state::global_config::GlobalConfig;
 use crate::state::VestingConfig;
 use anchor_lang::prelude::*;
 use anchor_spl::associated_token::AssociatedToken;
-use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
+use anchor_spl::token_interface::{Mint, TokenAccount};
+use anchor_spl::token::Token;
 
 #[derive(Accounts)]
 #[instruction(seed: u64)]
@@ -46,7 +47,7 @@ pub struct Initialize<'info> {
     global_config: Box<Account<'info, GlobalConfig>>,
 
     associated_token_program: Program<'info, AssociatedToken>,
-    token_program: Interface<'info, TokenInterface>,
+    token_program: Program<'info, Token>,
     system_program: Program<'info, System>,
 }
 

solana/programs/staking/src/contexts/transfer_vesting.rs

@@ -9,7 +9,8 @@ use crate::state::{Vesting, VestingBalance, VestingConfig};
 use crate::{error::ErrorCode, error::VestingError};
 use anchor_lang::prelude::*;
 use anchor_spl::associated_token::AssociatedToken;
-use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
+use anchor_spl::token_interface::{Mint, TokenAccount};
+use anchor_spl::token::Token;
 
 #[event_cpi]
 #[derive(Accounts)]
@@ -88,7 +89,7 @@ pub struct TransferVesting<'info> {
     pub new_stake_account_metadata: Option<Box<Account<'info, StakeAccountMetadata>>>,
 
     associated_token_program: Program<'info, AssociatedToken>,
-    token_program: Interface<'info, TokenInterface>,
+    token_program: Program<'info, Token>,
     system_program: Program<'info, System>,
 }
 

solana/programs/staking/src/contexts/withdraw_surplus.rs

@@ -4,8 +4,9 @@ use crate::state::VestingConfig;
 use anchor_lang::prelude::*;
 use anchor_spl::associated_token::AssociatedToken;
 use anchor_spl::token_interface::{
-    transfer_checked, Mint, TokenAccount, TokenInterface, TransferChecked,
+    transfer_checked, Mint, TokenAccount, TransferChecked,
 };
+use anchor_spl::token::Token;
 use crate::state::global_config::GlobalConfig;
 
 #[derive(Accounts)]
@@ -44,7 +45,7 @@ pub struct WithdrawSurplus<'info> {
     )]
     pub global_config: Box<Account<'info, GlobalConfig>>,
     associated_token_program: Program<'info, AssociatedToken>,
-    token_program: Interface<'info, TokenInterface>,
+    token_program: Program<'info, Token>,
     system_program: Program<'info, System>,
 }