@curvefi/api 2.12.1 → 2.13.1

package/lib/router.js

@@ -62,7 +62,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.swap = exports.swapEstimateGas = exports.swapApprove = exports.swapApproveEstimateGas = exports.swapIsApproved = exports.swapPriceImpact = exports.swapExpected = exports.getBestRouteAndOutput = exports._findAllRoutes = exports._findAllRoutesTvl = exports._findAllRoutesTheShorterTheBetter = void 0;
 var axios_1 = __importDefault(require("axios"));
 var memoizee_1 = __importDefault(require("memoizee"));
-var bignumber_js_1 = __importDefault(require("bignumber.js"));
 var ethers_1 = require("ethers");
 var curve_1 = require("./curve");
 var utils_1 = require("./utils");
@@ -126,7 +125,7 @@ var _findAllRoutesTheShorterTheBetter = function (inputCoinAddress, outputCoinAd
                         // Looking for outputCoinAddress only on the final step
                         if (step === 3 && underlying_coin_addresses[j] !== outputCoinAddress)
                             continue;
-                        swapType = poolId === 'aave' ? 10 : 9;
+                        swapType = poolId === 'aave' ? 11 : 10;
                         for (_d = 0, _e = routes[inCoin]; _d < _e.length; _d++) {
                             inCoinRoute = _e[_d];
                             routes[underlying_coin_addresses[j]] = ((_s = routes[underlying_coin_addresses[j]]) !== null && _s !== void 0 ? _s : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
@@ -153,7 +152,7 @@ var _findAllRoutesTheShorterTheBetter = function (inputCoinAddress, outputCoinAd
                     // Looking for outputCoinAddress only on the final step
                     if (step === 3 && token_address !== outputCoinAddress)
                         return [3 /*break*/, 11];
-                    swapType = is_lending ? 8 : underlying_coin_addresses.length === 2 ? 6 : 7;
+                    swapType = is_lending ? 9 : underlying_coin_addresses.length === 2 ? 7 : 8;
                     for (_f = 0, _h = routes[inCoin]; _f < _h.length; _f++) {
                         inCoinRoute = _h[_f];
                         routes[token_address] = ((_t = routes[token_address]) !== null && _t !== void 0 ? _t : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
@@ -239,7 +238,11 @@ var _findAllRoutesTheShorterTheBetter = function (inputCoinAddress, outputCoinAd
                 if (tvl === 0)
                     return [3 /*break*/, 10];
                 hasEth = (inCoin === curve_1.curve.constants.NATIVE_TOKEN.address || underlying_coin_addresses[j] === curve_1.curve.constants.NATIVE_TOKEN.address);
-                swapType = ((base_pool === null || base_pool === void 0 ? void 0 : base_pool.is_lending) && poolData.is_factory) ? 5 : hasEth ? 3 : poolData.is_crypto ? 4 : 2;
+                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
+                            : poolData.is_crypto ? 4
+                                : 2;
                 for (_o = 0, _p = routes[inCoin]; _o < _p.length; _o++) {
                     inCoinRoute = _p[_o];
                     routes[underlying_coin_addresses[j]] = ((_v = routes[underlying_coin_addresses[j]]) !== null && _v !== void 0 ? _v : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
@@ -251,7 +254,7 @@ var _findAllRoutesTheShorterTheBetter = function (inputCoinAddress, outputCoinAd
                                 i: inCoinIndexes.underlying_coin,
                                 j: j,
                                 swapType: swapType,
-                                swapAddress: ethers_1.ethers.constants.AddressZero,
+                                swapAddress: (swapType === 5 || swapType === 6) ? poolData.swap_address : ethers_1.ethers.constants.AddressZero,
                             },
                         ], false)]);
                 }
@@ -349,7 +352,7 @@ var _findAllRoutesTvl = function (inputCoinAddress, outputCoinAddress) { return
                                                                 return [4 /*yield*/, ((0, pools_1.getPool)(poolId)).stats.totalLiquidity()];
                                                             case 1:
                                                                 tvl = _q.apply(void 0, [_r.sent()]);
-                                                                swapType = poolId === 'aave' ? 10 : 9;
+                                                                swapType = poolId === 'aave' ? 11 : 10;
                                                                 newRoutes = routes[inCoin].map(function (route) {
                                                                     var routePoolIds = route.steps.map(function (s) { return s.poolId; });
                                                                     // Steps <= 4
@@ -406,7 +409,7 @@ var _findAllRoutesTvl = function (inputCoinAddress, outputCoinAddress) { return
                                                 return [4 /*yield*/, ((0, pools_1.getPool)(poolId)).stats.totalLiquidity()];
                                             case 5:
                                                 tvl_1 = _o.apply(void 0, [_p.sent()]);
-                                                swapType_1 = is_lending ? 8 : underlying_coin_addresses.length === 2 ? 6 : 7;
+                                                swapType_1 = is_lending ? 9 : underlying_coin_addresses.length === 2 ? 7 : 8;
                                                 newRoutes = routes[inCoin].map(function (route) {
                                                     var routePoolIds = route.steps.map(function (s) { return s.poolId; });
                                                     // Steps <= 4
@@ -540,7 +543,11 @@ var _findAllRoutesTvl = function (inputCoinAddress, outputCoinAddress) { return
                                                                 if (tvl === 0)
                                                                     return [2 /*return*/, "continue"];
                                                                 hasEth = (inCoin === curve_1.curve.constants.NATIVE_TOKEN.address || underlying_coin_addresses[j] === curve_1.curve.constants.NATIVE_TOKEN.address);
-                                                                swapType = ((base_pool === null || base_pool === void 0 ? void 0 : base_pool.is_lending) && poolData.is_factory) ? 5 : hasEth ? 3 : poolData.is_crypto ? 4 : 2;
+                                                                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
+                                                                            : poolData.is_crypto ? 4
+                                                                                : 2;
                                                                 newRoutes = routes[inCoin].map(function (route) {
                                                                     var routePoolIds = route.steps.map(function (s) { return s.poolId; });
                                                                     // Steps <= 4
@@ -559,7 +566,7 @@ var _findAllRoutesTvl = function (inputCoinAddress, outputCoinAddress) { return
                                                                                 i: inCoinIndexes.underlying_coin,
                                                                                 j: j,
                                                                                 swapType: swapType,
-                                                                                swapAddress: swapType === 5 ? poolData.swap_address : ethers_1.ethers.constants.AddressZero,
+                                                                                swapAddress: (swapType === 5 || swapType === 6) ? poolData.swap_address : ethers_1.ethers.constants.AddressZero,
                                                                             },
                                                                         ], false),
                                                                         minTvl: Math.min(tvl, route.minTvl),
@@ -831,7 +838,7 @@ var swapExpected = function (inputCoin, outputCoin, amount) { return __awaiter(v
 }); };
 exports.swapExpected = swapExpected;
 var swapPriceImpact = function (inputCoin, outputCoin, amount) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, inputCoinAddress, outputCoinAddress, _b, inputCoinDecimals, outputCoinDecimals, route, target, amountIntBN, outputIntBN, k, smallAmountIntBN, contract, _smallAmount, _c, _route, _swapParams, _factorySwapAddresses, _smallOutput, amountBN, outputBN, smallAmountBN, smallOutputBN, rateBN, smallRateBN, slippageBN;
+    var _a, inputCoinAddress, outputCoinAddress, _b, inputCoinDecimals, outputCoinDecimals, route, _amount, _output, smallAmountIntBN, amountIntBN, contract, _smallAmount, _c, _route, _swapParams, _factorySwapAddresses, _smallOutput, priceImpactBN;
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
@@ -840,27 +847,20 @@ var swapPriceImpact = function (inputCoin, outputCoin, amount) { return __awaite
                 return [4 /*yield*/, _getBestRouteAndOutput(inputCoinAddress, outputCoinAddress, amount)];
             case 1:
                 route = _d.sent();
-                target = (0, utils_1.BN)(Math.pow(10, 15));
-                amountIntBN = (0, utils_1.BN)(amount).times(Math.pow(10, inputCoinDecimals));
-                outputIntBN = (0, utils_1.toBN)(route._output, 0);
-                k = bignumber_js_1.default.min(bignumber_js_1.default.max(target.div(amountIntBN), target.div(outputIntBN)), 0.2);
-                smallAmountIntBN = bignumber_js_1.default.min(amountIntBN.times(k), (0, utils_1.BN)(Math.pow(10, inputCoinDecimals)));
-                if (smallAmountIntBN.toFixed(0) === '0')
-                    return [2 /*return*/, '0'];
+                _amount = (0, utils_1.parseUnits)(amount, inputCoinDecimals);
+                _output = route._output;
+                smallAmountIntBN = (0, utils_1._get_small_x)(_amount, _output, inputCoinDecimals, outputCoinDecimals);
+                amountIntBN = (0, utils_1.toBN)(_amount, 0);
+                if (smallAmountIntBN.gte(amountIntBN))
+                    return [2 /*return*/, 0];
                 contract = curve_1.curve.contracts[curve_1.curve.constants.ALIASES.registry_exchange].contract;
                 _smallAmount = (0, utils_1.fromBN)(smallAmountIntBN.div(Math.pow(10, inputCoinDecimals)), inputCoinDecimals);
                 _c = _getExchangeMultipleArgs(inputCoinAddress, route), _route = _c._route, _swapParams = _c._swapParams, _factorySwapAddresses = _c._factorySwapAddresses;
                 return [4 /*yield*/, contract.get_exchange_multiple_amount(_route, _swapParams, _smallAmount, _factorySwapAddresses, curve_1.curve.constantOptions)];
             case 2:
                 _smallOutput = _d.sent();
-                amountBN = (0, utils_1.BN)(amount);
-                outputBN = (0, utils_1.toBN)(route._output, outputCoinDecimals);
-                smallAmountBN = (0, utils_1.toBN)(_smallAmount, inputCoinDecimals);
-                smallOutputBN = (0, utils_1.toBN)(_smallOutput, outputCoinDecimals);
-                rateBN = outputBN.div(amountBN);
-                smallRateBN = smallOutputBN.div(smallAmountBN);
-                slippageBN = (0, utils_1.BN)(1).minus(rateBN.div(smallRateBN)).times(100);
-                return [2 /*return*/, (0, utils_1._cutZeros)(slippageBN.toFixed(6)).replace('-', '')];
+                priceImpactBN = (0, utils_1._get_price_impact)(_amount, _output, _smallAmount, _smallOutput, inputCoinDecimals, outputCoinDecimals);
+                return [2 /*return*/, Number((0, utils_1._cutZeros)(priceImpactBN.toFixed(4)).replace('-', ''))];
         }
     });
 }); };

package/lib/utils.d.ts

@@ -31,3 +31,5 @@ export declare const _getUsdRate: (assetId: string) => Promise<number>;
 export declare const getUsdRate: (coin: string) => Promise<number>;
 export declare const getTVL: (chainId?: number) => Promise<number>;
 export declare const _setContracts: (address: string, abi: any) => void;
+export declare const _get_small_x: (_x: ethers.BigNumber, _y: ethers.BigNumber, x_decimals: number, y_decimals: number) => BigNumber;
+export declare const _get_price_impact: (_x: ethers.BigNumber, _y: ethers.BigNumber, _small_x: ethers.BigNumber, _small_y: ethers.BigNumber, x_decimals: number, y_decimals: number) => BigNumber;

package/lib/utils.js

@@ -59,7 +59,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._setContracts = exports.getTVL = exports.getUsdRate = exports._getUsdRate = exports._getUsdPricesFromApi = exports.getPoolNameBySwapAddress = exports.ensureAllowance = exports.ensureAllowanceEstimateGas = exports._ensureAllowance = exports.hasAllowance = exports.getAllowance = exports._getAllowance = exports.getBalances = exports._prepareAddresses = exports._getBalances = exports._getCoinDecimals = exports._getCoinAddresses = exports._getCoinAddressesNoCheck = exports.getEthIndex = exports.isEth = exports.parseUnits = exports.formatNumber = exports.checkNumber = exports._cutZeros = exports.fromBN = exports.toStringFromBN = exports.toBN = exports.BN = exports.MAX_ALLOWANCE = exports.ETH_ADDRESS = void 0;
+exports._get_price_impact = exports._get_small_x = exports._setContracts = exports.getTVL = exports.getUsdRate = exports._getUsdRate = exports._getUsdPricesFromApi = exports.getPoolNameBySwapAddress = exports.ensureAllowance = exports.ensureAllowanceEstimateGas = exports._ensureAllowance = exports.hasAllowance = exports.getAllowance = exports._getAllowance = exports.getBalances = exports._prepareAddresses = exports._getBalances = exports._getCoinDecimals = exports._getCoinAddresses = exports._getCoinAddressesNoCheck = exports.getEthIndex = exports.isEth = exports.parseUnits = exports.formatNumber = exports.checkNumber = exports._cutZeros = exports.fromBN = exports.toStringFromBN = exports.toBN = exports.BN = exports.MAX_ALLOWANCE = exports.ETH_ADDRESS = void 0;
 var axios_1 = __importDefault(require("axios"));
 var ethers_1 = require("ethers");
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
@@ -578,3 +578,25 @@ var _setContracts = function (address, abi) {
     };
 };
 exports._setContracts = _setContracts;
+// Find k for which x * k = target_x or y * k = target_y
+// k = max(target_x / x, target_y / y)
+// small_x = x * k
+var _get_small_x = function (_x, _y, x_decimals, y_decimals) {
+    var target_x = (0, exports.BN)(Math.pow(10, (x_decimals > 5 ? x_decimals - 3 : x_decimals)));
+    var target_y = (0, exports.BN)(Math.pow(10, (y_decimals > 5 ? y_decimals - 3 : y_decimals)));
+    var x_int_BN = (0, exports.toBN)(_x, 0);
+    var y_int_BN = (0, exports.toBN)(_y, 0);
+    var k = bignumber_js_1.default.max(target_x.div(x_int_BN), target_y.div(y_int_BN));
+    return bignumber_js_1.default.min(x_int_BN.times(k), (0, exports.BN)(Math.pow(10, x_decimals)));
+};
+exports._get_small_x = _get_small_x;
+var _get_price_impact = function (_x, _y, _small_x, _small_y, x_decimals, y_decimals) {
+    var x_BN = (0, exports.toBN)(_x, x_decimals);
+    var y_BN = (0, exports.toBN)(_y, y_decimals);
+    var small_x_BN = (0, exports.toBN)(_small_x, x_decimals);
+    var small_y_BN = (0, exports.toBN)(_small_y, y_decimals);
+    var rateBN = y_BN.div(x_BN);
+    var smallRateBN = small_y_BN.div(small_x_BN);
+    return (0, exports.BN)(1).minus(rateBN.div(smallRateBN)).times(100);
+};
+exports._get_price_impact = _get_price_impact;

package/package.json

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