fix: conflicts

Author: jackwaller

.github/workflows/main.yml

@@ -74,7 +74,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: "22.14.x"
+          node-version: "24.x.x"
           registry-url: "https://registry.npmjs.org"
       - name: Install yarn
         run: yarn
@@ -89,13 +89,14 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: "22.14.x"
+          node-version: "24.x.x"
           registry-url: "https://registry.npmjs.org"
       - name: Install yarn
         run: yarn
       - name: Run lint
         run: yarn lint
   anchor-tests:
+    name: Anchor tests
     runs-on: ubicloud
     timeout-minutes: 60
     steps:
@@ -128,7 +129,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: "22.14.x"
+          node-version: "24.x.x"
           registry-url: "https://registry.npmjs.org"
 
       - name: Setup yarn
@@ -161,7 +162,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: "22.14.x"
+          node-version: "24.x.x"
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install dependencies
@@ -224,7 +225,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: "22.14.x"
+          node-version: "24.x.x"
           registry-url: "https://registry.npmjs.org"
       - name: Build sdk
         run: yarn
@@ -249,7 +250,14 @@ jobs:
           }
           echo "version=$PACKAGE_VERSION" >> $GITHUB_OUTPUT
       - name: Publish to npm
-        run: npm publish --access=public
+        run: |
+          if [[ "$PACKAGE_VERSION" == *beta* ]]; then
+            npm publish --access=public --tag latest
+          elif [[ "$PACKAGE_VERSION" == *alpha* ]]; then
+            npm publish --access=public --tag alpha
+          else
+            npm publish --access=public
+          fi
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: Build sdk for browser
@@ -259,7 +267,14 @@ jobs:
           # Update package name for browser version while keeping the same version
           node -e "const pkg = require('./package.json'); pkg.name = pkg.name + '-browser'; require('fs').writeFileSync('package.json', JSON.stringify(pkg, null, 2));"
       - name: Publish browser version to npm
-        run: npm publish --access=public
+        run: |
+          if [[ "$PACKAGE_VERSION" == *beta* ]]; then
+            npm publish --access=public --tag beta
+          elif [[ "$PACKAGE_VERSION" == *alpha* ]]; then
+            npm publish --access=public --tag alpha
+          else
+            npm publish --access=public
+          fi
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: Notify Slack on failure

CHANGELOG.md

@@ -13,6 +13,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking
 
+- sdk: `helius-laserstream` is now an optional dependency; installs with `--no-optional` will disable LaserStream support. [#2087](https://github.com/drift-labs/protocol-v2/pull/2087)
+- sdk: `LaserSubscribe` is deprecated and now lazy-loads with a warning; use `getLaserSubscribe()` instead. [#2087](https://github.com/drift-labs/protocol-v2/pull/2087)
+
+## [2.156.0] - 2026-01-26
+
+### Features
+
+### Fixes
+
+### Breaking
+
+## [2.155.0] - 2026-01-20
+
+### Features
+
+- program: additional logging for amm fills [#2078](https://github.com/drift-labs/protocol-v2/pull/2078)
+- program: allow delegate to transfer isolated pos deposit in sub account [#2079](https://github.com/drift-labs/protocol-v2/pull/2079)
+- program: use load_maps in update_amms [#2081](https://github.com/drift-labs/protocol-v2/pull/2081)
+
+### Fixes
+
+### Breaking
+
 ## [2.154.0] - 2026-01-08
 
 ### Features

Cargo.lock

@@ -29,7 +29,6 @@
 	},
 	"dependencies": {
 		"@ellipsis-labs/phoenix-sdk": "1.4.2",
-		"@pythnetwork/pyth-solana-receiver": "0.8.0",
 		"@switchboard-xyz/common": "3.0.14",
 		"@switchboard-xyz/on-demand": "2.4.1",
 		"anchor-bankrun": "0.3.0",

package.json

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

programs/drift/Cargo.toml

@@ -1803,6 +1803,7 @@ fn fulfill_perp_order(
     };
 
     if fulfillment_methods.is_empty() {
+        msg!("no fulfillment methods found");
         return Ok((0, 0));
     }
 

programs/drift/src/controller/orders.rs

@@ -140,5 +140,7 @@ pub const WHITELISTED_SWAP_PROGRAMS: &[solana_program::pubkey::Pubkey] = &[
     titan_mainnet_argos_v1::id(),
 ];
 
-pub const WHITELISTED_EXTERNAL_DEPOSITORS: [Pubkey; 1] =
-    [pubkey!("zApVWDs3nSychNnUXSS2czhY78Ycopa15zELrK2gAdM")];
+pub const WHITELISTED_EXTERNAL_DEPOSITORS: [Pubkey; 2] = [
+    pubkey!("zApVWDs3nSychNnUXSS2czhY78Ycopa15zELrK2gAdM"),
+    pubkey!("4B62MS5gxpRZ2hwkGCNAAayA5f7LYZRW4z1ASSfU3SXo"),
+];

programs/drift/src/ids.rs

@@ -2905,13 +2905,19 @@ pub fn handle_update_amms<'c: 'info, 'info>(
     let state = &ctx.accounts.state;
 
     let remaining_accounts_iter = &mut ctx.remaining_accounts.iter().peekable();
-    let oracle_map = &mut OracleMap::load(remaining_accounts_iter, clock.slot, None)?;
-    let market_map = &mut PerpMarketMap::load(
-        &get_market_set_from_list(market_indexes),
+    let AccountMaps {
+        mut perp_market_map,
+        mut oracle_map,
+        ..
+    } = load_maps(
         remaining_accounts_iter,
+        &get_market_set_from_list(market_indexes),
+        &MarketSet::new(),
+        clock.slot,
+        Some(state.oracle_guard_rails),
     )?;
 
-    controller::repeg::update_amms(market_map, oracle_map, state, &clock)?;
+    controller::repeg::update_amms(&mut perp_market_map, &mut oracle_map, state, &clock)?;
 
     Ok(())
 }

programs/drift/src/instructions/keeper.rs

@@ -4842,7 +4842,7 @@ pub struct TransferIsolatedPerpPositionDeposit<'info> {
     pub user: AccountLoader<'info, User>,
     #[account(
         mut,
-        has_one = authority
+        constraint = is_stats_for_user(&user, &user_stats)?
     )]
     pub user_stats: AccountLoader<'info, UserStats>,
     pub authority: Signer<'info>,

programs/drift/src/instructions/user.rs

@@ -3,6 +3,7 @@ use crate::error::DriftResult;
 use crate::math::casting::Cast;
 use crate::math::matching::do_orders_cross;
 use crate::math::safe_unwrap::SafeUnwrap;
+use crate::msg;
 use crate::state::fulfillment::{PerpFulfillmentMethod, SpotFulfillmentMethod};
 use crate::state::perp_market::AMM;
 use crate::state::user::Order;
@@ -73,7 +74,18 @@ pub fn determine_perp_fulfillment_methods(
 
     if amm_is_available {
         let taker_crosses_amm = match limit_price {
-            Some(taker_price) => do_orders_cross(maker_direction, amm_price, taker_price),
+            Some(taker_price) => {
+                let crosses = do_orders_cross(maker_direction, amm_price, taker_price);
+                if !crosses && fulfillment_methods.is_empty() {
+                    msg!(
+                        "taker does not cross amm: taker price {} amm price {}",
+                        taker_price,
+                        amm_price
+                    );
+                }
+                crosses
+            }
+
             None => true,
         };