@curvefi/api 2.66.30 → 2.66.31

package/lib/pools/mixins/withdrawImbalanceMixins.js

@@ -7,9 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { curve } from "../../curve.js";
-import { _ensureAllowance, fromBN, hasAllowance, toBN, parseUnits, mulBy1_3, smartNumber, DIGas } from '../../utils.js';
-// @ts-ignore
+import { _ensureAllowance, DIGas, fromBN, hasAllowance, mulBy1_3, parseUnits, smartNumber, toBN } from '../../utils.js';
 function _withdrawImbalanceCheck(amounts_1) {
     return __awaiter(this, arguments, void 0, function* (amounts, estimateGas = false) {
         const lpTokenAmount = yield this.withdrawImbalanceExpected(amounts);
@@ -17,147 +15,122 @@ function _withdrawImbalanceCheck(amounts_1) {
         if (Number(lpTokenBalance) < Number(lpTokenAmount)) {
             throw Error(`Not enough LP tokens. Actual: ${lpTokenBalance}, required: ${lpTokenAmount}`);
         }
-        if (estimateGas && this.zap && !(yield hasAllowance([this.lpToken], [lpTokenAmount], curve.signerAddress, this.zap))) {
+        if (estimateGas && this.zap && !(yield hasAllowance.call(this.curve, [this.lpToken], [lpTokenAmount], this.curve.signerAddress, this.zap))) {
             throw Error("Token allowance is needed to estimate gas");
         }
         if (!estimateGas)
-            yield curve.updateFeeData();
+            yield this.curve.updateFeeData();
         return amounts.map((amount, i) => parseUnits(amount, this.underlyingDecimals[i]));
     });
 }
 function _withdrawImbalanceMaxBurnAmount(_amounts_1) {
     return __awaiter(this, arguments, void 0, function* (_amounts, slippage = 0.5) {
-        // @ts-ignore
         const _expectedLpTokenAmount = yield this._calcLpTokenAmount(_amounts, false);
         const maxBurnAmountBN = toBN(_expectedLpTokenAmount).times(100 + slippage).div(100);
         return fromBN(maxBurnAmountBN);
     });
 }
-// @ts-ignore
 export const withdrawImbalanceMetaFactoryMixin = {
-    // @ts-ignore
     _withdrawImbalance(_amounts_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_amounts, slippage, estimateGas = false) {
             const _maxBurnAmount = yield _withdrawImbalanceMaxBurnAmount.call(this, _amounts, slippage);
             if (!estimateGas)
-                yield _ensureAllowance([this.lpToken], [_maxBurnAmount], this.zap);
-            const contract = curve.contracts[this.zap].contract;
-            const gas = yield contract.remove_liquidity_imbalance.estimateGas(this.address, _amounts, _maxBurnAmount, curve.constantOptions);
+                yield _ensureAllowance.call(this.curve, [this.lpToken], [_maxBurnAmount], this.zap);
+            const contract = this.curve.contracts[this.zap].contract;
+            const gas = yield contract.remove_liquidity_imbalance.estimateGas(this.address, _amounts, _maxBurnAmount, this.curve.constantOptions);
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.remove_liquidity_imbalance(this.address, _amounts, _maxBurnAmount, Object.assign(Object.assign({}, curve.options), { gasLimit }))).hash;
+            return (yield contract.remove_liquidity_imbalance(this.address, _amounts, _maxBurnAmount, Object.assign(Object.assign({}, this.curve.options), { gasLimit }))).hash;
         });
     },
     withdrawImbalanceEstimateGas(amounts) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _withdrawImbalanceCheck.call(this, amounts, true);
-            // @ts-ignore
-            return yield this._withdrawImbalance(_amounts, 0.1, true);
+            return yield withdrawImbalanceMetaFactoryMixin._withdrawImbalance.call(this, _amounts, 0.1, true);
         });
     },
     withdrawImbalance(amounts, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _withdrawImbalanceCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._withdrawImbalance(_amounts, slippage);
+            return yield withdrawImbalanceMetaFactoryMixin._withdrawImbalance.call(this, _amounts, slippage);
         });
     },
 };
-// @ts-ignore
 export const withdrawImbalanceZapMixin = {
-    // @ts-ignore
     _withdrawImbalance(_amounts_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_amounts, slippage, estimateGas = false) {
             const _maxBurnAmount = yield _withdrawImbalanceMaxBurnAmount.call(this, _amounts, slippage);
             if (!estimateGas)
-                yield _ensureAllowance([this.lpToken], [_maxBurnAmount], this.zap);
-            const contract = curve.contracts[this.zap].contract;
-            const gas = yield contract.remove_liquidity_imbalance.estimateGas(_amounts, _maxBurnAmount, curve.constantOptions);
+                yield _ensureAllowance.call(this.curve, [this.lpToken], [_maxBurnAmount], this.zap);
+            const contract = this.curve.contracts[this.zap].contract;
+            const gas = yield contract.remove_liquidity_imbalance.estimateGas(_amounts, _maxBurnAmount, this.curve.constantOptions);
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.remove_liquidity_imbalance(_amounts, _maxBurnAmount, Object.assign(Object.assign({}, curve.options), { gasLimit }))).hash;
+            return (yield contract.remove_liquidity_imbalance(_amounts, _maxBurnAmount, Object.assign(Object.assign({}, this.curve.options), { gasLimit }))).hash;
         });
     },
     withdrawImbalanceEstimateGas(amounts) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _withdrawImbalanceCheck.call(this, amounts, true);
-            // @ts-ignore
-            return yield this._withdrawImbalance(_amounts, 0.1, true);
+            return yield withdrawImbalanceZapMixin._withdrawImbalance.call(this, _amounts, 0.1, true);
         });
     },
     withdrawImbalance(amounts, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _withdrawImbalanceCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._withdrawImbalance(_amounts, slippage);
+            return yield withdrawImbalanceZapMixin._withdrawImbalance.call(this, _amounts, slippage);
         });
     },
 };
-// @ts-ignore
 export const withdrawImbalanceLendingMixin = {
-    // @ts-ignore
     _withdrawImbalance(_amounts_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_amounts, slippage, estimateGas = false) {
             const _maxBurnAmount = yield _withdrawImbalanceMaxBurnAmount.call(this, _amounts, slippage);
-            const contract = curve.contracts[this.address].contract;
-            const gas = yield contract.remove_liquidity_imbalance.estimateGas(_amounts, _maxBurnAmount, true, curve.constantOptions);
+            const contract = this.curve.contracts[this.address].contract;
+            const gas = yield contract.remove_liquidity_imbalance.estimateGas(_amounts, _maxBurnAmount, true, this.curve.constantOptions);
             if (estimateGas)
                 return smartNumber(gas);
-            const gasLimit = curve.chainId === 137 && this.id === 'ren' ? gas * curve.parseUnits("140", 0) / curve.parseUnits("100", 0) : mulBy1_3(DIGas(gas));
-            return (yield contract.remove_liquidity_imbalance(_amounts, _maxBurnAmount, true, Object.assign(Object.assign({}, curve.options), { gasLimit }))).hash;
+            const gasLimit = this.curve.chainId === 137 && this.id === 'ren' ? gas * this.curve.parseUnits("140", 0) / this.curve.parseUnits("100", 0) : mulBy1_3(DIGas(gas));
+            return (yield contract.remove_liquidity_imbalance(_amounts, _maxBurnAmount, true, Object.assign(Object.assign({}, this.curve.options), { gasLimit }))).hash;
         });
     },
     withdrawImbalanceEstimateGas(amounts) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _withdrawImbalanceCheck.call(this, amounts, true);
-            // @ts-ignore
-            return yield this._withdrawImbalance(_amounts, 0.1, true);
+            return yield withdrawImbalanceLendingMixin._withdrawImbalance.call(this, _amounts, 0.1, true);
         });
     },
     withdrawImbalance(amounts, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _withdrawImbalanceCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._withdrawImbalance(_amounts, slippage);
+            return yield withdrawImbalanceLendingMixin._withdrawImbalance.call(this, _amounts, slippage);
         });
     },
 };
-// @ts-ignore
 export const withdrawImbalancePlainMixin = {
-    // @ts-ignore
     _withdrawImbalance(_amounts_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_amounts, slippage, estimateGas = false) {
             const _maxBurnAmount = yield _withdrawImbalanceMaxBurnAmount.call(this, _amounts, slippage);
-            const contract = curve.contracts[this.address].contract;
-            const gas = yield contract.remove_liquidity_imbalance.estimateGas(_amounts, _maxBurnAmount, curve.constantOptions);
+            const contract = this.curve.contracts[this.address].contract;
+            const gas = yield contract.remove_liquidity_imbalance.estimateGas(_amounts, _maxBurnAmount, this.curve.constantOptions);
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.remove_liquidity_imbalance(_amounts, _maxBurnAmount, Object.assign(Object.assign({}, curve.options), { gasLimit }))).hash;
+            return (yield contract.remove_liquidity_imbalance(_amounts, _maxBurnAmount, Object.assign(Object.assign({}, this.curve.options), { gasLimit }))).hash;
         });
     },
     withdrawImbalanceEstimateGas(amounts) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _withdrawImbalanceCheck.call(this, amounts, true);
-            // @ts-ignore
-            return yield this._withdrawImbalance(_amounts, 0.1, true);
+            return yield withdrawImbalancePlainMixin._withdrawImbalance.call(this, _amounts, 0.1, true);
         });
     },
     withdrawImbalance(amounts, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _withdrawImbalanceCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._withdrawImbalance(_amounts, slippage);
+            return yield withdrawImbalancePlainMixin._withdrawImbalance.call(this, _amounts, slippage);
         });
     },
 };

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

@@ -1,3 +1,11 @@
 import { PoolTemplate } from "../PoolTemplate.js";
-export declare const withdrawImbalanceWrapped2argsMixin: PoolTemplate;
-export declare const withdrawImbalanceWrapped3argsMixin: PoolTemplate;
+export declare const withdrawImbalanceWrapped2argsMixin: {
+    _withdrawImbalanceWrapped(this: PoolTemplate, _amounts: bigint[], slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    withdrawImbalanceWrappedEstimateGas(this: PoolTemplate, amounts: (number | string)[]): Promise<number>;
+    withdrawImbalanceWrapped(this: PoolTemplate, amounts: (number | string)[], slippage?: number): Promise<string>;
+};
+export declare const withdrawImbalanceWrapped3argsMixin: {
+    _withdrawImbalanceWrapped(this: PoolTemplate, _amounts: bigint[], slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    withdrawImbalanceWrappedEstimateGas(this: PoolTemplate, amounts: (number | string)[]): Promise<number>;
+    withdrawImbalanceWrapped(this: PoolTemplate, amounts: (number | string)[], slippage?: number): Promise<string>;
+};

package/lib/pools/mixins/withdrawImbalanceWrappedMixins.js

@@ -7,9 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { curve } from "../../curve.js";
 import { fromBN, toBN, parseUnits, mulBy1_3, smartNumber, DIGas } from '../../utils.js';
-// @ts-ignore
 function _withdrawImbalanceWrappedCheck(amounts) {
     return __awaiter(this, void 0, void 0, function* () {
         const lpTokenAmount = yield this.withdrawImbalanceWrappedExpected(amounts);
@@ -17,77 +15,64 @@ function _withdrawImbalanceWrappedCheck(amounts) {
         if (Number(lpTokenBalance) < Number(lpTokenAmount)) {
             throw Error(`Not enough LP tokens. Actual: ${lpTokenBalance}, required: ${lpTokenAmount}`);
         }
-        yield curve.updateFeeData();
+        yield this.curve.updateFeeData();
         return amounts.map((amount, i) => parseUnits(amount, this.wrappedDecimals[i]));
     });
 }
 function _withdrawImbalanceWrappedMaxBurnAmount(_amounts_1) {
     return __awaiter(this, arguments, void 0, function* (_amounts, slippage = 0.5) {
-        // @ts-ignore
         const _expectedLpTokenAmount = yield this._calcLpTokenAmount(_amounts, false, false);
         const maxBurnAmountBN = toBN(_expectedLpTokenAmount).times(100 + slippage).div(100);
         return fromBN(maxBurnAmountBN);
     });
 }
-// @ts-ignore
 export const withdrawImbalanceWrapped2argsMixin = {
-    // @ts-ignore
     _withdrawImbalanceWrapped(_amounts_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_amounts, slippage, estimateGas = false) {
             const _maxBurnAmount = yield _withdrawImbalanceWrappedMaxBurnAmount.call(this, _amounts, slippage);
-            const contract = curve.contracts[this.address].contract;
-            const gas = yield contract.remove_liquidity_imbalance.estimateGas(_amounts, _maxBurnAmount, curve.constantOptions);
+            const contract = this.curve.contracts[this.address].contract;
+            const gas = yield contract.remove_liquidity_imbalance.estimateGas(_amounts, _maxBurnAmount, this.curve.constantOptions);
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.remove_liquidity_imbalance(_amounts, _maxBurnAmount, Object.assign(Object.assign({}, curve.options), { gasLimit }))).hash;
+            return (yield contract.remove_liquidity_imbalance(_amounts, _maxBurnAmount, Object.assign(Object.assign({}, this.curve.options), { gasLimit }))).hash;
         });
     },
     withdrawImbalanceWrappedEstimateGas(amounts) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _withdrawImbalanceWrappedCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._withdrawImbalanceWrapped(_amounts, 0.1, true);
+            return yield withdrawImbalanceWrapped2argsMixin._withdrawImbalanceWrapped.call(this, _amounts, 0.1, true);
         });
     },
     withdrawImbalanceWrapped(amounts, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _withdrawImbalanceWrappedCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._withdrawImbalanceWrapped(_amounts, slippage);
+            return yield withdrawImbalanceWrapped2argsMixin._withdrawImbalanceWrapped.call(this, _amounts, slippage);
         });
     },
 };
-// @ts-ignore
 export const withdrawImbalanceWrapped3argsMixin = {
-    // @ts-ignore
     _withdrawImbalanceWrapped(_amounts_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_amounts, slippage, estimateGas = false) {
             const _maxBurnAmount = yield _withdrawImbalanceWrappedMaxBurnAmount.call(this, _amounts, slippage);
-            const contract = curve.contracts[this.address].contract;
-            const gas = yield contract.remove_liquidity_imbalance.estimateGas(_amounts, _maxBurnAmount, false, curve.constantOptions);
+            const contract = this.curve.contracts[this.address].contract;
+            const gas = yield contract.remove_liquidity_imbalance.estimateGas(_amounts, _maxBurnAmount, false, this.curve.constantOptions);
             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.remove_liquidity_imbalance(_amounts, _maxBurnAmount, false, Object.assign(Object.assign({}, curve.options), { 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.remove_liquidity_imbalance(_amounts, _maxBurnAmount, false, Object.assign(Object.assign({}, this.curve.options), { gasLimit }))).hash;
         });
     },
     withdrawImbalanceWrappedEstimateGas(amounts) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _withdrawImbalanceWrappedCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._withdrawImbalanceWrapped(_amounts, 0.1, true);
+            return yield withdrawImbalanceWrapped3argsMixin._withdrawImbalanceWrapped.call(this, _amounts, 0.1, true);
         });
     },
     withdrawImbalanceWrapped(amounts, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _withdrawImbalanceWrappedCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._withdrawImbalanceWrapped(_amounts, slippage);
+            return yield withdrawImbalanceWrapped3argsMixin._withdrawImbalanceWrapped.call(this, _amounts, slippage);
         });
     },
 };

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

@@ -1,6 +1,26 @@
 import { PoolTemplate } from "../PoolTemplate.js";
-export declare const withdrawMetaFactoryMixin: PoolTemplate;
-export declare const withdrawCryptoMetaFactoryMixin: PoolTemplate;
-export declare const withdrawZapMixin: PoolTemplate;
-export declare const withdrawLendingOrCryptoMixin: PoolTemplate;
-export declare const withdrawPlainMixin: PoolTemplate;
+export declare const withdrawMetaFactoryMixin: {
+    _withdraw(this: PoolTemplate, _lpTokenAmount: bigint, slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    withdrawEstimateGas(this: PoolTemplate, lpTokenAmount: number | string): Promise<number | number[]>;
+    withdraw(this: PoolTemplate, lpTokenAmount: number | string, slippage?: number): Promise<string>;
+};
+export declare const withdrawCryptoMetaFactoryMixin: {
+    _withdraw(this: PoolTemplate, _lpTokenAmount: bigint, slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    withdrawEstimateGas(this: PoolTemplate, lpTokenAmount: number | string): Promise<number | number[]>;
+    withdraw(this: PoolTemplate, lpTokenAmount: number | string, slippage?: number): Promise<string>;
+};
+export declare const withdrawZapMixin: {
+    _withdraw(this: PoolTemplate, _lpTokenAmount: bigint, slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    withdrawEstimateGas(this: PoolTemplate, lpTokenAmount: number | string): Promise<number | number[]>;
+    withdraw(this: PoolTemplate, lpTokenAmount: number | string, slippage?: number): Promise<string>;
+};
+export declare const withdrawLendingOrCryptoMixin: {
+    _withdraw(this: PoolTemplate, _lpTokenAmount: bigint, slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    withdrawEstimateGas(this: PoolTemplate, lpTokenAmount: number | string): Promise<number | number[]>;
+    withdraw(this: PoolTemplate, lpTokenAmount: number | string, slippage?: number): Promise<string>;
+};
+export declare const withdrawPlainMixin: {
+    _withdraw(this: PoolTemplate, _lpTokenAmount: bigint, slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    withdrawEstimateGas(this: PoolTemplate, lpTokenAmount: number | string): Promise<number | number[]>;
+    withdraw(this: PoolTemplate, lpTokenAmount: number | string, slippage?: number): Promise<string>;
+};

package/lib/pools/mixins/withdrawMixins.js

@@ -7,194 +7,160 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { curve } from "../../curve.js";
-import { _ensureAllowance, fromBN, hasAllowance, toBN, parseUnits, mulBy1_3, smartNumber, DIGas } from '../../utils.js';
-// @ts-ignore
+import { _ensureAllowance, DIGas, fromBN, hasAllowance, mulBy1_3, parseUnits, smartNumber, toBN } from '../../utils.js';
 function _withdrawCheck(lpTokenAmount_1) {
     return __awaiter(this, arguments, void 0, function* (lpTokenAmount, estimateGas = false) {
         const lpTokenBalance = (yield this.wallet.lpTokenBalances())['lpToken'];
         if (Number(lpTokenBalance) < Number(lpTokenAmount)) {
             throw Error(`Not enough LP tokens. Actual: ${lpTokenBalance}, required: ${lpTokenAmount}`);
         }
-        if (estimateGas && this.zap && !(yield hasAllowance([this.lpToken], [lpTokenAmount], curve.signerAddress, this.zap))) {
+        if (estimateGas && this.zap && !(yield hasAllowance.call(this.curve, [this.lpToken], [lpTokenAmount], this.curve.signerAddress, this.zap))) {
             throw Error("Token allowance is needed to estimate gas");
         }
         if (!estimateGas)
-            yield curve.updateFeeData();
+            yield this.curve.updateFeeData();
         return parseUnits(lpTokenAmount);
     });
 }
 function _withdrawMinAmounts(_lpTokenAmount_1) {
     return __awaiter(this, arguments, void 0, function* (_lpTokenAmount, slippage = 0.5) {
-        const expectedAmounts = yield this.withdrawExpected(curve.formatUnits(_lpTokenAmount));
-        const _expectedAmounts = expectedAmounts.map((a, i) => curve.parseUnits(a, this.underlyingDecimals[i]));
+        const expectedAmounts = yield this.withdrawExpected(this.curve.formatUnits(_lpTokenAmount));
+        const _expectedAmounts = expectedAmounts.map((a, i) => this.curve.parseUnits(a, this.underlyingDecimals[i]));
         const minRecvAmountsBN = _expectedAmounts.map((_a, i) => toBN(_a, this.underlyingDecimals[i]).times(100 - slippage).div(100));
         return minRecvAmountsBN.map((a, i) => fromBN(a, this.underlyingDecimals[i]));
     });
 }
-// @ts-ignore
 export const withdrawMetaFactoryMixin = {
-    // @ts-ignore
     _withdraw(_lpTokenAmount_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_lpTokenAmount, slippage, estimateGas = false) {
             if (!estimateGas)
-                yield _ensureAllowance([this.lpToken], [_lpTokenAmount], this.zap);
+                yield _ensureAllowance.bind(this.curve, [this.lpToken], [_lpTokenAmount], this.zap);
             const _minAmounts = yield _withdrawMinAmounts.call(this, _lpTokenAmount, slippage);
-            const contract = curve.contracts[this.zap].contract;
-            const gas = yield contract.remove_liquidity.estimateGas(this.address, _lpTokenAmount, _minAmounts, curve.constantOptions);
+            const contract = this.curve.contracts[this.zap].contract;
+            const gas = yield contract.remove_liquidity.estimateGas(this.address, _lpTokenAmount, _minAmounts, this.curve.constantOptions);
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.remove_liquidity(this.address, _lpTokenAmount, _minAmounts, Object.assign(Object.assign({}, curve.options), { gasLimit }))).hash;
+            return (yield contract.remove_liquidity(this.address, _lpTokenAmount, _minAmounts, Object.assign(Object.assign({}, this.curve.options), { gasLimit }))).hash;
         });
     },
     withdrawEstimateGas(lpTokenAmount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _lpTokenAmount = yield _withdrawCheck.call(this, lpTokenAmount, true);
-            // @ts-ignore
-            return yield this._withdraw(_lpTokenAmount, 0.1, true);
+            return yield withdrawMetaFactoryMixin._withdraw.call(this, _lpTokenAmount, 0.1, true);
         });
     },
     withdraw(lpTokenAmount, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _lpTokenAmount = yield _withdrawCheck.call(this, lpTokenAmount);
-            // @ts-ignore
-            return yield this._withdraw(_lpTokenAmount, slippage);
+            return yield withdrawMetaFactoryMixin._withdraw.call(this, _lpTokenAmount, slippage);
         });
     },
 };
-// @ts-ignore
 export const withdrawCryptoMetaFactoryMixin = {
-    // @ts-ignore
     _withdraw(_lpTokenAmount_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_lpTokenAmount, slippage, estimateGas = false) {
             if (!estimateGas)
-                yield _ensureAllowance([this.lpToken], [_lpTokenAmount], this.zap);
+                yield _ensureAllowance.bind(this.curve, [this.lpToken], [_lpTokenAmount], this.zap);
             const _minAmounts = yield _withdrawMinAmounts.call(this, _lpTokenAmount, slippage);
-            const contract = curve.contracts[this.zap].contract;
-            const gas = yield contract.remove_liquidity.estimateGas(this.address, _lpTokenAmount, _minAmounts, true, curve.constantOptions);
+            const contract = this.curve.contracts[this.zap].contract;
+            const gas = yield contract.remove_liquidity.estimateGas(this.address, _lpTokenAmount, _minAmounts, true, this.curve.constantOptions);
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.remove_liquidity(this.address, _lpTokenAmount, _minAmounts, true, Object.assign(Object.assign({}, curve.options), { gasLimit }))).hash;
+            return (yield contract.remove_liquidity(this.address, _lpTokenAmount, _minAmounts, true, Object.assign(Object.assign({}, this.curve.options), { gasLimit }))).hash;
         });
     },
     withdrawEstimateGas(lpTokenAmount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _lpTokenAmount = yield _withdrawCheck.call(this, lpTokenAmount, true);
-            // @ts-ignore
-            return yield this._withdraw(_lpTokenAmount, 0.1, true);
+            return yield withdrawCryptoMetaFactoryMixin._withdraw.call(this, _lpTokenAmount, 0.1, true);
         });
     },
     withdraw(lpTokenAmount, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _lpTokenAmount = yield _withdrawCheck.call(this, lpTokenAmount);
-            // @ts-ignore
-            return yield this._withdraw(_lpTokenAmount, slippage);
+            return yield withdrawCryptoMetaFactoryMixin._withdraw.call(this, _lpTokenAmount, slippage);
         });
     },
 };
-// @ts-ignore
 export const withdrawZapMixin = {
-    // @ts-ignore
     _withdraw(_lpTokenAmount_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_lpTokenAmount, slippage, estimateGas = false) {
             if (!estimateGas)
-                yield _ensureAllowance([this.lpToken], [_lpTokenAmount], this.zap);
-            // @ts-ignore
+                yield _ensureAllowance.bind(this.curve, [this.lpToken], [_lpTokenAmount], this.zap);
             const _minAmounts = yield _withdrawMinAmounts.call(this, _lpTokenAmount, slippage);
-            const contract = curve.contracts[this.zap].contract;
+            const contract = this.curve.contracts[this.zap].contract;
             const args = [_lpTokenAmount, _minAmounts];
             if (`remove_liquidity(uint256,uint256[${this.underlyingCoinAddresses.length}],bool)` in contract)
                 args.push(true);
-            const gas = yield contract.remove_liquidity.estimateGas(...args, curve.constantOptions);
+            const gas = yield contract.remove_liquidity.estimateGas(...args, this.curve.constantOptions);
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.remove_liquidity(...args, Object.assign(Object.assign({}, curve.options), { gasLimit }))).hash;
+            return (yield contract.remove_liquidity(...args, Object.assign(Object.assign({}, this.curve.options), { gasLimit }))).hash;
         });
     },
     withdrawEstimateGas(lpTokenAmount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _lpTokenAmount = yield _withdrawCheck.call(this, lpTokenAmount, true);
-            // @ts-ignore
-            return yield this._withdraw(_lpTokenAmount, 0.1, true);
+            return yield withdrawZapMixin._withdraw.call(this, _lpTokenAmount, 0.1, true);
         });
     },
     withdraw(lpTokenAmount, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _lpTokenAmount = yield _withdrawCheck.call(this, lpTokenAmount);
-            // @ts-ignore
-            return yield this._withdraw(_lpTokenAmount, slippage);
+            return yield withdrawZapMixin._withdraw.call(this, _lpTokenAmount, slippage);
         });
     },
 };
-// @ts-ignore
 export const withdrawLendingOrCryptoMixin = {
-    // @ts-ignore
     _withdraw(_lpTokenAmount_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_lpTokenAmount, slippage, estimateGas = false) {
             const _minAmounts = yield _withdrawMinAmounts.call(this, _lpTokenAmount, slippage);
-            const contract = curve.contracts[this.address].contract;
-            const gas = yield contract.remove_liquidity.estimateGas(_lpTokenAmount, _minAmounts, true, curve.constantOptions);
+            const contract = this.curve.contracts[this.address].contract;
+            const gas = yield contract.remove_liquidity.estimateGas(_lpTokenAmount, _minAmounts, true, this.curve.constantOptions);
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.remove_liquidity(_lpTokenAmount, _minAmounts, true, Object.assign(Object.assign({}, curve.options), { gasLimit }))).hash;
+            return (yield contract.remove_liquidity(_lpTokenAmount, _minAmounts, true, Object.assign(Object.assign({}, this.curve.options), { gasLimit }))).hash;
         });
     },
     withdrawEstimateGas(lpTokenAmount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _lpTokenAmount = yield _withdrawCheck.call(this, lpTokenAmount, true);
-            // @ts-ignore
-            return yield this._withdraw(_lpTokenAmount, 0.1, true);
+            return yield withdrawLendingOrCryptoMixin._withdraw.call(this, _lpTokenAmount, 0.1, true);
         });
     },
     withdraw(lpTokenAmount, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _lpTokenAmount = yield _withdrawCheck.call(this, lpTokenAmount);
-            // @ts-ignore
-            return yield this._withdraw(_lpTokenAmount, slippage);
+            return yield withdrawLendingOrCryptoMixin._withdraw.call(this, _lpTokenAmount, slippage);
         });
     },
 };
-// @ts-ignore
 export const withdrawPlainMixin = {
-    // @ts-ignore
     _withdraw(_lpTokenAmount_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_lpTokenAmount, slippage, estimateGas = false) {
-            // @ts-ignore
             const _minAmounts = yield _withdrawMinAmounts.call(this, _lpTokenAmount, slippage);
-            const contract = curve.contracts[this.address].contract;
-            const gas = yield contract.remove_liquidity.estimateGas(_lpTokenAmount, _minAmounts, curve.constantOptions);
+            const contract = this.curve.contracts[this.address].contract;
+            const gas = yield contract.remove_liquidity.estimateGas(_lpTokenAmount, _minAmounts, this.curve.constantOptions);
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.remove_liquidity(_lpTokenAmount, _minAmounts, Object.assign(Object.assign({}, curve.options), { gasLimit }))).hash;
+            return (yield contract.remove_liquidity(_lpTokenAmount, _minAmounts, Object.assign(Object.assign({}, this.curve.options), { gasLimit }))).hash;
         });
     },
     withdrawEstimateGas(lpTokenAmount) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _lpTokenAmount = yield _withdrawCheck.call(this, lpTokenAmount, true);
-            // @ts-ignore
-            return yield this._withdraw(_lpTokenAmount, 0.1, true);
+            return yield withdrawPlainMixin._withdraw.call(this, _lpTokenAmount, 0.1, true);
         });
     },
     withdraw(lpTokenAmount, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _lpTokenAmount = yield _withdrawCheck.call(this, lpTokenAmount);
-            // @ts-ignore
-            return yield this._withdraw(_lpTokenAmount, slippage);
+            return yield withdrawPlainMixin._withdraw.call(this, _lpTokenAmount, slippage);
         });
     },
 };

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

@@ -1,5 +1,13 @@
 import { PoolTemplate } from "../PoolTemplate.js";
-export declare const withdrawOneCoinExpectedMetaFactoryMixin: PoolTemplate;
-export declare const withdrawOneCoinExpectedZapMixin: PoolTemplate;
-export declare const withdrawOneCoinExpected3argsMixin: PoolTemplate;
-export declare const withdrawOneCoinExpected2argsMixin: PoolTemplate;
+export declare const withdrawOneCoinExpectedMetaFactoryMixin: {
+    _withdrawOneCoinExpected(this: PoolTemplate, _lpTokenAmount: bigint, i: number): Promise<bigint>;
+};
+export declare const withdrawOneCoinExpectedZapMixin: {
+    _withdrawOneCoinExpected(this: PoolTemplate, _lpTokenAmount: bigint, i: number): Promise<bigint>;
+};
+export declare const withdrawOneCoinExpected3argsMixin: {
+    _withdrawOneCoinExpected(this: PoolTemplate, _lpTokenAmount: bigint, i: number): Promise<bigint>;
+};
+export declare const withdrawOneCoinExpected2argsMixin: {
+    _withdrawOneCoinExpected(this: PoolTemplate, _lpTokenAmount: bigint, i: number): Promise<bigint>;
+};

package/lib/pools/mixins/withdrawOneCoinExpectedMixins.js

@@ -7,40 +7,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { curve } from "../../curve.js";
-// @ts-ignore
 export const withdrawOneCoinExpectedMetaFactoryMixin = {
     _withdrawOneCoinExpected(_lpTokenAmount, i) {
         return __awaiter(this, void 0, void 0, function* () {
-            const contract = curve.contracts[this.zap].contract;
-            return yield contract.calc_withdraw_one_coin(this.address, _lpTokenAmount, i, curve.constantOptions);
+            const contract = this.curve.contracts[this.zap].contract;
+            return yield contract.calc_withdraw_one_coin(this.address, _lpTokenAmount, i, this.curve.constantOptions);
         });
     },
 };
-// @ts-ignore
 export const withdrawOneCoinExpectedZapMixin = {
     _withdrawOneCoinExpected(_lpTokenAmount, i) {
         return __awaiter(this, void 0, void 0, function* () {
-            const contract = curve.contracts[this.zap].contract;
-            return yield contract.calc_withdraw_one_coin(_lpTokenAmount, i, curve.constantOptions);
+            const contract = this.curve.contracts[this.zap].contract;
+            return yield contract.calc_withdraw_one_coin(_lpTokenAmount, i, this.curve.constantOptions);
         });
     },
 };
-// @ts-ignore
 export const withdrawOneCoinExpected3argsMixin = {
     _withdrawOneCoinExpected(_lpTokenAmount, i) {
         return __awaiter(this, void 0, void 0, function* () {
-            const contract = curve.contracts[this.address].contract;
-            return yield contract.calc_withdraw_one_coin(_lpTokenAmount, i, true, curve.constantOptions);
+            const contract = this.curve.contracts[this.address].contract;
+            return yield contract.calc_withdraw_one_coin(_lpTokenAmount, i, true, this.curve.constantOptions);
         });
     },
 };
-// @ts-ignore
 export const withdrawOneCoinExpected2argsMixin = {
     _withdrawOneCoinExpected(_lpTokenAmount, i) {
         return __awaiter(this, void 0, void 0, function* () {
-            const contract = curve.contracts[this.address].contract;
-            return yield contract.calc_withdraw_one_coin(_lpTokenAmount, i, curve.constantOptions);
+            const contract = this.curve.contracts[this.address].contract;
+            return yield contract.calc_withdraw_one_coin(_lpTokenAmount, i, this.curve.constantOptions);
         });
     },
 };