@curvefi/api 2.66.30 → 2.67.0

package/lib/pools/mixins/swapMixins.js

@@ -7,185 +7,151 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { curve } from "../../curve.js";
-import { _ensureAllowance, _getCoinDecimals, fromBN, hasAllowance, isEth, toBN, parseUnits, mulBy1_3, DIGas, smartNumber } from '../../utils.js';
-// @ts-ignore
+import { _ensureAllowance, _getCoinDecimals, DIGas, fromBN, hasAllowance, isEth, mulBy1_3, parseUnits, smartNumber, toBN, } from '../../utils.js';
 function _swapCheck(inputCoin_1, outputCoin_1, amount_1) {
     return __awaiter(this, arguments, void 0, function* (inputCoin, outputCoin, amount, estimateGas = false) {
-        // @ts-ignore
         const contractAddress = this._swapContractAddress();
-        // @ts-ignore
         const i = this._getCoinIdx(inputCoin);
-        // @ts-ignore
         const j = this._getCoinIdx(outputCoin);
         const inputCoinBalance = Object.values(yield this.wallet.underlyingCoinBalances())[i];
         if (Number(inputCoinBalance) < Number(amount)) {
             throw Error(`Not enough ${this.underlyingCoins[i]}. Actual: ${inputCoinBalance}, required: ${amount}`);
         }
-        if (estimateGas && !(yield hasAllowance([this.underlyingCoinAddresses[i]], [amount], curve.signerAddress, contractAddress))) {
+        if (estimateGas && !(yield hasAllowance.call(this.curve, [this.underlyingCoinAddresses[i]], [amount], this.curve.signerAddress, contractAddress))) {
             throw Error("Token allowance is needed to estimate gas");
         }
         if (!estimateGas)
-            yield curve.updateFeeData();
+            yield this.curve.updateFeeData();
         const _amount = parseUnits(amount, this.underlyingDecimals[i]);
         return [i, j, _amount];
     });
 }
 function _swapMinAmount(i_1, j_1, _amount_1) {
     return __awaiter(this, arguments, void 0, function* (i, j, _amount, slippage = 0.5) {
-        // @ts-ignore
         const _expected = yield this._swapExpected(i, j, _amount);
-        const [outputCoinDecimals] = _getCoinDecimals(this.underlyingCoinAddresses[j]);
+        const [outputCoinDecimals] = _getCoinDecimals.call(this.curve, this.underlyingCoinAddresses[j]);
         const minAmountBN = toBN(_expected, outputCoinDecimals).times(100 - slippage).div(100);
         return fromBN(minAmountBN, outputCoinDecimals);
     });
 }
-// @ts-ignore
 export const swapTricrypto2Mixin = {
-    // @ts-ignore
     _swap(i_1, j_1, _amount_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (i, j, _amount, slippage, estimateGas = false) {
-            // @ts-ignore
             const contractAddress = this._swapContractAddress();
             if (!estimateGas)
-                yield _ensureAllowance([this.underlyingCoinAddresses[i]], [_amount], contractAddress);
+                yield _ensureAllowance.call(this.curve, [this.underlyingCoinAddresses[i]], [_amount], contractAddress);
             const _minRecvAmount = yield _swapMinAmount.call(this, i, j, _amount, slippage);
-            const contract = curve.contracts[contractAddress].contract;
+            const contract = this.curve.contracts[contractAddress].contract;
             const exchangeMethod = 'exchange_underlying' in contract ? 'exchange_underlying' : 'exchange';
-            const value = isEth(this.underlyingCoinAddresses[i]) ? _amount : curve.parseUnits("0");
-            const gas = yield contract[exchangeMethod].estimateGas(i, j, _amount, _minRecvAmount, true, Object.assign(Object.assign({}, curve.constantOptions), { value }));
+            const value = isEth(this.underlyingCoinAddresses[i]) ? _amount : this.curve.parseUnits("0");
+            const gas = yield contract[exchangeMethod].estimateGas(i, j, _amount, _minRecvAmount, true, Object.assign(Object.assign({}, this.curve.constantOptions), { value }));
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract[exchangeMethod](i, j, _amount, _minRecvAmount, true, Object.assign(Object.assign({}, curve.options), { value, gasLimit }))).hash;
+            return (yield contract[exchangeMethod](i, j, _amount, _minRecvAmount, true, Object.assign(Object.assign({}, this.curve.options), { value, gasLimit }))).hash;
         });
     },
     swapEstimateGas(inputCoin, outputCoin, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const [i, j, _amount] = yield _swapCheck.call(this, inputCoin, outputCoin, amount, true);
-            // @ts-ignore
-            return yield this._swap(i, j, _amount, 0.1, true);
+            return yield swapTricrypto2Mixin._swap.call(this, i, j, _amount, 0.1, true);
         });
     },
     swap(inputCoin, outputCoin, amount, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const [i, j, _amount] = yield _swapCheck.call(this, inputCoin, outputCoin, amount);
-            // @ts-ignore
-            return yield this._swap(i, j, _amount, slippage);
+            return yield swapTricrypto2Mixin._swap.call(this, i, j, _amount, slippage);
         });
     },
 };
-// @ts-ignore
 export const swapMetaFactoryMixin = {
-    // @ts-ignore
     _swap(i_1, j_1, _amount_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (i, j, _amount, slippage, estimateGas = false) {
-            // @ts-ignore
             const contractAddress = this._swapContractAddress();
             if (!estimateGas)
-                yield _ensureAllowance([this.underlyingCoinAddresses[i]], [_amount], contractAddress);
+                yield _ensureAllowance.call(this.curve, [this.underlyingCoinAddresses[i]], [_amount], contractAddress);
             const _minRecvAmount = yield _swapMinAmount.call(this, i, j, _amount, slippage);
-            const contract = curve.contracts[contractAddress].contract;
+            const contract = this.curve.contracts[contractAddress].contract;
             const exchangeMethod = 'exchange_underlying' in contract ? 'exchange_underlying' : 'exchange';
-            const value = isEth(this.underlyingCoinAddresses[i]) ? _amount : curve.parseUnits("0");
-            const gas = yield contract[exchangeMethod].estimateGas(this.address, i, j, _amount, _minRecvAmount, Object.assign(Object.assign({}, curve.constantOptions), { value }));
+            const value = isEth(this.underlyingCoinAddresses[i]) ? _amount : this.curve.parseUnits("0");
+            const gas = yield contract[exchangeMethod].estimateGas(this.address, i, j, _amount, _minRecvAmount, Object.assign(Object.assign({}, this.curve.constantOptions), { value }));
             if (estimateGas)
                 return smartNumber(gas);
-            const gasLimit = DIGas(gas) * curve.parseUnits("140", 0) / curve.parseUnits("100", 0);
-            return (yield contract[exchangeMethod](this.address, i, j, _amount, _minRecvAmount, Object.assign(Object.assign({}, curve.options), { value, gasLimit }))).hash;
+            const gasLimit = DIGas(gas) * this.curve.parseUnits("140", 0) / this.curve.parseUnits("100", 0);
+            return (yield contract[exchangeMethod](this.address, i, j, _amount, _minRecvAmount, Object.assign(Object.assign({}, this.curve.options), { value, gasLimit }))).hash;
         });
     },
     swapEstimateGas(inputCoin, outputCoin, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const [i, j, _amount] = yield _swapCheck.call(this, inputCoin, outputCoin, amount, true);
-            // @ts-ignore
-            return yield this._swap(i, j, _amount, 0.1, true);
+            return yield swapMetaFactoryMixin._swap.call(this, i, j, _amount, 0.1, true);
         });
     },
     swap(inputCoin, outputCoin, amount, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const [i, j, _amount] = yield _swapCheck.call(this, inputCoin, outputCoin, amount);
-            // @ts-ignore
-            return yield this._swap(i, j, _amount, slippage);
+            return yield swapMetaFactoryMixin._swap.call(this, i, j, _amount, slippage);
         });
     },
 };
-// @ts-ignore
 export const swapCryptoMetaFactoryMixin = {
-    // @ts-ignore
     _swap(i_1, j_1, _amount_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (i, j, _amount, slippage, estimateGas = false) {
-            // @ts-ignore
             const contractAddress = this._swapContractAddress();
             if (!estimateGas)
-                yield _ensureAllowance([this.underlyingCoinAddresses[i]], [_amount], contractAddress);
+                yield _ensureAllowance.call(this.curve, [this.underlyingCoinAddresses[i]], [_amount], contractAddress);
             const _minRecvAmount = yield _swapMinAmount.call(this, i, j, _amount, slippage);
-            const contract = curve.contracts[contractAddress].contract;
+            const contract = this.curve.contracts[contractAddress].contract;
             const exchangeMethod = 'exchange_underlying' in contract ? 'exchange_underlying' : 'exchange';
-            const value = isEth(this.underlyingCoinAddresses[i]) ? _amount : curve.parseUnits("0");
-            const gas = yield contract[exchangeMethod].estimateGas(this.address, i, j, _amount, _minRecvAmount, true, Object.assign(Object.assign({}, curve.constantOptions), { value }));
+            const value = isEth(this.underlyingCoinAddresses[i]) ? _amount : this.curve.parseUnits("0");
+            const gas = yield contract[exchangeMethod].estimateGas(this.address, i, j, _amount, _minRecvAmount, true, Object.assign(Object.assign({}, this.curve.constantOptions), { value }));
             if (estimateGas)
                 return smartNumber(gas);
-            const gasLimit = DIGas(gas) * curve.parseUnits("140", 0) / curve.parseUnits("100", 0);
-            return (yield contract[exchangeMethod](this.address, i, j, _amount, _minRecvAmount, true, Object.assign(Object.assign({}, curve.options), { value, gasLimit }))).hash;
+            const gasLimit = DIGas(gas) * this.curve.parseUnits("140", 0) / this.curve.parseUnits("100", 0);
+            return (yield contract[exchangeMethod](this.address, i, j, _amount, _minRecvAmount, true, Object.assign(Object.assign({}, this.curve.options), { value, gasLimit }))).hash;
         });
     },
     swapEstimateGas(inputCoin, outputCoin, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const [i, j, _amount] = yield _swapCheck.call(this, inputCoin, outputCoin, amount, true);
-            // @ts-ignore
-            return yield this._swap(i, j, _amount, 0.1, true);
+            return yield swapCryptoMetaFactoryMixin._swap.call(this, i, j, _amount, 0.1, true);
         });
     },
     swap(inputCoin, outputCoin, amount, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const [i, j, _amount] = yield _swapCheck.call(this, inputCoin, outputCoin, amount);
-            // @ts-ignore
-            return yield this._swap(i, j, _amount, slippage);
+            return yield swapCryptoMetaFactoryMixin._swap.call(this, i, j, _amount, slippage);
         });
     },
 };
-// @ts-ignore
 export const swapMixin = {
-    // @ts-ignore
     _swap(i_1, j_1, _amount_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (i, j, _amount, slippage, estimateGas = false) {
-            // @ts-ignore
             const contractAddress = this._swapContractAddress();
             if (!estimateGas)
-                yield _ensureAllowance([this.underlyingCoinAddresses[i]], [_amount], contractAddress);
+                yield _ensureAllowance.call(this.curve, [this.underlyingCoinAddresses[i]], [_amount], contractAddress);
             const _minRecvAmount = yield _swapMinAmount.call(this, i, j, _amount, slippage);
-            const contract = curve.contracts[contractAddress].contract;
+            const contract = this.curve.contracts[contractAddress].contract;
             const exchangeMethod = 'exchange_underlying' in contract ? 'exchange_underlying' : 'exchange';
-            const value = isEth(this.underlyingCoinAddresses[i]) ? _amount : curve.parseUnits("0");
-            const gas = yield contract[exchangeMethod].estimateGas(i, j, _amount, _minRecvAmount, Object.assign(Object.assign({}, curve.constantOptions), { value }));
+            const value = isEth(this.underlyingCoinAddresses[i]) ? _amount : this.curve.parseUnits("0");
+            const gas = yield contract[exchangeMethod].estimateGas(i, j, _amount, _minRecvAmount, Object.assign(Object.assign({}, this.curve.constantOptions), { value }));
             if (estimateGas)
                 return smartNumber(gas);
-            yield curve.updateFeeData();
-            const gasLimit = curve.chainId === 137 && this.id === 'ren' ? DIGas(gas) * curve.parseUnits("160", 0) / curve.parseUnits("100", 0) : mulBy1_3(DIGas(gas));
-            return (yield contract[exchangeMethod](i, j, _amount, _minRecvAmount, Object.assign(Object.assign({}, curve.options), { value, gasLimit }))).hash;
+            yield this.curve.updateFeeData();
+            const gasLimit = this.curve.chainId === 137 && this.id === 'ren' ? DIGas(gas) * this.curve.parseUnits("160", 0) / this.curve.parseUnits("100", 0) : mulBy1_3(DIGas(gas));
+            return (yield contract[exchangeMethod](i, j, _amount, _minRecvAmount, Object.assign(Object.assign({}, this.curve.options), { value, gasLimit }))).hash;
         });
     },
     swapEstimateGas(inputCoin, outputCoin, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const [i, j, _amount] = yield _swapCheck.call(this, inputCoin, outputCoin, amount, true);
-            // @ts-ignore
-            return yield this._swap(i, j, _amount, 0.1, true);
+            return yield swapMixin._swap.call(this, i, j, _amount, 0.1, true);
         });
     },
     swap(inputCoin, outputCoin, amount, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const [i, j, _amount] = yield _swapCheck.call(this, inputCoin, outputCoin, amount);
-            // @ts-ignore
-            return yield this._swap(i, j, _amount, slippage);
+            return yield swapMixin._swap.call(this, i, j, _amount, slippage);
         });
     },
 };

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

@@ -1,5 +1,20 @@
 import { PoolTemplate } from "../PoolTemplate.js";
-export declare const swapWrappedTricrypto2Mixin: PoolTemplate;
-export declare const swapWrappedMixin: PoolTemplate;
-export declare const swapWrappedExpectedAndApproveMixin: PoolTemplate;
-export declare const swapWrappedRequiredMixin: PoolTemplate;
+export declare const swapWrappedTricrypto2Mixin: {
+    _swapWrapped(this: PoolTemplate, i: number, j: number, _amount: bigint, slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    swapWrappedEstimateGas(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string): Promise<number>;
+    swapWrapped(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string, slippage?: number): Promise<string>;
+};
+export declare const swapWrappedMixin: {
+    _swapWrapped(this: PoolTemplate, i: number, j: number, _amount: bigint, slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    swapWrappedEstimateGas(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string): Promise<number>;
+    swapWrapped(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string, slippage?: number): Promise<string>;
+};
+export declare const swapWrappedExpectedAndApproveMixin: {
+    swapWrappedExpected(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string): Promise<string>;
+    swapWrappedIsApproved(this: PoolTemplate, inputCoin: string | number, amount: number | string): Promise<boolean>;
+    swapWrappedApproveEstimateGas(this: PoolTemplate, inputCoin: string | number, amount: number | string): Promise<number | number[]>;
+    swapWrappedApprove(this: PoolTemplate, inputCoin: string | number, amount: number | string): Promise<string[]>;
+};
+export declare const swapWrappedRequiredMixin: {
+    swapWrappedRequired(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string): Promise<string>;
+};

package/lib/pools/mixins/swapWrappedMixins.js

@@ -7,153 +7,125 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { curve } from "../../curve.js";
-import { _ensureAllowance, _getCoinDecimals, ensureAllowance, ensureAllowanceEstimateGas, fromBN, hasAllowance, isEth, toBN, parseUnits, mulBy1_3, DIGas, smartNumber } from '../../utils.js';
-// @ts-ignore
+import { _ensureAllowance, _getCoinDecimals, DIGas, ensureAllowance, ensureAllowanceEstimateGas, fromBN, hasAllowance, isEth, mulBy1_3, parseUnits, smartNumber, toBN, } from '../../utils.js';
 function _swapWrappedCheck(inputCoin_1, outputCoin_1, amount_1) {
     return __awaiter(this, arguments, void 0, function* (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(yield this.wallet.wrappedCoinBalances())[i];
         if (Number(inputCoinBalance) < Number(amount)) {
             throw Error(`Not enough ${this.wrappedCoins[i]}. Actual: ${inputCoinBalance}, required: ${amount}`);
         }
-        if (estimateGas && !(yield hasAllowance([this.wrappedCoinAddresses[i]], [amount], curve.signerAddress, this.address))) {
+        if (estimateGas && !(yield hasAllowance.call(this.curve, [this.wrappedCoinAddresses[i]], [amount], this.curve.signerAddress, this.address))) {
             throw Error("Token allowance is needed to estimate gas");
         }
         if (!estimateGas)
-            yield curve.updateFeeData();
+            yield this.curve.updateFeeData();
         const _amount = parseUnits(amount, this.wrappedDecimals[i]);
         return [i, j, _amount];
     });
 }
 function _swapWrappedMinAmount(i_1, j_1, _amount_1) {
     return __awaiter(this, arguments, void 0, function* (i, j, _amount, slippage = 0.5) {
-        // @ts-ignore
-        const _expected = yield this._swapWrappedExpected(i, j, _amount);
-        const [outputCoinDecimals] = _getCoinDecimals(this.wrappedCoinAddresses[j]);
+        const _expected = yield this._swapWrappedExpected.call(this, i, j, _amount);
+        const [outputCoinDecimals] = _getCoinDecimals.call(this.curve, this.wrappedCoinAddresses[j]);
         const minAmountBN = toBN(_expected, outputCoinDecimals).times(100 - slippage).div(100);
         return fromBN(minAmountBN, outputCoinDecimals);
     });
 }
-// @ts-ignore
 export const swapWrappedTricrypto2Mixin = {
-    // @ts-ignore
     _swapWrapped(i_1, j_1, _amount_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (i, j, _amount, slippage, estimateGas = false) {
             if (!estimateGas)
-                yield _ensureAllowance([this.wrappedCoinAddresses[i]], [_amount], this.address);
+                yield _ensureAllowance.call(this.curve, [this.wrappedCoinAddresses[i]], [_amount], this.address);
             const _minRecvAmount = yield _swapWrappedMinAmount.call(this, i, j, _amount, slippage);
-            const contract = curve.contracts[this.address].contract;
-            const value = isEth(this.wrappedCoinAddresses[i]) ? _amount : curve.parseUnits("0");
-            const gas = yield contract.exchange.estimateGas(i, j, _amount, _minRecvAmount, false, Object.assign(Object.assign({}, curve.constantOptions), { value }));
+            const contract = this.curve.contracts[this.address].contract;
+            const value = isEth(this.wrappedCoinAddresses[i]) ? _amount : this.curve.parseUnits("0");
+            const gas = yield contract.exchange.estimateGas(i, j, _amount, _minRecvAmount, false, Object.assign(Object.assign({}, this.curve.constantOptions), { value }));
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.exchange(i, j, _amount, _minRecvAmount, false, Object.assign(Object.assign({}, curve.options), { value, gasLimit }))).hash;
+            return (yield contract.exchange(i, j, _amount, _minRecvAmount, false, Object.assign(Object.assign({}, this.curve.options), { value, gasLimit }))).hash;
         });
     },
     swapWrappedEstimateGas(inputCoin, outputCoin, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const [i, j, _amount] = yield _swapWrappedCheck.call(this, inputCoin, outputCoin, amount, true);
-            // @ts-ignore
-            return yield this._swapWrapped(i, j, _amount, 0.1, true);
+            return yield swapWrappedTricrypto2Mixin._swapWrapped.call(this, i, j, _amount, 0.1, true);
         });
     },
     swapWrapped(inputCoin, outputCoin, amount, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const [i, j, _amount] = yield _swapWrappedCheck.call(this, inputCoin, outputCoin, amount);
-            // @ts-ignore
-            return yield this._swapWrapped(i, j, _amount, slippage);
+            return yield swapWrappedTricrypto2Mixin._swapWrapped.call(this, i, j, _amount, slippage);
         });
     },
 };
-// @ts-ignore
 export const swapWrappedMixin = {
-    // @ts-ignore
     _swapWrapped(i_1, j_1, _amount_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (i, j, _amount, slippage, estimateGas = false) {
             if (!estimateGas)
-                yield _ensureAllowance([this.wrappedCoinAddresses[i]], [_amount], this.address);
+                yield _ensureAllowance.call(this.curve, [this.wrappedCoinAddresses[i]], [_amount], this.address);
             const _minRecvAmount = yield _swapWrappedMinAmount.call(this, i, j, _amount, slippage);
-            const contract = curve.contracts[this.address].contract;
-            const value = isEth(this.wrappedCoinAddresses[i]) ? _amount : curve.parseUnits("0");
-            const gas = yield contract.exchange.estimateGas(i, j, _amount, _minRecvAmount, Object.assign(Object.assign({}, curve.constantOptions), { value }));
+            const contract = this.curve.contracts[this.address].contract;
+            const value = isEth(this.wrappedCoinAddresses[i]) ? _amount : this.curve.parseUnits("0");
+            const gas = yield contract.exchange.estimateGas(i, j, _amount, _minRecvAmount, Object.assign(Object.assign({}, this.curve.constantOptions), { value }));
             if (estimateGas)
                 return smartNumber(gas);
-            const gasLimit = curve.chainId === 137 && this.id === 'ren' ? DIGas(gas) * curve.parseUnits("140", 0) / curve.parseUnits("100", 0) : mulBy1_3(DIGas(gas));
-            return (yield contract.exchange(i, j, _amount, _minRecvAmount, Object.assign(Object.assign({}, curve.options), { value, gasLimit }))).hash;
+            const gasLimit = this.curve.chainId === 137 && this.id === 'ren' ? DIGas(gas) * this.curve.parseUnits("140", 0) / this.curve.parseUnits("100", 0) : mulBy1_3(DIGas(gas));
+            return (yield contract.exchange(i, j, _amount, _minRecvAmount, Object.assign(Object.assign({}, this.curve.options), { value, gasLimit }))).hash;
         });
     },
     swapWrappedEstimateGas(inputCoin, outputCoin, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const [i, j, _amount] = yield _swapWrappedCheck.call(this, inputCoin, outputCoin, amount, true);
-            // @ts-ignore
-            return yield this._swapWrapped(i, j, _amount, 0.1, true);
+            return yield swapWrappedMixin._swapWrapped.call(this, i, j, _amount, 0.1, true);
         });
     },
     swapWrapped(inputCoin, outputCoin, amount, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const [i, j, _amount] = yield _swapWrappedCheck.call(this, inputCoin, outputCoin, amount);
-            // @ts-ignore
-            return yield this._swapWrapped(i, j, _amount, slippage);
+            return yield swapWrappedMixin._swapWrapped.call(this, i, j, _amount, slippage);
         });
     },
 };
-// @ts-ignore
 export const swapWrappedExpectedAndApproveMixin = {
     swapWrappedExpected(inputCoin, outputCoin, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @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 = yield this._swapWrappedExpected(i, j, _amount);
-            return curve.formatUnits(_expected, this.wrappedDecimals[j]);
+            const _expected = yield this._swapWrappedExpected.call(this, i, j, _amount);
+            return this.curve.formatUnits(_expected, this.wrappedDecimals[j]);
         });
     },
     swapWrappedIsApproved(inputCoin, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
-            const i = this._getCoinIdx(inputCoin, false);
-            return yield hasAllowance([this.wrappedCoinAddresses[i]], [amount], curve.signerAddress, this.address);
+            const i = this._getCoinIdx.call(this, inputCoin, false);
+            return yield hasAllowance.call(this.curve, [this.wrappedCoinAddresses[i]], [amount], this.curve.signerAddress, this.address);
         });
     },
     swapWrappedApproveEstimateGas(inputCoin, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
-            const i = this._getCoinIdx(inputCoin, false);
-            return yield ensureAllowanceEstimateGas([this.wrappedCoinAddresses[i]], [amount], this.address);
+            const i = this._getCoinIdx.call(this, inputCoin, false);
+            return yield ensureAllowanceEstimateGas.call(this.curve, [this.wrappedCoinAddresses[i]], [amount], this.address);
         });
     },
     swapWrappedApprove(inputCoin, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
-            const i = this._getCoinIdx(inputCoin, false);
-            return yield ensureAllowance([this.wrappedCoinAddresses[i]], [amount], this.address);
+            const i = this._getCoinIdx.call(this, inputCoin, false);
+            return yield ensureAllowance.call(this.curve, [this.wrappedCoinAddresses[i]], [amount], this.address);
         });
     },
 };
-// @ts-ignore
 export const swapWrappedRequiredMixin = {
     swapWrappedRequired(inputCoin, outputCoin, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
-            const i = this._getCoinIdx(inputCoin, false);
-            // @ts-ignore
-            const j = this._getCoinIdx(outputCoin, false);
+            const i = this._getCoinIdx.call(this, inputCoin, false);
+            const j = this._getCoinIdx.call(this, outputCoin, false);
             const _amount = parseUnits(amount, this.wrappedDecimals[j]);
-            // @ts-ignore
-            const _required = yield this._swapRequired(i, j, _amount, false);
-            return curve.formatUnits(_required, this.wrappedDecimals[i]);
+            const _required = yield this._swapRequired.call(this, i, j, _amount, false);
+            return this.curve.formatUnits(_required, this.wrappedDecimals[i]);
         });
     },
 };

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

@@ -1,5 +1,13 @@
 import { PoolTemplate } from "../PoolTemplate.js";
-export declare const withdrawExpectedMixin: PoolTemplate;
-export declare const withdrawExpectedLendingOrCryptoMixin: PoolTemplate;
-export declare const withdrawExpectedMetaMixin: PoolTemplate;
-export declare const withdrawWrappedExpectedMixin: PoolTemplate;
+export declare const withdrawExpectedMixin: {
+    withdrawExpected(this: PoolTemplate, lpTokenAmount: number | string): Promise<string[]>;
+};
+export declare const withdrawExpectedLendingOrCryptoMixin: {
+    withdrawExpected(this: PoolTemplate, lpTokenAmount: number | string): Promise<string[]>;
+};
+export declare const withdrawExpectedMetaMixin: {
+    withdrawExpected(this: PoolTemplate, lpTokenAmount: number | string): Promise<string[]>;
+};
+export declare const withdrawWrappedExpectedMixin: {
+    withdrawWrappedExpected(this: PoolTemplate, lpTokenAmount: number | string): Promise<string[]>;
+};

package/lib/pools/mixins/withdrawExpectedMixins.js

@@ -7,49 +7,44 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { curve } from "../../curve.js";
 import { parseUnits } from "../../utils.js";
 import { _calcExpectedAmounts, _calcExpectedUnderlyingAmountsMeta } from "./common.js";
-// @ts-ignore
+import { formatUnits } from "../../constants/utils";
 export const withdrawExpectedMixin = {
     withdrawExpected(lpTokenAmount) {
         return __awaiter(this, void 0, void 0, function* () {
             const _lpTokenAmount = parseUnits(lpTokenAmount);
             const _expected = yield _calcExpectedAmounts.call(this, _lpTokenAmount);
-            return _expected.map((amount, i) => curve.formatUnits(amount, this.underlyingDecimals[i]));
+            return _expected.map((amount, i) => formatUnits(amount, this.underlyingDecimals[i]));
         });
     },
 };
-// @ts-ignore
 export const withdrawExpectedLendingOrCryptoMixin = {
     withdrawExpected(lpTokenAmount) {
         return __awaiter(this, void 0, void 0, function* () {
             const _lpTokenAmount = parseUnits(lpTokenAmount);
             const _expectedAmounts = yield _calcExpectedAmounts.call(this, _lpTokenAmount);
-            // @ts-ignore
             const _rates = yield this._getRates();
-            const _expected = _expectedAmounts.map((_amount, i) => _amount * _rates[i] / curve.parseUnits(String(Math.pow(10, 18)), 0));
-            return _expected.map((amount, i) => curve.formatUnits(amount, this.underlyingDecimals[i]));
+            const _expected = _expectedAmounts.map((_amount, i) => _amount * _rates[i] / parseUnits(String(Math.pow(10, 18)), 0));
+            return _expected.map((amount, i) => formatUnits(amount, this.underlyingDecimals[i]));
         });
     },
 };
-// @ts-ignore
 export const withdrawExpectedMetaMixin = {
     withdrawExpected(lpTokenAmount) {
         return __awaiter(this, void 0, void 0, function* () {
             const _lpTokenAmount = parseUnits(lpTokenAmount);
             const _expected = yield _calcExpectedUnderlyingAmountsMeta.call(this, _lpTokenAmount);
-            return _expected.map((amount, i) => curve.formatUnits(amount, this.underlyingDecimals[i]));
+            return _expected.map((amount, i) => formatUnits(amount, this.underlyingDecimals[i]));
         });
     },
 };
-// @ts-ignore
 export const withdrawWrappedExpectedMixin = {
     withdrawWrappedExpected(lpTokenAmount) {
         return __awaiter(this, void 0, void 0, function* () {
             const _lpTokenAmount = parseUnits(lpTokenAmount);
             const _expected = yield _calcExpectedAmounts.call(this, _lpTokenAmount);
-            return _expected.map((amount, i) => curve.formatUnits(amount, this.wrappedDecimals[i]));
+            return _expected.map((amount, i) => formatUnits(amount, this.wrappedDecimals[i]));
         });
     },
 };

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

@@ -1,5 +1,21 @@
 import { PoolTemplate } from "../PoolTemplate.js";
-export declare const withdrawImbalanceMetaFactoryMixin: PoolTemplate;
-export declare const withdrawImbalanceZapMixin: PoolTemplate;
-export declare const withdrawImbalanceLendingMixin: PoolTemplate;
-export declare const withdrawImbalancePlainMixin: PoolTemplate;
+export declare const withdrawImbalanceMetaFactoryMixin: {
+    _withdrawImbalance(this: PoolTemplate, _amounts: bigint[], slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    withdrawImbalanceEstimateGas(this: PoolTemplate, amounts: (number | string)[]): Promise<number>;
+    withdrawImbalance(this: PoolTemplate, amounts: (number | string)[], slippage?: number): Promise<string>;
+};
+export declare const withdrawImbalanceZapMixin: {
+    _withdrawImbalance(this: PoolTemplate, _amounts: bigint[], slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    withdrawImbalanceEstimateGas(this: PoolTemplate, amounts: (number | string)[]): Promise<number>;
+    withdrawImbalance(this: PoolTemplate, amounts: (number | string)[], slippage?: number): Promise<string>;
+};
+export declare const withdrawImbalanceLendingMixin: {
+    _withdrawImbalance(this: PoolTemplate, _amounts: bigint[], slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    withdrawImbalanceEstimateGas(this: PoolTemplate, amounts: (number | string)[]): Promise<number>;
+    withdrawImbalance(this: PoolTemplate, amounts: (number | string)[], slippage?: number): Promise<string>;
+};
+export declare const withdrawImbalancePlainMixin: {
+    _withdrawImbalance(this: PoolTemplate, _amounts: bigint[], slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    withdrawImbalanceEstimateGas(this: PoolTemplate, amounts: (number | string)[]): Promise<number>;
+    withdrawImbalance(this: PoolTemplate, amounts: (number | string)[], slippage?: number): Promise<string>;
+};