Merge branch 'master' into wphan/builder_codes

Author: wphan

CHANGELOG.md

@@ -9,10 +9,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+### 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
+
+### Breaking
+
+## [2.137.0] - 2025-09-15
+
+### Features
+
+- program: post only respects reduce only ([#1878](https://github.com/drift-labs/protocol-v2/pull/1878))
+- program: add sequence id to exchange/mm oracle ([#1834](https://github.com/drift-labs/protocol-v2/pull/1834))
+- program: perp position max margin ratio ([#1847](https://github.com/drift-labs/protocol-v2/pull/1847))
+- program: add padding to swift messages ([#1845](https://github.com/drift-labs/protocol-v2/pull/1845))
 - program: rm lp ([#1755](https://github.com/drift-labs/protocol-v2/pull/1755))
 
 ### Fixes
 
+- program: make it easier to fill step size orders ([#1799](https://github.com/drift-labs/protocol-v2/pull/1799))
+- program: relax fee tier constraints for maker ([#1876](https://github.com/drift-labs/protocol-v2/pull/1876))
+
 ### Breaking
 
 ## [2.136.0] - 2025-09-03

Cargo.lock

@@ -48,11 +48,51 @@
 		"prepare": "husky install",
 		"prettify": "prettier --check './sdk/src/**/*.ts' './tests/**.ts' './cli/**.ts'",
 		"prettify:fix": "prettier --write './sdk/src/**/*.ts' './tests/**.ts' './cli/**.ts'",
-		"lint": "eslint . --ext ts --quiet",
+		"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"
+	},
+	"resolutions": {
+		"chalk": "4.1.2",
+		"debug": "<4.4.2",
+		"ansi-styles": "4.3.0",
+		"supports-color": "7.2.0",
+		"strip-ansi": "6.0.1",
+		"ansi-regex": "5.0.1",
+		"wrap-ansi": "7.0.0",
+		"color-convert": "<3.1.1",
+		"color-name": "<2.0.1",
+		"color-string": "<2.1.1",
+		"simple-swizzle": "<0.2.3",
+		"is-arrayish": "<0.3.3",
+		"slice-ansi": "3.0.0",
+		"error-ex": "<1.3.3",
+		"backslash": "<0.2.1",
+		"chalk-template": "<1.1.1",
+		"supports-hyperlinks": "<4.1.1",
+		"has-ansi": "<6.0.1"
+	},
+	"overrides": {
+		"chalk": "4.1.2",
+		"debug": "<4.4.2",
+		"ansi-styles": "4.3.0",
+		"supports-color": "7.2.0",
+		"strip-ansi": "6.0.1",
+		"ansi-regex": "5.0.1",
+		"wrap-ansi": "7.0.0",
+		"color-convert": "<3.1.1",
+		"color-name": "<2.0.1",
+		"color-string": "<2.1.1",
+		"simple-swizzle": "<0.2.3",
+		"is-arrayish": "<0.3.3",
+		"slice-ansi": "3.0.0",
+		"error-ex": "<1.3.3",
+		"backslash": "<0.2.1",
+		"chalk-template": "<1.1.1",
+		"supports-hyperlinks": "<4.1.1",
+		"has-ansi": "<6.0.1"
 	}
 }

package.json

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

programs/drift/Cargo.toml

@@ -15,8 +15,8 @@ use crate::math::amm::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::{
-    CONCENTRATION_PRECISION, FEE_ADJUSTMENT_MAX, FEE_POOL_TO_REVENUE_POOL_THRESHOLD,
-    K_BPS_UPDATE_SCALE, MAX_CONCENTRATION_COEFFICIENT, MAX_K_BPS_INCREASE, MAX_SQRT_K,
+    CONCENTRATION_PRECISION, FEE_POOL_TO_REVENUE_POOL_THRESHOLD, K_BPS_UPDATE_SCALE,
+    MAX_CONCENTRATION_COEFFICIENT, MAX_K_BPS_INCREASE, MAX_SQRT_K,
 };
 use crate::math::cp_curve::get_update_k_result;
 use crate::math::repeg::get_total_fee_lower_bound;

programs/drift/src/controller/amm.rs

@@ -133,6 +133,7 @@ fn formualic_k_tests() {
         confidence: 0,
         delay: 2,
         has_sufficient_number_of_data_points: true,
+        sequence_id: None,
     };
 
     // zero funding cost
@@ -192,6 +193,7 @@ fn iterative_bounds_formualic_k_tests() {
         confidence: 0,
         delay: 2,
         has_sufficient_number_of_data_points: true,
+        sequence_id: None,
     };
 
     // negative funding cost
@@ -236,6 +238,7 @@ fn iterative_no_bounds_formualic_k_tests() {
         confidence: 0,
         delay: 2,
         has_sufficient_number_of_data_points: true,
+        sequence_id: None,
     };
 
     // negative funding cost

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

@@ -973,7 +973,7 @@ pub fn handle_if_begin_swap(
     out_insurance_fund_vault_amount: u64,
     in_spot_market: &mut SpotMarket,
     out_spot_market: &mut SpotMarket,
-    in_amount: u64,
+    _in_amount: u64,
     now: i64,
 ) -> DriftResult<()> {
     if now

programs/drift/src/controller/insurance.rs

@@ -50,10 +50,9 @@ use crate::math::safe_math::SafeMath;
 
 use crate::math::spot_balance::get_token_value;
 use crate::state::events::{
-    emit_stack, LPAction, LPRecord, LiquidateBorrowForPerpPnlRecord,
-    LiquidatePerpPnlForDepositRecord, LiquidatePerpRecord, LiquidateSpotRecord, LiquidationRecord,
-    LiquidationType, OrderAction, OrderActionExplanation, OrderActionRecord, OrderRecord,
-    PerpBankruptcyRecord, SpotBankruptcyRecord,
+    LiquidateBorrowForPerpPnlRecord, LiquidatePerpPnlForDepositRecord, LiquidatePerpRecord,
+    LiquidateSpotRecord, LiquidationRecord, LiquidationType, OrderAction, OrderActionExplanation,
+    OrderActionRecord, OrderRecord, PerpBankruptcyRecord, SpotBankruptcyRecord,
 };
 use crate::state::fill_mode::FillMode;
 use crate::state::margin_calculation::{MarginCalculation, MarginContext, MarketIdentifier};
@@ -65,7 +64,6 @@ use crate::state::perp_market_map::PerpMarketMap;
 use crate::state::spot_market::SpotBalanceType;
 use crate::state::spot_market_map::SpotMarketMap;
 use crate::state::state::State;
-use crate::state::traits::Size;
 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};

programs/drift/src/controller/liquidation.rs

@@ -51,9 +51,7 @@ use crate::math::spot_balance::{get_signed_token_amount, get_token_amount};
 use crate::math::spot_swap::select_margin_type_for_swap;
 use crate::math::{amm, fees, margin::*, orders::*};
 use crate::print_error;
-use crate::state::events::{
-    emit_stack, get_order_action_record, LPAction, LPRecord, OrderActionRecord, OrderRecord,
-};
+use crate::state::events::{emit_stack, get_order_action_record, OrderActionRecord, OrderRecord};
 use crate::state::events::{OrderAction, OrderActionExplanation};
 use crate::state::fill_mode::FillMode;
 use crate::state::fulfillment::{PerpFulfillmentMethod, SpotFulfillmentMethod};
@@ -1001,23 +999,12 @@ pub fn fill_perp_order(
         .position(|order| order.order_id == order_id && order.status == OrderStatus::Open)
         .ok_or_else(print_error!(ErrorCode::OrderDoesNotExist))?;
 
-    let (
-        order_status,
-        market_index,
-        order_market_type,
-        order_price,
-        order_oracle_price_offset,
-        order_direction,
-        order_auction_duration,
-    ) = get_struct_values!(
+    let (order_status, market_index, order_market_type, order_direction) = get_struct_values!(
         user.orders[order_index],
         status,
         market_index,
         market_type,
-        price,
-        oracle_price_offset,
-        direction,
-        auction_duration
+        direction
     );
 
     validate!(
@@ -2229,12 +2216,13 @@ pub fn fulfill_perp_order_with_amm(
     };
 
     // if user position is less than min order size, step size is the threshold
-    let amm_size_threshold =
-        if existing_base_asset_amount.unsigned_abs() > market.amm.min_order_size {
-            market.amm.min_order_size
-        } else {
-            market.amm.order_step_size
-        };
+    let amm_size_threshold = if !user.orders[order_index].reduce_only
+        && existing_base_asset_amount.unsigned_abs() > market.amm.min_order_size
+    {
+        market.amm.min_order_size
+    } else {
+        market.amm.order_step_size
+    };
 
     if base_asset_amount < amm_size_threshold {
         // if is an actual swap (and not amm jit order) then msg!
@@ -2316,7 +2304,7 @@ pub fn fulfill_perp_order_with_amm(
         filler_reward,
         referee_discount,
         referrer_reward,
-        fee_to_market_for_lp,
+        fee_to_market_for_lp: _fee_to_market_for_lp,
         maker_rebate,
         builder_fee,
     } = fees::calculate_fee_for_fulfillment_with_amm(
@@ -2340,9 +2328,6 @@ pub fn fulfill_perp_order_with_amm(
         order.fees_accrued = order.fees_accrued.safe_add(builder_fee)?;
     }
 
-    let user_position_delta =
-        get_position_delta_for_fill(base_asset_amount, quote_asset_amount, order_direction)?;
-
     // Increment the protocol's total fee variables
     market.amm.total_fee = market.amm.total_fee.safe_add(fee_to_market.cast()?)?;
     market.amm.total_exchange_fee = market.amm.total_exchange_fee.safe_add(user_fee.cast()?)?;

programs/drift/src/controller/orders.rs

@@ -14,14 +14,11 @@ use crate::math::oracle::{is_oracle_valid_for_action, DriftAction};
 
 use crate::math::casting::Cast;
 use crate::math::margin::{
-    calculate_margin_requirement_and_total_collateral_and_liability_info,
     meets_maintenance_margin_requirement, meets_settle_pnl_maintenance_margin_requirement,
-    MarginRequirementType,
 };
 use crate::math::position::calculate_base_asset_value_with_expiry_price;
 use crate::math::safe_math::SafeMath;
 use crate::math::spot_balance::get_token_amount;
-use crate::state::margin_calculation::MarginContext;
 
 use crate::msg;
 use crate::state::events::{OrderActionExplanation, SettlePnlExplanation, SettlePnlRecord};