@gainsnetwork/sdk 0.1.29-rc3 → 0.2.0-rc3

package/lib/index.d.ts

@@ -1,7 +1,7 @@
-export * from "./trade";
-export * from "./contracts";
-export * from "./markets";
-export * from "./constants";
-export * from "./utils";
-export * from "./vault";
-export * from "./trade/fees/borrowing/index";
+export * from "./trade";
+export * from "./contracts";
+export * from "./markets";
+export * from "./constants";
+export * from "./utils";
+export * from "./vault";
+export * from "./trade/fees/borrowing/index";

package/lib/index.js

@@ -1,24 +1,24 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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 });
-__exportStar(require("./trade"), exports);
-__exportStar(require("./contracts"), exports);
-__exportStar(require("./markets"), exports);
-__exportStar(require("./constants"), exports);
-__exportStar(require("./utils"), exports);
-__exportStar(require("./vault"), exports);
-// Not sure why this is needed, but it is. Barrel imports are not working.
-__exportStar(require("./trade/fees/borrowing/index"), exports);
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 });
+__exportStar(require("./trade"), exports);
+__exportStar(require("./contracts"), exports);
+__exportStar(require("./markets"), exports);
+__exportStar(require("./constants"), exports);
+__exportStar(require("./utils"), exports);
+__exportStar(require("./vault"), exports);
+// Not sure why this is needed, but it is. Barrel imports are not working.
+__exportStar(require("./trade/fees/borrowing/index"), exports);

package/lib/markets/commodities.d.ts

@@ -1 +1 @@
-export declare const isCommoditiesOpen: (dateToCheck: Date) => boolean;
+export declare const isCommoditiesOpen: (dateToCheck: Date) => boolean;

package/lib/markets/commodities.js

@@ -1,31 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCommoditiesOpen = void 0;
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-// @ts-ignore-file
-const luxon_1 = require("luxon");
-const COMMODITIES_MARKETS_TIME_ZONE_IANA = luxon_1.IANAZone.create("America/New_York");
-const isCommoditiesOpen = (dateToCheck) => {
-    const now = luxon_1.DateTime.fromJSDate(dateToCheck).setZone(COMMODITIES_MARKETS_TIME_ZONE_IANA);
-    const weekday = now.weekday;
-    const hour = now.hour;
-    const dayOfMonth = now.day;
-    const month = now.month;
-    const minute = now.minute;
-    const isClosed = 
-    // Christmas 2023
-    (month === 12 && dayOfMonth >= 25 && dayOfMonth <= 27) ||
-        // New Year's Eve 2023
-        (month === 1 && dayOfMonth >= 1 && dayOfMonth <= 2) ||
-        // Friday Closing
-        (weekday === 5 && hour >= 17) ||
-        // Saturday Closed
-        weekday === 6 ||
-        // Saturday Opening
-        (weekday === 7 && hour <= 18) ||
-        // Daily Closing
-        hour === 17;
-    return !isClosed;
-};
-exports.isCommoditiesOpen = isCommoditiesOpen;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isCommoditiesOpen = void 0;
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+// @ts-ignore-file
+const luxon_1 = require("luxon");
+const COMMODITIES_MARKETS_TIME_ZONE_IANA = luxon_1.IANAZone.create("America/New_York");
+const isCommoditiesOpen = (dateToCheck) => {
+    const now = luxon_1.DateTime.fromJSDate(dateToCheck).setZone(COMMODITIES_MARKETS_TIME_ZONE_IANA);
+    const weekday = now.weekday;
+    const hour = now.hour;
+    const dayOfMonth = now.day;
+    const month = now.month;
+    const minute = now.minute;
+    const isClosed = 
+    // Christmas 2023
+    (month === 12 && dayOfMonth >= 25 && dayOfMonth <= 27) ||
+        // New Year's Eve 2023
+        (month === 1 && dayOfMonth >= 1 && dayOfMonth <= 2) ||
+        // Friday Closing
+        (weekday === 5 && hour >= 17) ||
+        // Saturday Closed
+        weekday === 6 ||
+        // Saturday Opening
+        (weekday === 7 && hour <= 18) ||
+        // Daily Closing
+        hour === 17;
+    return !isClosed;
+};
+exports.isCommoditiesOpen = isCommoditiesOpen;

package/lib/markets/crypto.d.ts

@@ -1 +1 @@
-export declare const isCryptoOpen: (dateToCheck: Date) => boolean;
+export declare const isCryptoOpen: (dateToCheck: Date) => boolean;

package/lib/markets/crypto.js

@@ -1,6 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCryptoOpen = void 0;
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const isCryptoOpen = (dateToCheck) => true;
-exports.isCryptoOpen = isCryptoOpen;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isCryptoOpen = void 0;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const isCryptoOpen = (dateToCheck) => true;
+exports.isCryptoOpen = isCryptoOpen;

package/lib/markets/forex.d.ts

@@ -1,3 +1,3 @@
-import { Pair } from "src/trade";
-export declare const isForexOpen: (dateToCheck: Date) => boolean;
-export declare const isForexLowLiquidity: (timestampToCheck: number, pair?: Pair) => boolean;
+import { Pair } from "src/trade";
+export declare const isForexOpen: (dateToCheck: Date) => boolean;
+export declare const isForexLowLiquidity: (timestampToCheck: number, pair?: Pair) => boolean;

package/lib/markets/forex.js

@@ -1,45 +1,45 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isForexLowLiquidity = exports.isForexOpen = void 0;
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-// @ts-ignore-file
-const luxon_1 = require("luxon");
-const FOREX_MARKETS_TIME_ZONE_IANA = luxon_1.IANAZone.create("America/New_York");
-const isForexOpen = (dateToCheck) => {
-    const now = luxon_1.DateTime.fromJSDate(dateToCheck).setZone(FOREX_MARKETS_TIME_ZONE_IANA);
-    const weekday = now.weekday;
-    const hour = now.hour;
-    const dayOfMonth = now.day;
-    const month = now.month;
-    const isInDST = now.isInDST;
-    const isClosed = 
-    // Christmas 2023
-    (month === 12 && dayOfMonth >= 25 && dayOfMonth <= 27) ||
-        // New Year's Eve 2023
-        (month === 1 && dayOfMonth >= 1 && dayOfMonth <= 2) ||
-        // Friday after 4PM (DST) and 5PM (non-DST)
-        (weekday === 5 && ((isInDST && hour >= 16) || hour >= 17)) ||
-        // Saturday
-        weekday === 6 ||
-        // Sunday before 4PM (DST) and 5PM (non-DST)
-        (weekday === 7 && ((isInDST && hour < 16) || hour < 17));
-    return !isClosed;
-};
-exports.isForexOpen = isForexOpen;
-const extendedLowLiqGroupIds = [8, 9];
-const isForexLowLiquidity = (timestampToCheck, pair) => {
-    const now = luxon_1.DateTime.fromMillis(timestampToCheck).setZone(FOREX_MARKETS_TIME_ZONE_IANA);
-    const hour = now.hour;
-    const minute = now.minute;
-    const isInDST = now.isInDST;
-    const groupIndex = pair === null || pair === void 0 ? void 0 : pair.groupIndex;
-    if (groupIndex && extendedLowLiqGroupIds.includes(+groupIndex)) {
-        return ((isInDST &&
-            ((hour == 15 && minute >= 15) || (hour >= 16 && hour < 21))) ||
-            (!isInDST && ((hour == 16 && minute >= 15) || (hour >= 17 && hour < 22))));
-    }
-    return ((isInDST && ((hour == 15 && minute >= 45) || (hour >= 16 && hour < 19))) ||
-        (!isInDST && ((hour == 16 && minute >= 45) || (hour >= 17 && hour < 20))));
-};
-exports.isForexLowLiquidity = isForexLowLiquidity;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isForexLowLiquidity = exports.isForexOpen = void 0;
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+// @ts-ignore-file
+const luxon_1 = require("luxon");
+const FOREX_MARKETS_TIME_ZONE_IANA = luxon_1.IANAZone.create("America/New_York");
+const isForexOpen = (dateToCheck) => {
+    const now = luxon_1.DateTime.fromJSDate(dateToCheck).setZone(FOREX_MARKETS_TIME_ZONE_IANA);
+    const weekday = now.weekday;
+    const hour = now.hour;
+    const dayOfMonth = now.day;
+    const month = now.month;
+    const isInDST = now.isInDST;
+    const isClosed = 
+    // Christmas 2023
+    (month === 12 && dayOfMonth >= 25 && dayOfMonth <= 27) ||
+        // New Year's Eve 2023
+        (month === 1 && dayOfMonth >= 1 && dayOfMonth <= 2) ||
+        // Friday after 4PM (DST) and 5PM (non-DST)
+        (weekday === 5 && ((isInDST && hour >= 16) || hour >= 17)) ||
+        // Saturday
+        weekday === 6 ||
+        // Sunday before 4PM (DST) and 5PM (non-DST)
+        (weekday === 7 && ((isInDST && hour < 16) || hour < 17));
+    return !isClosed;
+};
+exports.isForexOpen = isForexOpen;
+const extendedLowLiqGroupIds = [8, 9];
+const isForexLowLiquidity = (timestampToCheck, pair) => {
+    const now = luxon_1.DateTime.fromMillis(timestampToCheck).setZone(FOREX_MARKETS_TIME_ZONE_IANA);
+    const hour = now.hour;
+    const minute = now.minute;
+    const isInDST = now.isInDST;
+    const groupIndex = pair === null || pair === void 0 ? void 0 : pair.groupIndex;
+    if (groupIndex && extendedLowLiqGroupIds.includes(+groupIndex)) {
+        return ((isInDST &&
+            ((hour == 15 && minute >= 15) || (hour >= 16 && hour < 21))) ||
+            (!isInDST && ((hour == 16 && minute >= 15) || (hour >= 17 && hour < 22))));
+    }
+    return ((isInDST && ((hour == 15 && minute >= 45) || (hour >= 16 && hour < 19))) ||
+        (!isInDST && ((hour == 16 && minute >= 45) || (hour >= 17 && hour < 20))));
+};
+exports.isForexLowLiquidity = isForexLowLiquidity;

package/lib/markets/index.d.ts

@@ -1,5 +1,5 @@
-export * from "./crypto";
-export * from "./forex";
-export * from "./stocks";
-export * from "./indices";
-export * from "./commodities";
+export * from "./crypto";
+export * from "./forex";
+export * from "./stocks";
+export * from "./indices";
+export * from "./commodities";

package/lib/markets/index.js

@@ -1,21 +1,21 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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 });
-__exportStar(require("./crypto"), exports);
-__exportStar(require("./forex"), exports);
-__exportStar(require("./stocks"), exports);
-__exportStar(require("./indices"), exports);
-__exportStar(require("./commodities"), exports);
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 });
+__exportStar(require("./crypto"), exports);
+__exportStar(require("./forex"), exports);
+__exportStar(require("./stocks"), exports);
+__exportStar(require("./indices"), exports);
+__exportStar(require("./commodities"), exports);

package/lib/markets/indices.d.ts

@@ -1 +1 @@
-export declare const isIndicesOpen: (dateToCheck: Date) => boolean;
+export declare const isIndicesOpen: (dateToCheck: Date) => boolean;

package/lib/markets/indices.js

@@ -1,6 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIndicesOpen = void 0;
-const stocks_1 = require("./stocks");
-const isIndicesOpen = (dateToCheck) => (0, stocks_1.isStocksOpen)(dateToCheck);
-exports.isIndicesOpen = isIndicesOpen;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isIndicesOpen = void 0;
+const stocks_1 = require("./stocks");
+const isIndicesOpen = (dateToCheck) => (0, stocks_1.isStocksOpen)(dateToCheck);
+exports.isIndicesOpen = isIndicesOpen;

package/lib/markets/stocks.d.ts

@@ -1,3 +1,3 @@
-import { DateTime } from "luxon";
-export declare const isStocksOpen: (dateToCheck: Date) => boolean;
-export declare const getUSMarketsNow: () => DateTime;
+import { DateTime } from "luxon";
+export declare const isStocksOpen: (dateToCheck: Date) => boolean;
+export declare const getUSMarketsNow: () => DateTime;

package/lib/markets/stocks.js

@@ -1,54 +1,54 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUSMarketsNow = exports.isStocksOpen = void 0;
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-// @ts-ignore-file
-const luxon_1 = require("luxon");
-const STOCKS_MARKETS_TIME_ZONE_IANA = luxon_1.IANAZone.create("America/New_York");
-const isStocksOpen = (dateToCheck) => {
-    const now = luxon_1.DateTime.fromJSDate(dateToCheck).setZone(STOCKS_MARKETS_TIME_ZONE_IANA);
-    const weekday = now.weekday;
-    const hour = now.hour;
-    const dayOfMonth = now.day;
-    const month = now.month;
-    const minute = now.minute;
-    const isClosed = 
-    // New Year's  2023
-    (month === 1 && dayOfMonth === 2) ||
-        // Martin Luther King, Jr. Day 2023
-        (month === 1 && dayOfMonth === 16) ||
-        // Washington's Birthday 2023
-        (month === 2 && dayOfMonth === 20) ||
-        // Good Friday 2023
-        (month === 4 && dayOfMonth === 7) ||
-        // Memorial Day 2023
-        (month === 5 && dayOfMonth === 29) ||
-        // Juneteenth National Independence Day 2023
-        (month === 6 && dayOfMonth === 19) ||
-        // Independence Day 2023
-        (month === 7 && dayOfMonth === 4) ||
-        // Labor Day 2023
-        (month === 9 && dayOfMonth === 4) ||
-        // Thanksgiving Day 2022
-        (month === 11 && dayOfMonth === 23) ||
-        // Friday after Thanksgiving Day 2023 (closes early at 1PM)
-        (month === 11 && dayOfMonth === 24 && hour >= 13) ||
-        // Christmas Day 2023
-        (month === 12 && dayOfMonth === 25) ||
-        // Saturday
-        weekday === 6 ||
-        // Sunday
-        weekday === 7 ||
-        // Mo-Fr Daily Opening
-        hour < 9 ||
-        (hour === 9 && minute < 30) ||
-        // Mo-Fr Daily Closing
-        hour >= 16;
-    return !isClosed;
-};
-exports.isStocksOpen = isStocksOpen;
-const getUSMarketsNow = () => {
-    return luxon_1.DateTime.now().setZone(STOCKS_MARKETS_TIME_ZONE_IANA);
-};
-exports.getUSMarketsNow = getUSMarketsNow;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUSMarketsNow = exports.isStocksOpen = void 0;
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+// @ts-ignore-file
+const luxon_1 = require("luxon");
+const STOCKS_MARKETS_TIME_ZONE_IANA = luxon_1.IANAZone.create("America/New_York");
+const isStocksOpen = (dateToCheck) => {
+    const now = luxon_1.DateTime.fromJSDate(dateToCheck).setZone(STOCKS_MARKETS_TIME_ZONE_IANA);
+    const weekday = now.weekday;
+    const hour = now.hour;
+    const dayOfMonth = now.day;
+    const month = now.month;
+    const minute = now.minute;
+    const isClosed = 
+    // New Year's  2023
+    (month === 1 && dayOfMonth === 2) ||
+        // Martin Luther King, Jr. Day 2023
+        (month === 1 && dayOfMonth === 16) ||
+        // Washington's Birthday 2023
+        (month === 2 && dayOfMonth === 20) ||
+        // Good Friday 2023
+        (month === 4 && dayOfMonth === 7) ||
+        // Memorial Day 2023
+        (month === 5 && dayOfMonth === 29) ||
+        // Juneteenth National Independence Day 2023
+        (month === 6 && dayOfMonth === 19) ||
+        // Independence Day 2023
+        (month === 7 && dayOfMonth === 4) ||
+        // Labor Day 2023
+        (month === 9 && dayOfMonth === 4) ||
+        // Thanksgiving Day 2022
+        (month === 11 && dayOfMonth === 23) ||
+        // Friday after Thanksgiving Day 2023 (closes early at 1PM)
+        (month === 11 && dayOfMonth === 24 && hour >= 13) ||
+        // Christmas Day 2023
+        (month === 12 && dayOfMonth === 25) ||
+        // Saturday
+        weekday === 6 ||
+        // Sunday
+        weekday === 7 ||
+        // Mo-Fr Daily Opening
+        hour < 9 ||
+        (hour === 9 && minute < 30) ||
+        // Mo-Fr Daily Closing
+        hour >= 16;
+    return !isClosed;
+};
+exports.isStocksOpen = isStocksOpen;
+const getUSMarketsNow = () => {
+    return luxon_1.DateTime.now().setZone(STOCKS_MARKETS_TIME_ZONE_IANA);
+};
+exports.getUSMarketsNow = getUSMarketsNow;

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

@@ -1,13 +1,15 @@
-import { IGNSBorrowingFees } from "../../../contracts/types/generated/GNSBorrowingFees";
-import { BorrowingFee } from ".";
-export declare const convertPairGroupBorrowingFee: (pairGroup: IGNSBorrowingFees.PairGroupStructOutput) => BorrowingFee.PairGroup;
-export declare const convertPairBorrowingFee: (pair: IGNSBorrowingFees.PairStructOutput, pairOi: IGNSBorrowingFees.PairOiStructOutput) => BorrowingFee.Pair;
-export declare const convertPairBorrowingFees: ([pairs, pairOi]: [
-    IGNSBorrowingFees.PairStructOutput[],
-    IGNSBorrowingFees.PairOiStructOutput[]
-]) => BorrowingFee.Pair[];
-export declare const convertGroupBorrowingFee: (group: IGNSBorrowingFees.GroupStructOutput, groupFeeExponent: number) => BorrowingFee.Group;
-export declare const convertGroupBorrowingFees: ([groups, groupFeeExponents]: [
-    IGNSBorrowingFees.GroupStructOutput[],
-    number[]
-]) => BorrowingFee.Group[];
+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[]) => BorrowingFee.Pair;
+export declare const convertPairBorrowingFees: ([pairs, pairOi, pairGroups]: [
+    IBorrowingFees.BorrowingDataStructOutput[],
+    IBorrowingFees.OpenInterestStructOutput[],
+    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;
+export declare const convertGroupBorrowingFees: ([groups, groupOis]: [
+    IBorrowingFees.BorrowingDataStructOutput[],
+    IBorrowingFees.OpenInterestStructOutput[]
+]) => BorrowingFee.Group[];

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

@@ -1,41 +1,35 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertGroupBorrowingFees = exports.convertGroupBorrowingFee = exports.convertPairBorrowingFees = exports.convertPairBorrowingFee = exports.convertPairGroupBorrowingFee = void 0;
-const convertPairGroupBorrowingFee = (pairGroup) => ({
-    groupIndex: pairGroup.groupIndex,
-    initialAccFeeLong: parseFloat(pairGroup.initialAccFeeLong.toString()) / 1e10,
-    initialAccFeeShort: parseFloat(pairGroup.initialAccFeeShort.toString()) / 1e10,
-    prevGroupAccFeeLong: parseFloat(pairGroup.prevGroupAccFeeLong.toString()) / 1e10,
-    prevGroupAccFeeShort: parseFloat(pairGroup.prevGroupAccFeeShort.toString()) / 1e10,
-    pairAccFeeLong: parseFloat(pairGroup.pairAccFeeLong.toString()) / 1e10,
-    pairAccFeeShort: parseFloat(pairGroup.pairAccFeeShort.toString()) / 1e10,
-    block: pairGroup.block,
-});
-exports.convertPairGroupBorrowingFee = convertPairGroupBorrowingFee;
-const convertPairBorrowingFee = (pair, pairOi) => ({
-    feePerBlock: pair.feePerBlock / 1e10,
-    accFeeLong: parseFloat(pair.accFeeLong.toString()) / 1e10,
-    accFeeShort: parseFloat(pair.accFeeShort.toString()) / 1e10,
-    accLastUpdatedBlock: pair.accLastUpdatedBlock,
-    lastAccBlockWeightedMarketCap: parseFloat(pair.lastAccBlockWeightedMarketCap.toString()) / 1e40,
-    groups: pair.groups.map(value => (0, exports.convertPairGroupBorrowingFee)(value)),
-    feeExponent: pair.feeExponent,
-    maxOi: parseFloat(pairOi.max.toString()) / 1e10,
-});
-exports.convertPairBorrowingFee = convertPairBorrowingFee;
-const convertPairBorrowingFees = ([pairs, pairOi]) => pairs.map((value, ix) => (0, exports.convertPairBorrowingFee)(value, pairOi[ix]));
-exports.convertPairBorrowingFees = convertPairBorrowingFees;
-const convertGroupBorrowingFee = (group, groupFeeExponent) => ({
-    oiLong: parseFloat(group.oiLong.toString()) / 1e10,
-    oiShort: parseFloat(group.oiShort.toString()) / 1e10,
-    feePerBlock: group.feePerBlock / 1e10,
-    accFeeLong: parseFloat(group.accFeeLong.toString()) / 1e10,
-    accFeeShort: parseFloat(group.accFeeShort.toString()) / 1e10,
-    accLastUpdatedBlock: group.accLastUpdatedBlock,
-    lastAccBlockWeightedMarketCap: parseFloat(group.lastAccBlockWeightedMarketCap.toString()) / 1e40,
-    maxOi: parseFloat(group.maxOi.toString()) / 1e10,
-    feeExponent: groupFeeExponent,
-});
-exports.convertGroupBorrowingFee = convertGroupBorrowingFee;
-const convertGroupBorrowingFees = ([groups, groupFeeExponents]) => groups.map((value, ix) => (0, exports.convertGroupBorrowingFee)(value, groupFeeExponents[ix]));
-exports.convertGroupBorrowingFees = convertGroupBorrowingFees;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertGroupBorrowingFees = exports.convertGroupBorrowingData = exports.convertGroupBorrowingFee = exports.convertPairBorrowingFees = exports.convertPairBorrowingFee = exports.convertPairGroupBorrowingFee = void 0;
+const convertPairGroupBorrowingFee = (pairGroup) => ({
+    groupIndex: pairGroup.groupIndex,
+    initialAccFeeLong: parseFloat(pairGroup.initialAccFeeLong.toString()) / 1e10,
+    initialAccFeeShort: parseFloat(pairGroup.initialAccFeeShort.toString()) / 1e10,
+    prevGroupAccFeeLong: parseFloat(pairGroup.prevGroupAccFeeLong.toString()) / 1e10,
+    prevGroupAccFeeShort: parseFloat(pairGroup.prevGroupAccFeeShort.toString()) / 1e10,
+    pairAccFeeLong: parseFloat(pairGroup.pairAccFeeLong.toString()) / 1e10,
+    pairAccFeeShort: parseFloat(pairGroup.pairAccFeeShort.toString()) / 1e10,
+    block: pairGroup.block,
+});
+exports.convertPairGroupBorrowingFee = convertPairGroupBorrowingFee;
+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]) => 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;
+const convertGroupBorrowingData = (obj, oi) => ({
+    oi: {
+        long: parseFloat(oi.long.toString()) / 1e10,
+        short: parseFloat(oi.short.toString()) / 1e10,
+        max: parseFloat(oi.max.toString()) / 1e10,
+    },
+    feePerBlock: obj.feePerBlock / 1e10,
+    accFeeLong: parseFloat(obj.accFeeLong.toString()) / 1e10,
+    accFeeShort: parseFloat(obj.accFeeShort.toString()) / 1e10,
+    accLastUpdatedBlock: obj.accLastUpdatedBlock,
+    feeExponent: obj.feeExponent,
+});
+exports.convertGroupBorrowingData = convertGroupBorrowingData;
+const convertGroupBorrowingFees = ([groups, groupOis]) => groups.map((value, ix) => (0, exports.convertGroupBorrowingFee)(value, groupOis[ix]));
+exports.convertGroupBorrowingFees = convertGroupBorrowingFees;