stable target base liquidity fix + cleanup

Author: moosecat2

.devcontainer/Dockerfile

@@ -13,15 +13,16 @@ ENV HOME="/root"
 ENV PATH="/usr/local/cargo/bin:${PATH}"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:${PATH}"
 
-RUN mkdir -p /workdir /tmp && \
-    apt-get update -qq && apt-get upgrade -qq && apt-get install -y --no-install-recommends \
-      build-essential git curl wget jq pkg-config python3-pip xz-utils ca-certificates \
-      libssl-dev libudev-dev bash && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN apt-get install -y software-properties-common \
+RUN mkdir -p /workdir /tmp \
+  && apt-get update -qq \
+  && apt-get upgrade -qq \
+  && apt-get install -y --no-install-recommends \
+       build-essential git curl wget jq pkg-config python3-pip xz-utils ca-certificates \
+       libssl-dev libudev-dev bash software-properties-common \
   && add-apt-repository 'deb http://deb.debian.org/debian bookworm main' \
-  && apt-get update && apt-get install -y libc6 libc6-dev
+  && apt-get update -qq \
+  && apt-get install -y libc6 libc6-dev \
+  && rm -rf /var/lib/apt/lists/*
 
 RUN rustup component add rustfmt
 

programs/drift/src/instructions/lp_pool.rs

@@ -223,10 +223,7 @@ pub fn handle_update_lp_pool_aum<'c: 'info, 'info>(
 
     // Set USDC stable weight
     msg!("aum: {}", aum);
-    let total_stable_target_base = aum
-        .cast::<i128>()?
-        .safe_sub(crypto_delta.abs())?
-        .max(0_i128);
+    let total_stable_target_base = aum.cast::<i128>()?.safe_sub(crypto_delta)?;
     constituent_target_base
         .get_mut(lp_pool.quote_consituent_index as u32)
         .target_base = total_stable_target_base.cast::<i64>()?;
@@ -861,7 +858,6 @@ pub fn handle_view_lp_pool_add_liquidity_fees<'c: 'info, 'info>(
     in_amount: u128,
 ) -> Result<()> {
     let slot = Clock::get()?.slot;
-    let now = Clock::get()?.unix_timestamp;
     let state = &ctx.accounts.state;
     let lp_pool = ctx.accounts.lp_pool.load()?;
 
@@ -1043,7 +1039,7 @@ pub fn handle_lp_pool_remove_liquidity<'c: 'info, 'info>(
         out_spot_market.get_max_confidence_interval_multiplier()?,
         0,
     )?;
-    let out_oracle = out_oracle.clone();
+    let out_oracle = *out_oracle;
 
     // TODO: check self.aum validity
 
@@ -1247,7 +1243,6 @@ pub fn handle_view_lp_pool_remove_liquidity_fees<'c: 'info, 'info>(
     lp_to_burn: u64,
 ) -> Result<()> {
     let slot = Clock::get()?.slot;
-    let now = Clock::get()?.unix_timestamp;
     let state = &ctx.accounts.state;
     let lp_pool = ctx.accounts.lp_pool.load()?;
 
@@ -1520,7 +1515,7 @@ pub fn handle_withdraw_from_program_vault<'c: 'info, 'info>(
 
     controller::spot_balance::update_spot_market_cumulative_interest(
         &mut spot_market,
-        Some(&oracle_data),
+        Some(oracle_data),
         clock.unix_timestamp,
     )?;
     let token_balance_after_cumulative_interest_update = constituent

programs/drift/src/math/lp_pool.rs

@@ -10,7 +10,7 @@ pub mod perp_lp_pool_settlement {
         state::{amm_cache::CacheInfo, perp_market::PerpMarket, spot_market::SpotMarket},
         *,
     };
-    use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
+    use anchor_spl::token_interface::{TokenAccount, TokenInterface};
 
     #[derive(Debug, Clone, Copy)]
     pub struct SettlementResult {
@@ -55,7 +55,7 @@ pub mod perp_lp_pool_settlement {
         ctx: &SettlementContext,
         result: &SettlementResult,
     ) -> Result<()> {
-        if result.amount_transferred > ctx.max_settle_quote_amount as u64 {
+        if result.amount_transferred > ctx.max_settle_quote_amount {
             msg!(
                 "Amount to settle exceeds maximum allowed, {} > {}",
                 result.amount_transferred,
@@ -94,7 +94,8 @@ pub mod perp_lp_pool_settlement {
     }
 
     fn calculate_perp_to_lp_settlement(ctx: &SettlementContext) -> Result<SettlementResult> {
-        let amount_to_send = (ctx.quote_owed_from_lp.abs() as u64).min(ctx.max_settle_quote_amount);
+        let amount_to_send =
+            (ctx.quote_owed_from_lp.abs().cast::<u64>()?).min(ctx.max_settle_quote_amount);
 
         if ctx.fee_pool_balance >= amount_to_send as u128 {
             // Fee pool can cover entire amount

programs/drift/src/state/lp_pool.rs

@@ -220,7 +220,7 @@ impl LPPool {
 
         let out_fee_amount = out_amount
             .cast::<i128>()?
-            .safe_mul(out_fee as i128)?
+            .safe_mul(out_fee)?
             .safe_div(PERCENTAGE_PRECISION_I128)?;
 
         Ok((in_amount, out_amount, in_fee_amount, out_fee_amount))
@@ -472,7 +472,7 @@ impl LPPool {
             let out_spot_market = out_spot_market.unwrap();
             let out_oracle_price = out_oracle_price.unwrap();
             let out_amount = notional_trade_size
-                .safe_mul(10_i128.pow(out_spot_market.decimals as u32))?
+                .safe_mul(10_i128.pow(out_spot_market.decimals))?
                 .safe_div(out_oracle_price.cast::<i128>()?)?;
             (
                 false,
@@ -693,10 +693,10 @@ impl LPPool {
 
         if total_quote_owed > 0 {
             aum = aum
-                .saturating_sub(total_quote_owed as i128)
+                .saturating_sub(total_quote_owed)
                 .max(QUOTE_PRECISION_I128);
         } else if total_quote_owed < 0 {
-            aum = aum.saturating_add((-total_quote_owed) as i128);
+            aum = aum.saturating_add(-total_quote_owed);
         }
 
         let aum_u128 = aum.max(0).cast::<u128>()?;
@@ -739,7 +739,7 @@ impl SpotBalance for ConstituentSpotBalance {
     }
 
     fn balance(&self) -> u128 {
-        self.scaled_balance as u128
+        self.scaled_balance
     }
 
     fn increase_balance(&mut self, delta: u128) -> DriftResult {
@@ -883,15 +883,15 @@ impl Constituent {
                 self.pubkey,
                 self.spot_market_index
             );
-            return Err(ErrorCode::InvalidConstituentOperation.into());
+            Err(ErrorCode::InvalidConstituentOperation)
         } else if ConstituentLpOperation::is_operation_paused(self.paused_operations, operation) {
             msg!(
                 "Constituent {:?}, spot market {}, is paused for operation {:?}",
                 self.pubkey,
                 self.spot_market_index,
                 operation
             );
-            return Err(ErrorCode::InvalidConstituentOperation.into());
+            Err(ErrorCode::InvalidConstituentOperation)
         } else {
             Ok(())
         }
@@ -1175,7 +1175,7 @@ impl<'a> AccountZeroCopy<'a, TargetsDatum, ConstituentTargetBaseFixed> {
 
         // TODO: validate spot market
         let datum = self.get(constituent_index as u32);
-        let target_weight = calculate_target_weight(datum.target_base, &spot_market, price, aum)?;
+        let target_weight = calculate_target_weight(datum.target_base, spot_market, price, aum)?;
         Ok(target_weight)
     }
 }
@@ -1197,7 +1197,7 @@ pub fn calculate_target_weight(
         .safe_mul(PERCENTAGE_PRECISION_I128)?
         .safe_div(lp_pool_aum.cast::<i128>()?)?
         .cast::<i64>()?
-        .clamp(-1 * PERCENTAGE_PRECISION_I64, PERCENTAGE_PRECISION_I64);
+        .clamp(-PERCENTAGE_PRECISION_I64, PERCENTAGE_PRECISION_I64);
 
     Ok(target_weight)
 }
@@ -1268,11 +1268,10 @@ impl<'a> AccountZeroCopyMut<'a, TargetsDatum, ConstituentTargetBaseFixed> {
             mapping_index = j;
 
             let cell = self.get_mut(i as u32);
-            let target_base = target_notional
+            let target_base = -target_notional
                 .safe_div(PERCENTAGE_PRECISION_I128)?
                 .safe_mul(10_i128.pow(decimals as u32))?
-                .safe_div(price as i128)?
-                * -1; // Want to target opposite sign of total scaled notional inventory
+                .safe_div(price as i128)?; // Want to target opposite sign of total scaled notional inventory
 
             msg!(
                 "updating constituent index {} target base to {} from aggregated perp notional {}",
@@ -1295,7 +1294,7 @@ impl<'a> AccountZeroCopyMut<'a, AmmConstituentDatum, AmmConstituentMappingFixed>
 
         let mut open_slot_index: Option<u32> = None;
         for i in 0..len {
-            let cell = self.get(i as u32);
+            let cell = self.get(i);
             if cell.constituent_index == datum.constituent_index
                 && cell.perp_market_index == datum.perp_market_index
             {
@@ -1305,7 +1304,7 @@ impl<'a> AccountZeroCopyMut<'a, AmmConstituentDatum, AmmConstituentMappingFixed>
                 open_slot_index = Some(i);
             }
         }
-        let open_slot = open_slot_index.ok_or_else(|| ErrorCode::DefaultError.into())?;
+        let open_slot = open_slot_index.ok_or(ErrorCode::DefaultError)?;
 
         let cell = self.get_mut(open_slot);
         *cell = datum;
@@ -1319,11 +1318,11 @@ impl<'a> AccountZeroCopyMut<'a, AmmConstituentDatum, AmmConstituentMappingFixed>
         let len = self.len();
         let mut data: Vec<AmmConstituentDatum> = Vec::with_capacity(len as usize);
         for i in 0..len {
-            data.push(*self.get(i as u32));
+            data.push(*self.get(i));
         }
         data.sort_by_key(|datum| datum.constituent_index);
         for i in 0..len {
-            let cell = self.get_mut(i as u32);
+            let cell = self.get_mut(i);
             *cell = data[i as usize];
         }
         Ok(())
@@ -1482,8 +1481,8 @@ impl ConstituentCorrelations {
             "ConstituentCorrelation correlations must be between 0 and PERCENTAGE_PRECISION"
         )?;
 
-        self.correlations[(i as usize * num_constituents + j as usize) as usize] = corr;
-        self.correlations[(j as usize * num_constituents + i as usize) as usize] = corr;
+        self.correlations[(i as usize * num_constituents + j as usize)] = corr;
+        self.correlations[(j as usize * num_constituents + i as usize)] = corr;
 
         self.validate()?;
 
@@ -1568,7 +1567,7 @@ pub fn update_constituent_target_base_for_derivatives(
     constituent_target_base: &mut AccountZeroCopyMut<'_, TargetsDatum, ConstituentTargetBaseFixed>,
 ) -> DriftResult<()> {
     for (parent_index, constituent_indexes) in derivative_groups.iter() {
-        let parent_constituent = constituent_map.get_ref(&(parent_index))?;
+        let parent_constituent = constituent_map.get_ref(parent_index)?;
         let parent_target_base = constituent_target_base
             .get(*parent_index as u32)
             .target_base;