@curvefi/api 1.16.0 → 1.17.2

package/README.md

@@ -717,3 +717,64 @@ console.log(await pool.gaugeClaimableRewards());
 // ]
 await pool.gaugeClaimRewards();
 ```
+
+## Deposit&Stake
+Add liquidity and deposit into gauge in one transaction.
+
+### Underlying
+```ts
+(async () => {
+    const pool = new curve.Pool('compound');
+    const amounts = ['1000', '1000'];
+
+    console.log(await pool.underlyingCoinBalances());
+    // { DAI: '10000.0', USDC: '10000.0' }
+    console.log(await pool.lpTokenBalances());
+    // { lpToken: '0.0', gauge: '0.0' }
+    
+    console.log(await pool.depositAndStakeExpected(amounts));
+    // 1820.604572902286288394
+    console.log(await pool.depositAndStakeSlippage(amounts));
+    // -0.0000036435051742755193
+
+    console.log(await pool.depositAndStakeIsApproved(amounts));
+    // false
+    
+    await pool.depositAndStakeApprove(amounts);
+    await pool.depositAndStake(amounts);
+
+    console.log(await pool.underlyingCoinBalances());
+    // { DAI: '9000.0', USDC: '9000.0' }
+    console.log(await pool.lpTokenBalances());
+    // { lpToken: '0.0', gauge: '1820.556829935710883568' }
+})();
+```
+
+### Wrapped
+```ts
+(async () => {
+    const pool = new curve.Pool('compound');
+    const amounts = ['1000', '1000'];
+
+    console.log(await pool.coinBalances());
+    // { cDAI: '10000.0', cUSDC: '10000.0' }
+    console.log(await pool.lpTokenBalances());
+    // { lpToken: '0.0', gauge: '1820.556829935710883568' }
+    
+    console.log(await pool.depositAndStakeWrappedExpected(amounts));
+    // 40.328408669183101673
+    console.log(await pool.depositAndStakeWrappedSlippage(amounts));
+    // -0.0020519915272297325
+
+    console.log(await pool.depositAndStakeWrappedIsApproved(amounts));
+    // false
+    
+    await pool.depositAndStakeWrappedApprove(amounts);
+    await pool.depositAndStakeWrapped(amounts);
+
+    console.log(await pool.coinBalances());
+    // { cDAI: '9000.0', cUSDC: '9000.0' }
+    console.log(await pool.lpTokenBalances());
+    // { lpToken: '0.0', gauge: '1860.884096082215274556' }
+})();
+```

package/lib/constants/abis/json/deposit_and_stake.json

@@ -0,0 +1,51 @@
+[
+    {
+        "stateMutability": "payable",
+        "type": "function",
+        "name": "deposit_and_stake",
+        "inputs": [
+            {
+                "name": "deposit",
+                "type": "address"
+            },
+            {
+                "name": "lp_token",
+                "type": "address"
+            },
+            {
+                "name": "gauge",
+                "type": "address"
+            },
+            {
+                "name": "n_coins",
+                "type": "uint256"
+            },
+            {
+                "name": "coins",
+                "type": "address[5]"
+            },
+            {
+                "name": "amounts",
+                "type": "uint256[5]"
+            },
+            {
+                "name": "min_mint_amount",
+                "type": "uint256"
+            },
+            {
+                "name": "use_underlying",
+                "type": "bool"
+            },
+            {
+                "name": "pool",
+                "type": "address"
+            }
+        ],
+        "outputs": [],
+        "gas": "409532"
+    },
+    {
+        "stateMutability": "payable",
+        "type": "fallback"
+    }
+]

package/lib/constants/aliases.d.ts

@@ -5,6 +5,7 @@ export declare const ALIASES_ETHEREUM: {
     gauge_controller: string;
     address_provider: string;
     router: string;
+    deposit_and_stake: string;
     registry_exchange: string;
 };
 export declare const ALIASES_POLYGON: {
@@ -14,5 +15,6 @@ export declare const ALIASES_POLYGON: {
     gauge_controller: string;
     address_provider: string;
     router: string;
+    deposit_and_stake: string;
     registry_exchange: string;
 };

package/lib/constants/aliases.js

@@ -8,6 +8,7 @@ exports.ALIASES_ETHEREUM = {
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "address_provider": "0x0000000022d53366457f9d5e68ec105046fc4383",
     "router": "0xfA9a30350048B2BF66865ee20363067c66f67e58",
+    "deposit_and_stake": "0x271fbE8aB7f1fB262f81C77Ea5303F03DA9d3d6A",
     "registry_exchange": "",
 };
 exports.ALIASES_POLYGON = {
@@ -17,5 +18,6 @@ exports.ALIASES_POLYGON = {
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "address_provider": "0x0000000022d53366457f9d5e68ec105046fc4383",
     "router": "0xfA9a30350048B2BF66865ee20363067c66f67e58",
+    "deposit_and_stake": "0x43FF7b96808988C9d19C1d05Ef19658B03e8a143",
     "registry_exchange": "",
 };

package/lib/curve.d.ts

@@ -27,6 +27,7 @@ export declare let ALIASES: {
     gauge_controller: string;
     address_provider: string;
     router: string;
+    deposit_and_stake: string;
     registry_exchange: string;
 };
 declare class Curve {

package/lib/curve.js

@@ -70,6 +70,7 @@ var votingescrow_json_1 = __importDefault(require("./constants/abis/json/votinge
 var address_provider_json_1 = __importDefault(require("./constants/abis/json/address_provider.json"));
 var gaugecontroller_json_1 = __importDefault(require("./constants/abis/json/gaugecontroller.json"));
 var router_json_1 = __importDefault(require("./constants/abis/json/router.json"));
+var deposit_and_stake_json_1 = __importDefault(require("./constants/abis/json/deposit_and_stake.json"));
 var registry_exchange_json_1 = __importDefault(require("./constants/abis/json/registry_exchange.json"));
 var streamer_json_1 = __importDefault(require("./constants/abis/json/streamer.json"));
 var abis_ethereum_1 = require("./constants/abis/abis-ethereum");
@@ -84,6 +85,7 @@ exports.ALIASES = {
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "address_provider": "0x0000000022d53366457f9d5e68ec105046fc4383",
     "router": "0xfA9a30350048B2BF66865ee20363067c66f67e58",
+    "deposit_and_stake": "0x271fbE8aB7f1fB262f81C77Ea5303F03DA9d3d6A",
     "registry_exchange": "",
 };
 var Curve = /** @class */ (function () {
@@ -399,6 +401,14 @@ var Curve = /** @class */ (function () {
                             contract: new ethers_1.Contract(exports.ALIASES.router, router_json_1.default, this.signer || this.provider),
                             multicallContract: new ethcall_1.Contract(exports.ALIASES.router, router_json_1.default),
                         };
+                        this.contracts[exports.ALIASES.deposit_and_stake] = {
+                            contract: new ethers_1.Contract(exports.ALIASES.deposit_and_stake, deposit_and_stake_json_1.default, this.signer || this.provider),
+                            multicallContract: new ethcall_1.Contract(exports.ALIASES.deposit_and_stake, deposit_and_stake_json_1.default),
+                        };
+                        this.contracts[exports.ALIASES.deposit_and_stake.toLowerCase()] = {
+                            contract: new ethers_1.Contract(exports.ALIASES.deposit_and_stake, deposit_and_stake_json_1.default, this.signer || this.provider),
+                            multicallContract: new ethcall_1.Contract(exports.ALIASES.deposit_and_stake, deposit_and_stake_json_1.default),
+                        };
                         return [2 /*return*/];
                 }
             });

package/lib/index.d.ts

@@ -23,6 +23,7 @@ declare function setCustomFeeData(customFeeData: {
 declare const curve: {
     init: typeof init;
     getPoolList: () => string[];
+    getUsdRate: (coin: string) => Promise<number>;
     setCustomFeeData: typeof setCustomFeeData;
     signerAddress: string;
     chainId: number;

package/lib/index.js

@@ -63,6 +63,7 @@ function setCustomFeeData(customFeeData) {
 var curve = {
     init: init,
     getPoolList: utils_1.getPoolList,
+    getUsdRate: utils_1.getUsdRate,
     setCustomFeeData: setCustomFeeData,
     signerAddress: '',
     chainId: 0,

package/lib/pools.d.ts

@@ -25,8 +25,12 @@ export declare class Pool {
     estimateGas: {
         addLiquidityApprove: (amounts: string[]) => Promise<number>;
         addLiquidity: (amounts: string[]) => Promise<number>;
+        depositAndStakeApprove: (amounts: string[]) => Promise<number>;
+        depositAndStake: (amounts: string[]) => Promise<number>;
         addLiquidityWrappedApprove: (amounts: string[]) => Promise<number>;
         addLiquidityWrapped: (amounts: string[]) => Promise<number>;
+        depositAndStakeWrappedApprove: (amounts: string[]) => Promise<number>;
+        depositAndStakeWrapped: (amounts: string[]) => Promise<number>;
         gaugeDepositApprove: (lpTokenAmount: string) => Promise<number>;
         gaugeDeposit: (lpTokenAmount: string) => Promise<number>;
         gaugeWithdraw: (lpTokenAmount: string) => Promise<number>;
@@ -84,6 +88,14 @@ export declare class Pool {
     private addLiquidityEstimateGas;
     balancedAmounts: () => Promise<string[]>;
     addLiquidity: (amounts: string[]) => Promise<string>;
+    depositAndStakeExpected: (amounts: string[]) => Promise<string>;
+    depositAndStakeSlippage: (amounts: string[]) => Promise<string>;
+    depositAndStakeIsApproved: (amounts: string[]) => Promise<boolean>;
+    private depositAndStakeApproveEstimateGas;
+    depositAndStakeApprove: (amounts: string[]) => Promise<string[]>;
+    private depositAndStakeEstimateGas;
+    depositAndStake: (amounts: string[]) => Promise<string>;
+    private _depositAndStake;
     balancedWrappedAmounts: () => Promise<string[]>;
     addLiquidityWrappedExpected: (amounts: string[]) => Promise<string>;
     addLiquidityWrappedSlippage: (amounts: string[]) => Promise<string>;
@@ -92,6 +104,13 @@ export declare class Pool {
     addLiquidityWrappedApprove: (amounts: string[]) => Promise<string[]>;
     private addLiquidityWrappedEstimateGas;
     addLiquidityWrapped: (amounts: string[]) => Promise<string>;
+    depositAndStakeWrappedExpected: (amounts: string[]) => Promise<string>;
+    depositAndStakeWrappedSlippage: (amounts: string[]) => Promise<string>;
+    depositAndStakeWrappedIsApproved: (amounts: string[]) => Promise<boolean>;
+    private depositAndStakeWrappedApproveEstimateGas;
+    depositAndStakeWrappedApprove: (amounts: string[]) => Promise<string[]>;
+    private depositAndStakeWrappedEstimateGas;
+    depositAndStakeWrapped: (amounts: string[]) => Promise<string>;
     removeLiquidityExpected: (lpTokenAmount: string) => Promise<string[]>;
     removeLiquidityIsApproved: (lpTokenAmount: string) => Promise<boolean>;
     private removeLiquidityApproveEstimateGas;
@@ -161,7 +180,11 @@ export declare class Pool {
     private _getCoinIdx;
     private _getRates;
     private _balances;
+    private _underlyingPrices;
+    private _wrappedPrices;
+    private _addLiquidityCryptoSlippage;
     private _addLiquiditySlippage;
+    private _removeLiquidityCryptoSlippage;
     private _removeLiquiditySlippage;
     private _balancedAmounts;
     private _calcLpTokenAmount;

package/lib/pools.js

@@ -382,49 +382,52 @@ var Pool = /** @class */ (function () {
             });
         }); };
         this.addLiquiditySlippage = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
-            var totalAmount, expected, _a;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var prices_1, totalAmountUSD, expected_1, _a, totalAmount, expected, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        totalAmount = amounts.reduce(function (s, a) { return s + Number(a); }, 0);
+                        if (!this.isCrypto) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this._underlyingPrices()];
+                    case 1:
+                        prices_1 = _d.sent();
+                        totalAmountUSD = amounts.reduce(function (s, a, i) { return s + (Number(a) * prices_1[i]); }, 0);
                         _a = Number;
                         return [4 /*yield*/, this.addLiquidityExpected(amounts)];
-                    case 1:
-                        expected = _a.apply(void 0, [_c.sent()]);
+                    case 2:
+                        expected_1 = _a.apply(void 0, [_d.sent()]);
+                        return [4 /*yield*/, this._addLiquidityCryptoSlippage(totalAmountUSD, expected_1)];
+                    case 3: return [2 /*return*/, _d.sent()];
+                    case 4:
+                        totalAmount = amounts.reduce(function (s, a) { return s + Number(a); }, 0);
+                        _c = Number;
+                        return [4 /*yield*/, this.addLiquidityExpected(amounts)];
+                    case 5:
+                        expected = _c.apply(void 0, [_d.sent()]);
                         return [4 /*yield*/, this._addLiquiditySlippage(totalAmount, expected)];
-                    case 2: return [2 /*return*/, _c.sent()];
+                    case 6: return [2 /*return*/, _d.sent()];
                 }
             });
         }); };
         this.addLiquidityIsApproved = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
-            var spender;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        spender = (['compound', 'usdt', 'y', 'busd', 'pax'].includes(this.name) || this.isMeta) ? this.zap : this.swap;
-                        return [4 /*yield*/, (0, utils_1.hasAllowance)(this.underlyingCoinAddresses, amounts, curve_1.curve.signerAddress, spender)];
+                    case 0: return [4 /*yield*/, (0, utils_1.hasAllowance)(this.underlyingCoinAddresses, amounts, curve_1.curve.signerAddress, this.zap || this.swap)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         }); };
         this.addLiquidityApproveEstimateGas = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
-            var spender;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        spender = (['compound', 'usdt', 'y', 'busd', 'pax'].includes(this.name) || this.isMeta) ? this.zap : this.swap;
-                        return [4 /*yield*/, (0, utils_1.ensureAllowanceEstimateGas)(this.underlyingCoinAddresses, amounts, spender)];
+                    case 0: return [4 /*yield*/, (0, utils_1.ensureAllowanceEstimateGas)(this.underlyingCoinAddresses, amounts, this.zap || this.swap)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         }); };
         this.addLiquidityApprove = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
-            var spender;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        spender = (['compound', 'usdt', 'y', 'busd', 'pax'].includes(this.name) || this.isMeta) ? this.zap : this.swap;
-                        return [4 /*yield*/, (0, utils_1.ensureAllowance)(this.underlyingCoinAddresses, amounts, spender)];
+                    case 0: return [4 /*yield*/, (0, utils_1.ensureAllowance)(this.underlyingCoinAddresses, amounts, this.zap || this.swap)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -474,7 +477,7 @@ var Pool = /** @class */ (function () {
             });
         }); };
         this.balancedAmounts = function () { return __awaiter(_this, void 0, void 0, function () {
-            var poolBalances, walletBalances, _a, _c;
+            var poolBalances, walletBalances, _a, _c, prices_2, poolBalancesUSD, walletBalancesUSD, balancedAmountsUSD;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, this.getPoolBalances()];
@@ -484,7 +487,15 @@ var Pool = /** @class */ (function () {
                         return [4 /*yield*/, this.underlyingCoinBalances()];
                     case 2:
                         walletBalances = _c.apply(_a, [_d.sent()]).map(Number);
-                        return [2 /*return*/, this._balancedAmounts(poolBalances, walletBalances, this.underlyingDecimals)];
+                        if (!this.isCrypto) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this._underlyingPrices()];
+                    case 3:
+                        prices_2 = _d.sent();
+                        poolBalancesUSD = poolBalances.map(function (b, i) { return b * prices_2[i]; });
+                        walletBalancesUSD = walletBalances.map(function (b, i) { return b * prices_2[i]; });
+                        balancedAmountsUSD = this._balancedAmounts(poolBalancesUSD, walletBalancesUSD, this.underlyingDecimals);
+                        return [2 /*return*/, balancedAmountsUSD.map(function (b, i) { return String(Math.min(Number(b) / prices_2[i], poolBalances[i])); })];
+                    case 4: return [2 /*return*/, this._balancedAmounts(poolBalances, walletBalances, this.underlyingDecimals)];
                 }
             });
         }); };
@@ -521,8 +532,197 @@ var Pool = /** @class */ (function () {
                 }
             });
         }); };
+        this.depositAndStakeExpected = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.addLiquidityExpected(amounts)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        }); };
+        this.depositAndStakeSlippage = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.addLiquiditySlippage(amounts)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        }); };
+        this.depositAndStakeIsApproved = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            var coinsAllowance, gaugeContract, gaugeAllowance;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, utils_1.hasAllowance)(this.underlyingCoinAddresses, amounts, curve_1.curve.signerAddress, curve_1.ALIASES.deposit_and_stake)];
+                    case 1:
+                        coinsAllowance = _a.sent();
+                        gaugeContract = curve_1.curve.contracts[this.gauge].contract;
+                        if (!Object.prototype.hasOwnProperty.call(gaugeContract, 'approved_to_deposit')) return [3 /*break*/, 3];
+                        return [4 /*yield*/, gaugeContract.approved_to_deposit(curve_1.curve.signerAddress, curve_1.ALIASES.deposit_and_stake, curve_1.curve.constantOptions)];
+                    case 2:
+                        gaugeAllowance = _a.sent();
+                        return [2 /*return*/, coinsAllowance && gaugeAllowance];
+                    case 3: return [2 /*return*/, coinsAllowance];
+                }
+            });
+        }); };
+        this.depositAndStakeApproveEstimateGas = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            var approveCoinsGas, gaugeContract, gaugeAllowance, approveGaugeGas;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, utils_1.ensureAllowanceEstimateGas)(this.underlyingCoinAddresses, amounts, curve_1.ALIASES.deposit_and_stake)];
+                    case 1:
+                        approveCoinsGas = _a.sent();
+                        gaugeContract = curve_1.curve.contracts[this.gauge].contract;
+                        if (!Object.prototype.hasOwnProperty.call(gaugeContract, 'approved_to_deposit')) return [3 /*break*/, 4];
+                        return [4 /*yield*/, gaugeContract.approved_to_deposit(curve_1.curve.signerAddress, curve_1.ALIASES.deposit_and_stake, curve_1.curve.constantOptions)];
+                    case 2:
+                        gaugeAllowance = _a.sent();
+                        if (!!gaugeAllowance) return [3 /*break*/, 4];
+                        return [4 /*yield*/, gaugeContract.estimateGas.set_approve_deposit(curve_1.ALIASES.deposit_and_stake, true, curve_1.curve.constantOptions)];
+                    case 3:
+                        approveGaugeGas = (_a.sent()).toNumber();
+                        return [2 /*return*/, approveCoinsGas + approveGaugeGas];
+                    case 4: return [2 /*return*/, approveCoinsGas];
+                }
+            });
+        }); };
+        this.depositAndStakeApprove = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            var approveCoinsTx, gaugeContract, gaugeAllowance, gasLimit, approveGaugeTx;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, utils_1.ensureAllowance)(this.underlyingCoinAddresses, amounts, curve_1.ALIASES.deposit_and_stake)];
+                    case 1:
+                        approveCoinsTx = _a.sent();
+                        gaugeContract = curve_1.curve.contracts[this.gauge].contract;
+                        if (!Object.prototype.hasOwnProperty.call(gaugeContract, 'approved_to_deposit')) return [3 /*break*/, 5];
+                        return [4 /*yield*/, gaugeContract.approved_to_deposit(curve_1.curve.signerAddress, curve_1.ALIASES.deposit_and_stake, curve_1.curve.constantOptions)];
+                    case 2:
+                        gaugeAllowance = _a.sent();
+                        if (!!gaugeAllowance) return [3 /*break*/, 5];
+                        return [4 /*yield*/, gaugeContract.estimateGas.set_approve_deposit(curve_1.ALIASES.deposit_and_stake, true, curve_1.curve.constantOptions)];
+                    case 3:
+                        gasLimit = (_a.sent()).mul(130).div(100);
+                        return [4 /*yield*/, gaugeContract.set_approve_deposit(curve_1.ALIASES.deposit_and_stake, true, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit }))];
+                    case 4:
+                        approveGaugeTx = (_a.sent()).hash;
+                        return [2 /*return*/, __spreadArray(__spreadArray([], approveCoinsTx, true), [approveGaugeTx], false)];
+                    case 5: return [2 /*return*/, approveCoinsTx];
+                }
+            });
+        }); };
+        this.depositAndStakeEstimateGas = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this._depositAndStake(amounts, true, true)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        }); };
+        this.depositAndStake = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this._depositAndStake(amounts, true, false)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        }); };
+        this._depositAndStake = function (amounts, isUnderlying, estimateGas) { return __awaiter(_this, void 0, void 0, function () {
+            var coinAddresses, coins, decimals, depositAddress, balances, _a, _c, _d, _e, _f, i, allowance, _h, _amounts, contract, useUnderlying, _minMintAmount, _j, _k, _l, _m, _o, ethIndex, value, i, _gas, gasLimit;
+            return __generator(this, function (_p) {
+                switch (_p.label) {
+                    case 0:
+                        coinAddresses = isUnderlying ? __spreadArray([], this.underlyingCoinAddresses, true) : __spreadArray([], this.coinAddresses, true);
+                        coins = isUnderlying ? this.underlyingCoins : this.coinAddresses;
+                        decimals = isUnderlying ? this.underlyingDecimals : this.decimals;
+                        depositAddress = isUnderlying ? this.zap || this.swap : this.swap;
+                        if (amounts.length !== coinAddresses.length) {
+                            throw Error("".concat(this.name, " pool has ").concat(coinAddresses.length, " coins (amounts provided for ").concat(amounts.length, ")"));
+                        }
+                        if (!isUnderlying) return [3 /*break*/, 2];
+                        _d = (_c = Object).values;
+                        return [4 /*yield*/, this.underlyingCoinBalances()];
+                    case 1:
+                        _a = _d.apply(_c, [_p.sent()]);
+                        return [3 /*break*/, 4];
+                    case 2:
+                        _f = (_e = Object).values;
+                        return [4 /*yield*/, this.coinBalances()];
+                    case 3:
+                        _a = _f.apply(_e, [_p.sent()]);
+                        _p.label = 4;
+                    case 4:
+                        balances = _a;
+                        for (i = 0; i < balances.length; i++) {
+                            if (Number(balances[i]) < Number(amounts[i])) {
+                                throw Error("Not enough ".concat(coins[i], ". Actual: ").concat(balances[i], ", required: ").concat(amounts[i]));
+                            }
+                        }
+                        if (!isUnderlying) return [3 /*break*/, 6];
+                        return [4 /*yield*/, this.depositAndStakeIsApproved(amounts)];
+                    case 5:
+                        _h = _p.sent();
+                        return [3 /*break*/, 8];
+                    case 6: return [4 /*yield*/, this.depositAndStakeWrappedIsApproved(amounts)];
+                    case 7:
+                        _h = _p.sent();
+                        _p.label = 8;
+                    case 8:
+                        allowance = _h;
+                        if (estimateGas && !allowance) {
+                            throw Error("Token allowance is needed to estimate gas");
+                        }
+                        if (!!estimateGas) return [3 /*break*/, 12];
+                        if (!isUnderlying) return [3 /*break*/, 10];
+                        return [4 /*yield*/, this.depositAndStakeApprove(amounts)];
+                    case 9:
+                        _p.sent();
+                        return [3 /*break*/, 12];
+                    case 10: return [4 /*yield*/, this.depositAndStakeWrappedApprove(amounts)];
+                    case 11:
+                        _p.sent();
+                        _p.label = 12;
+                    case 12:
+                        _amounts = amounts.map(function (amount, i) {
+                            return ethers_1.ethers.utils.parseUnits(amount, decimals[i]);
+                        });
+                        contract = curve_1.curve.contracts[curve_1.ALIASES.deposit_and_stake].contract;
+                        useUnderlying = isUnderlying && (['aave', 'saave', 'ib', 'crveth', "cvxeth", "spelleth", "teth"].includes(this.name) || (curve_1.curve.chainId === 137 && this.name === 'ren'));
+                        if (!isUnderlying) return [3 /*break*/, 14];
+                        _l = (_k = ethers_1.ethers.utils).parseUnits;
+                        return [4 /*yield*/, this.depositAndStakeExpected(amounts)];
+                    case 13:
+                        _j = _l.apply(_k, [_p.sent()]).mul(99).div(100);
+                        return [3 /*break*/, 16];
+                    case 14:
+                        _o = (_m = ethers_1.ethers.utils).parseUnits;
+                        return [4 /*yield*/, this.depositAndStakeWrappedExpected(amounts)];
+                    case 15:
+                        _j = _o.apply(_m, [_p.sent()]).mul(99).div(100);
+                        _p.label = 16;
+                    case 16:
+                        _minMintAmount = _j;
+                        ethIndex = (0, utils_1.getEthIndex)(coinAddresses);
+                        value = _amounts[ethIndex] || ethers_1.ethers.BigNumber.from(0);
+                        for (i = 0; i < 5; i++) {
+                            coinAddresses[i] = coinAddresses[i] || ethers_1.ethers.constants.AddressZero;
+                            _amounts[i] = _amounts[i] || ethers_1.ethers.BigNumber.from(0);
+                        }
+                        return [4 /*yield*/, contract.estimateGas.deposit_and_stake(depositAddress, this.lpToken, this.gauge, coins.length, coinAddresses, _amounts, _minMintAmount, useUnderlying, this.isFactory && isUnderlying ? this.swap : ethers_1.ethers.constants.AddressZero, __assign(__assign({}, curve_1.curve.constantOptions), { value: value }))];
+                    case 17:
+                        _gas = (_p.sent());
+                        if (estimateGas)
+                            return [2 /*return*/, _gas.toNumber()];
+                        return [4 /*yield*/, curve_1.curve.updateFeeData()];
+                    case 18:
+                        _p.sent();
+                        gasLimit = _gas.mul(200).div(100);
+                        return [4 /*yield*/, contract.deposit_and_stake(depositAddress, this.lpToken, this.gauge, coins.length, coinAddresses, _amounts, _minMintAmount, useUnderlying, this.isFactory && isUnderlying ? this.swap : ethers_1.ethers.constants.AddressZero, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit, value: value }))];
+                    case 19: return [2 /*return*/, (_p.sent()).hash];
+                }
+            });
+        }); };
         this.balancedWrappedAmounts = function () { return __awaiter(_this, void 0, void 0, function () {
-            var poolBalances, walletBalances, _a, _c;
+            var poolBalances, walletBalances, _a, _c, prices_3, poolBalancesUSD, walletBalancesUSD, balancedAmountsUSD;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -536,7 +736,15 @@ var Pool = /** @class */ (function () {
                         return [4 /*yield*/, this.coinBalances()];
                     case 2:
                         walletBalances = _c.apply(_a, [_d.sent()]).map(Number);
-                        return [2 /*return*/, this._balancedAmounts(poolBalances, walletBalances, this.decimals)];
+                        if (!this.isCrypto) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this._wrappedPrices()];
+                    case 3:
+                        prices_3 = _d.sent();
+                        poolBalancesUSD = poolBalances.map(function (b, i) { return b * prices_3[i]; });
+                        walletBalancesUSD = walletBalances.map(function (b, i) { return b * prices_3[i]; });
+                        balancedAmountsUSD = this._balancedAmounts(poolBalancesUSD, walletBalancesUSD, this.decimals);
+                        return [2 /*return*/, balancedAmountsUSD.map(function (b, i) { return String(Math.min(Number(b) / prices_3[i], poolBalances[i])); })];
+                    case 4: return [2 /*return*/, this._balancedAmounts(poolBalances, walletBalances, this.decimals)];
                 }
             });
         }); };
@@ -555,20 +763,32 @@ var Pool = /** @class */ (function () {
             });
         }); };
         this.addLiquidityWrappedSlippage = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
-            var totalAmount, expected, _a;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var prices_4, totalAmountUSD, expected_2, _a, totalAmount, expected, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         if (this.isFake) {
                             throw Error("".concat(this.name, " pool doesn't have this method"));
                         }
-                        totalAmount = amounts.reduce(function (s, a) { return s + Number(a); }, 0);
+                        if (!this.isCrypto) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this._wrappedPrices()];
+                    case 1:
+                        prices_4 = _d.sent();
+                        totalAmountUSD = amounts.reduce(function (s, a, i) { return s + (Number(a) * prices_4[i]); }, 0);
                         _a = Number;
                         return [4 /*yield*/, this.addLiquidityWrappedExpected(amounts)];
-                    case 1:
-                        expected = _a.apply(void 0, [_c.sent()]);
+                    case 2:
+                        expected_2 = _a.apply(void 0, [_d.sent()]);
+                        return [4 /*yield*/, this._addLiquidityCryptoSlippage(totalAmountUSD, expected_2, false)];
+                    case 3: return [2 /*return*/, _d.sent()];
+                    case 4:
+                        totalAmount = amounts.reduce(function (s, a) { return s + Number(a); }, 0);
+                        _c = Number;
+                        return [4 /*yield*/, this.addLiquidityWrappedExpected(amounts)];
+                    case 5:
+                        expected = _c.apply(void 0, [_d.sent()]);
                         return [4 /*yield*/, this._addLiquiditySlippage(totalAmount, expected, false)];
-                    case 2: return [2 /*return*/, _c.sent()];
+                    case 6: return [2 /*return*/, _d.sent()];
                 }
             });
         }); };
@@ -675,6 +895,128 @@ var Pool = /** @class */ (function () {
                 }
             });
         }); };
+        this.depositAndStakeWrappedExpected = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.isFake) {
+                            throw Error("".concat(this.name, " pool doesn't have this method"));
+                        }
+                        return [4 /*yield*/, this.addLiquidityWrappedExpected(amounts)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        }); };
+        this.depositAndStakeWrappedSlippage = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.isFake) {
+                            throw Error("".concat(this.name, " pool doesn't have this method"));
+                        }
+                        return [4 /*yield*/, this.addLiquidityWrappedSlippage(amounts)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        }); };
+        this.depositAndStakeWrappedIsApproved = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            var coinsAllowance, gaugeContract, gaugeAllowance;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.isFake) {
+                            throw Error("".concat(this.name, " pool doesn't have this method"));
+                        }
+                        return [4 /*yield*/, (0, utils_1.hasAllowance)(this.coinAddresses, amounts, curve_1.curve.signerAddress, curve_1.ALIASES.deposit_and_stake)];
+                    case 1:
+                        coinsAllowance = _a.sent();
+                        gaugeContract = curve_1.curve.contracts[this.gauge].contract;
+                        if (!Object.prototype.hasOwnProperty.call(gaugeContract, 'approved_to_deposit')) return [3 /*break*/, 3];
+                        return [4 /*yield*/, gaugeContract.approved_to_deposit(curve_1.curve.signerAddress, curve_1.ALIASES.deposit_and_stake, curve_1.curve.constantOptions)];
+                    case 2:
+                        gaugeAllowance = _a.sent();
+                        return [2 /*return*/, coinsAllowance && gaugeAllowance];
+                    case 3: return [2 /*return*/, coinsAllowance];
+                }
+            });
+        }); };
+        this.depositAndStakeWrappedApproveEstimateGas = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            var approveCoinsGas, gaugeContract, gaugeAllowance, approveGaugeGas;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.isFake) {
+                            throw Error("".concat(this.name, " pool doesn't have this method"));
+                        }
+                        return [4 /*yield*/, (0, utils_1.ensureAllowanceEstimateGas)(this.coinAddresses, amounts, curve_1.ALIASES.deposit_and_stake)];
+                    case 1:
+                        approveCoinsGas = _a.sent();
+                        gaugeContract = curve_1.curve.contracts[this.gauge].contract;
+                        if (!Object.prototype.hasOwnProperty.call(gaugeContract, 'approved_to_deposit')) return [3 /*break*/, 4];
+                        return [4 /*yield*/, gaugeContract.approved_to_deposit(curve_1.curve.signerAddress, curve_1.ALIASES.deposit_and_stake, curve_1.curve.constantOptions)];
+                    case 2:
+                        gaugeAllowance = _a.sent();
+                        if (!!gaugeAllowance) return [3 /*break*/, 4];
+                        return [4 /*yield*/, gaugeContract.estimateGas.set_approve_deposit(curve_1.ALIASES.deposit_and_stake, true, curve_1.curve.constantOptions)];
+                    case 3:
+                        approveGaugeGas = (_a.sent()).toNumber();
+                        return [2 /*return*/, approveCoinsGas + approveGaugeGas];
+                    case 4: return [2 /*return*/, approveCoinsGas];
+                }
+            });
+        }); };
+        this.depositAndStakeWrappedApprove = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            var approveCoinsTx, gaugeContract, gaugeAllowance, gasLimit, approveGaugeTx;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.isFake) {
+                            throw Error("".concat(this.name, " pool doesn't have this method"));
+                        }
+                        return [4 /*yield*/, (0, utils_1.ensureAllowance)(this.coinAddresses, amounts, curve_1.ALIASES.deposit_and_stake)];
+                    case 1:
+                        approveCoinsTx = _a.sent();
+                        gaugeContract = curve_1.curve.contracts[this.gauge].contract;
+                        if (!Object.prototype.hasOwnProperty.call(gaugeContract, 'approved_to_deposit')) return [3 /*break*/, 5];
+                        return [4 /*yield*/, gaugeContract.approved_to_deposit(curve_1.curve.signerAddress, curve_1.ALIASES.deposit_and_stake, curve_1.curve.constantOptions)];
+                    case 2:
+                        gaugeAllowance = _a.sent();
+                        if (!!gaugeAllowance) return [3 /*break*/, 5];
+                        return [4 /*yield*/, gaugeContract.estimateGas.set_approve_deposit(curve_1.ALIASES.deposit_and_stake, true, curve_1.curve.constantOptions)];
+                    case 3:
+                        gasLimit = (_a.sent()).mul(130).div(100);
+                        return [4 /*yield*/, gaugeContract.set_approve_deposit(curve_1.ALIASES.deposit_and_stake, true, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit }))];
+                    case 4:
+                        approveGaugeTx = (_a.sent()).hash;
+                        return [2 /*return*/, __spreadArray(__spreadArray([], approveCoinsTx, true), [approveGaugeTx], false)];
+                    case 5: return [2 /*return*/, approveCoinsTx];
+                }
+            });
+        }); };
+        this.depositAndStakeWrappedEstimateGas = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.isFake) {
+                            throw Error("".concat(this.name, " pool doesn't have this method"));
+                        }
+                        return [4 /*yield*/, this._depositAndStake(amounts, false, true)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        }); };
+        this.depositAndStakeWrapped = function (amounts) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.isFake) {
+                            throw Error("".concat(this.name, " pool doesn't have this method"));
+                        }
+                        return [4 /*yield*/, this._depositAndStake(amounts, false, false)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        }); };
         this.removeLiquidityExpected = function (lpTokenAmount) { return __awaiter(_this, void 0, void 0, function () {
             var _lpTokenAmount, _expected;
             var _this = this;
@@ -705,7 +1047,7 @@ var Pool = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!['compound', 'usdt', 'y', 'busd', 'pax', 'tricrypto2'].includes(this.name) && !this.isMeta)
+                        if (!this.zap)
                             return [2 /*return*/, true];
                         return [4 /*yield*/, (0, utils_1.hasAllowance)([this.lpToken], [lpTokenAmount], curve_1.curve.signerAddress, this.zap)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -716,7 +1058,7 @@ var Pool = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!['compound', 'usdt', 'y', 'busd', 'pax', 'tricrypto2'].includes(this.name) && !this.isMeta)
+                        if (!this.zap)
                             return [2 /*return*/, 0];
                         return [4 /*yield*/, (0, utils_1.ensureAllowanceEstimateGas)([this.lpToken], [lpTokenAmount], this.zap)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -727,7 +1069,7 @@ var Pool = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!['compound', 'usdt', 'y', 'busd', 'pax', 'tricrypto2'].includes(this.name) && !this.isMeta)
+                        if (!this.zap)
                             return [2 /*return*/, []];
                         return [4 /*yield*/, (0, utils_1.ensureAllowance)([this.lpToken], [lpTokenAmount], this.zap)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -1153,7 +1495,7 @@ var Pool = /** @class */ (function () {
             });
         }); };
         this.removeLiquidityOneCoinSlippage = function (lpTokenAmount, coin) { return __awaiter(_this, void 0, void 0, function () {
-            var totalAmount, _a;
+            var totalAmount, _a, coinPrice;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -1161,8 +1503,14 @@ var Pool = /** @class */ (function () {
                         return [4 /*yield*/, this.removeLiquidityOneCoinExpected(lpTokenAmount, coin)];
                     case 1:
                         totalAmount = _a.apply(void 0, [_c.sent()]);
-                        return [4 /*yield*/, this._removeLiquiditySlippage(totalAmount, Number(lpTokenAmount))];
-                    case 2: return [2 /*return*/, _c.sent()];
+                        if (!this.isCrypto) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this._underlyingPrices()];
+                    case 2:
+                        coinPrice = (_c.sent())[this._getCoinIdx(coin)];
+                        return [4 /*yield*/, this._removeLiquidityCryptoSlippage(totalAmount * coinPrice, Number(lpTokenAmount))];
+                    case 3: return [2 /*return*/, _c.sent()];
+                    case 4: return [4 /*yield*/, this._removeLiquiditySlippage(totalAmount, Number(lpTokenAmount))];
+                    case 5: return [2 /*return*/, _c.sent()];
                 }
             });
         }); };
@@ -1170,7 +1518,7 @@ var Pool = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!['compound', 'usdt', 'y', 'busd', 'pax', 'tricrypto2'].includes(this.name) && !(this.name === 'susd') && !this.isMeta)
+                        if (!this.zap)
                             return [2 /*return*/, true];
                         return [4 /*yield*/, (0, utils_1.hasAllowance)([this.lpToken], [lpTokenAmount], curve_1.curve.signerAddress, this.zap)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -1181,7 +1529,7 @@ var Pool = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!['compound', 'usdt', 'y', 'busd', 'pax', 'tricrypto2'].includes(this.name) && !(this.name === 'susd') && !this.isMeta)
+                        if (!this.zap)
                             return [2 /*return*/, 0];
                         return [4 /*yield*/, (0, utils_1.ensureAllowanceEstimateGas)([this.lpToken], [lpTokenAmount], this.zap)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -1192,7 +1540,7 @@ var Pool = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!['compound', 'usdt', 'y', 'busd', 'pax', 'tricrypto2'].includes(this.name) && !(this.name === 'susd') && !this.isMeta)
+                        if (!this.zap)
                             return [2 /*return*/, []];
                         return [4 /*yield*/, (0, utils_1.ensureAllowance)([this.lpToken], [lpTokenAmount], this.zap)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -1286,7 +1634,7 @@ var Pool = /** @class */ (function () {
             });
         }); };
         this.removeLiquidityOneCoinWrappedSlippage = function (lpTokenAmount, coin) { return __awaiter(_this, void 0, void 0, function () {
-            var totalAmount, _a;
+            var totalAmount, _a, coinPrice;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -1297,8 +1645,14 @@ var Pool = /** @class */ (function () {
                         return [4 /*yield*/, this.removeLiquidityOneCoinWrappedExpected(lpTokenAmount, coin)];
                     case 1:
                         totalAmount = _a.apply(void 0, [_c.sent()]);
-                        return [4 /*yield*/, this._removeLiquiditySlippage(totalAmount, Number(lpTokenAmount), false)];
-                    case 2: return [2 /*return*/, _c.sent()];
+                        if (!this.isCrypto) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this._underlyingPrices()];
+                    case 2:
+                        coinPrice = (_c.sent())[this._getCoinIdx(coin, false)];
+                        return [4 /*yield*/, this._removeLiquidityCryptoSlippage(totalAmount * coinPrice, Number(lpTokenAmount))];
+                    case 3: return [2 /*return*/, _c.sent()];
+                    case 4: return [4 /*yield*/, this._removeLiquiditySlippage(totalAmount, Number(lpTokenAmount), false)];
+                    case 5: return [2 /*return*/, _c.sent()];
                 }
             });
         }); };
@@ -2121,6 +2475,90 @@ var Pool = /** @class */ (function () {
                 });
             });
         };
+        this._underlyingPrices = function () { return __awaiter(_this, void 0, void 0, function () {
+            var promises, _i, _a, addr;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        promises = [];
+                        for (_i = 0, _a = this.underlyingCoinAddresses; _i < _a.length; _i++) {
+                            addr = _a[_i];
+                            promises.push((0, utils_1._getUsdRate)(addr));
+                        }
+                        return [4 /*yield*/, Promise.all(promises)];
+                    case 1: return [2 /*return*/, _c.sent()];
+                }
+            });
+        }); };
+        // NOTE! It may crash!
+        this._wrappedPrices = function () { return __awaiter(_this, void 0, void 0, function () {
+            var promises, _i, _a, addr;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        promises = [];
+                        for (_i = 0, _a = this.coinAddresses; _i < _a.length; _i++) {
+                            addr = _a[_i];
+                            promises.push((0, utils_1._getUsdRate)(addr));
+                        }
+                        return [4 /*yield*/, Promise.all(promises)];
+                    case 1: return [2 /*return*/, _c.sent()];
+                }
+            });
+        }); };
+        this._addLiquidityCryptoSlippage = function (totalAmountUSD, expected, useUnderlying) {
+            if (useUnderlying === void 0) { useUnderlying = true; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var poolBalances, _a, prices, _c, poolBalancesUSD, poolTotalBalance, poolBalancesRatios, balancedAmountsUSD, balancedAmounts, balancedExpected, _d, _e, _f;
+                return __generator(this, function (_h) {
+                    switch (_h.label) {
+                        case 0:
+                            if (!useUnderlying) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.getPoolBalances()];
+                        case 1:
+                            _a = (_h.sent()).map(Number);
+                            return [3 /*break*/, 4];
+                        case 2: return [4 /*yield*/, this.getPoolWrappedBalances()];
+                        case 3:
+                            _a = (_h.sent()).map(Number);
+                            _h.label = 4;
+                        case 4:
+                            poolBalances = _a;
+                            if (!useUnderlying) return [3 /*break*/, 6];
+                            return [4 /*yield*/, this._underlyingPrices()];
+                        case 5:
+                            _c = _h.sent();
+                            return [3 /*break*/, 8];
+                        case 6: return [4 /*yield*/, this._wrappedPrices()];
+                        case 7:
+                            _c = _h.sent();
+                            _h.label = 8;
+                        case 8:
+                            prices = _c;
+                            poolBalancesUSD = poolBalances.map(function (b, i) { return Number(b) * prices[i]; });
+                            poolTotalBalance = poolBalancesUSD.reduce(function (a, b) { return a + b; });
+                            poolBalancesRatios = poolBalancesUSD.map(function (b) { return b / poolTotalBalance; });
+                            balancedAmountsUSD = poolBalancesRatios.map(function (r) { return r * totalAmountUSD; });
+                            balancedAmounts = balancedAmountsUSD.map(function (a, i) { return String(a / prices[i]); });
+                            if (!useUnderlying) return [3 /*break*/, 10];
+                            _e = Number;
+                            return [4 /*yield*/, this.addLiquidityExpected(balancedAmounts)];
+                        case 9:
+                            _d = _e.apply(void 0, [_h.sent()]);
+                            return [3 /*break*/, 12];
+                        case 10:
+                            _f = Number;
+                            return [4 /*yield*/, this.addLiquidityWrappedExpected(balancedAmounts)];
+                        case 11:
+                            _d = _f.apply(void 0, [_h.sent()]);
+                            _h.label = 12;
+                        case 12:
+                            balancedExpected = _d;
+                            return [2 /*return*/, String((balancedExpected - expected) / balancedExpected)];
+                    }
+                });
+            });
+        };
         this._addLiquiditySlippage = function (totalAmount, expected, useUnderlying) {
             if (useUnderlying === void 0) { useUnderlying = true; }
             return __awaiter(_this, void 0, void 0, function () {
@@ -2161,6 +2599,41 @@ var Pool = /** @class */ (function () {
                 });
             });
         };
+        this._removeLiquidityCryptoSlippage = function (totalAmountUSD, lpTokenAmount, useUnderlying) {
+            if (useUnderlying === void 0) { useUnderlying = true; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var prices, _a, balancedAmounts, _c, balancedTotalAmountsUSD;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            if (!useUnderlying) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this._underlyingPrices()];
+                        case 1:
+                            _a = _d.sent();
+                            return [3 /*break*/, 4];
+                        case 2: return [4 /*yield*/, this._wrappedPrices()];
+                        case 3:
+                            _a = _d.sent();
+                            _d.label = 4;
+                        case 4:
+                            prices = _a;
+                            if (!useUnderlying) return [3 /*break*/, 6];
+                            return [4 /*yield*/, this.removeLiquidityExpected(String(lpTokenAmount))];
+                        case 5:
+                            _c = _d.sent();
+                            return [3 /*break*/, 8];
+                        case 6: return [4 /*yield*/, this.removeLiquidityWrappedExpected(String(lpTokenAmount))];
+                        case 7:
+                            _c = _d.sent();
+                            _d.label = 8;
+                        case 8:
+                            balancedAmounts = _c;
+                            balancedTotalAmountsUSD = balancedAmounts.reduce(function (s, b, i) { return s + (Number(b) * prices[i]); }, 0);
+                            return [2 /*return*/, String((balancedTotalAmountsUSD - totalAmountUSD) / balancedTotalAmountsUSD)];
+                    }
+                });
+            });
+        };
         this._removeLiquiditySlippage = function (totalAmount, expected, useUnderlying) {
             if (useUnderlying === void 0) { useUnderlying = true; }
             return __awaiter(_this, void 0, void 0, function () {
@@ -2202,7 +2675,8 @@ var Pool = /** @class */ (function () {
             });
         };
         this._balancedAmounts = function (poolBalances, walletBalances, decimals) {
-            var poolBalancesRatios = poolBalances.map(function (b) { return b / poolBalances.reduce(function (a, b) { return a + b; }); });
+            var poolTotalLiquidity = poolBalances.reduce(function (a, b) { return a + b; });
+            var poolBalancesRatios = poolBalances.map(function (b) { return b / poolTotalLiquidity; });
             // Cross factors for each wallet balance used as reference to see the
             // max that can be used according to the lowest relative wallet balance
             var balancedAmountsForEachScenario = walletBalances.map(function (_, i) { return (walletBalances.map(function (_, j) { return (poolBalancesRatios[j] * walletBalances[i] / poolBalancesRatios[i]); })); });
@@ -2944,8 +3418,12 @@ var Pool = /** @class */ (function () {
         this.estimateGas = {
             addLiquidityApprove: this.addLiquidityApproveEstimateGas,
             addLiquidity: this.addLiquidityEstimateGas,
+            depositAndStakeApprove: this.depositAndStakeApproveEstimateGas,
+            depositAndStake: this.depositAndStakeEstimateGas,
             addLiquidityWrappedApprove: this.addLiquidityWrappedApproveEstimateGas,
             addLiquidityWrapped: this.addLiquidityWrappedEstimateGas,
+            depositAndStakeWrappedApprove: this.depositAndStakeWrappedApproveEstimateGas,
+            depositAndStakeWrapped: this.depositAndStakeWrappedEstimateGas,
             gaugeDepositApprove: this.gaugeDepositApproveEstimateGas,
             gaugeDeposit: this.gaugeDepositEstimateGas,
             gaugeWithdraw: this.gaugeWithdrawEstimateGas,

package/lib/utils.d.ts

@@ -23,3 +23,4 @@ export declare const getPoolNameBySwapAddress: (swapAddress: string) => string;
 export declare const _getUsdRate: (assetId: string) => Promise<number>;
 export declare const _getStatsUrl: (isCrypto?: boolean) => string;
 export declare const getPoolList: () => string[];
+export declare const getUsdRate: (coin: string) => 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.getPoolList = exports._getStatsUrl = exports._getUsdRate = 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.getEthIndex = exports.isEth = exports.fromBN = exports.toStringFromBN = exports.toBN = exports.BN = exports.MAX_ALLOWANCE = void 0;
+exports.getUsdRate = exports.getPoolList = exports._getStatsUrl = exports._getUsdRate = 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.getEthIndex = exports.isEth = exports.fromBN = exports.toStringFromBN = exports.toBN = exports.BN = exports.MAX_ALLOWANCE = void 0;
 var axios_1 = __importDefault(require("axios"));
 var ethers_1 = require("ethers");
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
@@ -431,3 +431,15 @@ var _getStatsUrl = function (isCrypto) {
 exports._getStatsUrl = _getStatsUrl;
 var getPoolList = function () { return Object.keys(curve_1.POOLS_DATA); };
 exports.getPoolList = getPoolList;
+var getUsdRate = function (coin) { return __awaiter(void 0, void 0, void 0, function () {
+    var coinAddress;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                coinAddress = (0, exports._getCoinAddresses)(coin)[0];
+                return [4 /*yield*/, (0, exports._getUsdRate)(coinAddress)];
+            case 1: return [2 /*return*/, _a.sent()];
+        }
+    });
+}); };
+exports.getUsdRate = getUsdRate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/api",
-  "version": "1.16.0",
+  "version": "1.17.2",
   "description": "JavaScript library for curve.fi",
   "main": "lib/index.js",
   "scripts": {