merge master

Author: moosecat2

CHANGELOG.md

@@ -13,6 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking
 
+## [2.145.0] - 2025-10-28
+
+### Features
+
+- dlp ([#1885](https://github.com/drift-labs/protocol-v2/pull/1885))
+
+### Fixes
+
+### Breaking
+
 ## [2.144.0] - 2025-10-27
 
 ### Features

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "drift"
-version = "2.144.0"
+version = "2.145.0"
 description = "Created with Anchor"
 edition = "2018"
 

programs/drift/Cargo.toml

@@ -1135,15 +1135,37 @@ pub fn handle_initialize_perp_market(
 
 pub fn handle_initialize_amm_cache(ctx: Context<InitializeAmmCache>) -> Result<()> {
     let amm_cache = &mut ctx.accounts.amm_cache;
-    let state = &ctx.accounts.state;
-    amm_cache
-        .cache
-        .resize_with(state.number_of_markets as usize, CacheInfo::default);
     amm_cache.bump = ctx.bumps.amm_cache;
 
     Ok(())
 }
 
+pub fn handle_resize_amm_cache(ctx: Context<ResizeAmmCache>) -> Result<()> {
+    let amm_cache = &mut ctx.accounts.amm_cache;
+    let state = &ctx.accounts.state;
+    let current_size = amm_cache.cache.len();
+    let new_size = (state.number_of_markets as usize).min(current_size + 20_usize);
+
+    msg!(
+        "resizing amm cache from {} entries to {}",
+        current_size,
+        new_size
+    );
+
+    let growth = new_size.saturating_sub(current_size);
+    validate!(
+        growth <= 20,
+        ErrorCode::DefaultError,
+        "cannot grow amm_cache by more than 20 entries in a single resize (requested +{})",
+        growth
+    )?;
+
+    amm_cache.cache.resize_with(new_size, CacheInfo::default);
+    amm_cache.validate(state)?;
+
+    Ok(())
+}
+
 #[access_control(
     perp_market_valid(&ctx.accounts.perp_market)
 )]
@@ -5511,7 +5533,7 @@ pub struct InitializeAmmCache<'info> {
     #[account(
         init,
         seeds = [AMM_POSITIONS_CACHE.as_ref()],
-        space = AmmCache::space(state.number_of_markets as usize),
+        space = AmmCache::init_space(),
         bump,
         payer = admin
     )]
@@ -5520,6 +5542,27 @@ pub struct InitializeAmmCache<'info> {
     pub system_program: Program<'info, System>,
 }
 
+#[derive(Accounts)]
+pub struct ResizeAmmCache<'info> {
+    #[account(
+        mut,
+        constraint = admin.key() == admin_hot_wallet::id() || admin.key() == state.admin
+    )]
+    pub admin: Signer<'info>,
+    pub state: Box<Account<'info, State>>,
+    #[account(
+        mut,
+        seeds = [AMM_POSITIONS_CACHE.as_ref()],
+        bump,
+        realloc = AmmCache::space(amm_cache.cache.len() + (state.number_of_markets as usize - amm_cache.cache.len()).min(20_usize)),
+        realloc::payer = admin,
+        realloc::zero = false,
+    )]
+    pub amm_cache: Box<Account<'info, AmmCache>>,
+    pub rent: Sysvar<'info, Rent>,
+    pub system_program: Program<'info, System>,
+}
+
 #[derive(Accounts)]
 pub struct DeleteInitializedPerpMarket<'info> {
     #[account(mut)]

programs/drift/src/instructions/admin.rs

@@ -849,7 +849,9 @@ pub fn place_signed_msg_taker_order<'c: 'info, 'info>(
         taker.update_perp_position_max_margin_ratio(market_index, max_margin_ratio)?;
     }
 
-    if let Some(isolated_position_deposit) = verified_message_and_signature.isolated_position_deposit {
+    if let Some(isolated_position_deposit) =
+        verified_message_and_signature.isolated_position_deposit
+    {
         spot_market_map.update_writable_spot_market(0)?;
         transfer_isolated_perp_position_deposit(
             taker,

programs/drift/src/instructions/keeper.rs

@@ -3909,6 +3909,7 @@ pub fn handle_begin_swap<'c: 'info, 'info>(
                     )?;
                 }
             } else {
+                let mut whitelisted_programs = WHITELISTED_SWAP_PROGRAMS.to_vec();
                 let mut whitelisted_programs = WHITELISTED_SWAP_PROGRAMS.to_vec();
                 if !delegate_is_signer {
                     whitelisted_programs.push(Token::id());

programs/drift/src/instructions/user.rs

@@ -175,15 +175,19 @@ impl HasLen for AmmCacheFixed {
 }
 
 impl AmmCache {
+    pub fn init_space() -> usize {
+        8 + 8 + 4
+    }
+
     pub fn space(num_markets: usize) -> usize {
         8 + 8 + 4 + num_markets * CacheInfo::SIZE
     }
 
     pub fn validate(&self, state: &State) -> DriftResult<()> {
         validate!(
-            self.cache.len() == state.number_of_markets as usize,
+            self.cache.len() <= state.number_of_markets as usize,
             ErrorCode::DefaultError,
-            "Number of amm positions is different than number of markets"
+            "Number of amm positions is no larger than number of markets"
         )?;
         Ok(())
     }

programs/drift/src/state/amm_cache.rs

@@ -1,5 +1,4 @@
 use std::collections::BTreeMap;
-use std::f32::consts::E;
 
 use crate::error::{DriftResult, ErrorCode};
 use crate::math::casting::Cast;

programs/drift/src/state/lp_pool.rs

@@ -1 +1 @@
-2.145.0-beta.2
+2.146.0-beta.2

sdk/VERSION

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.145.0-beta.2",
+	"version": "2.146.0-beta.2",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"module": "./lib/browser/index.js",