@curvefi/api 2.26.3 → 2.27.0

package/lib/index.d.ts

@@ -36,7 +36,7 @@ declare const curve: {
     getCryptoFactoryPoolList: () => string[];
     getUserPoolListByLiquidity: (address?: string) => Promise<string[]>;
     getUserPoolListByClaimable: (address?: string) => Promise<string[]>;
-    getUserPoolList: (address?: string) => Promise<string[]>;
+    getUserPoolList: (address?: string, useApi?: boolean) => Promise<string[]>;
     getUserLiquidityUSD: (pools: string[], address?: string) => Promise<string[]>;
     getUserClaimable: (pools: string[], address?: string) => Promise<{
         token: string;

package/lib/pools/PoolTemplate.js

@@ -737,6 +737,7 @@ var PoolTemplate = /** @class */ (function () {
                             rewards = _f.sent();
                             if (!rewards[this.gauge])
                                 return [2 /*return*/, []];
+                            rewards[this.gauge].forEach(function (r) { return (0, utils_1._setContracts)(r.tokenAddress, ERC20_json_1.default); });
                             return [2 /*return*/, rewards[this.gauge].map(function (r) { return ({ token: r.tokenAddress, symbol: r.symbol, decimals: r.decimals }); })];
                         case 2:
                             gaugeContract = curve_1.curve.contracts[this.gauge].contract;
@@ -1186,7 +1187,7 @@ var PoolTemplate = /** @class */ (function () {
         };
     }
     PoolTemplate.prototype.rewardsOnly = function () {
-        if (curve_1.curve.chainId === 2222 || curve_1.curve.chainId === 42220)
+        if (curve_1.curve.chainId === 2222)
             return true; // TODO remove this for Kava and Celo
         if (this.gauge === ethers_1.ethers.constants.AddressZero)
             throw Error("".concat(this.name, " doesn't have gauge"));

package/lib/pools/utils.d.ts

@@ -11,5 +11,5 @@ export declare const getUserClaimable: (pools: string[], address?: string) => Pr
     amount: string;
     price: number;
 }[][]>;
-export declare const getUserPoolList: (address?: string) => Promise<string[]>;
+export declare const getUserPoolList: (address?: string, useApi?: boolean) => Promise<string[]>;
 export declare const _getAmplificationCoefficientsFromApi: () => Promise<IDict<number>>;

package/lib/pools/utils.js

@@ -182,7 +182,7 @@ var _getUserClaimable = function (pools, address, useCache) { return __awaiter(v
                 for (_i = 0, poolsToFetch_3 = poolsToFetch; _i < poolsToFetch_3.length; _i++) {
                     poolId = poolsToFetch_3[_i];
                     pool = (0, poolConstructor_1.getPool)(poolId);
-                    if (curve_1.curve.chainId === 2222 || curve_1.curve.chainId === 42220 || pool.gauge === ethers_1.ethers.constants.AddressZero) { // TODO remove this for Kava and Celo
+                    if (curve_1.curve.chainId === 2222 || pool.gauge === ethers_1.ethers.constants.AddressZero) { // TODO remove this for Kava
                         hasCrvReward.push(false);
                         continue;
                     }
@@ -236,6 +236,9 @@ var _getUserClaimable = function (pools, address, useCache) { return __awaiter(v
                         rewardAddress = rawRewardTokens.shift();
                         if (rewardAddress === ethers_1.ethers.constants.AddressZero)
                             continue;
+                        // REYIELD shitcoin which breaks things, because symbol() throws an error
+                        if (rewardAddress === "0xf228ec3476318aCB4E719D2b290bb2ef8B34DFfA".toLowerCase())
+                            continue;
                         rewardTokens[poolsToFetch[i]].push(rewardAddress);
                     }
                 }
@@ -309,6 +312,106 @@ var _getUserClaimable = function (pools, address, useCache) { return __awaiter(v
         }
     });
 }); };
+var _getUserClaimableUseApi = function (pools, address, useCache) { return __awaiter(void 0, void 0, void 0, function () {
+    var poolsToFetch, hasCrvReward, _i, poolsToFetch_5, poolId, pool, gaugeContract, rewardTokens, i, pool, rewards, rewardInfoCalls, i, poolId, pool, gaugeContract, gaugeMulticallContract, _a, _b, r, rawRewardInfo, i, poolId, pool, gaugeContract, token, symbol, decimals, _amount, amount, _c, _d, r, _amount, _claimedAmount, amount, _claimable, _e, pools_3, poolId;
+    var _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
+            case 0:
+                poolsToFetch = useCache ? pools.filter(function (poolId) { return _isUserClaimableCacheExpired(address, poolId); }) : pools;
+                if (!(poolsToFetch.length > 0)) return [3 /*break*/, 6];
+                hasCrvReward = [];
+                for (_i = 0, poolsToFetch_5 = poolsToFetch; _i < poolsToFetch_5.length; _i++) {
+                    poolId = poolsToFetch_5[_i];
+                    pool = (0, poolConstructor_1.getPool)(poolId);
+                    if (curve_1.curve.chainId === 2222 || pool.gauge === ethers_1.ethers.constants.AddressZero) { // TODO remove this for Kava
+                        hasCrvReward.push(false);
+                        continue;
+                    }
+                    gaugeContract = curve_1.curve.contracts[pool.gauge].contract;
+                    hasCrvReward.push('inflation_rate()' in gaugeContract || 'inflation_rate(uint256)' in gaugeContract);
+                }
+                rewardTokens = {};
+                i = 0;
+                _h.label = 1;
+            case 1:
+                if (!(i < poolsToFetch.length)) return [3 /*break*/, 4];
+                pool = (0, poolConstructor_1.getPool)(poolsToFetch[i]);
+                return [4 /*yield*/, (0, utils_1._getRewardsFromApi)()];
+            case 2:
+                rewards = _h.sent();
+                rewardTokens[poolsToFetch[i]] = ((_f = rewards[pool.gauge]) !== null && _f !== void 0 ? _f : []).map(function (r) { return ({ token: r.tokenAddress, symbol: r.symbol, decimals: r.decimals }); });
+                _h.label = 3;
+            case 3:
+                i++;
+                return [3 /*break*/, 1];
+            case 4:
+                rewardInfoCalls = [];
+                for (i = 0; i < poolsToFetch.length; i++) {
+                    poolId = poolsToFetch[i];
+                    pool = (0, poolConstructor_1.getPool)(poolId);
+                    if (pool.gauge === ethers_1.ethers.constants.AddressZero)
+                        continue;
+                    gaugeContract = curve_1.curve.contracts[pool.gauge].contract;
+                    gaugeMulticallContract = curve_1.curve.contracts[pool.gauge].multicallContract;
+                    if (hasCrvReward[i]) {
+                        rewardInfoCalls.push(gaugeMulticallContract.claimable_tokens(address));
+                    }
+                    for (_a = 0, _b = rewardTokens[poolId]; _a < _b.length; _a++) {
+                        r = _b[_a];
+                        (0, utils_1._setContracts)(r.token, ERC20_json_1.default);
+                        if ('claimable_reward(address,address)' in gaugeContract) {
+                            rewardInfoCalls.push(gaugeMulticallContract.claimable_reward(address, r.token));
+                        }
+                        else if ('claimable_reward(address)' in gaugeContract) { // Synthetix Gauge
+                            rewardInfoCalls.push(gaugeMulticallContract.claimable_reward(address), gaugeMulticallContract.claimed_rewards_for(address));
+                        }
+                    }
+                }
+                return [4 /*yield*/, curve_1.curve.multicallProvider.all(rewardInfoCalls)];
+            case 5:
+                rawRewardInfo = _h.sent();
+                for (i = 0; i < poolsToFetch.length; i++) {
+                    poolId = poolsToFetch[i];
+                    pool = (0, poolConstructor_1.getPool)(poolId);
+                    if (!_userClaimableCache[address])
+                        _userClaimableCache[address] = {};
+                    _userClaimableCache[address][poolId] = { rewards: [], time: Date.now() };
+                    if (pool.gauge === ethers_1.ethers.constants.AddressZero)
+                        continue;
+                    gaugeContract = curve_1.curve.contracts[pool.gauge].contract;
+                    if (hasCrvReward[i]) {
+                        token = curve_1.curve.constants.ALIASES.crv;
+                        symbol = 'CRV';
+                        decimals = 18;
+                        _amount = rawRewardInfo.shift();
+                        amount = ethers_1.ethers.utils.formatUnits(_amount, decimals);
+                        if (Number(amount) > 0)
+                            _userClaimableCache[address][poolId].rewards.push({ token: token, symbol: symbol, amount: amount });
+                    }
+                    for (_c = 0, _d = rewardTokens[poolId]; _c < _d.length; _c++) {
+                        r = _d[_c];
+                        _amount = rawRewardInfo.shift();
+                        if ('claimable_reward(address)' in gaugeContract) {
+                            _claimedAmount = rawRewardInfo.shift();
+                            _amount = _amount.sub(_claimedAmount);
+                        }
+                        amount = ethers_1.ethers.utils.formatUnits(_amount, r.decimals);
+                        if (Number(amount) > 0)
+                            _userClaimableCache[address][poolId].rewards.push({ token: r.token, symbol: r.symbol, amount: amount });
+                    }
+                }
+                _h.label = 6;
+            case 6:
+                _claimable = [];
+                for (_e = 0, pools_3 = pools; _e < pools_3.length; _e++) {
+                    poolId = pools_3[_e];
+                    _claimable.push((_g = _userClaimableCache[address]) === null || _g === void 0 ? void 0 : _g[poolId].rewards);
+                }
+                return [2 /*return*/, _claimable];
+        }
+    });
+}); };
 var getUserPoolListByClaimable = function (address) {
     if (address === void 0) { address = curve_1.curve.signerAddress; }
     return __awaiter(void 0, void 0, void 0, function () {
@@ -369,8 +472,9 @@ var getUserClaimable = function (pools, address) {
     });
 };
 exports.getUserClaimable = getUserClaimable;
-var getUserPoolList = function (address) {
+var getUserPoolList = function (address, useApi) {
     if (address === void 0) { address = curve_1.curve.signerAddress; }
+    if (useApi === void 0) { useApi = true; }
     return __awaiter(void 0, void 0, void 0, function () {
         var pools, _a, _lpBalances, _claimable, userPoolList, i;
         return __generator(this, function (_b) {
@@ -379,7 +483,7 @@ var getUserPoolList = function (address) {
                     pools = __spreadArray(__spreadArray(__spreadArray([], (0, exports.getPoolList)(), true), (0, exports.getFactoryPoolList)(), true), (0, exports.getCryptoFactoryPoolList)(), true);
                     return [4 /*yield*/, Promise.all([
                             _getUserLpBalances(pools, address, false),
-                            _getUserClaimable(pools, address, false),
+                            useApi ? _getUserClaimableUseApi(pools, address, false) : _getUserClaimable(pools, address, false),
                         ])];
                 case 1:
                     _a = _b.sent(), _lpBalances = _a[0], _claimable = _a[1];

package/package.json

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