@gainsnetwork/sdk 0.2.54-rc1 → 0.2.55-rc1

package/lib/contracts/types/generated/factories/GNSMultiCollatDiamond__factory.js

@@ -10969,26 +10969,6 @@ const _abi = [
         name: "BorrowingZeroGroup",
         type: "error",
     },
-    {
-        anonymous: false,
-        inputs: [
-            {
-                indexed: false,
-                internalType: "uint32",
-                name: "minP",
-                type: "uint32",
-            },
-            {
-                indexed: false,
-                internalType: "uint32",
-                name: "maxP",
-                type: "uint32",
-            },
-        ],
-        name: "BorrowingFeePerBlockCapUpdated",
-        type: "event",
-        signature: "0xca38800286190b44d87a61aaf551868afbd46f1f76ed5b145e4e975e446a2964",
-    },
     {
         anonymous: false,
         inputs: [
@@ -11203,38 +11183,6 @@ const _abi = [
         type: "event",
         signature: "0x12515cf8712ede0f0e48dd7513c14f22f116a6b3f95bd493da7511cf7dcbadd7",
     },
-    {
-        anonymous: false,
-        inputs: [
-            {
-                indexed: true,
-                internalType: "uint8",
-                name: "collateralIndex",
-                type: "uint8",
-            },
-            {
-                indexed: true,
-                internalType: "uint16",
-                name: "pairIndex",
-                type: "uint16",
-            },
-            {
-                indexed: false,
-                internalType: "uint32",
-                name: "minP",
-                type: "uint32",
-            },
-            {
-                indexed: false,
-                internalType: "uint32",
-                name: "maxP",
-                type: "uint32",
-            },
-        ],
-        name: "BorrowingPairFeePerBlockCapUpdated",
-        type: "event",
-        signature: "0xf5413841beaa3a78d74ab0e0e7528e0f5d357a193b9f600eb87c8746475109f6",
-    },
     {
         anonymous: false,
         inputs: [
@@ -11537,32 +11485,6 @@ const _abi = [
         type: "function",
         signature: "0x48da5b38",
     },
-    {
-        inputs: [],
-        name: "getBorrowingFeePerBlockCap",
-        outputs: [
-            {
-                components: [
-                    {
-                        internalType: "uint32",
-                        name: "minP",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "maxP",
-                        type: "uint32",
-                    },
-                ],
-                internalType: "struct IBorrowingFees.BorrowingFeePerBlockCap",
-                name: "",
-                type: "tuple",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0x06c01bef",
-    },
     {
         inputs: [
             {
@@ -11694,12 +11616,7 @@ const _abi = [
             },
             {
                 internalType: "uint64",
-                name: "groupAccFeeLongDelta",
-                type: "uint64",
-            },
-            {
-                internalType: "uint64",
-                name: "groupAccFeeShortDelta",
+                name: "groupAccFeeDelta",
                 type: "uint64",
             },
         ],
@@ -11890,80 +11807,6 @@ const _abi = [
         type: "function",
         signature: "0x5d5bf24d",
     },
-    {
-        inputs: [
-            {
-                internalType: "uint8",
-                name: "_collateralIndex",
-                type: "uint8",
-            },
-            {
-                internalType: "uint16",
-                name: "_pairIndex",
-                type: "uint16",
-            },
-        ],
-        name: "getBorrowingPairFeePerBlockCap",
-        outputs: [
-            {
-                components: [
-                    {
-                        internalType: "uint32",
-                        name: "minP",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "maxP",
-                        type: "uint32",
-                    },
-                ],
-                internalType: "struct IBorrowingFees.BorrowingFeePerBlockCap",
-                name: "",
-                type: "tuple",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0x7bdbfe5a",
-    },
-    {
-        inputs: [
-            {
-                internalType: "uint8",
-                name: "_collateralIndex",
-                type: "uint8",
-            },
-            {
-                internalType: "uint16[]",
-                name: "_indices",
-                type: "uint16[]",
-            },
-        ],
-        name: "getBorrowingPairFeePerBlockCaps",
-        outputs: [
-            {
-                components: [
-                    {
-                        internalType: "uint32",
-                        name: "minP",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "maxP",
-                        type: "uint32",
-                    },
-                ],
-                internalType: "struct IBorrowingFees.BorrowingFeePerBlockCap[]",
-                name: "",
-                type: "tuple[]",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0x0a67b9a3",
-    },
     {
         inputs: [
             {
@@ -12140,12 +11983,7 @@ const _abi = [
             },
             {
                 internalType: "uint64",
-                name: "pairAccFeeLongDelta",
-                type: "uint64",
-            },
-            {
-                internalType: "uint64",
-                name: "pairAccFeeShortDelta",
+                name: "pairAccFeeDelta",
                 type: "uint64",
             },
         ],
@@ -12463,32 +12301,6 @@ const _abi = [
         type: "function",
         signature: "0xfc79e929",
     },
-    {
-        inputs: [
-            {
-                components: [
-                    {
-                        internalType: "uint32",
-                        name: "minP",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "maxP",
-                        type: "uint32",
-                    },
-                ],
-                internalType: "struct IBorrowingFees.BorrowingFeePerBlockCap",
-                name: "_feePerBlockCap",
-                type: "tuple",
-            },
-        ],
-        name: "initializeBorrowingFeePerBlockCap",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0x1a733ea0",
-    },
     {
         inputs: [
             {
@@ -12523,32 +12335,6 @@ const _abi = [
         type: "function",
         signature: "0x4fa72788",
     },
-    {
-        inputs: [
-            {
-                components: [
-                    {
-                        internalType: "uint32",
-                        name: "minP",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "maxP",
-                        type: "uint32",
-                    },
-                ],
-                internalType: "struct IBorrowingFees.BorrowingFeePerBlockCap",
-                name: "_feePerBlockCap",
-                type: "tuple",
-            },
-        ],
-        name: "setBorrowingFeePerBlockCap",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0x197b65a5",
-    },
     {
         inputs: [
             {
@@ -12631,42 +12417,6 @@ const _abi = [
         type: "function",
         signature: "0x02c4e7c1",
     },
-    {
-        inputs: [
-            {
-                internalType: "uint8",
-                name: "_collateralIndex",
-                type: "uint8",
-            },
-            {
-                internalType: "uint16[]",
-                name: "_indices",
-                type: "uint16[]",
-            },
-            {
-                components: [
-                    {
-                        internalType: "uint32",
-                        name: "minP",
-                        type: "uint32",
-                    },
-                    {
-                        internalType: "uint32",
-                        name: "maxP",
-                        type: "uint32",
-                    },
-                ],
-                internalType: "struct IBorrowingFees.BorrowingFeePerBlockCap[]",
-                name: "_values",
-                type: "tuple[]",
-            },
-        ],
-        name: "setBorrowingPairFeePerBlockCapArray",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0x92748a7d",
-    },
     {
         inputs: [
             {
@@ -12911,20 +12661,6 @@ const _abi = [
         type: "event",
         signature: "0x764c19c693af0da42ec6c6bed68a2dd1a2fa93d24785fcfce58ffa29ae313606",
     },
-    {
-        anonymous: false,
-        inputs: [
-            {
-                indexed: false,
-                internalType: "uint8",
-                name: "limitJobCount",
-                type: "uint8",
-            },
-        ],
-        name: "LimitJobCountUpdated",
-        type: "event",
-        signature: "0xe3fd233ab0f657acfa4eec07f6b1d79a510c3eef274d27d305c7fc47695a1e7f",
-    },
     {
         anonymous: false,
         inputs: [
@@ -13534,20 +13270,6 @@ const _abi = [
         type: "function",
         signature: "0x891e656c",
     },
-    {
-        inputs: [],
-        name: "getLimitJobCount",
-        outputs: [
-            {
-                internalType: "uint8",
-                name: "",
-                type: "uint8",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0x75d097a7",
-    },
     {
         inputs: [],
         name: "getLimitJobId",
@@ -13562,20 +13284,6 @@ const _abi = [
         type: "function",
         signature: "0xf4b0664d",
     },
-    {
-        inputs: [],
-        name: "getLimitJobIndex",
-        outputs: [
-            {
-                internalType: "uint88",
-                name: "",
-                type: "uint88",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-        signature: "0xdb461060",
-    },
     {
         inputs: [
             {
@@ -13934,20 +13642,6 @@ const _abi = [
         type: "function",
         signature: "0xbbad411a",
     },
-    {
-        inputs: [
-            {
-                internalType: "uint8",
-                name: "_limitJobCount",
-                type: "uint8",
-            },
-        ],
-        name: "initializeLimitJobCount",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0xc386f31b",
-    },
     {
         inputs: [
             {
@@ -14047,20 +13741,6 @@ const _abi = [
         type: "function",
         signature: "0x25e589cd",
     },
-    {
-        inputs: [
-            {
-                internalType: "uint8",
-                name: "_limitJobCount",
-                type: "uint8",
-            },
-        ],
-        name: "setLimitJobCount",
-        outputs: [],
-        stateMutability: "nonpayable",
-        type: "function",
-        signature: "0x19a891e4",
-    },
     {
         inputs: [
             {

package/lib/contracts/utils/borrowingFees.js

@@ -31,9 +31,7 @@ const getBorrowingGroupName = (groupIndex) => {
 };
 exports.getBorrowingGroupName = getBorrowingGroupName;
 const fetchAllPairBorrowingFees = (contract, collateralIndex) => __awaiter(void 0, void 0, void 0, function* () {
-    const [pairs, pairOi, pairGroups] = yield contract.getAllBorrowingPairs(collateralIndex);
-    const feeCaps = yield contract.getBorrowingPairFeePerBlockCaps(collateralIndex, [...Array(pairs.length).keys()]);
-    return (0, trade_1.convertPairBorrowingFees)([pairs, pairOi, pairGroups, feeCaps]);
+    return (0, trade_1.convertPairBorrowingFees)(yield contract.getAllBorrowingPairs(collateralIndex));
 });
 exports.fetchAllPairBorrowingFees = fetchAllPairBorrowingFees;
 const fetchGroupBorrowingFees = (contract, collateralIndex, groupIxs) => __awaiter(void 0, void 0, void 0, function* () {

package/lib/contracts/utils/pairs.js

@@ -443,4 +443,8 @@ const PAIR_INDEX_TO_DESCRIPTION = {
     [types_1.PairIndex.GRIFFAINUSD]: "GRIFFAIN to US Dollar",
     [types_1.PairIndex.SWARMSUSD]: "Swarms to US Dollar",
     [types_1.PairIndex.ANIMEUSD]: "Animecoin to US Dollar",
+    [types_1.PairIndex.PLUMEUSD]: "Plume to US Dollar",
+    [types_1.PairIndex.VVVUSD]: "Venice Token to US Dollar",
+    [types_1.PairIndex.VINEUSD]: "Vine coin to US Dollar",
+    [types_1.PairIndex.TOSHIUSD]: "Toshi to US Dollar",
 };

package/lib/trade/fees/borrowing/converter.d.ts

@@ -1,12 +1,11 @@
 import { IBorrowingFees } from "../../../contracts/types/generated/GNSMultiCollatDiamond";
 import { BorrowingFee } from ".";
 export declare const convertPairGroupBorrowingFee: (pairGroup: IBorrowingFees.BorrowingPairGroupStructOutput) => BorrowingFee.PairGroup;
-export declare const convertPairBorrowingFee: (pair: IBorrowingFees.BorrowingDataStructOutput, pairOi: IBorrowingFees.OpenInterestStructOutput, pairGroup: IBorrowingFees.BorrowingPairGroupStructOutput[], feeCap: IBorrowingFees.BorrowingFeePerBlockCapStructOutput) => BorrowingFee.Pair;
-export declare const convertPairBorrowingFees: ([pairs, pairOi, pairGroups, feeCaps]: [
+export declare const convertPairBorrowingFee: (pair: IBorrowingFees.BorrowingDataStructOutput, pairOi: IBorrowingFees.OpenInterestStructOutput, pairGroup: IBorrowingFees.BorrowingPairGroupStructOutput[]) => BorrowingFee.Pair;
+export declare const convertPairBorrowingFees: ([pairs, pairOi, pairGroups]: [
     IBorrowingFees.BorrowingDataStructOutput[],
     IBorrowingFees.OpenInterestStructOutput[],
-    IBorrowingFees.BorrowingPairGroupStructOutput[][],
-    IBorrowingFees.BorrowingFeePerBlockCapStructOutput[]
+    IBorrowingFees.BorrowingPairGroupStructOutput[][]
 ]) => BorrowingFee.Pair[];
 export declare const convertGroupBorrowingFee: (group: IBorrowingFees.BorrowingDataStructOutput, groupOi: IBorrowingFees.OpenInterestStructOutput) => BorrowingFee.Group;
 export declare const convertGroupBorrowingData: (obj: IBorrowingFees.BorrowingDataStructOutput, oi: IBorrowingFees.OpenInterestStructOutput) => BorrowingFee.BorrowingData & BorrowingFee.BorrowingOi;
@@ -14,4 +13,3 @@ export declare const convertGroupBorrowingFees: ([groups, groupOis]: [
     IBorrowingFees.BorrowingDataStructOutput[],
     IBorrowingFees.OpenInterestStructOutput[]
 ]) => BorrowingFee.Group[];
-export declare const convertFeePerBlockCap: (feeCap: IBorrowingFees.BorrowingFeePerBlockCapStructOutput) => BorrowingFee.BorrowingFeePerBlockCap;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertFeePerBlockCap = exports.convertGroupBorrowingFees = exports.convertGroupBorrowingData = exports.convertGroupBorrowingFee = exports.convertPairBorrowingFees = exports.convertPairBorrowingFee = exports.convertPairGroupBorrowingFee = void 0;
+exports.convertGroupBorrowingFees = exports.convertGroupBorrowingData = exports.convertGroupBorrowingFee = exports.convertPairBorrowingFees = exports.convertPairBorrowingFee = exports.convertPairGroupBorrowingFee = void 0;
 const borrowingFees_1 = require("../../../contracts/utils/borrowingFees");
 const convertPairGroupBorrowingFee = (pairGroup) => ({
     groupIndex: pairGroup.groupIndex,
@@ -14,9 +14,9 @@ const convertPairGroupBorrowingFee = (pairGroup) => ({
     block: pairGroup.block,
 });
 exports.convertPairGroupBorrowingFee = convertPairGroupBorrowingFee;
-const convertPairBorrowingFee = (pair, pairOi, pairGroup, feeCap) => (Object.assign(Object.assign({}, (0, exports.convertGroupBorrowingData)(pair, pairOi)), { groups: pairGroup.map(value => (0, exports.convertPairGroupBorrowingFee)(value)), feePerBlockCap: (0, exports.convertFeePerBlockCap)(feeCap) }));
+const convertPairBorrowingFee = (pair, pairOi, pairGroup) => (Object.assign(Object.assign({}, (0, exports.convertGroupBorrowingData)(pair, pairOi)), { groups: pairGroup.map(value => (0, exports.convertPairGroupBorrowingFee)(value)) }));
 exports.convertPairBorrowingFee = convertPairBorrowingFee;
-const convertPairBorrowingFees = ([pairs, pairOi, pairGroups, feeCaps]) => pairs.map((value, ix) => (0, exports.convertPairBorrowingFee)(value, pairOi[ix], pairGroups[ix], feeCaps[ix]));
+const convertPairBorrowingFees = ([pairs, pairOi, pairGroups]) => pairs.map((value, ix) => (0, exports.convertPairBorrowingFee)(value, pairOi[ix], pairGroups[ix]));
 exports.convertPairBorrowingFees = convertPairBorrowingFees;
 const convertGroupBorrowingFee = (group, groupOi) => (0, exports.convertGroupBorrowingData)(group, groupOi);
 exports.convertGroupBorrowingFee = convertGroupBorrowingFee;
@@ -35,8 +35,3 @@ const convertGroupBorrowingData = (obj, oi) => ({
 exports.convertGroupBorrowingData = convertGroupBorrowingData;
 const convertGroupBorrowingFees = ([groups, groupOis]) => groups.map((value, ix) => (0, exports.convertGroupBorrowingFee)(value, groupOis[ix]));
 exports.convertGroupBorrowingFees = convertGroupBorrowingFees;
-const convertFeePerBlockCap = (feeCap) => ({
-    minP: feeCap.minP ? parseFloat(feeCap.minP.toString()) / 1e3 / 100 : 0,
-    maxP: feeCap.maxP ? parseFloat(feeCap.maxP.toString()) / 1e3 / 100 : 1,
-});
-exports.convertFeePerBlockCap = convertFeePerBlockCap;

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

@@ -22,8 +22,7 @@ export declare const borrowingFeeUtils: {
     }) => {
         accFeeLong: number;
         accFeeShort: number;
-        deltaLong: number;
-        deltaShort: number;
+        delta: number;
     };
     getPairPendingAccFee: (pairIndex: PairIndex, currentBlock: number, long: boolean, context: {
         pairs: BorrowingFee.Pair[];
@@ -34,25 +33,21 @@ export declare const borrowingFeeUtils: {
     }) => {
         accFeeLong: number;
         accFeeShort: number;
-        deltaLong: number;
-        deltaShort: number;
+        delta: number;
     };
     getGroupPendingAccFee: (groupIndex: number, currentBlock: number, long: boolean, context: {
         groups: BorrowingFee.Group[];
     }) => number;
-    getPendingAccFees: (accFeeLong: number, accFeeShort: number, oiLong: number, oiShort: number, feePerBlock: number, currentBlock: number, accLastUpdatedBlock: number, maxOi: number, feeExponent: number, feeCaps?: BorrowingFee.BorrowingFeePerBlockCap) => {
+    getPendingAccFees: (accFeeLong: number, accFeeShort: number, oiLong: number, oiShort: number, feePerBlock: number, currentBlock: number, accLastUpdatedBlock: number, maxOi: number, feeExponent: number) => {
         accFeeLong: number;
         accFeeShort: number;
-        deltaLong: number;
-        deltaShort: number;
+        delta: number;
     };
     getActiveFeePerBlock: (pair: BorrowingFee.Pair, group: BorrowingFee.Group | undefined) => number;
     getBorrowingDataActiveFeePerBlock: (val: BorrowingFee.Pair | BorrowingFee.Group) => number;
     getPairGroupIndex: (pairIndex: PairIndex, context: {
         pairs: BorrowingFee.Pair[];
     }) => number;
-    getPendingAccFeesDelta: (blockDistance: number, feePerBlock: number, netOi: number, maxOi: number, feeExponent: number) => number;
-    getFeePerBlockCaps: (cap?: BorrowingFee.BorrowingFeePerBlockCap) => BorrowingFee.BorrowingFeePerBlockCap;
 };
 export * as BorrowingFee from "./types";
 export * from "./converter";

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

@@ -77,7 +77,7 @@ const getPairGroupIndex = (pairIndex, context) => {
 const getPairPendingAccFees = (pairIndex, currentBlock, context) => {
     const { pairs, openInterest: { long, short }, } = 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);
+    return getPendingAccFees(pair.accFeeLong, pair.accFeeShort, long, short, pair.feePerBlock, currentBlock, pair.accLastUpdatedBlock, pair.oi.max, pair.feeExponent);
 };
 const getPairPendingAccFee = (pairIndex, currentBlock, long, context) => {
     const { accFeeLong, accFeeShort } = getPairPendingAccFees(pairIndex, currentBlock, context);
@@ -127,62 +127,22 @@ const getPairGroupAccFeesDeltas = (i, pairGroups, initialFees, pairIndex, long,
     }
     return { deltaGroup, deltaPair, beforeTradeOpen };
 };
-const getPendingAccFees = (accFeeLong, accFeeShort, oiLong, oiShort, feePerBlock, currentBlock, accLastUpdatedBlock, maxOi, feeExponent, feeCaps // as percentage: eg minP: 0.1 = 10%, maxP: 0.5 = 50%
-) => {
+const getPendingAccFees = (accFeeLong, accFeeShort, oiLong, oiShort, feePerBlock, currentBlock, accLastUpdatedBlock, maxOi, feeExponent) => {
     const moreShorts = oiLong < oiShort;
-    const blockDistance = currentBlock > accLastUpdatedBlock ? currentBlock - accLastUpdatedBlock : 0;
-    // If block distance is zero nothing changes
-    if (blockDistance === 0) {
-        return {
-            accFeeLong,
-            accFeeShort,
-            deltaLong: 0,
-            deltaShort: 0,
-        };
-    }
     const netOi = Math.abs(oiLong - oiShort);
-    // Calculate minimum and maximum effective oi
-    const { minP, maxP } = getFeePerBlockCaps(feeCaps);
-    const minNetOi = maxOi * minP;
-    const maxNetOi = maxOi * maxP;
-    // Calculate the minimum acc fee delta (applies to both sides)
-    const minDelta = minNetOi > 0
-        ? getPendingAccFeesDelta(blockDistance, feePerBlock, netOi, maxOi, feeExponent)
-        : 0;
-    // Calculate the actual acc fee (using capped oi of 100% or less)
-    const delta = netOi > minNetOi
-        ? getPendingAccFeesDelta(blockDistance, feePerBlock, Math.min(netOi, maxNetOi), // if netOi > cap, use cap
-        maxOi, feeExponent)
-        : minDelta;
-    const [deltaLong, deltaShort] = moreShorts
-        ? [minDelta, delta]
-        : [delta, minDelta];
-    return {
-        accFeeLong: accFeeLong + deltaLong,
-        accFeeShort: accFeeShort + deltaShort,
-        deltaLong,
-        deltaShort,
-    };
-};
-const getPendingAccFeesDelta = (blockDistance, feePerBlock, netOi, maxOi, feeExponent) => {
-    return maxOi > 0 && feeExponent > 0
-        ? feePerBlock * blockDistance * Math.pow((netOi / maxOi), feeExponent)
+    const delta = maxOi > 0 && feeExponent > 0
+        ? feePerBlock *
+            (currentBlock - accLastUpdatedBlock) *
+            Math.pow((netOi / maxOi), feeExponent)
         : 0;
-};
-const getFeePerBlockCaps = (cap) => {
-    return {
-        minP: (cap === null || cap === void 0 ? void 0 : cap.minP) || 0,
-        maxP: (cap === null || cap === void 0 ? void 0 : cap.maxP) && cap.maxP > 0 ? cap.maxP : 1,
-    };
+    const newAccFeeLong = moreShorts ? accFeeLong : accFeeLong + delta;
+    const newAccFeeShort = moreShorts ? accFeeShort + delta : accFeeShort;
+    return { accFeeLong: newAccFeeLong, accFeeShort: newAccFeeShort, delta };
 };
 const getBorrowingDataActiveFeePerBlock = (val) => {
     const { long, short, max } = val.oi;
-    const { minP, maxP } = getFeePerBlockCaps("feePerBlockCap" in val ? val.feePerBlockCap : undefined);
-    // Calculate the effective open interest
-    // If minP > 0 then netOi has to be at least minP * maxOi
-    // If maxP > 0 then netOi cannot be more than maxP * maxOi
-    const effectiveOi = Math.min(Math.max(Math.abs(long - short), max * minP), max * maxP);
-    return val.feePerBlock * Math.pow((effectiveOi / max), val.feeExponent);
+    const netOi = Math.abs(long - short);
+    return val.feePerBlock * Math.pow((netOi / max), val.feeExponent);
 };
 const getActiveFeePerBlock = (pair, group) => {
     const pairFeePerBlock = getBorrowingDataActiveFeePerBlock(pair);
@@ -202,8 +162,6 @@ exports.borrowingFeeUtils = {
     getActiveFeePerBlock,
     getBorrowingDataActiveFeePerBlock,
     getPairGroupIndex,
-    getPendingAccFeesDelta,
-    getFeePerBlockCaps,
 };
 exports.BorrowingFee = __importStar(require("./types"));
 __exportStar(require("./converter"), exports);

package/lib/trade/fees/borrowing/types.d.ts

@@ -20,13 +20,8 @@ export type PairGroup = {
 export type BorrowingOi = {
     oi: OpenInterest;
 };
-export type BorrowingFeePerBlockCap = {
-    minP: number;
-    maxP: number;
-};
 export type Pair = BorrowingData & BorrowingOi & {
     groups: PairGroup[];
-    feePerBlockCap?: BorrowingFeePerBlockCap;
 };
 export type Group = BorrowingData & BorrowingOi;
 export type InitialAccFees = {

package/lib/trade/types.d.ts

@@ -556,5 +556,9 @@ export declare enum PairIndex {
     ARKMUSD = 334,
     GRIFFAINUSD = 335,
     SWARMSUSD = 336,
-    ANIMEUSD = 337
+    ANIMEUSD = 337,
+    PLUMEUSD = 338,
+    VVVUSD = 339,
+    VINEUSD = 340,
+    TOSHIUSD = 341
 }

package/lib/trade/types.js

@@ -367,4 +367,8 @@ var PairIndex;
     PairIndex[PairIndex["GRIFFAINUSD"] = 335] = "GRIFFAINUSD";
     PairIndex[PairIndex["SWARMSUSD"] = 336] = "SWARMSUSD";
     PairIndex[PairIndex["ANIMEUSD"] = 337] = "ANIMEUSD";
+    PairIndex[PairIndex["PLUMEUSD"] = 338] = "PLUMEUSD";
+    PairIndex[PairIndex["VVVUSD"] = 339] = "VVVUSD";
+    PairIndex[PairIndex["VINEUSD"] = 340] = "VINEUSD";
+    PairIndex[PairIndex["TOSHIUSD"] = 341] = "TOSHIUSD";
 })(PairIndex = exports.PairIndex || (exports.PairIndex = {}));

package/package.json

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