Multichain v2.2

sdk/src/configs/dataStore.ts

@@ -84,6 +84,7 @@ export const SUBACCOUNT_ORDER_ACTION = hashString("SUBACCOUNT_ORDER_ACTION");
 export const SUBACCOUNT_INTEGRATION_ID = hashString("SUBACCOUNT_INTEGRATION_ID");
 export const SUBACCOUNT_AUTO_TOP_UP_AMOUNT = hashString("SUBACCOUNT_AUTO_TOP_UP_AMOUNT");
 export const GLV_MAX_MARKET_TOKEN_BALANCE_USD = hashString("GLV_MAX_MARKET_TOKEN_BALANCE_USD");
+export const MIN_COLLATERAL_FACTOR_FOR_LIQUIDATION_KEY = hashString("MIN_COLLATERAL_FACTOR_FOR_LIQUIDATION");
 export const GLV_MAX_MARKET_TOKEN_BALANCE_AMOUNT = hashString("GLV_MAX_MARKET_TOKEN_BALANCE_AMOUNT");
 export const IS_GLV_MARKET_DISABLED = hashString("IS_GLV_MARKET_DISABLED");
 export const GLV_SHIFT_LAST_EXECUTED_AT = hashString("GLV_SHIFT_LAST_EXECUTED_AT");
@@ -302,6 +303,10 @@ export function minCollateralFactorKey(market: string) {
   return hashData(["bytes32", "address"], [MIN_COLLATERAL_FACTOR_KEY, market]);
 }
 
+export function minCollateralFactorForLiquidationKey(market: string) {
+  return hashData(["bytes32", "address"], [MIN_COLLATERAL_FACTOR_FOR_LIQUIDATION_KEY, market]);
+}
+
 export function minCollateralFactorForOpenInterest(market: string, isLong: boolean) {
   return hashData(
     ["bytes32", "address", "bool"],

sdk/src/modules/markets/index.ts

@@ -248,17 +248,22 @@ export class Markets extends Module {
             minCollateralFactorForOpenInterestShort:
               dataStoreValues.minCollateralFactorForOpenInterestShort.returnValues[0],
 
-            positionFeeFactorForPositiveImpact: dataStoreValues.positionFeeFactorForPositiveImpact.returnValues[0],
-            positionFeeFactorForNegativeImpact: dataStoreValues.positionFeeFactorForNegativeImpact.returnValues[0],
+            minCollateralFactorForLiquidation: dataStoreValues.minCollateralFactorForLiquidation.returnValues[0],
+
+            positionFeeFactorForBalanceWasImproved:
+              dataStoreValues.positionFeeFactorForBalanceWasImproved.returnValues[0],
+            positionFeeFactorForBalanceWasNotImproved:
+              dataStoreValues.positionFeeFactorForBalanceWasNotImproved.returnValues[0],
             positionImpactFactorPositive: dataStoreValues.positionImpactFactorPositive.returnValues[0],
             positionImpactFactorNegative: dataStoreValues.positionImpactFactorNegative.returnValues[0],
             maxPositionImpactFactorPositive: dataStoreValues.maxPositionImpactFactorPositive.returnValues[0],
             maxPositionImpactFactorNegative: dataStoreValues.maxPositionImpactFactorNegative.returnValues[0],
             maxPositionImpactFactorForLiquidations:
               dataStoreValues.maxPositionImpactFactorForLiquidations.returnValues[0],
             positionImpactExponentFactor: dataStoreValues.positionImpactExponentFactor.returnValues[0],
-            swapFeeFactorForPositiveImpact: dataStoreValues.swapFeeFactorForPositiveImpact.returnValues[0],
-            swapFeeFactorForNegativeImpact: dataStoreValues.swapFeeFactorForNegativeImpact.returnValues[0],
+            swapFeeFactorForBalanceWasImproved: dataStoreValues.swapFeeFactorForBalanceWasImproved.returnValues[0],
+            swapFeeFactorForBalanceWasNotImproved:
+              dataStoreValues.swapFeeFactorForBalanceWasNotImproved.returnValues[0],
             swapImpactFactorPositive: dataStoreValues.swapImpactFactorPositive.returnValues[0],
             atomicSwapFeeFactor: dataStoreValues.atomicSwapFeeFactor.returnValues[0],
             swapImpactFactorNegative: dataStoreValues.swapImpactFactorNegative.returnValues[0],

sdk/src/modules/markets/query-builders.ts

@@ -375,13 +375,13 @@ export async function buildMarketsConfigsRequest(
           methodName: "getUint",
           params: [prebuiltHashedKeys.maxPnlFactorForTradersShort],
         },
-        positionFeeFactorForPositiveImpact: {
+        positionFeeFactorForBalanceWasImproved: {
           methodName: "getUint",
-          params: [prebuiltHashedKeys.positionFeeFactorForPositiveImpact],
+          params: [prebuiltHashedKeys.positionFeeFactorForBalanceWasImproved],
         },
-        positionFeeFactorForNegativeImpact: {
+        positionFeeFactorForBalanceWasNotImproved: {
           methodName: "getUint",
-          params: [prebuiltHashedKeys.positionFeeFactorForNegativeImpact],
+          params: [prebuiltHashedKeys.positionFeeFactorForBalanceWasNotImproved],
         },
         positionImpactFactorPositive: {
           methodName: "getUint",
@@ -407,6 +407,10 @@ export async function buildMarketsConfigsRequest(
           methodName: "getUint",
           params: [prebuiltHashedKeys.minCollateralFactor],
         },
+        minCollateralFactorForLiquidation: {
+          methodName: "getUint",
+          params: [prebuiltHashedKeys.minCollateralFactorForLiquidation],
+        },
         minCollateralFactorForOpenInterestLong: {
           methodName: "getUint",
           params: [prebuiltHashedKeys.minCollateralFactorForOpenInterestLong],
@@ -419,13 +423,13 @@ export async function buildMarketsConfigsRequest(
           methodName: "getUint",
           params: [prebuiltHashedKeys.positionImpactExponentFactor],
         },
-        swapFeeFactorForPositiveImpact: {
+        swapFeeFactorForBalanceWasImproved: {
           methodName: "getUint",
-          params: [prebuiltHashedKeys.swapFeeFactorForPositiveImpact],
+          params: [prebuiltHashedKeys.swapFeeFactorForBalanceWasImproved],
         },
-        swapFeeFactorForNegativeImpact: {
+        swapFeeFactorForBalanceWasNotImproved: {
           methodName: "getUint",
-          params: [prebuiltHashedKeys.swapFeeFactorForNegativeImpact],
+          params: [prebuiltHashedKeys.swapFeeFactorForBalanceWasNotImproved],
         },
         atomicSwapFeeFactor: {
           methodName: "getUint",

sdk/src/modules/markets/types.ts

@@ -75,18 +75,19 @@ export type MarketConfig = Pick<
   | "maxPnlFactorForTradersLong"
   | "maxPnlFactorForTradersShort"
   | "minCollateralFactor"
+  | "minCollateralFactorForLiquidation"
   | "minCollateralFactorForOpenInterestLong"
   | "minCollateralFactorForOpenInterestShort"
-  | "positionFeeFactorForPositiveImpact"
-  | "positionFeeFactorForNegativeImpact"
+  | "positionFeeFactorForBalanceWasImproved"
+  | "positionFeeFactorForBalanceWasNotImproved"
   | "positionImpactFactorPositive"
   | "positionImpactFactorNegative"
   | "maxPositionImpactFactorPositive"
   | "maxPositionImpactFactorNegative"
   | "maxPositionImpactFactorForLiquidations"
   | "positionImpactExponentFactor"
-  | "swapFeeFactorForPositiveImpact"
-  | "swapFeeFactorForNegativeImpact"
+  | "swapFeeFactorForBalanceWasImproved"
+  | "swapFeeFactorForBalanceWasNotImproved"
   | "swapImpactFactorPositive"
   | "swapImpactFactorNegative"
   | "swapImpactExponentFactor"
@@ -161,19 +162,20 @@ export type MarketConfigMulticallRequestConfig = MulticallRequestConfig<{
       | "maxFundingFactorPerSecond"
       | "maxPnlFactorForTradersLong"
       | "maxPnlFactorForTradersShort"
-      | "positionFeeFactorForPositiveImpact"
-      | "positionFeeFactorForNegativeImpact"
+      | "positionFeeFactorForBalanceWasImproved"
+      | "positionFeeFactorForBalanceWasNotImproved"
       | "positionImpactFactorPositive"
       | "positionImpactFactorNegative"
       | "maxPositionImpactFactorPositive"
       | "maxPositionImpactFactorNegative"
       | "maxPositionImpactFactorForLiquidations"
       | "minCollateralFactor"
+      | "minCollateralFactorForLiquidation"
       | "minCollateralFactorForOpenInterestLong"
       | "minCollateralFactorForOpenInterestShort"
       | "positionImpactExponentFactor"
-      | "swapFeeFactorForPositiveImpact"
-      | "swapFeeFactorForNegativeImpact"
+      | "swapFeeFactorForBalanceWasImproved"
+      | "swapFeeFactorForBalanceWasNotImproved"
       | "atomicSwapFeeFactor"
       | "swapImpactFactorPositive"
       | "swapImpactFactorNegative"

sdk/src/modules/orders/helpers.spec.ts

@@ -6,7 +6,7 @@ import { TokenData, TokensData } from "types/tokens";
 import { getByKey } from "utils/objects";
 import * as swapPath from "utils/swap/swapPath";
 import { arbitrumSdk } from "utils/testUtil";
-import * as tradeAmounts from "utils/trade/amounts";
+import * as tradeAmounts from "utils/trade/increase";
 
 describe.skip("increaseOrderHelper", () => {
   let marketsInfoData: MarketsInfoData;

sdk/src/modules/orders/helpers.ts

@@ -7,7 +7,7 @@ import { getByKey } from "utils/objects";
 import { getSwapAmountsByFromValue, getSwapAmountsByToValue } from "utils/swap";
 import { createFindSwapPath } from "utils/swap/swapPath";
 import { convertToUsd, getIsUnwrap, getIsWrap, getTokensRatioByPrice } from "utils/tokens";
-import { getIncreasePositionAmounts } from "utils/trade/amounts";
+import { getIncreasePositionAmounts } from "utils/trade/increase";
 
 import type { GmxSdk } from "../..";
 

sdk/src/modules/positions/positions.ts

@@ -13,7 +13,7 @@ import { OrderInfo } from "types/orders";
 import { Position, PositionsData, PositionsInfoData } from "types/positions";
 import { UserReferralInfo } from "types/referrals";
 import { TokensData } from "types/tokens";
-import { getPositionFee, getPriceImpactForPosition } from "utils/fees";
+import { getPositionFee } from "utils/fees";
 import {
   getContractMarketPrices,
   getMarketIndexName,
@@ -27,12 +27,13 @@ import {
   getEntryPrice,
   getLeverage,
   getLiquidationPrice,
+  getNetPriceImpactDeltaUsdForDecrease,
   getPositionKey,
   getPositionNetValue,
+  getPositionPendingFeesUsd,
   getPositionPnlUsd,
 } from "utils/positions";
-import { getPositionPendingFeesUsd } from "utils/positions";
-import { getMarkPrice } from "utils/prices";
+import { getAcceptablePriceInfo, getMarkPrice } from "utils/prices";
 import { decodeReferralCode } from "utils/referrals";
 import { convertToTokenAmount, convertToUsd } from "utils/tokens";
 
@@ -181,6 +182,7 @@ export class Positions extends Module {
           collateralAmount: numbers.collateralAmount,
           increasedAtTime: numbers.increasedAtTime,
           decreasedAtTime: numbers.decreasedAtTime,
+          pendingImpactAmount: numbers.pendingImpactAmount,
           isLong: flags.isLong,
           pendingBorrowingFeesUsd: fees.borrowing.borrowingFeeUsd,
           fundingFeeAmount: fees.funding.fundingFeeAmount,
@@ -543,17 +545,20 @@ export class Positions extends Module {
         pendingFundingFeesUsd,
       });
 
-      const closingPriceImpactDeltaUsd = getPriceImpactForPosition(
-        marketInfo,
-        position.sizeInUsd * -1n,
-        position.isLong,
-        { fallbackToZero: true }
-      );
+      const closeAcceptablePriceInfo = marketInfo
+        ? getAcceptablePriceInfo({
+            marketInfo,
+            isIncrease: false,
+            isLong: position.isLong,
+            indexPrice: getMarkPrice({ prices: indexToken.prices, isLong: position.isLong, isIncrease: false }),
+            sizeDeltaUsd: position.sizeInUsd,
+          })
+        : undefined;
 
       const positionFeeInfo = getPositionFee(
         marketInfo,
         position.sizeInUsd,
-        closingPriceImpactDeltaUsd > 0,
+        closeAcceptablePriceInfo?.balanceWasImproved ?? false,
         userReferralInfo,
         uiFeeFactor
       );
@@ -582,16 +587,36 @@ export class Positions extends Module {
       const pnlPercentage =
         collateralUsd !== undefined && collateralUsd != 0n ? getBasisPoints(pnl, collateralUsd) : 0n;
 
+      const netPriceImapctValues =
+        marketInfo && closeAcceptablePriceInfo
+          ? getNetPriceImpactDeltaUsdForDecrease({
+              marketInfo,
+              sizeInUsd: position.sizeInUsd,
+              pendingImpactAmount: position.pendingImpactAmount,
+              sizeDeltaUsd: position.sizeInUsd,
+              priceImpactDeltaUsd: closeAcceptablePriceInfo.priceImpactDeltaUsd,
+            })
+          : undefined;
+
       const netValue = getPositionNetValue({
         collateralUsd: collateralUsd,
         pnl,
         pendingBorrowingFeesUsd: position.pendingBorrowingFeesUsd,
         pendingFundingFeesUsd: pendingFundingFeesUsd,
         closingFeeUsd,
         uiFeeUsd,
+        totalPendingImpactDeltaUsd: netPriceImapctValues?.totalImpactDeltaUsd ?? 0n,
+        priceImpactDiffUsd: netPriceImapctValues?.priceImpactDiffUsd ?? 0n,
       });
 
-      const pnlAfterFees = pnl - totalPendingFeesUsd - closingFeeUsd - uiFeeUsd;
+      const pnlAfterFees =
+        pnl -
+        totalPendingFeesUsd -
+        closingFeeUsd -
+        uiFeeUsd -
+        (netPriceImapctValues?.totalImpactDeltaUsd ?? 0n) +
+        (netPriceImapctValues?.priceImpactDiffUsd ?? 0n);
+
       const pnlAfterFeesPercentage =
         collateralUsd != 0n ? getBasisPoints(pnlAfterFees, collateralUsd + closingFeeUsd) : 0n;
 
@@ -622,6 +647,7 @@ export class Positions extends Module {
         sizeInTokens: position.sizeInTokens,
         collateralUsd,
         collateralAmount: position.collateralAmount,
+        pendingImpactAmount: position.pendingImpactAmount,
         userReferralInfo,
         minCollateralUsd,
         pendingBorrowingFeesUsd: position.pendingBorrowingFeesUsd,
@@ -657,6 +683,8 @@ export class Positions extends Module {
         pnlAfterFees,
         pnlAfterFeesPercentage,
         netValue,
+        netPriceImapctDeltaUsd: netPriceImapctValues?.totalImpactDeltaUsd ?? 0n,
+        priceImpactDiffUsd: netPriceImapctValues?.priceImpactDiffUsd ?? 0n,
         closingFeeUsd,
         uiFeeUsd,
         pendingFundingFeesUsd,