@curvefi/api 2.58.4 → 2.58.6

package/lib/index.d.ts

@@ -43,7 +43,8 @@ declare const curve: {
     getUsdRate: (coin: string) => Promise<number>;
     getGasPriceFromL1: () => Promise<number>;
     getGasPriceFromL2: () => Promise<number>;
-    getGasInfoForL2: () => Promise<Record<string, number>>;
+    getGasInfoForL2: () => Promise<Record<string, number | null>>;
+    getGasPriceByLastTransactions: () => 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, } from "./utils.js";
+import { getBalances, getAllowance, hasAllowance, ensureAllowanceEstimateGas, ensureAllowance, getUsdRate, getGasPriceFromL1, getGasPriceFromL2, getGasInfoForL2, getTVL, getCoinsData, getVolume, hasDepositAndStake, hasRouter, getBasePools, getGasPriceByLastTransactions, } 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,6 +81,7 @@ var curve = {
     getGasPriceFromL1: getGasPriceFromL1,
     getGasPriceFromL2: getGasPriceFromL2,
     getGasInfoForL2: getGasInfoForL2,
+    getGasPriceByLastTransactions: getGasPriceByLastTransactions,
     getTVL: getTVL,
     getBalances: getBalances,
     getAllowance: getAllowance,

package/lib/pools/PoolTemplate.js

@@ -1843,13 +1843,16 @@ var PoolTemplate = /** @class */ (function () {
                         if (this.rewardsOnly())
                             throw Error("".concat(this.name, " has Rewards-Only Gauge. Use claimRewards instead"));
                         contract = curve.chainId === 1 ? curve.contracts[curve.constants.ALIASES.minter].contract : curve.contracts[curve.constants.ALIASES.gauge_factory].contract;
+                        return [4 /*yield*/, curve.updateFeeData()];
+                    case 1:
+                        _e.sent();
                         _c = mulBy1_3;
                         _d = DIGas;
                         return [4 /*yield*/, contract.mint.estimateGas(this.gauge, curve.constantOptions)];
-                    case 1:
+                    case 2:
                         gasLimit = _c.apply(void 0, [_d.apply(void 0, [_e.sent()])]);
                         return [4 /*yield*/, contract.mint(this.gauge, __assign(__assign({}, curve.options), { gasLimit: gasLimit }))];
-                    case 2: return [2 /*return*/, (_e.sent()).hash];
+                    case 3: return [2 /*return*/, (_e.sent()).hash];
                 }
             });
         });
@@ -1943,13 +1946,16 @@ var PoolTemplate = /** @class */ (function () {
                         gaugeContract = curve.contracts[this.gauge].contract;
                         if (!("claim_rewards()" in gaugeContract))
                             throw Error("".concat(this.name, " pool doesn't have such method"));
+                        return [4 /*yield*/, curve.updateFeeData()];
+                    case 1:
+                        _e.sent();
                         _c = mulBy1_3;
                         _d = DIGas;
                         return [4 /*yield*/, gaugeContract.claim_rewards.estimateGas(curve.constantOptions)];
-                    case 1:
+                    case 2:
                         gasLimit = _c.apply(void 0, [_d.apply(void 0, [_e.sent()])]);
                         return [4 /*yield*/, gaugeContract.claim_rewards(__assign(__assign({}, curve.options), { gasLimit: gasLimit }))];
-                    case 2: return [2 /*return*/, (_e.sent()).hash];
+                    case 3: return [2 /*return*/, (_e.sent()).hash];
                 }
             });
         });

package/lib/utils.d.ts

@@ -39,9 +39,10 @@ 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 getGasPriceFromL1: () => Promise<number>;
 export declare const getGasPriceFromL2: () => Promise<number>;
-export declare const getGasInfoForL2: () => Promise<Record<string, number>>;
+export declare const getGasInfoForL2: () => Promise<Record<string, number | null>>;
 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 getVolumeApiController: (network: INetworkName) => Promise<IVolumeAndAPYs>;

package/lib/utils.js

@@ -729,6 +729,53 @@ 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) {
+            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();
+                console.log(tx, tx === null || tx === void 0 ? void 0 : tx.gasPrice);
+                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))];
+        }
+    });
+}); };
 export var getGasPriceFromL1 = function () { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         if (L2Networks.includes(curve.chainId) && curve.L1WeightedGasPrice) {
@@ -749,17 +796,21 @@ export var getGasPriceFromL2 = function () { return __awaiter(void 0, void 0, vo
                 return [4 /*yield*/, getBaseFeeByLastBlock()];
             case 1: return [2 /*return*/, _a.sent()];
             case 2:
-                if (!L2Networks.includes(curve.chainId)) return [3 /*break*/, 4];
+                if (!(curve.chainId === 196)) return [3 /*break*/, 4];
+                return [4 /*yield*/, getGasPriceByLastTransactions()]; // gwei
+            case 3: return [2 /*return*/, _a.sent()]; // gwei
+            case 4:
+                if (!L2Networks.includes(curve.chainId)) return [3 /*break*/, 6];
                 return [4 /*yield*/, curve.contracts[curve.constants.ALIASES.gas_oracle_blob].contract.gasPrice({ "gasPrice": "0x2000000" })];
-            case 3:
+            case 5:
                 gasPrice = _a.sent();
                 return [2 /*return*/, Number(gasPrice)];
-            case 4: throw Error("This method exists only for L2 networks");
+            case 6: throw Error("This method exists only for L2 networks");
         }
     });
 }); };
 export var getGasInfoForL2 = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var baseFee;
+    var baseFee, gasPrice;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -771,7 +822,17 @@ export var getGasInfoForL2 = function () { return __awaiter(void 0, void 0, void
                         maxFeePerGas: Number(((baseFee * 1.1) + 0.01).toFixed(2)),
                         maxPriorityFeePerGas: 0.01,
                     }];
-            case 2: throw Error("This method exists only for L2 networks");
+            case 2:
+                if (!(curve.chainId === 196)) return [3 /*break*/, 4];
+                return [4 /*yield*/, getGasPriceByLastTransactions()];
+            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.4",
+  "version": "2.58.6",
   "description": "JavaScript library for curve.fi",
   "main": "lib/index.js",
   "author": "Macket",