@curvefi/api 2.16.0 → 2.16.2

package/lib/constants/coins/ethereum.js

@@ -41,7 +41,8 @@ exports.LINK_COINS_ETHEREUM = {
 exports.EUR_COINS_ETHEREUM = {
     eurs: "0xdB25f211AB05b1c97D595516F45794528a807ad8",
     seur: "0xD71eCFF9342A5Ced620049e616c5035F1dB98620",
-    eurt: "0xC581b735A1688071A1746c968e0798D642EDE491", // EURT
+    eurt: "0xC581b735A1688071A1746c968e0798D642EDE491",
+    euroc: "0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c",
 };
 exports.USD_COINS_ETHEREUM = {
     ycdai: "0x99d1Fa417f94dcD62BfE781a1213c092a47041Bc",

package/lib/constants/pools/arbitrum.js

@@ -21,7 +21,6 @@ exports.POOLS_DATA_ARBITRUM = (0, utils_1.lowerCasePoolDataAddresses)({
         reference_asset: "USD",
         swap_address: '0x7f90122bf0700f9e7e1f688fe926940e8839f353',
         token_address: '0x7f90122bf0700f9e7e1f688fe926940e8839f353',
-        // gauge_address: '0xbF7E49483881C76487b0989CD7d9A8239B20CA41',  // Rewards-Only
         gauge_address: '0xCE5F24B7A95e9cBa7df4B54E911B4A3Dc8CDAf6f',
         is_plain: true,
         underlying_coins: ['USDC', 'USDT'],
@@ -47,7 +46,6 @@ exports.POOLS_DATA_ARBITRUM = (0, utils_1.lowerCasePoolDataAddresses)({
         is_crypto: true,
         swap_address: '0x960ea3e3C7FB317332d990873d354E18d7645590',
         token_address: '0x8e0B8c8BB9db49a46697F3a5Bb8A308e744821D2',
-        // gauge_address: '0x97E2768e8E73511cA874545DC5Ff8067eB19B787',  // Rewards-Only
         gauge_address: '0x555766f3da968ecBefa690Ffd49A2Ac02f47aa5f',
         deposit_address: '0xF97c707024ef0DD3E77a0824555a46B622bfB500',
         underlying_coins: ['USDT', 'WBTC', 'ETH'],
@@ -76,7 +74,6 @@ exports.POOLS_DATA_ARBITRUM = (0, utils_1.lowerCasePoolDataAddresses)({
         is_plain: true,
         swap_address: '0x3E01dD8a5E1fb3481F0F589056b428Fc308AF0Fb',
         token_address: '0x3E01dD8a5E1fb3481F0F589056b428Fc308AF0Fb',
-        // gauge_address: '0xC2b1DF84112619D190193E48148000e3990Bf627',  // Rewards-Only
         gauge_address: '0xDB3fd1bfC67b5D4325cb31C04E0Cae52f1787FD6',
         underlying_coins: ['WBTC', 'renBTC'],
         wrapped_coins: ['WBTC', 'renBTC'],
@@ -100,7 +97,6 @@ exports.POOLS_DATA_ARBITRUM = (0, utils_1.lowerCasePoolDataAddresses)({
         reference_asset: 'CRYPTO',
         swap_address: '0xA827a652Ead76c6B0b3D19dba05452E06e25c27e',
         token_address: '0x3dFe1324A0ee9d86337d06aEB829dEb4528DB9CA',
-        // gauge_address: '0x37C7ef6B0E23C9bd9B620A6daBbFEC13CE30D824',  // Rewards-Only
         gauge_address: '0x6339eF8Df0C2d3d3E7eE697E241666a916B81587',
         deposit_address: '0x25e2e8d104BC1A70492e2BE32dA7c1f8367F9d2c',
         is_meta: true,

package/lib/constants/pools/optimism.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.POOLS_DATA_OPTIMISM = void 0;
 var swap_json_1 = __importDefault(require("../abis/3pool-optimism/swap.json"));
 var swap_json_2 = __importDefault(require("../abis/wsteth/swap.json"));
-var gauge_rewards_only_json_1 = __importDefault(require("../abis/gauge_rewards_only.json"));
 var gauge_child_json_1 = __importDefault(require("../abis/gauge_child.json"));
 var utils_1 = require("../utils");
 exports.POOLS_DATA_OPTIMISM = (0, utils_1.lowerCasePoolDataAddresses)({
@@ -18,7 +17,7 @@ exports.POOLS_DATA_OPTIMISM = (0, utils_1.lowerCasePoolDataAddresses)({
         is_plain: true,
         swap_address: '0x1337BedC9D22ecbe766dF105c9623922A27963EC',
         token_address: '0x1337BedC9D22ecbe766dF105c9623922A27963EC',
-        gauge_address: '0x7f90122BF0700F9E7e1F688fe926940E8839F353',
+        gauge_address: '0x15F52286C0FF1d7A7dDbC9E300dd66628D46D4e6',
         underlying_coins: ['DAI', 'USDC', 'USDT'],
         wrapped_coins: ['DAI', 'USDC', 'USDT'],
         underlying_coin_addresses: [
@@ -34,7 +33,7 @@ exports.POOLS_DATA_OPTIMISM = (0, utils_1.lowerCasePoolDataAddresses)({
         underlying_decimals: [18, 6, 6],
         wrapped_decimals: [18, 6, 6],
         swap_abi: swap_json_1.default,
-        gauge_abi: gauge_rewards_only_json_1.default,
+        gauge_abi: gauge_child_json_1.default,
     },
     wsteth: {
         name: "wsteth",

package/lib/constants/pools/xdai.js

@@ -10,6 +10,7 @@ var deposit_json_1 = __importDefault(require("../abis/rai/deposit.json"));
 var swap_json_3 = __importDefault(require("../abis/tricrypto-xdai/swap.json"));
 var zap_json_1 = __importDefault(require("../abis/tricrypto-xdai/zap.json"));
 var gauge_rewards_only_json_1 = __importDefault(require("../abis/gauge_rewards_only.json"));
+var gauge_child_json_1 = __importDefault(require("../abis/gauge_child.json"));
 var streamer_json_1 = __importDefault(require("../abis/streamer.json"));
 var utils_1 = require("../utils");
 exports.POOLS_DATA_XDAI = (0, utils_1.lowerCasePoolDataAddresses)({
@@ -20,7 +21,7 @@ exports.POOLS_DATA_XDAI = (0, utils_1.lowerCasePoolDataAddresses)({
         reference_asset: 'USD',
         swap_address: '0x7f90122BF0700F9E7e1F688fe926940E8839F353',
         token_address: '0x1337BedC9D22ecbe766dF105c9623922A27963EC',
-        gauge_address: '0x78CF256256C8089d68Cde634Cf7cDEFb39286470',
+        gauge_address: '0xb721cc32160ab0da2614cc6ab16ed822aeebc101',
         sCurveRewards_address: '0x6C09F6727113543Fd061a721da512B7eFCDD0267',
         is_plain: true,
         underlying_coins: ['WXDAI', 'USDC', 'USDT'],
@@ -38,7 +39,7 @@ exports.POOLS_DATA_XDAI = (0, utils_1.lowerCasePoolDataAddresses)({
         underlying_decimals: [18, 6, 6],
         wrapped_decimals: [18, 6, 6],
         swap_abi: swap_json_1.default,
-        gauge_abi: gauge_rewards_only_json_1.default,
+        gauge_abi: gauge_child_json_1.default,
         sCurveRewards_abi: streamer_json_1.default,
     },
     rai: {

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

@@ -365,16 +365,18 @@ var PoolTemplate = /** @class */ (function () {
             if (isDeposit === void 0) { isDeposit = true; }
             if (useUnderlying === void 0) { useUnderlying = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var _rates_1, e_1, lpContract, _lpTotalSupply, decimals_1, amounts, seedAmounts_1, N_coins, decimals_2, calcContractAddress, calcContract, poolContract, lpContract, calls, res, _c, _totalSupply, _fee, _lpTokenAmount, balances, _d, totalSupplyBN, feeBN, lpTokenAmountBN, balancesBN, amountsBN, feesBN, i, _fees, _lpTokenFee, e_2, lpContract, _lpTotalSupply, decimals_3, amounts_1, _amounts18Decimals;
+                var _rates, e_1, lpContract, _lpTotalSupply, decimals_1, amounts, seedAmounts_1, N_coins, decimals_2, calcContractAddress, calcContract, poolContract, lpContract, calls, res, _c, _totalSupply, _fee, _lpTokenAmount, balances, _d, totalSupplyBN, feeBN, lpTokenAmountBN, balancesBN, amountsBN, feesBN, i, _fees, _lpTokenFee, e_2, lpContract, _lpTotalSupply, decimals_3, amounts_1, _amounts18Decimals;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
+                            _rates = [];
                             if (!(!this.isMeta && useUnderlying)) return [3 /*break*/, 2];
                             return [4 /*yield*/, this._getRates()];
                         case 1:
-                            _rates_1 = _e.sent();
+                            // For lending pools. For others rate = 1
+                            _rates = _e.sent();
                             _amounts = _amounts.map(function (_amount, i) {
-                                return _amount.mul(ethers_1.ethers.BigNumber.from(10).pow(18)).div(_rates_1[i]);
+                                return _amount.mul(ethers_1.ethers.BigNumber.from(10).pow(18)).div(_rates[i]);
                             });
                             _e.label = 2;
                         case 2:
@@ -443,6 +445,11 @@ var PoolTemplate = /** @class */ (function () {
                                 }
                             }
                             _fees = feesBN.map(function (fBN, i) { return (0, utils_1.fromBN)(fBN, decimals_2[i]); });
+                            if (!this.isMeta && useUnderlying) {
+                                _fees = _fees.map(function (_fee, i) {
+                                    return _fee.mul(ethers_1.ethers.BigNumber.from(10).pow(18)).div(_rates[i]);
+                                });
+                            }
                             return [4 /*yield*/, this._pureCalcLpTokenAmount(_fees, !isDeposit, useUnderlying)];
                         case 10:
                             _lpTokenFee = _e.sent();

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.0",
+  "version": "2.16.2",
   "description": "JavaScript library for curve.fi",
   "main": "lib/index.js",
   "author": "Macket",