@curvefi/api 2.58.7 → 2.58.9

package/lib/curve.js

@@ -112,7 +112,7 @@ import { lowerCasePoolDataAddresses, extractDecimals, extractGauges } from "./co
 import { _getAllGauges, _getHiddenPools } from "./external-api.js";
 import { L2Networks } from "./constants/L2Networks.js";
 import { getTwocryptoFactoryPoolData } from "./factory/factory-twocrypto.js";
-import { memoizedContract, memoizedMulticallContract } from "./utils.js";
+import { getGasInfoForL2, memoizedContract, memoizedMulticallContract } from "./utils.js";
 var _killGauges = function (poolsData) { return __awaiter(void 0, void 0, void 0, function () {
     var gaugeData, isKilled, gaugeStatuses, poolId;
     return __generator(this, function (_a) {
@@ -903,9 +903,9 @@ 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, oldEstimate, newEstimate;
-            return __generator(this, function (_p) {
-                switch (_p.label) {
+            var jsonRpcApiProviderOptions, _b, e_1, _c, network, poolId, _d, cTokens, yTokens, ycTokens, aTokens, customAbiTokens, _e, err_1, _f, _i, _g, pool, _h, _j, coinAddr, _k, _l, coinAddr, _m, _o, coinAddr, _gaugeFactoryABI, factoryContract, _p, curveInstance_1, originalEstimate_1, oldEstimate, newEstimate;
+            return __generator(this, function (_q) {
+                switch (_q.label) {
                     case 0:
                         // @ts-ignore
                         this.provider = null;
@@ -960,16 +960,16 @@ var Curve = /** @class */ (function () {
                         return [3 /*break*/, 5];
                     case 1:
                         if (!!((_a = providerSettings.url) === null || _a === void 0 ? void 0 : _a.startsWith("https://rpc.gnosischain.com"))) return [3 /*break*/, 5];
-                        _p.label = 2;
+                        _q.label = 2;
                     case 2:
-                        _p.trys.push([2, 4, , 5]);
+                        _q.trys.push([2, 4, , 5]);
                         _b = this;
                         return [4 /*yield*/, this.provider.getSigner()];
                     case 3:
-                        _b.signer = _p.sent();
+                        _b.signer = _q.sent();
                         return [3 /*break*/, 5];
                     case 4:
-                        e_1 = _p.sent();
+                        e_1 = _q.sent();
                         this.signer = null;
                         return [3 /*break*/, 5];
                     case 5: return [3 /*break*/, 9];
@@ -980,7 +980,7 @@ var Curve = /** @class */ (function () {
                         _c = this;
                         return [4 /*yield*/, this.provider.getSigner()];
                     case 7:
-                        _c.signer = _p.sent();
+                        _c.signer = _q.sent();
                         return [3 /*break*/, 9];
                     case 8:
                         if (providerType.toLowerCase() === 'Infura'.toLowerCase()) {
@@ -997,10 +997,10 @@ var Curve = /** @class */ (function () {
                         else {
                             throw Error('Wrong providerType');
                         }
-                        _p.label = 9;
+                        _q.label = 9;
                     case 9: return [4 /*yield*/, this.provider.getNetwork()];
                     case 10:
-                        network = _p.sent();
+                        network = _q.sent();
                         console.log("CURVE-JS IS CONNECTED TO NETWORK:", { name: network.name.toUpperCase(), chainId: Number(network.chainId) });
                         this.chainId = Number(network.chainId) === 133 || Number(network.chainId) === 31337 ? 1 : Number(network.chainId);
                         this.constants.NATIVE_TOKEN = NATIVE_TOKENS[this.chainId];
@@ -1027,29 +1027,35 @@ var Curve = /** @class */ (function () {
                         customAbiTokens = __spreadArray(__spreadArray(__spreadArray(__spreadArray([], cTokens, true), yTokens, true), ycTokens, true), aTokens, true);
                         this.multicallProvider = new MulticallProvider(this.chainId, this.provider);
                         if (!this.signer) return [3 /*break*/, 15];
-                        _p.label = 11;
+                        _q.label = 11;
                     case 11:
-                        _p.trys.push([11, 13, , 14]);
+                        _q.trys.push([11, 13, , 14]);
                         _e = this;
                         return [4 /*yield*/, this.signer.getAddress()];
                     case 12:
-                        _e.signerAddress = _p.sent();
+                        _e.signerAddress = _q.sent();
                         return [3 /*break*/, 14];
                     case 13:
-                        err_1 = _p.sent();
+                        err_1 = _q.sent();
                         this.signer = null;
                         return [3 /*break*/, 14];
                     case 14: return [3 /*break*/, 16];
                     case 15:
                         this.signerAddress = '';
-                        _p.label = 16;
+                        _q.label = 16;
                     case 16:
                         this.feeData = { gasPrice: options.gasPrice, maxFeePerGas: options.maxFeePerGas, maxPriorityFeePerGas: options.maxPriorityFeePerGas };
-                        return [4 /*yield*/, this.updateFeeData()];
+                        if (!(this.chainId === 196)) return [3 /*break*/, 18];
+                        _f = this.setCustomFeeData;
+                        return [4 /*yield*/, getGasInfoForL2()];
                     case 17:
-                        _p.sent();
-                        for (_i = 0, _f = Object.values(__assign(__assign({}, this.constants.POOLS_DATA), this.constants.LLAMMAS_DATA)); _i < _f.length; _i++) {
-                            pool = _f[_i];
+                        _f.apply(this, [_q.sent()]);
+                        _q.label = 18;
+                    case 18: return [4 /*yield*/, this.updateFeeData()];
+                    case 19:
+                        _q.sent();
+                        for (_i = 0, _g = Object.values(__assign(__assign({}, this.constants.POOLS_DATA), this.constants.LLAMMAS_DATA)); _i < _g.length; _i++) {
+                            pool = _g[_i];
                             this.setContract(pool.swap_address, pool.swap_abi);
                             if (pool.token_address !== pool.swap_address) {
                                 this.setContract(pool.token_address, ERC20Abi);
@@ -1060,12 +1066,12 @@ var Curve = /** @class */ (function () {
                             if (pool.deposit_address && !this.contracts[pool.deposit_address]) {
                                 this.setContract(pool.deposit_address, pool.deposit_abi);
                             }
-                            for (_g = 0, _h = pool.underlying_coin_addresses; _g < _h.length; _g++) {
-                                coinAddr = _h[_g];
+                            for (_h = 0, _j = pool.underlying_coin_addresses; _h < _j.length; _h++) {
+                                coinAddr = _j[_h];
                                 this.setContract(coinAddr, ERC20Abi);
                             }
-                            for (_j = 0, _k = pool.wrapped_coin_addresses; _j < _k.length; _j++) {
-                                coinAddr = _k[_j];
+                            for (_k = 0, _l = pool.wrapped_coin_addresses; _k < _l.length; _k++) {
+                                coinAddr = _l[_k];
                                 if (customAbiTokens.includes(coinAddr))
                                     continue;
                                 if (coinAddr in this.contracts)
@@ -1073,8 +1079,8 @@ var Curve = /** @class */ (function () {
                                 this.setContract(coinAddr, ERC20Abi);
                             }
                             // TODO add all coins
-                            for (_l = 0, _m = pool.wrapped_coin_addresses; _l < _m.length; _l++) {
-                                coinAddr = _m[_l];
+                            for (_m = 0, _o = pool.wrapped_coin_addresses; _m < _o.length; _m++) {
+                                coinAddr = _o[_m];
                                 if (cTokens.includes(coinAddr)) {
                                     this.setContract(coinAddr, cERC20Abi);
                                 }
@@ -1114,15 +1120,15 @@ var Curve = /** @class */ (function () {
                         this.setContract(this.constants.ALIASES.crypto_calc, cryptoCalcZapABI);
                         this.setContract(this.constants.ALIASES.stable_calc, StableCalcZapABI);
                         this.setContract(this.constants.ALIASES.factory, factoryABI);
-                        if (!(this.chainId !== 1313161554 && this.chainId !== 252 && this.chainId !== 196)) return [3 /*break*/, 19];
+                        if (!(this.chainId !== 1313161554 && this.chainId !== 252 && this.chainId !== 196)) return [3 /*break*/, 21];
                         factoryContract = this.contracts[this.constants.ALIASES.factory].contract;
-                        _o = this.constants.ALIASES;
+                        _p = this.constants.ALIASES;
                         return [4 /*yield*/, factoryContract.admin(this.constantOptions)];
-                    case 18:
-                        _o.factory_admin = (_p.sent()).toLowerCase();
+                    case 20:
+                        _p.factory_admin = (_q.sent()).toLowerCase();
                         this.setContract(this.constants.ALIASES.factory_admin, factoryAdminABI);
-                        _p.label = 19;
-                    case 19:
+                        _q.label = 21;
+                    case 21:
                         this.setContract(this.constants.ALIASES.crvusd_factory, factoryABI);
                         this.setContract(this.constants.ALIASES.eywa_factory, factoryEywaABI);
                         this.setContract(this.constants.ALIASES.crypto_factory, cryptoFactoryABI);

package/lib/index.d.ts

@@ -44,7 +44,7 @@ declare const curve: {
     getGasPriceFromL1: () => Promise<number>;
     getGasPriceFromL2: () => Promise<number>;
     getGasInfoForL2: () => Promise<Record<string, number | null>>;
-    getGasPriceByLastTransactions: () => Promise<number>;
+    getGasPrice: () => Promise<number>;
     getTVL: (network?: import("./interfaces.js").INetworkName | import("./interfaces.js").IChainId) => Promise<number>;
     getBalances: (coins: string[], ...addresses: string[] | string[][]) => Promise<string[] | import("./interfaces.js").IDict<string[]>>;
     getAllowance: (coins: string[], address: string, spender: string) => Promise<string[]>;

package/lib/index.js

@@ -39,7 +39,7 @@ import { getUserPoolListByLiquidity, getUserPoolListByClaimable, getUserPoolList
 import { getBestRouteAndOutput, getArgs, swapExpected, swapRequired, swapPriceImpact, swapIsApproved, swapApproveEstimateGas, swapApprove, swapEstimateGas, swap, getSwappedAmount, } from "./router.js";
 import { curve as _curve } from "./curve.js";
 import { getCrv, getLockedAmountAndUnlockTime, getVeCrv, getVeCrvPct, calcUnlockTime, createLockEstimateGas, createLock, isApproved, approveEstimateGas, approve, increaseAmountEstimateGas, increaseAmount, increaseUnlockTimeEstimateGas, increaseUnlockTime, withdrawLockedCrvEstimateGas, withdrawLockedCrv, claimableFees, claimFeesEstimateGas, claimFees, lastEthBlock, getAnycallBalance, topUpAnycall, topUpAnycallEstimateGas, lastBlockSent, blockToSend, sendBlockhash, sendBlockhashEstimateGas, submitProof, submitProofEstimateGas, } from "./boosting.js";
-import { getBalances, getAllowance, hasAllowance, ensureAllowanceEstimateGas, ensureAllowance, getUsdRate, getGasPriceFromL1, getGasPriceFromL2, getGasInfoForL2, getTVL, getCoinsData, getVolume, hasDepositAndStake, hasRouter, getBasePools, getGasPriceByLastTransactions, } from "./utils.js";
+import { getBalances, getAllowance, hasAllowance, ensureAllowanceEstimateGas, ensureAllowance, getUsdRate, getGasPriceFromL1, getGasPriceFromL2, getGasInfoForL2, getTVL, getCoinsData, getVolume, hasDepositAndStake, hasRouter, getBasePools, getGasPrice, } from "./utils.js";
 import { deployStablePlainPool, deployStablePlainPoolEstimateGas, getDeployedStablePlainPoolAddress, setOracle, setOracleEstimateGas, deployStableMetaPool, deployStableMetaPoolEstimateGas, getDeployedStableMetaPoolAddress, deployCryptoPool, deployCryptoPoolEstimateGas, getDeployedCryptoPoolAddress, deployTricryptoPool, deployTricryptoPoolEstimateGas, getDeployedTricryptoPoolAddress, deployGauge, deployGaugeEstimateGas, getDeployedGaugeAddress, deployGaugeSidechain, deployGaugeSidechainEstimateGas, deployGaugeMirror, deployGaugeMirrorEstimateGas, getDeployedGaugeMirrorAddress, getDeployedGaugeMirrorAddressByTx, deployStableNgPlainPool, deployStableNgPlainPoolEstimateGas, deployStableNgMetaPool, deployStableNgMetaPoolEstimateGas, deployTwocryptoPool, deployTwocryptoPoolEstimateGas, getDeployedTwocryptoPoolAddress, } from './factory/deploy.js';
 import { crvSupplyStats, userCrv, userVeCrv, crvLockIsApproved, crvLockApproveEstimateGas, crvLockApprove, calcCrvUnlockTime, createCrvLockEstimateGas, createCrvLock, increaseCrvLockedAmountEstimateGas, increaseCrvLockedAmount, increaseCrvUnlockTimeEstimateGas, increaseCrvUnlockTime, withdrawLockedCrvEstimateGas as daoWithdrawLockedCrvEstimateGas, withdrawLockedCrv as daoWithdrawLockedCrv, claimableFees as daoClaimableFees, claimFeesEstimateGas as daoClaimFeesEstimateGas, claimFees as daoClaimFees, getVotingGaugeList, userGaugeVotes, voteForGaugeNextTime, voteForGaugeEstimateGas, voteForGauge, getProposalList, getProposal, userProposalVotes, voteForProposalEstimateGas, voteForProposal, } from "./dao.js";
 function init(providerType, providerSettings, options) {
@@ -81,7 +81,7 @@ var curve = {
     getGasPriceFromL1: getGasPriceFromL1,
     getGasPriceFromL2: getGasPriceFromL2,
     getGasInfoForL2: getGasInfoForL2,
-    getGasPriceByLastTransactions: getGasPriceByLastTransactions,
+    getGasPrice: getGasPrice,
     getTVL: getTVL,
     getBalances: getBalances,
     getAllowance: getAllowance,

package/lib/utils.d.ts

@@ -39,7 +39,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 getBaseFeeByLastBlock: () => Promise<number>;
-export declare const getGasPriceByLastTransactions: () => Promise<number>;
+export declare const getGasPrice: () => Promise<number>;
 export declare const getGasPriceFromL1: () => Promise<number>;
 export declare const getGasPriceFromL2: () => Promise<number>;
 export declare const getGasInfoForL2: () => Promise<Record<string, number | null>>;

package/lib/utils.js

@@ -729,49 +729,16 @@ export var getBaseFeeByLastBlock = function () { return __awaiter(void 0, void 0
         }
     });
 }); };
-export var getGasPriceByLastTransactions = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var provider, latestBlockNumber, totalGasPrice, transactionsCount, txAmount, i, block, _i, _a, txHash, tx;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+export var getGasPrice = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var provider, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 provider = curve.provider;
-                return [4 /*yield*/, provider.getBlockNumber()];
-            case 1:
-                latestBlockNumber = _b.sent();
-                totalGasPrice = 0;
-                transactionsCount = 0;
-                txAmount = 15;
-                i = latestBlockNumber;
-                _b.label = 2;
-            case 2:
-                if (!(i > latestBlockNumber - txAmount && i >= 0)) return [3 /*break*/, 8];
-                return [4 /*yield*/, provider.getBlock(i)];
-            case 3:
-                block = _b.sent();
-                if (!block)
-                    return [3 /*break*/, 7];
-                _i = 0, _a = block.transactions;
-                _b.label = 4;
-            case 4:
-                if (!(_i < _a.length)) return [3 /*break*/, 7];
-                txHash = _a[_i];
-                return [4 /*yield*/, provider.getTransaction(txHash)];
-            case 5:
-                tx = _b.sent();
-                if (!tx)
-                    return [3 /*break*/, 6];
-                totalGasPrice = totalGasPrice + Number(tx.gasPrice);
-                transactionsCount++;
-                if (transactionsCount >= txAmount)
-                    return [3 /*break*/, 7]; // Limit to txAmount transactions
-                _b.label = 6;
-            case 6:
-                _i++;
-                return [3 /*break*/, 4];
-            case 7:
-                i--;
-                return [3 /*break*/, 2];
-            case 8: return [2 /*return*/, Number((totalGasPrice / transactionsCount / 1e9).toFixed(2))];
+                _a = Number;
+                _b = Number;
+                return [4 /*yield*/, provider.getFeeData()];
+            case 1: return [2 /*return*/, _a.apply(void 0, [(_b.apply(void 0, [(_c.sent()).gasPrice]) / 1e9).toFixed(2)])];
         }
     });
 }); };
@@ -796,7 +763,7 @@ export var getGasPriceFromL2 = function () { return __awaiter(void 0, void 0, vo
             case 1: return [2 /*return*/, _a.sent()];
             case 2:
                 if (!(curve.chainId === 196)) return [3 /*break*/, 4];
-                return [4 /*yield*/, getGasPriceByLastTransactions()]; // gwei
+                return [4 /*yield*/, getGasPrice()]; // gwei
             case 3: return [2 /*return*/, _a.sent()]; // gwei
             case 4:
                 if (!L2Networks.includes(curve.chainId)) return [3 /*break*/, 6];
@@ -823,13 +790,11 @@ export var getGasInfoForL2 = function () { return __awaiter(void 0, void 0, void
                     }];
             case 2:
                 if (!(curve.chainId === 196)) return [3 /*break*/, 4];
-                return [4 /*yield*/, getGasPriceByLastTransactions()];
+                return [4 /*yield*/, getGasPrice()];
             case 3:
                 gasPrice = _a.sent();
                 return [2 /*return*/, {
                         gasPrice: gasPrice,
-                        maxFeePerGas: null,
-                        maxPriorityFeePerGas: null,
                     }];
             case 4: throw Error("This method exists only for L2 networks");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/api",
-  "version": "2.58.7",
+  "version": "2.58.9",
   "description": "JavaScript library for curve.fi",
   "main": "lib/index.js",
   "author": "Macket",
@@ -34,7 +34,7 @@
   "dependencies": {
     "axios": "^0.21.1",
     "bignumber.js": "^9.0.1",
-    "ethcall": "6.0.5",
+    "ethcall": "6.0.6",
     "ethers": "^6.11.0",
     "memoizee": "^0.4.15"
   }