Use only AssociatedToken as vester_ta accounts

Author: zpoken

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

@@ -1,4 +1,5 @@
 use anchor_lang::prelude::*;
+use anchor_spl::associated_token::AssociatedToken;
 use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
 use crate::context::{VESTING_BALANCE_SEED, VESTING_CONFIG_SEED, VEST_SEED};
@@ -11,8 +12,9 @@ pub struct CancelVesting<'info> {
     admin: Signer<'info>,
     mint: InterfaceAccount<'info, Mint>,
     #[account(
-        token::mint = mint,
-        token::token_program = token_program
+        associated_token::mint = mint,
+        associated_token::authority = vester_ta.owner,
+        associated_token::token_program = token_program
     )]
     vester_ta: InterfaceAccount<'info, TokenAccount>,
     #[account(
@@ -38,6 +40,8 @@ pub struct CancelVesting<'info> {
         bump = vesting_balance.bump
     )]
     vesting_balance: Account<'info, VestingBalance>,
+
+    associated_token_program: Program<'info, AssociatedToken>,
     token_program: Interface<'info, TokenInterface>,
     system_program: Program<'info, System>,
 }

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

@@ -27,7 +27,9 @@ pub struct ClaimVesting<'info> {
     vault: InterfaceAccount<'info, TokenAccount>,
     #[account(
         mut,
-        token::mint = mint
+        associated_token::mint = mint,
+        associated_token::authority = vester,
+        associated_token::token_program = token_program
     )]
     vester_ta: InterfaceAccount<'info, TokenAccount>,
     #[account(

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

@@ -1,4 +1,5 @@
 use anchor_lang::prelude::*;
+use anchor_spl::associated_token::AssociatedToken;
 use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
 use crate::context::{VESTING_BALANCE_SEED, VESTING_CONFIG_SEED, VEST_SEED};
@@ -12,8 +13,9 @@ pub struct CreateVesting<'info> {
     admin: Signer<'info>,
     mint: InterfaceAccount<'info, Mint>,
     #[account(
-        token::mint = mint,
-        token::token_program = token_program
+        associated_token::mint = mint,
+        associated_token::authority = vester_ta.owner,
+        associated_token::token_program = token_program
     )]
     vester_ta: InterfaceAccount<'info, TokenAccount>,
     #[account(
@@ -39,6 +41,8 @@ pub struct CreateVesting<'info> {
         bump = vesting_balance.bump
     )]
     vesting_balance: Account<'info, VestingBalance>,
+
+    associated_token_program: Program<'info, AssociatedToken>,
     token_program: Interface<'info, TokenInterface>,
     system_program: Program<'info, System>,
 }

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

@@ -1,6 +1,7 @@
 use crate::context::{VESTING_BALANCE_SEED, VESTING_CONFIG_SEED};
 use crate::state::{VestingBalance, VestingConfig};
 use anchor_lang::prelude::*;
+use anchor_spl::associated_token::AssociatedToken;
 use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
 #[derive(Accounts)]
@@ -24,10 +25,13 @@ pub struct CreateVestingBalance<'info> {
     )]
     vesting_balance: Account<'info, VestingBalance>,
     #[account(
-        token::mint = mint,
-        token::token_program = token_program
+        associated_token::mint = mint,
+        associated_token::authority = vester_ta.owner,
+        associated_token::token_program = token_program
     )]
     vester_ta: InterfaceAccount<'info, TokenAccount>,
+
+    associated_token_program: Program<'info, AssociatedToken>,
     token_program: Interface<'info, TokenInterface>,
     system_program: Program<'info, System>,
 }

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

@@ -19,12 +19,16 @@ pub struct TransferVesting<'info> {
     mint: Box<InterfaceAccount<'info, Mint>>,
     #[account(
         mut,
-        token::mint = mint
+        associated_token::mint = mint,
+        associated_token::authority = vester_ta.owner,
+        associated_token::token_program = token_program
     )]
     vester_ta: Box<InterfaceAccount<'info, TokenAccount>>,
     #[account(
         mut,
-        token::mint = mint
+        associated_token::mint = mint,
+        associated_token::authority = new_vester_ta.owner,
+        associated_token::token_program = token_program
     )]
     new_vester_ta: Box<InterfaceAccount<'info, TokenAccount>>,
     #[account(