small proram tweaks (#2021)

Author: moosecat2

programs/drift/src/instructions/keeper.rs

@@ -3334,6 +3334,12 @@ pub fn handle_settle_perp_to_lp_pool<'c: 'info, 'info>(
     let lp_pool_key = ctx.accounts.lp_pool.key();
     let mut lp_pool = ctx.accounts.lp_pool.load_mut()?;
 
+    controller::spot_balance::update_spot_market_cumulative_interest(
+        &mut *quote_market,
+        None,
+        now,
+    )?;
+
     let tvl_before = quote_market
         .get_tvl()?
         .safe_add(quote_constituent.vault_token_balance as u128)?;
@@ -3351,12 +3357,6 @@ pub fn handle_settle_perp_to_lp_pool<'c: 'info, 'info>(
         None,
     )?;
 
-    controller::spot_balance::update_spot_market_cumulative_interest(
-        &mut *quote_market,
-        None,
-        now,
-    )?;
-
     for (_, perp_market_loader) in perp_market_map.0.iter() {
         let mut perp_market = perp_market_loader.load_mut()?;
         if lp_pool.lp_pool_id != perp_market.lp_pool_id {

programs/drift/src/instructions/user.rs

@@ -3,6 +3,7 @@ use std::ops::DerefMut;
 
 use anchor_lang::prelude::*;
 use anchor_lang::Discriminator;
+use anchor_spl::associated_token::AssociatedToken;
 use anchor_spl::{
     token::Token,
     token_2022::Token2022,
@@ -3681,6 +3682,7 @@ pub fn handle_begin_swap<'c: 'info, 'info>(
             } else {
                 let mut whitelisted_programs = WHITELISTED_SWAP_PROGRAMS.to_vec();
                 if !delegate_is_signer {
+                    whitelisted_programs.push(AssociatedToken::id());
                     whitelisted_programs.push(Token::id());
                     whitelisted_programs.push(Token2022::id());
                     whitelisted_programs.push(marinade_mainnet::ID);