Merge branch 'dlp' into devnet

Author: moosecat2

programs/drift/src/instructions/admin.rs

@@ -5489,7 +5489,7 @@ pub struct InitializePerpMarket<'info> {
         mut,
         seeds = [AMM_POSITIONS_CACHE.as_ref()],
         bump = amm_cache.bump,
-        realloc = AmmCache::space(amm_cache.cache.len() + 1 as usize),
+        realloc = AmmCache::space(amm_cache.cache.len() + 1_usize),
         realloc::payer = admin,
         realloc::zero = false,
     )]

programs/drift/src/instructions/lp_admin.rs

@@ -19,6 +19,7 @@ use crate::validate;
 use crate::{controller, load_mut};
 use anchor_lang::prelude::*;
 use anchor_lang::Discriminator;
+use anchor_spl::associated_token::AssociatedToken;
 use anchor_spl::token::Token;
 use anchor_spl::token_2022::Token2022;
 use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
@@ -639,12 +640,6 @@ pub fn handle_begin_lp_swap<'c: 'info, 'info>(
 
     // Make sure we have enough balance to do the swap
     let constituent_in_token_account = &ctx.accounts.constituent_in_token_account;
-
-    msg!("amount_in: {}", amount_in);
-    msg!(
-        "constituent_in_token_account.amount: {}",
-        constituent_in_token_account.amount
-    );
     validate!(
         amount_in <= constituent_in_token_account.amount,
         ErrorCode::InvalidSwap,
@@ -761,6 +756,7 @@ pub fn handle_begin_lp_swap<'c: 'info, 'info>(
                 }
             } else {
                 let mut whitelisted_programs = WHITELISTED_SWAP_PROGRAMS.to_vec();
+                whitelisted_programs.push(AssociatedToken::id());
                 whitelisted_programs.push(Token::id());
                 whitelisted_programs.push(Token2022::id());
                 whitelisted_programs.push(marinade_mainnet::ID);
@@ -1079,7 +1075,7 @@ pub struct InitializeConstituent<'info> {
         mut,
         seeds = [CONSTITUENT_TARGET_BASE_PDA_SEED.as_ref(), lp_pool.key().as_ref()],
         bump = constituent_target_base.bump,
-        realloc = ConstituentTargetBase::space(constituent_target_base.targets.len() + 1 as usize),
+        realloc = ConstituentTargetBase::space(constituent_target_base.targets.len() + 1_usize),
         realloc::payer = admin,
         realloc::zero = false,
     )]
@@ -1089,7 +1085,7 @@ pub struct InitializeConstituent<'info> {
         mut,
         seeds = [CONSTITUENT_CORRELATIONS_PDA_SEED.as_ref(), lp_pool.key().as_ref()],
         bump = constituent_correlations.bump,
-        realloc = ConstituentCorrelations::space(constituent_target_base.targets.len() + 1 as usize),
+        realloc = ConstituentCorrelations::space(constituent_target_base.targets.len() + 1_usize),
         realloc::payer = admin,
         realloc::zero = false,
     )]
@@ -1214,7 +1210,7 @@ pub struct AddAmmConstituentMappingData<'info> {
         mut,
         seeds = [CONSTITUENT_TARGET_BASE_PDA_SEED.as_ref(), lp_pool.key().as_ref()],
         bump,
-        realloc = ConstituentTargetBase::space(constituent_target_base.targets.len() + 1 as usize),
+        realloc = ConstituentTargetBase::space(constituent_target_base.targets.len() + 1_usize),
         realloc::payer = admin,
         realloc::zero = false,
     )]

programs/drift/src/state/lp_pool.rs

@@ -1455,7 +1455,7 @@ impl<'a> AccountZeroCopyMut<'a, TargetsDatum, ConstituentTargetBaseFixed> {
             );
             cell.target_base = target_base.cast::<i64>()?;
 
-            if slot.saturating_sub(oldest_position_slot) <= MAX_STALENESS_FOR_TARGET_CALC {
+            if slot.saturating_sub(oldest_position_slot) == MAX_STALENESS_FOR_TARGET_CALC {
                 cell.last_position_slot = slot;
             } else {
                 msg!(

sdk/src/adminClient.ts

@@ -84,11 +84,8 @@ import { PROGRAM_ID as PHOENIX_PROGRAM_ID } from '@ellipsis-labs/phoenix-sdk';
 import { DRIFT_ORACLE_RECEIVER_ID } from './config';
 import { getFeedIdUint8Array } from './util/pythOracleUtils';
 import { FUEL_RESET_LOG_ACCOUNT } from './constants/txConstants';
-import {
-	JupiterClient,
-	QuoteResponse,
-	SwapMode,
-} from './jupiter/jupiterClient';
+import { JupiterClient, QuoteResponse } from './jupiter/jupiterClient';
+import { SwapMode } from './swap/UnifiedSwapClient';
 
 const OPENBOOK_PROGRAM_ID = new PublicKey(
 	'opnb2LAfJYbRMAHHvqjCwQxanZn7ReEHp1k81EohpZb'

tests/lpPool.ts

@@ -28,7 +28,6 @@ import {
 	QUOTE_PRECISION,
 	getLpPoolPublicKey,
 	getAmmConstituentMappingPublicKey,
-	encodeName,
 	getConstituentTargetBasePublicKey,
 	PERCENTAGE_PRECISION,
 	PRICE_PRECISION,
@@ -1688,7 +1687,6 @@ describe('LP Pool', () => {
 
 	it('can initialize multiple lp pools', async () => {
 		const newLpPoolId = 1;
-		const newLpPoolKey = getLpPoolPublicKey(program.programId, newLpPoolId);
 
 		await adminClient.initializeLpPool(
 			newLpPoolId,

tests/lpPoolCUs.ts

@@ -28,7 +28,6 @@ import {
 	QUOTE_PRECISION,
 	getLpPoolPublicKey,
 	getAmmConstituentMappingPublicKey,
-	encodeName,
 	getConstituentTargetBasePublicKey,
 	PERCENTAGE_PRECISION,
 	PRICE_PRECISION,

tests/lpPoolSwap.ts

@@ -13,7 +13,6 @@ import {
 	TestClient,
 	QUOTE_PRECISION,
 	getLpPoolPublicKey,
-	encodeName,
 	getConstituentTargetBasePublicKey,
 	PERCENTAGE_PRECISION,
 	PRICE_PRECISION,
@@ -503,13 +502,11 @@ describe('LP Pool', () => {
 		expect(Number(diffOutToken)).to.be.approximately(1001298, 1);
 
 		console.log(
-			`in Token:  ${inTokenBalanceBefore.amount} -> ${
-				inTokenBalanceAfter.amount
+			`in Token:  ${inTokenBalanceBefore.amount} -> ${inTokenBalanceAfter.amount
 			} (${Number(diffInToken) / 1e6})`
 		);
 		console.log(
-			`out Token: ${outTokenBalanceBefore.amount} -> ${
-				outTokenBalanceAfter.amount
+			`out Token: ${outTokenBalanceBefore.amount} -> ${outTokenBalanceAfter.amount
 			} (${Number(diffOutToken) / 1e6})`
 		);
 	});