@curvefi/api 2.2.0 → 2.2.1

package/README.md

@@ -284,6 +284,8 @@ import curve from "@curvefi/api";
     // 0xdc69d4cb5b86388fff0b51885677e258883534ae
     pool.zap;
     // 0xa79828df1850e8a3a3064576f380d90aecdd3359
+    pool.sRewardContract;
+    // null
     pool.rewardContract;
     // null
     pool.isPlain;

package/lib/constants/aliases.js

@@ -27,7 +27,7 @@ exports.ALIASES_POLYGON = (0, utils_1.lowerCaseValues)({
     "registry_exchange": "",
 });
 exports.ALIASES_AVALANCHE = (0, utils_1.lowerCaseValues)({
-    "crv": "0x249848BeCA43aC405b8102Ec90Dd5F22CA513c06",
+    "crv": "0x47536F17F4fF30e64A96a7555826b8f9e66ec468",
     "minter": "0xd061D61a4d941c39E5453435B6345Dc261C2fcE0",
     "voting_escrow": "0x5f3b5DfEb7B28CDbD7FAba78963EE202a494e2A2",
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",

package/lib/constants/coins/avalanche.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.aTokensAvalanche = exports.ycTokensAvalanche = exports.yTokensAvalanche = exports.cTokensAvalanche = exports.COINS_AVALANCHE = void 0;
 var utils_1 = require("../utils");
 exports.COINS_AVALANCHE = (0, utils_1.lowerCaseValues)({
+    'crv': '0x47536F17F4fF30e64A96a7555826b8f9e66ec468',
     'crv.e': '0x249848BeCA43aC405b8102Ec90Dd5F22CA513c06',
     // --- USD ---
     'dai.e': '0xd586E7F844cEa2F87f50152665BCbc2C279D8d70',

package/lib/constants/pools/avalanche.js

@@ -20,7 +20,7 @@ exports.POOLS_DATA_AVALANCHE = (0, utils_1.lowerCasePoolDataAddresses)({
         swap_address: '0x7f90122BF0700F9E7e1F688fe926940E8839F353',
         token_address: '0x1337BedC9D22ecbe766dF105c9623922A27963EC',
         gauge_address: '0x5B5CFE992AdAC0C9D48E05854B2d91C73a003858',
-        sCurveRewards_address: '0xB504b6EB06760019801a91B451d3f7BD9f027fC9',
+        reward_contract: '0xB504b6EB06760019801a91B451d3f7BD9f027fC9',
         is_lending: true,
         underlying_coins: ['DAI.e', 'USDC.e', 'USDT.e'],
         wrapped_coins: ['avDAI', 'avUSDC', 'avUSDT'],
@@ -37,7 +37,7 @@ exports.POOLS_DATA_AVALANCHE = (0, utils_1.lowerCasePoolDataAddresses)({
         underlying_decimals: [18, 6, 6],
         wrapped_decimals: [18, 6, 6],
         use_lending: [true, true, true],
-        reward_tokens: ["0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7"],
+        reward_tokens: ["0x47536F17F4fF30e64A96a7555826b8f9e66ec468"],
         reward_decimals: [18],
         swap_abi: swap_json_1.default,
         gauge_abi: gauge_rewards_only_json_1.default,
@@ -51,7 +51,7 @@ exports.POOLS_DATA_AVALANCHE = (0, utils_1.lowerCasePoolDataAddresses)({
         swap_address: '0x16a7DA911A4DD1d83F3fF066fE28F3C792C50d90',
         token_address: '0xC2b1DF84112619D190193E48148000e3990Bf627',
         gauge_address: '0x0f9cb53Ebe405d49A0bbdBD291A65Ff571bC83e1',
-        sCurveRewards_address: '0x75D05190f35567e79012c2F0a02330D3Ed8a1F74',
+        reward_contract: '0x75D05190f35567e79012c2F0a02330D3Ed8a1F74',
         is_lending: true,
         underlying_coins: ['WBTC.e', 'renBTC'],
         wrapped_coins: ['avWBTC', 'renBTC'],
@@ -66,7 +66,7 @@ exports.POOLS_DATA_AVALANCHE = (0, utils_1.lowerCasePoolDataAddresses)({
         underlying_decimals: [8, 8],
         wrapped_decimals: [8, 8],
         use_lending: [true, false],
-        reward_tokens: ["0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7"],
+        reward_tokens: ["0x47536F17F4fF30e64A96a7555826b8f9e66ec468"],
         reward_decimals: [18],
         swap_abi: swap_json_2.default,
         gauge_abi: gauge_rewards_only_json_1.default,
@@ -81,7 +81,7 @@ exports.POOLS_DATA_AVALANCHE = (0, utils_1.lowerCasePoolDataAddresses)({
         token_address: '0x1daB6560494B04473A0BE3E7D83CF3Fdf3a51828',
         gauge_address: '0x445FE580eF8d70FF569aB36e80c647af338db351',
         deposit_address: '0x58e57cA18B7A47112b877E31929798Cd3D703b0f',
-        sCurveRewards_address: '0xa05E565cA0a103FcD999c7A7b8de7Bd15D5f6505',
+        reward_contract: '0xa05E565cA0a103FcD999c7A7b8de7Bd15D5f6505',
         is_meta: true,
         is_crypto: true,
         is_fake: true,
@@ -103,7 +103,7 @@ exports.POOLS_DATA_AVALANCHE = (0, utils_1.lowerCasePoolDataAddresses)({
         underlying_decimals: [18, 6, 6, 8, 18],
         wrapped_decimals: [18, 8, 18],
         use_lending: [false, false, false, false, false],
-        reward_tokens: ["0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7"],
+        reward_tokens: ["0x47536F17F4fF30e64A96a7555826b8f9e66ec468"],
         reward_decimals: [18],
         swap_abi: swap_json_3.default,
         gauge_abi: gauge_rewards_only_json_1.default,

package/lib/constants/pools/ethereum.js

@@ -1190,7 +1190,6 @@ exports.POOLS_DATA_ETHEREUM = (0, utils_1.lowerCasePoolDataAddresses)({
         token_address: '0x5a6A4D54456819380173272A5E8E9B9904BdF41B',
         gauge_address: '0xd8b712d29381748dB89c36BCa0138d7c75866ddF',
         deposit_address: '0xA79828DF1850E8a3A3064576f380D90aECDD3359',
-        sCurveRewards_address: '0xb76256d1091e93976c61449d6e500d9f46d827d4',
         is_meta: true,
         base_pool: '3pool',
         underlying_coins: ['MIM', 'DAI', 'USDC', 'USDT'],

package/lib/pools/PoolTemplate.d.ts

@@ -9,6 +9,7 @@ export declare class PoolTemplate {
     lpToken: string;
     gauge: string;
     zap: string | null;
+    sRewardContract: string | null;
     rewardContract: string | null;
     isPlain: boolean;
     isLending: boolean;

package/lib/pools/PoolTemplate.js

@@ -232,7 +232,7 @@ var PoolTemplate = /** @class */ (function () {
             return __generator(this, function (_k) {
                 switch (_k.label) {
                     case 0:
-                        if (!(curve_1.curve.chainId === 137)) return [3 /*break*/, 8];
+                        if (![137, 43114].includes(curve_1.curve.chainId)) return [3 /*break*/, 8];
                         apy = [];
                         _i = 0, _a = this.rewardTokens;
                         _k.label = 1;
@@ -637,6 +637,7 @@ var PoolTemplate = /** @class */ (function () {
         this.lpToken = poolData.token_address;
         this.gauge = poolData.gauge_address;
         this.zap = poolData.deposit_address || null;
+        this.sRewardContract = poolData.sCurveRewards_address || null;
         this.rewardContract = poolData.reward_contract || null;
         this.isPlain = poolData.is_plain || false;
         this.isLending = poolData.is_lending || false;
@@ -1144,9 +1145,9 @@ var PoolTemplate = /** @class */ (function () {
     PoolTemplate.prototype.claimableRewards = function (address) {
         if (address === void 0) { address = ""; }
         return __awaiter(this, void 0, void 0, function () {
-            var gaugeContract, rewards, _i, _a, rewardToken, rewardTokenContract, symbol, decimals, method, amount, _c, _d, rewardToken, rewardTokenContract, symbol, decimals, amount, _e, _f;
-            return __generator(this, function (_g) {
-                switch (_g.label) {
+            var gaugeContract, rewards, _i, _a, rewardToken, rewardTokenContract, symbol, decimals, method, amount, _c, _d, rewardToken, rewardTokenContract, symbol, decimals, _totalAmount, _claimedAmount;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         if (this.gauge === ethers_1.ethers.constants.AddressZero) {
                             throw Error("claimableRewards method doesn't exist for pool ".concat(this.name, " (id: ").concat(this.name, "). There is no gauge"));
@@ -1158,53 +1159,55 @@ var PoolTemplate = /** @class */ (function () {
                         rewards = [];
                         if (!('claimable_reward(address,address)' in gaugeContract)) return [3 /*break*/, 7];
                         _i = 0, _a = this.rewardTokens;
-                        _g.label = 1;
+                        _e.label = 1;
                     case 1:
                         if (!(_i < _a.length)) return [3 /*break*/, 6];
                         rewardToken = _a[_i];
                         rewardTokenContract = curve_1.curve.contracts[rewardToken].contract;
                         return [4 /*yield*/, rewardTokenContract.symbol()];
                     case 2:
-                        symbol = _g.sent();
+                        symbol = _e.sent();
                         return [4 /*yield*/, rewardTokenContract.decimals()];
                     case 3:
-                        decimals = _g.sent();
+                        decimals = _e.sent();
                         method = curve_1.curve.chainId === 1 ? "claimable_reward" : "claimable_reward_write";
                         _d = (_c = ethers_1.ethers.utils).formatUnits;
                         return [4 /*yield*/, gaugeContract[method](address, rewardToken, curve_1.curve.constantOptions)];
                     case 4:
-                        amount = _d.apply(_c, [_g.sent(), decimals]);
+                        amount = _d.apply(_c, [_e.sent(), decimals]);
                         rewards.push({
                             token: rewardToken,
                             symbol: symbol,
                             amount: amount,
                         });
-                        _g.label = 5;
+                        _e.label = 5;
                     case 5:
                         _i++;
                         return [3 /*break*/, 1];
-                    case 6: return [3 /*break*/, 11];
+                    case 6: return [3 /*break*/, 12];
                     case 7:
-                        if (!('claimable_reward(address)' in gaugeContract && this.rewardTokens.length > 0)) return [3 /*break*/, 11];
+                        if (!('claimable_reward(address)' in gaugeContract && this.rewardTokens.length > 0)) return [3 /*break*/, 12];
                         rewardToken = this.rewardTokens[0];
                         rewardTokenContract = curve_1.curve.contracts[rewardToken].contract;
                         return [4 /*yield*/, rewardTokenContract.symbol()];
                     case 8:
-                        symbol = _g.sent();
+                        symbol = _e.sent();
                         return [4 /*yield*/, rewardTokenContract.decimals()];
                     case 9:
-                        decimals = _g.sent();
-                        _f = (_e = ethers_1.ethers.utils).formatUnits;
+                        decimals = _e.sent();
                         return [4 /*yield*/, gaugeContract.claimable_reward(address, curve_1.curve.constantOptions)];
                     case 10:
-                        amount = _f.apply(_e, [_g.sent(), decimals]);
+                        _totalAmount = _e.sent();
+                        return [4 /*yield*/, gaugeContract.claimed_rewards_for(address, curve_1.curve.constantOptions)];
+                    case 11:
+                        _claimedAmount = _e.sent();
                         rewards.push({
                             token: rewardToken,
                             symbol: symbol,
-                            amount: amount,
+                            amount: ethers_1.ethers.utils.formatUnits(_totalAmount.sub(_claimedAmount), decimals),
                         });
-                        _g.label = 11;
-                    case 11: return [2 /*return*/, rewards];
+                        _e.label = 12;
+                    case 12: return [2 /*return*/, rewards];
                 }
             });
         });

package/lib/utils.js

@@ -470,12 +470,16 @@ var _getUsdRate = function (assetId) { return __awaiter(void 0, void 0, void 0,
                 }[assetId] || assetId;
                 assetId = (0, exports.isEth)(assetId) ? nativeTokenName : assetId.toLowerCase();
                 // No EURT on Coingecko Polygon
-                if (assetId.toLowerCase() === curve_1.curve.constants.COINS.eurt.toLowerCase()) {
+                if (curve_1.curve.chainId === 137 && assetId.toLowerCase() === curve_1.curve.constants.COINS.eurt) {
                     chainName = 'ethereum';
                     assetId = '0xC581b735A1688071A1746c968e0798D642EDE491'.toLowerCase(); // EURT Ethereum
                 }
+                // CRV
+                if (assetId.toLowerCase() === curve_1.curve.constants.ALIASES.crv) {
+                    assetId = 'curve-dao-token';
+                }
                 if (!((((_a = _usdRatesCache[assetId]) === null || _a === void 0 ? void 0 : _a.time) || 0) + 600000 < Date.now())) return [3 /*break*/, 3];
-                url = [nativeTokenName, 'bitcoin', 'link'].includes(assetId.toLowerCase()) ?
+                url = [nativeTokenName, 'bitcoin', 'link', 'curve-dao-token'].includes(assetId.toLowerCase()) ?
                     "https://api.coingecko.com/api/v3/simple/price?ids=".concat(assetId, "&vs_currencies=usd") :
                     "https://api.coingecko.com/api/v3/simple/token_price/".concat(chainName, "?contract_addresses=").concat(assetId, "&vs_currencies=usd");
                 return [4 /*yield*/, axios_1.default.get(url)];

package/package.json

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