@curvefi/api 2.24.0 → 2.24.2

package/lib/constants/abis/atricrypto3/base_pool_zap.json

@@ -50,6 +50,10 @@
             {
                 "name": "_min_dy",
                 "type": "uint256"
+            },
+            {
+                "name": "_use_eth",
+                "type": "bool"
             }
         ],
         "outputs": [
@@ -104,6 +108,10 @@
             {
                 "name": "_min_mint_amount",
                 "type": "uint256"
+            },
+            {
+                "name": "_use_eth",
+                "type": "bool"
             }
         ],
         "outputs": [
@@ -150,6 +158,10 @@
             {
                 "name": "_min_amounts",
                 "type": "uint256[6]"
+            },
+            {
+                "name": "_use_eth",
+                "type": "bool"
             }
         ],
         "outputs": [
@@ -179,6 +191,10 @@
             {
                 "name": "_min_amount",
                 "type": "uint256"
+            },
+            {
+                "name": "_use_eth",
+                "type": "bool"
             }
         ],
         "outputs": [

package/lib/constants/coins/polygon.js

@@ -34,7 +34,7 @@ exports.USD_COINS_POLYGON = {
     amusdt: "0x60D55F02A771d515e077c9C2403a1ef324885CeC",
     am3crv: "0xE7a24EF0C5e95Ffb0f6684b813A78F2a3AD7D171", // am3CRV
 };
-exports.COINS_POLYGON = (0, utils_1.lowerCaseValues)(__assign(__assign(__assign(__assign(__assign({}, exports.BTC_COINS_POLYGON), exports.ETH_COINS_POLYGON), exports.EUR_COINS_POLYGON), exports.USD_COINS_POLYGON), { crv: "0x172370d5cd63279efa6d502dab29171933a610af", matic: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE" }));
+exports.COINS_POLYGON = (0, utils_1.lowerCaseValues)(__assign(__assign(__assign(__assign(__assign({}, exports.BTC_COINS_POLYGON), exports.ETH_COINS_POLYGON), exports.EUR_COINS_POLYGON), exports.USD_COINS_POLYGON), { crv: "0x172370d5cd63279efa6d502dab29171933a610af", matic: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", wmatic: "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270" }));
 var DECIMALS_POLYGON = {
     "0x8f3cf7ad23cd3cadbd9735aff958023239c6a063": 18,
     "0x2791bca1f2de4661ed88a30c99a7a9449aa84174": 6,

package/lib/factory/factory-api.js

@@ -176,7 +176,7 @@ function getFactoryPoolsDataFromApi(isCrypto) {
                     poolGaugeDict = {};
                     for (_i = 0, _b = response.data.data.gauges; _i < _b.length; _i++) {
                         gaugeData = _b[_i];
-                        poolGaugeDict[gaugeData.swap] = gaugeData.gauge;
+                        poolGaugeDict[gaugeData.swap.toLowerCase()] = gaugeData.gauge.toLowerCase();
                     }
                     for (i = 0; i < rawPoolList.length; i++) {
                         rawPoolList[i].gaugeAddress = poolGaugeDict[rawPoolList[i].address];

package/lib/index.d.ts

@@ -57,7 +57,7 @@ declare const curve: {
         symbol: string;
     }[]>;
     factory: {
-        deployPlainPool: (name: string, symbol: string, coins: string[], A: number, fee: number, assetType: 0 | 1 | 2 | 3, implementationIdx: 0 | 1 | 2 | 3) => Promise<ethers.ContractTransaction>;
+        deployPlainPool: (name: string, symbol: string, coins: string[], A: number, fee: number, assetType: 0 | 2 | 1 | 3, implementationIdx: 0 | 2 | 1 | 3) => Promise<ethers.ContractTransaction>;
         deployMetaPool: (basePool: string, name: string, symbol: string, coin: string, A: number, fee: number, implementationIdx: 0 | 1) => Promise<ethers.ContractTransaction>;
         deployGauge: (poolAddress: string) => Promise<ethers.ContractTransaction>;
         getDeployedPlainPoolAddress: (tx: ethers.ContractTransaction) => Promise<string>;
@@ -65,7 +65,7 @@ declare const curve: {
         getDeployedGaugeAddress: (tx: ethers.ContractTransaction) => Promise<string>;
         fetchRecentlyDeployedPool: typeof fetchRecentlyDeployedFactoryPool;
         estimateGas: {
-            deployPlainPool: (name: string, symbol: string, coins: string[], A: number, fee: number, assetType: 0 | 1 | 2 | 3, implementationIdx: 0 | 1 | 2 | 3) => Promise<number>;
+            deployPlainPool: (name: string, symbol: string, coins: string[], A: number, fee: number, assetType: 0 | 2 | 1 | 3, implementationIdx: 0 | 2 | 1 | 3) => Promise<number>;
             deployMetaPool: (basePool: string, name: string, symbol: string, coin: string, A: number, fee: number, implementationIdx: 0 | 1) => Promise<number>;
             deployGauge: (poolAddress: string) => Promise<number>;
         };

package/lib/interfaces.d.ts

@@ -108,6 +108,7 @@ export interface IPoolDataFromApi {
     usdTotal: number;
     totalSupply: number;
     amplificationCoefficient: string;
+    gaugeCrvApy: [number | null, number | null];
 }
 export interface ISubgraphPoolData {
     address: string;

package/lib/pools/PoolTemplate.d.ts

@@ -78,7 +78,7 @@ export declare class PoolTemplate {
             day: string;
             week: string;
         }>;
-        tokenApy: () => Promise<[baseApy: string, boostedApy: string]>;
+        tokenApy: (useApi?: boolean) => Promise<[baseApy: number, boostedApy: number]>;
         rewardsApy: () => Promise<IReward[]>;
     };
     wallet: {
@@ -132,7 +132,7 @@ export declare class PoolTemplate {
     claimCrvEstimateGas(): Promise<number>;
     claimCrv(): Promise<string>;
     boost: (address?: string) => Promise<string>;
-    currentCrvApy: (address?: string) => Promise<string>;
+    currentCrvApy: (address?: string) => Promise<number>;
     maxBoostedStake: (...addresses: string[]) => Promise<IDict<string> | string>;
     rewardTokens: (() => Promise<{
         token: string;

package/lib/pools/PoolTemplate.js

@@ -279,64 +279,74 @@ var PoolTemplate = /** @class */ (function () {
                 }
             });
         }); };
-        this.statsTokenApy = function () { return __awaiter(_this, void 0, void 0, function () {
-            var totalLiquidityUSD, inflationRateBN, workingSupplyBN, totalSupplyBN, gaugeContract, lpTokenContract, crvContract, currentWeek, _c, gaugeContract, lpTokenContract, gaugeControllerContract, weightBN, rateBN, crvPrice, baseApyBN, boostedApyBN;
-            var _d, _e;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0:
-                        if (this.rewardsOnly())
-                            throw Error("".concat(this.name, " has Rewards-Only Gauge. Use getRewardsApy instead"));
-                        return [4 /*yield*/, this.statsTotalLiquidity()];
-                    case 1:
-                        totalLiquidityUSD = _f.sent();
-                        if (Number(totalLiquidityUSD) === 0)
-                            return [2 /*return*/, ["0", "0"]];
-                        if (!(curve_1.curve.chainId !== 1)) return [3 /*break*/, 5];
-                        gaugeContract = curve_1.curve.contracts[this.gauge].multicallContract;
-                        lpTokenContract = curve_1.curve.contracts[this.lpToken].multicallContract;
-                        crvContract = curve_1.curve.contracts[curve_1.curve.constants.ALIASES.crv].contract;
-                        currentWeek = Math.floor(Date.now() / 1000 / WEEK);
-                        return [4 /*yield*/, curve_1.curve.multicallProvider.all([
-                                gaugeContract.inflation_rate(currentWeek),
-                                gaugeContract.working_supply(),
-                                lpTokenContract.totalSupply(),
-                            ])];
-                    case 2:
-                        _d = (_f.sent()).map(function (value) { return (0, utils_1.toBN)(value); }), inflationRateBN = _d[0], workingSupplyBN = _d[1], totalSupplyBN = _d[2];
-                        if (!inflationRateBN.eq(0)) return [3 /*break*/, 4];
-                        _c = utils_1.toBN;
-                        return [4 /*yield*/, crvContract.balanceOf(this.gauge, curve_1.curve.constantOptions)];
-                    case 3:
-                        inflationRateBN = _c.apply(void 0, [_f.sent()]).div(WEEK);
-                        _f.label = 4;
-                    case 4: return [3 /*break*/, 7];
-                    case 5:
-                        gaugeContract = curve_1.curve.contracts[this.gauge].multicallContract;
-                        lpTokenContract = curve_1.curve.contracts[this.lpToken].multicallContract;
-                        gaugeControllerContract = curve_1.curve.contracts[curve_1.curve.constants.ALIASES.gauge_controller].multicallContract;
-                        weightBN = void 0;
-                        return [4 /*yield*/, curve_1.curve.multicallProvider.all([
-                                gaugeContract.inflation_rate(),
-                                gaugeControllerContract.gauge_relative_weight(this.gauge),
-                                gaugeContract.working_supply(),
-                                lpTokenContract.totalSupply(),
-                            ])];
-                    case 6:
-                        _e = (_f.sent()).map(function (value) { return (0, utils_1.toBN)(value); }), inflationRateBN = _e[0], weightBN = _e[1], workingSupplyBN = _e[2], totalSupplyBN = _e[3];
-                        inflationRateBN = inflationRateBN.times(weightBN);
-                        _f.label = 7;
-                    case 7:
-                        rateBN = inflationRateBN.times(31536000).times(0.4).div(workingSupplyBN).times(totalSupplyBN).div(Number(totalLiquidityUSD));
-                        return [4 /*yield*/, (0, utils_1._getUsdRate)(curve_1.curve.constants.ALIASES.crv)];
-                    case 8:
-                        crvPrice = _f.sent();
-                        baseApyBN = rateBN.times(crvPrice);
-                        boostedApyBN = baseApyBN.times(2.5);
-                        return [2 /*return*/, [baseApyBN.times(100).toFixed(4), boostedApyBN.times(100).toFixed(4)]];
-                }
+        this.statsTokenApy = function (useApi) {
+            if (useApi === void 0) { useApi = true; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var crvAPYs, poolCrvApy, totalLiquidityUSD, inflationRateBN, workingSupplyBN, totalSupplyBN, gaugeContract, lpTokenContract, crvContract, currentWeek, _c, gaugeContract, lpTokenContract, gaugeControllerContract, weightBN, rateBN, crvPrice, baseApyBN, boostedApyBN;
+                var _d, _e;
+                var _f;
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
+                        case 0:
+                            if (this.rewardsOnly())
+                                throw Error("".concat(this.name, " has Rewards-Only Gauge. Use getRewardsApy instead"));
+                            if (!(useApi && curve_1.curve.chainId === 1)) return [3 /*break*/, 2];
+                            return [4 /*yield*/, (0, utils_1._getCrvApyFromApi)()];
+                        case 1:
+                            crvAPYs = _g.sent();
+                            poolCrvApy = (_f = crvAPYs[this.gauge]) !== null && _f !== void 0 ? _f : [0, 0];
+                            return [2 /*return*/, [poolCrvApy[0], poolCrvApy[1]]];
+                        case 2: return [4 /*yield*/, this.statsTotalLiquidity()];
+                        case 3:
+                            totalLiquidityUSD = _g.sent();
+                            if (Number(totalLiquidityUSD) === 0)
+                                return [2 /*return*/, [0, 0]];
+                            if (!(curve_1.curve.chainId !== 1)) return [3 /*break*/, 7];
+                            gaugeContract = curve_1.curve.contracts[this.gauge].multicallContract;
+                            lpTokenContract = curve_1.curve.contracts[this.lpToken].multicallContract;
+                            crvContract = curve_1.curve.contracts[curve_1.curve.constants.ALIASES.crv].contract;
+                            currentWeek = Math.floor(Date.now() / 1000 / WEEK);
+                            return [4 /*yield*/, curve_1.curve.multicallProvider.all([
+                                    gaugeContract.inflation_rate(currentWeek),
+                                    gaugeContract.working_supply(),
+                                    lpTokenContract.totalSupply(),
+                                ])];
+                        case 4:
+                            _d = (_g.sent()).map(function (value) { return (0, utils_1.toBN)(value); }), inflationRateBN = _d[0], workingSupplyBN = _d[1], totalSupplyBN = _d[2];
+                            if (!inflationRateBN.eq(0)) return [3 /*break*/, 6];
+                            _c = utils_1.toBN;
+                            return [4 /*yield*/, crvContract.balanceOf(this.gauge, curve_1.curve.constantOptions)];
+                        case 5:
+                            inflationRateBN = _c.apply(void 0, [_g.sent()]).div(WEEK);
+                            _g.label = 6;
+                        case 6: return [3 /*break*/, 9];
+                        case 7:
+                            gaugeContract = curve_1.curve.contracts[this.gauge].multicallContract;
+                            lpTokenContract = curve_1.curve.contracts[this.lpToken].multicallContract;
+                            gaugeControllerContract = curve_1.curve.contracts[curve_1.curve.constants.ALIASES.gauge_controller].multicallContract;
+                            weightBN = void 0;
+                            return [4 /*yield*/, curve_1.curve.multicallProvider.all([
+                                    gaugeContract.inflation_rate(),
+                                    gaugeControllerContract.gauge_relative_weight(this.gauge),
+                                    gaugeContract.working_supply(),
+                                    lpTokenContract.totalSupply(),
+                                ])];
+                        case 8:
+                            _e = (_g.sent()).map(function (value) { return (0, utils_1.toBN)(value); }), inflationRateBN = _e[0], weightBN = _e[1], workingSupplyBN = _e[2], totalSupplyBN = _e[3];
+                            inflationRateBN = inflationRateBN.times(weightBN);
+                            _g.label = 9;
+                        case 9:
+                            rateBN = inflationRateBN.times(31536000).times(0.4).div(workingSupplyBN).times(totalSupplyBN).div(Number(totalLiquidityUSD));
+                            return [4 /*yield*/, (0, utils_1._getUsdRate)(curve_1.curve.constants.ALIASES.crv)];
+                        case 10:
+                            crvPrice = _g.sent();
+                            baseApyBN = rateBN.times(crvPrice);
+                            boostedApyBN = baseApyBN.times(2.5);
+                            return [2 /*return*/, [baseApyBN.times(100).toNumber(), boostedApyBN.times(100).toNumber()]];
+                    }
+                });
             });
-        }); };
+        };
         this.statsRewardsApy = function () { return __awaiter(_this, void 0, void 0, function () {
             var apy, rewardTokens, _i, rewardTokens_1, rewardToken, contract, totalLiquidityUSD, rewardRate, rewardData, periodFinish, inflation, baseApy, network, promises, _c, mainPoolsRewards, allTypesExtendedPoolData, rewards, _d, _e, extendedPoolData, _f, _g, pool;
             var _h;
@@ -648,8 +658,8 @@ var PoolTemplate = /** @class */ (function () {
                             if (boost == "2.5")
                                 return [2 /*return*/, maxApy];
                             if (boost === "NaN")
-                                return [2 /*return*/, "NaN"];
-                            return [2 /*return*/, (0, utils_1.BN)(baseApy).times((0, utils_1.BN)(boost)).toFixed(4).replace(/([0-9])0+$/, '$1')];
+                                return [2 /*return*/, NaN];
+                            return [2 /*return*/, (0, utils_1.BN)(baseApy).times((0, utils_1.BN)(boost)).toNumber()];
                     }
                 });
             });
@@ -1588,11 +1598,14 @@ var PoolTemplate = /** @class */ (function () {
                         return [4 /*yield*/, (0, utils_1._ensureAllowance)([this.lpToken], [_lpTokenAmount], this.gauge)];
                     case 1:
                         _c.sent();
-                        return [4 /*yield*/, curve_1.curve.contracts[this.gauge].contract.estimateGas.deposit(_lpTokenAmount, curve_1.curve.constantOptions)];
+                        return [4 /*yield*/, curve_1.curve.updateFeeData()];
                     case 2:
+                        _c.sent();
+                        return [4 /*yield*/, curve_1.curve.contracts[this.gauge].contract.estimateGas.deposit(_lpTokenAmount, curve_1.curve.constantOptions)];
+                    case 3:
                         gasLimit = (_c.sent()).mul(150).div(100);
                         return [4 /*yield*/, curve_1.curve.contracts[this.gauge].contract.deposit(_lpTokenAmount, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit }))];
-                    case 3: return [2 /*return*/, (_c.sent()).hash];
+                    case 4: return [2 /*return*/, (_c.sent()).hash];
                 }
             });
         });
@@ -1623,11 +1636,14 @@ var PoolTemplate = /** @class */ (function () {
                             throw Error("unstake method doesn't exist for pool ".concat(this.name, " (id: ").concat(this.name, "). There is no gauge"));
                         }
                         _lpTokenAmount = (0, utils_1.parseUnits)(lpTokenAmount);
-                        return [4 /*yield*/, curve_1.curve.contracts[this.gauge].contract.estimateGas.withdraw(_lpTokenAmount, curve_1.curve.constantOptions)];
+                        return [4 /*yield*/, curve_1.curve.updateFeeData()];
                     case 1:
+                        _c.sent();
+                        return [4 /*yield*/, curve_1.curve.contracts[this.gauge].contract.estimateGas.withdraw(_lpTokenAmount, curve_1.curve.constantOptions)];
+                    case 2:
                         gasLimit = (_c.sent()).mul(200).div(100);
                         return [4 /*yield*/, curve_1.curve.contracts[this.gauge].contract.withdraw(_lpTokenAmount, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit }))];
-                    case 2: return [2 /*return*/, (_c.sent()).hash];
+                    case 3: return [2 /*return*/, (_c.sent()).hash];
                 }
             });
         });

package/lib/pools/mixins/depositMixins.d.ts

@@ -1,5 +1,6 @@
 import { PoolTemplate } from "../PoolTemplate";
 export declare const depositMetaFactoryMixin: PoolTemplate;
+export declare const depositCryptoMetaFactoryMixin: PoolTemplate;
 export declare const depositZapMixin: PoolTemplate;
 export declare const depositLendingOrCryptoMixin: PoolTemplate;
 export declare const depositPlainMixin: PoolTemplate;

package/lib/pools/mixins/depositMixins.js

@@ -47,7 +47,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.depositPlainMixin = exports.depositLendingOrCryptoMixin = exports.depositZapMixin = exports.depositMetaFactoryMixin = void 0;
+exports.depositPlainMixin = exports.depositLendingOrCryptoMixin = exports.depositZapMixin = exports.depositCryptoMetaFactoryMixin = exports.depositMetaFactoryMixin = void 0;
 var utils_1 = require("../../utils");
 var curve_1 = require("../../curve");
 var ethers_1 = require("ethers");
@@ -174,6 +174,72 @@ exports.depositMetaFactoryMixin = {
     },
 };
 // @ts-ignore
+exports.depositCryptoMetaFactoryMixin = {
+    // @ts-ignore
+    _deposit: function (_amounts, slippage, estimateGas) {
+        if (estimateGas === void 0) { estimateGas = false; }
+        return __awaiter(this, void 0, void 0, function () {
+            var _minMintAmount, ethIndex, value, contract, gas, gasLimit;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!!estimateGas) return [3 /*break*/, 2];
+                        return [4 /*yield*/, (0, utils_1._ensureAllowance)(this.underlyingCoinAddresses, _amounts, this.zap)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, _depositMinAmount.call(this, _amounts, slippage)];
+                    case 3:
+                        _minMintAmount = _a.sent();
+                        ethIndex = (0, utils_1.getEthIndex)(this.underlyingCoinAddresses);
+                        value = _amounts[ethIndex] || ethers_1.ethers.BigNumber.from(0);
+                        contract = curve_1.curve.contracts[this.zap].contract;
+                        return [4 /*yield*/, contract.estimateGas.add_liquidity(this.address, _amounts, _minMintAmount, true, __assign(__assign({}, curve_1.curve.constantOptions), { value: value }))];
+                    case 4:
+                        gas = _a.sent();
+                        if (estimateGas)
+                            return [2 /*return*/, gas.toNumber()];
+                        gasLimit = gas.mul(130).div(100);
+                        return [4 /*yield*/, contract.add_liquidity(this.address, _amounts, _minMintAmount, true, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit, value: value }))];
+                    case 5: return [2 /*return*/, (_a.sent()).hash];
+                }
+            });
+        });
+    },
+    depositEstimateGas: function (amounts) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _amounts;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, _depositCheck.call(this, amounts, true)];
+                    case 1:
+                        _amounts = _a.sent();
+                        return [4 /*yield*/, this._deposit(_amounts, 0.1, true)];
+                    case 2: 
+                    // @ts-ignore
+                    return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    },
+    deposit: function (amounts, slippage) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _amounts;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, _depositCheck.call(this, amounts)];
+                    case 1:
+                        _amounts = _a.sent();
+                        return [4 /*yield*/, this._deposit(_amounts, slippage)];
+                    case 2: 
+                    // @ts-ignore
+                    return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    },
+};
+// @ts-ignore
 exports.depositZapMixin = {
     // @ts-ignore
     _deposit: function (_amounts, slippage, estimateGas) {

package/lib/pools/mixins/swapMixins.d.ts

@@ -1,4 +1,5 @@
 import { PoolTemplate } from "../PoolTemplate";
 export declare const swapTricrypto2Mixin: PoolTemplate;
 export declare const swapMetaFactoryMixin: PoolTemplate;
+export declare const swapCryptoMetaFactoryMixin: PoolTemplate;
 export declare const swapMixin: PoolTemplate;

package/lib/pools/mixins/swapMixins.js

@@ -47,7 +47,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.swapMixin = exports.swapMetaFactoryMixin = exports.swapTricrypto2Mixin = void 0;
+exports.swapMixin = exports.swapCryptoMetaFactoryMixin = exports.swapMetaFactoryMixin = exports.swapTricrypto2Mixin = void 0;
 var ethers_1 = require("ethers");
 var curve_1 = require("../../curve");
 var utils_1 = require("../../utils");
@@ -242,6 +242,73 @@ exports.swapMetaFactoryMixin = {
     },
 };
 // @ts-ignore
+exports.swapCryptoMetaFactoryMixin = {
+    // @ts-ignore
+    _swap: function (i, j, _amount, slippage, estimateGas) {
+        if (estimateGas === void 0) { estimateGas = false; }
+        return __awaiter(this, void 0, void 0, function () {
+            var contractAddress, _minRecvAmount, contract, exchangeMethod, value, gas, gasLimit;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        contractAddress = this._swapContractAddress();
+                        if (!!estimateGas) return [3 /*break*/, 2];
+                        return [4 /*yield*/, (0, utils_1._ensureAllowance)([this.underlyingCoinAddresses[i]], [_amount], contractAddress)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, _swapMinAmount.call(this, i, j, _amount, slippage)];
+                    case 3:
+                        _minRecvAmount = _a.sent();
+                        contract = curve_1.curve.contracts[contractAddress].contract;
+                        exchangeMethod = Object.prototype.hasOwnProperty.call(contract, 'exchange_underlying') ? 'exchange_underlying' : 'exchange';
+                        value = (0, utils_1.isEth)(this.underlyingCoinAddresses[i]) ? _amount : ethers_1.ethers.BigNumber.from(0);
+                        return [4 /*yield*/, contract.estimateGas[exchangeMethod](this.address, i, j, _amount, _minRecvAmount, true, __assign(__assign({}, curve_1.curve.constantOptions), { value: value }))];
+                    case 4:
+                        gas = _a.sent();
+                        if (estimateGas)
+                            return [2 /*return*/, gas.toNumber()];
+                        gasLimit = gas.mul(140).div(100);
+                        return [4 /*yield*/, contract[exchangeMethod](this.address, i, j, _amount, _minRecvAmount, true, __assign(__assign({}, curve_1.curve.options), { value: value, gasLimit: gasLimit }))];
+                    case 5: return [2 /*return*/, (_a.sent()).hash];
+                }
+            });
+        });
+    },
+    swapEstimateGas: function (inputCoin, outputCoin, amount) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, i, j, _amount;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, _swapCheck.call(this, inputCoin, outputCoin, amount, true)];
+                    case 1:
+                        _a = _b.sent(), i = _a[0], j = _a[1], _amount = _a[2];
+                        return [4 /*yield*/, this._swap(i, j, _amount, 0.1, true)];
+                    case 2: 
+                    // @ts-ignore
+                    return [2 /*return*/, _b.sent()];
+                }
+            });
+        });
+    },
+    swap: function (inputCoin, outputCoin, amount, slippage) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, i, j, _amount;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, _swapCheck.call(this, inputCoin, outputCoin, amount)];
+                    case 1:
+                        _a = _b.sent(), i = _a[0], j = _a[1], _amount = _a[2];
+                        return [4 /*yield*/, this._swap(i, j, _amount, slippage)];
+                    case 2: 
+                    // @ts-ignore
+                    return [2 /*return*/, _b.sent()];
+                }
+            });
+        });
+    },
+};
+// @ts-ignore
 exports.swapMixin = {
     // @ts-ignore
     _swap: function (i, j, _amount, slippage, estimateGas) {

package/lib/pools/mixins/withdrawMixins.d.ts

@@ -1,5 +1,6 @@
 import { PoolTemplate } from "../PoolTemplate";
 export declare const withdrawMetaFactoryMixin: PoolTemplate;
+export declare const withdrawCryptoMetaFactoryMixin: PoolTemplate;
 export declare const withdrawZapMixin: PoolTemplate;
 export declare const withdrawLendingOrCryptoMixin: PoolTemplate;
 export declare const withdrawPlainMixin: PoolTemplate;

package/lib/pools/mixins/withdrawMixins.js

@@ -47,7 +47,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withdrawPlainMixin = exports.withdrawLendingOrCryptoMixin = exports.withdrawZapMixin = exports.withdrawMetaFactoryMixin = void 0;
+exports.withdrawPlainMixin = exports.withdrawLendingOrCryptoMixin = exports.withdrawZapMixin = exports.withdrawCryptoMetaFactoryMixin = exports.withdrawMetaFactoryMixin = void 0;
 var ethers_1 = require("ethers");
 var curve_1 = require("../../curve");
 var utils_1 = require("../../utils");
@@ -166,6 +166,70 @@ exports.withdrawMetaFactoryMixin = {
     },
 };
 // @ts-ignore
+exports.withdrawCryptoMetaFactoryMixin = {
+    // @ts-ignore
+    _withdraw: function (_lpTokenAmount, slippage, estimateGas) {
+        if (estimateGas === void 0) { estimateGas = false; }
+        return __awaiter(this, void 0, void 0, function () {
+            var _minAmounts, contract, gas, gasLimit;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!!estimateGas) return [3 /*break*/, 2];
+                        return [4 /*yield*/, (0, utils_1._ensureAllowance)([this.lpToken], [_lpTokenAmount], this.zap)];
+                    case 1:
+                        _b.sent();
+                        _b.label = 2;
+                    case 2: return [4 /*yield*/, _withdrawMinAmounts.call(this, _lpTokenAmount, slippage)];
+                    case 3:
+                        _minAmounts = _b.sent();
+                        contract = curve_1.curve.contracts[this.zap].contract;
+                        return [4 /*yield*/, contract.estimateGas.remove_liquidity(this.address, _lpTokenAmount, _minAmounts, true, curve_1.curve.constantOptions)];
+                    case 4:
+                        gas = _b.sent();
+                        if (estimateGas)
+                            return [2 /*return*/, gas.toNumber()];
+                        gasLimit = gas.mul(130).div(100);
+                        return [4 /*yield*/, contract.remove_liquidity(this.address, _lpTokenAmount, _minAmounts, true, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit }))];
+                    case 5: return [2 /*return*/, (_b.sent()).hash];
+                }
+            });
+        });
+    },
+    withdrawEstimateGas: function (lpTokenAmount) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _lpTokenAmount;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, _withdrawCheck.call(this, lpTokenAmount, true)];
+                    case 1:
+                        _lpTokenAmount = _b.sent();
+                        return [4 /*yield*/, this._withdraw(_lpTokenAmount, 0.1, true)];
+                    case 2: 
+                    // @ts-ignore
+                    return [2 /*return*/, _b.sent()];
+                }
+            });
+        });
+    },
+    withdraw: function (lpTokenAmount, slippage) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _lpTokenAmount;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, _withdrawCheck.call(this, lpTokenAmount)];
+                    case 1:
+                        _lpTokenAmount = _b.sent();
+                        return [4 /*yield*/, this._withdraw(_lpTokenAmount, slippage)];
+                    case 2: 
+                    // @ts-ignore
+                    return [2 /*return*/, _b.sent()];
+                }
+            });
+        });
+    },
+};
+// @ts-ignore
 exports.withdrawZapMixin = {
     // @ts-ignore
     _withdraw: function (_lpTokenAmount, slippage, estimateGas) {

package/lib/pools/mixins/withdrawOneCoinMixins.d.ts

@@ -1,5 +1,6 @@
 import { PoolTemplate } from "../PoolTemplate";
 export declare const withdrawOneCoinMetaFactoryMixin: PoolTemplate;
+export declare const withdrawOneCoinCryptoMetaFactoryMixin: PoolTemplate;
 export declare const withdrawOneCoinZapMixin: PoolTemplate;
 export declare const withdrawOneCoinLendingOrCryptoMixin: PoolTemplate;
 export declare const withdrawOneCoinPlainMixin: PoolTemplate;

package/lib/pools/mixins/withdrawOneCoinMixins.js

@@ -47,7 +47,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withdrawOneCoinPlainMixin = exports.withdrawOneCoinLendingOrCryptoMixin = exports.withdrawOneCoinZapMixin = exports.withdrawOneCoinMetaFactoryMixin = void 0;
+exports.withdrawOneCoinPlainMixin = exports.withdrawOneCoinLendingOrCryptoMixin = exports.withdrawOneCoinZapMixin = exports.withdrawOneCoinCryptoMetaFactoryMixin = exports.withdrawOneCoinMetaFactoryMixin = void 0;
 var curve_1 = require("../../curve");
 var utils_1 = require("../../utils");
 // @ts-ignore
@@ -166,6 +166,70 @@ exports.withdrawOneCoinMetaFactoryMixin = {
     },
 };
 // @ts-ignore
+exports.withdrawOneCoinCryptoMetaFactoryMixin = {
+    // @ts-ignore
+    _withdrawOneCoin: function (_lpTokenAmount, i, slippage, estimateGas) {
+        if (estimateGas === void 0) { estimateGas = false; }
+        return __awaiter(this, void 0, void 0, function () {
+            var _minAmount, contract, gas, gasLimit;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!!estimateGas) return [3 /*break*/, 2];
+                        return [4 /*yield*/, (0, utils_1._ensureAllowance)([this.lpToken], [_lpTokenAmount], this.zap)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, _withdrawOneCoinMinAmount.call(this, _lpTokenAmount, i, slippage)];
+                    case 3:
+                        _minAmount = _a.sent();
+                        contract = curve_1.curve.contracts[this.zap].contract;
+                        return [4 /*yield*/, contract.estimateGas.remove_liquidity_one_coin(this.address, _lpTokenAmount, i, _minAmount, true, curve_1.curve.constantOptions)];
+                    case 4:
+                        gas = _a.sent();
+                        if (estimateGas)
+                            return [2 /*return*/, gas.toNumber()];
+                        gasLimit = gas.mul(130).div(100);
+                        return [4 /*yield*/, contract.remove_liquidity_one_coin(this.address, _lpTokenAmount, i, _minAmount, true, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit }))];
+                    case 5: return [2 /*return*/, (_a.sent()).hash];
+                }
+            });
+        });
+    },
+    withdrawOneCoinEstimateGas: function (lpTokenAmount, coin) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, _lpTokenAmount, i;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, _withdrawOneCoinCheck.call(this, lpTokenAmount, coin, true)];
+                    case 1:
+                        _a = _b.sent(), _lpTokenAmount = _a[0], i = _a[1];
+                        return [4 /*yield*/, this._withdrawOneCoin(_lpTokenAmount, i, 0.1, true)];
+                    case 2: 
+                    // @ts-ignore
+                    return [2 /*return*/, _b.sent()];
+                }
+            });
+        });
+    },
+    withdrawOneCoin: function (lpTokenAmount, coin, slippage) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, _lpTokenAmount, i;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, _withdrawOneCoinCheck.call(this, lpTokenAmount, coin)];
+                    case 1:
+                        _a = _b.sent(), _lpTokenAmount = _a[0], i = _a[1];
+                        return [4 /*yield*/, this._withdrawOneCoin(_lpTokenAmount, i, slippage)];
+                    case 2: 
+                    // @ts-ignore
+                    return [2 /*return*/, _b.sent()];
+                }
+            });
+        });
+    },
+};
+// @ts-ignore
 exports.withdrawOneCoinZapMixin = {
     // @ts-ignore
     _withdrawOneCoin: function (_lpTokenAmount, i, slippage, estimateGas) {

package/lib/pools/poolConstructor.js

@@ -70,7 +70,12 @@ var getPool = function (poolId) {
     }
     // deposit and depositEstimateGas
     if (poolDummy.isMetaFactory) {
-        Object.assign(Pool.prototype, depositMixins_1.depositMetaFactoryMixin);
+        if (poolDummy.isCrypto) {
+            Object.assign(Pool.prototype, depositMixins_1.depositCryptoMetaFactoryMixin);
+        }
+        else {
+            Object.assign(Pool.prototype, depositMixins_1.depositMetaFactoryMixin);
+        }
     }
     else if (poolDummy.zap && poolId !== 'susd') {
         Object.assign(Pool.prototype, depositMixins_1.depositZapMixin);
@@ -83,7 +88,7 @@ var getPool = function (poolId) {
     }
     // depositWrapped and depositWrappedEstimateGas
     if (!poolDummy.isPlain && !poolDummy.isFake) {
-        if ((poolDummy.isLending || poolDummy.isCrypto) && !poolDummy.zap) {
+        if (((poolDummy.isLending || poolDummy.isCrypto) && !poolDummy.zap) || (poolDummy.isCrypto && poolDummy.isMetaFactory)) {
             Object.assign(Pool.prototype, depositWrappedMixins_1.depositWrapped3argsMixin);
         }
         else {
@@ -105,7 +110,12 @@ var getPool = function (poolId) {
     }
     // withdraw and withdrawEstimateGas
     if (poolDummy.isMetaFactory) {
-        Object.assign(Pool.prototype, withdrawMixins_1.withdrawMetaFactoryMixin);
+        if (poolDummy.isCrypto) {
+            Object.assign(Pool.prototype, withdrawMixins_1.withdrawCryptoMetaFactoryMixin);
+        }
+        else {
+            Object.assign(Pool.prototype, withdrawMixins_1.withdrawMetaFactoryMixin);
+        }
     }
     else if (poolDummy.zap && poolId !== 'susd') {
         Object.assign(Pool.prototype, withdrawMixins_1.withdrawZapMixin);
@@ -118,7 +128,7 @@ var getPool = function (poolId) {
     }
     // withdrawWrapped and withdrawWrappedEstimateGas
     if (!poolDummy.isPlain && !poolDummy.isFake) {
-        if ((poolDummy.isLending || poolDummy.isCrypto) && !poolDummy.zap) {
+        if (((poolDummy.isLending || poolDummy.isCrypto) && !poolDummy.zap) || (poolDummy.isCrypto && poolDummy.isMetaFactory)) {
             Object.assign(Pool.prototype, withdrawWrappedMixins_1.withdrawWrapped3argsMixin);
             Object.assign(Pool.prototype, withdrawExpectedMixins_1.withdrawWrappedExpectedMixin);
         }
@@ -166,7 +176,12 @@ var getPool = function (poolId) {
     }
     // withdrawOneCoin and withdrawOneCoinEstimateGas
     if (poolDummy.isMetaFactory) {
-        Object.assign(Pool.prototype, withdrawOneCoinMixins_1.withdrawOneCoinMetaFactoryMixin);
+        if (poolDummy.isCrypto) {
+            Object.assign(Pool.prototype, withdrawOneCoinMixins_1.withdrawOneCoinCryptoMetaFactoryMixin);
+        }
+        else {
+            Object.assign(Pool.prototype, withdrawOneCoinMixins_1.withdrawOneCoinMetaFactoryMixin);
+        }
     }
     else if (poolDummy.zap) { // including susd
         Object.assign(Pool.prototype, withdrawOneCoinMixins_1.withdrawOneCoinZapMixin);
@@ -188,7 +203,7 @@ var getPool = function (poolId) {
     }
     // withdrawOneCoinWrapped and withdrawOneCoinWrappedEstimateGas
     if (!poolDummy.isPlain && !poolDummy.isFake && !(poolDummy.isLending && poolDummy.zap)) {
-        if ((poolDummy.isLending || poolDummy.isCrypto) && !poolDummy.zap) {
+        if (((poolDummy.isLending || poolDummy.isCrypto) && !poolDummy.zap) || (poolDummy.isCrypto && poolDummy.isMetaFactory)) {
             Object.assign(Pool.prototype, withdrawOneCoinWrappedMixins_1.withdrawOneCoinWrappedLendingOrCryptoMixin);
         }
         else {
@@ -201,7 +216,12 @@ var getPool = function (poolId) {
         Object.assign(Pool.prototype, swapMixins_1.swapTricrypto2Mixin);
     }
     else if (poolDummy.isMetaFactory && ((0, exports.getPool)(poolDummy.basePool).isLending || (0, exports.getPool)(poolDummy.basePool).isFake || poolDummy.isCrypto)) {
-        Object.assign(Pool.prototype, swapMixins_1.swapMetaFactoryMixin);
+        if (poolDummy.isCrypto) {
+            Object.assign(Pool.prototype, swapMixins_1.swapCryptoMetaFactoryMixin);
+        }
+        else {
+            Object.assign(Pool.prototype, swapMixins_1.swapMetaFactoryMixin);
+        }
     }
     else {
         Object.assign(Pool.prototype, swapMixins_1.swapMixin);

package/lib/router.js

@@ -315,6 +315,13 @@ var filterRoutes = function (routes, inputCoinAddress, sortFn) {
 };
 var sortByTvl = function (a, b) { return b.minTvl - a.minTvl || b.totalTvl - a.totalTvl || a.steps.length - b.steps.length; };
 var sortByLength = function (a, b) { return a.steps.length - b.steps.length || b.minTvl - a.minTvl || b.totalTvl - a.totalTvl; };
+// TODO REMOVE IT!!!
+var filterMaticFactory83Route = function (routes) {
+    return routes
+        .filter(function (r) {
+        return !(r.steps.length === 1 && r.steps[0].poolId === "factory-crypto-83" && r.steps[0].inputCoinAddress === curve_1.curve.constants.NATIVE_TOKEN.address);
+    });
+};
 // Inspired by Dijkstra's algorithm
 var _findAllRoutesTvl = function (inputCoinAddress, outputCoinAddress) { return __awaiter(void 0, void 0, void 0, function () {
     var ALL_POOLS, amplificationCoefficientDict, curCoins, nextCoins, routesByTvl, routesByLength, step, _loop_1, _i, curCoins_2, inCoin, routes;
@@ -548,6 +555,9 @@ var _findAllRoutesTvl = function (inputCoinAddress, outputCoinAddress) { return
                 return [3 /*break*/, 2];
             case 8:
                 routes = __spreadArray(__spreadArray([], ((_q = routesByTvl[outputCoinAddress]) !== null && _q !== void 0 ? _q : []), true), ((_r = routesByLength[outputCoinAddress]) !== null && _r !== void 0 ? _r : []), true);
+                // TODO REMOVE IT!!!
+                if (curve_1.curve.chainId === 137)
+                    routes = filterMaticFactory83Route(routes);
                 return [2 /*return*/, routes.map(function (r) { return r.steps; })];
         }
     });

package/lib/utils.d.ts

@@ -27,6 +27,7 @@ export declare const ensureAllowanceEstimateGas: (coins: string[], amounts: (num
 export declare const ensureAllowance: (coins: string[], amounts: (number | string)[], spender: string) => Promise<string[]>;
 export declare const getPoolNameBySwapAddress: (swapAddress: string) => string;
 export declare const _getUsdPricesFromApi: () => Promise<IDict<number>>;
+export declare const _getCrvApyFromApi: () => Promise<IDict<[number, number]>>;
 export declare const _getUsdRate: (assetId: string) => Promise<number>;
 export declare const getUsdRate: (coin: string) => Promise<number>;
 export declare const getTVL: (chainId?: number) => Promise<number>;

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.getCoinNamesAndSymbols = 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.fromBN = exports.toStringFromBN = exports.toBN = exports.BN = exports.parseUnits = exports.formatNumber = exports.checkNumber = exports._cutZeros = exports.MAX_ALLOWANCE = exports.ETH_ADDRESS = void 0;
+exports.getCoinNamesAndSymbols = exports._get_price_impact = exports._get_small_x = exports._setContracts = exports.getTVL = exports.getUsdRate = exports._getUsdRate = exports._getCrvApyFromApi = 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.fromBN = exports.toStringFromBN = exports.toBN = exports.BN = exports.parseUnits = exports.formatNumber = exports.checkNumber = exports._cutZeros = exports.MAX_ALLOWANCE = exports.ETH_ADDRESS = void 0;
 var axios_1 = __importDefault(require("axios"));
 var ethers_1 = require("ethers");
 var ethcall_1 = require("ethcall");
@@ -449,6 +449,37 @@ var _getUsdPricesFromApi = function () { return __awaiter(void 0, void 0, void 0
     });
 }); };
 exports._getUsdPricesFromApi = _getUsdPricesFromApi;
+var _getCrvApyFromApi = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var network, promises, allTypesExtendedPoolData, apyDict, _i, allTypesExtendedPoolData_2, extendedPoolData, _a, _b, pool;
+    var _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
+            case 0:
+                network = curve_1.curve.constants.NETWORK_NAME;
+                promises = [
+                    (0, external_api_1._getPoolsFromApi)(network, "main"),
+                    (0, external_api_1._getPoolsFromApi)(network, "crypto"),
+                    (0, external_api_1._getPoolsFromApi)(network, "factory"),
+                    (0, external_api_1._getPoolsFromApi)(network, "factory-crypto"),
+                ];
+                return [4 /*yield*/, Promise.all(promises)];
+            case 1:
+                allTypesExtendedPoolData = _e.sent();
+                apyDict = {};
+                for (_i = 0, allTypesExtendedPoolData_2 = allTypesExtendedPoolData; _i < allTypesExtendedPoolData_2.length; _i++) {
+                    extendedPoolData = allTypesExtendedPoolData_2[_i];
+                    for (_a = 0, _b = extendedPoolData.poolData; _a < _b.length; _a++) {
+                        pool = _b[_a];
+                        if (pool.gaugeAddress) {
+                            apyDict[pool.gaugeAddress] = [(_c = pool.gaugeCrvApy[0]) !== null && _c !== void 0 ? _c : 0, (_d = pool.gaugeCrvApy[1]) !== null && _d !== void 0 ? _d : 0];
+                        }
+                    }
+                }
+                return [2 /*return*/, apyDict];
+        }
+    });
+}); };
+exports._getCrvApyFromApi = _getCrvApyFromApi;
 var _usdRatesCache = {};
 var _getUsdRate = function (assetId) { return __awaiter(void 0, void 0, void 0, function () {
     var pricesFromApi, chainName, nativeTokenName, url, response;

package/package.json

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