merge in dlp

Author: moosecat2

programs/drift/src/controller/insurance.rs

@@ -14,9 +14,9 @@ use crate::error::ErrorCode;
 use crate::math::amm::calculate_net_user_pnl;
 use crate::math::casting::Cast;
 use crate::math::constants::{
-    MAX_APR_PER_REVENUE_SETTLE_TO_INSURANCE_FUND_VAULT,
+    FUEL_START_TS, GOV_SPOT_MARKET_INDEX, MAX_APR_PER_REVENUE_SETTLE_TO_INSURANCE_FUND_VAULT,
     MAX_APR_PER_REVENUE_SETTLE_TO_INSURANCE_FUND_VAULT_GOV, ONE_YEAR, PERCENTAGE_PRECISION,
-    SHARE_OF_REVENUE_ALLOCATED_TO_INSURANCE_FUND_VAULT_DENOMINATOR,
+    QUOTE_SPOT_MARKET_INDEX, SHARE_OF_REVENUE_ALLOCATED_TO_INSURANCE_FUND_VAULT_DENOMINATOR,
     SHARE_OF_REVENUE_ALLOCATED_TO_INSURANCE_FUND_VAULT_NUMERATOR,
 };
 use crate::math::fuel::calculate_insurance_fuel_bonus;
@@ -40,7 +40,7 @@ use crate::state::perp_market::PerpMarket;
 use crate::state::spot_market::{SpotBalanceType, SpotMarket};
 use crate::state::state::State;
 use crate::state::user::UserStats;
-use crate::{emit, validate, FUEL_START_TS, GOV_SPOT_MARKET_INDEX, QUOTE_SPOT_MARKET_INDEX};
+use crate::{emit, validate};
 
 #[cfg(test)]
 mod tests;

programs/drift/src/controller/liquidation.rs

@@ -24,8 +24,9 @@ use crate::error::{DriftResult, ErrorCode};
 use crate::math::bankruptcy::is_cross_margin_bankrupt;
 use crate::math::casting::Cast;
 use crate::math::constants::{
-    LIQUIDATION_FEE_PRECISION_U128, LIQUIDATION_PCT_PRECISION, QUOTE_PRECISION,
-    QUOTE_PRECISION_I128, QUOTE_PRECISION_U64, QUOTE_SPOT_MARKET_INDEX, SPOT_WEIGHT_PRECISION,
+    LIQUIDATION_FEE_PRECISION, LIQUIDATION_FEE_PRECISION_U128, LIQUIDATION_PCT_PRECISION,
+    QUOTE_PRECISION, QUOTE_PRECISION_I128, QUOTE_PRECISION_U64, QUOTE_SPOT_MARKET_INDEX,
+    SPOT_WEIGHT_PRECISION,
 };
 use crate::math::liquidation::{
     calculate_asset_transfer_for_liability_transfer,
@@ -51,6 +52,7 @@ use crate::math::orders::{
 use crate::math::position::calculate_base_asset_value_with_oracle_price;
 use crate::math::safe_math::SafeMath;
 
+use crate::math::constants::LST_POOL_ID;
 use crate::math::spot_balance::get_token_value;
 use crate::state::events::{
     LiquidateBorrowForPerpPnlRecord, LiquidatePerpPnlForDepositRecord, LiquidatePerpRecord,
@@ -69,8 +71,8 @@ use crate::state::spot_market_map::SpotMarketMap;
 use crate::state::state::State;
 use crate::state::user::{MarketType, Order, OrderStatus, OrderType, User, UserStats};
 use crate::state::user_map::{UserMap, UserStatsMap};
-use crate::{get_then_update_id, load_mut, LST_POOL_ID};
-use crate::{validate, LIQUIDATION_FEE_PRECISION};
+use crate::validate;
+use crate::{get_then_update_id, load_mut};
 
 #[cfg(test)]
 mod tests;

programs/drift/src/controller/orders.rs

@@ -10,6 +10,7 @@ use crate::state::revenue_share::{
 };
 use anchor_lang::prelude::*;
 
+use crate::controller;
 use crate::controller::funding::settle_funding_payment;
 use crate::controller::position;
 use crate::controller::position::{
@@ -32,7 +33,9 @@ use crate::math::amm::calculate_amm_available_liquidity;
 use crate::math::amm_jit::calculate_amm_jit_liquidity;
 use crate::math::auction::{calculate_auction_params_for_trigger_order, calculate_auction_prices};
 use crate::math::casting::Cast;
-use crate::math::constants::{BASE_PRECISION_U64, PERP_DECIMALS, QUOTE_SPOT_MARKET_INDEX};
+use crate::math::constants::{
+    BASE_PRECISION_U64, MARGIN_PRECISION, PERP_DECIMALS, QUOTE_SPOT_MARKET_INDEX,
+};
 use crate::math::fees::{determine_user_fee_tier, ExternalFillFees, FillFees};
 use crate::math::fulfillment::{
     determine_perp_fulfillment_methods, determine_spot_fulfillment_methods,
@@ -81,7 +84,6 @@ use crate::validation;
 use crate::validation::order::{
     validate_order, validate_order_for_force_reduce_only, validate_spot_order,
 };
-use crate::{controller, MARGIN_PRECISION};
 
 #[cfg(test)]
 mod tests;

programs/drift/src/controller/position/tests.rs

@@ -53,17 +53,7 @@ fn amm_pool_balance_liq_fees_example() {
     let perp_market_loader: AccountLoader<PerpMarket> =
         AccountLoader::try_from(&perp_market_account_info).unwrap();
 
-    let perp_market_map = PerpMarketMap::load_one(&perp_market_account_info, true).unwrap();
-
     let now = 1725948560;
-    let clock_slot = 326319440;
-    let clock = Clock {
-        unix_timestamp: now,
-        slot: clock_slot,
-        ..Clock::default()
-    };
-
-    let mut state = State::default();
 
     let mut prelaunch_oracle_price = PrelaunchOracle {
         price: PRICE_PRECISION_I64,
@@ -77,9 +67,8 @@ fn amm_pool_balance_liq_fees_example() {
         prelaunch_oracle_price,
         &prelaunch_oracle_price_key,
         PrelaunchOracle,
-        oracle_account_info
+        _oracle_account_info
     );
-    let mut oracle_map = OracleMap::load_one(&oracle_account_info, clock_slot, None).unwrap();
 
     let mut spot_market = SpotMarket {
         cumulative_deposit_interest: 11425141382,
@@ -610,11 +599,11 @@ fn amm_ref_price_decay_tail_test() {
 
     let signed_liquidity_ratio = liquidity_ratio
         .checked_mul(
-            (perp_market
+            perp_market
                 .amm
                 .get_protocol_owned_position()
                 .unwrap()
-                .signum() as i128),
+                .signum() as i128,
         )
         .unwrap();
 
@@ -655,7 +644,7 @@ fn amm_ref_price_decay_tail_test() {
             &state.oracle_guard_rails.validity,
         )
         .unwrap();
-    let cost = _update_amm(
+    _update_amm(
         &mut perp_market,
         &mm_oracle_price_data,
         &state,
@@ -688,7 +677,7 @@ fn amm_ref_price_decay_tail_test() {
             )
             .unwrap();
 
-        let cost = _update_amm(
+        _update_amm(
             &mut perp_market,
             &mm_oracle_price_data,
             &state,
@@ -787,11 +776,11 @@ fn amm_ref_price_offset_decay_logic() {
 
     let signed_liquidity_ratio = liquidity_ratio
         .checked_mul(
-            (perp_market
+            perp_market
                 .amm
                 .get_protocol_owned_position()
                 .unwrap()
-                .signum() as i128),
+                .signum() as i128,
         )
         .unwrap();
 
@@ -832,7 +821,7 @@ fn amm_ref_price_offset_decay_logic() {
             &state.oracle_guard_rails.validity,
         )
         .unwrap();
-    let cost = _update_amm(
+    _update_amm(
         &mut perp_market,
         &mm_oracle_price_data,
         &state,
@@ -872,7 +861,7 @@ fn amm_ref_price_offset_decay_logic() {
             )
             .unwrap();
 
-        let cost = _update_amm(
+        _update_amm(
             &mut perp_market,
             &mm_oracle_price_data,
             &state,
@@ -962,11 +951,11 @@ fn amm_negative_ref_price_offset_decay_logic() {
 
     let signed_liquidity_ratio = liquidity_ratio
         .checked_mul(
-            (perp_market
+            perp_market
                 .amm
                 .get_protocol_owned_position()
                 .unwrap()
-                .signum() as i128),
+                .signum() as i128,
         )
         .unwrap();
 
@@ -1007,7 +996,7 @@ fn amm_negative_ref_price_offset_decay_logic() {
             &state.oracle_guard_rails.validity,
         )
         .unwrap();
-    let cost = _update_amm(
+    _update_amm(
         &mut perp_market,
         &mm_oracle_price_data,
         &state,
@@ -1048,7 +1037,7 @@ fn amm_negative_ref_price_offset_decay_logic() {
             )
             .unwrap();
 
-        let cost = _update_amm(
+        _update_amm(
             &mut perp_market,
             &mm_oracle_price_data,
             &state,
@@ -1148,11 +1137,11 @@ fn amm_perp_ref_offset() {
 
     let signed_liquidity_ratio = liquidity_ratio
         .checked_mul(
-            (perp_market
+            perp_market
                 .amm
                 .get_protocol_owned_position()
                 .unwrap()
-                .signum() as i128),
+                .signum() as i128,
         )
         .unwrap();
 
@@ -1194,7 +1183,7 @@ fn amm_perp_ref_offset() {
             &state.oracle_guard_rails.validity,
         )
         .unwrap();
-    let cost = _update_amm(
+    _update_amm(
         &mut perp_market,
         &mm_oracle_price_data,
         &state,

programs/drift/src/controller/repeg/tests.rs

@@ -260,7 +260,7 @@ pub fn update_amm_test_bad_oracle() {
 #[test]
 pub fn update_amm_larg_conf_test() {
     let now = 1662800000 + 60;
-    let mut slot = 81680085;
+    let slot = 81680085;
 
     let mut market = PerpMarket::default_btc_test();
     assert_eq!(market.amm.base_asset_amount_with_amm, -1000000000);
@@ -409,7 +409,7 @@ pub fn update_amm_larg_conf_test() {
 #[test]
 pub fn update_amm_larg_conf_w_neg_tfmd_test() {
     let now = 1662800000 + 60;
-    let mut slot = 81680085;
+    let slot = 81680085;
 
     let mut market = PerpMarket::default_btc_test();
     market.amm.concentration_coef = 1414213;

programs/drift/src/controller/spot_balance/tests.rs

@@ -1387,7 +1387,7 @@ fn check_fee_collection_larger_nums() {
 
 #[test]
 fn test_multi_stage_borrow_rate_curve() {
-    let mut spot_market = SpotMarket {
+    let spot_market = SpotMarket {
         market_index: 0,
         oracle_source: OracleSource::QuoteAsset,
         cumulative_deposit_interest: SPOT_CUMULATIVE_INTEREST_PRECISION,
@@ -1457,7 +1457,7 @@ fn test_multi_stage_borrow_rate_curve_sol() {
 
     let spot_market_loader: AccountLoader<SpotMarket> =
         AccountLoader::try_from(&sol_market_account_info).unwrap();
-    let mut spot_market = spot_market_loader.load_mut().unwrap();
+    let spot_market = spot_market_loader.load_mut().unwrap();
 
     // Store all rates to verify monotonicity and smoothness later
     let mut last_rate = 0_u128;

programs/drift/src/error.rs

@@ -658,8 +658,6 @@ pub enum ErrorCode {
     InvalidConstituent,
     #[msg("Invalid Amm Constituent Mapping argument")]
     InvalidAmmConstituentMappingArgument,
-    #[msg("Invalid update constituent update target weights argument")]
-    InvalidUpdateConstituentTargetBaseArgument,
     #[msg("Constituent not found")]
     ConstituentNotFound,
     #[msg("Constituent could not load")]
@@ -668,8 +666,6 @@ pub enum ErrorCode {
     ConstituentWrongMutability,
     #[msg("Wrong number of constituents passed to instruction")]
     WrongNumberOfConstituents,
-    #[msg("Oracle too stale for LP AUM update")]
-    OracleTooStaleForLPAUMUpdate,
     #[msg("Insufficient constituent token balance")]
     InsufficientConstituentTokenBalance,
     #[msg("Amm Cache data too stale")]
@@ -682,8 +678,6 @@ pub enum ErrorCode {
     LpInvariantFailed,
     #[msg("Invalid constituent derivative weights")]
     InvalidConstituentDerivativeWeights,
-    #[msg("Unauthorized dlp authority")]
-    UnauthorizedDlpAuthority,
     #[msg("Max DLP AUM Breached")]
     MaxDlpAumBreached,
     #[msg("Settle Lp Pool Disabled")]

programs/drift/src/ids.rs

@@ -1,6 +1,3 @@
-use anchor_lang::prelude::Pubkey;
-use solana_program::pubkey;
-
 pub mod pyth_program {
     use solana_program::declare_id;
     #[cfg(feature = "mainnet-beta")]

programs/drift/src/instructions/admin.rs

@@ -9,20 +9,24 @@ use serum_dex::state::ToAlignedBytes;
 use std::convert::{identity, TryInto};
 use std::mem::size_of;
 
+use crate::controller;
 use crate::controller::token::{close_vault, initialize_immutable_owner, initialize_token_account};
 use crate::error::ErrorCode;
+use crate::get_then_update_id;
 use crate::ids::{admin_hot_wallet, amm_spread_adjust_wallet, mm_oracle_crank_wallet};
 use crate::instructions::constraints::*;
 use crate::instructions::optional_accounts::{load_maps, AccountMaps};
+use crate::load;
 use crate::math::casting::Cast;
 use crate::math::constants::{
     AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO, DEFAULT_LIQUIDATION_MARGIN_BUFFER_RATIO,
-    FEE_POOL_TO_REVENUE_POOL_THRESHOLD, GOV_SPOT_MARKET_INDEX, IF_FACTOR_PRECISION,
-    INSURANCE_A_MAX, INSURANCE_B_MAX, INSURANCE_C_MAX, INSURANCE_SPECULATIVE_MAX,
-    LIQUIDATION_FEE_PRECISION, MAX_CONCENTRATION_COEFFICIENT, MAX_SQRT_K,
-    MAX_UPDATE_K_PRICE_CHANGE, PERCENTAGE_PRECISION, PERCENTAGE_PRECISION_I64,
-    QUOTE_SPOT_MARKET_INDEX, SPOT_CUMULATIVE_INTEREST_PRECISION, SPOT_IMF_PRECISION,
-    SPOT_WEIGHT_PRECISION, THIRTEEN_DAY, TWENTY_FOUR_HOUR,
+    EPOCH_DURATION, FEE_ADJUSTMENT_MAX, FEE_POOL_TO_REVENUE_POOL_THRESHOLD, GOV_SPOT_MARKET_INDEX,
+    IF_FACTOR_PRECISION, INSURANCE_A_MAX, INSURANCE_B_MAX, INSURANCE_C_MAX,
+    INSURANCE_SPECULATIVE_MAX, LIQUIDATION_FEE_PRECISION, MAX_CONCENTRATION_COEFFICIENT,
+    MAX_SQRT_K, MAX_UPDATE_K_PRICE_CHANGE, PERCENTAGE_PRECISION, PERCENTAGE_PRECISION_I64,
+    QUOTE_PRECISION_I64, QUOTE_SPOT_MARKET_INDEX, SPOT_BALANCE_PRECISION,
+    SPOT_CUMULATIVE_INTEREST_PRECISION, SPOT_IMF_PRECISION, SPOT_WEIGHT_PRECISION, THIRTEEN_DAY,
+    TWENTY_FOUR_HOUR,
 };
 use crate::math::cp_curve::get_update_k_result;
 use crate::math::helpers::get_proportion_u128;
@@ -32,6 +36,7 @@ use crate::math::safe_math::SafeMath;
 use crate::math::spot_balance::get_token_amount;
 use crate::math::spot_withdraw::validate_spot_market_vault_amount;
 use crate::math::{amm, bn};
+use crate::math_error;
 use crate::optional_accounts::get_token_mint;
 use crate::state::amm_cache::{AmmCache, CacheInfo, AMM_POSITIONS_CACHE};
 use crate::state::events::{
@@ -77,12 +82,8 @@ use crate::validation::fee_structure::validate_fee_structure;
 use crate::validation::margin::{validate_margin, validate_margin_weights};
 use crate::validation::perp_market::validate_perp_market;
 use crate::validation::spot_market::validate_borrow_rate;
-use crate::{controller, QUOTE_PRECISION_I64};
-use crate::{get_then_update_id, EPOCH_DURATION};
-use crate::{load, FEE_ADJUSTMENT_MAX};
 use crate::{load_mut, PTYH_PRICE_FEED_SEED_PREFIX};
 use crate::{math, safe_decrement, safe_increment};
-use crate::{math_error, SPOT_BALANCE_PRECISION};
 
 use anchor_spl::token_2022::spl_token_2022::extension::transfer_hook::TransferHook;
 use anchor_spl::token_2022::spl_token_2022::extension::{

programs/drift/src/instructions/if_staker.rs

@@ -6,6 +6,8 @@ use crate::error::ErrorCode;
 use crate::ids::{admin_hot_wallet, if_rebalance_wallet};
 use crate::instructions::constraints::*;
 use crate::instructions::optional_accounts::{load_maps, AccountMaps};
+use crate::load_mut;
+use crate::math::constants::QUOTE_SPOT_MARKET_INDEX;
 use crate::optional_accounts::get_token_mint;
 use crate::state::insurance_fund_stake::{InsuranceFundStake, ProtocolIfSharesTransferConfig};
 use crate::state::paused_operations::InsuranceFundOperation;
@@ -23,7 +25,6 @@ use crate::{
         spot_market_map::get_writable_spot_market_set_from_many,
     },
 };
-use crate::{load_mut, QUOTE_SPOT_MARKET_INDEX};
 use anchor_lang::solana_program::sysvar::instructions;
 
 use super::optional_accounts::get_token_interface;