@gainsnetwork/sdk 0.2.60-rc1 → 0.2.61-rc1

package/lib/contracts/utils/pairs.js

@@ -458,4 +458,15 @@ const PAIR_INDEX_TO_DESCRIPTION = {
     [types_1.PairIndex.PIUSD]: "Pi Network to US Dollar",
     [types_1.PairIndex.SHELLUSD]: "MyShell to US Dollar",
     [types_1.PairIndex.BMTUSD]: "Bubblemaps to US Dollar",
+    [types_1.PairIndex.BROCCOLIUSD]: "CZ'S Dog to US Dollar",
+    [types_1.PairIndex.TUTUSD]: "Tutorial to US Dollar",
+    [types_1.PairIndex.GPSUSD]: "GoPlus Security to US Dollar",
+    [types_1.PairIndex.REDUSD]: "RedStone to US Dollar",
+    [types_1.PairIndex.MUBARAKUSD]: "Mubarak to US Dollar",
+    [types_1.PairIndex.FORMUSD]: "Four to US Dollar",
+    [types_1.PairIndex.WALUSD]: "Walrus to US Dollar",
+    [types_1.PairIndex.NILUSD]: "Nillion to US Dollar",
+    [types_1.PairIndex.PARTIUSD]: "Particle Network to US Dollar",
+    [types_1.PairIndex.SIRENUSD]: "Siren to US Dollar",
+    [types_1.PairIndex.BANANAS31]: "Banana For Scale to US Dollar",
 };

package/lib/trade/liquidation.d.ts

@@ -1,12 +1,11 @@
 import { GetBorrowingFeeContext, BorrowingFee } from "./fees";
-import { Fee, LiquidationParams, Trade, UserPriceImpact } from "./types";
+import { Fee, LiquidationParams, Trade } from "./types";
 import { ContractsVersion } from "../contracts/types";
 export type GetLiquidationPriceContext = GetBorrowingFeeContext & {
     liquidationParams: LiquidationParams | undefined;
     pairSpreadP: number | undefined;
     collateralPriceUsd: number | undefined;
     contractsVersion: ContractsVersion | undefined;
-    userPriceImpact?: UserPriceImpact | undefined;
 };
 export declare const getLiquidationPrice: (trade: Trade, fee: Fee, initialAccFees: BorrowingFee.InitialAccFees, context: GetLiquidationPriceContext) => number;
 export declare const getLiqPnlThresholdP: (liquidationParams: LiquidationParams | undefined, leverage: number | undefined) => number;

package/lib/trade/liquidation.js

@@ -5,7 +5,7 @@ const fees_1 = require("./fees");
 const spread_1 = require("./spread");
 const types_1 = require("../contracts/types");
 const getLiquidationPrice = (trade, fee, initialAccFees, context) => {
-    var _a, _b;
+    var _a;
     const closingFee = (0, fees_1.getClosingFee)(trade.collateralAmount, trade.leverage, trade.pairIndex, fee, context.collateralPriceUsd);
     const borrowingFee = (0, fees_1.getBorrowingFee)(trade.collateralAmount * trade.leverage, trade.pairIndex, trade.long, initialAccFees, context);
     const liqThresholdP = (0, exports.getLiqPnlThresholdP)(context.liquidationParams, trade.leverage);
@@ -15,11 +15,9 @@ const getLiquidationPrice = (trade, fee, initialAccFees, context) => {
         trade.leverage;
     if ((context === null || context === void 0 ? void 0 : context.contractsVersion) !== undefined &&
         context.contractsVersion >= types_1.ContractsVersion.V9_2 &&
-        ((((_a = context === null || context === void 0 ? void 0 : context.liquidationParams) === null || _a === void 0 ? void 0 : _a.maxLiqSpreadP) !== undefined &&
-            context.liquidationParams.maxLiqSpreadP > 0) ||
-            (((_b = context === null || context === void 0 ? void 0 : context.userPriceImpact) === null || _b === void 0 ? void 0 : _b.fixedSpreadP) !== undefined &&
-                context.userPriceImpact.fixedSpreadP > 0))) {
-        const closingSpreadP = (0, spread_1.getSpreadP)(context.pairSpreadP, true, context.liquidationParams, context.userPriceImpact);
+        ((_a = context === null || context === void 0 ? void 0 : context.liquidationParams) === null || _a === void 0 ? void 0 : _a.maxLiqSpreadP) !== undefined &&
+        context.liquidationParams.maxLiqSpreadP > 0) {
+        const closingSpreadP = (0, spread_1.getSpreadP)(context.pairSpreadP, true, context.liquidationParams);
         liqPriceDistance -= trade.openPrice * closingSpreadP;
     }
     return trade.long

package/lib/trade/spread.d.ts

@@ -1,4 +1,4 @@
-import { LiquidationParams, OiWindows, OiWindowsSettings, PairDepth, PairFactor, UserPriceImpact } from "./types";
+import { LiquidationParams, OiWindows, OiWindowsSettings, PairDepth, PairFactor } from "./types";
 import { ContractsVersion } from "../contracts/types";
 export type SpreadContext = {
     isOpen?: boolean;
@@ -8,11 +8,10 @@ export type SpreadContext = {
     currentBlock?: number | undefined;
     contractsVersion?: ContractsVersion | undefined;
     protectionCloseFactorWhitelist?: boolean;
-    userPriceImpact?: UserPriceImpact | undefined;
 } & Partial<PairFactor>;
 export declare const getProtectionCloseFactor: (spreadCtx: SpreadContext | undefined) => number;
 export declare const isProtectionCloseFactorActive: (spreadCtx: SpreadContext | undefined) => boolean | undefined;
 export declare const getCumulativeFactor: (spreadCtx: SpreadContext | undefined) => number;
 export declare const getLegacyFactor: (spreadCtx: SpreadContext | undefined) => number;
 export declare const getSpreadWithPriceImpactP: (pairSpreadP: number, buy: boolean, collateral: number, leverage: number, pairDepth: PairDepth | undefined, oiWindowsSettings?: OiWindowsSettings | undefined, oiWindows?: OiWindows | undefined, spreadCtx?: SpreadContext | undefined) => number;
-export declare const getSpreadP: (pairSpreadP: number | undefined, isLiquidation?: boolean | undefined, liquidationParams?: LiquidationParams | undefined, userPriceImpact?: UserPriceImpact | undefined) => number;
+export declare const getSpreadP: (pairSpreadP: number | undefined, isLiquidation?: boolean | undefined, liquidationParams?: LiquidationParams | undefined) => number;

package/lib/trade/spread.js

@@ -5,20 +5,14 @@ const oiWindows_1 = require("./oiWindows");
 const constants_1 = require("../constants");
 const types_1 = require("../contracts/types");
 const getProtectionCloseFactor = (spreadCtx) => {
-    var _a;
-    const protectionCloseFactor = spreadCtx === undefined ||
+    if (spreadCtx === undefined ||
         spreadCtx.contractsVersion === types_1.ContractsVersion.BEFORE_V9_2 ||
         spreadCtx.isOpen === undefined ||
         spreadCtx.isPnlPositive === undefined ||
-        spreadCtx.protectionCloseFactor === undefined ||
-        (0, exports.isProtectionCloseFactorActive)(spreadCtx) !== true
-        ? constants_1.DEFAULT_PROTECTION_CLOSE_FACTOR
-        : spreadCtx.protectionCloseFactor;
-    const protectionCloseFactorMultiplier = ((_a = spreadCtx === null || spreadCtx === void 0 ? void 0 : spreadCtx.userPriceImpact) === null || _a === void 0 ? void 0 : _a.cumulVolPriceImpactMultiplier) !== undefined &&
-        spreadCtx.userPriceImpact.cumulVolPriceImpactMultiplier > 0
-        ? spreadCtx.userPriceImpact.cumulVolPriceImpactMultiplier
-        : 1;
-    return protectionCloseFactor * protectionCloseFactorMultiplier;
+        (0, exports.isProtectionCloseFactorActive)(spreadCtx) !== true)
+        return constants_1.DEFAULT_PROTECTION_CLOSE_FACTOR;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    return spreadCtx.protectionCloseFactor;
 };
 exports.getProtectionCloseFactor = getProtectionCloseFactor;
 const isProtectionCloseFactorActive = (spreadCtx) => {
@@ -83,7 +77,7 @@ const getSpreadWithPriceImpactP = (pairSpreadP, buy, collateral, leverage, pairD
     if (!onePercentDepth || activeOi === undefined || collateral === undefined) {
         return pairSpreadP / 2;
     }
-    return ((0, exports.getSpreadP)(pairSpreadP, undefined, undefined, spreadCtx === null || spreadCtx === void 0 ? void 0 : spreadCtx.userPriceImpact) +
+    return ((0, exports.getSpreadP)(pairSpreadP) +
         ((activeOi * (0, exports.getCumulativeFactor)(spreadCtx) + (collateral * leverage) / 2) /
             onePercentDepth /
             100 /
@@ -91,13 +85,11 @@ const getSpreadWithPriceImpactP = (pairSpreadP, buy, collateral, leverage, pairD
             (0, exports.getProtectionCloseFactor)(spreadCtx));
 };
 exports.getSpreadWithPriceImpactP = getSpreadWithPriceImpactP;
-const getSpreadP = (pairSpreadP, isLiquidation, liquidationParams, userPriceImpact) => {
-    var _a;
-    const fixedSpreadP = (_a = userPriceImpact === null || userPriceImpact === void 0 ? void 0 : userPriceImpact.fixedSpreadP) !== null && _a !== void 0 ? _a : 0;
-    if (pairSpreadP === undefined || (pairSpreadP === 0 && fixedSpreadP === 0)) {
+const getSpreadP = (pairSpreadP, isLiquidation, liquidationParams) => {
+    if (pairSpreadP === undefined || pairSpreadP === 0) {
         return 0;
     }
-    const spreadP = pairSpreadP / 2 + fixedSpreadP;
+    const spreadP = pairSpreadP / 2;
     return isLiquidation === true &&
         liquidationParams !== undefined &&
         liquidationParams.maxLiqSpreadP > 0 &&

package/lib/trade/types.d.ts

@@ -185,10 +185,6 @@ export type PairFactor = {
     exemptOnOpen: boolean;
     exemptAfterProtectionCloseFactor: boolean;
 };
-export type UserPriceImpact = {
-    cumulVolPriceImpactMultiplier: number;
-    fixedSpreadP: number;
-};
 export declare enum PendingOrderType {
     MARKET_OPEN = 0,
     MARKET_CLOSE = 1,
@@ -575,5 +571,16 @@ export declare enum PairIndex {
     ELXUSD = 349,
     PIUSD = 350,
     SHELLUSD = 351,
-    BMTUSD = 352
+    BMTUSD = 352,
+    BROCCOLIUSD = 353,
+    TUTUSD = 354,
+    GPSUSD = 355,
+    REDUSD = 356,
+    MUBARAKUSD = 357,
+    FORMUSD = 358,
+    WALUSD = 359,
+    NILUSD = 360,
+    PARTIUSD = 361,
+    SIRENUSD = 362,
+    BANANAS31 = 363
 }

package/lib/trade/types.js

@@ -382,4 +382,15 @@ var PairIndex;
     PairIndex[PairIndex["PIUSD"] = 350] = "PIUSD";
     PairIndex[PairIndex["SHELLUSD"] = 351] = "SHELLUSD";
     PairIndex[PairIndex["BMTUSD"] = 352] = "BMTUSD";
+    PairIndex[PairIndex["BROCCOLIUSD"] = 353] = "BROCCOLIUSD";
+    PairIndex[PairIndex["TUTUSD"] = 354] = "TUTUSD";
+    PairIndex[PairIndex["GPSUSD"] = 355] = "GPSUSD";
+    PairIndex[PairIndex["REDUSD"] = 356] = "REDUSD";
+    PairIndex[PairIndex["MUBARAKUSD"] = 357] = "MUBARAKUSD";
+    PairIndex[PairIndex["FORMUSD"] = 358] = "FORMUSD";
+    PairIndex[PairIndex["WALUSD"] = 359] = "WALUSD";
+    PairIndex[PairIndex["NILUSD"] = 360] = "NILUSD";
+    PairIndex[PairIndex["PARTIUSD"] = 361] = "PARTIUSD";
+    PairIndex[PairIndex["SIRENUSD"] = 362] = "SIRENUSD";
+    PairIndex[PairIndex["BANANAS31"] = 363] = "BANANAS31";
 })(PairIndex = exports.PairIndex || (exports.PairIndex = {}));

package/package.json

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