Wphan/merge-master (#1915)

* fix comments (#1844)

* chore: update laser 0.1.8

* chore: remove logging

* program: tweak ResizeSignedMsgUserOrders (#1898)

* fix linter and cargo test

* fix cargo build errors

* v2.138.0

* sdk: release v2.139.0-beta.0

* program: init-delegated-if-stake (#1859)

* program: init-delegated-if-stake

* add sdk

* CHANGELOG

---------

Co-authored-by: Chris Heaney <[email protected]>

* program: auction-order-params-on-slow-fast-twap-divergence (#1882)

* program: auction-order-params-on-slow-fast-twap-divergence

* change tests

* rm dlog

* CHANGELOG

* cargo fmt --

---------

Co-authored-by: Chris Heaney <[email protected]>

* program: add invariant for max in amount for if swap (#1825)

* sdk: release v2.139.0-beta.1

* chore: add grpc client to order subscriber

* sdk: release v2.139.0-beta.2

* sdk: add market index 76 to constant (#1901)

* sdk: release v2.139.0-beta.3

* fix ui build (#1902)

* sdk: release v2.139.0-beta.4

* sdk: update aster config (#1903)

* update aster config

* add pythLazerId

* sdk: release v2.139.0-beta.5

* Revert "Revert "Crispeaney/revert swift max margin ratio" (#1877)" (#1907)

This reverts commit 0a8e153.

* sdk: release v2.139.0-beta.6

* Revert "Revert "Revert "Crispeaney/revert swift max margin ratio" (#1877)" (#…" (#1910)

* sdk: release v2.139.0-beta.7

* more robust isDelegateSigner for swift orders

* sdk: release v2.139.0-beta.8

* program: allow resolve perp pnl deficit if pnl pool isnt 0 but at deficit (#1909)

* program: update-resolve-perp-pnl-pool-validate

* CHANGELOG

---------

Co-authored-by: Chris Heaney <[email protected]>

* program: add immutable owner support for token 22 vaults (#1904)

* program: add immutable owner support for token 22 vaults

* cargo fmt --

* CHANGELOG

* sdk: tweak math for filling triggers (#1880)

* sdk: tweak math for filling triggers

* add back line

* sdk: release v2.139.0-beta.9

* program: allow delegate to update user position max margin ratio (#1913)

* Revert "more robust isDelegateSigner for swift orders"

This reverts commit 2d4e30b.

* sdk: release v2.139.0-beta.10

* update SwiftOrderMessage type for missing fields (#1908)

* sdk: release v2.139.0-beta.11

* sdk: add getUpdateFeatureBitFlagsMedianTriggerPriceIx

* sdk: release v2.139.0-beta.12

* update devnet market constants (#1914)

* sdk: release v2.139.0-beta.13

* program: deposit into if stake from admin (#1899)

* program: deposit into if stake from admin

* add test

* change action

* cargo fmt --

* move depositIntoInsuranceFundStake to adminClient

---------

Co-authored-by: wphan <[email protected]>

* sdk: release v2.139.0-beta.14

* program: comment out unused ix (#1911)

* program: raise MAX_BASE_ASSET_AMOUNT_WITH_AMM numerical invariant

* v2.139.0

* sdk: release v2.140.0-beta.0

---------

Co-authored-by: jordy25519 <[email protected]>
Co-authored-by: Jack Waller <[email protected]>
Co-authored-by: lil perp <[email protected]>
Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: bigz_Pubkey <[email protected]>
Co-authored-by: lowkeynicc <[email protected]>
Co-authored-by: Nour Alharithi <[email protected]>

Author: 8 people

CHANGELOG.md

@@ -9,7 +9,29 @@ 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))
+
+### Fixes
+
+### Breaking
+
+## [2.138.0] - 2025-09-22
+
+### Features
+
 - program: support scaled ui extension ([#1894](https://github.com/drift-labs/protocol-v2/pull/1894))
+- Revert "Crispeaney/revert swift max margin ratio ([#1877](https://github.com/drift-labs/protocol-v2/pull/1877))
 
 ### Fixes
 

Cargo.lock

@@ -50,7 +50,7 @@
 		"prettify:fix": "prettier --write './sdk/src/**/*.ts' './tests/**.ts' './cli/**.ts'",
 		"lint": "eslint . --ext ts --quiet --format unix",
 		"lint:fix": "eslint . --ext ts --fix",
-		"update-idl": "cp target/idl/drift.json sdk/src/idl/drift.json"
+		"update-idl": "anchor build -- --features anchor-test && cp target/idl/drift.json sdk/src/idl/drift.json"
 	},
 	"engines": {
 		"node": ">=12"

package.json

@@ -1,6 +1,6 @@
 [package]
 name = "drift"
-version = "2.137.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)?;
@@ -1098,6 +1112,14 @@ pub fn handle_if_end_swap(
         if_rebalance_config.epoch_max_in_amount
     )?;
 
+    validate!(
+        if_rebalance_config.current_in_amount <= if_rebalance_config.total_in_amount,
+        ErrorCode::InvalidIfRebalanceSwap,
+        "current_in_amount={} > total_in_amount={}",
+        if_rebalance_config.current_in_amount,
+        if_rebalance_config.total_in_amount
+    )?;
+
     let oracle_twap = out_spot_market
         .historical_oracle_data
         .last_oracle_price_twap;

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

@@ -291,3 +291,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(())
+}