fix: max margin ratio correct naming and decoding

Author: LukasDeco

sdk/src/decode/user.ts

@@ -84,7 +84,6 @@ export function decodeUser(buffer: Buffer): UserAccount {
 		const quoteAssetAmount = readSignedBigInt64LE(buffer, offset + 16);
 		const lpShares = readUnsignedBigInt64LE(buffer, offset + 64);
 		const openOrders = buffer.readUInt8(offset + 94);
-		const customMarginRatio = buffer.readUInt32LE(offset + 95);
 
 		if (
 			baseAssetAmount.eq(ZERO) &&
@@ -112,7 +111,7 @@ export function decodeUser(buffer: Buffer): UserAccount {
 		offset += 8;
 		const lastQuoteAssetAmountPerLp = readSignedBigInt64LE(buffer, offset);
 		offset += 8;
-		const remainderBaseAssetAmount = buffer.readInt32LE(offset);
+		const maxMarginRatio = buffer.readInt32LE(offset);
 		offset += 4;
 		const marketIndex = buffer.readUInt16LE(offset);
 		offset += 3;
@@ -129,13 +128,13 @@ export function decodeUser(buffer: Buffer): UserAccount {
 			openAsks,
 			settledPnl,
 			lpShares,
+			remainderBaseAssetAmount: 0,
 			lastBaseAssetAmountPerLp,
 			lastQuoteAssetAmountPerLp,
-			remainderBaseAssetAmount,
 			marketIndex,
 			openOrders,
 			perLpBase,
-			customMarginRatio,
+			maxMarginRatio,
 		});
 	}
 

sdk/src/types.ts

@@ -1042,11 +1042,12 @@ export type PerpPosition = {
 	openAsks: BN;
 	settledPnl: BN;
 	lpShares: BN;
+	/**	 TODO: remove this field - it doesn't exist on chain */
 	remainderBaseAssetAmount: number;
+	maxMarginRatio: number;
 	lastBaseAssetAmountPerLp: BN;
 	lastQuoteAssetAmountPerLp: BN;
 	perLpBase: number;
-	customMarginRatio: number;
 };
 
 export type UserStatsAccount = {

sdk/src/user.ts

@@ -325,7 +325,7 @@ export class User {
 			lastBaseAssetAmountPerLp: ZERO,
 			lastQuoteAssetAmountPerLp: ZERO,
 			perLpBase: 0,
-			customMarginRatio: 0,
+			maxMarginRatio: 0,
 		};
 	}
 
@@ -715,7 +715,7 @@ export class User {
 		perpPosition?: PerpPosition
 	): BN {
 		const userCustomMargin = Math.max(
-			perpPosition?.customMarginRatio ?? 0,
+			perpPosition?.maxMarginRatio ?? 0,
 			this.getUserAccount().maxMarginRatio
 		);
 		const marginRatio = calculateMarketMarginRatio(
@@ -2447,7 +2447,7 @@ export class User {
 			}
 
 			const userCustomMargin = Math.max(
-				perpPosition.customMarginRatio,
+				perpPosition.maxMarginRatio,
 				this.getUserAccount().maxMarginRatio
 			);
 			const marginRatio = calculateMarketMarginRatio(
@@ -2500,7 +2500,7 @@ export class User {
 		const proposedBaseAssetAmount = baseAssetAmount.add(positionBaseSizeChange);
 
 		const userCustomMargin = Math.max(
-			perpPosition.customMarginRatio,
+			perpPosition.maxMarginRatio,
 			this.getUserAccount().maxMarginRatio
 		);
 
@@ -3882,7 +3882,7 @@ export class User {
 		);
 
 		const userCustomMargin = Math.max(
-			perpPosition.customMarginRatio,
+			perpPosition.maxMarginRatio,
 			this.getUserAccount().maxMarginRatio
 		);
 		const marginRatio = new BN(