merge master into dlp

Author: moosecat2

.devcontainer/Dockerfile

@@ -17,8 +17,8 @@ RUN mkdir -p /workdir /tmp \
   && apt-get update -qq \
   && apt-get upgrade -qq \
   && apt-get install -y --no-install-recommends \
-       build-essential git curl wget jq pkg-config python3-pip xz-utils ca-certificates \
-       libssl-dev libudev-dev bash software-properties-common \
+  build-essential git curl wget jq pkg-config python3-pip xz-utils ca-certificates \
+  libssl-dev libudev-dev bash software-properties-common \
   && add-apt-repository 'deb http://deb.debian.org/debian bookworm main' \
   && apt-get update -qq \
   && apt-get install -y libc6 libc6-dev \

CHANGELOG.md

@@ -13,6 +13,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking
 
+## [2.141.0] - 2025-10-03
+
+### Features
+
+- program: disallow builder to be escrow authority ([#1930](https://github.com/drift-labs/protocol-v2/pull/1930))
+- dont panic on settle-pnl when no position ([#1928](https://github.com/drift-labs/protocol-v2/pull/1928))
+
+### Fixes
+
+### Breaking
+
 ## [2.140.0] - 2025-09-29
 
 ### Features

Cargo.lock

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

programs/drift/Cargo.toml

@@ -2243,6 +2243,10 @@ pub fn fulfill_perp_order_with_amm(
         direction,
         order_id
     );
+    let user_order_has_builder = user.orders[order_index].is_has_builder();
+    if user_order_has_builder && rev_share_escrow.is_none() {
+        msg!("Order has builder but no escrow account included, in the future this will fail.");
+    }
 
     validation::perp_market::validate_amm_account_for_fill(&market.amm, order_direction)?;
 
@@ -2331,7 +2335,7 @@ pub fn fulfill_perp_order_with_amm(
 
     if builder_fee != 0 {
         if let (Some(idx), Some(escrow)) = (builder_order_idx, rev_share_escrow.as_mut()) {
-            let mut order = escrow.get_order_mut(idx)?;
+            let order = escrow.get_order_mut(idx)?;
             order.fees_accrued = order.fees_accrued.safe_add(builder_fee)?;
         } else {
             msg!("Order has builder fee but no escrow account found, in the future this tx will fail.");
@@ -2593,6 +2597,10 @@ pub fn fulfill_perp_order_with_match(
 
     let oracle_price = oracle_map.get_price_data(&market.oracle_id())?.price;
     let taker_direction: PositionDirection = taker.orders[taker_order_index].direction;
+    let taker_order_has_builder = taker.orders[taker_order_index].is_has_builder();
+    if taker_order_has_builder && rev_share_escrow.is_none() {
+        msg!("Order has builder but no escrow account included, in the future this will fail.");
+    }
 
     let taker_price = if let Some(taker_limit_price) = taker_limit_price {
         taker_limit_price
@@ -2840,7 +2848,7 @@ pub fn fulfill_perp_order_with_match(
 
     if builder_fee != 0 {
         if let (Some(idx), Some(escrow)) = (builder_order_idx, rev_share_escrow.as_deref_mut()) {
-            let mut order = escrow.get_order_mut(idx)?;
+            let order = escrow.get_order_mut(idx)?;
             order.fees_accrued = order.fees_accrued.safe_add(builder_fee)?;
         } else {
             msg!("Order has builder fee but no escrow account found, in the future this tx will fail.");
@@ -2906,7 +2914,7 @@ pub fn fulfill_perp_order_with_match(
 
     if let (Some(idx), Some(escrow)) = (referrer_builder_order_idx, rev_share_escrow.as_deref_mut())
     {
-        let mut order = escrow.get_order_mut(idx)?;
+        let order = escrow.get_order_mut(idx)?;
         order.fees_accrued = order.fees_accrued.safe_add(referrer_reward)?;
     } else if let (Some(referrer), Some(referrer_stats)) =
         (referrer.as_mut(), referrer_stats.as_mut())

programs/drift/src/controller/orders.rs

@@ -79,7 +79,16 @@ pub fn settle_pnl(
 
     drop(market);
 
-    let position_index = get_position_index(&user.perp_positions, market_index)?;
+    let position_index = match get_position_index(&user.perp_positions, market_index) {
+        Ok(index) => index,
+        Err(e) => {
+            return mode.result(
+                e,
+                market_index,
+                &format!("User has no position in market {}", market_index),
+            )
+        }
+    };
     let unrealized_pnl = user.perp_positions[position_index].get_unrealized_pnl(oracle_price)?;
 
     // cannot settle negative pnl this way on a user who is in liquidation territory

programs/drift/src/controller/pnl.rs

@@ -115,3 +115,8 @@ pub mod lp_pool_swap_wallet {
     use solana_program::declare_id;
     declare_id!("25qbsE2oWri76c9a86ubn17NKKdo6Am4HXD2Jm8vT8K4");
 }
+
+pub mod dflow_mainnet_aggregator_4 {
+    use solana_program::declare_id;
+    declare_id!("DF1ow4tspfHX9JwWJsAb9epbkA8hmpSEAtxXy1V27QBH");
+}

programs/drift/src/ids.rs

@@ -24,6 +24,7 @@ use crate::controller::token::{receive, send_from_program_vault};
 use crate::error::ErrorCode;
 use crate::get_then_update_id;
 use crate::ids::admin_hot_wallet;
+use crate::ids::dflow_mainnet_aggregator_4;
 use crate::ids::{jupiter_mainnet_3, jupiter_mainnet_4, jupiter_mainnet_6, serum_program};
 use crate::instructions::constraints::*;
 use crate::instructions::optional_accounts::get_revenue_share_escrow_account;
@@ -1119,8 +1120,7 @@ pub fn handle_settle_pnl<'c: 'info, 'info>(
             &mut oracle_map,
             state,
             &clock,
-        )
-        .map(|_| ErrorCode::InvalidOracleForSettlePnl)?;
+        )?;
 
         controller::pnl::settle_pnl(
             market_index,
@@ -1134,8 +1134,7 @@ pub fn handle_settle_pnl<'c: 'info, 'info>(
             state,
             None,
             SettlePnlMode::MustSettle,
-        )
-        .map(|_| ErrorCode::InvalidOracleForSettlePnl)?;
+        )?;
     }
 
     if state.builder_codes_enabled() || state.builder_referral_enabled() {
@@ -1235,8 +1234,7 @@ pub fn handle_settle_multiple_pnls<'c: 'info, 'info>(
                 &mut oracle_map,
                 state,
                 &clock,
-            )
-            .map(|_| ErrorCode::InvalidOracleForSettlePnl)?;
+            )?;
 
             controller::pnl::settle_pnl(
                 *market_index,
@@ -1250,8 +1248,7 @@ pub fn handle_settle_multiple_pnls<'c: 'info, 'info>(
                 state,
                 Some(meets_margin_requirement),
                 mode,
-            )
-            .map(|_| ErrorCode::InvalidOracleForSettlePnl)?;
+            )?;
         }
 
         if state.builder_codes_enabled() || state.builder_referral_enabled() {
@@ -1737,6 +1734,7 @@ pub fn handle_liquidate_spot_with_swap_begin<'c: 'info, 'info>(
                     jupiter_mainnet_3::ID,
                     jupiter_mainnet_4::ID,
                     jupiter_mainnet_6::ID,
+                    dflow_mainnet_aggregator_4::ID,
                 ];
                 validate!(
                     whitelisted_programs.contains(&ix.program_id),

programs/drift/src/instructions/keeper.rs

@@ -22,6 +22,7 @@ use crate::controller::spot_position::{
 };
 use crate::error::ErrorCode;
 use crate::ids::admin_hot_wallet;
+use crate::ids::dflow_mainnet_aggregator_4;
 use crate::ids::{
     jupiter_mainnet_3, jupiter_mainnet_4, jupiter_mainnet_6, lighthouse, marinade_mainnet,
     serum_program,
@@ -581,6 +582,12 @@ pub fn handle_change_approved_builder<'c: 'info, 'info>(
     max_fee_tenth_bps: u16,
     add: bool,
 ) -> Result<()> {
+    validate!(
+        ctx.accounts.escrow.authority != builder,
+        ErrorCode::DefaultError,
+        "Builder cannot be the same as the escrow authority"
+    )?;
+
     let existing_builder_index = ctx
         .accounts
         .escrow
@@ -3678,6 +3685,7 @@ pub fn handle_begin_swap<'c: 'info, 'info>(
                     jupiter_mainnet_3::ID,
                     jupiter_mainnet_4::ID,
                     jupiter_mainnet_6::ID,
+                    dflow_mainnet_aggregator_4::ID,
                 ];
                 if !delegate_is_signer {
                     whitelisted_programs.push(Token::id());

programs/drift/src/instructions/user.rs

@@ -809,6 +809,7 @@ pub fn calculate_max_perp_order_size(
     )?;
 
     let user_custom_margin_ratio = user.max_margin_ratio;
+    let perp_position_margin_ratio = user.perp_positions[position_index].max_margin_ratio as u32;
     let user_high_leverage_mode = user.is_high_leverage_mode(MarginRequirementType::Initial);
 
     let free_collateral_before = total_collateral.safe_sub(margin_requirement.cast()?)?;
@@ -838,7 +839,8 @@ pub fn calculate_max_perp_order_size(
             MarginRequirementType::Initial,
             user_high_leverage_mode,
         )?
-        .max(user_custom_margin_ratio);
+        .max(user_custom_margin_ratio)
+        .max(perp_position_margin_ratio);
 
     let mut order_size_to_reduce_position = 0_u64;
     let mut free_collateral_released = 0_i128;
@@ -915,7 +917,8 @@ pub fn calculate_max_perp_order_size(
                 MarginRequirementType::Initial,
                 user_high_leverage_mode,
             )?
-            .max(user_custom_margin_ratio);
+            .max(user_custom_margin_ratio)
+            .max(perp_position_margin_ratio);
 
         Ok((new_order_size, new_margin_ratio))
     };