@gainsnetwork/sdk 1.0.0-rc1 → 1.0.0-rc11

package/lib/trade/fees/borrowing/index.js

@@ -27,6 +27,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BorrowingFee = exports.borrowingFeeUtils = exports.withinMaxGroupOi = exports.getBorrowingFee = void 0;
+const __1 = require("../../..");
 /**
  * @dev Calculates borrowing fees using v1 model (block-based with groups)
  * @dev Still actively used by markets that haven't migrated to v2
@@ -38,7 +39,7 @@ exports.BorrowingFee = exports.borrowingFeeUtils = exports.withinMaxGroupOi = ex
  * @param context Context with current block, fee data, and collateral price
  * @returns Borrowing fee in collateral tokens
  */
-const getBorrowingFee = (posDai, pairIndex, long, initialAccFees, context) => {
+const getBorrowingFee = (posDai, pairIndex, long, initialAccFees, currentPairPrice, context) => {
     if (pairIndex === undefined) {
         throw new Error("pairIndex is required for borrowing fee calculations");
     }
@@ -50,12 +51,19 @@ const getBorrowingFee = (posDai, pairIndex, long, initialAccFees, context) => {
     const firstPairGroup = (pairGroups === null || pairGroups === void 0 ? void 0 : pairGroups.length) > 0 ? pairGroups[0] : undefined;
     let fee = 0;
     if (!firstPairGroup || firstPairGroup.block > initialAccFees.block) {
-        const openInterest = pairs[pairIndex].oi;
+        const openInterest = (0, __1.getPairTotalOisDynamicCollateral)(pairIndex, {
+            pairOis: context.pairOis,
+            currentPairPrice,
+        });
         fee =
             (!firstPairGroup
                 ? getPairPendingAccFee(pairIndex, context.currentBlock, long, {
                     pairs,
-                    openInterest,
+                    openInterest: {
+                        long: openInterest.long,
+                        short: openInterest.short,
+                        max: context.pairOis[pairIndex].maxCollateral,
+                    },
                     collateralPriceUsd: context.collateralPriceUsd,
                 })
                 : long
@@ -63,11 +71,12 @@ const getBorrowingFee = (posDai, pairIndex, long, initialAccFees, context) => {
                     : firstPairGroup.pairAccFeeShort) - initialAccFees.accPairFee;
     }
     for (let i = pairGroups.length; i > 0; i--) {
-        const { deltaGroup, deltaPair, beforeTradeOpen } = getPairGroupAccFeesDeltas(i - 1, pairGroups, initialAccFees, pairIndex, long, {
+        const { deltaGroup, deltaPair, beforeTradeOpen } = getPairGroupAccFeesDeltas(i - 1, pairGroups, initialAccFees, pairIndex, long, currentPairPrice, {
             currentBlock: context.currentBlock,
             groups,
             pairs,
             collateralPriceUsd: context.collateralPriceUsd,
+            pairOis: context.pairOis,
         });
         fee += Math.max(deltaGroup, deltaPair);
         if (beforeTradeOpen) {
@@ -101,7 +110,7 @@ const getPairGroupIndex = (pairIndex, context) => {
 const getPairPendingAccFees = (pairIndex, currentBlock, context) => {
     const { pairs, openInterest: { long, short }, collateralPriceUsd, } = context;
     const pair = pairs[pairIndex];
-    return getPendingAccFees(pair.accFeeLong, pair.accFeeShort, long, short, pair.feePerBlock, currentBlock, pair.accLastUpdatedBlock, pair.oi.max, pair.feeExponent, pair.feePerBlockCap, collateralPriceUsd);
+    return getPendingAccFees(pair.accFeeLong, pair.accFeeShort, long, short, pair.feePerBlock, currentBlock, pair.accLastUpdatedBlock, context.openInterest.max, pair.feeExponent, pair.feePerBlockCap, collateralPriceUsd);
 };
 const getPairPendingAccFee = (pairIndex, currentBlock, long, context) => {
     const { accFeeLong, accFeeShort } = getPairPendingAccFees(pairIndex, currentBlock, context);
@@ -117,20 +126,27 @@ const getGroupPendingAccFee = (groupIndex, currentBlock, long, context) => {
     const { accFeeLong, accFeeShort } = getGroupPendingAccFees(groupIndex, currentBlock, context);
     return long ? accFeeLong : accFeeShort;
 };
-const getPairGroupAccFeesDeltas = (i, pairGroups, initialFees, pairIndex, long, context) => {
+const getPairGroupAccFeesDeltas = (i, pairGroups, initialFees, pairIndex, long, currentPairPrice, context) => {
     const group = pairGroups[i];
     const beforeTradeOpen = group.block < initialFees.block;
     let deltaGroup, deltaPair;
     if (i == pairGroups.length - 1) {
         const { currentBlock, groups, pairs, collateralPriceUsd } = context;
-        const openInterest = pairs[pairIndex].oi;
+        const openInterest = (0, __1.getPairTotalOisDynamicCollateral)(pairIndex, {
+            pairOis: context.pairOis,
+            currentPairPrice,
+        });
         deltaGroup = getGroupPendingAccFee(group.groupIndex, currentBlock, long, {
             groups,
             collateralPriceUsd,
         });
         deltaPair = getPairPendingAccFee(pairIndex, currentBlock, long, {
             pairs,
-            openInterest,
+            openInterest: {
+                long: openInterest.long,
+                short: openInterest.short,
+                max: context.pairOis[pairIndex].maxCollateral,
+            },
             collateralPriceUsd,
         });
     }
@@ -180,7 +196,7 @@ collateralPriceUsd) => {
     const maxNetOi = maxOiUsd * maxP;
     // Calculate the minimum acc fee delta (applies to both sides)
     const minDelta = minNetOi > 0
-        ? getPendingAccFeesDelta(blockDistance, feePerBlock, netOi, maxOiUsd, feeExponent)
+        ? getPendingAccFeesDelta(blockDistance, feePerBlock, minNetOi, maxOiUsd, feeExponent)
         : 0;
     // Calculate the actual acc fee (using capped oi of 100% or less)
     const delta = netOi > minNetOi

package/lib/trade/fees/borrowingV2/fetcher.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="mocha" />
 import type { GNSMultiCollatDiamond } from "../../../contracts/types/generated";
 import { BorrowingFeeV2 } from ".";
 /**

package/lib/trade/fees/fundingFees/converter.js

@@ -74,7 +74,7 @@ exports.convertPairFundingFeeDataArray = convertPairFundingFeeDataArray;
  */
 const convertPairGlobalParams = (contractParams) => {
     return {
-        maxSkewCollateral: Number(contractParams.maxSkewCollateral),
+        maxSkewCollateral: Number(contractParams.maxSkewCollateral) / 1e10,
     };
 };
 exports.convertPairGlobalParams = convertPairGlobalParams;

package/lib/trade/fees/index.d.ts

@@ -6,5 +6,6 @@ export { convertTradeFeesData, convertTradeFeesDataArray, convertUiRealizedPnlDa
 export { BorrowingFeeV2, borrowingFeeV2Utils, getPairPendingAccBorrowingFees as getPairPendingAccBorrowingFeesV2, getTradeBorrowingFeesCollateral as getTradeBorrowingFeesCollateralV2, getPairBorrowingFees as getPairBorrowingFeesV2, MAX_BORROWING_RATE_PER_SECOND as MAX_BORROWING_RATE_PER_SECOND_V2, BORROWING_V2_PRECISION, } from "./borrowingV2";
 export { convertBorrowingFeeParams as convertBorrowingFeeParamsV2, convertBorrowingFeeParamsArray as convertBorrowingFeeParamsArrayV2, convertPairBorrowingFeeData as convertPairBorrowingFeeDataV2, convertPairBorrowingFeeDataArray as convertPairBorrowingFeeDataArrayV2, convertTradeInitialAccFees as convertTradeInitialAccFeesV2, convertTradeInitialAccFeesArray as convertTradeInitialAccFeesArrayV2, createBorrowingV2Context, isValidBorrowingRate as isValidBorrowingRateV2, borrowingRateToAPR as borrowingRateToAPRV2, aprToBorrowingRate as aprToBorrowingRateV2, } from "./borrowingV2/converter";
 export { fetchBorrowingFeeParamsV2, fetchPairBorrowingFeeDataV2, fetchTradeBorrowingFeesCollateralV2, fetchPairPendingAccBorrowingFeesV2, fetchAllBorrowingV2Data, createBorrowingV2ContextFromContract, createBorrowingV2ContextFromArrays, fetchBorrowingV2DataForPairs, } from "./borrowingV2/fetcher";
+export { buildBorrowingV2Context } from "./borrowingV2/builder";
 export { FundingFees, getCurrentFundingVelocityPerYear, getSecondsToReachZeroRate, getAvgFundingRatePerSecondP, getLongShortAprMultiplier, getPairPendingAccFundingFees, getTradeFundingFeesCollateral, getTradeFundingFeesCollateralSimple, getTradeFundingFees, } from "./fundingFees";
 export { convertFundingFeeParams, convertFundingFeeParamsArray, convertPairFundingFeeData, convertPairFundingFeeDataArray, convertPairGlobalParams, convertPairGlobalParamsArray, convertTradeInitialAccFundingFees, createFundingFeeContext, isValidFundingRate, fundingRateToAPR, aprToFundingRate, calculateVelocityFromSkew, FUNDING_FEES_PRECISION, } from "./fundingFees/converter";

package/lib/trade/fees/index.js

@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fundingRateToAPR = exports.isValidFundingRate = exports.createFundingFeeContext = exports.convertTradeInitialAccFundingFees = exports.convertPairGlobalParamsArray = exports.convertPairGlobalParams = exports.convertPairFundingFeeDataArray = exports.convertPairFundingFeeData = exports.convertFundingFeeParamsArray = exports.convertFundingFeeParams = exports.getTradeFundingFees = exports.getTradeFundingFeesCollateralSimple = exports.getTradeFundingFeesCollateral = exports.getPairPendingAccFundingFees = exports.getLongShortAprMultiplier = exports.getAvgFundingRatePerSecondP = exports.getSecondsToReachZeroRate = exports.getCurrentFundingVelocityPerYear = exports.FundingFees = exports.fetchBorrowingV2DataForPairs = exports.createBorrowingV2ContextFromArrays = exports.createBorrowingV2ContextFromContract = exports.fetchAllBorrowingV2Data = exports.fetchPairPendingAccBorrowingFeesV2 = exports.fetchTradeBorrowingFeesCollateralV2 = exports.fetchPairBorrowingFeeDataV2 = exports.fetchBorrowingFeeParamsV2 = exports.aprToBorrowingRateV2 = exports.borrowingRateToAPRV2 = exports.isValidBorrowingRateV2 = exports.createBorrowingV2Context = exports.convertTradeInitialAccFeesArrayV2 = exports.convertTradeInitialAccFeesV2 = exports.convertPairBorrowingFeeDataArrayV2 = exports.convertPairBorrowingFeeDataV2 = exports.convertBorrowingFeeParamsArrayV2 = exports.convertBorrowingFeeParamsV2 = exports.BORROWING_V2_PRECISION = exports.MAX_BORROWING_RATE_PER_SECOND_V2 = exports.getPairBorrowingFeesV2 = exports.getTradeBorrowingFeesCollateralV2 = exports.getPairPendingAccBorrowingFeesV2 = exports.borrowingFeeV2Utils = exports.BorrowingFeeV2 = exports.encodeUiRealizedPnlData = exports.encodeTradeFeesData = exports.convertUiRealizedPnlDataArray = exports.convertUiRealizedPnlData = exports.convertTradeFeesDataArray = exports.convertTradeFeesData = void 0;
-exports.FUNDING_FEES_PRECISION = exports.calculateVelocityFromSkew = exports.aprToFundingRate = void 0;
+exports.isValidFundingRate = exports.createFundingFeeContext = exports.convertTradeInitialAccFundingFees = exports.convertPairGlobalParamsArray = exports.convertPairGlobalParams = exports.convertPairFundingFeeDataArray = exports.convertPairFundingFeeData = exports.convertFundingFeeParamsArray = exports.convertFundingFeeParams = exports.getTradeFundingFees = exports.getTradeFundingFeesCollateralSimple = exports.getTradeFundingFeesCollateral = exports.getPairPendingAccFundingFees = exports.getLongShortAprMultiplier = exports.getAvgFundingRatePerSecondP = exports.getSecondsToReachZeroRate = exports.getCurrentFundingVelocityPerYear = exports.FundingFees = exports.buildBorrowingV2Context = exports.fetchBorrowingV2DataForPairs = exports.createBorrowingV2ContextFromArrays = exports.createBorrowingV2ContextFromContract = exports.fetchAllBorrowingV2Data = exports.fetchPairPendingAccBorrowingFeesV2 = exports.fetchTradeBorrowingFeesCollateralV2 = exports.fetchPairBorrowingFeeDataV2 = exports.fetchBorrowingFeeParamsV2 = exports.aprToBorrowingRateV2 = exports.borrowingRateToAPRV2 = exports.isValidBorrowingRateV2 = exports.createBorrowingV2Context = exports.convertTradeInitialAccFeesArrayV2 = exports.convertTradeInitialAccFeesV2 = exports.convertPairBorrowingFeeDataArrayV2 = exports.convertPairBorrowingFeeDataV2 = exports.convertBorrowingFeeParamsArrayV2 = exports.convertBorrowingFeeParamsV2 = exports.BORROWING_V2_PRECISION = exports.MAX_BORROWING_RATE_PER_SECOND_V2 = exports.getPairBorrowingFeesV2 = exports.getTradeBorrowingFeesCollateralV2 = exports.getPairPendingAccBorrowingFeesV2 = exports.borrowingFeeV2Utils = exports.BorrowingFeeV2 = exports.encodeUiRealizedPnlData = exports.encodeTradeFeesData = exports.convertUiRealizedPnlDataArray = exports.convertUiRealizedPnlData = exports.convertTradeFeesDataArray = exports.convertTradeFeesData = void 0;
+exports.FUNDING_FEES_PRECISION = exports.calculateVelocityFromSkew = exports.aprToFundingRate = exports.fundingRateToAPR = void 0;
 __exportStar(require("./borrowing"), exports);
 __exportStar(require("./tiers"), exports);
 __exportStar(require("./trading"), exports);
@@ -58,6 +58,8 @@ Object.defineProperty(exports, "fetchAllBorrowingV2Data", { enumerable: true, ge
 Object.defineProperty(exports, "createBorrowingV2ContextFromContract", { enumerable: true, get: function () { return fetcher_1.createBorrowingV2ContextFromContract; } });
 Object.defineProperty(exports, "createBorrowingV2ContextFromArrays", { enumerable: true, get: function () { return fetcher_1.createBorrowingV2ContextFromArrays; } });
 Object.defineProperty(exports, "fetchBorrowingV2DataForPairs", { enumerable: true, get: function () { return fetcher_1.fetchBorrowingV2DataForPairs; } });
+var builder_1 = require("./borrowingV2/builder");
+Object.defineProperty(exports, "buildBorrowingV2Context", { enumerable: true, get: function () { return builder_1.buildBorrowingV2Context; } });
 // Funding Fees exports
 var fundingFees_1 = require("./fundingFees");
 Object.defineProperty(exports, "FundingFees", { enumerable: true, get: function () { return fundingFees_1.FundingFees; } });

package/lib/trade/fees/trading/index.js

@@ -137,7 +137,7 @@ const getTradePendingHoldingFeesCollateral = (trade, tradeInfo, tradeFeesData, c
     // Calculate v1 borrowing fees (some markets use v1 indefinitely)
     let borrowingFeeCollateral_old = 0;
     if (context.borrowingV1 && context.initialAccFees) {
-        borrowingFeeCollateral_old = (0, borrowing_1.getBorrowingFee)(positionSizeCollateral, trade.pairIndex, trade.long, context.initialAccFees, context.borrowingV1);
+        borrowingFeeCollateral_old = (0, borrowing_1.getBorrowingFee)(positionSizeCollateral, trade.pairIndex, trade.long, context.initialAccFees, currentPairPrice, context.borrowingV1);
     }
     return {
         fundingFeeCollateral,

package/lib/trade/pnl/index.d.ts

@@ -6,6 +6,7 @@ import { Trade, TradeInfo, LiquidationParams, Fee, GlobalTradeFeeParams, TradeFe
 import { ComprehensivePnlResult, GetComprehensivePnlContext } from "./types";
 import { BorrowingFee } from "../fees/borrowing";
 import { ContractsVersion } from "../../contracts/types";
+import { UnifiedPairOi } from "src/markets";
 /**
  * @dev Gets trade realized PnL components from TradeFeesData
  * @dev Mirrors contract's getTradeRealizedPnlCollateral function
@@ -60,6 +61,7 @@ export type GetPnlContext = {
     fee: Fee;
     globalTradeFeeParams: GlobalTradeFeeParams;
     traderFeeMultiplier?: number;
+    pairOis: UnifiedPairOi[];
 };
 /**
  * @dev Legacy PnL calculation function

package/lib/trade/pnl/index.js

@@ -91,7 +91,7 @@ const getComprehensivePnl = (trade, marketPrice, executionPrice, tradeInfo, cont
     // Calculate position size
     const positionSizeCollateral = trade.collateralAmount * trade.leverage;
     // Calculate holding fees - always use getTradePendingHoldingFeesCollateral
-    const pendingHoldingFees = (0, trading_1.getTradePendingHoldingFeesCollateral)(trade, tradeInfo, context.tradeData.tradeFeesData, executionPrice, {
+    const pendingHoldingFees = (0, trading_1.getTradePendingHoldingFeesCollateral)(trade, tradeInfo, context.tradeData.tradeFeesData, marketPrice, {
         contractsVersion: context.core.contractsVersion,
         currentTimestamp: context.core.currentTimestamp,
         collateralPriceUsd: context.core.collateralPriceUsd,
@@ -206,11 +206,12 @@ const getPnl = (price, trade, _tradeInfo, initialAccFees, liquidationParams, use
         context.groups &&
         context.currentBlock !== undefined &&
         context.collateralPriceUsd !== undefined) {
-        pnlCollat -= (0, borrowing_1.getBorrowingFee)(posCollat * trade.leverage, trade.pairIndex, trade.long, initialAccFees, {
+        pnlCollat -= (0, borrowing_1.getBorrowingFee)(posCollat * trade.leverage, trade.pairIndex, trade.long, initialAccFees, price, {
             currentBlock: context.currentBlock,
             groups: context.groups,
             pairs: context.pairs,
             collateralPriceUsd: context.collateralPriceUsd,
+            pairOis: context.pairOis,
         });
     }
     let pnlPercentage = (pnlCollat / posCollat) * 100;

package/lib/trade/priceImpact/open/index.js

@@ -56,6 +56,7 @@ const getTradeOpeningPriceImpact = (input, context) => {
     return {
         priceAfterImpact,
         percentProfitP,
+        fixedSpreadP: spreadP,
         cumulVolPriceImpactP,
         baseSkewPriceImpactP: skewPriceImpactObject.basePriceImpactP,
         tradeSkewPriceImpactP: skewPriceImpactObject.tradePriceImpactP,

package/lib/trade/priceImpact/open/types.d.ts

@@ -35,6 +35,7 @@ export type TradeOpeningPriceImpactContext = {
 export type TradeOpeningPriceImpactResult = {
     priceAfterImpact: number;
     percentProfitP: number;
+    fixedSpreadP: number;
     cumulVolPriceImpactP: number;
     baseSkewPriceImpactP: number;
     tradeSkewPriceImpactP: number;

package/lib/trade/types.d.ts

@@ -719,5 +719,21 @@ export declare enum PairIndex {
     SBETUSD = 393,
     PLTRUSD = 394,
     BIDUUSD = 395,
-    ROKUUSD = 396
+    ROKUUSD = 396,
+    LMTUSD = 397,
+    RIOTUSD = 398,
+    MARAUSD = 399,
+    LOKAUSD = 400,
+    STOUSD = 401,
+    FUNUSD = 402,
+    KNCUSD = 403,
+    HUSD = 404,
+    ICNTUSD = 405,
+    NEWTUSD = 406,
+    PUMPUSD = 407,
+    SAROSUSD = 408,
+    SPKUSD = 409,
+    ERAUSD = 410,
+    BGSCUSD = 411,
+    TAGUSD = 412
 }

package/lib/trade/types.js

@@ -426,4 +426,20 @@ var PairIndex;
     PairIndex[PairIndex["PLTRUSD"] = 394] = "PLTRUSD";
     PairIndex[PairIndex["BIDUUSD"] = 395] = "BIDUUSD";
     PairIndex[PairIndex["ROKUUSD"] = 396] = "ROKUUSD";
+    PairIndex[PairIndex["LMTUSD"] = 397] = "LMTUSD";
+    PairIndex[PairIndex["RIOTUSD"] = 398] = "RIOTUSD";
+    PairIndex[PairIndex["MARAUSD"] = 399] = "MARAUSD";
+    PairIndex[PairIndex["LOKAUSD"] = 400] = "LOKAUSD";
+    PairIndex[PairIndex["STOUSD"] = 401] = "STOUSD";
+    PairIndex[PairIndex["FUNUSD"] = 402] = "FUNUSD";
+    PairIndex[PairIndex["KNCUSD"] = 403] = "KNCUSD";
+    PairIndex[PairIndex["HUSD"] = 404] = "HUSD";
+    PairIndex[PairIndex["ICNTUSD"] = 405] = "ICNTUSD";
+    PairIndex[PairIndex["NEWTUSD"] = 406] = "NEWTUSD";
+    PairIndex[PairIndex["PUMPUSD"] = 407] = "PUMPUSD";
+    PairIndex[PairIndex["SAROSUSD"] = 408] = "SAROSUSD";
+    PairIndex[PairIndex["SPKUSD"] = 409] = "SPKUSD";
+    PairIndex[PairIndex["ERAUSD"] = 410] = "ERAUSD";
+    PairIndex[PairIndex["BGSCUSD"] = 411] = "BGSCUSD";
+    PairIndex[PairIndex["TAGUSD"] = 412] = "TAGUSD";
 })(PairIndex = exports.PairIndex || (exports.PairIndex = {}));

package/package.json

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