Merge remote-tracking branch 'origin/master' into chore/anchor-32

Author: jordy25519

CHANGELOG.md

@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+### Fixes
+
+### Breaking
+
+## [2.146.0] - 2025-11-03
+
+### Features
+
 - program: add isolated_position_deposit to signed msg params
 
 ### Fixes

Cargo.lock

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

programs/drift/Cargo.toml

@@ -29,6 +29,7 @@ use crate::math::{amm, amm_spread, bn, cp_curve, quote_asset::*};
 
 use crate::state::events::CurveRecord;
 use crate::state::oracle::OraclePriceData;
+use crate::state::paused_operations::PerpOperation;
 use crate::state::perp_market::{PerpMarket, AMM};
 use crate::state::spot_market::{SpotBalance, SpotBalanceType, SpotMarket};
 use crate::state::user::{SpotPosition, User};
@@ -499,6 +500,10 @@ fn calculate_revenue_pool_transfer(
     // If the AMM budget is above `FEE_POOL_TO_REVENUE_POOL_THRESHOLD` (in surplus), settle fees collected to the revenue pool depending on the health of the AMM state
     // Otherwise, spull from the revenue pool (up to a constraint amount)
 
+    if market.is_operation_paused(PerpOperation::SettleRevPool) {
+        return Ok(0);
+    }
+
     let amm_budget_surplus =
         terminal_state_surplus.saturating_sub(FEE_POOL_TO_REVENUE_POOL_THRESHOLD.cast()?);
 

programs/drift/src/controller/amm.rs

@@ -692,6 +692,8 @@ pub enum ErrorCode {
     Unauthorized,
     #[msg("Invalid Lp Pool Id for Operation")]
     InvalidLpPoolId,
+    #[msg("MarketIndexNotFoundAmmCache")]
+    MarketIndexNotFoundAmmCache,
 }
 
 #[macro_export]

programs/drift/src/error.rs

@@ -1107,17 +1107,6 @@ pub fn handle_initialize_perp_market(
 
     safe_increment!(state.number_of_markets, 1);
 
-    let amm_cache = &mut ctx.accounts.amm_cache;
-    let current_len = amm_cache.cache.len();
-    amm_cache
-        .cache
-        .resize_with(current_len + 1, CacheInfo::default);
-    let current_market_info = amm_cache.cache.get_mut(current_len).unwrap();
-    current_market_info.slot = clock_slot;
-    current_market_info.oracle = perp_market.amm.oracle;
-    current_market_info.oracle_source = u8::from(perp_market.amm.oracle_source);
-    amm_cache.validate(state)?;
-
     controller::amm::update_concentration_coef(perp_market, concentration_coef_scale)?;
     crate::dlog!(oracle_price);
 
@@ -1140,28 +1129,32 @@ pub fn handle_initialize_amm_cache(ctx: Context<InitializeAmmCache>) -> Result<(
     Ok(())
 }
 
-pub fn handle_resize_amm_cache(ctx: Context<ResizeAmmCache>) -> Result<()> {
+pub fn handle_add_market_to_amm_cache(ctx: Context<AddMarketToAmmCache>) -> Result<()> {
     let amm_cache = &mut ctx.accounts.amm_cache;
-    let state = &ctx.accounts.state;
+    let perp_market = ctx.accounts.perp_market.load()?;
+
+    for cache_info in amm_cache.cache.iter() {
+        validate!(
+            cache_info.market_index != perp_market.market_index,
+            ErrorCode::DefaultError,
+            "Market index {} already in amm cache",
+            perp_market.market_index
+        )?;
+    }
+
     let current_size = amm_cache.cache.len();
-    let new_size = (state.number_of_markets as usize).min(current_size + 20_usize);
+    let new_size = current_size.saturating_add(1);
 
     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)?;
+    amm_cache.cache.resize_with(new_size, || CacheInfo {
+        market_index: perp_market.market_index,
+        ..CacheInfo::default()
+    });
 
     Ok(())
 }
@@ -3364,7 +3357,8 @@ pub fn handle_update_perp_market_paused_operations(
 
     if *ctx.accounts.admin.key != ctx.accounts.state.admin {
         validate!(
-            paused_operations == PerpOperation::UpdateFunding as u8,
+            paused_operations == PerpOperation::UpdateFunding as u8
+                || paused_operations == PerpOperation::SettleRevPool as u8,
             ErrorCode::DefaultError,
             "signer must be admin",
         )?;
@@ -3586,20 +3580,6 @@ pub fn handle_update_perp_market_reference_price_offset_deadband_pct(
     Ok(())
 }
 
-pub fn handle_update_lp_cooldown_time(
-    ctx: Context<AdminUpdateState>,
-    lp_cooldown_time: u64,
-) -> Result<()> {
-    msg!(
-        "lp_cooldown_time: {} -> {}",
-        ctx.accounts.state.lp_cooldown_time,
-        lp_cooldown_time
-    );
-
-    ctx.accounts.state.lp_cooldown_time = lp_cooldown_time;
-    Ok(())
-}
-
 pub fn handle_update_perp_fee_structure(
     ctx: Context<AdminUpdateState>,
     fee_structure: FeeStructure,
@@ -3819,7 +3799,14 @@ pub fn handle_update_perp_market_oracle(
     perp_market.amm.oracle = oracle;
     perp_market.amm.oracle_source = oracle_source;
 
-    amm_cache.update_perp_market_fields(perp_market)?;
+    if amm_cache
+        .cache
+        .iter()
+        .find(|cache_info| cache_info.market_index == perp_market.market_index)
+        .is_some()
+    {
+        amm_cache.update_perp_market_fields(perp_market)?;
+    }
 
     Ok(())
 }
@@ -5511,15 +5498,6 @@ pub struct InitializePerpMarket<'info> {
         payer = admin
     )]
     pub perp_market: AccountLoader<'info, PerpMarket>,
-    #[account(
-        mut,
-        seeds = [AMM_POSITIONS_CACHE.as_ref()],
-        bump = amm_cache.bump,
-        realloc = AmmCache::space(amm_cache.cache.len() + 1_usize),
-        realloc::payer = admin,
-        realloc::zero = false,
-    )]
-    pub amm_cache: Box<Account<'info, AmmCache>>,
     /// CHECK: checked in `initialize_perp_market`
     pub oracle: AccountInfo<'info>,
     pub rent: Sysvar<'info, Rent>,
@@ -5547,7 +5525,7 @@ pub struct InitializeAmmCache<'info> {
 }
 
 #[derive(Accounts)]
-pub struct ResizeAmmCache<'info> {
+pub struct AddMarketToAmmCache<'info> {
     #[account(
         mut,
         constraint = admin.key() == admin_hot_wallet::id() || admin.key() == state.admin
@@ -5558,22 +5536,23 @@ pub struct ResizeAmmCache<'info> {
         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 = AmmCache::space(amm_cache.cache.len() + 1),
         realloc::payer = admin,
         realloc::zero = false,
     )]
     pub amm_cache: Box<Account<'info, AmmCache>>,
+    pub perp_market: AccountLoader<'info, PerpMarket>,
     pub rent: Sysvar<'info, Rent>,
     pub system_program: Program<'info, System>,
 }
 
 #[derive(Accounts)]
 pub struct DeleteAmmCache<'info> {
-    #[account(mut)]
-    pub admin: Signer<'info>,
     #[account(
-        has_one = admin
+        mut,
+        constraint = admin.key() == admin_hot_wallet::id() || admin.key() == state.admin
     )]
+    pub admin: Signer<'info>,
     pub state: Box<Account<'info, State>>,
     #[account(
         mut,

programs/drift/src/instructions/admin.rs

@@ -3377,7 +3377,7 @@ pub fn handle_settle_perp_to_lp_pool<'c: 'info, 'info>(
             continue;
         }
 
-        let cached_info = amm_cache.get_mut(perp_market.market_index as u32);
+        let cached_info = amm_cache.get_for_market_index_mut(perp_market.market_index)?;
 
         // Early validation checks
         if slot.saturating_sub(cached_info.oracle_slot) > SETTLE_AMM_ORACLE_MAX_DELAY {
@@ -3593,7 +3593,7 @@ pub fn handle_update_amm_cache<'c: 'info, 'info>(
         if perp_market.lp_status == 0 {
             continue;
         }
-        let cached_info = amm_cache.get_mut(perp_market.market_index as u32);
+        let cached_info = amm_cache.get_for_market_index_mut(perp_market.market_index)?;
 
         validate!(
             perp_market.oracle_id() == cached_info.oracle_id()?,

programs/drift/src/instructions/keeper.rs

@@ -4,7 +4,7 @@ use crate::ids::{lp_pool_hot_wallet, lp_pool_swap_wallet, WHITELISTED_SWAP_PROGR
 use crate::instructions::optional_accounts::{get_token_mint, load_maps, AccountMaps};
 use crate::math::constants::{PRICE_PRECISION_U64, QUOTE_SPOT_MARKET_INDEX};
 use crate::math::safe_math::SafeMath;
-use crate::state::amm_cache::{AmmCache, CacheInfo, AMM_POSITIONS_CACHE};
+use crate::state::amm_cache::{AmmCache, AMM_POSITIONS_CACHE};
 use crate::state::lp_pool::{
     AmmConstituentDatum, AmmConstituentMapping, Constituent, ConstituentCorrelations,
     ConstituentTargetBase, LPPool, TargetsDatum, AMM_MAP_PDA_SEED,
@@ -922,20 +922,6 @@ pub fn handle_update_initial_amm_cache_info<'c: 'info, 'info>(
     Ok(())
 }
 
-pub fn handle_reset_amm_cache(ctx: Context<ResetAmmCache>) -> Result<()> {
-    let state = &ctx.accounts.state;
-    let amm_cache = &mut ctx.accounts.amm_cache;
-
-    amm_cache.cache.clear();
-    amm_cache
-        .cache
-        .resize_with(state.number_of_markets as usize, CacheInfo::default);
-    amm_cache.validate(state)?;
-
-    msg!("AMM cache reset. markets: {}", state.number_of_markets);
-    Ok(())
-}
-
 #[derive(Debug, Clone, Copy, AnchorSerialize, AnchorDeserialize, PartialEq, Eq)]
 pub struct OverrideAmmCacheParams {
     pub quote_owed_from_lp_pool: Option<i64>,

programs/drift/src/instructions/lp_admin.rs

@@ -43,6 +43,7 @@ use crate::{
     },
     validate,
 };
+use std::collections::BTreeMap;
 use std::iter::Peekable;
 use std::slice::Iter;
 
@@ -96,31 +97,33 @@ pub fn handle_update_constituent_target_base<'c: 'info, 'info>(
     let constituent_map =
         ConstituentMap::load(&ConstituentSet::new(), &lp_pool_key, remaining_accounts)?;
 
-    let mut amm_inventories: Vec<AmmInventoryAndPricesAndSlots> =
-        Vec::with_capacity(amm_cache.len() as usize);
+    let mut amm_inventories: BTreeMap<u16, AmmInventoryAndPricesAndSlots> = BTreeMap::new();
     for (_, cache_info) in amm_cache.iter().enumerate() {
         if cache_info.lp_status_for_perp_market == 0 {
             continue;
         }
 
-        amm_inventories.push(AmmInventoryAndPricesAndSlots {
-            inventory: {
-                let scaled_position = cache_info
-                    .position
-                    .safe_mul(cache_info.amm_position_scalar as i64)?
-                    .safe_div(100)?;
-
-                scaled_position.clamp(
-                    -cache_info.amm_inventory_limit,
-                    cache_info.amm_inventory_limit,
-                )
+        amm_inventories.insert(
+            cache_info.market_index,
+            AmmInventoryAndPricesAndSlots {
+                inventory: {
+                    let scaled_position = cache_info
+                        .position
+                        .safe_mul(cache_info.amm_position_scalar as i64)?
+                        .safe_div(100)?;
+
+                    scaled_position.clamp(
+                        -cache_info.amm_inventory_limit,
+                        cache_info.amm_inventory_limit,
+                    )
+                },
+                price: cache_info.oracle_price,
+                last_oracle_slot: cache_info.oracle_slot,
+                last_position_slot: cache_info.slot,
             },
-            price: cache_info.oracle_price,
-            last_oracle_slot: cache_info.oracle_slot,
-            last_position_slot: cache_info.slot,
-        });
+        );
     }
-    msg!("amm inventories: {:?}", amm_inventories);
+    msg!("amm inventories:{:?}", amm_inventories);
 
     if amm_inventories.is_empty() {
         msg!("No valid inventories found for constituent target weights update");
@@ -140,7 +143,7 @@ pub fn handle_update_constituent_target_base<'c: 'info, 'info>(
 
     constituent_target_base.update_target_base(
         &amm_constituent_mapping,
-        amm_inventories.as_slice(),
+        &amm_inventories,
         constituent_indexes_and_decimals_and_prices.as_mut_slice(),
         slot,
     )?;
@@ -1010,7 +1013,7 @@ pub fn handle_lp_pool_remove_liquidity<'c: 'info, 'info>(
         if cache_info.last_fee_pool_token_amount != 0 && cache_info.last_settle_slot != slot {
             msg!(
                 "Market {} has not been settled in current slot. Last slot: {}",
-                i,
+                cache_info.market_index,
                 cache_info.last_settle_slot
             );
             return Err(ErrorCode::AMMCacheStale.into());