respond to more comments

Author: moosecat2

programs/drift/src/controller/amm.rs

@@ -15,8 +15,8 @@ use crate::math::amm::calculate_quote_asset_amount_swapped;
 use crate::math::amm_spread::{calculate_spread_reserves, get_spread_reserves};
 use crate::math::casting::Cast;
 use crate::math::constants::{
-    CONCENTRATION_PRECISION, FEE_ADJUSTMENT_MAX, FEE_POOL_TO_REVENUE_POOL_THRESHOLD,
-    K_BPS_UPDATE_SCALE, MAX_CONCENTRATION_COEFFICIENT, MAX_K_BPS_INCREASE, MAX_SQRT_K,
+    CONCENTRATION_PRECISION, FEE_POOL_TO_REVENUE_POOL_THRESHOLD, K_BPS_UPDATE_SCALE,
+    MAX_CONCENTRATION_COEFFICIENT, MAX_K_BPS_INCREASE, MAX_SQRT_K,
 };
 use crate::math::cp_curve::get_update_k_result;
 use crate::math::repeg::get_total_fee_lower_bound;

programs/drift/src/instructions/admin.rs

@@ -1135,8 +1135,8 @@ pub fn handle_initialize_amm_cache(ctx: Context<InitializeAmmCache>) -> Result<(
     Ok(())
 }
 
-pub fn handle_update_init_amm_cache_info<'c: 'info, 'info>(
-    ctx: Context<'_, '_, 'c, 'info, UpdateInitAmmCacheInfo<'info>>,
+pub fn handle_update_initial_amm_cache_info<'c: 'info, 'info>(
+    ctx: Context<'_, '_, 'c, 'info, UpdateInitialAmmCacheInfo<'info>>,
 ) -> Result<()> {
     let amm_cache = &mut ctx.accounts.amm_cache;
 
@@ -1191,7 +1191,7 @@ pub struct OverrideAmmCacheParams {
 }
 
 pub fn handle_override_amm_cache_info<'c: 'info, 'info>(
-    ctx: Context<'_, '_, 'c, 'info, UpdateInitAmmCacheInfo<'info>>,
+    ctx: Context<'_, '_, 'c, 'info, UpdateInitialAmmCacheInfo<'info>>,
     market_index: u16,
     override_params: OverrideAmmCacheParams,
 ) -> Result<()> {
@@ -4786,23 +4786,21 @@ pub fn handle_initialize_lp_pool(
         max_aum,
         last_aum: 0,
         last_aum_slot: 0,
-        last_aum_ts: 0,
         max_settle_quote_amount: max_settle_quote_amount_per_market,
         last_hedge_ts: 0,
-        total_fees_received: 0,
-        total_fees_paid: 0,
         total_mint_redeem_fees_paid: 0,
         bump: ctx.bumps.lp_pool,
         min_mint_fee,
         max_mint_fee_premium: max_mint_fee,
         revenue_rebalance_period,
         next_mint_redeem_id: 1,
-        usdc_consituent_index: 0,
-        cumulative_usdc_sent_to_perp_markets: 0,
-        cumulative_usdc_received_from_perp_markets: 0,
+        quote_consituent_index: 0,
+        cumulative_quote_sent_to_perp_markets: 0,
+        cumulative_quote_received_from_perp_markets: 0,
         gamma_execution: 2,
         volatility: 4,
         xi: 2,
+        padding: 0,
     };
 
     let amm_constituent_mapping = &mut ctx.accounts.amm_constituent_mapping;
@@ -5319,7 +5317,7 @@ pub fn handle_initialize_constituent<'info>(
     constituent.oracle_staleness_threshold = oracle_staleness_threshold;
     constituent.pubkey = ctx.accounts.constituent.key();
     constituent.mint = ctx.accounts.spot_market_mint.key();
-    constituent.token_vault = ctx.accounts.constituent_vault.key();
+    constituent.vault = ctx.accounts.constituent_vault.key();
     constituent.bump = ctx.bumps.constituent;
     constituent.max_borrow_token_amount = max_borrow_token_amount;
     constituent.lp_pool = lp_pool.pubkey;
@@ -5336,7 +5334,7 @@ pub fn handle_initialize_constituent<'info>(
     lp_pool.constituents += 1;
 
     if constituent.mint.eq(&usdc_mint::ID) {
-        lp_pool.usdc_consituent_index = constituent.constituent_index;
+        lp_pool.quote_consituent_index = constituent.constituent_index;
     }
 
     let constituent_correlations = &mut ctx.accounts.constituent_correlations;
@@ -6260,7 +6258,7 @@ pub struct InitializeAmmCache<'info> {
 }
 
 #[derive(Accounts)]
-pub struct UpdateInitAmmCacheInfo<'info> {
+pub struct UpdateInitialAmmCacheInfo<'info> {
     #[account(
         mut,
         constraint = admin.key() == admin_hot_wallet::id() || admin.key() == state.admin
@@ -7189,12 +7187,12 @@ pub struct LPTakerSwap<'info> {
     /// Constituent token accounts
     #[account(
         mut,
-        address = out_constituent.load()?.token_vault,
+        address = out_constituent.load()?.vault,
     )]
     pub constituent_out_token_account: Box<InterfaceAccount<'info, TokenAccount>>,
     #[account(
         mut,
-        address = in_constituent.load()?.token_vault,
+        address = in_constituent.load()?.vault,
     )]
     pub constituent_in_token_account: Box<InterfaceAccount<'info, TokenAccount>>,
 

programs/drift/src/instructions/keeper.rs

@@ -3130,30 +3130,13 @@ pub fn handle_settle_perp_to_lp_pool<'c: 'info, 'info>(
         return Err(ErrorCode::SettleLpPoolDisabled.into());
     }
 
-    // Validation and setup code (unchanged)
-    let amm_cache_key = &ctx.accounts.amm_cache.key();
     let mut amm_cache: AccountZeroCopyMut<'_, CacheInfo, _> =
         ctx.accounts.amm_cache.load_zc_mut()?;
     let quote_market = &mut ctx.accounts.quote_market.load_mut()?;
     let mut quote_constituent = ctx.accounts.constituent.load_mut()?;
     let constituent_token_account = &mut ctx.accounts.constituent_quote_token_account;
     let mut lp_pool = ctx.accounts.lp_pool.load_mut()?;
 
-    // PDA validation (unchanged)
-    let expected_pda = &Pubkey::create_program_address(
-        &[
-            AMM_POSITIONS_CACHE.as_ref(),
-            amm_cache.fixed.bump.to_le_bytes().as_ref(),
-        ],
-        &crate::ID,
-    )
-    .map_err(|_| ErrorCode::InvalidPDA)?;
-    validate!(
-        expected_pda.eq(amm_cache_key),
-        ErrorCode::InvalidPDA,
-        "Amm cache PDA does not match expected PDA"
-    )?;
-
     let remaining_accounts_iter = &mut ctx.remaining_accounts.iter().peekable();
     let AccountMaps {
         perp_market_map,
@@ -3211,7 +3194,7 @@ pub fn handle_settle_perp_to_lp_pool<'c: 'info, 'info>(
         // Create settlement context
         let settlement_ctx = SettlementContext {
             quote_owed_from_lp: cached_info.quote_owed_from_lp_pool,
-            quote_constituent_token_balance: quote_constituent.token_balance,
+            quote_constituent_token_balance: quote_constituent.vault_token_balance,
             fee_pool_balance: get_token_amount(
                 perp_market.amm.fee_pool.scaled_balance,
                 quote_market,
@@ -3287,13 +3270,13 @@ pub fn handle_settle_perp_to_lp_pool<'c: 'info, 'info>(
         // Update LP pool stats
         match settlement_result.direction {
             SettlementDirection::FromLpPool => {
-                lp_pool.cumulative_usdc_sent_to_perp_markets = lp_pool
-                    .cumulative_usdc_sent_to_perp_markets
+                lp_pool.cumulative_quote_sent_to_perp_markets = lp_pool
+                    .cumulative_quote_sent_to_perp_markets
                     .saturating_add(settlement_result.amount_transferred as u128);
             }
             SettlementDirection::ToLpPool => {
-                lp_pool.cumulative_usdc_received_from_perp_markets = lp_pool
-                    .cumulative_usdc_received_from_perp_markets
+                lp_pool.cumulative_quote_received_from_perp_markets = lp_pool
+                    .cumulative_quote_received_from_perp_markets
                     .saturating_add(settlement_result.amount_transferred as u128);
             }
             SettlementDirection::None => {}
@@ -3318,26 +3301,11 @@ pub fn handle_update_amm_cache<'c: 'info, 'info>(
     ctx: Context<'_, '_, 'c, 'info, UpdateAmmCache<'info>>,
 ) -> Result<()> {
     let remaining_accounts_iter = &mut ctx.remaining_accounts.iter().peekable();
-    let amm_cache_key = &ctx.accounts.amm_cache.key();
     let mut amm_cache: AccountZeroCopyMut<'_, CacheInfo, _> =
         ctx.accounts.amm_cache.load_zc_mut()?;
 
     let quote_market = ctx.accounts.quote_market.load()?;
 
-    let expected_pda = &Pubkey::create_program_address(
-        &[
-            AMM_POSITIONS_CACHE.as_ref(),
-            amm_cache.fixed.bump.to_le_bytes().as_ref(),
-        ],
-        &crate::ID,
-    )
-    .map_err(|_| ErrorCode::InvalidPDA)?;
-    validate!(
-        expected_pda.eq(amm_cache_key),
-        ErrorCode::InvalidPDA,
-        "Amm cache PDA does not match expected PDA"
-    )?;
-
     let AccountMaps {
         perp_market_map,
         spot_market_map: _,
@@ -3414,7 +3382,7 @@ pub struct SettleAmmPnlToLp<'info> {
     pub constituent: AccountLoader<'info, Constituent>,
     #[account(
         mut,
-        address = constituent.load()?.token_vault,
+        address = constituent.load()?.vault,
     )]
     pub constituent_quote_token_account: Box<InterfaceAccount<'info, TokenAccount>>,
     #[account(

programs/drift/src/instructions/lp_pool.rs

@@ -265,13 +265,13 @@ pub fn handle_update_lp_pool_aum<'c: 'info, 'info>(
         .safe_sub(crypto_delta.abs())?
         .max(0_i128);
     constituent_target_base
-        .get_mut(lp_pool.usdc_consituent_index as u32)
+        .get_mut(lp_pool.quote_consituent_index as u32)
         .target_base = total_stable_target_base.cast::<i64>()?;
 
     msg!(
         "stable target base: {}",
         constituent_target_base
-            .get(lp_pool.usdc_consituent_index as u32)
+            .get(lp_pool.quote_consituent_index as u32)
             .target_base
     );
     msg!("aum: {}, crypto_delta: {}", aum, crypto_delta);
@@ -451,11 +451,11 @@ pub fn handle_lp_pool_swap<'c: 'info, 'info>(
     )?;
 
     validate!(
-        out_amount_net_fees.cast::<u64>()? <= out_constituent.token_balance,
+        out_amount_net_fees.cast::<u64>()? <= out_constituent.vault_token_balance,
         ErrorCode::InsufficientConstituentTokenBalance,
         format!(
             "Insufficient out constituent balance: out_amount_net_fees({}) > out_constituent.token_balance({})",
-            out_amount_net_fees, out_constituent.token_balance
+            out_amount_net_fees, out_constituent.vault_token_balance
         )
         .as_str()
     )?;
@@ -1516,7 +1516,7 @@ pub struct DepositWithdrawProgramVault<'info> {
     pub constituent: AccountLoader<'info, Constituent>,
     #[account(
         mut,
-        address = constituent.load()?.token_vault,
+        address = constituent.load()?.vault,
         constraint = &constituent.load()?.mint.eq(&constituent_token_account.mint),
         token::authority = drift_signer
     )]
@@ -1609,12 +1609,12 @@ pub struct LPPoolSwap<'info> {
 
     #[account(
         mut,
-        address = in_constituent.load()?.token_vault,
+        address = in_constituent.load()?.vault,
     )]
     pub constituent_in_token_account: Box<InterfaceAccount<'info, TokenAccount>>,
     #[account(
         mut,
-        address = out_constituent.load()?.token_vault,
+        address = out_constituent.load()?.vault,
     )]
     pub constituent_out_token_account: Box<InterfaceAccount<'info, TokenAccount>>,
 
@@ -1678,12 +1678,12 @@ pub struct ViewLPPoolSwapFees<'info> {
 
     #[account(
         mut,
-        address = in_constituent.load()?.token_vault,
+        address = in_constituent.load()?.vault,
     )]
     pub constituent_in_token_account: Box<InterfaceAccount<'info, TokenAccount>>,
     #[account(
         mut,
-        address = out_constituent.load()?.token_vault,
+        address = out_constituent.load()?.vault,
     )]
     pub constituent_out_token_account: Box<InterfaceAccount<'info, TokenAccount>>,
 

programs/drift/src/lib.rs

@@ -998,10 +998,10 @@ pub mod drift {
         handle_initialize_amm_cache(ctx)
     }
 
-    pub fn update_init_amm_cache_info<'c: 'info, 'info>(
-        ctx: Context<'_, '_, 'c, 'info, UpdateInitAmmCacheInfo<'info>>,
+    pub fn update_initial_amm_cache_info<'c: 'info, 'info>(
+        ctx: Context<'_, '_, 'c, 'info, UpdateInitialAmmCacheInfo<'info>>,
     ) -> Result<()> {
-        handle_update_init_amm_cache_info(ctx)
+        handle_update_initial_amm_cache_info(ctx)
     }
 
     pub fn initialize_prediction_market<'c: 'info, 'info>(
@@ -1965,7 +1965,7 @@ pub mod drift {
     }
 
     pub fn override_amm_cache_info<'c: 'info, 'info>(
-        ctx: Context<'_, '_, 'c, 'info, UpdateInitAmmCacheInfo<'info>>,
+        ctx: Context<'_, '_, 'c, 'info, UpdateInitialAmmCacheInfo<'info>>,
         market_index: u16,
         override_params: OverrideAmmCacheParams,
     ) -> Result<()> {

programs/drift/src/math/oracle.rs

@@ -279,7 +279,9 @@ pub fn oracle_validity(
         oracle_delay.gt(&valid_oracle_guard_rails.slots_before_stale_for_margin)
     };
 
-    let oracle_validity = if is_oracle_price_too_volatile {
+    let oracle_validity = if is_oracle_price_nonpositive {
+        OracleValidity::NonPositive
+    } else if is_oracle_price_too_volatile {
         OracleValidity::TooVolatile
     } else if is_conf_too_large {
         OracleValidity::TooUncertain