fix: broken tests and PR cleanup

Author: LukasDeco

sdk/src/driftClient.ts

@@ -4279,19 +4279,21 @@ export class DriftClient {
 		perpMarketIndex: number,
 		subAccountId?: number,
 		txParams?: TxParams,
-		trySettle?: boolean
+		trySettle?: boolean,
+		noBuffer?: boolean
 	): Promise<TransactionSignature> {
 		const ixs = [];
 		const tokenAmountDeposited =
 			this.getIsolatedPerpPositionTokenAmount(perpMarketIndex);
 		const transferIx = await this.getTransferIsolatedPerpPositionDepositIx(
 			amount,
 			perpMarketIndex,
-			subAccountId
+			subAccountId,
+			noBuffer
 		);
 
 		const needsToSettle =
-			amount.gt(tokenAmountDeposited) || amount.eq(MIN_I64) || trySettle;
+			amount.lt(tokenAmountDeposited.neg()) || amount.eq(MIN_I64) || trySettle;
 		if (needsToSettle) {
 			const settleIx = await this.settleMultiplePNLsIx(
 				await getUserAccountPublicKey(
@@ -4320,7 +4322,8 @@ export class DriftClient {
 		amount: BN,
 		perpMarketIndex: number,
 		subAccountId?: number,
-		noAmountBuffer?: boolean
+		noAmountBuffer?: boolean,
+		signingAuthority?: PublicKey
 	): Promise<TransactionInstruction> {
 		const userAccountPublicKey = await getUserAccountPublicKey(
 			this.program.programId,
@@ -4337,7 +4340,7 @@ export class DriftClient {
 			writableSpotMarketIndexes: [spotMarketIndex],
 			readablePerpMarketIndex: [perpMarketIndex],
 		});
-
+		
 		const amountWithBuffer =
 			noAmountBuffer || amount.eq(MIN_I64)
 				? amount
@@ -4353,7 +4356,7 @@ export class DriftClient {
 					spotMarketVault: spotMarketAccount.vault,
 					user: userAccountPublicKey,
 					userStats: this.getUserStatsAccountPublicKey(),
-					authority: this.wallet.publicKey,
+					authority: signingAuthority ?? this.wallet.publicKey,
 				},
 				remainingAccounts,
 			}

sdk/src/math/margin.ts

@@ -176,7 +176,7 @@ export function calculateWorstCasePerpLiabilityValue(
 			worstCaseLiabilityValue: calculatePerpLiabilityValue(
 				perpPosition.baseAssetAmount,
 				oraclePrice,
-				isVariant(perpMarket.contractType, 'prediction')
+				isPredictionMarket
 			),
 		};
 	}

sdk/src/types.ts

@@ -1317,10 +1317,6 @@ export type OptionalOrderParams = {
 	[Property in keyof OrderParams]?: OrderParams[Property];
 } & NecessaryOrderParams;
 
-export type PerpOrderIsolatedExtras = {
-	isolatedPositionDepositAmount?: BN;
-};
-
 export type ModifyOrderParams = {
 	[Property in keyof OrderParams]?: OrderParams[Property] | null;
 } & { policy?: ModifyOrderPolicy };

tests/isolatedPositionDriftClient.ts

@@ -164,7 +164,7 @@ describe('drift client', () => {
 	});
 
 	it('Transfer isolated perp position deposit', async () => {
-		await driftClient.transferIsolatedPerpPositionDeposit(usdcAmount.neg(), 0);
+		await driftClient.transferIsolatedPerpPositionDeposit(usdcAmount.neg(), 0, undefined, undefined, undefined, true);
 
 		const quoteAssetTokenAmount =
 			driftClient.getIsolatedPerpPositionTokenAmount(0);
@@ -173,7 +173,7 @@ describe('drift client', () => {
 		const quoteTokenAmount = driftClient.getQuoteAssetTokenAmount();
 		assert(quoteTokenAmount.eq(usdcAmount));
 
-		await driftClient.transferIsolatedPerpPositionDeposit(usdcAmount, 0);
+		await driftClient.transferIsolatedPerpPositionDeposit(usdcAmount, 0, undefined, undefined, undefined, true);
 
 		const quoteAssetTokenAmount2 =
 			driftClient.getIsolatedPerpPositionTokenAmount(0);
@@ -514,7 +514,7 @@ describe('drift client', () => {
 
 	it('Open short position', async () => {
 		// Re-Deposit USDC, assuming we have 0 balance here
-		await driftClient.transferIsolatedPerpPositionDeposit(new BN(9855998), 0);
+		await driftClient.transferIsolatedPerpPositionDeposit(new BN(9855998), 0, undefined, undefined, undefined, true);
 
 		const baseAssetAmount = new BN(48000000000);
 		await driftClient.openPosition(PositionDirection.SHORT, baseAssetAmount, 0);