@curvefi/api 2.21.4 → 2.21.6

package/lib/factory/factory-api.js

@@ -70,6 +70,7 @@ var factory_crypto_pool_2_json_1 = __importDefault(require("../constants/abis/fa
 var constants_1 = require("./constants");
 var constants_crypto_1 = require("./constants-crypto");
 var common_1 = require("./common");
+var external_api_1 = require("../external-api");
 function setFactorySwapContracts(rawPoolList, isCrypto) {
     var _this = this;
     if (isCrypto) {
@@ -131,27 +132,25 @@ function setFactoryCoinsContracts(rawPoolList) {
 }
 function getFactoryPoolsDataFromApi(isCrypto) {
     return __awaiter(this, void 0, void 0, function () {
-        var network, factoryType, url, response, rawPoolList, mainAddresses, url_1, response_1, poolGaugeDict, _i, _a, gaugeData, i, FACTORY_POOLS_DATA;
+        var network, factoryType, rawPoolList, mainAddresses, url, response, poolGaugeDict, _i, _a, gaugeData, i, FACTORY_POOLS_DATA;
         var _this = this;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     network = this.constants.NETWORK_NAME;
                     factoryType = isCrypto ? "factory-crypto" : "factory";
-                    url = "https://api.curve.fi/api/getPools/".concat(network, "/").concat(factoryType);
-                    return [4 /*yield*/, axios_1.default.get(url)];
+                    return [4 /*yield*/, (0, external_api_1._getPoolsFromApi)(network, factoryType)];
                 case 1:
-                    response = _b.sent();
-                    rawPoolList = response.data.data.poolData;
+                    rawPoolList = (_b.sent()).poolData;
                     mainAddresses = Object.values(this.constants.POOLS_DATA).map(function (pool) { return pool.swap_address.toLowerCase(); });
                     rawPoolList = rawPoolList.filter(function (p) { return !mainAddresses.includes(p.address.toLowerCase()); });
                     if (!(this.chainId !== 1)) return [3 /*break*/, 3];
-                    url_1 = "https://api.curve.fi/api/getFactoGauges/".concat(network);
-                    return [4 /*yield*/, axios_1.default.get(url_1)];
+                    url = "https://api.curve.fi/api/getFactoGauges/".concat(network);
+                    return [4 /*yield*/, axios_1.default.get(url)];
                 case 2:
-                    response_1 = _b.sent();
+                    response = _b.sent();
                     poolGaugeDict = {};
-                    for (_i = 0, _a = response_1.data.data.gauges; _i < _a.length; _i++) {
+                    for (_i = 0, _a = response.data.data.gauges; _i < _a.length; _i++) {
                         gaugeData = _a[_i];
                         poolGaugeDict[gaugeData.swap] = gaugeData.gauge;
                     }

package/lib/pools/PoolTemplate.d.ts

@@ -157,14 +157,14 @@ export declare class PoolTemplate {
     private depositAndStakeApproveEstimateGas;
     depositAndStakeApprove(amounts: (number | string)[]): Promise<string[]>;
     private depositAndStakeEstimateGas;
-    depositAndStake(amounts: (number | string)[]): Promise<string>;
+    depositAndStake(amounts: (number | string)[], slippage?: number): Promise<string>;
     depositAndStakeWrappedExpected(amounts: (number | string)[]): Promise<string>;
     depositAndStakeWrappedBonus(amounts: (number | string)[]): Promise<string>;
     depositAndStakeWrappedIsApproved(amounts: (number | string)[]): Promise<boolean>;
     private depositAndStakeWrappedApproveEstimateGas;
     depositAndStakeWrappedApprove(amounts: (number | string)[]): Promise<string[]>;
     private depositAndStakeWrappedEstimateGas;
-    depositAndStakeWrapped(amounts: (number | string)[]): Promise<string>;
+    depositAndStakeWrapped(amounts: (number | string)[], slippage?: number): Promise<string>;
     private _depositAndStake;
     withdrawExpected(lpTokenAmount: number | string): Promise<string[]>;
     withdrawIsApproved(lpTokenAmount: number | string): Promise<boolean>;

package/lib/pools/PoolTemplate.js

@@ -1046,7 +1046,6 @@ var PoolTemplate = /** @class */ (function () {
                 });
             });
         };
-        // Used by mixin. Don't delete it!!!
         this._underlyingPrices = function () { return __awaiter(_this, void 0, void 0, function () {
             var promises, _i, _c, addr;
             return __generator(this, function (_d) {
@@ -1062,7 +1061,6 @@ var PoolTemplate = /** @class */ (function () {
                 }
             });
         }); };
-        // Used by mixin. Don't delete it!!!
         // NOTE! It may crash!
         this._wrappedPrices = function () { return __awaiter(_this, void 0, void 0, function () {
             var promises, _i, _c, addr;
@@ -1328,26 +1326,34 @@ var PoolTemplate = /** @class */ (function () {
     };
     PoolTemplate.prototype.depositBonus = function (amounts) {
         return __awaiter(this, void 0, void 0, function () {
-            var amountsBN, pricesBN, balancesBN, balancedAmounts, expectedBN, _c, balancedExpectedBN, _d;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            var amountsBN, prices, _c, pricesBN, balancesBN, balancedAmounts, expectedBN, _d, balancedExpectedBN, _e;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
                         amountsBN = amounts.map(utils_1.BN);
+                        if (!(this.isCrypto || this.id === 'wsteth')) return [3 /*break*/, 2];
                         return [4 /*yield*/, this._underlyingPrices()];
                     case 1:
-                        pricesBN = (_e.sent()).map(utils_1.BN);
-                        return [4 /*yield*/, this.stats.underlyingBalances()];
+                        _c = _f.sent();
+                        return [3 /*break*/, 3];
                     case 2:
-                        balancesBN = (_e.sent()).map(utils_1.BN);
-                        balancedAmounts = this._balancedAmountsWithSameValue(amountsBN, pricesBN, balancesBN);
-                        _c = utils_1.BN;
-                        return [4 /*yield*/, this.depositExpected(amounts)];
+                        _c = this.underlyingCoins.map(function () { return 1; });
+                        _f.label = 3;
                     case 3:
-                        expectedBN = _c.apply(void 0, [_e.sent()]);
+                        prices = _c;
+                        pricesBN = prices.map(utils_1.BN);
+                        return [4 /*yield*/, this.stats.underlyingBalances()];
+                    case 4:
+                        balancesBN = (_f.sent()).map(utils_1.BN);
+                        balancedAmounts = this._balancedAmountsWithSameValue(amountsBN, pricesBN, balancesBN);
                         _d = utils_1.BN;
+                        return [4 /*yield*/, this.depositExpected(amounts)];
+                    case 5:
+                        expectedBN = _d.apply(void 0, [_f.sent()]);
+                        _e = utils_1.BN;
                         return [4 /*yield*/, this.depositExpected(balancedAmounts)];
-                    case 4:
-                        balancedExpectedBN = _d.apply(void 0, [_e.sent()]);
+                    case 6:
+                        balancedExpectedBN = _e.apply(void 0, [_f.sent()]);
                         return [2 /*return*/, String(expectedBN.minus(balancedExpectedBN).div(balancedExpectedBN).times(100))];
                 }
             });
@@ -1888,13 +1894,14 @@ var PoolTemplate = /** @class */ (function () {
                         if (this.gauge === ethers_1.ethers.constants.AddressZero) {
                             throw Error("depositAndStake method doesn't exist for pool ".concat(this.name, " (id: ").concat(this.name, "). There is no gauge"));
                         }
-                        return [4 /*yield*/, this._depositAndStake(amounts, true, true)];
+                        return [4 /*yield*/, this._depositAndStake(amounts, 1, true, true)];
                     case 1: return [2 /*return*/, _c.sent()];
                 }
             });
         });
     };
-    PoolTemplate.prototype.depositAndStake = function (amounts) {
+    PoolTemplate.prototype.depositAndStake = function (amounts, slippage) {
+        if (slippage === void 0) { slippage = 0.1; }
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -1902,7 +1909,7 @@ var PoolTemplate = /** @class */ (function () {
                         if (this.gauge === ethers_1.ethers.constants.AddressZero) {
                             throw Error("depositAndStake method doesn't exist for pool ".concat(this.name, " (id: ").concat(this.name, "). There is no gauge"));
                         }
-                        return [4 /*yield*/, this._depositAndStake(amounts, true, false)];
+                        return [4 /*yield*/, this._depositAndStake(amounts, slippage, true, false)];
                     case 1: return [2 /*return*/, _c.sent()];
                 }
             });
@@ -2037,13 +2044,14 @@ var PoolTemplate = /** @class */ (function () {
                         }
                         if (this.isPlain || this.isFake)
                             throw Error("depositAndStakeWrapped method doesn't exist for pool ".concat(this.name, " (id: ").concat(this.name, ")"));
-                        return [4 /*yield*/, this._depositAndStake(amounts, false, true)];
+                        return [4 /*yield*/, this._depositAndStake(amounts, 1, false, true)];
                     case 1: return [2 /*return*/, _c.sent()];
                 }
             });
         });
     };
-    PoolTemplate.prototype.depositAndStakeWrapped = function (amounts) {
+    PoolTemplate.prototype.depositAndStakeWrapped = function (amounts, slippage) {
+        if (slippage === void 0) { slippage = 0.1; }
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -2053,15 +2061,15 @@ var PoolTemplate = /** @class */ (function () {
                         }
                         if (this.isPlain || this.isFake)
                             throw Error("depositAndStakeWrapped method doesn't exist for pool ".concat(this.name, " (id: ").concat(this.name, ")"));
-                        return [4 /*yield*/, this._depositAndStake(amounts, false, false)];
+                        return [4 /*yield*/, this._depositAndStake(amounts, slippage, false, false)];
                     case 1: return [2 /*return*/, _c.sent()];
                 }
             });
         });
     };
-    PoolTemplate.prototype._depositAndStake = function (amounts, isUnderlying, estimateGas) {
+    PoolTemplate.prototype._depositAndStake = function (amounts, slippage, isUnderlying, estimateGas) {
         return __awaiter(this, void 0, void 0, function () {
-            var coinAddresses, coins, decimals, depositAddress, balances, _c, _d, _e, _f, _g, i, allowance, _h, _amounts, contract, useUnderlying, _minMintAmount, _j, _k, _l, _m, _o, ethIndex, value, i, _gas, gasLimit;
+            var coinAddresses, coins, decimals, depositAddress, balances, _c, _d, _e, _f, _g, i, allowance, _h, _amounts, contract, useUnderlying, _expectedLpTokenAmount, _j, _k, _l, _m, _o, minAmountBN, _minMintAmount, ethIndex, value, i, _gas, gasLimit;
             return __generator(this, function (_q) {
                 switch (_q.label) {
                     case 0:
@@ -2123,16 +2131,18 @@ var PoolTemplate = /** @class */ (function () {
                         _l = (_k = ethers_1.ethers.utils).parseUnits;
                         return [4 /*yield*/, this.depositAndStakeExpected(amounts)];
                     case 13:
-                        _j = _l.apply(_k, [_q.sent()]).mul(99).div(100);
+                        _j = _l.apply(_k, [_q.sent()]);
                         return [3 /*break*/, 16];
                     case 14:
                         _o = (_m = ethers_1.ethers.utils).parseUnits;
                         return [4 /*yield*/, this.depositAndStakeWrappedExpected(amounts)];
                     case 15:
-                        _j = _o.apply(_m, [_q.sent()]).mul(99).div(100);
+                        _j = _o.apply(_m, [_q.sent()]);
                         _q.label = 16;
                     case 16:
-                        _minMintAmount = _j;
+                        _expectedLpTokenAmount = _j;
+                        minAmountBN = (0, utils_1.toBN)(_expectedLpTokenAmount).times(100 - slippage).div(100);
+                        _minMintAmount = (0, utils_1.fromBN)(minAmountBN);
                         ethIndex = (0, utils_1.getEthIndex)(coinAddresses);
                         value = _amounts[ethIndex] || ethers_1.ethers.BigNumber.from(0);
                         for (i = 0; i < 5; i++) {
@@ -2261,19 +2271,27 @@ var PoolTemplate = /** @class */ (function () {
     };
     PoolTemplate.prototype.withdrawImbalanceBonus = function (amounts) {
         return __awaiter(this, void 0, void 0, function () {
-            var prices, value, lpTokenAmount, balancedAmounts, balancedValue;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0: return [4 /*yield*/, this._underlyingPrices()];
+            var prices, _c, value, lpTokenAmount, balancedAmounts, balancedValue;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        if (!(this.isCrypto || this.id === 'wsteth')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this._underlyingPrices()];
                     case 1:
-                        prices = _c.sent();
+                        _c = _d.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        _c = this.underlyingCoins.map(function () { return 1; });
+                        _d.label = 3;
+                    case 3:
+                        prices = _c;
                         value = amounts.map(utils_1.checkNumber).map(Number).reduce(function (s, a, i) { return s + (a * prices[i]); }, 0);
                         return [4 /*yield*/, this.withdrawImbalanceExpected(amounts)];
-                    case 2:
-                        lpTokenAmount = _c.sent();
+                    case 4:
+                        lpTokenAmount = _d.sent();
                         return [4 /*yield*/, this.withdrawExpected(lpTokenAmount)];
-                    case 3:
-                        balancedAmounts = _c.sent();
+                    case 5:
+                        balancedAmounts = _d.sent();
                         balancedValue = balancedAmounts.map(Number).reduce(function (s, a, i) { return s + (a * prices[i]); }, 0);
                         return [2 /*return*/, String((value - balancedValue) / balancedValue * 100)];
                 }
@@ -2440,21 +2458,29 @@ var PoolTemplate = /** @class */ (function () {
     };
     PoolTemplate.prototype.withdrawOneCoinBonus = function (lpTokenAmount, coin) {
         return __awaiter(this, void 0, void 0, function () {
-            var prices, coinPrice, amount, _c, value, balancedAmounts, balancedValue;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0: return [4 /*yield*/, this._underlyingPrices()];
+            var prices, _c, coinPrice, amount, _d, value, balancedAmounts, balancedValue;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        if (!(this.isCrypto || this.id === 'wsteth')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this._underlyingPrices()];
                     case 1:
-                        prices = _d.sent();
+                        _c = _e.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        _c = this.underlyingCoins.map(function () { return 1; });
+                        _e.label = 3;
+                    case 3:
+                        prices = _c;
                         coinPrice = prices[this._getCoinIdx(coin)];
-                        _c = Number;
+                        _d = Number;
                         return [4 /*yield*/, this.withdrawOneCoinExpected(lpTokenAmount, coin)];
-                    case 2:
-                        amount = _c.apply(void 0, [_d.sent()]);
+                    case 4:
+                        amount = _d.apply(void 0, [_e.sent()]);
                         value = amount * coinPrice;
                         return [4 /*yield*/, this.withdrawExpected(lpTokenAmount)];
-                    case 3:
-                        balancedAmounts = _d.sent();
+                    case 5:
+                        balancedAmounts = _e.sent();
                         balancedValue = balancedAmounts.map(Number).reduce(function (s, a, i) { return s + (a * prices[i]); }, 0);
                         return [2 /*return*/, String((value - balancedValue) / balancedValue * 100)];
                 }

package/package.json

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