@curvefi/api 2.32.0 → 2.33.1

package/lib/pools/mixins/swapWrappedMixins.js

@@ -1,111 +1,293 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import { curve } from "../../curve.js";
 import { _ensureAllowance, _getCoinDecimals, ensureAllowance, ensureAllowanceEstimateGas, fromBN, hasAllowance, isEth, toBN, parseUnits, mulBy1_3, } from "../../utils.js";
 // @ts-ignore
-async function _swapWrappedCheck(inputCoin, outputCoin, amount, estimateGas = false) {
-    // @ts-ignore
-    const i = this._getCoinIdx(inputCoin, false);
-    // @ts-ignore
-    const j = this._getCoinIdx(outputCoin, false);
-    const inputCoinBalance = Object.values(await this.wallet.wrappedCoinBalances())[i];
-    if (Number(inputCoinBalance) < Number(amount)) {
-        throw Error(`Not enough ${this.wrappedCoins[i]}. Actual: ${inputCoinBalance}, required: ${amount}`);
-    }
-    if (estimateGas && !(await hasAllowance([this.wrappedCoinAddresses[i]], [amount], curve.signerAddress, this.address))) {
-        throw Error("Token allowance is needed to estimate gas");
-    }
-    if (!estimateGas)
-        await curve.updateFeeData();
-    const _amount = parseUnits(amount, this.wrappedDecimals[i]);
-    return [i, j, _amount];
+function _swapWrappedCheck(inputCoin, outputCoin, amount, estimateGas) {
+    if (estimateGas === void 0) { estimateGas = false; }
+    return __awaiter(this, void 0, void 0, function () {
+        var i, j, inputCoinBalance, _a, _b, _c, _amount;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    i = this._getCoinIdx(inputCoin, false);
+                    j = this._getCoinIdx(outputCoin, false);
+                    _b = (_a = Object).values;
+                    return [4 /*yield*/, this.wallet.wrappedCoinBalances()];
+                case 1:
+                    inputCoinBalance = _b.apply(_a, [_d.sent()])[i];
+                    if (Number(inputCoinBalance) < Number(amount)) {
+                        throw Error("Not enough ".concat(this.wrappedCoins[i], ". Actual: ").concat(inputCoinBalance, ", required: ").concat(amount));
+                    }
+                    _c = estimateGas;
+                    if (!_c) return [3 /*break*/, 3];
+                    return [4 /*yield*/, hasAllowance([this.wrappedCoinAddresses[i]], [amount], curve.signerAddress, this.address)];
+                case 2:
+                    _c = !(_d.sent());
+                    _d.label = 3;
+                case 3:
+                    if (_c) {
+                        throw Error("Token allowance is needed to estimate gas");
+                    }
+                    if (!!estimateGas) return [3 /*break*/, 5];
+                    return [4 /*yield*/, curve.updateFeeData()];
+                case 4:
+                    _d.sent();
+                    _d.label = 5;
+                case 5:
+                    _amount = parseUnits(amount, this.wrappedDecimals[i]);
+                    return [2 /*return*/, [i, j, _amount]];
+            }
+        });
+    });
 }
-async function _swapWrappedMinAmount(i, j, _amount, slippage = 0.5) {
-    // @ts-ignore
-    const _expected = await this._swapWrappedExpected(i, j, _amount);
-    const [outputCoinDecimals] = _getCoinDecimals(this.wrappedCoinAddresses[j]);
-    const minAmountBN = toBN(_expected, outputCoinDecimals).times(100 - slippage).div(100);
-    return fromBN(minAmountBN, outputCoinDecimals);
+function _swapWrappedMinAmount(i, j, _amount, slippage) {
+    if (slippage === void 0) { slippage = 0.5; }
+    return __awaiter(this, void 0, void 0, function () {
+        var _expected, outputCoinDecimals, minAmountBN;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, this._swapWrappedExpected(i, j, _amount)];
+                case 1:
+                    _expected = _a.sent();
+                    outputCoinDecimals = _getCoinDecimals(this.wrappedCoinAddresses[j])[0];
+                    minAmountBN = toBN(_expected, outputCoinDecimals).times(100 - slippage).div(100);
+                    return [2 /*return*/, fromBN(minAmountBN, outputCoinDecimals)];
+            }
+        });
+    });
 }
 // @ts-ignore
-export const swapWrappedTricrypto2Mixin = {
+export var swapWrappedTricrypto2Mixin = {
     // @ts-ignore
-    async _swapWrapped(i, j, _amount, slippage, estimateGas = false) {
-        if (!estimateGas)
-            await _ensureAllowance([this.wrappedCoinAddresses[i]], [_amount], this.address);
-        const _minRecvAmount = await _swapWrappedMinAmount.call(this, i, j, _amount, slippage);
-        const contract = curve.contracts[this.address].contract;
-        const value = isEth(this.wrappedCoinAddresses[i]) ? _amount : 0n;
-        const gas = await contract.exchange.estimateGas(i, j, _amount, _minRecvAmount, false, { ...curve.constantOptions, value });
-        if (estimateGas)
-            return Number(gas);
-        const gasLimit = mulBy1_3(gas);
-        return (await contract.exchange(i, j, _amount, _minRecvAmount, false, { ...curve.options, value, gasLimit })).hash;
+    _swapWrapped: function (i, j, _amount, slippage, estimateGas) {
+        if (estimateGas === void 0) { estimateGas = false; }
+        return __awaiter(this, void 0, void 0, function () {
+            var _minRecvAmount, contract, value, gas, gasLimit;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!!estimateGas) return [3 /*break*/, 2];
+                        return [4 /*yield*/, _ensureAllowance([this.wrappedCoinAddresses[i]], [_amount], this.address)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, _swapWrappedMinAmount.call(this, i, j, _amount, slippage)];
+                    case 3:
+                        _minRecvAmount = _a.sent();
+                        contract = curve.contracts[this.address].contract;
+                        value = isEth(this.wrappedCoinAddresses[i]) ? _amount : curve.parseUnits("0");
+                        return [4 /*yield*/, contract.exchange.estimateGas(i, j, _amount, _minRecvAmount, false, __assign(__assign({}, curve.constantOptions), { value: value }))];
+                    case 4:
+                        gas = _a.sent();
+                        if (estimateGas)
+                            return [2 /*return*/, Number(gas)];
+                        gasLimit = mulBy1_3(gas);
+                        return [4 /*yield*/, contract.exchange(i, j, _amount, _minRecvAmount, false, __assign(__assign({}, curve.options), { value: value, gasLimit: gasLimit }))];
+                    case 5: return [2 /*return*/, (_a.sent()).hash];
+                }
+            });
+        });
     },
-    async swapWrappedEstimateGas(inputCoin, outputCoin, amount) {
-        // @ts-ignore
-        const [i, j, _amount] = await _swapWrappedCheck.call(this, inputCoin, outputCoin, amount, true);
-        // @ts-ignore
-        return await this._swapWrapped(i, j, _amount, 0.1, true);
+    swapWrappedEstimateGas: 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*/, _swapWrappedCheck.call(this, inputCoin, outputCoin, amount, true)];
+                    case 1:
+                        _a = _b.sent(), i = _a[0], j = _a[1], _amount = _a[2];
+                        return [4 /*yield*/, this._swapWrapped(i, j, _amount, 0.1, true)];
+                    case 2: 
+                    // @ts-ignore
+                    return [2 /*return*/, _b.sent()];
+                }
+            });
+        });
     },
-    async swapWrapped(inputCoin, outputCoin, amount, slippage) {
-        // @ts-ignore
-        const [i, j, _amount] = await _swapWrappedCheck.call(this, inputCoin, outputCoin, amount);
-        // @ts-ignore
-        return await this._swapWrapped(i, j, _amount, slippage);
+    swapWrapped: 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*/, _swapWrappedCheck.call(this, inputCoin, outputCoin, amount)];
+                    case 1:
+                        _a = _b.sent(), i = _a[0], j = _a[1], _amount = _a[2];
+                        return [4 /*yield*/, this._swapWrapped(i, j, _amount, slippage)];
+                    case 2: 
+                    // @ts-ignore
+                    return [2 /*return*/, _b.sent()];
+                }
+            });
+        });
     },
 };
 // @ts-ignore
-export const swapWrappedMixin = {
+export var swapWrappedMixin = {
     // @ts-ignore
-    async _swapWrapped(i, j, _amount, slippage, estimateGas = false) {
-        if (!estimateGas)
-            await _ensureAllowance([this.wrappedCoinAddresses[i]], [_amount], this.address);
-        const _minRecvAmount = await _swapWrappedMinAmount.call(this, i, j, _amount, slippage);
-        const contract = curve.contracts[this.address].contract;
-        const value = isEth(this.wrappedCoinAddresses[i]) ? _amount : 0n;
-        const gas = await contract.exchange.estimateGas(i, j, _amount, _minRecvAmount, { ...curve.constantOptions, value });
-        if (estimateGas)
-            return Number(gas);
-        const gasLimit = curve.chainId === 137 && this.id === 'ren' ? gas * 140n / 100n : mulBy1_3(gas);
-        return (await contract.exchange(i, j, _amount, _minRecvAmount, { ...curve.options, value, gasLimit })).hash;
+    _swapWrapped: function (i, j, _amount, slippage, estimateGas) {
+        if (estimateGas === void 0) { estimateGas = false; }
+        return __awaiter(this, void 0, void 0, function () {
+            var _minRecvAmount, contract, value, gas, gasLimit;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!!estimateGas) return [3 /*break*/, 2];
+                        return [4 /*yield*/, _ensureAllowance([this.wrappedCoinAddresses[i]], [_amount], this.address)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, _swapWrappedMinAmount.call(this, i, j, _amount, slippage)];
+                    case 3:
+                        _minRecvAmount = _a.sent();
+                        contract = curve.contracts[this.address].contract;
+                        value = isEth(this.wrappedCoinAddresses[i]) ? _amount : curve.parseUnits("0");
+                        return [4 /*yield*/, contract.exchange.estimateGas(i, j, _amount, _minRecvAmount, __assign(__assign({}, curve.constantOptions), { value: value }))];
+                    case 4:
+                        gas = _a.sent();
+                        if (estimateGas)
+                            return [2 /*return*/, Number(gas)];
+                        gasLimit = curve.chainId === 137 && this.id === 'ren' ? gas * curve.parseUnits("140", 0) / curve.parseUnits("100", 0) : mulBy1_3(gas);
+                        return [4 /*yield*/, contract.exchange(i, j, _amount, _minRecvAmount, __assign(__assign({}, curve.options), { value: value, gasLimit: gasLimit }))];
+                    case 5: return [2 /*return*/, (_a.sent()).hash];
+                }
+            });
+        });
     },
-    async swapWrappedEstimateGas(inputCoin, outputCoin, amount) {
-        // @ts-ignore
-        const [i, j, _amount] = await _swapWrappedCheck.call(this, inputCoin, outputCoin, amount, true);
-        // @ts-ignore
-        return await this._swapWrapped(i, j, _amount, 0.1, true);
+    swapWrappedEstimateGas: 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*/, _swapWrappedCheck.call(this, inputCoin, outputCoin, amount, true)];
+                    case 1:
+                        _a = _b.sent(), i = _a[0], j = _a[1], _amount = _a[2];
+                        return [4 /*yield*/, this._swapWrapped(i, j, _amount, 0.1, true)];
+                    case 2: 
+                    // @ts-ignore
+                    return [2 /*return*/, _b.sent()];
+                }
+            });
+        });
     },
-    async swapWrapped(inputCoin, outputCoin, amount, slippage) {
-        // @ts-ignore
-        const [i, j, _amount] = await _swapWrappedCheck.call(this, inputCoin, outputCoin, amount);
-        // @ts-ignore
-        return await this._swapWrapped(i, j, _amount, slippage);
+    swapWrapped: 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*/, _swapWrappedCheck.call(this, inputCoin, outputCoin, amount)];
+                    case 1:
+                        _a = _b.sent(), i = _a[0], j = _a[1], _amount = _a[2];
+                        return [4 /*yield*/, this._swapWrapped(i, j, _amount, slippage)];
+                    case 2: 
+                    // @ts-ignore
+                    return [2 /*return*/, _b.sent()];
+                }
+            });
+        });
     },
 };
 // @ts-ignore
-export const swapWrappedExpectedAndApproveMixin = {
-    async swapWrappedExpected(inputCoin, outputCoin, amount) {
-        // @ts-ignore
-        const i = this._getCoinIdx(inputCoin, false);
-        // @ts-ignore
-        const j = this._getCoinIdx(outputCoin, false);
-        const _amount = parseUnits(amount, this.wrappedDecimals[i]);
-        // @ts-ignore
-        const _expected = await this._swapWrappedExpected(i, j, _amount);
-        return curve.formatUnits(_expected, this.wrappedDecimals[j]);
+export var swapWrappedExpectedAndApproveMixin = {
+    swapWrappedExpected: function (inputCoin, outputCoin, amount) {
+        return __awaiter(this, void 0, void 0, function () {
+            var i, j, _amount, _expected;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        i = this._getCoinIdx(inputCoin, false);
+                        j = this._getCoinIdx(outputCoin, false);
+                        _amount = parseUnits(amount, this.wrappedDecimals[i]);
+                        return [4 /*yield*/, this._swapWrappedExpected(i, j, _amount)];
+                    case 1:
+                        _expected = _a.sent();
+                        return [2 /*return*/, curve.formatUnits(_expected, this.wrappedDecimals[j])];
+                }
+            });
+        });
     },
-    async swapWrappedIsApproved(inputCoin, amount) {
-        // @ts-ignore
-        const i = this._getCoinIdx(inputCoin, false);
-        return await hasAllowance([this.wrappedCoinAddresses[i]], [amount], curve.signerAddress, this.address);
+    swapWrappedIsApproved: function (inputCoin, amount) {
+        return __awaiter(this, void 0, void 0, function () {
+            var i;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        i = this._getCoinIdx(inputCoin, false);
+                        return [4 /*yield*/, hasAllowance([this.wrappedCoinAddresses[i]], [amount], curve.signerAddress, this.address)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
     },
-    async swapWrappedApproveEstimateGas(inputCoin, amount) {
-        // @ts-ignore
-        const i = this._getCoinIdx(inputCoin, false);
-        return await ensureAllowanceEstimateGas([this.wrappedCoinAddresses[i]], [amount], this.address);
+    swapWrappedApproveEstimateGas: function (inputCoin, amount) {
+        return __awaiter(this, void 0, void 0, function () {
+            var i;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        i = this._getCoinIdx(inputCoin, false);
+                        return [4 /*yield*/, ensureAllowanceEstimateGas([this.wrappedCoinAddresses[i]], [amount], this.address)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
     },
-    async swapWrappedApprove(inputCoin, amount) {
-        // @ts-ignore
-        const i = this._getCoinIdx(inputCoin, false);
-        return await ensureAllowance([this.wrappedCoinAddresses[i]], [amount], this.address);
+    swapWrappedApprove: function (inputCoin, amount) {
+        return __awaiter(this, void 0, void 0, function () {
+            var i;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        i = this._getCoinIdx(inputCoin, false);
+                        return [4 /*yield*/, ensureAllowance([this.wrappedCoinAddresses[i]], [amount], this.address)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
     },
 };

package/lib/pools/mixins/withdrawExpectedMixins.js

@@ -1,38 +1,119 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import { curve } from "../../curve.js";
 import { parseUnits } from "../../utils.js";
 import { _calcExpectedAmounts, _calcExpectedUnderlyingAmountsMeta } from "./common.js";
 // @ts-ignore
-export const withdrawExpectedMixin = {
-    async withdrawExpected(lpTokenAmount) {
-        const _lpTokenAmount = parseUnits(lpTokenAmount);
-        const _expected = await _calcExpectedAmounts.call(this, _lpTokenAmount);
-        return _expected.map((amount, i) => curve.formatUnits(amount, this.underlyingDecimals[i]));
+export var withdrawExpectedMixin = {
+    withdrawExpected: function (lpTokenAmount) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _lpTokenAmount, _expected;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _lpTokenAmount = parseUnits(lpTokenAmount);
+                        return [4 /*yield*/, _calcExpectedAmounts.call(this, _lpTokenAmount)];
+                    case 1:
+                        _expected = _a.sent();
+                        return [2 /*return*/, _expected.map(function (amount, i) { return curve.formatUnits(amount, _this.underlyingDecimals[i]); })];
+                }
+            });
+        });
     },
 };
 // @ts-ignore
-export const withdrawExpectedLendingOrCryptoMixin = {
-    async withdrawExpected(lpTokenAmount) {
-        const _lpTokenAmount = parseUnits(lpTokenAmount);
-        const _expectedAmounts = await _calcExpectedAmounts.call(this, _lpTokenAmount);
-        // @ts-ignore
-        const _rates = await this._getRates();
-        const _expected = _expectedAmounts.map((_amount, i) => _amount * _rates[i] / (10n ** 18n));
-        return _expected.map((amount, i) => curve.formatUnits(amount, this.underlyingDecimals[i]));
+export var withdrawExpectedLendingOrCryptoMixin = {
+    withdrawExpected: function (lpTokenAmount) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _lpTokenAmount, _expectedAmounts, _rates, _expected;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _lpTokenAmount = parseUnits(lpTokenAmount);
+                        return [4 /*yield*/, _calcExpectedAmounts.call(this, _lpTokenAmount)];
+                    case 1:
+                        _expectedAmounts = _a.sent();
+                        return [4 /*yield*/, this._getRates()];
+                    case 2:
+                        _rates = _a.sent();
+                        _expected = _expectedAmounts.map(function (_amount, i) { return _amount * _rates[i] / curve.parseUnits(String(Math.pow(10, 18)), 0); });
+                        return [2 /*return*/, _expected.map(function (amount, i) { return curve.formatUnits(amount, _this.underlyingDecimals[i]); })];
+                }
+            });
+        });
     },
 };
 // @ts-ignore
-export const withdrawExpectedMetaMixin = {
-    async withdrawExpected(lpTokenAmount) {
-        const _lpTokenAmount = parseUnits(lpTokenAmount);
-        const _expected = await _calcExpectedUnderlyingAmountsMeta.call(this, _lpTokenAmount);
-        return _expected.map((amount, i) => curve.formatUnits(amount, this.underlyingDecimals[i]));
+export var withdrawExpectedMetaMixin = {
+    withdrawExpected: function (lpTokenAmount) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _lpTokenAmount, _expected;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _lpTokenAmount = parseUnits(lpTokenAmount);
+                        return [4 /*yield*/, _calcExpectedUnderlyingAmountsMeta.call(this, _lpTokenAmount)];
+                    case 1:
+                        _expected = _a.sent();
+                        return [2 /*return*/, _expected.map(function (amount, i) { return curve.formatUnits(amount, _this.underlyingDecimals[i]); })];
+                }
+            });
+        });
     },
 };
 // @ts-ignore
-export const withdrawWrappedExpectedMixin = {
-    async withdrawWrappedExpected(lpTokenAmount) {
-        const _lpTokenAmount = parseUnits(lpTokenAmount);
-        const _expected = await _calcExpectedAmounts.call(this, _lpTokenAmount);
-        return _expected.map((amount, i) => curve.formatUnits(amount, this.wrappedDecimals[i]));
+export var withdrawWrappedExpectedMixin = {
+    withdrawWrappedExpected: function (lpTokenAmount) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _lpTokenAmount, _expected;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _lpTokenAmount = parseUnits(lpTokenAmount);
+                        return [4 /*yield*/, _calcExpectedAmounts.call(this, _lpTokenAmount)];
+                    case 1:
+                        _expected = _a.sent();
+                        return [2 /*return*/, _expected.map(function (amount, i) { return curve.formatUnits(amount, _this.wrappedDecimals[i]); })];
+                }
+            });
+        });
     },
 };