chore: post rebase cleaner upper

Author: LukasDeco

sdk/src/decode/user.ts

@@ -86,7 +86,6 @@ export function decodeUser(buffer: Buffer): UserAccount {
 		const openOrders = buffer.readUInt8(offset + 94);
 		const positionFlag = buffer.readUInt8(offset + 95);
 		const isolatedPositionScaledBalance = readUnsignedBigInt64LE(buffer, offset + 96);
-		const customMarginRatio = buffer.readUInt32LE(offset + 97);
 
 		if (
 			baseAssetAmount.eq(ZERO) &&
@@ -139,7 +138,6 @@ export function decodeUser(buffer: Buffer): UserAccount {
 			maxMarginRatio,
 			positionFlag,
 			isolatedPositionScaledBalance,
-			customMarginRatio,
 		});	
 	}
 

sdk/src/driftClient.ts

@@ -264,103 +264,6 @@ export class DriftClient {
 		return this._isSubscribed && this.accountSubscriber.isSubscribed;
 	}
 
-	public async getDepositIntoIsolatedPerpPositionIx({
-		perpMarketIndex,
-		amount,
-		spotMarketIndex,
-		subAccountId,
-		userTokenAccount,
-	}: {
-		perpMarketIndex: number;
-		amount: BN;
-		spotMarketIndex?: number; // defaults to perp.quoteSpotMarketIndex
-		subAccountId?: number;
-		userTokenAccount?: PublicKey; // defaults ATA for spot market mint
-	}): Promise<TransactionInstruction> {
-		const user = await this.getUserAccountPublicKey(subAccountId);
-		const userStats = this.getUserStatsAccountPublicKey();
-		const statePk = await this.getStatePublicKey();
-		const perp = this.getPerpMarketAccount(perpMarketIndex);
-		const spotIndex = spotMarketIndex ?? perp.quoteSpotMarketIndex;
-		const spot = this.getSpotMarketAccount(spotIndex);
-
-		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount(subAccountId)],
-			readablePerpMarketIndex: perpMarketIndex,
-			writableSpotMarketIndexes: [spotIndex],
-		});
-
-		// token program and transfer hook mints need to be present for deposit
-		this.addTokenMintToRemainingAccounts(spot, remainingAccounts);
-		if (this.isTransferHook(spot)) {
-			await this.addExtraAccountMetasToRemainingAccounts(
-				spot.mint,
-				remainingAccounts
-			);
-		}
-
-		const tokenProgram = this.getTokenProgramForSpotMarket(spot);
-		const ata =
-			userTokenAccount ??
-			(await this.getAssociatedTokenAccount(
-				spotIndex,
-				false,
-				tokenProgram
-			));
-
-		return await this.program.instruction.depositIntoIsolatedPerpPosition(
-			spotIndex,
-			perpMarketIndex,
-			amount,
-			{
-				accounts: {
-					state: statePk,
-					user,
-					userStats,
-					authority: this.wallet.publicKey,
-					spotMarketVault: spot.vault,
-					userTokenAccount: ata,
-					tokenProgram,
-				},
-				remainingAccounts,
-			}
-		);
-	}
-
-	public async getTransferIsolatedPerpPositionDepositIx({
-		perpMarketIndex,
-		amount,
-		spotMarketIndex,
-		subAccountId,
-	}: {
-		perpMarketIndex: number;
-		amount: BN;
-		spotMarketIndex?: number; // defaults to perp.quoteSpotMarketIndex
-		subAccountId?: number;
-	}): Promise<TransactionInstruction> {
-		const user = await this.getUserAccountPublicKey(subAccountId);
-		const userStats = this.getUserStatsAccountPublicKey();
-		const statePk = await this.getStatePublicKey();
-		const perp = this.getPerpMarketAccount(perpMarketIndex);
-		const spotIndex = spotMarketIndex ?? perp.quoteSpotMarketIndex;
-		const spot = this.getSpotMarketAccount(spotIndex);
-
-		return await this.program.instruction.transferIsolatedPerpPositionDeposit(
-			spotIndex,
-			perpMarketIndex,
-			amount,
-			{
-				accounts: {
-					user,
-					userStats,
-					authority: this.wallet.publicKey,
-					state: statePk,
-					spotMarketVault: spot.vault,
-				},
-			}
-		);
-	}
-
 	public set isSubscribed(val: boolean) {
 		this._isSubscribed = val;
 	}
@@ -4384,29 +4287,27 @@ export class DriftClient {
 
 		const txKeys = Object.keys(ixPromisesForTxs);
 
-
 		const preIxs: TransactionInstruction[] = [];
-		if (isVariant(orderParams.marketType, 'perp') && isolatedPositionDepositAmount?.gt?.(ZERO)) {
+		if (
+			isVariant(orderParams.marketType, 'perp') &&
+			isolatedPositionDepositAmount?.gt?.(ZERO)
+		) {
 			preIxs.push(
-				await this.getTransferIsolatedPerpPositionDepositIx({
-					perpMarketIndex: orderParams.marketIndex,
-					amount: isolatedPositionDepositAmount as BN,
-					subAccountId: userAccount.subAccountId,
-				})
+				await this.getTransferIsolatedPerpPositionDepositIx(
+					isolatedPositionDepositAmount as BN,
+					orderParams.marketIndex,
+					userAccount.subAccountId
+				)
 			);
 		}
 
-
 		ixPromisesForTxs.marketOrderTx = (async () => {
 			const placeOrdersIx = await this.getPlaceOrdersIx(
 				[orderParams, ...bracketOrdersParams],
 				userAccount.subAccountId
 			);
 			if (preIxs.length) {
-				return [
-					...preIxs,
-					placeOrdersIx,
-				] as unknown as TransactionInstruction;
+				return [...preIxs, placeOrdersIx] as unknown as TransactionInstruction;
 			}
 			return placeOrdersIx;
 		})();
@@ -4530,11 +4431,11 @@ export class DriftClient {
 		const preIxs: TransactionInstruction[] = [];
 		if (isolatedPositionDepositAmount?.gt?.(ZERO)) {
 			preIxs.push(
-				await this.getTransferIsolatedPerpPositionDepositIx({
-					perpMarketIndex: orderParams.marketIndex,
-					amount: isolatedPositionDepositAmount as BN,
-					subAccountId,
-				})
+				await this.getTransferIsolatedPerpPositionDepositIx(
+					isolatedPositionDepositAmount as BN,
+					orderParams.marketIndex,
+					subAccountId
+				)
 			);
 		}
 
@@ -4918,7 +4819,6 @@ export class DriftClient {
 			useMarketLastSlotCache: true,
 		});
 
-
 		return await this.program.instruction.cancelOrders(
 			marketType ?? null,
 			marketIndex ?? null,
@@ -4993,13 +4893,16 @@ export class DriftClient {
 		const preIxs: TransactionInstruction[] = [];
 		if (params?.length === 1) {
 			const p = params[0];
-			if (isVariant(p.marketType, 'perp') && isolatedPositionDepositAmount?.gt?.(ZERO)) {
+			if (
+				isVariant(p.marketType, 'perp') &&
+				isolatedPositionDepositAmount?.gt?.(ZERO)
+			) {
 				preIxs.push(
-					await this.getTransferIsolatedPerpPositionDepositIx({
-						perpMarketIndex: p.marketIndex,
-						amount: isolatedPositionDepositAmount as BN,
-						subAccountId,
-					})
+					await this.getTransferIsolatedPerpPositionDepositIx(
+						isolatedPositionDepositAmount as BN,
+						p.marketIndex,
+						subAccountId
+					)
 				);
 			}
 		}
@@ -6470,13 +6373,16 @@ export class DriftClient {
 				subAccountId
 			);
 
-			if (isVariant(orderParams.marketType, 'perp') && isolatedPositionDepositAmount?.gt?.(ZERO)) {
+			if (
+				isVariant(orderParams.marketType, 'perp') &&
+				isolatedPositionDepositAmount?.gt?.(ZERO)
+			) {
 				placeAndTakeIxs.push(
-					await this.getTransferIsolatedPerpPositionDepositIx({
-						perpMarketIndex: orderParams.marketIndex,
-						amount: isolatedPositionDepositAmount as BN,
-						subAccountId,
-					})
+					await this.getTransferIsolatedPerpPositionDepositIx(
+						isolatedPositionDepositAmount as BN,
+						orderParams.marketIndex,
+						subAccountId
+					)
 				);
 			}
 
@@ -10758,4 +10664,4 @@ export class DriftClient {
 			forceVersionedTransaction,
 		});
 	}
-}
+}

sdk/src/user.ts

@@ -287,14 +287,14 @@ export class User {
 				);
 
 			// margin ratio for this perp
-			const customMarginRatio = Math.max(this.getUserAccount().maxMarginRatio, marketPosition.customMarginRatio);
+			const customMarginRatio = Math.max(this.getUserAccount().maxMarginRatio, marketPosition.maxMarginRatio);
 			let marginRatio = new BN(
 				calculateMarketMarginRatio(
 					market,
 					worstCaseBaseAssetAmount.abs(),
 					marginCategory,
 					customMarginRatio,
-					this.isHighLeverageMode() || enteringHighLeverage
+					this.isHighLeverageMode(marginCategory) || enteringHighLeverage
 				)
 			);
 			if (isVariant(market.status, 'settlement')) {
@@ -616,7 +616,6 @@ export class User {
 			maxMarginRatio: 0,
 			positionFlag: 0,
 			isolatedPositionScaledBalance: ZERO,
-			customMarginRatio: 0,
 		};
 	}
 

sdk/tests/dlob/helpers.ts

@@ -47,6 +47,8 @@ export const mockPerpPosition: PerpPosition = {
 	lastQuoteAssetAmountPerLp: new BN(0),
 	perLpBase: 0,
 	positionFlag: 0,
+	isolatedPositionScaledBalance: new BN(0),
+	maxMarginRatio: 0,
 };
 
 export const mockAMM: AMM = {
@@ -663,7 +665,6 @@ export class MockUserMap implements UserMapInterface {
 	private userMap = new Map<string, User>();
 	private userAccountToAuthority = new Map<string, string>();
 	private driftClient: DriftClient;
-	eventEmitter: StrictEventEmitter<EventEmitter, UserEvents>;
 
 	constructor() {
 		this.userMap = new Map();