Nour/address more comments (#1726)

moosecat2 · web-flow · commit 464e1d3daf81 · 2025-07-09T15:50:49.000-07:00
* use oracle staleness threshold for staleness

* add spot market vault invariant
diff --git a/programs/drift/src/error.rs b/programs/drift/src/error.rs
@@ -662,6 +662,8 @@ pub enum ErrorCode {
     LpPoolAumDelayed,
     #[msg("Constituent oracle is stale")]
     ConstituentOracleStale,
+    #[msg("LP Invariant failed")]
+    LpInvariantFailed,
 }
 
 #[macro_export]
diff --git a/programs/drift/src/instructions/lp_pool.rs b/programs/drift/src/instructions/lp_pool.rs
@@ -17,7 +17,7 @@ use crate::{
         casting::Cast,
         constants::{
             PERCENTAGE_PRECISION, PERCENTAGE_PRECISION_I128, PERCENTAGE_PRECISION_I64,
-            PERCENTAGE_PRECISION_U64, PRICE_PRECISION_I128, QUOTE_PRECISION_I128,
+            PERCENTAGE_PRECISION_U64, PRICE_PRECISION, PRICE_PRECISION_I128, QUOTE_PRECISION_I128,
         },
         oracle::{is_oracle_valid_for_action, oracle_validity, DriftAction},
         safe_math::SafeMath,
@@ -30,7 +30,7 @@ use crate::{
             calculate_target_weight, AmmConstituentDatum, AmmConstituentMappingFixed, Constituent,
             ConstituentCorrelationsFixed, ConstituentTargetBaseFixed, LPPool, TargetsDatum,
             WeightValidationFlags, LP_POOL_SWAP_AUM_UPDATE_DELAY,
-            MAX_AMM_CACHE_STALENESS_FOR_TARGET_CALC, MAX_CONSTITUENT_ORACLE_SLOT_STALENESS_FOR_AUM,
+            MAX_AMM_CACHE_STALENESS_FOR_TARGET_CALC,
         },
         oracle::OraclePriceData,
         oracle_map::OracleMap,
@@ -258,7 +258,7 @@ pub fn handle_update_lp_pool_aum<'c: 'info, 'info>(
     for i in 0..lp_pool.constituents as usize {
         let constituent = constituent_map.get_ref(&(i as u16))?;
         if slot.saturating_sub(constituent.last_oracle_slot)
-            > MAX_CONSTITUENT_ORACLE_SLOT_STALENESS_FOR_AUM
+            > constituent.oracle_staleness_threshold
         {
             msg!(
                 "Constituent {} oracle slot is too stale: {}, current slot: {}",
@@ -490,13 +490,13 @@ pub fn handle_lp_pool_swap<'c: 'info, 'info>(
     } = load_maps(
         &mut ctx.remaining_accounts.iter().peekable(),
         &MarketSet::new(),
-        &get_writable_spot_market_set_from_many(vec![in_market_index, out_market_index]),
+        &MarketSet::new(),
         slot,
         Some(state.oracle_guard_rails),
     )?;
 
-    let mut in_spot_market = spot_market_map.get_ref_mut(&in_market_index)?;
-    let mut out_spot_market = spot_market_map.get_ref_mut(&out_market_index)?;
+    let in_spot_market = spot_market_map.get_ref(&in_market_index)?;
+    let out_spot_market = spot_market_map.get_ref(&out_market_index)?;
 
     let in_oracle_id = in_spot_market.oracle_id();
     let out_oracle_id = out_spot_market.oracle_id();
@@ -538,9 +538,6 @@ pub fn handle_lp_pool_swap<'c: 'info, 'info>(
         return Err(ErrorCode::InvalidOracle.into());
     }
 
-    update_spot_market_cumulative_interest(&mut in_spot_market, Some(&in_oracle), now)?;
-    update_spot_market_cumulative_interest(&mut out_spot_market, Some(&out_oracle), now)?;
-
     let in_target_weight = constituent_target_base.get_target_weight(
         in_constituent.constituent_index,
         &in_spot_market,
@@ -622,8 +619,6 @@ pub fn handle_lp_pool_swap<'c: 'info, 'info>(
         in_constituent_index: in_constituent.constituent_index,
         out_oracle_price: out_oracle.price,
         in_oracle_price: in_oracle.price,
-        out_mint: out_constituent.mint,
-        in_mint: in_constituent.mint,
         last_aum: lp_pool.last_aum,
         last_aum_slot: lp_pool.last_aum_slot,
         in_market_current_weight: in_constituent.get_weight(
@@ -833,7 +828,10 @@ pub fn handle_lp_pool_add_liquidity<'c: 'info, 'info>(
 
     let dlp_total_supply = ctx.accounts.lp_mint.supply;
     let lp_price = if dlp_total_supply > 0 {
-        lp_pool.last_aum.safe_div(dlp_total_supply as u128)?
+        lp_pool
+            .last_aum
+            .safe_mul(PRICE_PRECISION)?
+            .safe_div(dlp_total_supply as u128)?
     } else {
         0
     };
@@ -850,7 +848,6 @@ pub fn handle_lp_pool_add_liquidity<'c: 'info, 'info>(
         constituent_index: in_constituent.constituent_index,
         oracle_price: in_oracle.price,
         mint: in_constituent.mint,
-        lp_mint: lp_pool.mint,
         lp_amount,
         lp_fee: lp_fee_amount,
         lp_price,
@@ -1032,7 +1029,10 @@ pub fn handle_lp_pool_remove_liquidity<'c: 'info, 'info>(
 
     let dlp_total_supply = ctx.accounts.lp_mint.supply;
     let lp_price = if dlp_total_supply > 0 {
-        lp_pool.last_aum.safe_div(dlp_total_supply as u128)?
+        lp_pool
+            .last_aum
+            .safe_mul(PRICE_PRECISION)?
+            .safe_div(dlp_total_supply as u128)?
     } else {
         0
     };
@@ -1049,7 +1049,6 @@ pub fn handle_lp_pool_remove_liquidity<'c: 'info, 'info>(
         constituent_index: out_constituent.constituent_index,
         oracle_price: out_oracle.price,
         mint: out_constituent.mint,
-        lp_mint: lp_pool.mint,
         lp_amount: lp_burn_amount,
         lp_fee: lp_fee_amount,
         lp_price,
@@ -1112,6 +1111,8 @@ pub fn handle_deposit_to_program_vault<'c: 'info, 'info>(
         return Err(ErrorCode::InsufficientDeposit.into());
     }
 
+    let deposit_plus_token_amount_before = amount.safe_add(spot_market_vault.amount)?;
+
     let oracle_data = oracle_map.get_price_data(&oracle_id)?;
     let oracle_data_slot = clock.slot - oracle_data.delay.max(0i64).cast::<u64>()?;
     if constituent.last_oracle_slot < oracle_data_slot {
@@ -1150,6 +1151,12 @@ pub fn handle_deposit_to_program_vault<'c: 'info, 'info>(
     ctx.accounts.spot_market_vault.reload()?;
     spot_market.validate_max_token_deposits_and_borrows(false)?;
 
+    validate!(
+        ctx.accounts.spot_market_vault.amount == deposit_plus_token_amount_before,
+        ErrorCode::LpInvariantFailed,
+        "Spot market vault amount mismatch after deposit"
+    )?;
+
     Ok(())
 }
 
diff --git a/programs/drift/src/state/events.rs b/programs/drift/src/state/events.rs
@@ -760,10 +760,6 @@ pub struct LPSwapRecord {
     pub out_oracle_price: i64,
     /// precision: PRICE_PRECISION
     pub in_oracle_price: i64,
-    /// out token mint
-    pub out_mint: Pubkey,
-    /// in token mint
-    pub in_mint: Pubkey,
     /// LPPool last_aum, QUOTE_PRECISION
     pub last_aum: u128,
     pub last_aum_slot: u64,
@@ -802,8 +798,6 @@ pub struct LPMintRedeemRecord {
     pub oracle_price: i64,
     /// token mint
     pub mint: Pubkey,
-    /// lp mint
-    pub lp_mint: Pubkey,
     /// lp amount, lp mint precision
     pub lp_amount: u64,
     /// lp fee, lp mint precision
diff --git a/programs/drift/src/state/lp_pool.rs b/programs/drift/src/state/lp_pool.rs
@@ -41,11 +41,6 @@ pub const MAX_AMM_CACHE_STALENESS_FOR_TARGET_CALC: u64 = 10000u64;
 #[cfg(not(feature = "anchor-test"))]
 pub const MAX_AMM_CACHE_STALENESS_FOR_TARGET_CALC: u64 = 0u64;
 
-#[cfg(feature = "anchor-test")]
-pub const MAX_CONSTITUENT_ORACLE_SLOT_STALENESS_FOR_AUM: u64 = 10000u64;
-#[cfg(not(feature = "anchor-test"))]
-pub const MAX_CONSTITUENT_ORACLE_SLOT_STALENESS_FOR_AUM: u64 = 2u64;
-
 #[cfg(test)]
 mod tests;
 
diff --git a/sdk/src/driftClient.ts b/sdk/src/driftClient.ts
@@ -9982,7 +9982,7 @@ export class DriftClient {
 	): Promise<TransactionInstruction> {
 		const remainingAccounts = this.getRemainingAccounts({
 			userAccounts: [],
-			writableSpotMarketIndexes: [inMarketIndex, outMarketIndex],
+			readableSpotMarketIndexes: [inMarketIndex, outMarketIndex],
 		});
 
 		return this.program.instruction.lpPoolSwap(
diff --git a/sdk/src/idl/drift.json b/sdk/src/idl/drift.json
@@ -16543,16 +16543,6 @@
           "type": "i64",
           "index": false
         },
-        {
-          "name": "outMint",
-          "type": "publicKey",
-          "index": false
-        },
-        {
-          "name": "inMint",
-          "type": "publicKey",
-          "index": false
-        },
         {
           "name": "lastAum",
           "type": "u128",
@@ -16648,11 +16638,6 @@
           "type": "publicKey",
           "index": false
         },
-        {
-          "name": "lpMint",
-          "type": "publicKey",
-          "index": false
-        },
         {
           "name": "lpAmount",
           "type": "u64",
@@ -18341,6 +18326,11 @@
       "code": 6328,
       "name": "ConstituentOracleStale",
       "msg": "Constituent oracle is stale"
+    },
+    {
+      "code": 6329,
+      "name": "LpInvariantFailed",
+      "msg": "LP Invariant failed"
     }
   ],
   "metadata": {

Original file line number	Diff line number	Diff line change
`@@ -662,6 +662,8 @@ pub enum ErrorCode {`
`662`	`662`	`LpPoolAumDelayed,`
`663`	`663`	`#[msg("Constituent oracle is stale")]`
`664`	`664`	`ConstituentOracleStale,`
	`665`	`+ #[msg("LP Invariant failed")]`
	`666`	`+ LpInvariantFailed,`
`665`	`667`	`}`
`666`	`668`
`667`	`669`	`#[macro_export]`