check in for z

CHANGELOG.md

@@ -13,6 +13,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking
 
+## [2.134.0] - 2025-08-13
+
+### Features
+
+- program: add new settle pnl invariants ([#1812](https://github.com/drift-labs/protocol-v2/pull/1812))
+- program: add update_perp_market_pnl_pool ([#1810](https://github.com/drift-labs/protocol-v2/pull/1810))
+- program: increase min margin ratio invariant constant ([#1802](https://github.com/drift-labs/protocol-v2/pull/1802))
+- program: update mark twap crank use 5min basis for bid/ask ([#1769](https://github.com/drift-labs/protocol-v2/pull/1769))
+
+### Fixes
+
+- program: remove burn lp shares invariant ([#1816](https://github.com/drift-labs/protocol-v2/pull/1816))
+- program: correct fee tier 5 volume requirement ([#1800](https://github.com/drift-labs/protocol-v2/pull/1800))
+- program: fix small number mark-twap-integer-bias ([#1783](https://github.com/drift-labs/protocol-v2/pull/1783))
+
+### Breaking
+
 ## [2.133.0] - 2025-08-11
 
 ### Features

package.json

@@ -30,8 +30,8 @@
 	"dependencies": {
 		"@ellipsis-labs/phoenix-sdk": "1.4.2",
 		"@pythnetwork/pyth-solana-receiver": "0.8.0",
-		"@switchboard-xyz/on-demand": "2.4.1",
 		"@switchboard-xyz/common": "3.0.14",
+		"@switchboard-xyz/on-demand": "2.4.1",
 		"anchor-bankrun": "0.3.0",
 		"chai-bn": "0.2.2",
 		"csvtojson": "2.0.10",
@@ -40,6 +40,7 @@
 		"nanoid": "3.3.4",
 		"rpc-websockets": "7.5.1",
 		"solana-bankrun": "0.3.0",
+		"zod": "4.0.17",
 		"zstddec": "0.1.0"
 	},
 	"scripts": {
@@ -54,4 +55,4 @@
 	"engines": {
 		"node": ">=12"
 	}
-}
+}

programs/drift/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drift"
-version = "2.133.0"
+version = "2.134.0"
 description = "Created with Anchor"
 edition = "2018"
 

programs/drift/src/controller/lp.rs

@@ -249,15 +249,6 @@ pub fn burn_lp_shares(
         .base_asset_amount_with_unsettled_lp
         .safe_add(position.remainder_base_asset_amount.cast()?)?;
     if shares_to_burn as u128 == market.amm.user_lp_shares && unsettled_remainder != 0 {
-        crate::validate!(
-            unsettled_remainder.unsigned_abs() <= market.amm.order_step_size as u128,
-            ErrorCode::UnableToBurnLPTokens,
-            "unsettled baa on final burn too big rel to stepsize {}: {} (remainder:{})",
-            market.amm.order_step_size,
-            market.amm.base_asset_amount_with_unsettled_lp,
-            position.remainder_base_asset_amount
-        )?;
-
         // sub bc lps take the opposite side of the user
         position.remainder_base_asset_amount = position
             .remainder_base_asset_amount

programs/drift/src/controller/pnl.rs

@@ -59,13 +59,20 @@ pub fn settle_pnl(
     clock: &Clock,
     state: &State,
     meets_margin_requirement: Option<bool>,
-    mode: SettlePnlMode,
+    mut mode: SettlePnlMode,
 ) -> DriftResult {
     validate!(!user.is_bankrupt(), ErrorCode::UserBankrupt)?;
     let now = clock.unix_timestamp;
+    let tvl_before;
+    let deposits_balance_before;
+    let borrows_balance_before;
     {
         let spot_market = &mut spot_market_map.get_quote_spot_market_mut()?;
         update_spot_market_cumulative_interest(spot_market, None, now)?;
+
+        tvl_before = spot_market.get_tvl()?;
+        deposits_balance_before = spot_market.deposit_balance;
+        borrows_balance_before = spot_market.borrow_balance;
     }
 
     let mut market = perp_market_map.get_ref_mut(&market_index)?;
@@ -281,6 +288,15 @@ pub fn settle_pnl(
         now,
     )?;
 
+    // if the spot market balance has changed, we have to fail if we are in try settle mode
+    if (spot_market.deposit_balance != deposits_balance_before
+        || spot_market.borrow_balance != borrows_balance_before)
+        && mode == SettlePnlMode::TrySettle
+    {
+        msg!("Spot market balance has changed, switch to MUST_SETTLE mode");
+        mode = SettlePnlMode::MustSettle;
+    }
+
     if user_unsettled_pnl == 0 {
         let msg = format!("User has no unsettled pnl for market {}", market_index);
         return mode.result(ErrorCode::NoUnsettledPnl, market_index, &msg);
@@ -350,6 +366,16 @@ pub fn settle_pnl(
         explanation: SettlePnlExplanation::None,
     });
 
+    let tvl_after = spot_market.get_tvl()?;
+
+    validate!(
+        tvl_before.safe_sub(tvl_after)? <= 10,
+        ErrorCode::DefaultError,
+        "Settle Pnl TVL mismatch: before={}, after={}",
+        tvl_before,
+        tvl_after
+    )?;
+
     Ok(())
 }
 

programs/drift/src/controller/spot_balance.rs

@@ -9,7 +9,7 @@ use crate::error::{DriftResult, ErrorCode};
 use crate::math::amm::sanitize_new_price;
 use crate::math::casting::Cast;
 use crate::math::constants::{
-    FIVE_MINUTE, IF_FACTOR_PRECISION, ONE_HOUR, QUOTE_SPOT_MARKET_INDEX,
+    FIVE_MINUTE, IF_FACTOR_PRECISION, ONE_HOUR, ONE_MINUTE, QUOTE_SPOT_MARKET_INDEX,
     SPOT_MARKET_TOKEN_TWAP_WINDOW,
 };
 use crate::math::spot_balance::{
@@ -55,6 +55,7 @@ pub fn update_spot_market_twap_stats(
         spot_market.deposit_token_twap.cast()?,
         since_last,
         from_start,
+        None,
     )?
     .cast()?;
 
@@ -63,6 +64,7 @@ pub fn update_spot_market_twap_stats(
         spot_market.borrow_token_twap.cast()?,
         since_last,
         from_start,
+        None,
     )?
     .cast()?;
 
@@ -73,6 +75,7 @@ pub fn update_spot_market_twap_stats(
         spot_market.utilization_twap.cast()?,
         since_last,
         from_start,
+        None,
     )?
     .cast()?;
 
@@ -103,15 +106,19 @@ pub fn update_spot_market_twap_stats(
             FIVE_MINUTE as i64,
         )?;
 
-        spot_market.historical_oracle_data.last_oracle_price_twap = oracle_price_twap;
-        spot_market
-            .historical_oracle_data
-            .last_oracle_price_twap_5min = oracle_price_twap_5min;
-
         spot_market.historical_oracle_data.last_oracle_price = oracle_price_data.price;
         spot_market.historical_oracle_data.last_oracle_conf = oracle_price_data.confidence;
         spot_market.historical_oracle_data.last_oracle_delay = oracle_price_data.delay;
-        spot_market.historical_oracle_data.last_oracle_price_twap_ts = now;
+
+        if oracle_price_twap != spot_market.historical_oracle_data.last_oracle_price_twap
+            || since_last >= (ONE_MINUTE as i64)
+        {
+            spot_market.historical_oracle_data.last_oracle_price_twap = oracle_price_twap;
+            spot_market
+                .historical_oracle_data
+                .last_oracle_price_twap_5min = oracle_price_twap_5min;
+            spot_market.historical_oracle_data.last_oracle_price_twap_ts = now;
+        }
     }
 
     spot_market.last_twap_ts = now.cast()?;
@@ -243,10 +250,12 @@ pub fn update_spot_balances(
         }
 
         if token_amount > 0 {
+            msg!("token amount to transfer: {}", token_amount);
             spot_balance.update_balance_type(*update_direction)?;
             let round_up = update_direction == &SpotBalanceType::Borrow;
             let balance_delta =
                 get_spot_balance(token_amount, spot_market, update_direction, round_up)?;
+            msg!("balance delta {}", balance_delta);
             spot_balance.increase_balance(balance_delta)?;
             increase_spot_balance(balance_delta, spot_market, update_direction)?;
         }

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

@@ -1743,12 +1743,18 @@ fn check_usdc_spot_market_twap() {
     );
 
     let wa_res =
-        calculate_weighted_average(PRICE_PRECISION_I64, PRICE_PRECISION_I64, 0, ONE_HOUR).unwrap();
+        calculate_weighted_average(PRICE_PRECISION_I64, PRICE_PRECISION_I64, 0, ONE_HOUR, None)
+            .unwrap();
 
     assert_eq!(wa_res, PRICE_PRECISION_I64);
-    let wa_res2 =
-        calculate_weighted_average(PRICE_PRECISION_I64, PRICE_PRECISION_I64 + 1, 0, ONE_HOUR)
-            .unwrap();
+    let wa_res2 = calculate_weighted_average(
+        PRICE_PRECISION_I64,
+        PRICE_PRECISION_I64 + 1,
+        0,
+        ONE_HOUR,
+        None,
+    )
+    .unwrap();
     assert_eq!(wa_res2, PRICE_PRECISION_I64 + 1);
 
     assert_eq!(

programs/drift/src/instructions/admin.rs

@@ -2105,6 +2105,36 @@ pub fn handle_deposit_into_perp_market_fee_pool<'c: 'info, 'info>(
     Ok(())
 }
 
+#[access_control(
+    perp_market_valid(&ctx.accounts.perp_market)
+)]
+pub fn handle_update_perp_market_pnl_pool<'c: 'info, 'info>(
+    ctx: Context<'_, '_, 'c, 'info, UpdatePerpMarketPnlPool<'info>>,
+    amount: u64,
+) -> Result<()> {
+    let perp_market = &mut load_mut!(ctx.accounts.perp_market)?;
+
+    let spot_market = &mut load_mut!(ctx.accounts.spot_market)?;
+
+    controller::spot_balance::update_spot_balances(
+        amount.cast::<u128>()?,
+        &SpotBalanceType::Deposit,
+        spot_market,
+        &mut perp_market.pnl_pool,
+        false,
+    )?;
+
+    validate_spot_market_vault_amount(spot_market, ctx.accounts.spot_market_vault.amount)?;
+
+    msg!(
+        "updating perp market {} pnl pool with amount {}",
+        perp_market.market_index,
+        amount
+    );
+
+    Ok(())
+}
+
 #[access_control(
     deposit_not_paused(&ctx.accounts.state)
     spot_market_valid(&ctx.accounts.spot_market)
@@ -5299,6 +5329,7 @@ pub fn handle_initialize_constituent<'info>(
     constituent.volatility = volatility;
     constituent.gamma_execution = gamma_execution;
     constituent.gamma_inventory = gamma_inventory;
+    constituent.spot_balance.market_index = spot_market_index;
     constituent.xi = xi;
     lp_pool.constituents += 1;
 
@@ -5340,6 +5371,10 @@ pub fn handle_update_constituent_params<'info>(
     constituent_params: ConstituentParams,
 ) -> Result<()> {
     let mut constituent = ctx.accounts.constituent.load_mut()?;
+    if constituent.spot_balance.market_index != constituent.spot_market_index {
+        constituent.spot_balance.market_index = constituent.spot_market_index;
+    }
+
     if constituent_params.max_weight_deviation.is_some() {
         msg!(
             "max_weight_deviation: {:?} -> {:?}",
@@ -5684,6 +5719,11 @@ pub fn handle_begin_lp_swap<'c: 'info, 'info>(
     // Make sure we have enough balance to do the swap
     let constituent_in_token_account = &ctx.accounts.constituent_in_token_account;
 
+    msg!("amount_in: {}", amount_in);
+    msg!(
+        "constituent_in_token_account.amount: {}",
+        constituent_in_token_account.amount
+    );
     validate!(
         amount_in <= constituent_in_token_account.amount,
         ErrorCode::InvalidSwap,
@@ -6318,6 +6358,29 @@ pub struct SettleExpiredMarketPoolsToRevenuePool<'info> {
     pub perp_market: AccountLoader<'info, PerpMarket>,
 }
 
+#[derive(Accounts)]
+pub struct UpdatePerpMarketPnlPool<'info> {
+    #[account(
+        has_one = admin
+    )]
+    pub state: Box<Account<'info, State>>,
+    pub admin: Signer<'info>,
+    #[account(
+        seeds = [b"spot_market", 0_u16.to_le_bytes().as_ref()],
+        bump,
+        mut
+    )]
+    pub spot_market: AccountLoader<'info, SpotMarket>,
+    #[account(
+        mut,
+        seeds = [b"spot_market_vault".as_ref(), 0_u16.to_le_bytes().as_ref()],
+        bump,
+    )]
+    pub spot_market_vault: Box<InterfaceAccount<'info, TokenAccount>>,
+    #[account(mut)]
+    pub perp_market: AccountLoader<'info, PerpMarket>,
+}
+
 #[derive(Accounts)]
 pub struct DepositIntoMarketFeePool<'info> {
     #[account(

programs/drift/src/instructions/keeper.rs

@@ -2461,13 +2461,9 @@ pub fn handle_update_perp_bid_ask_twap<'c: 'info, 'info>(
         msg!("skipping mark twap update for disabled amm prediction market");
         return Ok(());
     }
-
-    msg!(
-        "before amm bid twap = {} ask twap = {} ts = {}",
-        perp_market.amm.last_bid_price_twap,
-        perp_market.amm.last_ask_price_twap,
-        perp_market.amm.last_mark_price_twap_ts
-    );
+    let before_bid_price_twap = perp_market.amm.last_bid_price_twap;
+    let before_ask_price_twap = perp_market.amm.last_ask_price_twap;
+    let before_mark_twap_ts = perp_market.amm.last_mark_price_twap_ts;
 
     let sanitize_clamp_denominator = perp_market.get_sanitize_clamp_denominator()?;
     math::amm::update_mark_twap_crank(
@@ -2480,12 +2476,33 @@ pub fn handle_update_perp_bid_ask_twap<'c: 'info, 'info>(
     )?;
 
     msg!(
-        "after amm bid twap = {} ask twap = {} ts = {}",
+        "after amm bid twap = {} -> {} 
+        ask twap = {} -> {} 
+        ts = {} -> {}",
+        before_bid_price_twap,
         perp_market.amm.last_bid_price_twap,
+        before_ask_price_twap,
         perp_market.amm.last_ask_price_twap,
+        before_mark_twap_ts,
         perp_market.amm.last_mark_price_twap_ts
     );
 
+    if perp_market.amm.last_bid_price_twap == before_bid_price_twap
+        || perp_market.amm.last_ask_price_twap == before_ask_price_twap
+    {
+        validate!(
+            perp_market
+                .amm
+                .last_mark_price_twap_ts
+                .safe_sub(before_mark_twap_ts)?
+                >= 60
+                || estimated_bid.unwrap_or(0) == before_bid_price_twap
+                || estimated_ask.unwrap_or(0) == before_ask_price_twap,
+            ErrorCode::CantUpdatePerpBidAskTwap,
+            "bid or ask twap unchanged from small ts delta update",
+        )?;
+    }
+
     let funding_paused =
         state.funding_paused()? || perp_market.is_operation_paused(PerpOperation::UpdateFunding);
     controller::funding::update_funding_rate(