@drift-labs/sdk 2.149.1 → 2.150.0-alpha.0

package/src/user.ts

@@ -204,6 +204,7 @@ export class User {
 	}
 
 	public async unsubscribe(): Promise<void> {
+		this.eventEmitter.removeAllListeners();
 		await this.accountSubscriber.unsubscribe();
 		this.isSubscribed = false;
 	}
@@ -352,6 +353,10 @@ export class User {
 		};
 	}
 
+	public isPositionEmpty(position: PerpPosition): boolean {
+		return position.baseAssetAmount.eq(ZERO) && position.openOrders === 0;
+	}
+
 	public getIsolatePerpPositionTokenAmount(perpMarketIndex: number): BN {
 		const perpPosition = this.getPerpPosition(perpMarketIndex);
 		if (!perpPosition) return ZERO;
@@ -485,7 +490,8 @@ export class User {
 		marketIndex: number,
 		collateralBuffer = ZERO,
 		enterHighLeverageMode = undefined,
-		maxMarginRatio = undefined
+		maxMarginRatio = undefined,
+		positionType: 'isolated' | 'cross' = 'cross'
 	): BN {
 		const perpPosition = this.getPerpPositionOrEmpty(marketIndex);
 
@@ -499,10 +505,33 @@ export class User {
 			  )
 			: ZERO;
 
-		const freeCollateral = this.getFreeCollateral(
-			'Initial',
-			enterHighLeverageMode
-		).sub(collateralBuffer);
+		let freeCollateral: BN = ZERO;
+		// if position is isolated, we always add on available quote from the cross account
+		if (positionType === 'isolated') {
+			const {
+				totalAssetValue: quoteSpotMarketAssetValue,
+				totalLiabilityValue: quoteSpotMarketLiabilityValue,
+			} = this.getSpotMarketAssetAndLiabilityValue(
+				perpMarket.quoteSpotMarketIndex,
+				'Initial',
+				undefined,
+				undefined,
+				true
+			);
+
+			freeCollateral = quoteSpotMarketAssetValue.sub(
+				quoteSpotMarketLiabilityValue
+			);
+		}
+
+		// adding free collateral from the cross account or from within isolated margin calc for this marketIndex
+		freeCollateral = freeCollateral.add(
+			this.getFreeCollateral(
+				'Initial',
+				enterHighLeverageMode,
+				positionType === 'isolated' ? marketIndex : undefined
+			).sub(collateralBuffer)
+		);
 
 		return this.getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(
 			marketIndex,
@@ -544,17 +573,20 @@ export class User {
 		enterHighLeverageMode = false,
 		perpMarketIndex?: number
 	): BN {
-		const { totalCollateral, marginRequirement, getIsolatedFreeCollateral } =
-			this.getMarginCalculation(marginCategory, {
-				enteringHighLeverage: enterHighLeverageMode,
-				strict: marginCategory === 'Initial',
-			});
+		const calc = this.getMarginCalculation(marginCategory, {
+			enteringHighLeverage: enterHighLeverageMode,
+			strict: marginCategory === 'Initial',
+		});
 
 		if (perpMarketIndex !== undefined) {
-			return getIsolatedFreeCollateral(perpMarketIndex);
+			// getIsolatedFreeCollateral will throw if no existing isolated position but we are fetching for potential new position, so we wrap in a try/catch
+			try {
+				return calc.getIsolatedFreeCollateral(perpMarketIndex);
+			} catch (error) {
+				return ZERO;
+			}
 		} else {
-			const freeCollateral = totalCollateral.sub(marginRequirement);
-			return freeCollateral.gte(ZERO) ? freeCollateral : ZERO;
+			return calc.getCrossFreeCollateral();
 		}
 	}
 
@@ -2752,7 +2784,8 @@ export class User {
 		tradeSide: PositionDirection,
 		isLp = false,
 		enterHighLeverageMode = undefined,
-		maxMarginRatio = undefined
+		maxMarginRatio = undefined,
+		positionType: 'isolated' | 'cross' = 'cross'
 	): { tradeSize: BN; oppositeSideTradeSize: BN } {
 		let tradeSize = ZERO;
 		let oppositeSideTradeSize = ZERO;
@@ -2792,7 +2825,8 @@ export class User {
 			targetMarketIndex,
 			lpBuffer,
 			enterHighLeverageMode,
-			maxMarginRatio
+			maxMarginRatio,
+			positionType
 		);
 
 		if (maxPositionSize.gte(ZERO)) {

package/tests/amm/test.ts

@@ -279,7 +279,7 @@ describe('AMM Tests', () => {
 			longIntensity,
 			shortIntensity,
 			volume24H,
-			0
+			0,
 		);
 		const l1 = spreads[0];
 		const s1 = spreads[1];

package/tests/dlob/helpers.ts

@@ -782,4 +782,4 @@ export class MockUserMap implements UserMapInterface {
 			];
 		}
 	}
-}
+}

package/tests/user/test.ts

@@ -49,7 +49,6 @@ async function makeMockUser(
 		oraclePriceMap[myMockSpotMarkets[i].oracle.toString()] =
 			spotOraclePriceList[i];
 	}
-	// console.log(oraclePriceMap);
 
 	function getMockUserAccount(): UserAccount {
 		return myMockUserAccount;
@@ -61,12 +60,6 @@ async function makeMockUser(
 		return myMockSpotMarkets[marketIndex];
 	}
 	function getMockOracle(oracleKey: PublicKey) {
-		// console.log('oracleKey.toString():', oracleKey.toString());
-		// console.log(
-		// 	'oraclePriceMap[oracleKey.toString()]:',
-		// 	oraclePriceMap[oracleKey.toString()]
-		// );
-
 		const QUOTE_ORACLE_PRICE_DATA: OraclePriceData = {
 			price: new BN(
 				oraclePriceMap[oracleKey.toString()] * PRICE_PRECISION.toNumber()