@gainsnetwork/sdk 0.2.33-rc4 → 0.2.35-rc1

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 {
-                totalPositionSizeFeeP: parseFloat(fee.totalPositionSizeFeeP.toString()) / 1e12,
-                totalLiqCollateralFeeP: parseFloat(fee.totalLiqCollateralFeeP.toString()) / 1e12,
-                oraclePositionSizeFeeP: parseFloat(fee.oraclePositionSizeFeeP.toString()) / 1e12,
-                minPositionSizeUsd: parseFloat(fee.minPositionSizeUsd.toString()) / 1e3,
+                openFeeP: parseFloat(fee.openFeeP.toString()) / 1e12,
+                closeFeeP: parseFloat(fee.closeFeeP.toString()) / 1e12,
+                triggerOrderFeeP: parseFloat(fee.triggerOrderFeeP.toString()) / 1e12,
+                minPositionSizeUsd: parseFloat(fee.minPositionSizeUsd.toString()) / 1e18,
             };
         });
     }
@@ -391,4 +391,12 @@ const PAIR_INDEX_TO_DESCRIPTION = {
     [types_1.PairIndex.POLYXUSD]: "Polymesh to US Dollar",
     [types_1.PairIndex.MOODENGUSD]: "Moo Deng to US Dollar",
     [types_1.PairIndex.MOTHERUSD]: "Mother Iggy to US Dollar",
+    [types_1.PairIndex.AEROUSD]: "Aerodrome Finance to US Dollar",
+    [types_1.PairIndex.CVCUSD]: "Civic to US Dollar",
+    [types_1.PairIndex.NEIROCTOUSD]: "Neiro CTO to US Dollar",
+    [types_1.PairIndex.ARKUSD]: "Ark to US Dollar",
+    [types_1.PairIndex.NPCUSD]: "Non-Playable Coin to US Dollar",
+    [types_1.PairIndex.ORBSUSD]: "ORBS to US Dollar",
+    [types_1.PairIndex.APUUSD]: "Apu Apustaja to US Dollar",
+    [types_1.PairIndex.BSVUSD]: "Bitcoin SV to US Dollar",
 };

package/lib/trade/fees/index.js

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

package/lib/trade/spread.d.ts

@@ -1,14 +1,16 @@
-import { LiquidationParams, OiWindows, OiWindowsSettings, PairDepth, PairFactor } from "./types";
+import { LiquidationParams, OiWindows, OiWindowsSettings, PairDepth } from "./types";
 import { ContractsVersion } from "../contracts/types";
 export type SpreadContext = {
     isOpen?: boolean;
     isPnlPositive?: boolean;
+    protectionCloseFactor?: number;
+    protectionCloseFactorBlocks?: number;
+    cumulativeFactor?: number;
     createdBlock?: number;
     liquidationParams?: LiquidationParams | undefined;
     currentBlock?: number | undefined;
     contractsVersion?: ContractsVersion | undefined;
-    protectionCloseFactorWhitelist?: boolean;
-} & Partial<PairFactor>;
+};
 export declare const getProtectionCloseFactor: (spreadCtx: SpreadContext | undefined) => number;
 export declare const getCumulativeFactor: (spreadCtx: SpreadContext | undefined) => number;
 export declare const getLegacyFactor: (spreadCtx: SpreadContext | undefined) => number;

package/lib/trade/spread.js

@@ -12,8 +12,7 @@ const getProtectionCloseFactor = (spreadCtx) => {
         spreadCtx.protectionCloseFactor === undefined ||
         spreadCtx.protectionCloseFactorBlocks === undefined ||
         spreadCtx.createdBlock === undefined ||
-        spreadCtx.currentBlock === undefined ||
-        spreadCtx.protectionCloseFactorWhitelist === true)
+        spreadCtx.currentBlock === undefined)
         return constants_1.DEFAULT_PROTECTION_CLOSE_FACTOR;
     if (spreadCtx.isPnlPositive &&
         !spreadCtx.isOpen &&
@@ -26,9 +25,7 @@ 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;
@@ -38,7 +35,6 @@ const getLegacyFactor = (spreadCtx) => {
     return (spreadCtx === null || spreadCtx === void 0 ? void 0 : spreadCtx.contractsVersion) === types_1.ContractsVersion.BEFORE_V9_2 ? 1 : 2;
 };
 exports.getLegacyFactor = getLegacyFactor;
-// @todo
 const getSpreadWithPriceImpactP = (pairSpreadP, buy, collateral, leverage, pairDepth, oiWindowsSettings, oiWindows, spreadCtx) => {
     if (pairSpreadP === undefined) {
         return 0;
@@ -64,7 +60,6 @@ const getSpreadWithPriceImpactP = (pairSpreadP, buy, collateral, leverage, pairD
     if (!onePercentDepth || activeOi === undefined || collateral === undefined) {
         return pairSpreadP / 2;
     }
-    // @todo implement exemptOnOpen && exemptAfterProtectionCloseFactor
     return ((0, exports.getSpreadP)(pairSpreadP) +
         ((activeOi * (0, exports.getCumulativeFactor)(spreadCtx) + (collateral * leverage) / 2) /
             onePercentDepth /

package/lib/trade/types.d.ts

@@ -48,17 +48,10 @@ export type TradingGroup = {
     name: string;
 };
 export type Fee = {
-    totalPositionSizeFeeP: number;
-    totalLiqCollateralFeeP: number;
-    oraclePositionSizeFeeP: number;
+    openFeeP: number;
+    closeFeeP: number;
     minPositionSizeUsd: number;
-};
-export type GlobalTradeFeeParams = {
-    referralFeeP: number;
-    govFeeP: number;
     triggerOrderFeeP: number;
-    gnsOtcFeeP: number;
-    gTokenFeeP: number;
 };
 export type PairDepth = {
     onePercentDepthAboveUsd: number;
@@ -176,14 +169,11 @@ 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,
@@ -504,5 +494,13 @@ export declare enum PairIndex {
     EIGENUSD = 282,
     POLYXUSD = 283,
     MOODENGUSD = 284,
-    MOTHERUSD = 285
+    MOTHERUSD = 285,
+    AEROUSD = 286,
+    CVCUSD = 287,
+    NEIROCTOUSD = 288,
+    ARKUSD = 289,
+    NPCUSD = 290,
+    ORBSUSD = 291,
+    APUUSD = 292,
+    BSVUSD = 293
 }

package/lib/trade/types.js

@@ -315,4 +315,12 @@ var PairIndex;
     PairIndex[PairIndex["POLYXUSD"] = 283] = "POLYXUSD";
     PairIndex[PairIndex["MOODENGUSD"] = 284] = "MOODENGUSD";
     PairIndex[PairIndex["MOTHERUSD"] = 285] = "MOTHERUSD";
+    PairIndex[PairIndex["AEROUSD"] = 286] = "AEROUSD";
+    PairIndex[PairIndex["CVCUSD"] = 287] = "CVCUSD";
+    PairIndex[PairIndex["NEIROCTOUSD"] = 288] = "NEIROCTOUSD";
+    PairIndex[PairIndex["ARKUSD"] = 289] = "ARKUSD";
+    PairIndex[PairIndex["NPCUSD"] = 290] = "NPCUSD";
+    PairIndex[PairIndex["ORBSUSD"] = 291] = "ORBSUSD";
+    PairIndex[PairIndex["APUUSD"] = 292] = "APUUSD";
+    PairIndex[PairIndex["BSVUSD"] = 293] = "BSVUSD";
 })(PairIndex = exports.PairIndex || (exports.PairIndex = {}));

package/package.json

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