@gainsnetwork/sdk 0.0.51-multi-collat-rc4 → 0.0.51-multi-collat-rc6

package/lib/constants.js

@@ -231,7 +231,7 @@ exports.stockSplits = {
 exports.delistedPairIxs = new Set([
     6, 31, 36, 42, 45, 48, 50, 54, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
     70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
-    89, 97, 99, 101, 106, 107, 108, 52, 131, 147, 157, 158, 160, 161, 166, 170,
-    179, 180, 181, 182, 183, 186, 188, 189, 190,
+    89, 97, 99, 101, 106, 107, 108, 52, 131, 147, 157, 160, 179, 182, 183, 188,
+    189, 190,
 ]);
 exports.delistedGroupsIxs = new Set([6, 7]);

package/lib/contracts/addresses.d.ts

@@ -1,2 +1,3 @@
 import { CollateralTypes, ContractAddresses } from "./types";
 export declare const getContractAddressesForChain: (chainId: number, collateral?: CollateralTypes) => ContractAddresses;
+export declare const getCollateralByAddressForChain: (chainId: number, address: string) => CollateralTypes;

package/lib/contracts/addresses.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContractAddressesForChain = void 0;
+exports.getCollateralByAddressForChain = exports.getContractAddressesForChain = void 0;
 const types_1 = require("./types");
 const addresses_json_1 = __importDefault(require("./addresses.json"));
 const getContractAddressesForChain = (chainId, collateral = types_1.CollateralTypes.DAI) => {
@@ -12,8 +12,20 @@ const getContractAddressesForChain = (chainId, collateral = types_1.CollateralTy
         throw new Error(`Unknown chain id (${chainId}). No known contracts have been deployed on this chain.`);
     }
     if (!_addresses[chainId][collateral]) {
-        throw new Error(`Unknown collateral (${collateral}) for chain id (${chainId}). No known contracts have been deployed on this chain.`);
+        throw new Error(`Unknown collateral (${collateral}) for chain id (${chainId}). No known contracts have been deployed for this collateral.`);
     }
     return _addresses[chainId][collateral];
 };
 exports.getContractAddressesForChain = getContractAddressesForChain;
+const getCollateralByAddressForChain = (chainId, address) => {
+    const _addresses = addresses_json_1.default;
+    if (!_addresses[chainId]) {
+        throw new Error(`Unknown chain id (${chainId}). No known contracts have been deployed on this chain.`);
+    }
+    for (const collateral in types_1.CollateralTypes) {
+        if (Object.values(_addresses[chainId][collateral] || {}).some(contract => contract.toLowerCase() === address.toLowerCase()))
+            return collateral;
+    }
+    throw new Error(`Unable to find collateral for address (${address}) and chain id (${chainId}). No known contracts match requested address.`);
+};
+exports.getCollateralByAddressForChain = getCollateralByAddressForChain;

package/lib/contracts/addresses.json

@@ -2,7 +2,7 @@
     "137": {
         "DAI": {
             "gfarmTradingStorageV5": "0xaee4d11a16B2bc65EDD6416Fb626EB404a6D65BD",
-            "gnsMultiCollatDiamond": "0x6e5326e944F528c243B9Ca5d14fe5C9269a8c922",
+            "gnsMultiCollatDiamond": "0x209A9A01980377916851af2cA075C2b170452018",
             "gTokenOpenPnlFeed": "0x8d687276543b92819F2f2B5C3faad4AD27F4440c",
             "gnsNftRewardsV6": "0x3470756E5B490a974Bc25FeEeEb24c11102f5268",
             "gnsNftRewardsV6_3_1": "0x8103C0665A544201BBF606d90845d1B2D8005F1c",
@@ -14,7 +14,7 @@
     "42161": {
         "DAI": {
             "gfarmTradingStorageV5": "0xcFa6ebD475d89dB04cAd5A756fff1cb2BC5bE33c",
-            "gnsMultiCollatDiamond": "0xf67Df2a4339eC1591615d94599081Dd037960d4b",
+            "gnsMultiCollatDiamond": "0xFF162c694eAA571f685030649814282eA457f169",
             "gTokenOpenPnlFeed": "0x990BA9Edd8a9615A23E4c452E63A80e519A4a23D",
             "gnsNftRewardsV6": "0xc2d107e870927E3fb1127E6c1a33De5C863505b8",
             "gnsNftRewardsV6_3_1": "0xde5750071CacA8db173FC6543D23d0BCACACFEC3",
@@ -35,36 +35,24 @@
             "gDai": "0x5215C8B3e76D493c8bcb9A7352F7afe18A6bb091"
         },
         "ETH": {
-            "gfarmTradingStorageV5": "0x3468885B028271e586419a8827C12c19673DBbcc",
+            "gfarmTradingStorageV5": "0x989DF13f4feE478cAc463CCCDB784Aa36108aB37",
             "gnsMultiCollatDiamond": "0xDee93dD1Cb54ce80D690eC07a20CB0ce9d7F741C",
-            "gTokenOpenPnlFeed": "0x14148383529690EF511d35a3a24dE78b9414895c",
+            "gTokenOpenPnlFeed": "0xC8D8d6efBC343604f8B6288a20C00a9D7f697A38",
             "gnsNftRewardsV6": "0x820781b85F446eDc4165C1c1D1e273B33d0B57aB",
-            "gnsNftRewardsV6_3_1": "0xf7Ac400b45Bdd2E098FaCA3642bE4d01071BC73B",
-            "gnsBorrowingFees": "0xBaE5EdF3DF8d1CA3DB5Ff9E9B43937c8e8f4CeC5",
-            "gnsTradingCallbacks": "0x9b897661E03ac0131d0f5E522eC188d9193Cb1f5",
-            "gDai": "0xBCfCE19e1a97222cbE2eeebC87196670Fce46c87"
-        }
-    },
-    "421613": {
-        "ETH": {
-            "gfarmTradingStorageV5": "0xcFa6ebD475d89dB04cAd5A756fff1cb2BC5bE33c",
-            "gnsMultiCollatDiamond": "0xf67Df2a4339eC1591615d94599081Dd037960d4b",
-            "gTokenOpenPnlFeed": "0x990BA9Edd8a9615A23E4c452E63A80e519A4a23D",
-            "gnsNftRewardsV6": "0xc2d107e870927E3fb1127E6c1a33De5C863505b8",
-            "gnsNftRewardsV6_3_1": "0xde5750071CacA8db173FC6543D23d0BCACACFEC3",
-            "gnsBorrowingFees": "0xA03e32a42C75FDdDc9a39973ddd082F147393154",
-            "gnsTradingCallbacks": "0x298a695906e16aea0a184a2815a76ead1a0b7522",
-            "gDai": "0xd85E038593d7A098614721EaE955EC2022B9B91B"
+            "gnsNftRewardsV6_3_1": "0xa974360d916877D97635d7595565CBBF1776D2Cc",
+            "gnsBorrowingFees": "0x61bd04984adde83Baa904eC70885038c66459e48",
+            "gnsTradingCallbacks": "0x0Bb7f01c3808Ec9B7af16E20d71eCb7a27C7ECf5",
+            "gDai": "0x71A52242f7430cF4a290854d93f6719a8C35F287"
         },
-        "DAI": {
-            "gfarmTradingStorageV5": "0xcFa6ebD475d89dB04cAd5A756fff1cb2BC5bE33c",
-            "gnsMultiCollatDiamond": "0xf67Df2a4339eC1591615d94599081Dd037960d4b",
-            "gTokenOpenPnlFeed": "0x990BA9Edd8a9615A23E4c452E63A80e519A4a23D",
-            "gnsNftRewardsV6": "0xc2d107e870927E3fb1127E6c1a33De5C863505b8",
-            "gnsNftRewardsV6_3_1": "0xde5750071CacA8db173FC6543D23d0BCACACFEC3",
-            "gnsBorrowingFees": "0xA03e32a42C75FDdDc9a39973ddd082F147393154",
-            "gnsTradingCallbacks": "0x298a695906e16aea0a184a2815a76ead1a0b7522",
-            "gDai": "0xd85E038593d7A098614721EaE955EC2022B9B91B"
+        "USDC": {
+            "gfarmTradingStorageV5": "0x13ed64798DfC826f6384F226913509e18662ab0B",
+            "gnsMultiCollatDiamond": "0xDee93dD1Cb54ce80D690eC07a20CB0ce9d7F741C",
+            "gTokenOpenPnlFeed": "0x540E381b5Aef048D317A715667b12ec999D397Bc",
+            "gnsNftRewardsV6": "0x820781b85F446eDc4165C1c1D1e273B33d0B57aB",
+            "gnsNftRewardsV6_3_1": "0x9b19727268CF23E1874b8681694CAE7F66E40aE3",
+            "gnsBorrowingFees": "0xcC160C98eC5dad51021266284048F59a2535b329",
+            "gnsTradingCallbacks": "0x0c8C70eF2744A9376195855C63B59A3360FEEbBe",
+            "gDai": "0xd7F8D728414a6aD18476B5a72a0C20be5704f868"
         }
     }
 }

package/lib/contracts/index.d.ts

@@ -2,5 +2,6 @@ import type { Signer } from "ethers";
 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 * from "./utils";
 export * from "./addresses";

package/lib/contracts/index.js

@@ -14,7 +14,7 @@ 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.getContractsForChain = void 0;
+exports.getContractsForChainByRequester = exports.getContractsForChain = void 0;
 const addresses_1 = require("./addresses");
 const factories_1 = require("./types/generated/factories");
 const getContractsForChain = (chainId, signerOrProvider, collateral) => {
@@ -30,5 +30,9 @@ 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));
+};
+exports.getContractsForChainByRequester = getContractsForChainByRequester;
 __exportStar(require("./utils"), exports);
 __exportStar(require("./addresses"), exports);

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

@@ -16,11 +16,6 @@ const _abi = [
         name: "Overflow",
         type: "error",
     },
-    {
-        inputs: [],
-        name: "Overflow",
-        type: "error",
-    },
     {
         inputs: [],
         name: "WrongAccess",

package/lib/contracts/utils/openTrades.js

@@ -16,7 +16,8 @@ exports.fetchOpenPairTradesRaw = exports.fetchOpenPairTrades = void 0;
 const ethcall_1 = require("ethcall");
 const fetchOpenPairTrades = (contracts, overrides = {}) => __awaiter(void 0, void 0, void 0, function* () {
     const rawTrades = yield (0, exports.fetchOpenPairTradesRaw)(contracts, overrides);
-    return rawTrades.map(rawTrade => _prepareTradeContainer(rawTrade.trade, rawTrade.tradeInfo, rawTrade.initialAccFees, rawTrade.tradeData));
+    const { precision: collateralPrecision } = yield contracts.gnsBorrowingFees.collateralConfig();
+    return rawTrades.map(rawTrade => _prepareTradeContainer(rawTrade.trade, rawTrade.tradeInfo, rawTrade.initialAccFees, rawTrade.tradeData, collateralPrecision));
 });
 exports.fetchOpenPairTrades = fetchOpenPairTrades;
 const fetchOpenPairTradesRaw = (contracts, overrides = {}) => __awaiter(void 0, void 0, void 0, function* () {
@@ -152,7 +153,7 @@ const fetchOpenPairTradesBatchMulticall = (contracts, startPairIndex, endPairInd
     }
     return finalTrades.filter(trade => trade !== undefined);
 });
-const _prepareTradeContainer = (trade, tradeInfo, tradeInitialAccFees, tradeData) => ({
+const _prepareTradeContainer = (trade, tradeInfo, tradeInitialAccFees, tradeData, collateralPrecision) => ({
     trade: {
         trader: trade.trader,
         pairIndex: parseInt(trade.pairIndex.toString()),
@@ -167,7 +168,8 @@ const _prepareTradeContainer = (trade, tradeInfo, tradeInitialAccFees, tradeData
     tradeInfo: {
         beingMarketClosed: tradeInfo.beingMarketClosed.toString() === "true",
         tokenPriceDai: parseFloat(tradeInfo.tokenPriceDai.toString()) / 1e10,
-        openInterestDai: parseFloat(tradeInfo.openInterestDai.toString()) / 1e18,
+        openInterestDai: parseFloat(tradeInfo.openInterestDai.toString()) /
+            parseFloat(collateralPrecision.toString()),
         tpLastUpdated: tradeInfo.tpLastUpdated,
         slLastUpdated: tradeInfo.slLastUpdated,
     },

package/package.json

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