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

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];
+    return Object.assign(Object.assign({}, _addresses[chainId]["global"]), _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

@@ -1,70 +1,89 @@
 {
     "137": {
+        "global": {
+            "gnsMultiCollatDiamond": "0x209A9A01980377916851af2cA075C2b170452018"
+        },
         "DAI": {
             "gfarmTradingStorageV5": "0xaee4d11a16B2bc65EDD6416Fb626EB404a6D65BD",
-            "gnsMultiCollatDiamond": "0x6e5326e944F528c243B9Ca5d14fe5C9269a8c922",
             "gTokenOpenPnlFeed": "0x8d687276543b92819F2f2B5C3faad4AD27F4440c",
-            "gnsNftRewardsV6": "0x3470756E5B490a974Bc25FeEeEb24c11102f5268",
-            "gnsNftRewardsV6_3_1": "0x8103C0665A544201BBF606d90845d1B2D8005F1c",
+            "gnsNftRewards": "0x8103C0665A544201BBF606d90845d1B2D8005F1c",
+            "gnsBorrowingFees": "0x83AE6fADB88872D77299550Dc746b95D0196FE15",
+            "gnsTradingCallbacks": "0x82e59334da8c667797009bbe82473b55c7a6b311",
+            "gToken": "0x91993f2101cc758D0dEB7279d41e880F7dEFe827"
+        },
+        "ETH": {
+            "gfarmTradingStorageV5": "0xaee4d11a16B2bc65EDD6416Fb626EB404a6D65BD",
+            "gTokenOpenPnlFeed": "0x8d687276543b92819F2f2B5C3faad4AD27F4440c",
+            "gnsNftRewards": "",
             "gnsBorrowingFees": "0x83AE6fADB88872D77299550Dc746b95D0196FE15",
             "gnsTradingCallbacks": "0x82e59334da8c667797009bbe82473b55c7a6b311",
-            "gDai": "0x91993f2101cc758D0dEB7279d41e880F7dEFe827"
+            "gToken": "0x91993f2101cc758D0dEB7279d41e880F7dEFe827"
+        },
+        "USDC": {
+            "gfarmTradingStorageV5": "0xaee4d11a16B2bc65EDD6416Fb626EB404a6D65BD",
+            "gTokenOpenPnlFeed": "0x8d687276543b92819F2f2B5C3faad4AD27F4440c",
+            "gnsNftRewards": "",
+            "gnsBorrowingFees": "0x83AE6fADB88872D77299550Dc746b95D0196FE15",
+            "gnsTradingCallbacks": "",
+            "gToken": "0x91993f2101cc758D0dEB7279d41e880F7dEFe827"
         }
     },
     "42161": {
+        "global": {
+            "gnsMultiCollatDiamond": "0xFF162c694eAA571f685030649814282eA457f169"
+        },
         "DAI": {
             "gfarmTradingStorageV5": "0xcFa6ebD475d89dB04cAd5A756fff1cb2BC5bE33c",
-            "gnsMultiCollatDiamond": "0xf67Df2a4339eC1591615d94599081Dd037960d4b",
             "gTokenOpenPnlFeed": "0x990BA9Edd8a9615A23E4c452E63A80e519A4a23D",
-            "gnsNftRewardsV6": "0xc2d107e870927E3fb1127E6c1a33De5C863505b8",
-            "gnsNftRewardsV6_3_1": "0xde5750071CacA8db173FC6543D23d0BCACACFEC3",
+            "gnsNftRewards": "0xde5750071CacA8db173FC6543D23d0BCACACFEC3",
             "gnsBorrowingFees": "0xA03e32a42C75FDdDc9a39973ddd082F147393154",
             "gnsTradingCallbacks": "0x298a695906e16aea0a184a2815a76ead1a0b7522",
-            "gDai": "0xd85E038593d7A098614721EaE955EC2022B9B91B"
+            "gToken": "0xd85E038593d7A098614721EaE955EC2022B9B91B"
+        },
+        "ETH": {
+            "gfarmTradingStorageV5": "0xFe54a9A1C2C276cf37C56CeeE30737FDc6dA4d27",
+            "gTokenOpenPnlFeed": "0x018D9A3F0D06cCb7C305B7C9219a4307e1f9f27e",
+            "gnsNftRewards": "0x0d3EcF681C38D50a06C414C3e530Ce564F32C611",
+            "gnsBorrowingFees": "0x4475935686154a68B7b2a4B50BD917FD50aD3536",
+            "gnsTradingCallbacks": "0x62a9f50c92a57C719Ff741133caa55c7A81Ce019",
+            "gToken": "0x5977A9682D7AF81D347CFc338c61692163a2784C"
+        },
+        "USDC": {
+            "gfarmTradingStorageV5": "0x3B09fCa4cC6b140fDd364f28db830ccE01Fd60fD",
+            "gTokenOpenPnlFeed": "0xBF55C78132ab06a2B217040b7A7F20B5cBD47982",
+            "gnsNftRewards": "0xaCb9C3196b23413fE1e8E997C8Aa27600c4d2c88",
+            "gnsBorrowingFees": "0x0775dC8Fc3E389e5eF3442c06de70Ea3181bdD66",
+            "gnsTradingCallbacks": "0x4542256C583bCaD66a19a525B57203773a6485bf",
+            "gToken": "0xd3443ee1e91aF28e5FB858Fbd0D72A63bA8046E0"
         }
     },
     "80001": {
+        "global": {
+            "gnsMultiCollatDiamond": "0xDee93dD1Cb54ce80D690eC07a20CB0ce9d7F741C"
+        },
         "DAI": {
             "gfarmTradingStorageV5": "0x4d2dF485c608aa55A23d8d98dD2B4FA24Ba0f2Cf",
-            "gnsMultiCollatDiamond": "0xDee93dD1Cb54ce80D690eC07a20CB0ce9d7F741C",
             "gTokenOpenPnlFeed": "0xA7C829CB2346E12DC49Fd5ea8002Abaf48E9396C",
-            "gnsNftRewardsV6": "0x3982E3de77DAd60373C0c2c539fCb93Bd288D2f5",
-            "gnsNftRewardsV6_3_1": "0xf7Ac400b45Bdd2E098FaCA3642bE4d01071BC73B",
+            "gnsNftRewards": "0xf7Ac400b45Bdd2E098FaCA3642bE4d01071BC73B",
             "gnsBorrowingFees": "0xA280c8e34dcD6A835183E13CA82c6fAE20988644",
             "gnsTradingCallbacks": "0xA7443A20B42f9156F7D9DB01e51523C42CAC8eCE",
-            "gDai": "0x5215C8B3e76D493c8bcb9A7352F7afe18A6bb091"
+            "gToken": "0x5215C8B3e76D493c8bcb9A7352F7afe18A6bb091"
         },
         "ETH": {
-            "gfarmTradingStorageV5": "0x3468885B028271e586419a8827C12c19673DBbcc",
-            "gnsMultiCollatDiamond": "0xDee93dD1Cb54ce80D690eC07a20CB0ce9d7F741C",
-            "gTokenOpenPnlFeed": "0x14148383529690EF511d35a3a24dE78b9414895c",
-            "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"
+            "gfarmTradingStorageV5": "0x989DF13f4feE478cAc463CCCDB784Aa36108aB37",
+            "gTokenOpenPnlFeed": "0xC8D8d6efBC343604f8B6288a20C00a9D7f697A38",
+            "gnsNftRewards": "0xa974360d916877D97635d7595565CBBF1776D2Cc",
+            "gnsBorrowingFees": "0x61bd04984adde83Baa904eC70885038c66459e48",
+            "gnsTradingCallbacks": "0x0Bb7f01c3808Ec9B7af16E20d71eCb7a27C7ECf5",
+            "gToken": "0x71A52242f7430cF4a290854d93f6719a8C35F287"
         },
-        "DAI": {
-            "gfarmTradingStorageV5": "0xcFa6ebD475d89dB04cAd5A756fff1cb2BC5bE33c",
-            "gnsMultiCollatDiamond": "0xf67Df2a4339eC1591615d94599081Dd037960d4b",
-            "gTokenOpenPnlFeed": "0x990BA9Edd8a9615A23E4c452E63A80e519A4a23D",
-            "gnsNftRewardsV6": "0xc2d107e870927E3fb1127E6c1a33De5C863505b8",
-            "gnsNftRewardsV6_3_1": "0xde5750071CacA8db173FC6543D23d0BCACACFEC3",
-            "gnsBorrowingFees": "0xA03e32a42C75FDdDc9a39973ddd082F147393154",
-            "gnsTradingCallbacks": "0x298a695906e16aea0a184a2815a76ead1a0b7522",
-            "gDai": "0xd85E038593d7A098614721EaE955EC2022B9B91B"
+        "USDC": {
+            "gfarmTradingStorageV5": "0x13ed64798DfC826f6384F226913509e18662ab0B",
+            "gTokenOpenPnlFeed": "0x540E381b5Aef048D317A715667b12ec999D397Bc",
+            "gnsNftRewards": "0x9b19727268CF23E1874b8681694CAE7F66E40aE3",
+            "gnsBorrowingFees": "0xcC160C98eC5dad51021266284048F59a2535b329",
+            "gnsTradingCallbacks": "0x0c8C70eF2744A9376195855C63B59A3360FEEbBe",
+            "gToken": "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) => {
@@ -26,9 +26,13 @@ const getContractsForChain = (chainId, signerOrProvider, collateral) => {
         gnsNftRewards: factories_1.GNSNftRewardsV6_3_1__factory.connect(addresses.gnsNftRewardsV6_3_1, signerOrProvider),
         gnsBorrowingFees: factories_1.GNSBorrowingFees__factory.connect(addresses.gnsBorrowingFees, signerOrProvider),
         gnsTradingCallbacks: factories_1.GNSTradingCallbacks__factory.connect(addresses.gnsTradingCallbacks, signerOrProvider),
-        gDai: factories_1.GTokenV6_3_2__factory.connect(addresses.gDai, signerOrProvider),
+        gToken: factories_1.GToken__factory.connect(addresses.gToken, signerOrProvider),
     };
 };
 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);