@drift-labs/sdk 2.23.0-beta.1 → 2.23.0

package/lib/driftClient.d.ts

@@ -93,6 +93,7 @@ export declare class DriftClient {
     updateWallet(newWallet: IWallet, subAccountIds?: number[], activeSubAccountId?: number): Promise<void>;
     switchActiveUser(subAccountId: number): void;
     addUser(subAccountId: number): Promise<void>;
+    addAllUsers(): Promise<void>;
     initializeUserAccount(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[TransactionSignature, PublicKey]>;
     getInitializeUserInstructions(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[PublicKey, TransactionInstruction]>;
     getInitializeUserStatsIx(): Promise<TransactionInstruction>;

package/lib/driftClient.js

@@ -246,7 +246,6 @@ class DriftClient {
         if (!this.marketLookupTable) {
             throw Error('Market lookup table address not set');
         }
-        // @ts-ignore
         return (await this.connection.getAddressLookupTable(this.marketLookupTable))
             .value;
     }
@@ -298,6 +297,12 @@ class DriftClient {
         await user.subscribe();
         this.users.set(subAccountId, user);
     }
+    async addAllUsers() {
+        const userAccounts = await this.getUserAccountsForAuthority(this.authority);
+        for (const userAccount of userAccounts) {
+            await this.addUser(userAccount.subAccountId);
+        }
+    }
     async initializeUserAccount(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         const tx = new web3_js_1.Transaction();
@@ -801,9 +806,7 @@ class DriftClient {
     }
     async deposit(amount, marketIndex, collateralAccountPublicKey, subAccountId, reduceOnly = false) {
         const tx = new web3_js_1.Transaction();
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: 600000,
         }));
         const additionalSigners = [];
@@ -916,15 +919,11 @@ class DriftClient {
         const spotMarket = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarket.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const tx = new web3_js_1.Transaction();
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: (_a = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits) !== null && _a !== void 0 ? _a : 600000,
         }));
         if (txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice) {
-            tx.add(
-            // @ts-ignore
-            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+            tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
                 microLamports: txParams.computeUnitsPrice,
             }));
         }
@@ -971,9 +970,7 @@ class DriftClient {
     }
     async withdraw(amount, marketIndex, userTokenAccount, reduceOnly = false) {
         const tx = new web3_js_1.Transaction();
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: 600000,
         }));
         const additionalSigners = [];
@@ -2048,9 +2045,7 @@ class DriftClient {
             ? await this.getPlaceSpotOrderIx(newOrderParams)
             : await this.getPlacePerpOrderIx(newOrderParams);
         const tx = new web3_js_1.Transaction();
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: 1000000,
         }));
         tx.add(cancelOrderIx);
@@ -2125,9 +2120,7 @@ class DriftClient {
             ? await this.getPlaceSpotOrderIx(newOrderParams)
             : await this.getPlacePerpOrderIx(newOrderParams);
         const tx = new web3_js_1.Transaction();
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: 1000000,
         }));
         tx.add(cancelOrderIx);
@@ -2150,9 +2143,7 @@ class DriftClient {
             }
         }
         const tx = new web3_js_1.Transaction()
-            .add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+            .add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: 1000000,
         }))
             .add(...ixs);

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.23.0-beta.1",
+    "version": "2.23.0",
     "name": "drift",
     "instructions": [
         {
@@ -5994,6 +5994,22 @@
                 ]
             }
         },
+        {
+            "name": "FulfillmentParams",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "SerumFulfillmentParams",
+                        "fields": [
+                            {
+                                "defined": "SerumFulfillmentParams<'a,'b>"
+                            }
+                        ]
+                    }
+                ]
+            }
+        },
         {
             "name": "SpotFulfillmentType",
             "type": {

package/lib/tx/utils.js

@@ -6,16 +6,12 @@ const COMPUTE_UNITS_DEFAULT = 200000;
 function wrapInTx(instruction, computeUnits = 600000, computeUnitsPrice = 0) {
     const tx = new web3_js_1.Transaction();
     if (computeUnits != COMPUTE_UNITS_DEFAULT) {
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: computeUnits,
         }));
     }
     if (computeUnitsPrice != 0) {
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
             microLamports: computeUnitsPrice,
         }));
     }

package/lib/user.js

@@ -1249,7 +1249,8 @@ class User {
             }
         }
         for (const spotPosition of userAccount.spotPositions) {
-            if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow')) {
+            if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow') &&
+                spotPosition.scaledBalance.gt(numericConstants_1.ZERO)) {
                 return false;
             }
             if (spotPosition.openOrders !== 0) {

package/package.json

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

package/src/driftClient.ts

@@ -418,7 +418,6 @@ export class DriftClient {
 			throw Error('Market lookup table address not set');
 		}
 
-		// @ts-ignore
 		return (await this.connection.getAddressLookupTable(this.marketLookupTable))
 			.value;
 	}
@@ -500,6 +499,13 @@ export class DriftClient {
 		this.users.set(subAccountId, user);
 	}
 
+	public async addAllUsers(): Promise<void> {
+		const userAccounts = await this.getUserAccountsForAuthority(this.authority);
+		for (const userAccount of userAccounts) {
+			await this.addUser(userAccount.subAccountId);
+		}
+	}
+
 	public async initializeUserAccount(
 		subAccountId = 0,
 		name = DEFAULT_USER_NAME,
@@ -1233,7 +1239,6 @@ export class DriftClient {
 	): Promise<TransactionSignature> {
 		const tx = new Transaction();
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: 600_000,
 			})
@@ -1459,7 +1464,6 @@ export class DriftClient {
 		const tx = new Transaction();
 
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: txParams?.computeUnits ?? 600_000,
 			})
@@ -1467,7 +1471,6 @@ export class DriftClient {
 
 		if (txParams?.computeUnitsPrice) {
 			tx.add(
-				// @ts-ignore
 				ComputeBudgetProgram.setComputeUnitPrice({
 					microLamports: txParams.computeUnitsPrice,
 				})
@@ -1598,7 +1601,6 @@ export class DriftClient {
 	): Promise<TransactionSignature> {
 		const tx = new Transaction();
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: 600_000,
 			})
@@ -3458,7 +3460,6 @@ export class DriftClient {
 
 		const tx = new Transaction();
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: 1_000_000,
 			})
@@ -3570,7 +3571,6 @@ export class DriftClient {
 
 		const tx = new Transaction();
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: 1_000_000,
 			})
@@ -3611,7 +3611,6 @@ export class DriftClient {
 
 		const tx = new Transaction()
 			.add(
-				// @ts-ignore
 				ComputeBudgetProgram.setComputeUnitLimit({
 					units: 1_000_000,
 				})

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.23.0-beta.1",
+  "version": "2.23.0",
   "name": "drift",
   "instructions": [
     {
@@ -5994,6 +5994,22 @@
         ]
       }
     },
+    {
+      "name": "FulfillmentParams",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "SerumFulfillmentParams",
+            "fields": [
+              {
+                "defined": "SerumFulfillmentParams<'a,'b>"
+              }
+            ]
+          }
+        ]
+      }
+    },
     {
       "name": "SpotFulfillmentType",
       "type": {

package/src/tx/utils.ts

@@ -14,7 +14,6 @@ export function wrapInTx(
 	const tx = new Transaction();
 	if (computeUnits != COMPUTE_UNITS_DEFAULT) {
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: computeUnits,
 			})
@@ -23,7 +22,6 @@ export function wrapInTx(
 
 	if (computeUnitsPrice != 0) {
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitPrice({
 				microLamports: computeUnitsPrice,
 			})

package/src/user.ts

@@ -2253,7 +2253,10 @@ export class User {
 		}
 
 		for (const spotPosition of userAccount.spotPositions) {
-			if (isVariant(spotPosition.balanceType, 'borrow')) {
+			if (
+				isVariant(spotPosition.balanceType, 'borrow') &&
+				spotPosition.scaledBalance.gt(ZERO)
+			) {
 				return false;
 			}