@curvefi/api 2.49.4 → 2.49.5

package/README.md

@@ -1482,7 +1482,7 @@ For L2 networks `estimateGas` return array `[L2GasUsed, L1GasUsed]`, where `L2Ga
 Gas Price in L1 is required to calculate the fee.
 You can use `getGasPriceFromL1` for get Gas Price in L1.
 ````ts
- const L1GasPrice = await curve.L1GasPrice()
+ const L1GasPrice = await curve.getGasPriceFromL1()
  // 13161051
 ````
 

package/lib/index.d.ts

@@ -203,7 +203,7 @@ declare const curve: {
         getSwappedAmount: (tx: ethers.ContractTransactionResponse, outputCoin: string) => Promise<string>;
         estimateGas: {
             approve: (inputCoin: string, amount: string | number) => Promise<number | number[]>;
-            swap: (inputCoin: string, outputCoin: string, amount: string | number) => Promise<number>;
+            swap: (inputCoin: string, outputCoin: string, amount: string | number) => Promise<number | number[]>;
         };
     };
 };

package/lib/router.d.ts

@@ -19,6 +19,6 @@ export declare const swapPriceImpact: (inputCoin: string, outputCoin: string, am
 export declare const swapIsApproved: (inputCoin: string, amount: number | string) => Promise<boolean>;
 export declare const swapApproveEstimateGas: (inputCoin: string, amount: number | string) => Promise<number | number[]>;
 export declare const swapApprove: (inputCoin: string, amount: number | string) => Promise<string[]>;
-export declare const swapEstimateGas: (inputCoin: string, outputCoin: string, amount: number | string) => Promise<number>;
+export declare const swapEstimateGas: (inputCoin: string, outputCoin: string, amount: number | string) => Promise<number | number[]>;
 export declare const swap: (inputCoin: string, outputCoin: string, amount: number | string, slippage?: number) => Promise<ethers.ContractTransactionResponse>;
 export declare const getSwappedAmount: (tx: ethers.ContractTransactionResponse, outputCoin: string) => Promise<string>;

package/lib/router.js

@@ -58,9 +58,10 @@ import axios from "axios";
 import memoize from "memoizee";
 import { ethers } from "ethers";
 import { curve } from "./curve.js";
-import { _getCoinAddresses, _getCoinDecimals, _getUsdRate, ensureAllowance, ensureAllowanceEstimateGas, fromBN, hasAllowance, isEth, toBN, BN, parseUnits, _cutZeros, ETH_ADDRESS, _get_small_x, _get_price_impact, DIGas, } from "./utils.js";
+import { _getCoinAddresses, _getCoinDecimals, _getUsdRate, ensureAllowance, ensureAllowanceEstimateGas, fromBN, hasAllowance, isEth, toBN, BN, parseUnits, _cutZeros, ETH_ADDRESS, _get_small_x, _get_price_impact, DIGas, smartNumber, getTxCostsUsd, getGasPriceFromL1, } from "./utils.js";
 import { getPool } from "./pools/index.js";
 import { _getAmplificationCoefficientsFromApi } from "./pools/utils.js";
+import { L2Networks } from "./constants/L2Networks.js";
 var MAX_STEPS = 5;
 var ROUTE_LENGTH = (MAX_STEPS * 2) + 1;
 var GRAPH_MAX_EDGES = 3;
@@ -568,7 +569,7 @@ var _estimateGasForDifferentRoutes = function (routes, inputCoinAddress, outputC
                     var routeKey = _getRouteKey(route, inputCoinAddress, outputCoinAddress);
                     _estimatedGasForDifferentRoutesCache[routeKey] = { 'gas': _gasAmounts_1[i], 'time': Date.now() };
                 });
-                return [2 /*return*/, _gasAmounts_1.map(function (_g) { return Number(curve.formatUnits(DIGas(_g), 0)); })];
+                return [2 /*return*/, _gasAmounts_1.map(function (_g) { return smartNumber(_g); })];
             case 3:
                 err_1 = _c.sent();
                 return [2 /*return*/, routes.map(function () { return 0; })];
@@ -577,9 +578,9 @@ var _estimateGasForDifferentRoutes = function (routes, inputCoinAddress, outputC
     });
 }); };
 var _getBestRoute = memoize(function (inputCoinAddress, outputCoinAddress, amount) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, inputCoinDecimals, outputCoinDecimals, _amount, routesRaw, routes, calls, multicallContract, _i, routesRaw_1, r, _b, _route, _swapParams, _pools, _outputAmounts, i, err_2, contract, _outputs, _c, routesRaw_2, r, _d, _route, _swapParams, _pools, _e, _f, e_1, i, _h, gasAmounts, outputCoinUsdRate, gasData, ethUsdRate, gasPrice, expectedAmounts, expectedAmountsUsd, txCostsUsd;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var _a, inputCoinDecimals, outputCoinDecimals, _amount, routesRaw, routes, calls, multicallContract, _i, routesRaw_1, r, _b, _route, _swapParams, _pools, _outputAmounts, i, err_2, contract, _outputs, _c, routesRaw_2, r, _d, _route, _swapParams, _pools, _e, _f, e_1, i, _h, gasAmounts, outputCoinUsdRate, gasData, ethUsdRate, gasPrice, expectedAmounts, expectedAmountsUsd, L1GasPrice, _j, txCostsUsd;
+    return __generator(this, function (_k) {
+        switch (_k.label) {
             case 0:
                 _a = _getCoinDecimals(inputCoinAddress, outputCoinAddress), inputCoinDecimals = _a[0], outputCoinDecimals = _a[1];
                 _amount = parseUnits(amount, inputCoinDecimals);
@@ -587,11 +588,11 @@ var _getBestRoute = memoize(function (inputCoinAddress, outputCoinAddress, amoun
                     return [2 /*return*/, []];
                 return [4 /*yield*/, _findRoutes(inputCoinAddress, outputCoinAddress)];
             case 1:
-                routesRaw = (_j.sent()).map(function (route) { return ({ route: route, _output: curve.parseUnits("0"), outputUsd: 0, txCostUsd: 0 }); });
+                routesRaw = (_k.sent()).map(function (route) { return ({ route: route, _output: curve.parseUnits("0"), outputUsd: 0, txCostUsd: 0 }); });
                 routes = [];
-                _j.label = 2;
+                _k.label = 2;
             case 2:
-                _j.trys.push([2, 4, , 11]);
+                _k.trys.push([2, 4, , 11]);
                 calls = [];
                 multicallContract = curve.contracts[curve.constants.ALIASES.router].multicallContract;
                 for (_i = 0, routesRaw_1 = routesRaw; _i < routesRaw_1.length; _i++) {
@@ -601,32 +602,32 @@ var _getBestRoute = memoize(function (inputCoinAddress, outputCoinAddress, amoun
                 }
                 return [4 /*yield*/, curve.multicallProvider.all(calls)];
             case 3:
-                _outputAmounts = _j.sent();
+                _outputAmounts = _k.sent();
                 for (i = 0; i < _outputAmounts.length; i++) {
                     routesRaw[i]._output = _outputAmounts[i];
                     routes.push(routesRaw[i]);
                 }
                 return [3 /*break*/, 11];
             case 4:
-                err_2 = _j.sent();
+                err_2 = _k.sent();
                 contract = curve.contracts[curve.constants.ALIASES.router].contract;
                 _outputs = [];
                 _c = 0, routesRaw_2 = routesRaw;
-                _j.label = 5;
+                _k.label = 5;
             case 5:
                 if (!(_c < routesRaw_2.length)) return [3 /*break*/, 10];
                 r = routesRaw_2[_c];
                 _d = _getExchangeArgs(r.route), _route = _d._route, _swapParams = _d._swapParams, _pools = _d._pools;
-                _j.label = 6;
+                _k.label = 6;
             case 6:
-                _j.trys.push([6, 8, , 9]);
+                _k.trys.push([6, 8, , 9]);
                 _f = (_e = _outputs).push;
                 return [4 /*yield*/, contract.get_dy(_route, _swapParams, _amount, _pools, curve.constantOptions)];
             case 7:
-                _f.apply(_e, [_j.sent()]);
+                _f.apply(_e, [_k.sent()]);
                 return [3 /*break*/, 9];
             case 8:
-                e_1 = _j.sent();
+                e_1 = _k.sent();
                 _outputs.push(curve.parseUnits('-1', 0));
                 return [3 /*break*/, 9];
             case 9:
@@ -654,11 +655,21 @@ var _getBestRoute = memoize(function (inputCoinAddress, outputCoinAddress, amoun
                         _getUsdRate(ETH_ADDRESS),
                     ])];
             case 12:
-                _h = _j.sent(), gasAmounts = _h[0], outputCoinUsdRate = _h[1], gasData = _h[2], ethUsdRate = _h[3];
+                _h = _k.sent(), gasAmounts = _h[0], outputCoinUsdRate = _h[1], gasData = _h[2], ethUsdRate = _h[3];
                 gasPrice = gasData.data.data.gas.standard;
                 expectedAmounts = (routes).map(function (route) { return Number(curve.formatUnits(route._output, outputCoinDecimals)); });
                 expectedAmountsUsd = expectedAmounts.map(function (a) { return a * outputCoinUsdRate; });
-                txCostsUsd = gasAmounts.map(function (a) { return ethUsdRate * a * gasPrice / 1e18; });
+                if (!L2Networks.includes(curve.chainId)) return [3 /*break*/, 14];
+                return [4 /*yield*/, getGasPriceFromL1()];
+            case 13:
+                _j = _k.sent();
+                return [3 /*break*/, 15];
+            case 14:
+                _j = 0;
+                _k.label = 15;
+            case 15:
+                L1GasPrice = _j;
+                txCostsUsd = gasAmounts.map(function (a) { return getTxCostsUsd(ethUsdRate, gasPrice, a, L1GasPrice); });
                 routes.forEach(function (route, i) {
                     route.outputUsd = expectedAmountsUsd[i];
                     route.txCostUsd = txCostsUsd[i];

package/lib/utils.d.ts

@@ -36,6 +36,7 @@ export declare const _getRewardsFromApi: () => Promise<IDict<IRewardFromApi[]>>;
 export declare const _getUsdRate: (assetId: string) => Promise<number>;
 export declare const getUsdRate: (coin: string) => Promise<number>;
 export declare const getGasPriceFromL1: () => Promise<number>;
+export declare const getTxCostsUsd: (ethUsdRate: number, gasPrice: number, gas: number | number[], gasPriceL1?: number) => number;
 export declare const getTVL: (network?: INetworkName | IChainId) => Promise<number>;
 export declare const getVolume: (network?: INetworkName | IChainId) => Promise<{
     totalVolume: number;

package/lib/utils.js

@@ -683,16 +683,28 @@ export var getUsdRate = function (coin) { return __awaiter(void 0, void 0, void
     });
 }); };
 export var getGasPriceFromL1 = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var gasPrice;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 if (!L2Networks.includes(curve.chainId)) return [3 /*break*/, 2];
-                return [4 /*yield*/, curve.contracts[curve.constants.ALIASES.gas_oracle].contract.gasPrice()];
-            case 1: return [2 /*return*/, _a.sent()];
+                return [4 /*yield*/, curve.contracts[curve.constants.ALIASES.gas_oracle].contract.l1BaseFee()];
+            case 1:
+                gasPrice = _a.sent();
+                return [2 /*return*/, Number(gasPrice) + 1e9]; // + 1 gwei
             case 2: throw Error("This method exists only for L2 networks");
         }
     });
 }); };
+export var getTxCostsUsd = function (ethUsdRate, gasPrice, gas, gasPriceL1) {
+    if (gasPriceL1 === void 0) { gasPriceL1 = 0; }
+    if (Array.isArray(gas)) {
+        return ethUsdRate * ((gas[0] * gasPrice / 1e18) + (gas[1] * gasPriceL1 / 1e18));
+    }
+    else {
+        return ethUsdRate * gas * gasPrice / 1e18;
+    }
+};
 var _getNetworkName = function (network) {
     if (network === void 0) { network = curve.chainId; }
     if (typeof network === "number" && NETWORK_CONSTANTS[network]) {

package/package.json

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