Merge remote-tracking branch 'origin/master' into wphan/builder_codes

Author: wphan

CHANGELOG.md

@@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+### Fixes
+
+### Breaking
+
+## [2.139.0] - 2025-09-25
+
+### Features
+
+- program: all token 22 use immutable owner ([#1904](https://github.com/drift-labs/protocol-v2/pull/1904))
+- program: allow resolve perp pnl deficit if pnl pool isnt 0 but at deficit ([#1909](https://github.com/drift-labs/protocol-v2/pull/1909))
 - program: auction order params account for twap divergence ([#1882](https://github.com/drift-labs/protocol-v2/pull/1882))
 - program: add delegate stake if ([#1859](https://github.com/drift-labs/protocol-v2/pull/1859))
 

Cargo.lock

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

programs/drift/Cargo.toml

@@ -11,7 +11,7 @@ use crate::controller::spot_balance::{
 };
 use crate::error::{DriftResult, ErrorCode};
 use crate::get_then_update_id;
-use crate::math::amm::calculate_quote_asset_amount_swapped;
+use crate::math::amm::{calculate_net_user_pnl, 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::{
@@ -942,7 +942,7 @@ pub fn calculate_perp_market_amm_summary_stats(
         .safe_add(fee_pool_token_amount)?
         .cast()?;
 
-    let net_user_pnl = amm::calculate_net_user_pnl(&perp_market.amm, perp_market_oracle_price)?;
+    let net_user_pnl = calculate_net_user_pnl(&perp_market.amm, perp_market_oracle_price)?;
 
     // amm's mm_fee can be incorrect with drifting integer math error
     let mut new_total_fee_minus_distributions = pnl_tokens_available.safe_sub(net_user_pnl)?;

programs/drift/src/controller/amm.rs

@@ -112,6 +112,7 @@ pub fn add_insurance_fund_stake(
     user_stats: &mut UserStats,
     spot_market: &mut SpotMarket,
     now: i64,
+    admin_deposit: bool,
 ) -> DriftResult {
     validate!(
         !(insurance_vault_amount == 0 && spot_market.insurance_fund.total_shares != 0),
@@ -161,7 +162,11 @@ pub fn add_insurance_fund_stake(
     emit!(InsuranceFundStakeRecord {
         ts: now,
         user_authority: user_stats.authority,
-        action: StakeAction::Stake,
+        action: if admin_deposit {
+            StakeAction::AdminDeposit
+        } else {
+            StakeAction::Stake
+        },
         amount,
         market_index: spot_market.market_index,
         insurance_vault_amount_before: insurance_vault_amount,
@@ -843,11 +848,20 @@ pub fn resolve_perp_pnl_deficit(
         &SpotBalanceType::Deposit,
     )?;
 
+    let net_user_pnl = calculate_net_user_pnl(
+        &market.amm,
+        market
+            .amm
+            .historical_oracle_data
+            .last_oracle_price_twap_5min,
+    )?;
+
     validate!(
-        pnl_pool_token_amount == 0,
+        pnl_pool_token_amount.cast::<i128>()? < net_user_pnl,
         ErrorCode::SufficientPerpPnlPool,
-        "pnl_pool_token_amount > 0 (={})",
-        pnl_pool_token_amount
+        "pnl_pool_token_amount >= net_user_pnl ({} >= {})",
+        pnl_pool_token_amount,
+        net_user_pnl
     )?;
 
     update_spot_market_cumulative_interest(spot_market, None, now)?;

programs/drift/src/controller/insurance.rs

@@ -41,6 +41,7 @@ pub fn basic_stake_if_test() {
         &mut user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
     assert_eq!(if_stake.unchecked_if_shares(), amount as u128);
@@ -104,6 +105,7 @@ pub fn basic_stake_if_test() {
         &mut user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
     assert_eq!(if_stake.cost_basis, 1234);
@@ -141,6 +143,7 @@ pub fn basic_seeded_stake_if_test() {
         &mut user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
 
@@ -202,6 +205,7 @@ pub fn basic_seeded_stake_if_test() {
         &mut user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
     assert_eq!(if_stake.cost_basis, 1234);
@@ -245,6 +249,7 @@ pub fn large_num_seeded_stake_if_test() {
         &mut user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
 
@@ -334,6 +339,7 @@ pub fn large_num_seeded_stake_if_test() {
         &mut user_stats,
         &mut spot_market,
         20,
+        false,
     )
     .unwrap();
     assert_eq!(if_stake.cost_basis, 199033744205760);
@@ -346,6 +352,7 @@ pub fn large_num_seeded_stake_if_test() {
         &mut user_stats,
         &mut spot_market,
         30,
+        false,
     )
     .unwrap();
     assert_eq!(if_stake.cost_basis, 398067488411520);
@@ -378,6 +385,7 @@ pub fn gains_stake_if_test() {
         &mut user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
     assert_eq!(if_stake.unchecked_if_shares(), amount as u128);
@@ -502,6 +510,7 @@ pub fn losses_stake_if_test() {
         &mut user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
     assert_eq!(if_stake.unchecked_if_shares(), amount as u128);
@@ -631,6 +640,7 @@ pub fn escrow_losses_stake_if_test() {
         &mut user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
     assert_eq!(if_stake.unchecked_if_shares(), amount as u128);
@@ -729,7 +739,8 @@ pub fn escrow_gains_stake_if_test() {
         &mut if_stake,
         &mut user_stats,
         &mut spot_market,
-        0
+        0,
+        false,
     )
     .is_err());
 
@@ -741,6 +752,7 @@ pub fn escrow_gains_stake_if_test() {
         &mut user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
 
@@ -858,6 +870,7 @@ pub fn drained_stake_if_test_rebase_on_new_add() {
         &mut user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .is_err());
 
@@ -877,6 +890,7 @@ pub fn drained_stake_if_test_rebase_on_new_add() {
         &mut user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
     if_balance += amount;
@@ -912,6 +926,7 @@ pub fn drained_stake_if_test_rebase_on_new_add() {
         &mut orig_user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
 
@@ -1010,6 +1025,7 @@ pub fn drained_stake_if_test_rebase_on_old_remove_all() {
         &mut user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
 
@@ -1210,6 +1226,7 @@ pub fn drained_stake_if_test_rebase_on_old_remove_all_2() {
         &mut user_stats,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
     if_balance += 10_000_000_000_000;
@@ -1254,6 +1271,7 @@ pub fn multiple_if_stakes_and_rebase() {
         &mut user_stats_1,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
 
@@ -1266,6 +1284,7 @@ pub fn multiple_if_stakes_and_rebase() {
         &mut user_stats_2,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
 
@@ -1392,6 +1411,7 @@ pub fn multiple_if_stakes_and_rebase_and_admin_remove() {
         &mut user_stats_1,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
 
@@ -1404,6 +1424,7 @@ pub fn multiple_if_stakes_and_rebase_and_admin_remove() {
         &mut user_stats_2,
         &mut spot_market,
         0,
+        false,
     )
     .unwrap();
 

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

@@ -217,3 +217,16 @@ pub fn initialize_token_account<'info>(
 
     Ok(())
 }
+
+pub fn initialize_immutable_owner<'info>(
+    token_program: &Interface<'info, TokenInterface>,
+    account: &AccountInfo<'info>,
+) -> Result<()> {
+    let accounts = ::anchor_spl::token_interface::InitializeImmutableOwner {
+        account: account.to_account_info(),
+    };
+    let cpi_ctx = anchor_lang::context::CpiContext::new(token_program.to_account_info(), accounts);
+    ::anchor_spl::token_interface::initialize_immutable_owner(cpi_ctx)?;
+
+    Ok(())
+}

programs/drift/src/controller/token.rs

@@ -10,7 +10,7 @@ use pyth_solana_receiver_sdk::cpi::accounts::InitPriceUpdate;
 use pyth_solana_receiver_sdk::program::PythSolanaReceiver;
 use serum_dex::state::ToAlignedBytes;
 
-use crate::controller::token::{close_vault, initialize_token_account};
+use crate::controller::token::{close_vault, initialize_immutable_owner, initialize_token_account};
 use crate::error::ErrorCode;
 use crate::ids::{admin_hot_wallet, amm_spread_adjust_wallet, mm_oracle_crank_wallet};
 use crate::instructions::constraints::*;
@@ -148,6 +148,16 @@ pub fn handle_initialize_spot_market(
     let state = &mut ctx.accounts.state;
     let spot_market_pubkey = ctx.accounts.spot_market.key();
 
+    let is_token_2022 = *ctx.accounts.spot_market_mint.to_account_info().owner == Token2022::id();
+    if is_token_2022 {
+        initialize_immutable_owner(&ctx.accounts.token_program, &ctx.accounts.spot_market_vault)?;
+
+        initialize_immutable_owner(
+            &ctx.accounts.token_program,
+            &ctx.accounts.insurance_fund_vault,
+        )?;
+    }
+
     initialize_token_account(
         &ctx.accounts.token_program,
         &ctx.accounts.spot_market_vault,

programs/drift/src/instructions/admin.rs

@@ -159,15 +159,13 @@ pub fn get_vault_len(mint: &InterfaceAccount<Mint>) -> anchor_lang::Result<usize
         let mint_state = StateWithExtensions::<Mint>::unpack(&mint_data)?;
         let mint_extensions = match mint_state.get_extension_types() {
             Ok(extensions) => extensions,
-            // If we cant deserialize the mint, we use the default token account length
+            // If we cant deserialize the mint, try assuming no extensions
             // Init token will fail if this size doesnt work, so worst case init account just fails
-            Err(_) => {
-                msg!("Failed to deserialize mint. Falling back to default token account length");
-                return Ok(::anchor_spl::token::TokenAccount::LEN);
-            }
+            Err(_) => vec![],
         };
-        let required_extensions =
+        let mut required_extensions =
             ExtensionType::get_required_init_account_extensions(&mint_extensions);
+        required_extensions.push(ExtensionType::ImmutableOwner);
         ExtensionType::try_calculate_account_len::<Account>(&required_extensions)?
     } else {
         ::anchor_spl::token::TokenAccount::LEN