refactor last settle ts to last settle slot

moosecat2 · moosecat2 · commit dca709357656 · 2025-08-14T16:42:25.000-07:00
diff --git a/programs/drift/src/instructions/admin.rs b/programs/drift/src/instructions/admin.rs
@@ -1182,7 +1182,7 @@ pub fn handle_update_init_amm_cache_info<'c: 'info, 'info>(
 #[derive(Debug, Clone, Copy, AnchorSerialize, AnchorDeserialize, PartialEq, Eq)]
 pub struct OverrideAmmCacheParams {
     pub quote_owed_from_lp_pool: Option<i64>,
-    pub last_settle_ts: Option<i64>,
+    pub last_settle_slot: Option<u64>,
     pub last_fee_pool_token_amount: Option<u128>,
     pub last_net_pnl_pool_token_amount: Option<i128>,
 }
@@ -1204,8 +1204,8 @@ pub fn handle_override_amm_cache_info<'c: 'info, 'info>(
     if let Some(quote_owed_from_lp_pool) = override_params.quote_owed_from_lp_pool {
         cache_entry.quote_owed_from_lp_pool = quote_owed_from_lp_pool;
     }
-    if let Some(last_settle_ts) = override_params.last_settle_ts {
-        cache_entry.last_settle_ts = last_settle_ts;
+    if let Some(last_settle_slot) = override_params.last_settle_slot {
+        cache_entry.last_settle_slot = last_settle_slot;
     }
     if let Some(last_fee_pool_token_amount) = override_params.last_fee_pool_token_amount {
         cache_entry.last_fee_pool_token_amount = last_fee_pool_token_amount;
diff --git a/programs/drift/src/instructions/keeper.rs b/programs/drift/src/instructions/keeper.rs
@@ -3136,7 +3136,6 @@ pub fn handle_settle_perp_to_lp_pool<'c: 'info, 'info>(
     use perp_lp_pool_settlement::*;
 
     let slot = Clock::get()?.slot;
-    let timestamp = Clock::get()?.unix_timestamp;
     let state = &ctx.accounts.state;
 
     if !state.allow_settle_lp_pool() {
@@ -3292,7 +3291,7 @@ pub fn handle_settle_perp_to_lp_pool<'c: 'info, 'info>(
         };
 
         // Update cache info
-        update_cache_info(cached_info, &settlement_result, new_quote_owed, timestamp)?;
+        update_cache_info(cached_info, &settlement_result, new_quote_owed, slot)?;
 
         // Update LP pool stats
         match settlement_result.direction {
diff --git a/programs/drift/src/math/lp_pool.rs b/programs/drift/src/math/lp_pool.rs
@@ -157,11 +157,11 @@ pub mod perp_lp_pool_settlement {
         cache_info: &mut CacheInfo,
         result: &SettlementResult,
         new_quote_owed: i64,
-        timestamp: i64,
+        slot: u64,
     ) -> Result<()> {
         cache_info.quote_owed_from_lp_pool = new_quote_owed;
         cache_info.last_settle_amount = result.amount_transferred;
-        cache_info.last_settle_ts = timestamp;
+        cache_info.last_settle_slot = slot;
 
         match result.direction {
             SettlementDirection::FromLpPool => {
diff --git a/programs/drift/src/state/lp_pool/tests.rs b/programs/drift/src/state/lp_pool/tests.rs
@@ -1887,7 +1887,7 @@ mod settle_tests {
             last_fee_pool_token_amount: 2_000,
             last_net_pnl_pool_token_amount: 500,
             last_settle_amount: 0,
-            last_settle_ts: 0,
+            last_settle_slot: 0,
             ..Default::default()
         };
 
@@ -1906,7 +1906,7 @@ mod settle_tests {
         assert_eq!(cache.quote_owed_from_lp_pool, new_quote_owed);
         // settle fields updated
         assert_eq!(cache.last_settle_amount, 200);
-        assert_eq!(cache.last_settle_ts, ts);
+        assert_eq!(cache.last_settle_slot, ts);
         // fee pool decreases by fee_pool_used
         assert_eq!(cache.last_fee_pool_token_amount, 2_000 - 120);
         // pnl pool decreases by pnl_pool_used
@@ -1920,7 +1920,7 @@ mod settle_tests {
             last_fee_pool_token_amount: 1_000,
             last_net_pnl_pool_token_amount: 200,
             last_settle_amount: 0,
-            last_settle_ts: 0,
+            last_settle_slot: 0,
             ..Default::default()
         };
 
@@ -1939,7 +1939,7 @@ mod settle_tests {
         assert_eq!(cache.quote_owed_from_lp_pool, new_quote_owed);
         // settle fields updated
         assert_eq!(cache.last_settle_amount, 150);
-        assert_eq!(cache.last_settle_ts, ts);
+        assert_eq!(cache.last_settle_slot, ts);
         // fee pool increases by amount_transferred
         assert_eq!(cache.last_fee_pool_token_amount, 1_000 + 150);
         // pnl pool untouched
@@ -2063,7 +2063,7 @@ mod settle_tests {
             last_fee_pool_token_amount: 1000,
             last_net_pnl_pool_token_amount: 500,
             last_settle_amount: 50,
-            last_settle_ts: 12345,
+            last_settle_slot: 12345,
             ..Default::default()
         };
 
@@ -2082,7 +2082,7 @@ mod settle_tests {
         assert_eq!(cache.quote_owed_from_lp_pool, 100);
         // settle fields updated with new timestamp but zero amount
         assert_eq!(cache.last_settle_amount, 0);
-        assert_eq!(cache.last_settle_ts, ts);
+        assert_eq!(cache.last_settle_slot, ts);
         // pool amounts unchanged
         assert_eq!(cache.last_fee_pool_token_amount, 1000);
         assert_eq!(cache.last_net_pnl_pool_token_amount, 500);
@@ -2095,7 +2095,7 @@ mod settle_tests {
             last_fee_pool_token_amount: u128::MAX / 2,
             last_net_pnl_pool_token_amount: i128::MAX / 2,
             last_settle_amount: 0,
-            last_settle_ts: 0,
+            last_settle_slot: 0,
             ..Default::default()
         };
 
@@ -2106,9 +2106,9 @@ mod settle_tests {
             pnl_pool_used: 0,
         };
         let new_quote_owed = cache.quote_owed_from_lp_pool - (result.amount_transferred as i64);
-        let ts = i64::MAX / 2;
+        let slot = u64::MAX / 2;
 
-        let update_result = update_cache_info(&mut cache, &result, new_quote_owed, ts);
+        let update_result = update_cache_info(&mut cache, &result, new_quote_owed, slot);
         assert!(update_result.is_ok());
     }
 
@@ -2119,7 +2119,7 @@ mod settle_tests {
             last_fee_pool_token_amount: 1000,
             last_net_pnl_pool_token_amount: i128::MIN / 2,
             last_settle_amount: 0,
-            last_settle_ts: 0,
+            last_settle_slot: 0,
             ..Default::default()
         };
 
@@ -2143,7 +2143,7 @@ mod settle_tests {
             last_fee_pool_token_amount: 5000,
             last_net_pnl_pool_token_amount: 3000,
             last_settle_amount: 0,
-            last_settle_ts: 0,
+            last_settle_slot: 0,
             ..Default::default()
         };
 
@@ -2174,7 +2174,7 @@ mod settle_tests {
         assert_eq!(cache.quote_owed_from_lp_pool, 1100);
         assert_eq!(cache.last_fee_pool_token_amount, 5050);
         assert_eq!(cache.last_net_pnl_pool_token_amount, 2850);
-        assert_eq!(cache.last_settle_ts, 200);
+        assert_eq!(cache.last_settle_slot, 200);
     }
 
     #[test]
@@ -2281,7 +2281,7 @@ mod settle_tests {
             };
 
             update_cache_info(&mut cache, &result, 0, ts).unwrap();
-            assert_eq!(cache.last_settle_ts, ts);
+            assert_eq!(cache.last_settle_slot, ts);
             assert_eq!(cache.last_settle_amount, 100);
         }
     }
diff --git a/programs/drift/src/state/perp_market.rs b/programs/drift/src/state/perp_market.rs
@@ -1890,7 +1890,7 @@ pub struct CacheInfo {
     pub max_confidence_interval_multiplier: u64,
     pub last_oracle_price_twap: i64,
     pub last_settle_amount: u64,
-    pub last_settle_ts: i64,
+    pub last_settle_slot: u64,
     pub quote_owed_from_lp_pool: i64,
     pub oracle_price: i64,
     pub oracle_confidence: u64,
@@ -1921,7 +1921,7 @@ impl Default for CacheInfo {
             last_fee_pool_token_amount: 0u128,
             last_net_pnl_pool_token_amount: 0i128,
             last_settle_amount: 0u64,
-            last_settle_ts: 0i64,
+            last_settle_slot: 0u64,
             oracle_source: 0u8,
             quote_owed_from_lp_pool: 0i64,
         }
@@ -1980,12 +1980,12 @@ impl AmmCache {
 impl_zero_copy_loader!(AmmCache, crate::id, AmmCacheFixed, CacheInfo);
 
 impl<'a> AccountZeroCopy<'a, CacheInfo, AmmCacheFixed> {
-    pub fn check_settle_staleness(&self, now: i64, threshold_ms: i64) -> DriftResult<()> {
+    pub fn check_settle_staleness(&self, slot: u64, threshold_slot_diff: u64) -> DriftResult<()> {
         for (i, cache_info) in self.iter().enumerate() {
             if cache_info.slot == 0 {
                 continue;
             }
-            if cache_info.last_settle_ts < now.saturating_sub(threshold_ms) {
+            if cache_info.last_settle_slot < slot.saturating_sub(threshold_slot_diff) {
                 msg!("AMM settle data is stale for perp market {}", i);
                 return Err(ErrorCode::AMMCacheStale.into());
             }
diff --git a/sdk/src/idl/drift.json b/sdk/src/idl/drift.json
@@ -11711,9 +11711,9 @@
             }
           },
           {
-            "name": "lastSettleTs",
+            "name": "lastSettleSlot",
             "type": {
-              "option": "i64"
+              "option": "u64"
             }
           },
           {
@@ -13578,8 +13578,8 @@
             "type": "u64"
           },
           {
-            "name": "lastSettleTs",
-            "type": "i64"
+            "name": "lastSettleSlot",
+            "type": "u64"
           },
           {
             "name": "quoteOwedFromLpPool",
diff --git a/sdk/src/types.ts b/sdk/src/types.ts
@@ -1664,6 +1664,9 @@ export type LPPoolAccount = {
 	lastRevenueRebalanceTs: BN;
 	totalFeesReceived: BN;
 	totalFeesPaid: BN;
+	totalMintRedeemFeesPaid: BN;
+	cumulativeUsdcSentToPerpMarkets: BN;
+	cumulativeUsdcReceivedFromPerpMarkets: BN;
 	constituents: number;
 };
 
@@ -1730,7 +1733,7 @@ export type CacheInfo = {
 	lastFeePoolTokenAmount: BN;
 	lastNetPnlPoolTokenAmount: BN;
 	lastSettleAmount: BN;
-	lastSettleTs: BN;
+	lastSettleSlot: BN;
 	quoteOwedFromLpPool: BN;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -1182,7 +1182,7 @@ pub fn handle_update_init_amm_cache_info<'c: 'info, 'info>(`
`1182`	`1182`	`#[derive(Debug, Clone, Copy, AnchorSerialize, AnchorDeserialize, PartialEq, Eq)]`
`1183`	`1183`	`pub struct OverrideAmmCacheParams {`
`1184`	`1184`	`pub quote_owed_from_lp_pool: Option<i64>,`
`1185`		`- pub last_settle_ts: Option<i64>,`
	`1185`	`+ pub last_settle_slot: Option<u64>,`
`1186`	`1186`	`pub last_fee_pool_token_amount: Option<u128>,`
`1187`	`1187`	`pub last_net_pnl_pool_token_amount: Option<i128>,`
`1188`	`1188`	`}`
`@@ -1204,8 +1204,8 @@ pub fn handle_override_amm_cache_info<'c: 'info, 'info>(`
`1204`	`1204`	`if let Some(quote_owed_from_lp_pool) = override_params.quote_owed_from_lp_pool {`
`1205`	`1205`	`cache_entry.quote_owed_from_lp_pool = quote_owed_from_lp_pool;`
`1206`	`1206`	`}`
`1207`		`- if let Some(last_settle_ts) = override_params.last_settle_ts {`
`1208`		`- cache_entry.last_settle_ts = last_settle_ts;`
	`1207`	`+ if let Some(last_settle_slot) = override_params.last_settle_slot {`
	`1208`	`+ cache_entry.last_settle_slot = last_settle_slot;`
`1209`	`1209`	`}`
`1210`	`1210`	`if let Some(last_fee_pool_token_amount) = override_params.last_fee_pool_token_amount {`
`1211`	`1211`	`cache_entry.last_fee_pool_token_amount = last_fee_pool_token_amount;`
Original file line number	Diff line number	Diff line change
`@@ -11711,9 +11711,9 @@`
`11711`	`11711`	`}`
`11712`	`11712`	`},`
`11713`	`11713`	`{`
`11714`		`- "name": "lastSettleTs",`
	`11714`	`+ "name": "lastSettleSlot",`
`11715`	`11715`	`"type": {`
`11716`		`- "option": "i64"`
	`11716`	`+ "option": "u64"`
`11717`	`11717`	`}`
`11718`	`11718`	`},`
`11719`	`11719`	`{`
`@@ -13578,8 +13578,8 @@`
`13578`	`13578`	`"type": "u64"`
`13579`	`13579`	`},`
`13580`	`13580`	`{`
`13581`		`- "name": "lastSettleTs",`
`13582`		`- "type": "i64"`
	`13581`	`+ "name": "lastSettleSlot",`
	`13582`	`+ "type": "u64"`
`13583`	`13583`	`},`
`13584`	`13584`	`{`
`13585`	`13585`	`"name": "quoteOwedFromLpPool",`