@drift-labs/sdk 2.60.0-beta.7 → 2.60.0-beta.9

package/VERSION

@@ -1 +1 @@
-2.60.0-beta.7
+2.60.0-beta.9

package/lib/constants/spotMarkets.d.ts

@@ -11,6 +11,7 @@ export type SpotMarketConfig = {
     precisionExp: BN;
     serumMarket?: PublicKey;
     phoenixMarket?: PublicKey;
+    launchTs?: number;
 };
 export declare const WRAPPED_SOL_MINT: PublicKey;
 export declare const DevnetSpotMarkets: SpotMarketConfig[];

package/lib/constants/spotMarkets.js

@@ -139,6 +139,7 @@ exports.MainnetSpotMarkets = [
         precision: new __1.BN(10).pow(numericConstants_1.NINE),
         precisionExp: numericConstants_1.NINE,
         serumMarket: new web3_js_1.PublicKey('H87FfmHABiZLRGrDsXRZtqq25YpARzaokCzL1vMYGiep'),
+        phoenixMarket: new web3_js_1.PublicKey('BRLLmdtPGuuFn3BU6orYw4KHaohAEptBToi3dwRUnHQZ'),
     },
     {
         symbol: 'WIF',
@@ -149,6 +150,7 @@ exports.MainnetSpotMarkets = [
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
         serumMarket: new web3_js_1.PublicKey('2BtDHBTCTUxvdur498ZEcMgimasaFrY5GzLv8wS8XgCb'),
+        phoenixMarket: new web3_js_1.PublicKey('6ojSigXF7nDPyhFRgmn3V9ywhYseKF9J32ZrranMGVSX'),
     },
     {
         symbol: 'JUP',
@@ -159,6 +161,7 @@ exports.MainnetSpotMarkets = [
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
         phoenixMarket: new web3_js_1.PublicKey('2pspvjWWaf3dNgt3jsgSzFCNvMGPb7t8FrEYvLGjvcCe'),
+        launchTs: 1706731200000,
     },
 ];
 exports.SpotMarkets = {

package/lib/user.d.ts

@@ -249,6 +249,7 @@ export declare class User {
      * @returns Precision : PRICE_PRECISION
      */
     liquidationPrice(marketIndex: number, positionBaseSizeChange?: BN, estimatedEntryPrice?: BN): BN;
+    calculateEntriesEffectOnFreeCollateral(market: PerpMarketAccount, oraclePrice: BN, perpPosition: PerpPosition, positionBaseSizeChange: BN, estimatedEntryPrice: BN): BN;
     calculateFreeCollateralDeltaForPerp(market: PerpMarketAccount, perpPosition: PerpPosition, positionBaseSizeChange: BN): BN | undefined;
     calculateFreeCollateralDeltaForSpot(market: SpotMarketAccount, signedTokenAmount: BN): BN;
     /**

package/lib/user.js

@@ -1088,24 +1088,12 @@ class User {
         let freeCollateral = _1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(maintenanceMarginRequirement));
         const oracle = this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
         const oraclePrice = this.driftClient.getOracleDataForPerpMarket(marketIndex).price;
-        // update free collateral to accoutn from pnl based on entry price
-        if (!estimatedEntryPrice.eq(numericConstants_1.ZERO) && !positionBaseSizeChange.eq(numericConstants_1.ZERO)) {
-            const costBasis = oraclePrice
-                .mul(positionBaseSizeChange.abs())
-                .div(numericConstants_1.BASE_PRECISION);
-            const newPositionValue = estimatedEntryPrice
-                .mul(positionBaseSizeChange.abs())
-                .div(numericConstants_1.BASE_PRECISION);
-            if (positionBaseSizeChange.gt(numericConstants_1.ZERO)) {
-                freeCollateral = freeCollateral.add(costBasis.sub(newPositionValue));
-            }
-            else {
-                freeCollateral = freeCollateral.add(newPositionValue.sub(costBasis));
-            }
-        }
         const market = this.driftClient.getPerpMarketAccount(marketIndex);
         const currentPerpPosition = this.getPerpPositionWithLPSettle(marketIndex, undefined, true)[0] ||
             this.getEmptyPosition(marketIndex);
+        positionBaseSizeChange = (0, _1.standardizeBaseAssetAmount)(positionBaseSizeChange, market.amm.orderStepSize);
+        const freeCollateralChangeFromNewPosition = this.calculateEntriesEffectOnFreeCollateral(market, oraclePrice, currentPerpPosition, positionBaseSizeChange, estimatedEntryPrice);
+        freeCollateral = freeCollateral.add(freeCollateralChangeFromNewPosition);
         let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange);
         if (!freeCollateralDelta) {
             return new _1.BN(-1);
@@ -1133,6 +1121,47 @@ class User {
         }
         return liqPrice;
     }
+    calculateEntriesEffectOnFreeCollateral(market, oraclePrice, perpPosition, positionBaseSizeChange, estimatedEntryPrice) {
+        let freeCollateralChange = numericConstants_1.ZERO;
+        // update free collateral to account for change in pnl from new position
+        if (!estimatedEntryPrice.eq(numericConstants_1.ZERO) && !positionBaseSizeChange.eq(numericConstants_1.ZERO)) {
+            const costBasis = oraclePrice
+                .mul(positionBaseSizeChange.abs())
+                .div(numericConstants_1.BASE_PRECISION);
+            const newPositionValue = estimatedEntryPrice
+                .mul(positionBaseSizeChange.abs())
+                .div(numericConstants_1.BASE_PRECISION);
+            if (positionBaseSizeChange.gt(numericConstants_1.ZERO)) {
+                freeCollateralChange = costBasis.sub(newPositionValue);
+            }
+            else {
+                freeCollateralChange = newPositionValue.sub(costBasis);
+            }
+            // assume worst fee tier
+            const takerFeeTier = this.driftClient.getStateAccount().perpFeeStructure.feeTiers[0];
+            const takerFee = newPositionValue
+                .muln(takerFeeTier.feeNumerator)
+                .divn(takerFeeTier.feeDenominator);
+            freeCollateralChange = freeCollateralChange.sub(takerFee);
+        }
+        const worstCaseBaseAssetAmount = (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition);
+        const marginRatioBefore = (0, _1.calculateMarketMarginRatio)(market, worstCaseBaseAssetAmount.abs(), 'Maintenance');
+        const newWorstCaseBaseAssetAmount = worstCaseBaseAssetAmount.add(positionBaseSizeChange);
+        const newMarginRatio = (0, _1.calculateMarketMarginRatio)(market, newWorstCaseBaseAssetAmount.abs(), 'Maintenance');
+        // update free collateral to account for change in margin ratio from position change
+        freeCollateralChange = freeCollateralChange.sub(worstCaseBaseAssetAmount
+            .mul(oraclePrice)
+            .div(numericConstants_1.BASE_PRECISION)
+            .mul(new _1.BN(newMarginRatio - marginRatioBefore))
+            .div(numericConstants_1.MARGIN_PRECISION));
+        // update free collateral to account for new margin requirement from position change
+        freeCollateralChange = freeCollateralChange.sub(positionBaseSizeChange
+            .mul(oraclePrice)
+            .div(numericConstants_1.BASE_PRECISION)
+            .mul(new _1.BN(newMarginRatio))
+            .div(numericConstants_1.MARGIN_PRECISION));
+        return freeCollateralChange;
+    }
     calculateFreeCollateralDeltaForPerp(market, perpPosition, positionBaseSizeChange) {
         const currentBaseAssetAmount = perpPosition.baseAssetAmount;
         const worstCaseBaseAssetAmount = (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition);

package/package.json

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

package/src/constants/spotMarkets.ts

@@ -20,6 +20,7 @@ export type SpotMarketConfig = {
 	precisionExp: BN;
 	serumMarket?: PublicKey;
 	phoenixMarket?: PublicKey;
+	launchTs?: number;
 };
 
 export const WRAPPED_SOL_MINT = new PublicKey(
@@ -169,6 +170,9 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		precision: new BN(10).pow(NINE),
 		precisionExp: NINE,
 		serumMarket: new PublicKey('H87FfmHABiZLRGrDsXRZtqq25YpARzaokCzL1vMYGiep'),
+		phoenixMarket: new PublicKey(
+			'BRLLmdtPGuuFn3BU6orYw4KHaohAEptBToi3dwRUnHQZ'
+		),
 	},
 	{
 		symbol: 'WIF',
@@ -179,6 +183,9 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
 		serumMarket: new PublicKey('2BtDHBTCTUxvdur498ZEcMgimasaFrY5GzLv8wS8XgCb'),
+		phoenixMarket: new PublicKey(
+			'6ojSigXF7nDPyhFRgmn3V9ywhYseKF9J32ZrranMGVSX'
+		),
 	},
 	{
 		symbol: 'JUP',
@@ -191,6 +198,7 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		phoenixMarket: new PublicKey(
 			'2pspvjWWaf3dNgt3jsgSzFCNvMGPb7t8FrEYvLGjvcCe'
 		),
+		launchTs: 1706731200000,
 	},
 ];
 

package/src/user.ts

@@ -60,6 +60,7 @@ import {
 	sigNum,
 	SpotBalanceType,
 	SpotMarketAccount,
+	standardizeBaseAssetAmount,
 } from '.';
 import {
 	calculateAssetWeight,
@@ -1989,26 +1990,27 @@ export class User {
 		const oraclePrice =
 			this.driftClient.getOracleDataForPerpMarket(marketIndex).price;
 
-		// update free collateral to accoutn from pnl based on entry price
-		if (!estimatedEntryPrice.eq(ZERO) && !positionBaseSizeChange.eq(ZERO)) {
-			const costBasis = oraclePrice
-				.mul(positionBaseSizeChange.abs())
-				.div(BASE_PRECISION);
-			const newPositionValue = estimatedEntryPrice
-				.mul(positionBaseSizeChange.abs())
-				.div(BASE_PRECISION);
-			if (positionBaseSizeChange.gt(ZERO)) {
-				freeCollateral = freeCollateral.add(costBasis.sub(newPositionValue));
-			} else {
-				freeCollateral = freeCollateral.add(newPositionValue.sub(costBasis));
-			}
-		}
-
 		const market = this.driftClient.getPerpMarketAccount(marketIndex);
 		const currentPerpPosition =
 			this.getPerpPositionWithLPSettle(marketIndex, undefined, true)[0] ||
 			this.getEmptyPosition(marketIndex);
 
+		positionBaseSizeChange = standardizeBaseAssetAmount(
+			positionBaseSizeChange,
+			market.amm.orderStepSize
+		);
+
+		const freeCollateralChangeFromNewPosition =
+			this.calculateEntriesEffectOnFreeCollateral(
+				market,
+				oraclePrice,
+				currentPerpPosition,
+				positionBaseSizeChange,
+				estimatedEntryPrice
+			);
+
+		freeCollateral = freeCollateral.add(freeCollateralChangeFromNewPosition);
+
 		let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(
 			market,
 			currentPerpPosition,
@@ -2064,6 +2066,78 @@ export class User {
 		return liqPrice;
 	}
 
+	calculateEntriesEffectOnFreeCollateral(
+		market: PerpMarketAccount,
+		oraclePrice: BN,
+		perpPosition: PerpPosition,
+		positionBaseSizeChange: BN,
+		estimatedEntryPrice: BN
+	): BN {
+		let freeCollateralChange = ZERO;
+
+		// update free collateral to account for change in pnl from new position
+		if (!estimatedEntryPrice.eq(ZERO) && !positionBaseSizeChange.eq(ZERO)) {
+			const costBasis = oraclePrice
+				.mul(positionBaseSizeChange.abs())
+				.div(BASE_PRECISION);
+			const newPositionValue = estimatedEntryPrice
+				.mul(positionBaseSizeChange.abs())
+				.div(BASE_PRECISION);
+			if (positionBaseSizeChange.gt(ZERO)) {
+				freeCollateralChange = costBasis.sub(newPositionValue);
+			} else {
+				freeCollateralChange = newPositionValue.sub(costBasis);
+			}
+
+			// assume worst fee tier
+			const takerFeeTier =
+				this.driftClient.getStateAccount().perpFeeStructure.feeTiers[0];
+			const takerFee = newPositionValue
+				.muln(takerFeeTier.feeNumerator)
+				.divn(takerFeeTier.feeDenominator);
+			freeCollateralChange = freeCollateralChange.sub(takerFee);
+		}
+
+		const worstCaseBaseAssetAmount =
+			calculateWorstCaseBaseAssetAmount(perpPosition);
+
+		const marginRatioBefore = calculateMarketMarginRatio(
+			market,
+			worstCaseBaseAssetAmount.abs(),
+			'Maintenance'
+		);
+
+		const newWorstCaseBaseAssetAmount = worstCaseBaseAssetAmount.add(
+			positionBaseSizeChange
+		);
+
+		const newMarginRatio = calculateMarketMarginRatio(
+			market,
+			newWorstCaseBaseAssetAmount.abs(),
+			'Maintenance'
+		);
+
+		// update free collateral to account for change in margin ratio from position change
+		freeCollateralChange = freeCollateralChange.sub(
+			worstCaseBaseAssetAmount
+				.mul(oraclePrice)
+				.div(BASE_PRECISION)
+				.mul(new BN(newMarginRatio - marginRatioBefore))
+				.div(MARGIN_PRECISION)
+		);
+
+		// update free collateral to account for new margin requirement from position change
+		freeCollateralChange = freeCollateralChange.sub(
+			positionBaseSizeChange
+				.mul(oraclePrice)
+				.div(BASE_PRECISION)
+				.mul(new BN(newMarginRatio))
+				.div(MARGIN_PRECISION)
+		);
+
+		return freeCollateralChange;
+	}
+
 	calculateFreeCollateralDeltaForPerp(
 		market: PerpMarketAccount,
 		perpPosition: PerpPosition,