@curvefi/api 2.49.2 → 2.49.3

package/README.md

@@ -1472,6 +1472,11 @@ import curve from "@curvefi/api";
 ```
 
 ## Gas estimation L2
+
+**Only for OPTIMISM and BASE!**
+
+Arbitrium is also L2 network, but for estimateGas should use default method `estimateGas`, which return `Number`.
+
 For L2 networks `estimateGas` return array `[L2GasUsed, L1GasUsed]`, where `L2GasUsed` -  gas estimate for execution transaction in current L2 network, and `L1GasUsed` - gas estimate for data storage in parent L1 network.
 
 Gas Price in L1 is required to calculate the fee.

package/lib/boosting.d.ts

@@ -10,7 +10,7 @@ export declare const getLockedAmountAndUnlockTime: (...addresses: string[] | str
 export declare const getVeCrv: (...addresses: string[] | string[][]) => Promise<IDict<string> | string>;
 export declare const getVeCrvPct: (...addresses: string[] | string[][]) => Promise<IDict<string> | string>;
 export declare const isApproved: (amount: number | string) => Promise<boolean>;
-export declare const approveEstimateGas: (amount: number | string) => Promise<number>;
+export declare const approveEstimateGas: (amount: number | string) => Promise<number | number[]>;
 export declare const approve: (amount: number | string) => Promise<string[]>;
 export declare const createLockEstimateGas: (amount: number | string, days: number) => Promise<number>;
 export declare const calcUnlockTime: (days: number, start?: number) => number;

package/lib/boosting.js

@@ -48,7 +48,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import { Contract } from "ethers";
 import { curve } from "./curve.js";
 import feeDistributorViewABI from "./constants/abis/fee_distributor_view.json" assert { type: 'json' };
-import { _getBalances, _prepareAddresses, DIGas, ensureAllowance, ensureAllowanceEstimateGas, hasAllowance, mulBy1_3, smartNumber } from "./utils.js";
+import { _getBalances, _prepareAddresses, DIGas, ensureAllowance, ensureAllowanceEstimateGas, hasAllowance, mulBy1_3, smartNumber, } from "./utils.js";
 import { _ensureAllowance, toBN, toStringFromBN, parseUnits } from './utils.js';
 import { _generateBoostingProof } from './external-api.js';
 export var getCrv = function () {

package/lib/constants/L2Networks.js

@@ -1 +1 @@
-export var L2Networks = [10]; // <-- Will be added later: 8453 (base), 42161 (arbitrum)
+export var L2Networks = [10, 8453]; // 42161 (arbitrum) is L2 network, but does not need a change to estimateGas.

package/lib/constants/aliases.js

@@ -234,6 +234,7 @@ export var ALIASES_BASE = lowerCaseValues({
     "crypto_factory": '0x5EF72230578b3e399E6C6F4F6360edF95e83BBfd',
     "tricrypto_factory": '0xA5961898870943c68037F6848d2D866Ed2016bcB',
     "factory_admin": "0x0000000000000000000000000000000000000000",
+    "gas_oracle": '0xc0d3C0d3C0d3c0D3C0D3C0d3C0d3C0D3C0D3000f', // <-- NEW
 });
 var registry_exchange_deprecated = {
     '1': '0x99a58482bd75cbab83b27ec03ca68ff489b5788f',

package/lib/curve.js

@@ -708,7 +708,7 @@ var Curve = /** @class */ (function () {
         var _a;
         if (options === void 0) { options = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var jsonRpcApiProviderOptions, _b, e_1, _c, network, poolId, _d, cTokens, yTokens, ycTokens, aTokens, customAbiTokens, _e, err_1, _i, _f, pool, _g, _h, coinAddr, _j, _k, coinAddr, _l, _m, coinAddr, _gaugeFactoryABI, factoryContract, _o, curveInstance_1, originalEstimate_1, newEstimate;
+            var jsonRpcApiProviderOptions, _b, e_1, _c, network, poolId, _d, cTokens, yTokens, ycTokens, aTokens, customAbiTokens, _e, err_1, _i, _f, pool, _g, _h, coinAddr, _j, _k, coinAddr, _l, _m, coinAddr, _gaugeFactoryABI, factoryContract, _o, curveInstance_1, originalEstimate_1, oldEstimate, newEstimate;
             return __generator(this, function (_p) {
                 switch (_p.label) {
                     case 0:
@@ -939,7 +939,27 @@ var Curve = /** @class */ (function () {
                         if (L2Networks.includes(this.chainId)) {
                             curveInstance_1 = this;
                             curveInstance_1.setContract(curveInstance_1.constants.ALIASES.gas_oracle, gasOracleABI);
+                            // @ts-ignore
+                            if (JsonRpcSigner.prototype.originalEstimate) {
+                                // @ts-ignore
+                                JsonRpcSigner.prototype.estimateGas = JsonRpcSigner.prototype.originalEstimate;
+                            }
                             originalEstimate_1 = JsonRpcSigner.prototype.estimateGas;
+                            oldEstimate = function (arg) {
+                                return __awaiter(this, void 0, void 0, function () {
+                                    var originalEstimateFunc, gas;
+                                    return __generator(this, function (_a) {
+                                        switch (_a.label) {
+                                            case 0:
+                                                originalEstimateFunc = originalEstimate_1.bind(this);
+                                                return [4 /*yield*/, originalEstimateFunc(arg)];
+                                            case 1:
+                                                gas = _a.sent();
+                                                return [2 /*return*/, gas];
+                                        }
+                                    });
+                                });
+                            };
                             newEstimate = function (arg) {
                                 return __awaiter(this, void 0, void 0, function () {
                                     var L2EstimateGas, L1GasUsed, L2GasUsed;
@@ -960,6 +980,15 @@ var Curve = /** @class */ (function () {
                             };
                             // @ts-ignore
                             JsonRpcSigner.prototype.estimateGas = newEstimate;
+                            // @ts-ignore
+                            JsonRpcSigner.prototype.originalEstimate = oldEstimate;
+                        }
+                        else {
+                            // @ts-ignore
+                            if (JsonRpcSigner.prototype.originalEstimate) {
+                                // @ts-ignore
+                                JsonRpcSigner.prototype.estimateGas = JsonRpcSigner.prototype.originalEstimate;
+                            }
                         }
                         return [2 /*return*/];
                 }

package/lib/index.d.ts

@@ -135,7 +135,7 @@ declare const curve: {
         };
     };
     estimateGas: {
-        ensureAllowance: (coins: string[], amounts: (string | number)[], spender: string, isMax?: boolean) => Promise<number>;
+        ensureAllowance: (coins: string[], amounts: (string | number)[], spender: string, isMax?: boolean) => Promise<number | number[]>;
     };
     boosting: {
         getCrv: (...addresses: string[] | string[][]) => Promise<string | import("./interfaces.js").IDict<string>>;
@@ -158,7 +158,7 @@ declare const curve: {
         claimableFees: (address?: string) => Promise<string>;
         claimFees: (address?: string) => Promise<string>;
         estimateGas: {
-            approve: (amount: string | number) => Promise<number>;
+            approve: (amount: string | number) => Promise<number | number[]>;
             createLock: (amount: string | number, days: number) => Promise<number>;
             increaseAmount: (amount: string | number) => Promise<number>;
             increaseUnlockTime: (days: number) => Promise<number>;
@@ -202,7 +202,7 @@ declare const curve: {
         swap: (inputCoin: string, outputCoin: string, amount: string | number, slippage?: number) => Promise<ethers.ContractTransactionResponse>;
         getSwappedAmount: (tx: ethers.ContractTransactionResponse, outputCoin: string) => Promise<string>;
         estimateGas: {
-            approve: (inputCoin: string, amount: string | number) => Promise<number>;
+            approve: (inputCoin: string, amount: string | number) => Promise<number | number[]>;
             swap: (inputCoin: string, outputCoin: string, amount: string | number) => Promise<number>;
         };
     };

package/lib/pools/PoolTemplate.d.ts

@@ -34,32 +34,32 @@ export declare class PoolTemplate {
     isGaugeKilled: boolean;
     gaugeStatus: Record<string, boolean> | null;
     estimateGas: {
-        depositApprove: (amounts: (number | string)[]) => Promise<number>;
-        deposit: (amounts: (number | string)[]) => Promise<number>;
-        depositWrappedApprove: (amounts: (number | string)[]) => Promise<number>;
-        depositWrapped: (amounts: (number | string)[]) => Promise<number>;
-        stakeApprove: (lpTokenAmount: number | string) => Promise<number>;
+        depositApprove: (amounts: (number | string)[]) => Promise<number | number[]>;
+        deposit: (amounts: (number | string)[]) => Promise<number | number[]>;
+        depositWrappedApprove: (amounts: (number | string)[]) => Promise<number | number[]>;
+        depositWrapped: (amounts: (number | string)[]) => Promise<number | number[]>;
+        stakeApprove: (lpTokenAmount: number | string) => Promise<number | number[]>;
         stake: (lpTokenAmount: number | string) => Promise<number>;
         unstake: (lpTokenAmount: number | string) => Promise<number>;
         claimCrv: () => Promise<number>;
         claimRewards: () => Promise<number>;
-        depositAndStakeApprove: (amounts: (number | string)[]) => Promise<number>;
+        depositAndStakeApprove: (amounts: (number | string)[]) => Promise<number | number[]>;
         depositAndStake: (amounts: (number | string)[]) => Promise<number>;
-        depositAndStakeWrappedApprove: (amounts: (number | string)[]) => Promise<number>;
+        depositAndStakeWrappedApprove: (amounts: (number | string)[]) => Promise<number | number[]>;
         depositAndStakeWrapped: (amounts: (number | string)[]) => Promise<number>;
-        withdrawApprove: (lpTokenAmount: number | string) => Promise<number>;
+        withdrawApprove: (lpTokenAmount: number | string) => Promise<number | number[]>;
         withdraw: (lpTokenAmount: number | string) => Promise<number>;
         withdrawWrapped: (lpTokenAmount: number | string) => Promise<number>;
-        withdrawImbalanceApprove: (amounts: (number | string)[]) => Promise<number>;
+        withdrawImbalanceApprove: (amounts: (number | string)[]) => Promise<number | number[]>;
         withdrawImbalance: (amounts: (number | string)[]) => Promise<number>;
         withdrawImbalanceWrapped: (amounts: (number | string)[]) => Promise<number>;
-        withdrawOneCoinApprove: (lpTokenAmount: number | string) => Promise<number>;
+        withdrawOneCoinApprove: (lpTokenAmount: number | string) => Promise<number | number[]>;
         withdrawOneCoin: (lpTokenAmount: number | string, coin: string | number) => Promise<number>;
         withdrawOneCoinWrapped: (lpTokenAmount: number | string, coin: string | number) => Promise<number>;
-        swapApprove: (inputCoin: string | number, amount: number | string) => Promise<number>;
+        swapApprove: (inputCoin: string | number, amount: number | string) => Promise<number | number[]>;
         swap: (inputCoin: string | number, outputCoin: string | number, amount: number | string, slippage: number) => Promise<number>;
-        swapWrappedApprove: (inputCoin: string | number, amount: number | string) => Promise<number>;
-        swapWrapped: (inputCoin: string | number, outputCoin: string | number, amount: number | string, slippage: number) => Promise<number>;
+        swapWrappedApprove: (inputCoin: string | number, amount: number | string) => Promise<number | number[]>;
+        swapWrapped: (inputCoin: string | number, outputCoin: string | number, amount: number | string, slippage: number) => Promise<number | number[]>;
     };
     stats: {
         parameters: () => Promise<{

package/lib/pools/PoolTemplate.js

@@ -56,7 +56,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import memoize from "memoizee";
 import { _getPoolsFromApi, _getSubgraphData, _getFactoryAPYsAndVolumes, _getLegacyAPYsAndVolumes } from '../external-api.js';
-import { _getCoinAddresses, _getBalances, _prepareAddresses, _ensureAllowance, _getUsdRate, hasAllowance, ensureAllowance, ensureAllowanceEstimateGas, BN, toBN, toStringFromBN, parseUnits, getEthIndex, fromBN, _cutZeros, _setContracts, _get_small_x, _get_price_impact, checkNumber, _getCrvApyFromApi, _getRewardsFromApi, mulBy1_3, } from '../utils.js';
+import { _getCoinAddresses, _getBalances, _prepareAddresses, _ensureAllowance, _getUsdRate, hasAllowance, ensureAllowance, ensureAllowanceEstimateGas, BN, toBN, toStringFromBN, parseUnits, getEthIndex, fromBN, _cutZeros, _setContracts, _get_small_x, _get_price_impact, checkNumber, _getCrvApyFromApi, _getRewardsFromApi, mulBy1_3, smartNumber, } from '../utils.js';
 import { curve as _curve, curve } from "../curve.js";
 import ERC20Abi from '../constants/abis/ERC20.json' assert { type: 'json' };
 var DAY = 86400;
@@ -1945,11 +1945,17 @@ var PoolTemplate = /** @class */ (function () {
                     case 2:
                         gaugeAllowance = _d.sent();
                         if (!!gaugeAllowance) return [3 /*break*/, 4];
-                        _c = Number;
+                        _c = smartNumber;
                         return [4 /*yield*/, gaugeContract.set_approve_deposit.estimateGas(curve.constants.ALIASES.deposit_and_stake, true, curve.constantOptions)];
                     case 3:
                         approveGaugeGas = _c.apply(void 0, [_d.sent()]);
-                        return [2 /*return*/, approveCoinsGas + approveGaugeGas];
+                        if (Array.isArray(approveCoinsGas) && Array.isArray(approveGaugeGas)) {
+                            return [2 /*return*/, [approveCoinsGas[0] + approveGaugeGas[0], approveCoinsGas[1] + approveGaugeGas[1]]];
+                        }
+                        if (!Array.isArray(approveCoinsGas) && !Array.isArray(approveGaugeGas)) {
+                            return [2 /*return*/, approveCoinsGas + approveGaugeGas];
+                        }
+                        _d.label = 4;
                     case 4: return [2 /*return*/, approveCoinsGas];
                 }
             });
@@ -2097,7 +2103,13 @@ var PoolTemplate = /** @class */ (function () {
                         return [4 /*yield*/, gaugeContract.set_approve_deposit.estimateGas(curve.constants.ALIASES.deposit_and_stake, true, curve.constantOptions)];
                     case 3:
                         approveGaugeGas = _c.apply(void 0, [_d.sent()]);
-                        return [2 /*return*/, approveCoinsGas + approveGaugeGas];
+                        if (Array.isArray(approveCoinsGas) && Array.isArray(approveGaugeGas)) {
+                            return [2 /*return*/, [approveCoinsGas[0] + approveGaugeGas[0], approveCoinsGas[1] + approveGaugeGas[1]]];
+                        }
+                        if (!Array.isArray(approveCoinsGas) && !Array.isArray(approveGaugeGas)) {
+                            return [2 /*return*/, approveCoinsGas + approveGaugeGas];
+                        }
+                        _d.label = 4;
                     case 4: return [2 /*return*/, approveCoinsGas];
                 }
             });

package/lib/router.d.ts

@@ -17,7 +17,7 @@ export declare const swapExpected: (inputCoin: string, outputCoin: string, amoun
 export declare const swapRequired: (inputCoin: string, outputCoin: string, outAmount: number | string) => Promise<string>;
 export declare const swapPriceImpact: (inputCoin: string, outputCoin: string, amount: number | string) => Promise<number>;
 export declare const swapIsApproved: (inputCoin: string, amount: number | string) => Promise<boolean>;
-export declare const swapApproveEstimateGas: (inputCoin: string, amount: number | string) => Promise<number>;
+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 swap: (inputCoin: string, outputCoin: string, amount: number | string, slippage?: number) => Promise<ethers.ContractTransactionResponse>;

package/lib/utils.d.ts

@@ -15,6 +15,8 @@ export declare const getEthIndex: (addresses: string[]) => number;
 export declare const mulBy1_3: (n: bigint) => bigint;
 export declare const smartNumber: (abstractNumber: bigint | bigint[]) => number | number[];
 export declare const DIGas: (gas: bigint | Array<bigint>) => bigint;
+export declare const getGasFromArray: (gas: number[]) => number | number[];
+export declare const gasSum: (gas: number[], currentGas: number | number[]) => number[];
 export declare const _getCoinAddressesNoCheck: (...coins: string[] | string[][]) => string[];
 export declare const _getCoinAddresses: (...coins: string[] | string[][]) => string[];
 export declare const _getCoinDecimals: (...coinAddresses: string[] | string[][]) => number[];
@@ -25,7 +27,7 @@ export declare const _getAllowance: (coins: string[], address: string, spender:
 export declare const getAllowance: (coins: string[], address: string, spender: string) => Promise<string[]>;
 export declare const hasAllowance: (coins: string[], amounts: (number | string)[], address: string, spender: string) => Promise<boolean>;
 export declare const _ensureAllowance: (coins: string[], amounts: bigint[], spender: string, isMax?: boolean) => Promise<string[]>;
-export declare const ensureAllowanceEstimateGas: (coins: string[], amounts: (number | string)[], spender: string, isMax?: boolean) => Promise<number>;
+export declare const ensureAllowanceEstimateGas: (coins: string[], amounts: (number | string)[], spender: string, isMax?: boolean) => Promise<number | number[]>;
 export declare const ensureAllowance: (coins: string[], amounts: (number | string)[], spender: string, isMax?: boolean) => Promise<string[]>;
 export declare const getPoolIdBySwapAddress: (swapAddress: string) => string;
 export declare const _getUsdPricesFromApi: () => Promise<IDict<number>>;

package/lib/utils.js

@@ -119,6 +119,24 @@ export var DIGas = function (gas) {
         return gas;
     }
 };
+export var getGasFromArray = function (gas) {
+    if (gas.length === 1) {
+        return gas[0];
+    }
+    else {
+        return gas;
+    }
+};
+export var gasSum = function (gas, currentGas) {
+    if (Array.isArray(currentGas)) {
+        gas[0] = gas[0] + currentGas[0];
+        gas[1] = gas[1] + currentGas[1];
+    }
+    else {
+        gas[0] = gas[0] + currentGas;
+    }
+    return gas;
+};
 // coins can be either addresses or symbols
 export var _getCoinAddressesNoCheck = function () {
     var coins = [];
@@ -351,9 +369,9 @@ export var _ensureAllowance = function (coins, amounts, spender, isMax) {
 export var ensureAllowanceEstimateGas = function (coins, amounts, spender, isMax) {
     if (isMax === void 0) { isMax = true; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var coinAddresses, decimals, _amounts, address, allowance, gas, i, contract, _approveAmount, _a, _b, _c, _d, _e, _f;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        var coinAddresses, decimals, _amounts, address, allowance, gas, i, contract, _approveAmount, currentGas_1, _a, currentGas, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     coinAddresses = _getCoinAddresses(coins);
                     decimals = _getCoinDecimals(coinAddresses);
@@ -361,35 +379,33 @@ export var ensureAllowanceEstimateGas = function (coins, amounts, spender, isMax
                     address = curve.signerAddress;
                     return [4 /*yield*/, _getAllowance(coinAddresses, address, spender)];
                 case 1:
-                    allowance = _g.sent();
-                    gas = 0;
+                    allowance = _c.sent();
+                    gas = [0, 0];
                     i = 0;
-                    _g.label = 2;
+                    _c.label = 2;
                 case 2:
                     if (!(i < allowance.length)) return [3 /*break*/, 7];
                     if (!(allowance[i] < _amounts[i])) return [3 /*break*/, 6];
                     contract = curve.contracts[coinAddresses[i]].contract;
                     _approveAmount = isMax ? MAX_ALLOWANCE : _amounts[i];
                     if (!(allowance[i] > curve.parseUnits("0"))) return [3 /*break*/, 4];
-                    _a = gas;
-                    _b = Number;
-                    _c = DIGas;
+                    _a = smartNumber;
                     return [4 /*yield*/, contract.approve.estimateGas(spender, curve.parseUnits("0"), curve.constantOptions)];
                 case 3:
-                    gas = _a + _b.apply(void 0, [_c.apply(void 0, [_g.sent()])]);
-                    _g.label = 4;
+                    currentGas_1 = _a.apply(void 0, [_c.sent()]);
+                    gas = gasSum(gas, currentGas_1);
+                    _c.label = 4;
                 case 4:
-                    _d = gas;
-                    _e = Number;
-                    _f = DIGas;
+                    _b = smartNumber;
                     return [4 /*yield*/, contract.approve.estimateGas(spender, _approveAmount, curve.constantOptions)];
                 case 5:
-                    gas = _d + _e.apply(void 0, [_f.apply(void 0, [_g.sent()])]);
-                    _g.label = 6;
+                    currentGas = _b.apply(void 0, [_c.sent()]);
+                    gas = gasSum(gas, currentGas);
+                    _c.label = 6;
                 case 6:
                     i++;
                     return [3 /*break*/, 2];
-                case 7: return [2 /*return*/, gas];
+                case 7: return [2 /*return*/, getGasFromArray(gas)];
             }
         });
     });

package/package.json

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