@drift-labs/sdk 2.74.0-beta.5 → 2.74.0-beta.7

package/VERSION

@@ -1 +1 @@
-2.74.0-beta.5
+2.74.0-beta.7

package/lib/driftClient.d.ts

@@ -134,6 +134,11 @@ export declare class DriftClient {
         subAccountId: number;
     }[]): Promise<TransactionSignature>;
     getUpdateAdvancedDlpIx(advancedLp: boolean, subAccountId: number): Promise<anchor.web3.TransactionInstruction>;
+    updateUserReduceOnly(updates: {
+        reduceOnly: boolean;
+        subAccountId: number;
+    }[]): Promise<TransactionSignature>;
+    getUpdateUserReduceOnlyIx(reduceOnly: boolean, subAccountId: number): Promise<anchor.web3.TransactionInstruction>;
     fetchAllUserAccounts(includeIdle?: boolean): Promise<ProgramAccount<UserAccount>[]>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
     getUserAccountsAndAddressesForAuthority(authority: PublicKey): Promise<ProgramAccount<UserAccount>[]>;

package/lib/driftClient.js

@@ -627,6 +627,23 @@ class DriftClient {
         });
         return ix;
     }
+    async updateUserReduceOnly(updates) {
+        const ixs = await Promise.all(updates.map(async ({ reduceOnly, subAccountId }) => {
+            return await this.getUpdateUserReduceOnlyIx(reduceOnly, subAccountId);
+        }));
+        const tx = await this.buildTransaction(ixs, this.txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdateUserReduceOnlyIx(reduceOnly, subAccountId) {
+        const ix = await this.program.instruction.updateUserReduceOnly(subAccountId, reduceOnly, {
+            accounts: {
+                user: (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId),
+                authority: this.wallet.publicKey,
+            },
+        });
+        return ix;
+    }
     async fetchAllUserAccounts(includeIdle = true) {
         let filters = undefined;
         if (!includeIdle) {

package/lib/user.d.ts

@@ -246,13 +246,15 @@ export declare class User {
     /**
      * Calculate the liquidation price of a perp position, with optional parameter to calculate the liquidation price after a trade
      * @param marketIndex
-     * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
+     * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^9
+     * @param estimatedEntryPrice
      * @param marginCategory // allow Initial to be passed in if we are trying to calculate price for DLP de-risking
+     * @param includeOpenOrders
      * @returns Precision : PRICE_PRECISION
      */
-    liquidationPrice(marketIndex: number, positionBaseSizeChange?: BN, estimatedEntryPrice?: BN, marginCategory?: MarginCategory): BN;
-    calculateEntriesEffectOnFreeCollateral(market: PerpMarketAccount, oraclePrice: BN, perpPosition: PerpPosition, positionBaseSizeChange: BN, estimatedEntryPrice: BN): BN;
-    calculateFreeCollateralDeltaForPerp(market: PerpMarketAccount, perpPosition: PerpPosition, positionBaseSizeChange: BN, marginCategory?: MarginCategory): BN | undefined;
+    liquidationPrice(marketIndex: number, positionBaseSizeChange?: BN, estimatedEntryPrice?: BN, marginCategory?: MarginCategory, includeOpenOrders?: boolean): BN;
+    calculateEntriesEffectOnFreeCollateral(market: PerpMarketAccount, oraclePrice: BN, perpPosition: PerpPosition, positionBaseSizeChange: BN, estimatedEntryPrice: BN, includeOpenOrders: boolean): BN;
+    calculateFreeCollateralDeltaForPerp(market: PerpMarketAccount, perpPosition: PerpPosition, positionBaseSizeChange: BN, marginCategory?: MarginCategory, includeOpenOrders?: boolean): BN | undefined;
     calculateFreeCollateralDeltaForSpot(market: SpotMarketAccount, signedTokenAmount: BN, marginCategory?: MarginCategory): BN;
     /**
      * Calculates the estimated liquidation price for a position after closing a quote amount of the position.

package/lib/user.js

@@ -1082,13 +1082,15 @@ class User {
     /**
      * Calculate the liquidation price of a perp position, with optional parameter to calculate the liquidation price after a trade
      * @param marketIndex
-     * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
+     * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^9
+     * @param estimatedEntryPrice
      * @param marginCategory // allow Initial to be passed in if we are trying to calculate price for DLP de-risking
+     * @param includeOpenOrders
      * @returns Precision : PRICE_PRECISION
      */
-    liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO, estimatedEntryPrice = numericConstants_1.ZERO, marginCategory = 'Maintenance') {
+    liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO, estimatedEntryPrice = numericConstants_1.ZERO, marginCategory = 'Maintenance', includeOpenOrders = false) {
         const totalCollateral = this.getTotalCollateral(marginCategory);
-        const marginRequirement = this.getMarginRequirement(marginCategory, undefined, false);
+        const marginRequirement = this.getMarginRequirement(marginCategory, undefined, false, includeOpenOrders);
         let freeCollateral = _1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(marginRequirement));
         const oracle = this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
         const oraclePrice = this.driftClient.getOracleDataForPerpMarket(marketIndex).price;
@@ -1096,9 +1098,9 @@ class User {
         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);
+        const freeCollateralChangeFromNewPosition = this.calculateEntriesEffectOnFreeCollateral(market, oraclePrice, currentPerpPosition, positionBaseSizeChange, estimatedEntryPrice, includeOpenOrders);
         freeCollateral = freeCollateral.add(freeCollateralChangeFromNewPosition);
-        let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange, marginCategory);
+        let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange, marginCategory, includeOpenOrders);
         if (!freeCollateralDelta) {
             return new _1.BN(-1);
         }
@@ -1125,7 +1127,7 @@ class User {
         }
         return liqPrice;
     }
-    calculateEntriesEffectOnFreeCollateral(market, oraclePrice, perpPosition, positionBaseSizeChange, estimatedEntryPrice) {
+    calculateEntriesEffectOnFreeCollateral(market, oraclePrice, perpPosition, positionBaseSizeChange, estimatedEntryPrice, includeOpenOrders) {
         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)) {
@@ -1139,8 +1141,6 @@ class User {
                 freeCollateralChange = costBasis.sub(newPositionValue);
             }
             else {
-                console.log('newPositionValue', newPositionValue.toString());
-                console.log('costBasis', costBasis.toString());
                 freeCollateralChange = newPositionValue.sub(costBasis);
             }
             // assume worst fee tier
@@ -1150,30 +1150,33 @@ class User {
                 .divn(takerFeeTier.feeDenominator);
             freeCollateralChange = freeCollateralChange.sub(takerFee);
         }
-        const worstCaseBaseAssetAmount = (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition);
-        const newWorstCaseBaseAssetAmount = worstCaseBaseAssetAmount.add(positionBaseSizeChange);
-        const newMarginRatio = (0, _1.calculateMarketMarginRatio)(market, newWorstCaseBaseAssetAmount.abs(), 'Maintenance');
+        const baseAssetAmount = includeOpenOrders
+            ? (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition)
+            : perpPosition.baseAssetAmount;
+        const newBaseAssetAmount = baseAssetAmount.add(positionBaseSizeChange);
+        const newMarginRatio = (0, _1.calculateMarketMarginRatio)(market, newBaseAssetAmount.abs(), 'Maintenance');
         // update free collateral to account for new margin requirement from position change
-        freeCollateralChange = freeCollateralChange.sub(newWorstCaseBaseAssetAmount
+        freeCollateralChange = freeCollateralChange.sub(newBaseAssetAmount
             .abs()
-            .sub(worstCaseBaseAssetAmount.abs())
+            .sub(baseAssetAmount.abs())
             .mul(oraclePrice)
             .div(numericConstants_1.BASE_PRECISION)
             .mul(new _1.BN(newMarginRatio))
             .div(numericConstants_1.MARGIN_PRECISION));
         return freeCollateralChange;
     }
-    calculateFreeCollateralDeltaForPerp(market, perpPosition, positionBaseSizeChange, marginCategory = 'Maintenance') {
-        const currentBaseAssetAmount = perpPosition.baseAssetAmount;
-        const worstCaseBaseAssetAmount = (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition);
-        const orderBaseAssetAmount = worstCaseBaseAssetAmount.sub(currentBaseAssetAmount);
-        const proposedBaseAssetAmount = currentBaseAssetAmount.add(positionBaseSizeChange);
-        const proposedWorstCaseBaseAssetAmount = worstCaseBaseAssetAmount.add(positionBaseSizeChange);
-        const marginRatio = (0, _1.calculateMarketMarginRatio)(market, proposedWorstCaseBaseAssetAmount.abs(), marginCategory, this.getUserAccount().maxMarginRatio);
+    calculateFreeCollateralDeltaForPerp(market, perpPosition, positionBaseSizeChange, marginCategory = 'Maintenance', includeOpenOrders = false) {
+        const baseAssetAmount = includeOpenOrders
+            ? (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition)
+            : perpPosition.baseAssetAmount;
+        // zero if include orders == false
+        const orderBaseAssetAmount = baseAssetAmount.sub(perpPosition.baseAssetAmount);
+        const proposedBaseAssetAmount = baseAssetAmount.add(positionBaseSizeChange);
+        const marginRatio = (0, _1.calculateMarketMarginRatio)(market, proposedBaseAssetAmount.abs(), marginCategory, this.getUserAccount().maxMarginRatio);
         const marginRatioQuotePrecision = new _1.BN(marginRatio)
             .mul(numericConstants_1.QUOTE_PRECISION)
             .div(numericConstants_1.MARGIN_PRECISION);
-        if (proposedWorstCaseBaseAssetAmount.eq(numericConstants_1.ZERO)) {
+        if (proposedBaseAssetAmount.eq(numericConstants_1.ZERO)) {
             return undefined;
         }
         let freeCollateralDelta = numericConstants_1.ZERO;

package/package.json

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

package/src/driftClient.ts

@@ -1074,6 +1074,43 @@ export class DriftClient {
 		return ix;
 	}
 
+	public async updateUserReduceOnly(
+		updates: { reduceOnly: boolean; subAccountId: number }[]
+	): Promise<TransactionSignature> {
+		const ixs = await Promise.all(
+			updates.map(async ({ reduceOnly, subAccountId }) => {
+				return await this.getUpdateUserReduceOnlyIx(reduceOnly, subAccountId);
+			})
+		);
+
+		const tx = await this.buildTransaction(ixs, this.txParams);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
+	}
+
+	public async getUpdateUserReduceOnlyIx(
+		reduceOnly: boolean,
+		subAccountId: number
+	) {
+		const ix = await this.program.instruction.updateUserReduceOnly(
+			subAccountId,
+			reduceOnly,
+			{
+				accounts: {
+					user: getUserAccountPublicKeySync(
+						this.program.programId,
+						this.wallet.publicKey,
+						subAccountId
+					),
+					authority: this.wallet.publicKey,
+				},
+			}
+		);
+
+		return ix;
+	}
+
 	public async fetchAllUserAccounts(
 		includeIdle = true
 	): Promise<ProgramAccount<UserAccount>[]> {

package/src/user.ts

@@ -1975,21 +1975,25 @@ export class User {
 	/**
 	 * Calculate the liquidation price of a perp position, with optional parameter to calculate the liquidation price after a trade
 	 * @param marketIndex
-	 * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
+	 * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^9
+	 * @param estimatedEntryPrice
 	 * @param marginCategory // allow Initial to be passed in if we are trying to calculate price for DLP de-risking
+	 * @param includeOpenOrders
 	 * @returns Precision : PRICE_PRECISION
 	 */
 	public liquidationPrice(
 		marketIndex: number,
 		positionBaseSizeChange: BN = ZERO,
 		estimatedEntryPrice: BN = ZERO,
-		marginCategory: MarginCategory = 'Maintenance'
+		marginCategory: MarginCategory = 'Maintenance',
+		includeOpenOrders = false
 	): BN {
 		const totalCollateral = this.getTotalCollateral(marginCategory);
 		const marginRequirement = this.getMarginRequirement(
 			marginCategory,
 			undefined,
-			false
+			false,
+			includeOpenOrders
 		);
 		let freeCollateral = BN.max(ZERO, totalCollateral.sub(marginRequirement));
 
@@ -2015,7 +2019,8 @@ export class User {
 				oraclePrice,
 				currentPerpPosition,
 				positionBaseSizeChange,
-				estimatedEntryPrice
+				estimatedEntryPrice,
+				includeOpenOrders
 			);
 
 		freeCollateral = freeCollateral.add(freeCollateralChangeFromNewPosition);
@@ -2024,7 +2029,8 @@ export class User {
 			market,
 			currentPerpPosition,
 			positionBaseSizeChange,
-			marginCategory
+			marginCategory,
+			includeOpenOrders
 		);
 
 		if (!freeCollateralDelta) {
@@ -2082,7 +2088,8 @@ export class User {
 		oraclePrice: BN,
 		perpPosition: PerpPosition,
 		positionBaseSizeChange: BN,
-		estimatedEntryPrice: BN
+		estimatedEntryPrice: BN,
+		includeOpenOrders: boolean
 	): BN {
 		let freeCollateralChange = ZERO;
 
@@ -2097,8 +2104,6 @@ export class User {
 			if (positionBaseSizeChange.gt(ZERO)) {
 				freeCollateralChange = costBasis.sub(newPositionValue);
 			} else {
-				console.log('newPositionValue', newPositionValue.toString());
-				console.log('costBasis', costBasis.toString());
 				freeCollateralChange = newPositionValue.sub(costBasis);
 			}
 
@@ -2111,24 +2116,23 @@ export class User {
 			freeCollateralChange = freeCollateralChange.sub(takerFee);
 		}
 
-		const worstCaseBaseAssetAmount =
-			calculateWorstCaseBaseAssetAmount(perpPosition);
+		const baseAssetAmount = includeOpenOrders
+			? calculateWorstCaseBaseAssetAmount(perpPosition)
+			: perpPosition.baseAssetAmount;
 
-		const newWorstCaseBaseAssetAmount = worstCaseBaseAssetAmount.add(
-			positionBaseSizeChange
-		);
+		const newBaseAssetAmount = baseAssetAmount.add(positionBaseSizeChange);
 
 		const newMarginRatio = calculateMarketMarginRatio(
 			market,
-			newWorstCaseBaseAssetAmount.abs(),
+			newBaseAssetAmount.abs(),
 			'Maintenance'
 		);
 
 		// update free collateral to account for new margin requirement from position change
 		freeCollateralChange = freeCollateralChange.sub(
-			newWorstCaseBaseAssetAmount
+			newBaseAssetAmount
 				.abs()
-				.sub(worstCaseBaseAssetAmount.abs())
+				.sub(baseAssetAmount.abs())
 				.mul(oraclePrice)
 				.div(BASE_PRECISION)
 				.mul(new BN(newMarginRatio))
@@ -2142,25 +2146,23 @@ export class User {
 		market: PerpMarketAccount,
 		perpPosition: PerpPosition,
 		positionBaseSizeChange: BN,
-		marginCategory: MarginCategory = 'Maintenance'
+		marginCategory: MarginCategory = 'Maintenance',
+		includeOpenOrders = false
 	): BN | undefined {
-		const currentBaseAssetAmount = perpPosition.baseAssetAmount;
+		const baseAssetAmount = includeOpenOrders
+			? calculateWorstCaseBaseAssetAmount(perpPosition)
+			: perpPosition.baseAssetAmount;
 
-		const worstCaseBaseAssetAmount =
-			calculateWorstCaseBaseAssetAmount(perpPosition);
-		const orderBaseAssetAmount = worstCaseBaseAssetAmount.sub(
-			currentBaseAssetAmount
-		);
-		const proposedBaseAssetAmount = currentBaseAssetAmount.add(
-			positionBaseSizeChange
-		);
-		const proposedWorstCaseBaseAssetAmount = worstCaseBaseAssetAmount.add(
-			positionBaseSizeChange
+		// zero if include orders == false
+		const orderBaseAssetAmount = baseAssetAmount.sub(
+			perpPosition.baseAssetAmount
 		);
 
+		const proposedBaseAssetAmount = baseAssetAmount.add(positionBaseSizeChange);
+
 		const marginRatio = calculateMarketMarginRatio(
 			market,
-			proposedWorstCaseBaseAssetAmount.abs(),
+			proposedBaseAssetAmount.abs(),
 			marginCategory,
 			this.getUserAccount().maxMarginRatio
 		);
@@ -2168,7 +2170,7 @@ export class User {
 			.mul(QUOTE_PRECISION)
 			.div(MARGIN_PRECISION);
 
-		if (proposedWorstCaseBaseAssetAmount.eq(ZERO)) {
+		if (proposedBaseAssetAmount.eq(ZERO)) {
 			return undefined;
 		}