@curvefi/api 2.5.0 → 2.7.0

package/lib/pools/PoolTemplate.js

@@ -262,7 +262,7 @@ var PoolTemplate = /** @class */ (function () {
                     case 0:
                         if (this.gauge === ethers_1.ethers.constants.AddressZero)
                             return [2 /*return*/, []];
-                        if (![137, 250, 43114].includes(curve_1.curve.chainId)) return [3 /*break*/, 8];
+                        if (![10, 137, 250, 43114, 42161].includes(curve_1.curve.chainId)) return [3 /*break*/, 8];
                         apy = [];
                         return [4 /*yield*/, this.rewardTokens()];
                     case 1:

package/lib/pools/poolConstructor.js

@@ -16,6 +16,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPool = void 0;
+var curve_1 = require("../curve");
 var PoolTemplate_1 = require("./PoolTemplate");
 var poolBalancesMixin_1 = require("./mixins/poolBalancesMixin");
 var depositBalancedAmountsMixins_1 = require("./mixins/depositBalancedAmountsMixins");
@@ -226,7 +227,7 @@ var getPool = function (poolId) {
         }
     }
     // swap and swapEstimateGas
-    if (poolId === 'tricrypto2') {
+    if ('exchange(uint256,uint256,uint256,uint256,bool)' in curve_1.curve.contracts[poolDummy.address].contract) { // tricrypto2 (eth), tricrypto (arbitrum)
         Object.assign(Pool.prototype, swapMixins_1.swapTricrypto2Mixin);
     }
     else if (poolDummy.isMetaFactory && (0, exports.getPool)(poolDummy.basePool).isLending) {
@@ -238,7 +239,7 @@ var getPool = function (poolId) {
     // swapWrapped and swapWrappedEstimateGas
     if (!poolDummy.isPlain && !poolDummy.isFake) {
         Object.assign(Pool.prototype, swapWrappedMixins_1.swapWrappedExpectedAndApproveMixin);
-        if (poolId === 'tricrypto2') {
+        if ('exchange(uint256,uint256,uint256,uint256,bool)' in curve_1.curve.contracts[poolDummy.address].contract) { // tricrypto2 (eth), tricrypto (arbitrum)
             Object.assign(Pool.prototype, swapWrappedMixins_1.swapWrappedTricrypto2Mixin);
         }
         else {

package/lib/pools/utils.js

@@ -46,6 +46,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserPoolList = exports.getCryptoFactoryPoolList = exports.getFactoryPoolList = exports.getPoolList = void 0;
+var ethers_1 = require("ethers");
 var curve_1 = require("../curve");
 var poolConstructor_1 = require("./poolConstructor");
 var getPoolList = function () { return Object.keys(curve_1.curve.constants.POOLS_DATA); };
@@ -55,27 +56,34 @@ exports.getFactoryPoolList = getFactoryPoolList;
 var getCryptoFactoryPoolList = function () { return Object.keys(curve_1.curve.constants.CRYPTO_FACTORY_POOLS_DATA); };
 exports.getCryptoFactoryPoolList = getCryptoFactoryPoolList;
 var getUserPoolList = function (address) { return __awaiter(void 0, void 0, void 0, function () {
-    var poolNames, promises, _i, poolNames_1, poolName, pool, userPoolList, balances, i;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var poolIds, calls, _i, poolIds_1, poolId, pool, userPoolList, _rawBalances, _a, poolIds_2, poolId, pool, _balance;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 if (!address)
                     address = curve_1.curve.signerAddress;
                 address = address;
-                poolNames = __spreadArray(__spreadArray(__spreadArray([], (0, exports.getPoolList)(), true), (0, exports.getFactoryPoolList)(), true), (0, exports.getCryptoFactoryPoolList)(), true);
-                promises = [];
-                for (_i = 0, poolNames_1 = poolNames; _i < poolNames_1.length; _i++) {
-                    poolName = poolNames_1[_i];
-                    pool = (0, poolConstructor_1.getPool)(poolName);
-                    promises.push(pool.wallet.lpTokenBalances(address)); // TODO optimization
+                poolIds = __spreadArray(__spreadArray(__spreadArray([], (0, exports.getPoolList)(), true), (0, exports.getFactoryPoolList)(), true), (0, exports.getCryptoFactoryPoolList)(), true);
+                calls = [];
+                for (_i = 0, poolIds_1 = poolIds; _i < poolIds_1.length; _i++) {
+                    poolId = poolIds_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)
+                        calls.push(curve_1.curve.contracts[pool.gauge].multicallContract.balanceOf(address));
                 }
                 userPoolList = [];
-                return [4 /*yield*/, Promise.all(promises)];
+                return [4 /*yield*/, curve_1.curve.multicallProvider.all(calls)];
             case 1:
-                balances = (_a.sent()).map(function (lpBalance) { return Object.values(lpBalance).map(Number).reduce(function (a, b) { return a + b; }); });
-                for (i = 0; i < poolNames.length; i++) {
-                    if (balances[i] > 0) {
-                        userPoolList.push(poolNames[i]);
+                _rawBalances = _b.sent();
+                for (_a = 0, poolIds_2 = poolIds; _a < poolIds_2.length; _a++) {
+                    poolId = poolIds_2[_a];
+                    pool = (0, poolConstructor_1.getPool)(poolId);
+                    _balance = _rawBalances.shift();
+                    if (pool.gauge !== ethers_1.ethers.constants.AddressZero)
+                        _balance = _balance.add(_rawBalances.shift());
+                    if (_balance.gt(0)) {
+                        userPoolList.push(poolId);
                     }
                 }
                 return [2 /*return*/, userPoolList];

package/lib/utils.js

@@ -240,7 +240,7 @@ var _getAllowance = function (coins, address, spender) { return __awaiter(void 0
                     _coins.splice(ethIndex, 1);
                 }
                 if (!(_coins.length === 1)) return [3 /*break*/, 2];
-                return [4 /*yield*/, curve_1.curve.contracts[_coins[0]].contract.allowance(address, spender)];
+                return [4 /*yield*/, curve_1.curve.contracts[_coins[0]].contract.allowance(address, spender, curve_1.curve.constantOptions)];
             case 1:
                 allowance = [_a.sent()];
                 return [3 /*break*/, 4];
@@ -452,15 +452,19 @@ var _getUsdRate = function (assetId) { return __awaiter(void 0, void 0, void 0,
                     return [2 /*return*/, 1];
                 chainName = {
                     1: 'ethereum',
+                    10: 'optimistic-ethereum',
                     137: 'polygon-pos',
                     250: 'fantom',
                     43114: 'avalanche',
+                    42161: 'arbitrum-one',
                 }[curve_1.curve.chainId];
                 nativeTokenName = {
                     1: 'ethereum',
+                    10: 'optimism',
                     137: 'matic-network',
                     250: 'fantom',
                     43114: 'avalanche-2',
+                    42161: 'ethereum',
                 }[curve_1.curve.chainId];
                 if (chainName === undefined) {
                     throw Error('curve object is not initialized');
@@ -523,9 +527,11 @@ var getTVL = function (chainId) {
                 case 0:
                     network = (_a = {
                         1: "ethereum",
+                        10: 'optimism',
                         137: "polygon",
                         250: "fantom",
                         43114: "avalanche",
+                        42161: "arbitrum",
                     }[chainId]) !== null && _a !== void 0 ? _a : "ethereum";
                     promises = [
                         (0, external_api_1._getPoolsFromApi)(network, "main"),

package/package.json

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