@drift-labs/sdk 2.103.0-beta.9 → 2.104.0-beta.0

package/VERSION

@@ -1 +1 @@
-2.103.0-beta.9
+2.104.0-beta.0

package/lib/browser/constants/spotMarkets.d.ts

@@ -4,6 +4,7 @@ import { BN, DriftEnv, OracleSource } from '../';
 export type SpotMarketConfig = {
     symbol: string;
     marketIndex: number;
+    poolId: number;
     oracle: PublicKey;
     mint: PublicKey;
     oracleSource: OracleSource;

package/lib/browser/constants/spotMarkets.js

@@ -9,6 +9,7 @@ exports.DevnetSpotMarkets = [
     {
         symbol: 'USDC',
         marketIndex: 0,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce'),
         oracleSource: __1.OracleSource.PYTH_STABLE_COIN_PULL,
         mint: new web3_js_1.PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
@@ -19,6 +20,7 @@ exports.DevnetSpotMarkets = [
     {
         symbol: 'SOL',
         marketIndex: 1,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('BAtFj4kQttZRVep3UZS2aZRDixkGYgWsbqTBVDbnSsPF'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey(exports.WRAPPED_SOL_MINT),
@@ -31,6 +33,7 @@ exports.DevnetSpotMarkets = [
     {
         symbol: 'BTC',
         marketIndex: 2,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('486kr3pmFPfTsS4aZgcsQ7kS4i9rjMsYYZup6HQNSTT4'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('3BZPwbcqB5kKScF3TEXxwNfx5ipV13kbRVDvfVp5c6fv'),
@@ -42,6 +45,7 @@ exports.DevnetSpotMarkets = [
     {
         symbol: 'PYUSD',
         marketIndex: 3,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('HpMoKp3TCd3QT4MWYUKk2zCBwmhr5Df45fB6wdxYqEeh'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('GLfF72ZCUnS6N9iDJw8kedHzd6WFVf3VbpwdKKy76FRk'),
@@ -49,11 +53,45 @@ exports.DevnetSpotMarkets = [
         precisionExp: numericConstants_1.SIX,
         pythFeedId: '0xc1da1b73d7f01e7ddd54b3766cf7fcd644395ad14f70aa706ec5384c59e76692',
     },
+    {
+        symbol: 'Bonk',
+        marketIndex: 4,
+        poolId: 0,
+        oracle: new web3_js_1.PublicKey('GojbSnJuPdKDT1ZuHuAM5t9oz6bxTo1xhUKpTua2F72p'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        mint: new web3_js_1.PublicKey('7SekVZDmKCCDgTP8m6Hk4CfexFSru9RkwDCczmcwcsP6'),
+        precision: new __1.BN(10).pow(numericConstants_1.FIVE),
+        precisionExp: numericConstants_1.FIVE,
+        pythFeedId: '0x72b021217ca3fe68922a19aaf990109cb9d84e9ad004b4d2025ad6f529314419',
+    },
+    {
+        symbol: 'JLP',
+        marketIndex: 5,
+        poolId: 1,
+        oracle: new web3_js_1.PublicKey('5Mb11e5rt1Sp6A286B145E4TmgMzsM2UX9nCF2vas5bs'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        mint: new web3_js_1.PublicKey('HGe9FejFyhWSx6zdvx2RjynX7rmoEXFiJiLU437NXemZ'),
+        precision: new __1.BN(10).pow(numericConstants_1.SIX),
+        precisionExp: numericConstants_1.SIX,
+        pythFeedId: '0xc811abc82b4bad1f9bd711a2773ccaa935b03ecef974236942cec5e0eb845a3a',
+    },
+    {
+        symbol: 'USDC',
+        marketIndex: 6,
+        poolId: 1,
+        oracle: new web3_js_1.PublicKey('En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce'),
+        oracleSource: __1.OracleSource.PYTH_STABLE_COIN_PULL,
+        mint: new web3_js_1.PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
+        precision: new __1.BN(10).pow(numericConstants_1.SIX),
+        precisionExp: numericConstants_1.SIX,
+        pythFeedId: '0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
+    },
 ];
 exports.MainnetSpotMarkets = [
     {
         symbol: 'USDC',
         marketIndex: 0,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce'),
         oracleSource: __1.OracleSource.PYTH_STABLE_COIN_PULL,
         mint: new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
@@ -64,6 +102,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'SOL',
         marketIndex: 1,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('BAtFj4kQttZRVep3UZS2aZRDixkGYgWsbqTBVDbnSsPF'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey(exports.WRAPPED_SOL_MINT),
@@ -77,6 +116,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'mSOL',
         marketIndex: 2,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('FAq7hqjn7FWGXKDwJHzsXGgBcydGTcK4kziJpAGWXjDb'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So'),
@@ -88,6 +128,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'wBTC',
         marketIndex: 3,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('9Tq8iN5WnMX2PcZGj4iSFEAgHCi8cM6x8LsDUbuzq8uw'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh'),
@@ -99,6 +140,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'wETH',
         marketIndex: 4,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('6bEp2MiyoiiiDxcVqE8rUHQWwHirXUXtKfAEATTVqNzT'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs'),
@@ -112,6 +154,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'USDT',
         marketIndex: 5,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('BekJ3P5G3iFeC97sXHuKnUHofCFj9Sbo7uyF2fkKwvit'),
         oracleSource: __1.OracleSource.PYTH_STABLE_COIN_PULL,
         mint: new web3_js_1.PublicKey('Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB'),
@@ -123,6 +166,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'jitoSOL',
         marketIndex: 6,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('9QE1P5EfzthYDgoQ9oPeTByCEKaRJeZbVVqKJfgU9iau'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn'),
@@ -135,6 +179,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'PYTH',
         marketIndex: 7,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('GqkCu7CbsPVz1H6W6AAHuReqbJckYG59TXz7Y5HDV7hr'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('HZ1JovNiVvGrGNiiYvEozEVgZ58xaU3RKwX8eACQBCt3'),
@@ -147,6 +192,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'bSOL',
         marketIndex: 8,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('BmDWPMsytWmYkh9n6o7m79eVshVYf2B5GVaqQ2EWKnGH'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1'),
@@ -158,6 +204,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'JTO',
         marketIndex: 9,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('Ffq6ACJ17NAgaxC6ocfMzVXL3K61qxB2xHg6WUawWPfP'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('jtojtomepa8beP8AuQc6eXt5FriJwfFMwQx2v2f9mCL'),
@@ -170,6 +217,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'WIF',
         marketIndex: 10,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('6x6KfE7nY2xoLCRSMPT1u83wQ5fpGXoKNBqFjrCwzsCQ'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('EKpQGSJtjMFqKZ9KQanSqYXRcF8fBopzLHYxdM65zcjm'),
@@ -183,6 +231,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'JUP',
         marketIndex: 11,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('AwqRpfJ36jnSZQykyL1jYY35mhMteeEAjh7o8LveRQin'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN'),
@@ -195,6 +244,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'RENDER',
         marketIndex: 12,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('8TQztfGcNjHGRusX4ejQQtPZs3Ypczt9jWF6pkgQMqUX'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('rndrizKT3MK1iimdxRdWabcF7Zg7AR5T4nud4EkHBof'),
@@ -207,6 +257,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'W',
         marketIndex: 13,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('4HbitGsdcFbtFotmYscikQFAAKJ3nYx4t7sV7fTvsk8U'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('85VBFQZC9TZkfaptBWjvUw7YbZjy52A6mjtPGjstQAmQ'),
@@ -219,6 +270,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'TNSR',
         marketIndex: 14,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('13jpjpVyU5hGpjsZ4HzCcmBo85wze4N8Au7U6cC3GMip'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6'),
@@ -231,6 +283,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'DRIFT',
         marketIndex: 15,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('23KmX7SNikmUr2axSCy6Zer7XPBnvmVcASALnDGqBVRR'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('DriFtupJYLTosbwoN8koMbEYSx54aFAVLddWsbksjwg7'),
@@ -243,6 +296,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'INF',
         marketIndex: 16,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('B7RUYg2zF6UdUSHv2RmpnriPVJccYWojgFydNS1NY5F8'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('5oVNBeEEQvYi1cX3ir8Dx5n1P7pdxydbGF2X4TxVusJm'),
@@ -254,6 +308,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'dSOL',
         marketIndex: 17,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('7QJ6e57t3yM8HYVg6bAnJiCiZ3wQQ5CSVsa6GA16nJuK'),
         oracleSource: __1.OracleSource.SWITCHBOARD_ON_DEMAND,
         mint: new web3_js_1.PublicKey('Dso1bDeDjCQxTrWHqUUi63oBvV7Mdm6WaobLbQ7gnPQ'),
@@ -264,6 +319,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'USDY',
         marketIndex: 18,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('BPTQgHV4y2x4jvKPPkkd9aS8jY7L3DGZBwjEZC8Vm27o'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('A1KLoBrKBde8Ty9qtNQUtq3C2ortoC3u7twggz7sEto6'),
@@ -275,6 +331,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'JLP',
         marketIndex: 19,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('5Mb11e5rt1Sp6A286B145E4TmgMzsM2UX9nCF2vas5bs'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('27G8MtK7VtTcCHkpASjSDdkWWYfoqT6ggEuKidVJidD4'),
@@ -286,6 +343,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'POPCAT',
         marketIndex: 20,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('H3pn43tkNvsG5z3qzmERguSvKoyHZvvY6VPmNrJqiW5X'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('7GCihgDB8fe6KNjn2MYtkzZcRjQy3t9GHdC8uHYmW2hr'),
@@ -298,6 +356,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'CLOUD',
         marketIndex: 21,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('FNFejcXENaPgKaCTfstew9vSSvdQPnXjGTkJjUnnYvHU'),
         oracleSource: __1.OracleSource.SWITCHBOARD_ON_DEMAND,
         mint: new web3_js_1.PublicKey('CLoUDKc4Ane7HeQcPpE3YHnznRxhMimJ4MyaUqyHFzAu'),
@@ -308,6 +367,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'PYUSD',
         marketIndex: 22,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('HpMoKp3TCd3QT4MWYUKk2zCBwmhr5Df45fB6wdxYqEeh'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('2b1kV6DkPAnxd5ixfnxCpjxmKwqjjaYmCZfHsFu24GXo'),
@@ -318,6 +378,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'USDe',
         marketIndex: 23,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('BXej5boX2nWudwAfZQedo212B9XJxhjTeeF3GbCwXmYa'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('DEkqHyPN7GMRJ5cArtQFAWefqbZb33Hyf6s5iCwjEonT'),
@@ -328,6 +389,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'sUSDe',
         marketIndex: 24,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('BRuNuzLAPHHGSSVAJPKMcmJMdgDfrekvnSxkxPDGdeqp'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('Eh6XEPhSwoLv5wFApukmnaVSHQ6sAnoD9BmgmwQoN2sN'),
@@ -338,6 +400,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'BNSOL',
         marketIndex: 25,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('8DmXTfhhtb9kTcpTVfb6Ygx8WhZ8wexGqcpxfn23zooe'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('BNso1VUJnh4zcfpZa6986Ea66P6TCp59hvtNJ8b1X85'),
@@ -348,6 +411,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'MOTHER',
         marketIndex: 26,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('56ap2coZG7FPWUigVm9XrpQs3xuCwnwQaWtjWZcffEUG'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('3S8qX1MsMqRbiwKg2cQyx7nis1oHMgaCuc9c4VfvVdPN'),
@@ -358,6 +422,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'cbBTC',
         marketIndex: 27,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('486kr3pmFPfTsS4aZgcsQ7kS4i9rjMsYYZup6HQNSTT4'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('cbbtcf3aa214zXHbiAZQwf4122FBYbraNdFqgw4iMij'),
@@ -369,6 +434,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'USDS',
         marketIndex: 28,
+        poolId: 0,
         oracle: new web3_js_1.PublicKey('7pT9mxKXyvfaZKeKy1oe2oV2K1RFtF7tPEJHUY3h2vVV'),
         oracleSource: __1.OracleSource.PYTH_STABLE_COIN_PULL,
         mint: new web3_js_1.PublicKey('USDSwr9ApdHk5bvJKMjzff41FfuX8bSxdKcR81vTwcA'),

package/lib/browser/dlob/DLOB.d.ts

@@ -58,10 +58,10 @@ export declare class DLOB {
     initFromOrders(dlobOrders: DLOBOrders, slot: number): boolean;
     handleOrderRecord(record: OrderRecord, slot: number): void;
     handleOrderActionRecord(record: OrderActionRecord, slot: number): void;
-    insertOrder(order: Order, userAccount: string, slot: number, onInsert?: OrderBookCallback): void;
+    insertOrder(order: Order, userAccount: string, slot: number, isUserProtectedMaker: boolean, onInsert?: OrderBookCallback): void;
     addOrderList(marketType: MarketTypeStr, marketIndex: number): void;
     updateOrder(order: Order, userAccount: PublicKey, slot: number, cumulativeBaseAssetAmountFilled: BN, onUpdate?: OrderBookCallback): void;
-    trigger(order: Order, userAccount: PublicKey, slot: number, onTrigger?: OrderBookCallback): void;
+    trigger(order: Order, userAccount: PublicKey, slot: number, isUserProtectedMaker: boolean, onTrigger?: OrderBookCallback): void;
     delete(order: Order, userAccount: PublicKey, slot: number, onDelete?: OrderBookCallback): void;
     getListForOrder(order: Order, slot: number): NodeList<any> | undefined;
     updateRestingLimitOrders(slot: number): void;

package/lib/browser/dlob/DLOB.js

@@ -6,6 +6,7 @@ const __1 = require("..");
 const web3_js_1 = require("@solana/web3.js");
 const exchangeStatus_1 = require("../math/exchangeStatus");
 const orderBookLevels_1 = require("./orderBookLevels");
+const userStatus_1 = require("../math/userStatus");
 const SUPPORTED_ORDER_TYPES = [
     'market',
     'limit',
@@ -62,8 +63,9 @@ class DLOB {
             const userAccount = user.getUserAccount();
             const userAccountPubkey = user.getUserAccountPublicKey();
             const userAccountPubkeyString = userAccountPubkey.toString();
+            const protectedMaker = (0, userStatus_1.isUserProtectedMaker)(userAccount);
             for (const order of userAccount.orders) {
-                this.insertOrder(order, userAccountPubkeyString, slot);
+                this.insertOrder(order, userAccountPubkeyString, slot, protectedMaker);
             }
         }
         this.initialized = true;
@@ -74,13 +76,13 @@ class DLOB {
             return false;
         }
         for (const { user, order } of dlobOrders) {
-            this.insertOrder(order, user.toString(), slot);
+            this.insertOrder(order, user.toString(), slot, false);
         }
         this.initialized = true;
         return true;
     }
     handleOrderRecord(record, slot) {
-        this.insertOrder(record.order, record.user.toString(), slot);
+        this.insertOrder(record.order, record.user.toString(), slot, false);
     }
     handleOrderActionRecord(record, slot) {
         if ((0, __1.isOneOfVariant)(record.action, ['place', 'expire'])) {
@@ -90,13 +92,13 @@ class DLOB {
             if (record.taker !== null) {
                 const takerOrder = this.getOrder(record.takerOrderId, record.taker);
                 if (takerOrder) {
-                    this.trigger(takerOrder, record.taker, slot);
+                    this.trigger(takerOrder, record.taker, slot, false);
                 }
             }
             if (record.maker !== null) {
                 const makerOrder = this.getOrder(record.makerOrderId, record.maker);
                 if (makerOrder) {
-                    this.trigger(makerOrder, record.maker, slot);
+                    this.trigger(makerOrder, record.maker, slot, false);
                 }
             }
         }
@@ -129,7 +131,7 @@ class DLOB {
             }
         }
     }
-    insertOrder(order, userAccount, slot, onInsert) {
+    insertOrder(order, userAccount, slot, isUserProtectedMaker, onInsert) {
         var _a;
         if ((0, __1.isVariant)(order.status, 'init')) {
             return;
@@ -146,7 +148,7 @@ class DLOB {
                 .get(marketType)
                 .add((0, NodeList_1.getOrderSignature)(order.orderId, userAccount));
         }
-        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount);
+        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount, isUserProtectedMaker);
         if (onInsert) {
             onInsert();
         }
@@ -194,7 +196,7 @@ class DLOB {
             onUpdate();
         }
     }
-    trigger(order, userAccount, slot, onTrigger) {
+    trigger(order, userAccount, slot, isUserProtectedMaker, onTrigger) {
         var _a;
         if ((0, __1.isVariant)(order.status, 'init')) {
             return;
@@ -207,7 +209,7 @@ class DLOB {
         const triggerList = this.orderLists.get(marketType).get(order.marketIndex)
             .trigger[(0, __1.isVariant)(order.triggerCondition, 'above') ? 'above' : 'below'];
         triggerList.remove(order, userAccount.toString());
-        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount.toString());
+        (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount.toString(), isUserProtectedMaker);
         if (onTrigger) {
             onTrigger();
         }

package/lib/browser/dlob/DLOBNode.d.ts

@@ -7,6 +7,7 @@ export interface DLOBNode {
     isBaseFilled(): boolean;
     haveFilled: boolean;
     userAccount: string | undefined;
+    isUserProtectedMaker: boolean;
 }
 export declare abstract class OrderNode implements DLOBNode {
     order: Order;
@@ -14,7 +15,8 @@ export declare abstract class OrderNode implements DLOBNode {
     sortValue: BN;
     haveFilled: boolean;
     haveTrigger: boolean;
-    constructor(order: Order, userAccount: string);
+    isUserProtectedMaker: boolean;
+    constructor(order: Order, userAccount: string, isUserProtectedMaker: boolean);
     abstract getSortValue(order: Order): BN;
     getLabel(): string;
     getPrice(oraclePriceData: OraclePriceData, slot: number): BN;
@@ -54,4 +56,4 @@ export type DLOBNodeMap = {
     trigger: TriggerOrderNode;
 };
 export type DLOBNodeType = 'restingLimit' | 'takingLimit' | 'floatingLimit' | 'market' | ('trigger' & keyof DLOBNodeMap);
-export declare function createNode<T extends DLOBNodeType>(nodeType: T, order: Order, userAccount: string): DLOBNodeMap[T];
+export declare function createNode<T extends DLOBNodeType>(nodeType: T, order: Order, userAccount: string, isUserProtectedMaker: boolean): DLOBNodeMap[T];

package/lib/browser/dlob/DLOBNode.js

@@ -5,13 +5,14 @@ const __1 = require("..");
 // import { PublicKey } from '@solana/web3.js';
 const NodeList_1 = require("./NodeList");
 class OrderNode {
-    constructor(order, userAccount) {
+    constructor(order, userAccount, isUserProtectedMaker) {
         this.haveFilled = false;
         this.haveTrigger = false;
         // Copy the order over to the node
         this.order = { ...order };
         this.userAccount = userAccount;
         this.sortValue = this.getSortValue(order);
+        this.isUserProtectedMaker = isUserProtectedMaker;
     }
     getLabel() {
         let msg = `Order ${(0, NodeList_1.getOrderSignature)(this.order.orderId, this.userAccount)}`;
@@ -67,18 +68,18 @@ class TriggerOrderNode extends OrderNode {
     }
 }
 exports.TriggerOrderNode = TriggerOrderNode;
-function createNode(nodeType, order, userAccount) {
+function createNode(nodeType, order, userAccount, isUserProtectedMaker) {
     switch (nodeType) {
         case 'floatingLimit':
-            return new FloatingLimitOrderNode(order, userAccount);
+            return new FloatingLimitOrderNode(order, userAccount, isUserProtectedMaker);
         case 'restingLimit':
-            return new RestingLimitOrderNode(order, userAccount);
+            return new RestingLimitOrderNode(order, userAccount, isUserProtectedMaker);
         case 'takingLimit':
-            return new TakingLimitOrderNode(order, userAccount);
+            return new TakingLimitOrderNode(order, userAccount, isUserProtectedMaker);
         case 'market':
-            return new MarketOrderNode(order, userAccount);
+            return new MarketOrderNode(order, userAccount, isUserProtectedMaker);
         case 'trigger':
-            return new TriggerOrderNode(order, userAccount);
+            return new TriggerOrderNode(order, userAccount, isUserProtectedMaker);
         default:
             throw Error(`Unknown DLOBNode type ${nodeType}`);
     }

package/lib/browser/dlob/NodeList.d.ts

@@ -14,7 +14,7 @@ export declare class NodeList<NodeType extends keyof DLOBNodeMap> implements DLO
     nodeMap: Map<string, DLOBNodeMap[NodeType]>;
     constructor(nodeType: NodeType, sortDirection: SortDirection);
     clear(): void;
-    insert(order: Order, marketType: MarketTypeStr, userAccount: string): void;
+    insert(order: Order, marketType: MarketTypeStr, userAccount: string, isUserProtectedMaker: boolean): void;
     prependNode(currentNode: DLOBNodeMap[NodeType], newNode: DLOBNodeMap[NodeType]): boolean;
     update(order: Order, userAccount: string): void;
     remove(order: Order, userAccount: string): void;

package/lib/browser/dlob/NodeList.js

@@ -20,11 +20,11 @@ class NodeList {
         this.length = 0;
         this.nodeMap.clear();
     }
-    insert(order, marketType, userAccount) {
+    insert(order, marketType, userAccount, isUserProtectedMaker) {
         if ((0, __1.isVariant)(order.status, 'init')) {
             return;
         }
-        const newNode = (0, DLOBNode_1.createNode)(this.nodeType, order, userAccount);
+        const newNode = (0, DLOBNode_1.createNode)(this.nodeType, order, userAccount, isUserProtectedMaker);
         const orderSignature = getOrderSignature(order.orderId, userAccount);
         if (this.nodeMap.has(orderSignature)) {
             return;
@@ -134,6 +134,7 @@ function* getVammNodeGenerator(price) {
         isVammNode: () => true,
         order: undefined,
         userAccount: undefined,
+        isUserProtectedMaker: false,
         isBaseFilled: () => false,
         haveFilled: false,
     };

package/lib/browser/driftClient.d.ts

@@ -623,7 +623,7 @@ export declare class DriftClient {
         postOnly?: boolean;
         immediateOrCancel?: boolean;
         maxTs?: BN;
-        policy?: ModifyOrderPolicy;
+        policy?: number;
     }, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
     getModifyOrderIx({ orderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, immediateOrCancel, maxTs, policy, }: {
         orderId: number;
@@ -640,7 +640,7 @@ export declare class DriftClient {
         postOnly?: boolean;
         immediateOrCancel?: boolean;
         maxTs?: BN;
-        policy?: ModifyOrderPolicy;
+        policy?: number;
     }, subAccountId?: number): Promise<TransactionInstruction>;
     /**
      * Modifies an open order by closing it and replacing it with a new order.

package/lib/browser/driftClient.js

@@ -962,13 +962,13 @@ class DriftClient {
                 isWritable: true,
                 pubkey: spotMarket.vault,
             });
-            const keeperVault = await this.getAssociatedTokenAccount(spotPosition.marketIndex, false);
+            const tokenProgram = this.getTokenProgramForSpotMarket(spotMarket);
+            const keeperVault = await this.getAssociatedTokenAccount(spotPosition.marketIndex, false, tokenProgram);
             remainingAccounts.push({
                 isSigner: false,
                 isWritable: true,
                 pubkey: keeperVault,
             });
-            const tokenProgram = this.getTokenProgramForSpotMarket(spotMarket);
             tokenPrograms.add(tokenProgram.toBase58());
         }
         for (const tokenProgram of tokenPrograms) {