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

package/lib/constants/spotMarkets.js

@@ -9,8 +9,8 @@ exports.DevnetSpotMarkets = [
     {
         symbol: 'USDC',
         marketIndex: 0,
-        oracle: web3_js_1.PublicKey.default,
-        oracleSource: __1.OracleSource.QUOTE_ASSET,
+        oracle: new web3_js_1.PublicKey('5SSkXsEKQepHHAewytPVwdej4epN1nxgLVM84L4KXgy7'),
+        oracleSource: __1.OracleSource.PYTH_STABLE_COIN,
         mint: new web3_js_1.PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
@@ -40,8 +40,8 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'USDC',
         marketIndex: 0,
-        oracle: web3_js_1.PublicKey.default,
-        oracleSource: __1.OracleSource.QUOTE_ASSET,
+        oracle: new web3_js_1.PublicKey('Gnt27xtC473ZT2Mw5u8wZ68Z3gULkSTb5DuxJy7eJotD'),
+        oracleSource: __1.OracleSource.PYTH_STABLE_COIN,
         mint: new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
         precision: numericConstants_1.QUOTE_PRECISION,
         precisionExp: numericConstants_1.QUOTE_PRECISION_EXP,

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

@@ -297,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();

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.23.0-beta.0",
+    "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/user.js

@@ -1236,7 +1236,8 @@ class User {
             return false;
         }
         const userLastActiveSlot = userAccount.lastActiveSlot;
-        if (userLastActiveSlot.lt(slotsBeforeIdle)) {
+        const slotsSinceLastActive = slot.sub(userLastActiveSlot);
+        if (slotsSinceLastActive.lt(slotsBeforeIdle)) {
             return false;
         }
         if (this.isBeingLiquidated()) {
@@ -1248,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.0",
+	"version": "2.23.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/constants/spotMarkets.ts

@@ -27,8 +27,8 @@ export const DevnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'USDC',
 		marketIndex: 0,
-		oracle: PublicKey.default,
-		oracleSource: OracleSource.QUOTE_ASSET,
+		oracle: new PublicKey('5SSkXsEKQepHHAewytPVwdej4epN1nxgLVM84L4KXgy7'),
+		oracleSource: OracleSource.PYTH_STABLE_COIN,
 		mint: new PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
@@ -59,8 +59,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'USDC',
 		marketIndex: 0,
-		oracle: PublicKey.default,
-		oracleSource: OracleSource.QUOTE_ASSET,
+		oracle: new PublicKey('Gnt27xtC473ZT2Mw5u8wZ68Z3gULkSTb5DuxJy7eJotD'),
+		oracleSource: OracleSource.PYTH_STABLE_COIN,
 		mint: new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
 		precision: QUOTE_PRECISION,
 		precisionExp: QUOTE_PRECISION_EXP,

package/src/driftClient.ts

@@ -499,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,

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.23.0-beta.0",
+  "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/user.ts

@@ -2237,7 +2237,8 @@ export class User {
 		}
 
 		const userLastActiveSlot = userAccount.lastActiveSlot;
-		if (userLastActiveSlot.lt(slotsBeforeIdle)) {
+		const slotsSinceLastActive = slot.sub(userLastActiveSlot);
+		if (slotsSinceLastActive.lt(slotsBeforeIdle)) {
 			return false;
 		}
 
@@ -2252,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;
 			}