@gainsnetwork/sdk 0.2.32-rc3 → 0.2.33-rc2

package/lib/contracts/utils/pairs.js

@@ -69,10 +69,10 @@ const fetchFees = (contracts, feeIxs) => __awaiter(void 0, void 0, void 0, funct
         const fees = yield Promise.all(feeIxs.map(pairIndex => multiCollatContract.fees(pairIndex)));
         return fees.map(fee => {
             return {
-                openFeeP: parseFloat(fee.openFeeP.toString()) / 1e12,
-                closeFeeP: parseFloat(fee.closeFeeP.toString()) / 1e12,
-                triggerOrderFeeP: parseFloat(fee.triggerOrderFeeP.toString()) / 1e12,
-                minPositionSizeUsd: parseFloat(fee.minPositionSizeUsd.toString()) / 1e18,
+                totalPositionSizeFeeP: parseFloat(fee.totalPositionSizeFeeP.toString()) / 1e12,
+                totalLiqCollateralFeeP: parseFloat(fee.totalLiqCollateralFeeP.toString()) / 1e12,
+                oraclePositionSizeFeeP: parseFloat(fee.oraclePositionSizeFeeP.toString()) / 1e12,
+                minPositionSizeUsd: parseFloat(fee.minPositionSizeUsd.toString()) / 1e3,
             };
         });
     }

package/lib/trade/fees/index.js

@@ -22,8 +22,9 @@ const getClosingFee = (posDai, leverage, pairIndex, pairFee, collateralPriceUsd
         pairFee === undefined) {
         return 0;
     }
-    const { closeFeeP, triggerOrderFeeP, minPositionSizeUsd } = pairFee;
-    return ((closeFeeP + triggerOrderFeeP) *
+    // @todo check
+    const { totalPositionSizeFeeP, minPositionSizeUsd } = pairFee;
+    return (totalPositionSizeFeeP *
         feeMultiplier *
         Math.max(collateralPriceUsd && collateralPriceUsd > 0
             ? minPositionSizeUsd / collateralPriceUsd

package/lib/trade/spread.js

@@ -25,7 +25,9 @@ const getProtectionCloseFactor = (spreadCtx) => {
 };
 exports.getProtectionCloseFactor = getProtectionCloseFactor;
 const getCumulativeFactor = (spreadCtx) => {
-    if (spreadCtx === undefined || spreadCtx.cumulativeFactor === undefined || spreadCtx.cumulativeFactor === 0) {
+    if (spreadCtx === undefined ||
+        spreadCtx.cumulativeFactor === undefined ||
+        spreadCtx.cumulativeFactor === 0) {
         return constants_1.DEFAULT_CUMULATIVE_FACTOR;
     }
     return spreadCtx.cumulativeFactor;

package/lib/trade/types.d.ts

@@ -48,10 +48,17 @@ export type TradingGroup = {
     name: string;
 };
 export type Fee = {
-    openFeeP: number;
-    closeFeeP: number;
+    totalPositionSizeFeeP: number;
+    totalLiqCollateralFeeP: number;
+    oraclePositionSizeFeeP: number;
     minPositionSizeUsd: number;
+};
+export type GlobalTradeFeeParams = {
+    referralFeeP: number;
+    govFeeP: number;
     triggerOrderFeeP: number;
+    gnsOtcFeeP: number;
+    gTokenFeeP: number;
 };
 export type PairDepth = {
     onePercentDepthAboveUsd: number;
@@ -169,11 +176,14 @@ export type TraderFeeTiers = {
     outboundPoints: number;
     lastDayUpdatedPoints: number;
     expiredPoints: number[];
+    unclaimedPoints: number;
 };
 export type PairFactor = {
     cumulativeFactor: number;
     protectionCloseFactor: number;
     protectionCloseFactorBlocks: number;
+    exemptOnOpen: boolean;
+    exemptAfterProtectionCloseFactor: boolean;
 };
 export declare enum PendingOrderType {
     MARKET_OPEN = 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gainsnetwork/sdk",
-  "version": "0.2.32-rc3",
+  "version": "0.2.33-rc2",
   "description": "Gains Network SDK",
   "main": "./lib/index.js",
   "files": [