@gainsnetwork/sdk 0.2.0-rc5 → 0.2.0-rc6

package/lib/contracts/index.d.ts

@@ -3,6 +3,11 @@ import type { Provider } from "@ethersproject/providers";
 import { CollateralTypes, Contracts } from "./types";
 export declare const getContractsForChain: (chainId: number, signerOrProvider?: Signer | Provider, collateral?: CollateralTypes) => Contracts;
 export declare const getContractsForChainByRequester: (chainId: number, requester: string, signerOrProvider?: Signer | Provider) => Contracts;
+export declare const getCollateralIndexAndContractsForChainByRequester: (chainId: number, requester: string, signerOrProvider?: Signer | Provider) => {
+    contracts: Contracts;
+    collateralIndex: number;
+};
+export declare const COLLATERAL_TO_COLLATERAL_INDEX: Record<CollateralTypes, number>;
 export * from "./utils";
 export * from "./addresses";
 export { CollateralTypes } from "./types";

package/lib/contracts/index.js

@@ -14,9 +14,10 @@ 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.CollateralTypes = exports.getContractsForChainByRequester = exports.getContractsForChain = void 0;
+exports.CollateralTypes = exports.COLLATERAL_TO_COLLATERAL_INDEX = exports.getCollateralIndexAndContractsForChainByRequester = exports.getContractsForChainByRequester = exports.getContractsForChain = void 0;
 const addresses_1 = require("./addresses");
 const factories_1 = require("./types/generated/factories");
+const types_1 = require("./types");
 // @todo rework this to return all
 const getContractsForChain = (chainId, signerOrProvider, collateral) => {
     const addresses = (0, addresses_1.getContractAddressesForChain)(chainId, collateral);
@@ -28,10 +29,25 @@ const getContractsForChain = (chainId, signerOrProvider, collateral) => {
 };
 exports.getContractsForChain = getContractsForChain;
 const getContractsForChainByRequester = (chainId, requester, signerOrProvider) => {
-    return (0, exports.getContractsForChain)(chainId, signerOrProvider, (0, addresses_1.getCollateralByAddressForChain)(chainId, requester));
+    const { contracts } = (0, exports.getCollateralIndexAndContractsForChainByRequester)(chainId, requester, signerOrProvider);
+    return contracts;
 };
 exports.getContractsForChainByRequester = getContractsForChainByRequester;
+const getCollateralIndexAndContractsForChainByRequester = (chainId, requester, signerOrProvider) => {
+    const collateral = (0, addresses_1.getCollateralByAddressForChain)(chainId, requester);
+    return {
+        contracts: (0, exports.getContractsForChain)(chainId, signerOrProvider, collateral),
+        collateralIndex: exports.COLLATERAL_TO_COLLATERAL_INDEX[collateral],
+    };
+};
+exports.getCollateralIndexAndContractsForChainByRequester = getCollateralIndexAndContractsForChainByRequester;
+exports.COLLATERAL_TO_COLLATERAL_INDEX = {
+    [types_1.CollateralTypes.DAI]: 1,
+    [types_1.CollateralTypes.ETH]: 2,
+    [types_1.CollateralTypes.USDC]: 3,
+    [types_1.CollateralTypes.ARB]: 0, // not in use
+};
 __exportStar(require("./utils"), exports);
 __exportStar(require("./addresses"), exports);
-var types_1 = require("./types");
-Object.defineProperty(exports, "CollateralTypes", { enumerable: true, get: function () { return types_1.CollateralTypes; } });
+var types_2 = require("./types");
+Object.defineProperty(exports, "CollateralTypes", { enumerable: true, get: function () { return types_2.CollateralTypes; } });

package/lib/contracts/utils/pairs.d.ts

@@ -3,5 +3,5 @@ import { Contracts } from "../../contracts/types";
 export declare const fetchPairs: (contracts: Contracts, pairIxs: PairIndex[]) => Promise<Pair[]>;
 export declare const fetchPairDepths: (contracts: Contracts, pairIxs: number[]) => Promise<PairDepth[]>;
 export declare const fetchFees: (contracts: Contracts, feeIxs: PairIndex[]) => Promise<Fee[]>;
-export declare const fetchOpenInterest: (collateralIndex: number, contracts: Contracts, pairIxs: number[]) => Promise<OpenInterest[]>;
+export declare const fetchOpenInterest: (contracts: Contracts, collateralIndex: number, pairIxs: number[]) => Promise<OpenInterest[]>;
 export declare const getPairDescription: (pairIndex: PairIndex) => string;

package/lib/contracts/utils/pairs.js

@@ -82,13 +82,10 @@ const fetchFees = (contracts, feeIxs) => __awaiter(void 0, void 0, void 0, funct
     }
 });
 exports.fetchFees = fetchFees;
-const fetchOpenInterest = (collateralIndex, contracts, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchOpenInterest = (contracts, collateralIndex, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
     if (pairIxs.length === 0) {
         return [];
     }
-    const { precision: collateralPrecision, precisionDelta: collateralPrecisionDelta, } = yield contracts.gnsMultiCollatDiamond.getCollateral(collateralIndex);
-    const precision = parseFloat(collateralPrecision.toString());
-    const precisionDelta = parseFloat(collateralPrecisionDelta.toString());
     const openInterests = (yield contracts.gnsMultiCollatDiamond.getAllBorrowingPairs(collateralIndex))[1];
     return pairIxs.map(pairIndex => {
         const openInterest = openInterests[pairIndex];
@@ -96,12 +93,8 @@ const fetchOpenInterest = (collateralIndex, contracts, pairIxs) => __awaiter(voi
             return { long: 0, short: 0, max: 0 };
         }
         return {
-            long: (parseFloat(openInterest[0].toString()) * precisionDelta) /
-                1e10 /
-                precision,
-            short: (parseFloat(openInterest[1].toString()) * precisionDelta) /
-                1e10 /
-                precision,
+            long: parseFloat(openInterest[0].toString()) / 1e10,
+            short: parseFloat(openInterest[1].toString()) / 1e10,
             max: parseFloat(openInterest[2].toString()) / 1e10,
         };
     });

package/package.json

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