@drift-labs/sdk 2.94.0-beta.2 → 2.94.0-beta.4

package/VERSION

@@ -1 +1 @@
-2.94.0-beta.2
+2.94.0-beta.4

package/lib/tx/baseTxSender.d.ts

@@ -47,7 +47,7 @@ export declare abstract class BaseTxSender implements TxSender {
     sendToAdditionalConnections(rawTx: Buffer | Uint8Array, opts: ConfirmOptions): void;
     addAdditionalConnection(newConnection: Connection): void;
     getTimeoutCount(): number;
-    checkConfirmationResultForError(txSig: string, result: RpcResponseAndContext<SignatureResult>): Promise<void>;
+    checkConfirmationResultForError(txSig: string, result: SignatureResult): Promise<void>;
     reportTransactionError(txSig: string): Promise<any>;
     getTxLandRate(): number;
     private defaultLandRateToFeeFunc;

package/lib/tx/baseTxSender.js

@@ -103,7 +103,7 @@ class BaseTxSender {
         }
     }
     async confirmTransactionWebSocket(signature, commitment) {
-        var _a;
+        var _a, _b;
         let decodedSignature;
         try {
             decodedSignature = bs58_1.default.decode(signature);
@@ -150,11 +150,13 @@ class BaseTxSender {
         if (response === null) {
             if (this.confirmationStrategy === types_1.ConfirmationStrategy.Combo) {
                 try {
-                    const rpcResponse = await this.connection.getSignatureStatus(signature);
-                    if ((_a = rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value) === null || _a === void 0 ? void 0 : _a.confirmationStatus) {
+                    const rpcResponse = await this.connection.getSignatureStatuses([
+                        signature,
+                    ]);
+                    if ((_b = (_a = rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.confirmationStatus) {
                         response = {
                             context: rpcResponse.context,
-                            value: { err: rpcResponse.value.err },
+                            value: { err: rpcResponse.value[0].err },
                         };
                         return response;
                     }
@@ -176,10 +178,14 @@ class BaseTxSender {
         const start = Date.now();
         while (totalTime < this.timeout) {
             await new Promise((resolve) => setTimeout(resolve, backoffTime));
-            const response = await this.connection.getSignatureStatus(signature);
-            const result = response && ((_a = response.value) === null || _a === void 0 ? void 0 : _a[0]);
-            if (result && result.confirmationStatus === commitment) {
-                return { context: result.context, value: { err: null } };
+            const rpcResponse = await this.connection.getSignatureStatuses([
+                signature,
+            ]);
+            const signatureResult = rpcResponse && ((_a = rpcResponse.value) === null || _a === void 0 ? void 0 : _a[0]);
+            if (rpcResponse &&
+                signatureResult &&
+                signatureResult.confirmationStatus === commitment) {
+                return { context: rpcResponse.context, value: { err: null } };
             }
             totalTime += backoffTime;
             backoffTime = Math.min(backoffTime * 2, 5000);
@@ -238,7 +244,7 @@ class BaseTxSender {
         return this.timeoutCount;
     }
     async checkConfirmationResultForError(txSig, result) {
-        if (result.value.err) {
+        if (result.err) {
             await this.reportTransactionError(txSig);
         }
         return;

package/lib/tx/fastSingleTxSender.js

@@ -63,14 +63,14 @@ class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
                     this.confirmTransaction(txid, opts.commitment).then(async (result) => {
                         var _a;
                         (_a = this.txSigCache) === null || _a === void 0 ? void 0 : _a.set(txid, true);
-                        await this.checkConfirmationResultForError(txid, result);
+                        await this.checkConfirmationResultForError(txid, result.value);
                         slot = result.context.slot;
                     });
                 }
                 else {
                     const result = await this.confirmTransaction(txid, opts.commitment);
                     (_b = this.txSigCache) === null || _b === void 0 ? void 0 : _b.set(txid, true);
-                    await this.checkConfirmationResultForError(txid, result);
+                    await this.checkConfirmationResultForError(txid, result.value);
                     slot = result.context.slot;
                 }
             }

package/lib/tx/retryTxSender.js

@@ -69,7 +69,7 @@ class RetryTxSender extends baseTxSender_1.BaseTxSender {
         try {
             const result = await this.confirmTransaction(txid, opts.commitment);
             (_b = this.txSigCache) === null || _b === void 0 ? void 0 : _b.set(txid, true);
-            await this.checkConfirmationResultForError(txid, result);
+            await this.checkConfirmationResultForError(txid, result.value);
             slot = result.context.slot;
             // eslint-disable-next-line no-useless-catch
         }

package/lib/tx/whileValidTxSender.d.ts

@@ -20,6 +20,8 @@ export declare class WhileValidTxSender extends BaseTxSender {
         lastValidBlockHeight: number;
     }>;
     blockhashCommitment: Commitment;
+    useBlockHeightOffset: boolean;
+    private checkAndSetUseBlockHeightOffset;
     constructor({ connection, wallet, opts, retrySleep, additionalConnections, additionalTxSenderCallbacks, blockhashCommitment, txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }: {
         connection: Connection;
         wallet: IWallet;

package/lib/tx/whileValidTxSender.js

@@ -10,6 +10,25 @@ const bs58_1 = __importDefault(require("bs58"));
 const DEFAULT_RETRY = 2000;
 const VALID_BLOCK_HEIGHT_OFFSET = -150; // This is a bit of weirdness but the lastValidBlockHeight value returned from connection.getLatestBlockhash is always 300 blocks ahead of the current block, even though the transaction actually expires after 150 blocks. This accounts for that so that we can at least accuractely estimate the transaction expiry.
 class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
+    async checkAndSetUseBlockHeightOffset() {
+        this.connection.getVersion().then((version) => {
+            const solanaCoreVersion = version['solana-core'];
+            if (!solanaCoreVersion)
+                return;
+            const majorVersion = solanaCoreVersion.split('.')[0];
+            if (!majorVersion)
+                return;
+            const parsedMajorVersion = parseInt(majorVersion);
+            if (isNaN(parsedMajorVersion))
+                return;
+            if (parsedMajorVersion >= 2) {
+                this.useBlockHeightOffset = false;
+            }
+            else {
+                this.useBlockHeightOffset = true;
+            }
+        });
+    }
     constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), maxRetries: 0 }, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), additionalTxSenderCallbacks = [], blockhashCommitment = 'finalized', txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
         super({
             connection,
@@ -24,8 +43,10 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
         });
         this.timoutCount = 0;
         this.untilValid = new Map();
+        this.useBlockHeightOffset = true;
         this.retrySleep = retrySleep;
         this.blockhashCommitment = blockhashCommitment;
+        this.checkAndSetUseBlockHeightOffset();
     }
     async sleep(reference) {
         return new Promise((resolve) => {
@@ -120,11 +141,16 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
             const { blockhash, lastValidBlockHeight } = this.untilValid.get(txid);
             const result = await this.connection.confirmTransaction({
                 signature: txid,
-                lastValidBlockHeight: lastValidBlockHeight + VALID_BLOCK_HEIGHT_OFFSET,
                 blockhash,
-            }, opts.commitment);
+                lastValidBlockHeight: this.useBlockHeightOffset
+                    ? lastValidBlockHeight + VALID_BLOCK_HEIGHT_OFFSET
+                    : lastValidBlockHeight,
+            }, opts === null || opts === void 0 ? void 0 : opts.commitment);
+            if (!result) {
+                throw new Error(`Couldn't get signature status for txid: ${txid}`);
+            }
             (_b = this.txSigCache) === null || _b === void 0 ? void 0 : _b.set(txid, true);
-            await this.checkConfirmationResultForError(txid, result);
+            await this.checkConfirmationResultForError(txid, result.value);
             slot = result.context.slot;
             // eslint-disable-next-line no-useless-catch
         }

package/lib/user.d.ts

@@ -4,7 +4,7 @@ import { PublicKey } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { DriftClient } from './driftClient';
-import { HealthComponents, MarginCategory, Order, PerpMarketAccount, PerpPosition, SpotPosition, UserAccount, UserStatus } from './types';
+import { HealthComponent, HealthComponents, MarginCategory, Order, PerpMarketAccount, PerpPosition, SpotPosition, UserAccount, UserStatus } from './types';
 import { DataAndSlot, UserAccountEvents, UserAccountSubscriber } from './accounts/types';
 import { BN, MarketType, PositionDirection, SpotMarketAccount } from '.';
 import { OraclePriceData } from './oracles/types';
@@ -387,6 +387,12 @@ export declare class User {
         perpTier: number;
         spotTier: number;
     };
+    getPerpPositionHealth({ marginCategory, perpPosition, oraclePriceData, quoteOraclePriceData, }: {
+        marginCategory: MarginCategory;
+        perpPosition: PerpPosition;
+        oraclePriceData?: OraclePriceData;
+        quoteOraclePriceData?: OraclePriceData;
+    }): HealthComponent;
     getHealthComponents({ marginCategory, }: {
         marginCategory: MarginCategory;
     }): HealthComponents;

package/lib/user.js

@@ -1988,6 +1988,37 @@ class User {
             spotTier: safestSpotTier,
         };
     }
+    getPerpPositionHealth({ marginCategory, perpPosition, oraclePriceData, quoteOraclePriceData, }) {
+        const settledLpPosition = this.getPerpPositionWithLPSettle(perpPosition.marketIndex, perpPosition)[0];
+        const perpMarket = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
+        const _oraclePriceData = oraclePriceData ||
+            this.driftClient.getOracleDataForPerpMarket(perpMarket.marketIndex);
+        const oraclePrice = _oraclePriceData.price;
+        const { worstCaseBaseAssetAmount: worstCaseBaseAmount, worstCaseLiabilityValue, } = (0, _1.calculateWorstCasePerpLiabilityValue)(settledLpPosition, perpMarket, oraclePrice);
+        const marginRatio = new _1.BN((0, _1.calculateMarketMarginRatio)(perpMarket, worstCaseBaseAmount.abs(), marginCategory, this.getUserAccount().maxMarginRatio));
+        const _quoteOraclePriceData = quoteOraclePriceData ||
+            this.driftClient.getOracleDataForSpotMarket(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
+        let marginRequirement = worstCaseLiabilityValue
+            .mul(_quoteOraclePriceData.price)
+            .div(numericConstants_1.PRICE_PRECISION)
+            .mul(marginRatio)
+            .div(numericConstants_1.MARGIN_PRECISION);
+        marginRequirement = marginRequirement.add(new _1.BN(perpPosition.openOrders).mul(numericConstants_1.OPEN_ORDER_MARGIN_REQUIREMENT));
+        if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
+            marginRequirement = marginRequirement.add(_1.BN.max(numericConstants_1.QUOTE_PRECISION, oraclePrice
+                .mul(perpMarket.amm.orderStepSize)
+                .mul(numericConstants_1.QUOTE_PRECISION)
+                .div(numericConstants_1.AMM_RESERVE_PRECISION)
+                .div(numericConstants_1.PRICE_PRECISION)));
+        }
+        return {
+            marketIndex: perpMarket.marketIndex,
+            size: worstCaseBaseAmount,
+            value: worstCaseLiabilityValue,
+            weight: marginRatio,
+            weightedValue: marginRequirement,
+        };
+    }
     getHealthComponents({ marginCategory, }) {
         const healthComponents = {
             deposits: [],
@@ -1996,34 +2027,16 @@ class User {
             perpPnl: [],
         };
         for (const perpPosition of this.getActivePerpPositions()) {
-            const settledLpPosition = this.getPerpPositionWithLPSettle(perpPosition.marketIndex, perpPosition)[0];
             const perpMarket = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
             const oraclePriceData = this.driftClient.getOracleDataForPerpMarket(perpMarket.marketIndex);
-            const oraclePrice = oraclePriceData.price;
-            const { worstCaseBaseAssetAmount: worstCaseBaseAmount, worstCaseLiabilityValue, } = (0, _1.calculateWorstCasePerpLiabilityValue)(settledLpPosition, perpMarket, oraclePrice);
-            const marginRatio = new _1.BN((0, _1.calculateMarketMarginRatio)(perpMarket, worstCaseBaseAmount.abs(), marginCategory, this.getUserAccount().maxMarginRatio));
-            const quoteSpotMarket = this.driftClient.getSpotMarketAccount(perpMarket.quoteSpotMarketIndex);
             const quoteOraclePriceData = this.driftClient.getOracleDataForSpotMarket(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
-            let marginRequirement = worstCaseLiabilityValue
-                .mul(quoteOraclePriceData.price)
-                .div(numericConstants_1.PRICE_PRECISION)
-                .mul(marginRatio)
-                .div(numericConstants_1.MARGIN_PRECISION);
-            marginRequirement = marginRequirement.add(new _1.BN(perpPosition.openOrders).mul(numericConstants_1.OPEN_ORDER_MARGIN_REQUIREMENT));
-            if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
-                marginRequirement = marginRequirement.add(_1.BN.max(numericConstants_1.QUOTE_PRECISION, oraclePrice
-                    .mul(perpMarket.amm.orderStepSize)
-                    .mul(numericConstants_1.QUOTE_PRECISION)
-                    .div(numericConstants_1.AMM_RESERVE_PRECISION)
-                    .div(numericConstants_1.PRICE_PRECISION)));
-            }
-            healthComponents.perpPositions.push({
-                marketIndex: perpMarket.marketIndex,
-                size: worstCaseBaseAmount,
-                value: worstCaseLiabilityValue,
-                weight: marginRatio,
-                weightedValue: marginRequirement,
-            });
+            healthComponents.perpPositions.push(this.getPerpPositionHealth({
+                marginCategory,
+                perpPosition,
+                oraclePriceData,
+                quoteOraclePriceData,
+            }));
+            const quoteSpotMarket = this.driftClient.getSpotMarketAccount(perpMarket.quoteSpotMarketIndex);
             const settledPerpPosition = this.getPerpPositionWithLPSettle(perpPosition.marketIndex, perpPosition)[0];
             const positionUnrealizedPnl = (0, _1.calculatePositionPNL)(perpMarket, settledPerpPosition, true, oraclePriceData);
             let pnlWeight;

package/package.json

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

package/src/tx/baseTxSender.ts

@@ -267,13 +267,14 @@ export abstract class BaseTxSender implements TxSender {
 		if (response === null) {
 			if (this.confirmationStrategy === ConfirmationStrategy.Combo) {
 				try {
-					const rpcResponse = await this.connection.getSignatureStatus(
-						signature
-					);
-					if (rpcResponse?.value?.confirmationStatus) {
+					const rpcResponse = await this.connection.getSignatureStatuses([
+						signature,
+					]);
+
+					if (rpcResponse?.value?.[0]?.confirmationStatus) {
 						response = {
 							context: rpcResponse.context,
-							value: { err: rpcResponse.value.err },
+							value: { err: rpcResponse.value[0].err },
 						};
 						return response;
 					}
@@ -305,11 +306,18 @@ export abstract class BaseTxSender implements TxSender {
 		while (totalTime < this.timeout) {
 			await new Promise((resolve) => setTimeout(resolve, backoffTime));
 
-			const response = await this.connection.getSignatureStatus(signature);
-			const result = response && response.value?.[0];
+			const rpcResponse = await this.connection.getSignatureStatuses([
+				signature,
+			]);
+
+			const signatureResult = rpcResponse && rpcResponse.value?.[0];
 
-			if (result && result.confirmationStatus === commitment) {
-				return { context: result.context, value: { err: null } };
+			if (
+				rpcResponse &&
+				signatureResult &&
+				signatureResult.confirmationStatus === commitment
+			) {
+				return { context: rpcResponse.context, value: { err: null } };
 			}
 
 			totalTime += backoffTime;
@@ -398,9 +406,9 @@ export abstract class BaseTxSender implements TxSender {
 
 	public async checkConfirmationResultForError(
 		txSig: string,
-		result: RpcResponseAndContext<SignatureResult>
+		result: SignatureResult
 	) {
-		if (result.value.err) {
+		if (result.err) {
 			await this.reportTransactionError(txSig);
 		}
 

package/src/tx/fastSingleTxSender.ts

@@ -118,14 +118,14 @@ export class FastSingleTxSender extends BaseTxSender {
 					this.confirmTransaction(txid, opts.commitment).then(
 						async (result) => {
 							this.txSigCache?.set(txid, true);
-							await this.checkConfirmationResultForError(txid, result);
+							await this.checkConfirmationResultForError(txid, result.value);
 							slot = result.context.slot;
 						}
 					);
 				} else {
 					const result = await this.confirmTransaction(txid, opts.commitment);
 					this.txSigCache?.set(txid, true);
-					await this.checkConfirmationResultForError(txid, result);
+					await this.checkConfirmationResultForError(txid, result.value);
 					slot = result.context.slot;
 				}
 			} catch (e) {

package/src/tx/retryTxSender.ts

@@ -117,7 +117,7 @@ export class RetryTxSender extends BaseTxSender {
 			const result = await this.confirmTransaction(txid, opts.commitment);
 			this.txSigCache?.set(txid, true);
 
-			await this.checkConfirmationResultForError(txid, result);
+			await this.checkConfirmationResultForError(txid, result.value);
 
 			slot = result.context.slot;
 			// eslint-disable-next-line no-useless-catch

package/src/tx/whileValidTxSender.ts

@@ -35,6 +35,30 @@ export class WhileValidTxSender extends BaseTxSender {
 	>();
 	blockhashCommitment: Commitment;
 
+	useBlockHeightOffset = true;
+
+	private async checkAndSetUseBlockHeightOffset() {
+		this.connection.getVersion().then((version) => {
+			const solanaCoreVersion = version['solana-core'];
+
+			if (!solanaCoreVersion) return;
+
+			const majorVersion = solanaCoreVersion.split('.')[0];
+
+			if (!majorVersion) return;
+
+			const parsedMajorVersion = parseInt(majorVersion);
+
+			if (isNaN(parsedMajorVersion)) return;
+
+			if (parsedMajorVersion >= 2) {
+				this.useBlockHeightOffset = false;
+			} else {
+				this.useBlockHeightOffset = true;
+			}
+		});
+	}
+
 	public constructor({
 		connection,
 		wallet,
@@ -73,6 +97,8 @@ export class WhileValidTxSender extends BaseTxSender {
 		});
 		this.retrySleep = retrySleep;
 		this.blockhashCommitment = blockhashCommitment;
+
+		this.checkAndSetUseBlockHeightOffset();
 	}
 
 	async sleep(reference: ResolveReference): Promise<void> {
@@ -209,17 +235,25 @@ export class WhileValidTxSender extends BaseTxSender {
 		let slot: number;
 		try {
 			const { blockhash, lastValidBlockHeight } = this.untilValid.get(txid);
+
 			const result = await this.connection.confirmTransaction(
 				{
 					signature: txid,
-					lastValidBlockHeight:
-						lastValidBlockHeight + VALID_BLOCK_HEIGHT_OFFSET,
 					blockhash,
+					lastValidBlockHeight: this.useBlockHeightOffset
+						? lastValidBlockHeight + VALID_BLOCK_HEIGHT_OFFSET
+						: lastValidBlockHeight,
 				},
-				opts.commitment
+				opts?.commitment
 			);
+
+			if (!result) {
+				throw new Error(`Couldn't get signature status for txid: ${txid}`);
+			}
+
 			this.txSigCache?.set(txid, true);
-			await this.checkConfirmationResultForError(txid, result);
+
+			await this.checkConfirmationResultForError(txid, result.value);
 
 			slot = result.context.slot;
 			// eslint-disable-next-line no-useless-catch

package/src/user.ts

@@ -3,6 +3,7 @@ import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { DriftClient } from './driftClient';
 import {
+	HealthComponent,
 	HealthComponents,
 	isVariant,
 	MarginCategory,
@@ -3701,6 +3702,82 @@ export class User {
 		};
 	}
 
+	public getPerpPositionHealth({
+		marginCategory,
+		perpPosition,
+		oraclePriceData,
+		quoteOraclePriceData,
+	}: {
+		marginCategory: MarginCategory;
+		perpPosition: PerpPosition;
+		oraclePriceData?: OraclePriceData;
+		quoteOraclePriceData?: OraclePriceData;
+	}): HealthComponent {
+		const settledLpPosition = this.getPerpPositionWithLPSettle(
+			perpPosition.marketIndex,
+			perpPosition
+		)[0];
+		const perpMarket = this.driftClient.getPerpMarketAccount(
+			perpPosition.marketIndex
+		);
+		const _oraclePriceData =
+			oraclePriceData ||
+			this.driftClient.getOracleDataForPerpMarket(perpMarket.marketIndex);
+		const oraclePrice = _oraclePriceData.price;
+		const {
+			worstCaseBaseAssetAmount: worstCaseBaseAmount,
+			worstCaseLiabilityValue,
+		} = calculateWorstCasePerpLiabilityValue(
+			settledLpPosition,
+			perpMarket,
+			oraclePrice
+		);
+
+		const marginRatio = new BN(
+			calculateMarketMarginRatio(
+				perpMarket,
+				worstCaseBaseAmount.abs(),
+				marginCategory,
+				this.getUserAccount().maxMarginRatio
+			)
+		);
+
+		const _quoteOraclePriceData =
+			quoteOraclePriceData ||
+			this.driftClient.getOracleDataForSpotMarket(QUOTE_SPOT_MARKET_INDEX);
+
+		let marginRequirement = worstCaseLiabilityValue
+			.mul(_quoteOraclePriceData.price)
+			.div(PRICE_PRECISION)
+			.mul(marginRatio)
+			.div(MARGIN_PRECISION);
+
+		marginRequirement = marginRequirement.add(
+			new BN(perpPosition.openOrders).mul(OPEN_ORDER_MARGIN_REQUIREMENT)
+		);
+
+		if (perpPosition.lpShares.gt(ZERO)) {
+			marginRequirement = marginRequirement.add(
+				BN.max(
+					QUOTE_PRECISION,
+					oraclePrice
+						.mul(perpMarket.amm.orderStepSize)
+						.mul(QUOTE_PRECISION)
+						.div(AMM_RESERVE_PRECISION)
+						.div(PRICE_PRECISION)
+				)
+			);
+		}
+
+		return {
+			marketIndex: perpMarket.marketIndex,
+			size: worstCaseBaseAmount,
+			value: worstCaseLiabilityValue,
+			weight: marginRatio,
+			weightedValue: marginRequirement,
+		};
+	}
+
 	public getHealthComponents({
 		marginCategory,
 	}: {
@@ -3714,72 +3791,30 @@ export class User {
 		};
 
 		for (const perpPosition of this.getActivePerpPositions()) {
-			const settledLpPosition = this.getPerpPositionWithLPSettle(
-				perpPosition.marketIndex,
-				perpPosition
-			)[0];
 			const perpMarket = this.driftClient.getPerpMarketAccount(
 				perpPosition.marketIndex
 			);
+
 			const oraclePriceData = this.driftClient.getOracleDataForPerpMarket(
 				perpMarket.marketIndex
 			);
-			const oraclePrice = oraclePriceData.price;
-			const {
-				worstCaseBaseAssetAmount: worstCaseBaseAmount,
-				worstCaseLiabilityValue,
-			} = calculateWorstCasePerpLiabilityValue(
-				settledLpPosition,
-				perpMarket,
-				oraclePrice
+
+			const quoteOraclePriceData = this.driftClient.getOracleDataForSpotMarket(
+				QUOTE_SPOT_MARKET_INDEX
 			);
 
-			const marginRatio = new BN(
-				calculateMarketMarginRatio(
-					perpMarket,
-					worstCaseBaseAmount.abs(),
+			healthComponents.perpPositions.push(
+				this.getPerpPositionHealth({
 					marginCategory,
-					this.getUserAccount().maxMarginRatio
-				)
+					perpPosition,
+					oraclePriceData,
+					quoteOraclePriceData,
+				})
 			);
 
 			const quoteSpotMarket = this.driftClient.getSpotMarketAccount(
 				perpMarket.quoteSpotMarketIndex
 			);
-			const quoteOraclePriceData = this.driftClient.getOracleDataForSpotMarket(
-				QUOTE_SPOT_MARKET_INDEX
-			);
-
-			let marginRequirement = worstCaseLiabilityValue
-				.mul(quoteOraclePriceData.price)
-				.div(PRICE_PRECISION)
-				.mul(marginRatio)
-				.div(MARGIN_PRECISION);
-
-			marginRequirement = marginRequirement.add(
-				new BN(perpPosition.openOrders).mul(OPEN_ORDER_MARGIN_REQUIREMENT)
-			);
-
-			if (perpPosition.lpShares.gt(ZERO)) {
-				marginRequirement = marginRequirement.add(
-					BN.max(
-						QUOTE_PRECISION,
-						oraclePrice
-							.mul(perpMarket.amm.orderStepSize)
-							.mul(QUOTE_PRECISION)
-							.div(AMM_RESERVE_PRECISION)
-							.div(PRICE_PRECISION)
-					)
-				);
-			}
-
-			healthComponents.perpPositions.push({
-				marketIndex: perpMarket.marketIndex,
-				size: worstCaseBaseAmount,
-				value: worstCaseLiabilityValue,
-				weight: marginRatio,
-				weightedValue: marginRequirement,
-			});
 
 			const settledPerpPosition = this.getPerpPositionWithLPSettle(
 				perpPosition.marketIndex,

package/tests/ci/idl.ts

@@ -1,7 +1,4 @@
-import {
-	DriftClient,
-	BulkAccountLoader,
-} from '../../src';
+import { DriftClient, BulkAccountLoader } from '../../src';
 import { Connection, Keypair } from '@solana/web3.js';
 import { Wallet, Program } from '@coral-xyz/anchor';
 import dotenv from 'dotenv';
@@ -40,14 +37,19 @@ describe('Verify IDL', function () {
 	});
 
 	it('verify idl', async () => {
-		const idl = await Program.fetchIdl(mainnetDriftClient.program.programId, mainnetDriftClient.provider);
+		const idl = await Program.fetchIdl(
+			mainnetDriftClient.program.programId,
+			mainnetDriftClient.provider
+		);
 
 		// anchor idl init seems to strip the metadata
-		idl["metadata"] = {"address":"dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"};
+		idl['metadata'] = {
+			address: 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH',
+		};
 		const encodedMainnetIdl = JSON.stringify(idl);
 
 		const encodedSdkIdl = JSON.stringify(driftIDL);
 
 		assert(encodedSdkIdl === encodedMainnetIdl);
 	});
-});
+});

package/tests/ci/verifyConstants.ts

@@ -61,13 +61,14 @@ describe('Verify Constants', function () {
 		},
 	});
 
-	let lutAccounts : string[];
+	let lutAccounts: string[];
 
 	before(async () => {
 		await devnetDriftClient.subscribe();
 		await mainnetDriftClient.subscribe();
 
-		const lookupTable = await mainnetDriftClient.fetchMarketLookupTableAccount();
+		const lookupTable =
+			await mainnetDriftClient.fetchMarketLookupTableAccount();
 		lutAccounts = lookupTable.state.addresses.map((x) => x.toBase58());
 	});
 
@@ -113,10 +114,20 @@ describe('Verify Constants', function () {
 			);
 
 			const lutHasMarket = lutAccounts.includes(market.pubkey.toBase58());
-			assert(lutHasMarket, `Mainnet LUT is missing spot market ${market.marketIndex} pubkey ${market.pubkey.toBase58()}`);
+			assert(
+				lutHasMarket,
+				`Mainnet LUT is missing spot market ${
+					market.marketIndex
+				} pubkey ${market.pubkey.toBase58()}`
+			);
 
 			const lutHasMarketOracle = lutAccounts.includes(market.oracle.toBase58());
-			assert(lutHasMarketOracle, `Mainnet LUT is missing spot market ${market.marketIndex} oracle ${market.oracle.toBase58()}`);
+			assert(
+				lutHasMarketOracle,
+				`Mainnet LUT is missing spot market ${
+					market.marketIndex
+				} oracle ${market.oracle.toBase58()}`
+			);
 		}
 
 		const perpMarkets = mainnetDriftClient.getPerpMarketAccounts();
@@ -150,10 +161,22 @@ describe('Verify Constants', function () {
 			);
 
 			const lutHasMarket = lutAccounts.includes(market.pubkey.toBase58());
-			assert(lutHasMarket, `Mainnet LUT is missing perp market ${market.marketIndex} pubkey ${market.pubkey.toBase58()}`);
+			assert(
+				lutHasMarket,
+				`Mainnet LUT is missing perp market ${
+					market.marketIndex
+				} pubkey ${market.pubkey.toBase58()}`
+			);
 
-			const lutHasMarketOracle = lutAccounts.includes(market.amm.oracle.toBase58());
-			assert(lutHasMarketOracle, `Mainnet LUT is missing perp market ${market.marketIndex} oracle ${market.amm.oracle.toBase58()}`);
+			const lutHasMarketOracle = lutAccounts.includes(
+				market.amm.oracle.toBase58()
+			);
+			assert(
+				lutHasMarketOracle,
+				`Mainnet LUT is missing perp market ${
+					market.marketIndex
+				} oracle ${market.amm.oracle.toBase58()}`
+			);
 		}
 	});