@curvefi/api 2.16.1 → 2.16.3

package/lib/factory/factory-api.js

@@ -65,7 +65,6 @@ var ethers_1 = require("ethers");
 var ethcall_1 = require("ethcall");
 var gauge_factory_json_1 = __importDefault(require("../constants/abis/gauge_factory.json"));
 var gauge_child_json_1 = __importDefault(require("../constants/abis/gauge_child.json"));
-var gauge_rewards_only_json_1 = __importDefault(require("../constants/abis/gauge_rewards_only.json"));
 var ERC20_json_1 = __importDefault(require("../constants/abis/ERC20.json"));
 var factory_crypto_pool_2_json_1 = __importDefault(require("../constants/abis/factory-crypto/factory-crypto-pool-2.json"));
 var constants_1 = require("./constants");
@@ -109,8 +108,8 @@ function setFactoryGaugeContracts(rawPoolList) {
         if (pool.gaugeAddress) {
             var addr = pool.gaugeAddress.toLowerCase();
             _this.contracts[addr] = {
-                contract: new ethers_1.Contract(addr, _this.chainId === 1 ? gauge_factory_json_1.default : _this.chainId === 2222 ? gauge_rewards_only_json_1.default : gauge_child_json_1.default, _this.signer || _this.provider),
-                multicallContract: new ethcall_1.Contract(addr, _this.chainId === 1 ? gauge_factory_json_1.default : _this.chainId === 2222 ? gauge_rewards_only_json_1.default : gauge_child_json_1.default),
+                contract: new ethers_1.Contract(addr, _this.chainId === 1 ? gauge_factory_json_1.default : gauge_child_json_1.default, _this.signer || _this.provider),
+                multicallContract: new ethcall_1.Contract(addr, _this.chainId === 1 ? gauge_factory_json_1.default : gauge_child_json_1.default),
             };
         }
     });
@@ -310,7 +309,7 @@ function getFactoryPoolsDataFromApi(isCrypto) {
                                 underlying_decimals: coinDecimals,
                                 wrapped_decimals: coinDecimals,
                                 swap_abi: implementationABIDict[pool.implementationAddress],
-                                gauge_abi: _this.chainId === 1 ? gauge_factory_json_1.default : _this.chainId === 2222 ? gauge_rewards_only_json_1.default : gauge_child_json_1.default, // TODO remove RewardsOnly for Kava
+                                gauge_abi: _this.chainId === 1 ? gauge_factory_json_1.default : gauge_child_json_1.default,
                             };
                         }
                     });

package/lib/index.d.ts

@@ -32,8 +32,8 @@ declare const curve: {
     getPoolList: () => string[];
     getFactoryPoolList: () => string[];
     getCryptoFactoryPoolList: () => string[];
-    getUserPoolList: (address?: string | undefined) => Promise<string[]>;
-    getUserLiquidityUSD: (pools: string[], address?: string | undefined) => Promise<string[]>;
+    getUserPoolList: (address?: string) => Promise<string[]>;
+    getUserLiquidityUSD: (pools: string[], address?: string) => Promise<string[]>;
     PoolTemplate: typeof PoolTemplate;
     getPool: (poolId: string) => PoolTemplate;
     getUsdRate: (coin: string) => Promise<number>;

package/lib/pools/PoolTemplate.js

@@ -1116,6 +1116,8 @@ var PoolTemplate = /** @class */ (function () {
         };
     }
     PoolTemplate.prototype.rewardsOnly = function () {
+        if (curve_1.curve.chainId === 2222)
+            return true; // TODO remove this for Kava
         if (this.gauge === ethers_1.ethers.constants.AddressZero)
             throw Error("".concat(this.name, " doesn't have gauge"));
         var gaugeContract = curve_1.curve.contracts[this.gauge].contract;

package/lib/pools/utils.d.ts

@@ -2,6 +2,6 @@ import { ethers } from "ethers";
 export declare const getPoolList: () => string[];
 export declare const getFactoryPoolList: () => string[];
 export declare const getCryptoFactoryPoolList: () => string[];
-export declare const _getUserLpBalances: (pools: string[], address?: string) => Promise<ethers.BigNumber[]>;
+export declare const _getUserLpBalances: (pools: string[], address: string, useCache: boolean) => Promise<ethers.BigNumber[]>;
 export declare const getUserPoolList: (address?: string) => Promise<string[]>;
 export declare const getUserLiquidityUSD: (pools: string[], address?: string) => Promise<string[]>;

package/lib/pools/utils.js

@@ -57,29 +57,18 @@ exports.getFactoryPoolList = getFactoryPoolList;
 var getCryptoFactoryPoolList = function () { return Object.keys(curve_1.curve.constants.CRYPTO_FACTORY_POOLS_DATA); };
 exports.getCryptoFactoryPoolList = getCryptoFactoryPoolList;
 var _userLpBalance = {};
-var _isUserLpBalanceExpired = function (address, poolId) {
-    var _a, _b;
-    return (((_b = (_a = _userLpBalance[address]) === null || _a === void 0 ? void 0 : _a[poolId]) === null || _b === void 0 ? void 0 : _b.time) || 0) + 600000 < Date.now();
-};
-var _getUserLpBalances = function (pools, address) { return __awaiter(void 0, void 0, void 0, function () {
-    var poolsToFetch, _i, pools_1, poolId, calls, _a, poolsToFetch_1, poolId, pool, _rawBalances, _b, poolsToFetch_2, poolId, pool, _balance, _lpBalances, _c, pools_2, poolId;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+var _isUserLpBalanceExpired = function (address, poolId) { var _a, _b; return (((_b = (_a = _userLpBalance[address]) === null || _a === void 0 ? void 0 : _a[poolId]) === null || _b === void 0 ? void 0 : _b.time) || 0) + 600000 < Date.now(); };
+var _getUserLpBalances = function (pools, address, useCache) { return __awaiter(void 0, void 0, void 0, function () {
+    var poolsToFetch, calls, _i, poolsToFetch_1, poolId, pool, _rawBalances, _a, poolsToFetch_2, poolId, pool, _balance, _lpBalances, _b, pools_1, poolId;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
-                if (!address)
-                    address = curve_1.curve.signerAddress;
-                address = address;
-                poolsToFetch = [];
-                for (_i = 0, pools_1 = pools; _i < pools_1.length; _i++) {
-                    poolId = pools_1[_i];
-                    if (_isUserLpBalanceExpired(address, poolId))
-                        poolsToFetch.push(poolId);
-                }
+                poolsToFetch = useCache ? pools.filter(function (poolId) { return _isUserLpBalanceExpired(address, poolId); }) : pools;
                 if (!(poolsToFetch.length > 0)) return [3 /*break*/, 2];
                 calls = [];
-                for (_a = 0, poolsToFetch_1 = poolsToFetch; _a < poolsToFetch_1.length; _a++) {
-                    poolId = poolsToFetch_1[_a];
+                for (_i = 0, poolsToFetch_1 = poolsToFetch; _i < poolsToFetch_1.length; _i++) {
+                    poolId = poolsToFetch_1[_i];
                     pool = (0, poolConstructor_1.getPool)(poolId);
                     calls.push(curve_1.curve.contracts[pool.lpToken].multicallContract.balanceOf(address));
                     if (pool.gauge !== ethers_1.ethers.constants.AddressZero)
@@ -87,9 +76,9 @@ var _getUserLpBalances = function (pools, address) { return __awaiter(void 0, vo
                 }
                 return [4 /*yield*/, curve_1.curve.multicallProvider.all(calls)];
             case 1:
-                _rawBalances = _e.sent();
-                for (_b = 0, poolsToFetch_2 = poolsToFetch; _b < poolsToFetch_2.length; _b++) {
-                    poolId = poolsToFetch_2[_b];
+                _rawBalances = _d.sent();
+                for (_a = 0, poolsToFetch_2 = poolsToFetch; _a < poolsToFetch_2.length; _a++) {
+                    poolId = poolsToFetch_2[_a];
                     pool = (0, poolConstructor_1.getPool)(poolId);
                     _balance = _rawBalances.shift();
                     if (pool.gauge !== ethers_1.ethers.constants.AddressZero)
@@ -98,61 +87,67 @@ var _getUserLpBalances = function (pools, address) { return __awaiter(void 0, vo
                         _userLpBalance[address] = {};
                     _userLpBalance[address][poolId] = { '_lpBalance': _balance, 'time': Date.now() };
                 }
-                _e.label = 2;
+                _d.label = 2;
             case 2:
                 _lpBalances = [];
-                for (_c = 0, pools_2 = pools; _c < pools_2.length; _c++) {
-                    poolId = pools_2[_c];
-                    _lpBalances.push((_d = _userLpBalance[address]) === null || _d === void 0 ? void 0 : _d[poolId]._lpBalance);
+                for (_b = 0, pools_1 = pools; _b < pools_1.length; _b++) {
+                    poolId = pools_1[_b];
+                    _lpBalances.push((_c = _userLpBalance[address]) === null || _c === void 0 ? void 0 : _c[poolId]._lpBalance);
                 }
                 return [2 /*return*/, _lpBalances];
         }
     });
 }); };
 exports._getUserLpBalances = _getUserLpBalances;
-var getUserPoolList = function (address) { return __awaiter(void 0, void 0, void 0, function () {
-    var pools, _lpBalances, userPoolList, i;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                pools = __spreadArray(__spreadArray(__spreadArray([], (0, exports.getPoolList)(), true), (0, exports.getFactoryPoolList)(), true), (0, exports.getCryptoFactoryPoolList)(), true);
-                return [4 /*yield*/, (0, exports._getUserLpBalances)(pools, address)];
-            case 1:
-                _lpBalances = _a.sent();
-                userPoolList = [];
-                for (i = 0; i < pools.length; i++) {
-                    if (_lpBalances[i].gt(0)) {
-                        userPoolList.push(pools[i]);
+var getUserPoolList = function (address) {
+    if (address === void 0) { address = curve_1.curve.signerAddress; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var pools, _lpBalances, userPoolList, i;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    pools = __spreadArray(__spreadArray(__spreadArray([], (0, exports.getPoolList)(), true), (0, exports.getFactoryPoolList)(), true), (0, exports.getCryptoFactoryPoolList)(), true);
+                    return [4 /*yield*/, (0, exports._getUserLpBalances)(pools, address, false)];
+                case 1:
+                    _lpBalances = _a.sent();
+                    userPoolList = [];
+                    for (i = 0; i < pools.length; i++) {
+                        if (_lpBalances[i].gt(0)) {
+                            userPoolList.push(pools[i]);
+                        }
                     }
-                }
-                return [2 /*return*/, userPoolList];
-        }
+                    return [2 /*return*/, userPoolList];
+            }
+        });
     });
-}); };
+};
 exports.getUserPoolList = getUserPoolList;
-var getUserLiquidityUSD = function (pools, address) { return __awaiter(void 0, void 0, void 0, function () {
-    var _lpBalances, userLiquidityUSD, i, pool, price;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports._getUserLpBalances)(pools, address)];
-            case 1:
-                _lpBalances = _a.sent();
-                userLiquidityUSD = [];
-                i = 0;
-                _a.label = 2;
-            case 2:
-                if (!(i < pools.length)) return [3 /*break*/, 5];
-                pool = (0, poolConstructor_1.getPool)(pools[i]);
-                return [4 /*yield*/, (0, utils_1._getUsdRate)(pool.lpToken)];
-            case 3:
-                price = _a.sent();
-                userLiquidityUSD.push((0, utils_1.toBN)(_lpBalances[i]).times(price).toFixed(8));
-                _a.label = 4;
-            case 4:
-                i++;
-                return [3 /*break*/, 2];
-            case 5: return [2 /*return*/, userLiquidityUSD];
-        }
+var getUserLiquidityUSD = function (pools, address) {
+    if (address === void 0) { address = curve_1.curve.signerAddress; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var _lpBalances, userLiquidityUSD, i, pool, price;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, (0, exports._getUserLpBalances)(pools, address, true)];
+                case 1:
+                    _lpBalances = _a.sent();
+                    userLiquidityUSD = [];
+                    i = 0;
+                    _a.label = 2;
+                case 2:
+                    if (!(i < pools.length)) return [3 /*break*/, 5];
+                    pool = (0, poolConstructor_1.getPool)(pools[i]);
+                    return [4 /*yield*/, (0, utils_1._getUsdRate)(pool.lpToken)];
+                case 3:
+                    price = _a.sent();
+                    userLiquidityUSD.push((0, utils_1.toBN)(_lpBalances[i]).times(price).toFixed(8));
+                    _a.label = 4;
+                case 4:
+                    i++;
+                    return [3 /*break*/, 2];
+                case 5: return [2 /*return*/, userLiquidityUSD];
+            }
+        });
     });
-}); };
+};
 exports.getUserLiquidityUSD = getUserLiquidityUSD;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/api",
-  "version": "2.16.1",
+  "version": "2.16.3",
   "description": "JavaScript library for curve.fi",
   "main": "lib/index.js",
   "author": "Macket",