@drift-labs/sdk 2.61.0-beta.2 → 2.61.0-beta.4

package/VERSION

@@ -1 +1 @@
-2.61.0-beta.2
+2.61.0-beta.4

package/lib/driftClient.d.ts

@@ -129,6 +129,7 @@ export declare class DriftClient {
         subAccountId: number;
     }[]): Promise<TransactionSignature>;
     updateUserDelegate(delegate: PublicKey, subAccountId?: number): Promise<TransactionSignature>;
+    updateUserAdvancedLp(advancedLp: boolean, subAccountId?: number): Promise<TransactionSignature>;
     fetchAllUserAccounts(includeIdle?: boolean): Promise<ProgramAccount<UserAccount>[]>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
     getUserAccountsAndAddressesForAuthority(authority: PublicKey): Promise<ProgramAccount<UserAccount>[]>;

package/lib/driftClient.js

@@ -600,6 +600,16 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
+    async updateUserAdvancedLp(advancedLp, subAccountId = 0) {
+        const tx = await this.program.transaction.updateUserAdvancedLp(subAccountId, advancedLp, {
+            accounts: {
+                user: await this.getUserAccountPublicKey(),
+                authority: this.wallet.publicKey,
+            },
+        });
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
     async fetchAllUserAccounts(includeIdle = true) {
         let filters = undefined;
         if (!includeIdle) {

package/lib/idl/drift.json

@@ -1147,6 +1147,31 @@
                 }
             ]
         },
+        {
+            "name": "updateUserAdvancedLp",
+            "accounts": [
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                }
+            ],
+            "args": [
+                {
+                    "name": "subAccountId",
+                    "type": "u16"
+                },
+                {
+                    "name": "advancedLp",
+                    "type": "bool"
+                }
+            ]
+        },
         {
             "name": "deleteUser",
             "accounts": [
@@ -8925,6 +8950,9 @@
                     },
                     {
                         "name": "ReduceOnly"
+                    },
+                    {
+                        "name": "AdvancedLp"
                     }
                 ]
             }

package/lib/math/exchangeStatus.js

@@ -7,15 +7,29 @@ function exchangePaused(state) {
 }
 exports.exchangePaused = exchangePaused;
 function fillPaused(state, market) {
-    return ((state.exchangeStatus & types_1.ExchangeStatus.FILL_PAUSED) ===
-        types_1.ExchangeStatus.FILL_PAUSED ||
-        (0, types_1.isOneOfVariant)(market.status, ['paused', 'fillPaused']));
+    if ((state.exchangeStatus & types_1.ExchangeStatus.FILL_PAUSED) ===
+        types_1.ExchangeStatus.FILL_PAUSED) {
+        return true;
+    }
+    if (market.hasOwnProperty('amm')) {
+        return isOperationPaused(market.pausedOperations, types_1.PerpOperation.FILL);
+    }
+    else {
+        return isOperationPaused(market.pausedOperations, types_1.SpotOperation.FILL);
+    }
 }
 exports.fillPaused = fillPaused;
 function ammPaused(state, market) {
-    return ((state.exchangeStatus & types_1.ExchangeStatus.AMM_PAUSED) ===
-        types_1.ExchangeStatus.AMM_PAUSED ||
-        (0, types_1.isOneOfVariant)(market.status, ['paused', 'ammPaused']));
+    if ((state.exchangeStatus & types_1.ExchangeStatus.AMM_PAUSED) ===
+        types_1.ExchangeStatus.AMM_PAUSED) {
+        return true;
+    }
+    if (market.hasOwnProperty('amm')) {
+        return isOperationPaused(market.pausedOperations, types_1.PerpOperation.AMM_FILL);
+    }
+    else {
+        return false;
+    }
 }
 exports.ammPaused = ammPaused;
 function isOperationPaused(pausedOperations, operation) {

package/lib/math/orders.js

@@ -207,17 +207,6 @@ function isRestingLimitOrder(order, slot) {
     if (!isLimitOrder(order)) {
         return false;
     }
-    if ((0, types_1.isVariant)(order.orderType, 'triggerLimit')) {
-        if ((0, types_1.isVariant)(order.direction, 'long') &&
-            order.triggerPrice.lt(order.price)) {
-            return false;
-        }
-        else if ((0, types_1.isVariant)(order.direction, 'short') &&
-            order.triggerPrice.gt(order.price)) {
-            return false;
-        }
-        return (0, auction_1.isAuctionComplete)(order, slot);
-    }
     return order.postOnly || (0, auction_1.isAuctionComplete)(order, slot);
 }
 exports.isRestingLimitOrder = isRestingLimitOrder;

package/lib/types.d.ts

@@ -56,7 +56,8 @@ export declare enum SpotOperation {
 export declare enum UserStatus {
     BEING_LIQUIDATED = 1,
     BANKRUPT = 2,
-    REDUCE_ONLY = 4
+    REDUCE_ONLY = 4,
+    ADVANCED_LP = 8
 }
 export declare class ContractType {
     static readonly PERPETUAL: {
@@ -689,6 +690,7 @@ export type PerpMarketAccount = {
     };
     quoteSpotMarketIndex: number;
     feeAdjustment: number;
+    pausedOperations: number;
 };
 export type HistoricalOracleData = {
     lastOraclePrice: BN;
@@ -766,6 +768,7 @@ export type SpotMarketAccount = {
     flashLoanAmount: BN;
     flashLoanInitialTokenAmount: BN;
     ordersEnabled: boolean;
+    pausedOperations: number;
 };
 export type PoolBalance = {
     scaledBalance: BN;

package/lib/types.js

@@ -46,6 +46,7 @@ var UserStatus;
     UserStatus[UserStatus["BEING_LIQUIDATED"] = 1] = "BEING_LIQUIDATED";
     UserStatus[UserStatus["BANKRUPT"] = 2] = "BANKRUPT";
     UserStatus[UserStatus["REDUCE_ONLY"] = 4] = "REDUCE_ONLY";
+    UserStatus[UserStatus["ADVANCED_LP"] = 8] = "ADVANCED_LP";
 })(UserStatus = exports.UserStatus || (exports.UserStatus = {}));
 class ContractType {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.61.0-beta.2",
+	"version": "2.61.0-beta.4",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/driftClient.ts

@@ -1024,6 +1024,25 @@ export class DriftClient {
 		return txSig;
 	}
 
+	public async updateUserAdvancedLp(
+		advancedLp: boolean,
+		subAccountId = 0
+	): Promise<TransactionSignature> {
+		const tx = await this.program.transaction.updateUserAdvancedLp(
+			subAccountId,
+			advancedLp,
+			{
+				accounts: {
+					user: await this.getUserAccountPublicKey(),
+					authority: this.wallet.publicKey,
+				},
+			}
+		);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
+	}
+
 	public async fetchAllUserAccounts(
 		includeIdle = true
 	): Promise<ProgramAccount<UserAccount>[]> {

package/src/idl/drift.json

@@ -1147,6 +1147,31 @@
         }
       ]
     },
+    {
+      "name": "updateUserAdvancedLp",
+      "accounts": [
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        }
+      ],
+      "args": [
+        {
+          "name": "subAccountId",
+          "type": "u16"
+        },
+        {
+          "name": "advancedLp",
+          "type": "bool"
+        }
+      ]
+    },
     {
       "name": "deleteUser",
       "accounts": [
@@ -8925,6 +8950,9 @@
           },
           {
             "name": "ReduceOnly"
+          },
+          {
+            "name": "AdvancedLp"
           }
         ]
       }

package/src/math/exchangeStatus.ts

@@ -1,6 +1,5 @@
 import {
 	ExchangeStatus,
-	isOneOfVariant,
 	PerpMarketAccount,
 	PerpOperation,
 	SpotMarketAccount,
@@ -16,22 +15,36 @@ export function fillPaused(
 	state: StateAccount,
 	market: PerpMarketAccount | SpotMarketAccount
 ): boolean {
-	return (
+	if (
 		(state.exchangeStatus & ExchangeStatus.FILL_PAUSED) ===
-			ExchangeStatus.FILL_PAUSED ||
-		isOneOfVariant(market.status, ['paused', 'fillPaused'])
-	);
+		ExchangeStatus.FILL_PAUSED
+	) {
+		return true;
+	}
+
+	if (market.hasOwnProperty('amm')) {
+		return isOperationPaused(market.pausedOperations, PerpOperation.FILL);
+	} else {
+		return isOperationPaused(market.pausedOperations, SpotOperation.FILL);
+	}
 }
 
 export function ammPaused(
 	state: StateAccount,
 	market: PerpMarketAccount | SpotMarketAccount
 ): boolean {
-	return (
+	if (
 		(state.exchangeStatus & ExchangeStatus.AMM_PAUSED) ===
-			ExchangeStatus.AMM_PAUSED ||
-		isOneOfVariant(market.status, ['paused', 'ammPaused'])
-	);
+		ExchangeStatus.AMM_PAUSED
+	) {
+		return true;
+	}
+
+	if (market.hasOwnProperty('amm')) {
+		return isOperationPaused(market.pausedOperations, PerpOperation.AMM_FILL);
+	} else {
+		return false;
+	}
 }
 
 export function isOperationPaused(

package/src/math/orders.ts

@@ -331,22 +331,6 @@ export function isRestingLimitOrder(order: Order, slot: number): boolean {
 		return false;
 	}
 
-	if (isVariant(order.orderType, 'triggerLimit')) {
-		if (
-			isVariant(order.direction, 'long') &&
-			order.triggerPrice.lt(order.price)
-		) {
-			return false;
-		} else if (
-			isVariant(order.direction, 'short') &&
-			order.triggerPrice.gt(order.price)
-		) {
-			return false;
-		}
-
-		return isAuctionComplete(order, slot);
-	}
-
 	return order.postOnly || isAuctionComplete(order, slot);
 }
 

package/src/types.ts

@@ -45,6 +45,7 @@ export enum UserStatus {
 	BEING_LIQUIDATED = 1,
 	BANKRUPT = 2,
 	REDUCE_ONLY = 4,
+	ADVANCED_LP = 8,
 }
 
 export class ContractType {
@@ -609,6 +610,7 @@ export type PerpMarketAccount = {
 	};
 	quoteSpotMarketIndex: number;
 	feeAdjustment: number;
+	pausedOperations: number;
 };
 
 export type HistoricalOracleData = {
@@ -700,6 +702,8 @@ export type SpotMarketAccount = {
 	flashLoanInitialTokenAmount: BN;
 
 	ordersEnabled: boolean;
+
+	pausedOperations: number;
 };
 
 export type PoolBalance = {

package/tests/dlob/test.ts

@@ -28,7 +28,6 @@ import {
 
 import { mockPerpMarkets, mockSpotMarkets, mockStateAccount } from './helpers';
 import { DLOBOrdersCoder } from '../../src/dlob/DLOBOrders';
-import { isAuctionComplete, isRestingLimitOrder } from '../../lib';
 
 function insertOrderToDLOB(
 	dlob: DLOB,
@@ -2698,60 +2697,6 @@ describe('DLOB Perp Tests', () => {
 		}
 	});
 
-	it('Test trigger limit isnt maker', () => {
-		const vAsk = new BN(15);
-		const vBid = new BN(8);
-
-		const user0 = Keypair.generate();
-
-		const dlob = new DLOB();
-		const marketIndex = 0;
-
-		const slot = 20;
-		const oracle = {
-			price: vBid.add(vAsk).div(new BN(2)),
-			slot: new BN(slot),
-			confidence: new BN(1),
-			hasSufficientNumberOfDataPoints: true,
-		};
-
-		// should trigger limit buy with above condition
-		insertTriggerOrderToDLOB(
-			dlob,
-			user0.publicKey,
-			OrderType.TRIGGER_LIMIT,
-			MarketType.PERP,
-			1, //orderId
-			marketIndex, // marketIndex
-			oracle.price.add(new BN(1)), // price
-			BASE_PRECISION, // baseAssetAmount: BN,
-			PositionDirection.LONG,
-			oracle.price.sub(new BN(1)), // triggerPrice: BN,
-			OrderTriggerCondition.TRIGGERED_ABOVE, // triggerCondition: OrderTriggerCondition,
-			vBid,
-			vAsk,
-			new BN(1) // slot
-		);
-
-		const restingLimitBids = Array.from(
-			dlob.getRestingLimitBids(marketIndex, slot, MarketType.PERP, oracle)
-		);
-		expect(restingLimitBids.length).to.equal(0);
-
-		const takingBids = Array.from(
-			dlob.getTakingBids(marketIndex, MarketType.PERP, slot, oracle)
-		);
-		expect(takingBids.length).to.equal(1);
-		const triggerLimitBid = takingBids[0];
-		expect(triggerLimitBid !== undefined);
-		expect(isAuctionComplete(triggerLimitBid.order as Order, slot)).to.equal(
-			true
-		);
-		expect(isRestingLimitOrder(triggerLimitBid.order as Order, slot)).to.equal(
-			false
-		);
-	});
-
 	it('Test will return expired market orders to fill', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(8);