@drift-labs/sdk 0.2.0-master.40 → 0.2.0-master.42

package/src/dlob/DLOB.ts

@@ -22,8 +22,9 @@ import {
 	StateAccount,
 	isMarketOrder,
 	isLimitOrder,
-	hasLimitPrice,
 	getOptionalLimitPrice,
+	mustBeTriggered,
+	isTriggered,
 } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { DLOBNode, DLOBNodeType, TriggerOrderNode } from '..';
@@ -253,8 +254,7 @@ export class DLOB {
 
 	public getListForOrder(order: Order): NodeList<any> | undefined {
 		const isInactiveTriggerOrder =
-			isOneOfVariant(order.orderType, ['triggerMarket', 'triggerLimit']) &&
-			!order.triggered;
+			mustBeTriggered(order) && !isTriggered(order);
 
 		let type: DLOBNodeType;
 		if (isInactiveTriggerOrder) {
@@ -651,10 +651,7 @@ export class DLOB {
 					const user = this.userMap.get(
 						bestGenerator.next.value.userAccount.toString()
 					);
-					if (
-						user?.getUserAccount().isBeingLiquidated ||
-						user?.getUserAccount().isBankrupt
-					) {
+					if (user?.isBeingLiquidated()) {
 						bestGenerator.next = bestGenerator.generator.next();
 						continue;
 					}
@@ -740,10 +737,7 @@ export class DLOB {
 					const user = this.userMap.get(
 						bestGenerator.next.value.userAccount.toString()
 					);
-					if (
-						user?.getUserAccount().isBeingLiquidated ||
-						user?.getUserAccount().isBankrupt
-					) {
+					if (user?.isBeingLiquidated()) {
 						bestGenerator.next = bestGenerator.generator.next();
 						continue;
 					}
@@ -804,8 +798,11 @@ export class DLOB {
 			bidNode
 		);
 
-		// If order doesn't have limit price, cant be maker
-		if (!hasLimitPrice(makerNode.order, slot)) {
+		// If maker is market order and auction is complete, cant be maker
+		if (
+			isMarketOrder(makerNode.order) &&
+			isAuctionComplete(makerNode.order, slot)
+		) {
 			return {
 				crossingNodes: [],
 				exhaustedSide: makerSide,

package/src/driftClient.ts

@@ -586,6 +586,24 @@ export class DriftClient {
 		);
 	}
 
+	public async getUserAccountsForAuthority(
+		authority: PublicKey
+	): Promise<UserAccount[]> {
+		const programAccounts = await this.program.account.user.all([
+			{
+				memcmp: {
+					offset: 8,
+					/** data to match, as base-58 encoded string and limited to less than 129 bytes */
+					bytes: bs58.encode(authority.toBuffer()),
+				},
+			},
+		]);
+
+		return programAccounts.map(
+			(programAccount) => programAccount.account as UserAccount
+		);
+	}
+
 	public async deleteUser(subAccountId = 0): Promise<TransactionSignature> {
 		const userAccountPublicKey = getUserAccountPublicKeySync(
 			this.program.programId,
@@ -2933,7 +2951,8 @@ export class DriftClient {
 		userAccount: UserAccount,
 		assetMarketIndex: number,
 		liabilityMarketIndex: number,
-		maxLiabilityTransfer: BN
+		maxLiabilityTransfer: BN,
+		limitPrice?: BN
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(
@@ -2942,7 +2961,8 @@ export class DriftClient {
 					userAccount,
 					assetMarketIndex,
 					liabilityMarketIndex,
-					maxLiabilityTransfer
+					maxLiabilityTransfer,
+					limitPrice
 				)
 			),
 			[],
@@ -2958,7 +2978,8 @@ export class DriftClient {
 		userAccount: UserAccount,
 		assetMarketIndex: number,
 		liabilityMarketIndex: number,
-		maxLiabilityTransfer: BN
+		maxLiabilityTransfer: BN,
+		limitPrice?: BN
 	): Promise<TransactionInstruction> {
 		const userStatsPublicKey = getUserStatsAccountPublicKey(
 			this.program.programId,
@@ -2978,6 +2999,7 @@ export class DriftClient {
 			assetMarketIndex,
 			liabilityMarketIndex,
 			maxLiabilityTransfer,
+			limitPrice || null,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
@@ -2997,7 +3019,8 @@ export class DriftClient {
 		userAccount: UserAccount,
 		perpMarketIndex: number,
 		liabilityMarketIndex: number,
-		maxLiabilityTransfer: BN
+		maxLiabilityTransfer: BN,
+		limitPrice?: BN
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(
@@ -3006,7 +3029,8 @@ export class DriftClient {
 					userAccount,
 					perpMarketIndex,
 					liabilityMarketIndex,
-					maxLiabilityTransfer
+					maxLiabilityTransfer,
+					limitPrice
 				)
 			),
 			[],
@@ -3022,7 +3046,8 @@ export class DriftClient {
 		userAccount: UserAccount,
 		perpMarketIndex: number,
 		liabilityMarketIndex: number,
-		maxLiabilityTransfer: BN
+		maxLiabilityTransfer: BN,
+		limitPrice?: BN
 	): Promise<TransactionInstruction> {
 		const userStatsPublicKey = getUserStatsAccountPublicKey(
 			this.program.programId,
@@ -3042,6 +3067,7 @@ export class DriftClient {
 			perpMarketIndex,
 			liabilityMarketIndex,
 			maxLiabilityTransfer,
+			limitPrice || null,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
@@ -3061,7 +3087,8 @@ export class DriftClient {
 		userAccount: UserAccount,
 		perpMarketIndex: number,
 		assetMarketIndex: number,
-		maxPnlTransfer: BN
+		maxPnlTransfer: BN,
+		limitPrice?: BN
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(
@@ -3070,7 +3097,8 @@ export class DriftClient {
 					userAccount,
 					perpMarketIndex,
 					assetMarketIndex,
-					maxPnlTransfer
+					maxPnlTransfer,
+					limitPrice
 				)
 			),
 			[],
@@ -3086,7 +3114,8 @@ export class DriftClient {
 		userAccount: UserAccount,
 		perpMarketIndex: number,
 		assetMarketIndex: number,
-		maxPnlTransfer: BN
+		maxPnlTransfer: BN,
+		limitPrice?: BN
 	): Promise<TransactionInstruction> {
 		const userStatsPublicKey = getUserStatsAccountPublicKey(
 			this.program.programId,
@@ -3106,6 +3135,7 @@ export class DriftClient {
 			perpMarketIndex,
 			assetMarketIndex,
 			maxPnlTransfer,
+			limitPrice || null,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),

package/src/events/types.ts

@@ -11,6 +11,8 @@ import {
 	LPRecord,
 	InsuranceFundRecord,
 	SpotInterestRecord,
+	InsuranceFundStakeRecord,
+	CurveRecord,
 } from '../index';
 
 export type EventSubscriptionOptions = {
@@ -39,6 +41,8 @@ export const DefaultEventSubscriptionOptions: EventSubscriptionOptions = {
 		'LPRecord',
 		'InsuranceFundRecord',
 		'SpotInterestRecord',
+		'InsuranceFundStakeRecord',
+		'CurveRecord',
 	],
 	maxEventsPerType: 4096,
 	orderBy: 'blockchain',
@@ -77,6 +81,8 @@ export type EventMap = {
 	LPRecord: Event<LPRecord>;
 	InsuranceFundRecord: Event<InsuranceFundRecord>;
 	SpotInterestRecord: Event<SpotInterestRecord>;
+	InsuranceFundStakeRecord: Event<InsuranceFundStakeRecord>;
+	CurveRecord: Event<CurveRecord>;
 };
 
 export type EventType = keyof EventMap;

package/src/idl/drift.json

@@ -17,7 +17,7 @@
         },
         {
           "name": "state",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false
         },
         {
@@ -773,7 +773,7 @@
         },
         {
           "name": "state",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false
         },
         {
@@ -1107,6 +1107,12 @@
         {
           "name": "liquidatorMaxLiabilityTransfer",
           "type": "u128"
+        },
+        {
+          "name": "limitPrice",
+          "type": {
+            "option": "u64"
+          }
         }
       ]
     },
@@ -1156,6 +1162,12 @@
         {
           "name": "liquidatorMaxLiabilityTransfer",
           "type": "u128"
+        },
+        {
+          "name": "limitPrice",
+          "type": {
+            "option": "u64"
+          }
         }
       ]
     },
@@ -1205,6 +1217,12 @@
         {
           "name": "liquidatorMaxPnlTransfer",
           "type": "u128"
+        },
+        {
+          "name": "limitPrice",
+          "type": {
+            "option": "u64"
+          }
         }
       ]
     },
@@ -3712,7 +3730,7 @@
             "type": {
               "array": [
                 "u8",
-                6
+                14
               ]
             }
           }
@@ -3846,7 +3864,7 @@
             "type": {
               "array": [
                 "u8",
-                3
+                51
               ]
             }
           }
@@ -3933,6 +3951,14 @@
             "name": "cumulativeBorrowInterest",
             "type": "u128"
           },
+          {
+            "name": "totalSocialLoss",
+            "type": "u128"
+          },
+          {
+            "name": "totalQuoteSocialLoss",
+            "type": "u128"
+          },
           {
             "name": "withdrawGuardThreshold",
             "type": "u64"
@@ -4064,7 +4090,7 @@
             "type": {
               "array": [
                 "u8",
-                6
+                86
               ]
             }
           }
@@ -4195,6 +4221,10 @@
             "name": "numberOfAuthorities",
             "type": "u64"
           },
+          {
+            "name": "numberOfSubAccounts",
+            "type": "u64"
+          },
           {
             "name": "lpCooldownTime",
             "type": "u64"
@@ -4242,7 +4272,7 @@
             "type": {
               "array": [
                 "u8",
-                1
+                17
               ]
             }
           }
@@ -4316,6 +4346,10 @@
             "name": "totalWithdraws",
             "type": "u64"
           },
+          {
+            "name": "totalSocialLoss",
+            "type": "u64"
+          },
           {
             "name": "settledPerpPnl",
             "type": "i64"
@@ -4328,6 +4362,14 @@
             "name": "cumulativePerpFunding",
             "type": "i64"
           },
+          {
+            "name": "liquidationMarginFreed",
+            "type": "u64"
+          },
+          {
+            "name": "liquidationStartTs",
+            "type": "i64"
+          },
           {
             "name": "nextOrderId",
             "type": "u32"
@@ -4345,12 +4387,10 @@
             "type": "u16"
           },
           {
-            "name": "isBeingLiquidated",
-            "type": "bool"
-          },
-          {
-            "name": "isBankrupt",
-            "type": "bool"
+            "name": "status",
+            "type": {
+              "defined": "UserStatus"
+            }
           },
           {
             "name": "isMarginTradingEnabled",
@@ -4361,7 +4401,7 @@
             "type": {
               "array": [
                 "u8",
-                1
+                26
               ]
             }
           }
@@ -4424,7 +4464,7 @@
             "type": "u16"
           },
           {
-            "name": "maxSubAccountId",
+            "name": "numberOfSubAccountsCreated",
             "type": "u16"
           },
           {
@@ -4436,7 +4476,7 @@
             "type": {
               "array": [
                 "u8",
-                3
+                51
               ]
             }
           }
@@ -4578,6 +4618,10 @@
             "name": "liquidatorOrderId",
             "type": "u32"
           },
+          {
+            "name": "liquidatorFee",
+            "type": "u64"
+          },
           {
             "name": "ifFee",
             "type": "u64"
@@ -5012,8 +5056,8 @@
             "type": "i128"
           },
           {
-            "name": "cumulativeSocialLoss",
-            "type": "i128"
+            "name": "totalSocialLoss",
+            "type": "u128"
           },
           {
             "name": "askBaseAssetReserve",
@@ -5111,6 +5155,10 @@
             "name": "markStd",
             "type": "u64"
           },
+          {
+            "name": "oracleStd",
+            "type": "u64"
+          },
           {
             "name": "lastMarkPriceTwapTs",
             "type": "i64"
@@ -5164,6 +5212,15 @@
           {
             "name": "lastOracleValid",
             "type": "bool"
+          },
+          {
+            "name": "padding",
+            "type": {
+              "array": [
+                "u8",
+                48
+              ]
+            }
           }
         ]
       }
@@ -5626,10 +5683,6 @@
               "defined": "OrderTriggerCondition"
             }
           },
-          {
-            "name": "triggered",
-            "type": "bool"
-          },
           {
             "name": "auctionDuration",
             "type": "u8"
@@ -5639,7 +5692,7 @@
             "type": {
               "array": [
                 "u8",
-                2
+                3
               ]
             }
           }
@@ -5817,16 +5870,30 @@
         ]
       }
     },
+    {
+      "name": "DepositExplanation",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "None"
+          },
+          {
+            "name": "Transfer"
+          }
+        ]
+      }
+    },
     {
       "name": "DepositDirection",
       "type": {
         "kind": "enum",
         "variants": [
           {
-            "name": "DEPOSIT"
+            "name": "Deposit"
           },
           {
-            "name": "WITHDRAW"
+            "name": "Withdraw"
           }
         ]
       }
@@ -5875,7 +5942,7 @@
             "name": "OrderExpired"
           },
           {
-            "name": "CanceledForLiquidation"
+            "name": "Liquidation"
           },
           {
             "name": "OrderFilledWithAMM"
@@ -5891,6 +5958,9 @@
           },
           {
             "name": "RiskingIncreasingOrder"
+          },
+          {
+            "name": "OrderFillWithSerum"
           }
         ]
       }
@@ -5938,6 +6008,20 @@
         ]
       }
     },
+    {
+      "name": "SettlePnlExplanation",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "None"
+          },
+          {
+            "name": "ExpiredPosition"
+          }
+        ]
+      }
+    },
     {
       "name": "StakeAction",
       "type": {
@@ -6160,6 +6244,23 @@
         ]
       }
     },
+    {
+      "name": "UserStatus",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "Active"
+          },
+          {
+            "name": "BeingLiquidated"
+          },
+          {
+            "name": "Bankrupt"
+          }
+        ]
+      }
+    },
     {
       "name": "AssetType",
       "type": {
@@ -6224,6 +6325,12 @@
           },
           {
             "name": "Below"
+          },
+          {
+            "name": "TriggeredAbove"
+          },
+          {
+            "name": "TriggeredBelow"
           }
         ]
       }
@@ -6359,6 +6466,13 @@
           "type": "u64",
           "index": false
         },
+        {
+          "name": "explanation",
+          "type": {
+            "defined": "DepositExplanation"
+          },
+          "index": false
+        },
         {
           "name": "transferUser",
           "type": {
@@ -6946,6 +7060,11 @@
           "type": "i128",
           "index": false
         },
+        {
+          "name": "marginFreed",
+          "type": "u64",
+          "index": false
+        },
         {
           "name": "liquidationId",
           "type": "u16",
@@ -7049,6 +7168,13 @@
           "name": "settlePrice",
           "type": "i64",
           "index": false
+        },
+        {
+          "name": "explanation",
+          "type": {
+            "defined": "SettlePnlExplanation"
+          },
+          "index": false
         }
       ]
     },
@@ -7568,8 +7694,8 @@
     },
     {
       "code": 6078,
-      "name": "MarketNotFound",
-      "msg": "MarketNotFound"
+      "name": "PerpMarketNotFound",
+      "msg": "PerpMarketNotFound"
     },
     {
       "code": 6079,
@@ -7578,7 +7704,7 @@
     },
     {
       "code": 6080,
-      "name": "UnableToLoadMarketAccount",
+      "name": "UnableToLoadPerpMarketAccount",
       "msg": "UnableToLoadMarketAccount"
     },
     {
@@ -8245,6 +8371,16 @@
       "code": 6213,
       "name": "MarketBeingInitialized",
       "msg": "Market Being Initialized"
+    },
+    {
+      "code": 6214,
+      "name": "InvalidUserSubAccountId",
+      "msg": "Invalid Sub Account Id"
+    },
+    {
+      "code": 6215,
+      "name": "InvalidTriggerOrderCondition",
+      "msg": "Invalid Trigger Order Condition"
     }
   ]
 }

package/src/math/oracles.ts

@@ -69,7 +69,7 @@ export function isOracleTooDivergent(
 		amm.historicalOracleData.lastOraclePriceTwapTs
 	);
 	const sinceStart = BN.max(ZERO, new BN(60 * 5).sub(sinceLastUpdate));
-	const oracleTwap5min = amm.historicalOracleData.lastOraclePriceTwap5min
+	const oracleTwap5min = amm.historicalOracleData.lastOraclePriceTwap5Min
 		.mul(sinceStart)
 		.add(oraclePriceData.price)
 		.mul(sinceLastUpdate)

package/src/math/orders.ts

@@ -196,10 +196,7 @@ export function calculateBaseAssetAmountForAmmToFulfill(
 	oraclePriceData: OraclePriceData,
 	slot: number
 ): BN {
-	if (
-		isOneOfVariant(order.orderType, ['triggerMarket', 'triggerLimit']) &&
-		order.triggered === false
-	) {
+	if (mustBeTriggered(order) && !isTriggered(order)) {
 		return ZERO;
 	}
 
@@ -285,3 +282,11 @@ export function isMarketOrder(order: Order): boolean {
 export function isLimitOrder(order: Order): boolean {
 	return isOneOfVariant(order.orderType, ['limit', 'triggerLimit']);
 }
+
+export function mustBeTriggered(order: Order): boolean {
+	return isOneOfVariant(order.orderType, ['triggerMarket', 'triggerLimit']);
+}
+
+export function isTriggered(order: Order): boolean {
+	return isOneOfVariant(order.orderType, ['triggeredAbove', 'triggeredBelow']);
+}