@curvefi/api 2.30.1 → 2.31.0

package/lib/pools/mixins/withdrawExpectedMixins.js

@@ -35,20 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withdrawWrappedExpectedMixin = exports.withdrawExpectedAtricrypto3Mixin = exports.withdrawExpectedMetaMixin = exports.withdrawExpectedLendingOrCryptoMixin = exports.withdrawExpectedMixin = void 0;
+exports.withdrawWrappedExpectedMixin = exports.withdrawExpectedMetaMixin = exports.withdrawExpectedLendingOrCryptoMixin = exports.withdrawExpectedMixin = void 0;
 var ethers_1 = require("ethers");
 var common_1 = require("./common");
-var PoolTemplate_1 = require("../PoolTemplate");
 var utils_1 = require("../../utils");
 // @ts-ignore
 exports.withdrawExpectedMixin = {
@@ -94,40 +84,6 @@ exports.withdrawExpectedLendingOrCryptoMixin = {
 };
 // @ts-ignore
 exports.withdrawExpectedMetaMixin = {
-    withdrawExpected: function (lpTokenAmount) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _lpTokenAmount, _expectedWrappedAmounts, _expectedMetaCoinAmount, _expectedUnderlyingAmounts, basePool, _basePoolExpectedAmounts, _a, _expected;
-            var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _lpTokenAmount = (0, utils_1.parseUnits)(lpTokenAmount);
-                        return [4 /*yield*/, common_1._calcExpectedAmounts.call(this, _lpTokenAmount)];
-                    case 1:
-                        _expectedWrappedAmounts = _b.sent();
-                        _expectedWrappedAmounts.unshift(_expectedWrappedAmounts.pop());
-                        _expectedMetaCoinAmount = _expectedWrappedAmounts[0], _expectedUnderlyingAmounts = _expectedWrappedAmounts.slice(1);
-                        basePool = new PoolTemplate_1.PoolTemplate(this.basePool);
-                        if (!(this.basePool === "atricrypto3")) return [3 /*break*/, 3];
-                        return [4 /*yield*/, common_1._atricrypto3CalcExpectedAmounts.call(basePool, _expectedMetaCoinAmount)];
-                    case 2:
-                        _a = _b.sent();
-                        return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, common_1._calcExpectedAmounts.call(basePool, _expectedMetaCoinAmount)];
-                    case 4:
-                        _a = _b.sent();
-                        _b.label = 5;
-                    case 5:
-                        _basePoolExpectedAmounts = _a;
-                        _expected = __spreadArray(__spreadArray([], _expectedUnderlyingAmounts, true), _basePoolExpectedAmounts, true);
-                        return [2 /*return*/, _expected.map(function (amount, i) { return ethers_1.ethers.utils.formatUnits(amount, _this.underlyingDecimals[i]); })];
-                }
-            });
-        });
-    },
-};
-// @ts-ignore
-exports.withdrawExpectedAtricrypto3Mixin = {
     withdrawExpected: function (lpTokenAmount) {
         return __awaiter(this, void 0, void 0, function () {
             var _lpTokenAmount, _expected;
@@ -136,7 +92,7 @@ exports.withdrawExpectedAtricrypto3Mixin = {
                 switch (_a.label) {
                     case 0:
                         _lpTokenAmount = (0, utils_1.parseUnits)(lpTokenAmount);
-                        return [4 /*yield*/, common_1._atricrypto3CalcExpectedAmounts.call(this, _lpTokenAmount)];
+                        return [4 /*yield*/, common_1._calcExpectedUnderlyingAmountsMeta.call(this, _lpTokenAmount)];
                     case 1:
                         _expected = _a.sent();
                         return [2 /*return*/, _expected.map(function (amount, i) { return ethers_1.ethers.utils.formatUnits(amount, _this.underlyingDecimals[i]); })];

package/lib/pools/mixins/withdrawMixins.js

@@ -46,6 +46,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withdrawPlainMixin = exports.withdrawLendingOrCryptoMixin = exports.withdrawZapMixin = exports.withdrawCryptoMetaFactoryMixin = exports.withdrawMetaFactoryMixin = void 0;
 var ethers_1 = require("ethers");
@@ -235,27 +244,31 @@ exports.withdrawZapMixin = {
     _withdraw: function (_lpTokenAmount, slippage, estimateGas) {
         if (estimateGas === void 0) { estimateGas = false; }
         return __awaiter(this, void 0, void 0, function () {
-            var _minAmounts, contract, gas, gasLimit;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _minAmounts, contract, args, gas, gasLimit;
+            var _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         if (!!estimateGas) return [3 /*break*/, 2];
                         return [4 /*yield*/, (0, utils_1._ensureAllowance)([this.lpToken], [_lpTokenAmount], this.zap)];
                     case 1:
-                        _b.sent();
-                        _b.label = 2;
+                        _c.sent();
+                        _c.label = 2;
                     case 2: return [4 /*yield*/, _withdrawMinAmounts.call(this, _lpTokenAmount, slippage)];
                     case 3:
-                        _minAmounts = _b.sent();
+                        _minAmounts = _c.sent();
                         contract = curve_1.curve.contracts[this.zap].contract;
-                        return [4 /*yield*/, contract.estimateGas.remove_liquidity(_lpTokenAmount, _minAmounts, curve_1.curve.constantOptions)];
+                        args = [_lpTokenAmount, _minAmounts];
+                        if ("remove_liquidity(uint256,uint256[".concat(this.underlyingCoinAddresses.length, "],bool)") in contract)
+                            args.push(true);
+                        return [4 /*yield*/, (_b = contract.estimateGas).remove_liquidity.apply(_b, __spreadArray(__spreadArray([], args, false), [curve_1.curve.constantOptions], false))];
                     case 4:
-                        gas = _b.sent();
+                        gas = _c.sent();
                         if (estimateGas)
                             return [2 /*return*/, gas.toNumber()];
                         gasLimit = gas.mul(130).div(100);
-                        return [4 /*yield*/, contract.remove_liquidity(_lpTokenAmount, _minAmounts, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit }))];
-                    case 5: return [2 /*return*/, (_b.sent()).hash];
+                        return [4 /*yield*/, contract.remove_liquidity.apply(contract, __spreadArray(__spreadArray([], args, false), [__assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit })], false))];
+                    case 5: return [2 /*return*/, (_c.sent()).hash];
                 }
             });
         });

package/lib/pools/mixins/withdrawOneCoinMixins.js

@@ -46,6 +46,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withdrawOneCoinPlainMixin = exports.withdrawOneCoinLendingOrCryptoMixin = exports.withdrawOneCoinZapMixin = exports.withdrawOneCoinCryptoMetaFactoryMixin = exports.withdrawOneCoinMetaFactoryMixin = void 0;
 var curve_1 = require("../../curve");
@@ -235,27 +244,31 @@ exports.withdrawOneCoinZapMixin = {
     _withdrawOneCoin: function (_lpTokenAmount, i, slippage, estimateGas) {
         if (estimateGas === void 0) { estimateGas = false; }
         return __awaiter(this, void 0, void 0, function () {
-            var _minAmount, contract, gas, gasLimit;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _minAmount, contract, args, gas, gasLimit;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (!!estimateGas) return [3 /*break*/, 2];
                         return [4 /*yield*/, (0, utils_1._ensureAllowance)([this.lpToken], [_lpTokenAmount], this.zap)];
                     case 1:
-                        _a.sent();
-                        _a.label = 2;
+                        _b.sent();
+                        _b.label = 2;
                     case 2: return [4 /*yield*/, _withdrawOneCoinMinAmount.call(this, _lpTokenAmount, i, slippage)];
                     case 3:
-                        _minAmount = _a.sent();
+                        _minAmount = _b.sent();
                         contract = curve_1.curve.contracts[this.zap].contract;
-                        return [4 /*yield*/, contract.estimateGas.remove_liquidity_one_coin(_lpTokenAmount, i, _minAmount, curve_1.curve.constantOptions)];
+                        args = [_lpTokenAmount, i, _minAmount];
+                        if ("remove_liquidity_one_coin(uint256,uint256,uint256,bool)" in contract)
+                            args.push(true);
+                        return [4 /*yield*/, (_a = contract.estimateGas).remove_liquidity_one_coin.apply(_a, __spreadArray(__spreadArray([], args, false), [curve_1.curve.constantOptions], false))];
                     case 4:
-                        gas = _a.sent();
+                        gas = _b.sent();
                         if (estimateGas)
                             return [2 /*return*/, gas.toNumber()];
                         gasLimit = gas.mul(130).div(100);
-                        return [4 /*yield*/, contract.remove_liquidity_one_coin(_lpTokenAmount, i, _minAmount, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit }))];
-                    case 5: return [2 /*return*/, (_a.sent()).hash];
+                        return [4 /*yield*/, contract.remove_liquidity_one_coin.apply(contract, __spreadArray(__spreadArray([], args, false), [__assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit })], false))];
+                    case 5: return [2 /*return*/, (_b.sent()).hash];
                 }
             });
         });

package/lib/pools/poolConstructor.js

@@ -43,10 +43,7 @@ var getPool = function (poolId) {
         return Pool;
     }(PoolTemplate_1.PoolTemplate));
     // statsBalances
-    if (poolDummy.isFake || (curve_1.curve.chainId === 100 && poolDummy.id === "tricrypto")) { // 100 is xDAI
-        Object.assign(Pool.prototype, poolBalancesMixin_1.poolBalancesAtricrypto3Mixin);
-    }
-    else if (poolDummy.isMeta) {
+    if (poolDummy.isMeta) {
         Object.assign(Pool.prototype, poolBalancesMixin_1.poolBalancesMetaMixin);
     }
     else if (poolDummy.useLending.reduce(function (x, y) { return x || y; })) {
@@ -96,10 +93,7 @@ var getPool = function (poolId) {
         }
     }
     // withdrawExpected
-    if (poolDummy.isFake || (curve_1.curve.chainId === 100 && poolDummy.id === "tricrypto")) { // 100 is xDAI
-        Object.assign(Pool.prototype, withdrawExpectedMixins_1.withdrawExpectedAtricrypto3Mixin);
-    }
-    else if (poolDummy.isMeta) {
+    if (poolDummy.isMeta) {
         Object.assign(Pool.prototype, withdrawExpectedMixins_1.withdrawExpectedMetaMixin);
     }
     else if (poolDummy.isLending || (poolDummy.isCrypto && !poolDummy.isPlain)) {
@@ -212,7 +206,7 @@ var getPool = function (poolId) {
     }
     // swap and swapEstimateGas
     if ('exchange(uint256,uint256,uint256,uint256,bool)' in curve_1.curve.contracts[poolDummy.address].contract &&
-        !(curve_1.curve.chainId === 100 && poolDummy.id === "tricrypto")) { // tricrypto2 (eth), tricrypto (arbitrum); 100 is xDAI
+        !(curve_1.curve.chainId === 100 && poolDummy.id === "tricrypto")) { // tricrypto2 (eth), tricrypto (arbitrum), avaxcrypto (avalanche); 100 is xDAI
         Object.assign(Pool.prototype, swapMixins_1.swapTricrypto2Mixin);
     }
     else if (poolDummy.isMetaFactory && ((0, exports.getPool)(poolDummy.basePool).isLending || (0, exports.getPool)(poolDummy.basePool).isFake || poolDummy.isCrypto)) {

package/lib/router.js

@@ -81,8 +81,35 @@ var getNewRoute = function (routeTvl, poolId, poolAddress, inputCoinAddress, out
         totalTvl: routeTvl.totalTvl + tvl,
     };
 };
+// TODO REMOVE IT!!!
+var filterMaticFactory83Route = function (routes) {
+    return routes.filter(function (r) {
+        for (var _i = 0, _a = r.route; _i < _a.length; _i++) {
+            var step = _a[_i];
+            if (step.poolId === "factory-crypto-83" && step.inputCoinAddress === curve_1.curve.constants.NATIVE_TOKEN.address)
+                return false;
+        }
+        return true;
+    });
+};
+// TODO REMOVE IT!!!
+var filterAvax = function (routes) {
+    return routes.filter(function (r) {
+        for (var _i = 0, _a = r.route; _i < _a.length; _i++) {
+            var step = _a[_i];
+            if (step.poolId == 'avaxcrypto' && step.swapType == 4 && (step.i === 3 || step.j === 3))
+                return false;
+        }
+        return true;
+    });
+};
 var MAX_ROUTES_FOR_ONE_COIN = 3;
 var filterRoutes = function (routes, inputCoinAddress, sortFn) {
+    // TODO REMOVE IT!!!
+    if (curve_1.curve.chainId === 137)
+        routes = filterMaticFactory83Route(routes);
+    if (curve_1.curve.chainId === 43114)
+        routes = filterAvax(routes);
     return routes
         .filter(function (r) { return r.route.length > 0; })
         .filter(function (r) { return r.route[0].inputCoinAddress === inputCoinAddress; }) // Truncated routes
@@ -94,13 +121,6 @@ var filterRoutes = function (routes, inputCoinAddress, sortFn) {
 };
 var sortByTvl = function (a, b) { return b.minTvl - a.minTvl || b.totalTvl - a.totalTvl || a.route.length - b.route.length; };
 var sortByLength = function (a, b) { return a.route.length - b.route.length || b.minTvl - a.minTvl || b.totalTvl - a.totalTvl; };
-// TODO REMOVE IT!!!
-var filterMaticFactory83Route = function (routes) {
-    return routes
-        .filter(function (r) {
-        return !(r.route.length === 1 && r.route[0].poolId === "factory-crypto-83" && r.route[0].inputCoinAddress === curve_1.curve.constants.NATIVE_TOKEN.address);
-    });
-};
 // Inspired by Dijkstra's algorithm
 var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __awaiter(void 0, void 0, void 0, function () {
     var ALL_POOLS, amplificationCoefficientDict, curCoins, nextCoins, routesByTvl, routesByLength, step, _loop_1, _i, curCoins_1, inCoin, routes;
@@ -217,8 +237,8 @@ var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __a
                                                         if (j === inCoinIndexes.wrapped_coin)
                                                             return "continue";
                                                         // Native swaps spend less gas
-                                                        if (wrapped_coin_addresses[j] !== outputCoinAddress && wrapped_coin_addresses[j] === curve_1.curve.constants.NATIVE_TOKEN.wrappedAddress)
-                                                            return "continue";
+                                                        // TODO uncomment
+                                                        // if (wrapped_coin_addresses[j] !== outputCoinAddress && wrapped_coin_addresses[j] === curve.constants.NATIVE_TOKEN.wrappedAddress) continue;
                                                         // Looking for outputCoinAddress only on the final step
                                                         if (step === 3 && wrapped_coin_addresses[j] !== outputCoinAddress)
                                                             return "continue";
@@ -268,7 +288,7 @@ var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __a
                                                                 hasEth = (inCoin === curve_1.curve.constants.NATIVE_TOKEN.address || underlying_coin_addresses[j] === curve_1.curve.constants.NATIVE_TOKEN.address);
                                                                 swapType = (poolData.is_crypto && poolData.is_meta && poolData.is_factory) ? 6
                                                                     : ((base_pool === null || base_pool === void 0 ? void 0 : base_pool.is_lending) && poolData.is_factory) ? 5
-                                                                        : hasEth ? 3
+                                                                        : hasEth && poolId !== 'avaxcrypto' ? 3
                                                                             : poolData.is_crypto ? 4
                                                                                 : 2;
                                                                 newRoutesByTvl = routesByTvl[inCoin].map(function (route) { return getNewRoute(route, poolId, poolAddress, inCoin, underlying_coin_addresses[j], inCoinIndexes.underlying_coin, j, swapType, (swapType === 5 || swapType === 6) ? poolData.swap_address : ethers_1.ethers.constants.AddressZero, tvl_1); });
@@ -334,9 +354,6 @@ var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __a
                 return [3 /*break*/, 2];
             case 8:
                 routes = __spreadArray(__spreadArray([], ((_q = routesByTvl[outputCoinAddress]) !== null && _q !== void 0 ? _q : []), true), ((_r = routesByLength[outputCoinAddress]) !== null && _r !== void 0 ? _r : []), true);
-                // TODO REMOVE IT!!!
-                if (curve_1.curve.chainId === 137)
-                    routes = filterMaticFactory83Route(routes);
                 return [2 /*return*/, routes.map(function (r) { return r.route; })];
         }
     });
@@ -523,6 +540,8 @@ var getBestRouteAndOutput = function (inputCoin, outputCoin, amount) { return __
                 return [4 /*yield*/, _getBestRoute(inputCoinAddress, outputCoinAddress, amount)];
             case 1:
                 route = _c.sent();
+                if (route.length === 0)
+                    return [2 /*return*/, { route: route, output: '0.0' }];
                 return [4 /*yield*/, _getOutputForRoute(route, (0, utils_1.parseUnits)(amount, inputCoinDecimals))];
             case 2:
                 _output = _c.sent();

package/package.json

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