@drift-labs/sdk 2.10.0 → 2.11.0-beta.1

package/lib/factory/oracleClient.js

@@ -3,15 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOracleClient = void 0;
 const types_1 = require("../types");
 const pythClient_1 = require("../oracles/pythClient");
-const switchboardClient_1 = require("../oracles/switchboardClient");
+// import { SwitchboardClient } from '../oracles/switchboardClient';
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 function getOracleClient(oracleSource, connection) {
     if ((0, types_1.isVariant)(oracleSource, 'pyth')) {
         return new pythClient_1.PythClient(connection);
     }
-    if ((0, types_1.isVariant)(oracleSource, 'switchboard')) {
-        return new switchboardClient_1.SwitchboardClient(connection);
-    }
+    // if (isVariant(oracleSource, 'switchboard')) {
+    // 	return new SwitchboardClient(connection);
+    // }
     if ((0, types_1.isVariant)(oracleSource, 'quoteAsset')) {
         return new quoteAssetOracleClient_1.QuoteAssetOracleClient();
     }

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.10.0",
+    "version": "2.11.0-beta.1",
     "name": "drift",
     "instructions": [
         {
@@ -6190,7 +6190,12 @@
                         ]
                     },
                     {
-                        "name": "Match"
+                        "name": "Match",
+                        "fields": [
+                            {
+                                "defined": "usize"
+                            }
+                        ]
                     }
                 ]
             }
@@ -8558,6 +8563,11 @@
             "code": 6223,
             "name": "FailedUnwrap",
             "msg": "Failed Unwrap"
+        },
+        {
+            "code": 6224,
+            "name": "MaxNumberOfUsers",
+            "msg": "Max Number Of Users"
         }
     ]
 }

package/lib/index.d.ts

@@ -4,7 +4,6 @@ import pyth from '@pythnetwork/client';
 export * from './tokenFaucet';
 export * from './oracles/types';
 export * from './oracles/pythClient';
-export * from './oracles/switchboardClient';
 export * from './types';
 export * from './constants/perpMarkets';
 export * from './accounts/fetch';

package/lib/index.js

@@ -27,7 +27,7 @@ exports.pyth = client_1.default;
 __exportStar(require("./tokenFaucet"), exports);
 __exportStar(require("./oracles/types"), exports);
 __exportStar(require("./oracles/pythClient"), exports);
-__exportStar(require("./oracles/switchboardClient"), exports);
+// export * from './oracles/switchboardClient';
 __exportStar(require("./types"), exports);
 __exportStar(require("./constants/perpMarkets"), exports);
 __exportStar(require("./accounts/fetch"), exports);

package/lib/types.d.ts

@@ -142,9 +142,6 @@ export declare class OracleSource {
     static readonly PYTH: {
         pyth: {};
     };
-    static readonly SWITCHBOARD: {
-        switchboard: {};
-    };
     static readonly QUOTE_ASSET: {
         quoteAsset: {};
     };

package/lib/types.js

@@ -76,7 +76,7 @@ class OracleSource {
 }
 exports.OracleSource = OracleSource;
 OracleSource.PYTH = { pyth: {} };
-OracleSource.SWITCHBOARD = { switchboard: {} };
+// static readonly SWITCHBOARD = { switchboard: {} };
 OracleSource.QUOTE_ASSET = { quoteAsset: {} };
 class OrderType {
 }

package/lib/user.js

@@ -291,6 +291,9 @@ class User {
             .reduce((unrealizedPnl, perpPosition) => {
             const market = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
             const oraclePriceData = this.getOracleDataForPerpMarket(market.marketIndex);
+            if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
+                perpPosition = this.getSettledLPPosition(perpPosition.marketIndex)[0];
+            }
             let positionUnrealizedPnl = (0, _1.calculatePositionPNL)(market, perpPosition, withFunding, oraclePriceData);
             if (withWeightMarginCategory !== undefined) {
                 if (positionUnrealizedPnl.gt(numericConstants_1.ZERO)) {
@@ -698,6 +701,9 @@ class User {
      */
     spotLiquidationPrice(spotPosition) {
         const currentSpotPosition = this.getSpotPosition(spotPosition.marketIndex);
+        if (!currentSpotPosition) {
+            return new _1.BN(-1);
+        }
         const mtc = this.getTotalCollateral('Maintenance');
         const mmr = this.getMaintenanceMarginRequirement();
         const deltaValueToLiq = mtc.sub(mmr); // QUOTE_PRECISION

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.10.0",
+	"version": "2.11.0-beta.1",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -38,7 +38,6 @@
 		"@pythnetwork/client": "2.5.3",
 		"@solana/spl-token": "^0.1.6",
 		"@solana/web3.js": "1.66.2",
-		"@switchboard-xyz/switchboard-v2": "^0.0.67",
 		"strict-event-emitter-types": "^2.0.0",
 		"uuid": "^8.3.2"
 	},

package/src/factory/oracleClient.ts

@@ -2,7 +2,7 @@ import { isVariant, OracleSource } from '../types';
 import { Connection } from '@solana/web3.js';
 import { OracleClient } from '../oracles/types';
 import { PythClient } from '../oracles/pythClient';
-import { SwitchboardClient } from '../oracles/switchboardClient';
+// import { SwitchboardClient } from '../oracles/switchboardClient';
 import { QuoteAssetOracleClient } from '../oracles/quoteAssetOracleClient';
 
 export function getOracleClient(
@@ -13,9 +13,9 @@ export function getOracleClient(
 		return new PythClient(connection);
 	}
 
-	if (isVariant(oracleSource, 'switchboard')) {
-		return new SwitchboardClient(connection);
-	}
+	// if (isVariant(oracleSource, 'switchboard')) {
+	// 	return new SwitchboardClient(connection);
+	// }
 
 	if (isVariant(oracleSource, 'quoteAsset')) {
 		return new QuoteAssetOracleClient();

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.10.0",
+  "version": "2.11.0-beta.1",
   "name": "drift",
   "instructions": [
     {
@@ -6190,7 +6190,12 @@
             ]
           },
           {
-            "name": "Match"
+            "name": "Match",
+            "fields": [
+              {
+                "defined": "usize"
+              }
+            ]
           }
         ]
       }
@@ -8558,6 +8563,11 @@
       "code": 6223,
       "name": "FailedUnwrap",
       "msg": "Failed Unwrap"
+    },
+    {
+      "code": 6224,
+      "name": "MaxNumberOfUsers",
+      "msg": "Max Number Of Users"
     }
   ]
 }

package/src/index.ts

@@ -5,7 +5,7 @@ import pyth from '@pythnetwork/client';
 export * from './tokenFaucet';
 export * from './oracles/types';
 export * from './oracles/pythClient';
-export * from './oracles/switchboardClient';
+// export * from './oracles/switchboardClient';
 export * from './types';
 export * from './constants/perpMarkets';
 export * from './accounts/fetch';

package/src/types.ts

@@ -74,7 +74,7 @@ export class DepositDirection {
 
 export class OracleSource {
 	static readonly PYTH = { pyth: {} };
-	static readonly SWITCHBOARD = { switchboard: {} };
+	// static readonly SWITCHBOARD = { switchboard: {} };
 	static readonly QUOTE_ASSET = { quoteAsset: {} };
 }
 

package/src/user.ts

@@ -447,6 +447,10 @@ export class User {
 					market.marketIndex
 				);
 
+				if (perpPosition.lpShares.gt(ZERO)) {
+					perpPosition = this.getSettledLPPosition(perpPosition.marketIndex)[0];
+				}
+
 				let positionUnrealizedPnl = calculatePositionPNL(
 					market,
 					perpPosition,
@@ -1169,6 +1173,10 @@ export class User {
 	): BN {
 		const currentSpotPosition = this.getSpotPosition(spotPosition.marketIndex);
 
+		if (!currentSpotPosition) {
+			return new BN(-1);
+		}
+
 		const mtc = this.getTotalCollateral('Maintenance');
 		const mmr = this.getMaintenanceMarginRequirement();