@curvefi/api 2.66.30 → 2.67.0

package/lib/pools/mixins/common.js

@@ -8,10 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { PoolTemplate } from "../PoolTemplate.js";
-import { curve } from "../../curve.js";
 import { fromBN, toBN } from "../../utils.js";
 export function _calcExpectedAmounts(_lpTokenAmount) {
     return __awaiter(this, void 0, void 0, function* () {
+        const { curve } = this;
         const coinBalancesBN = [];
         for (let i = 0; i < this.wrappedCoinAddresses.length; i++) {
             const _balance = yield curve.contracts[this.address].contract.balances(i, curve.constantOptions);
@@ -30,7 +30,7 @@ export function _calcExpectedUnderlyingAmountsMeta(_lpTokenAmount) {
         const _expectedWrappedAmounts = yield _calcExpectedAmounts.call(this, _lpTokenAmount);
         const [_expectedMetaCoinAmount] = _expectedWrappedAmounts.splice(this.metaCoinIdx, 1);
         const _expectedUnderlyingAmounts = _expectedWrappedAmounts;
-        const basePool = new PoolTemplate(this.basePool);
+        const basePool = new PoolTemplate(this.basePool, this.curve);
         const _basePoolExpectedAmounts = basePool.isMeta ?
             yield _calcExpectedUnderlyingAmountsMeta.call(basePool, _expectedMetaCoinAmount) :
             yield _calcExpectedAmounts.call(basePool, _expectedMetaCoinAmount);

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

@@ -1,5 +1,13 @@
 import { PoolTemplate } from "../PoolTemplate.js";
-export declare const depositBalancedAmountsMixin: PoolTemplate;
-export declare const depositBalancedAmountsCryptoMixin: PoolTemplate;
-export declare const depositWrappedBalancedAmountsMixin: PoolTemplate;
-export declare const depositWrappedBalancedAmountsCryptoMixin: PoolTemplate;
+export declare const depositBalancedAmountsMixin: {
+    depositBalancedAmounts(this: PoolTemplate): Promise<string[]>;
+};
+export declare const depositBalancedAmountsCryptoMixin: {
+    depositBalancedAmounts(this: PoolTemplate): Promise<string[]>;
+};
+export declare const depositWrappedBalancedAmountsMixin: {
+    depositWrappedBalancedAmounts(this: PoolTemplate): Promise<string[]>;
+};
+export declare const depositWrappedBalancedAmountsCryptoMixin: {
+    depositWrappedBalancedAmounts(this: PoolTemplate): Promise<string[]>;
+};

package/lib/pools/mixins/depositBalancedAmountsMixins.js

@@ -28,28 +28,21 @@ function _depositBalancedAmounts(poolBalances, walletBalances, decimals) {
     const bestScenario = balancedAmountsForEachScenarioBN[scenarioWithLowestBalancesBN];
     return bestScenario.map((a, i) => walletBalancesBN[i].isZero() ? "0" : a.toFixed(decimals[i]));
 }
-// @ts-ignore
 export const depositBalancedAmountsMixin = {
     depositBalancedAmounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const poolBalances = yield this.stats.underlyingBalances();
-            // @ts-ignore
             const walletBalances = Object.values(yield this.wallet.underlyingCoinBalances());
             const balancedAmountsBN = (_depositBalancedAmounts(poolBalances, walletBalances, this.underlyingDecimals));
             return balancedAmountsBN.map((b, i) => BigNumber.min(BN(b), BN(walletBalances[i])).toString());
         });
     },
 };
-// @ts-ignore
 export const depositBalancedAmountsCryptoMixin = {
     depositBalancedAmounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const poolBalances = yield this.stats.underlyingBalances();
-            // @ts-ignore
             const walletBalances = Object.values(yield this.wallet.underlyingCoinBalances());
-            // @ts-ignore
             const prices = yield this._underlyingPrices();
             const poolBalancesUSD = poolBalances.map((b, i) => BN(b).times(prices[i]).toString());
             const walletBalancesUSD = walletBalances.map((b, i) => BN(b).times(prices[i]).toString());
@@ -58,28 +51,21 @@ export const depositBalancedAmountsCryptoMixin = {
         });
     },
 };
-// @ts-ignore
 export const depositWrappedBalancedAmountsMixin = {
     depositWrappedBalancedAmounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const poolBalances = yield this.stats.wrappedBalances();
-            // @ts-ignore
             const walletBalances = Object.values(yield this.wallet.wrappedCoinBalances());
             const balancedAmountsBN = (_depositBalancedAmounts(poolBalances, walletBalances, this.underlyingDecimals));
             return balancedAmountsBN.map((b, i) => BigNumber.min(BN(b), BN(walletBalances[i])).toString());
         });
     },
 };
-// @ts-ignore
 export const depositWrappedBalancedAmountsCryptoMixin = {
     depositWrappedBalancedAmounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const poolBalances = (yield this.stats.wrappedBalances()).map(Number);
-            // @ts-ignore
-            const walletBalances = Object.values(yield this.walletWrappedCoinBalances()).map(Number);
-            // @ts-ignore
+            const walletBalances = Object.values(yield this.wallet.wrappedCoinBalances()).map(Number);
             const prices = yield this._wrappedPrices();
             const poolBalancesUSD = poolBalances.map((b, i) => BN(b).times(prices[i]).toString());
             const walletBalancesUSD = walletBalances.map((b, i) => BN(b).times(prices[i]).toString());

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

@@ -1,6 +1,26 @@
 import { PoolTemplate } from "../PoolTemplate.js";
-export declare const depositMetaFactoryMixin: PoolTemplate;
-export declare const depositCryptoMetaFactoryMixin: PoolTemplate;
-export declare const depositZapMixin: PoolTemplate;
-export declare const depositLendingOrCryptoMixin: PoolTemplate;
-export declare const depositPlainMixin: PoolTemplate;
+export declare const depositMetaFactoryMixin: {
+    _deposit(this: PoolTemplate, _amounts: bigint[], slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    depositEstimateGas(this: PoolTemplate, amounts: (number | string)[]): Promise<string | number | number[]>;
+    deposit(this: PoolTemplate, amounts: (number | string)[], slippage?: number): Promise<string | number | number[]>;
+};
+export declare const depositCryptoMetaFactoryMixin: {
+    _deposit(this: PoolTemplate, _amounts: bigint[], slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    depositEstimateGas(this: PoolTemplate, amounts: (number | string)[]): Promise<number | number[]>;
+    deposit(this: PoolTemplate, amounts: (number | string)[], slippage?: number): Promise<string>;
+};
+export declare const depositZapMixin: {
+    _deposit(this: PoolTemplate, _amounts: bigint[], slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    depositEstimateGas(this: PoolTemplate, amounts: (number | string)[]): Promise<number | number[]>;
+    deposit(this: PoolTemplate, amounts: (number | string)[], slippage?: number): Promise<string>;
+};
+export declare const depositLendingOrCryptoMixin: {
+    _deposit(this: PoolTemplate, _amounts: bigint[], slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    depositEstimateGas(this: PoolTemplate, amounts: (number | string)[]): Promise<number | number[]>;
+    deposit(this: PoolTemplate, amounts: (number | string)[], slippage?: number): Promise<string>;
+};
+export declare const depositPlainMixin: {
+    _deposit(this: PoolTemplate, _amounts: bigint[], slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    depositEstimateGas(this: PoolTemplate, amounts: (number | string)[]): Promise<number | number[]>;
+    deposit(this: PoolTemplate, amounts: (number | string)[], slippage?: number): Promise<string>;
+};

package/lib/pools/mixins/depositMixins.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, getEthIndex, hasAllowance, toBN, parseUnits, mulBy1_3, DIGas, smartNumber } from '../../utils.js';
-// @ts-ignore
+import { _ensureAllowance, DIGas, fromBN, getEthIndex, hasAllowance, mulBy1_3, parseUnits, smartNumber, toBN, } from '../../utils.js';
 function _depositCheck(amounts_1) {
     return __awaiter(this, arguments, void 0, function* (amounts, estimateGas = false) {
         if (amounts.length !== this.underlyingCoinAddresses.length) {
@@ -21,202 +19,166 @@ function _depositCheck(amounts_1) {
                 throw Error(`Not enough ${this.underlyingCoins[i]}. Actual: ${balances[i]}, required: ${amounts[i]}`);
             }
         }
-        if (estimateGas && !(yield hasAllowance(this.underlyingCoinAddresses, amounts, curve.signerAddress, this.zap || this.address))) {
+        if (estimateGas && !(yield hasAllowance.call(this.curve, this.underlyingCoinAddresses, amounts, this.curve.signerAddress, this.zap || this.address))) {
             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 _depositMinAmount(_amounts_1) {
     return __awaiter(this, arguments, void 0, function* (_amounts, slippage = 0.5) {
-        // @ts-ignore
         const _expectedLpTokenAmount = yield this._calcLpTokenAmount(_amounts);
         const minAmountBN = toBN(_expectedLpTokenAmount).times(100 - slippage).div(100);
         return fromBN(minAmountBN);
     });
 }
-// @ts-ignore
 export const depositMetaFactoryMixin = {
-    // @ts-ignore
     _deposit(_amounts_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_amounts, slippage, estimateGas = false) {
             if (!estimateGas)
-                yield _ensureAllowance(this.underlyingCoinAddresses, _amounts, this.zap);
-            // @ts-ignore
+                yield _ensureAllowance.call(this.curve, this.underlyingCoinAddresses, _amounts, this.zap);
             const _minMintAmount = yield _depositMinAmount.call(this, _amounts, slippage);
             const ethIndex = getEthIndex(this.underlyingCoinAddresses);
-            const value = _amounts[ethIndex] || curve.parseUnits("0");
-            const contract = curve.contracts[this.zap].contract;
-            const gas = yield contract.add_liquidity.estimateGas(this.address, _amounts, _minMintAmount, Object.assign(Object.assign({}, curve.constantOptions), { value }));
+            const value = _amounts[ethIndex] || parseUnits("0");
+            const contract = this.curve.contracts[this.zap].contract;
+            const gas = yield contract.add_liquidity.estimateGas(this.address, _amounts, _minMintAmount, Object.assign(Object.assign({}, this.curve.constantOptions), { value }));
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.add_liquidity(this.address, _amounts, _minMintAmount, Object.assign(Object.assign({}, curve.options), { gasLimit, value }))).hash;
+            return (yield contract.add_liquidity(this.address, _amounts, _minMintAmount, Object.assign(Object.assign({}, this.curve.options), { gasLimit, value }))).hash;
         });
     },
     depositEstimateGas(amounts) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositCheck.call(this, amounts, true);
-            // @ts-ignore
-            return yield this._deposit(_amounts, 0.1, true);
+            return yield depositMetaFactoryMixin._deposit.call(this, _amounts, 0.1, true);
         });
     },
     deposit(amounts, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._deposit(_amounts, slippage);
+            return yield depositMetaFactoryMixin._deposit.call(this, _amounts, slippage);
         });
     },
 };
-// @ts-ignore
 export const depositCryptoMetaFactoryMixin = {
-    // @ts-ignore
     _deposit(_amounts_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_amounts, slippage, estimateGas = false) {
             if (!estimateGas)
-                yield _ensureAllowance(this.underlyingCoinAddresses, _amounts, this.zap);
-            // @ts-ignore
+                yield _ensureAllowance.call(this.curve, this.underlyingCoinAddresses, _amounts, this.zap);
             const _minMintAmount = yield _depositMinAmount.call(this, _amounts, slippage);
             const ethIndex = getEthIndex(this.underlyingCoinAddresses);
-            const value = _amounts[ethIndex] || curve.parseUnits("0");
-            const contract = curve.contracts[this.zap].contract;
-            const gas = yield contract.add_liquidity.estimateGas(this.address, _amounts, _minMintAmount, true, Object.assign(Object.assign({}, curve.constantOptions), { value }));
+            const value = _amounts[ethIndex] || this.curve.parseUnits("0");
+            const contract = this.curve.contracts[this.zap].contract;
+            const gas = yield contract.add_liquidity.estimateGas(this.address, _amounts, _minMintAmount, true, Object.assign(Object.assign({}, this.curve.constantOptions), { value }));
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.add_liquidity(this.address, _amounts, _minMintAmount, true, Object.assign(Object.assign({}, curve.options), { gasLimit, value }))).hash;
+            return (yield contract.add_liquidity(this.address, _amounts, _minMintAmount, true, Object.assign(Object.assign({}, this.curve.options), { gasLimit, value }))).hash;
         });
     },
     depositEstimateGas(amounts) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositCheck.call(this, amounts, true);
-            // @ts-ignore
-            return yield this._deposit(_amounts, 0.1, true);
+            return yield depositCryptoMetaFactoryMixin._deposit.call(this, _amounts, 0.1, true);
         });
     },
     deposit(amounts, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._deposit(_amounts, slippage);
+            return yield depositCryptoMetaFactoryMixin._deposit.call(this, _amounts, slippage);
         });
     },
 };
-// @ts-ignore
 export const depositZapMixin = {
-    // @ts-ignore
     _deposit(_amounts_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_amounts, slippage, estimateGas = false) {
             if (!estimateGas)
-                yield _ensureAllowance(this.underlyingCoinAddresses, _amounts, this.zap);
-            // @ts-ignore
+                yield _ensureAllowance.call(this.curve, this.underlyingCoinAddresses, _amounts, this.zap);
             const _minMintAmount = yield _depositMinAmount.call(this, _amounts, slippage);
             const ethIndex = getEthIndex(this.underlyingCoinAddresses);
-            const value = _amounts[ethIndex] || curve.parseUnits("0");
-            const contract = curve.contracts[this.zap].contract;
+            const value = _amounts[ethIndex] || this.curve.parseUnits("0");
+            const contract = this.curve.contracts[this.zap].contract;
             const args = [_amounts, _minMintAmount];
             if (`add_liquidity(uint256[${this.underlyingCoinAddresses.length}],uint256,bool)` in contract)
                 args.push(true);
-            const gas = yield contract.add_liquidity.estimateGas(...args, Object.assign(Object.assign({}, curve.constantOptions), { value }));
+            const gas = yield contract.add_liquidity.estimateGas(...args, Object.assign(Object.assign({}, this.curve.constantOptions), { value }));
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.add_liquidity(...args, Object.assign(Object.assign({}, curve.options), { gasLimit, value }))).hash;
+            return (yield contract.add_liquidity(...args, Object.assign(Object.assign({}, this.curve.options), { gasLimit, value }))).hash;
         });
     },
     depositEstimateGas(amounts) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositCheck.call(this, amounts, true);
-            // @ts-ignore
-            return yield this._deposit(_amounts, 0.1, true);
+            return yield depositZapMixin._deposit.call(this, _amounts, 0.1, true);
         });
     },
     deposit(amounts, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._deposit(_amounts, slippage);
+            return yield depositZapMixin._deposit.call(this, _amounts, slippage);
         });
     },
 };
-// @ts-ignore
 export const depositLendingOrCryptoMixin = {
-    // @ts-ignore
     _deposit(_amounts_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_amounts, slippage, estimateGas = false) {
             if (!estimateGas)
-                yield _ensureAllowance(this.underlyingCoinAddresses, _amounts, this.address);
-            // @ts-ignore
+                yield _ensureAllowance.call(this.curve, this.underlyingCoinAddresses, _amounts, this.address);
             const _minMintAmount = yield _depositMinAmount.call(this, _amounts, slippage);
             const ethIndex = getEthIndex(this.underlyingCoinAddresses);
-            const value = _amounts[ethIndex] || curve.parseUnits("0");
-            const contract = curve.contracts[this.address].contract;
-            const gas = yield contract.add_liquidity.estimateGas(_amounts, _minMintAmount, true, Object.assign(Object.assign({}, curve.constantOptions), { value }));
+            const value = _amounts[ethIndex] || this.curve.parseUnits("0");
+            const contract = this.curve.contracts[this.address].contract;
+            const gas = yield contract.add_liquidity.estimateGas(_amounts, _minMintAmount, true, Object.assign(Object.assign({}, this.curve.constantOptions), { value }));
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.add_liquidity(_amounts, _minMintAmount, true, Object.assign(Object.assign({}, curve.options), { gasLimit, value }))).hash;
+            return (yield contract.add_liquidity(_amounts, _minMintAmount, true, Object.assign(Object.assign({}, this.curve.options), { gasLimit, value }))).hash;
         });
     },
     depositEstimateGas(amounts) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositCheck.call(this, amounts, true);
-            // @ts-ignore
-            return yield this._deposit(_amounts, 0.1, true);
+            return yield depositLendingOrCryptoMixin._deposit.call(this, _amounts, 0.1, true);
         });
     },
     deposit(amounts, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._deposit(_amounts, slippage);
+            return yield depositLendingOrCryptoMixin._deposit.call(this, _amounts, slippage);
         });
     },
 };
-// @ts-ignore
 export const depositPlainMixin = {
-    // @ts-ignore
     _deposit(_amounts_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_amounts, slippage, estimateGas = false) {
             if (!estimateGas)
-                yield _ensureAllowance(this.wrappedCoinAddresses, _amounts, this.address);
-            // @ts-ignore
+                yield _ensureAllowance.call(this.curve, this.wrappedCoinAddresses, _amounts, this.address);
             const _minMintAmount = yield _depositMinAmount.call(this, _amounts, slippage);
             const ethIndex = getEthIndex(this.wrappedCoinAddresses);
-            const value = _amounts[ethIndex] || curve.parseUnits("0");
-            const contract = curve.contracts[this.address].contract;
-            const gas = yield contract.add_liquidity.estimateGas(_amounts, _minMintAmount, Object.assign(Object.assign({}, curve.constantOptions), { value }));
+            const value = _amounts[ethIndex] || this.curve.parseUnits("0");
+            const contract = this.curve.contracts[this.address].contract;
+            const gas = yield contract.add_liquidity.estimateGas(_amounts, _minMintAmount, Object.assign(Object.assign({}, this.curve.constantOptions), { value }));
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.add_liquidity(_amounts, _minMintAmount, Object.assign(Object.assign({}, curve.options), { gasLimit, value }))).hash;
+            return (yield contract.add_liquidity(_amounts, _minMintAmount, Object.assign(Object.assign({}, this.curve.options), { gasLimit, value }))).hash;
         });
     },
     depositEstimateGas(amounts) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositCheck.call(this, amounts, true);
-            // @ts-ignore
-            return yield this._deposit(_amounts, 0.1, true);
+            return yield depositPlainMixin._deposit.call(this, _amounts, 0.1, true);
         });
     },
     deposit(amounts, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._deposit(_amounts, slippage);
+            return yield depositPlainMixin._deposit.call(this, _amounts, slippage);
         });
     },
 };

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

@@ -1,3 +1,11 @@
 import { PoolTemplate } from "../PoolTemplate.js";
-export declare const depositWrapped2argsMixin: PoolTemplate;
-export declare const depositWrapped3argsMixin: PoolTemplate;
+export declare const depositWrapped2argsMixin: {
+    _depositWrapped(this: PoolTemplate, _amounts: bigint[], slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    depositWrappedEstimateGas(this: PoolTemplate, amounts: (number | string)[]): Promise<number>;
+    depositWrapped(this: PoolTemplate, amounts: (number | string)[], slippage?: number): Promise<string>;
+};
+export declare const depositWrapped3argsMixin: {
+    _depositWrapped(this: PoolTemplate, _amounts: bigint[], slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    depositWrappedEstimateGas(this: PoolTemplate, amounts: (number | string)[]): Promise<number>;
+    depositWrapped(this: PoolTemplate, amounts: (number | string)[], slippage?: number): Promise<string>;
+};

package/lib/pools/mixins/depositWrappedMixins.js

@@ -7,8 +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, getEthIndex, hasAllowance, toBN, parseUnits, mulBy1_3, DIGas, smartNumber } from '../../utils.js';
+import { _ensureAllowance, DIGas, fromBN, getEthIndex, hasAllowance, mulBy1_3, parseUnits, smartNumber, toBN, } from '../../utils.js';
 function _depositWrappedCheck(amounts_1) {
     return __awaiter(this, arguments, void 0, function* (amounts, estimateGas = false) {
         if (this.isFake) {
@@ -23,91 +22,76 @@ function _depositWrappedCheck(amounts_1) {
                 throw Error(`Not enough ${this.wrappedCoins[i]}. Actual: ${balances[i]}, required: ${amounts[i]}`);
             }
         }
-        if (estimateGas && !(yield hasAllowance(this.wrappedCoinAddresses, amounts, curve.signerAddress, this.address))) {
+        if (estimateGas && !(yield hasAllowance.call(this.curve, this.wrappedCoinAddresses, amounts, this.curve.signerAddress, this.address))) {
             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.wrappedDecimals[i]));
     });
 }
 function _depositWrappedMinAmount(_amounts_1) {
     return __awaiter(this, arguments, void 0, function* (_amounts, slippage = 0.5) {
-        // @ts-ignore
         const _expectedLpTokenAmount = yield this._calcLpTokenAmount(_amounts, true, false);
         const minAmountBN = toBN(_expectedLpTokenAmount).times(100 - slippage).div(100);
         return fromBN(minAmountBN);
     });
 }
-// @ts-ignore
 export const depositWrapped2argsMixin = {
-    // @ts-ignore
     _depositWrapped(_amounts_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_amounts, slippage, estimateGas = false) {
             if (!estimateGas)
-                yield _ensureAllowance(this.wrappedCoinAddresses, _amounts, this.address);
-            // @ts-ignore
+                yield _ensureAllowance.call(this.curve, this.wrappedCoinAddresses, _amounts, this.address);
             const _minMintAmount = yield _depositWrappedMinAmount.call(this, _amounts, slippage);
             const ethIndex = getEthIndex(this.wrappedCoinAddresses);
-            const value = _amounts[ethIndex] || curve.parseUnits("0");
-            const contract = curve.contracts[this.address].contract;
-            const gas = yield contract.add_liquidity.estimateGas(_amounts, _minMintAmount, Object.assign(Object.assign({}, curve.constantOptions), { value }));
+            const value = _amounts[ethIndex] || this.curve.parseUnits("0");
+            const contract = this.curve.contracts[this.address].contract;
+            const gas = yield contract.add_liquidity.estimateGas(_amounts, _minMintAmount, Object.assign(Object.assign({}, this.curve.constantOptions), { value }));
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.add_liquidity(_amounts, _minMintAmount, Object.assign(Object.assign({}, curve.options), { gasLimit, value }))).hash;
+            return (yield contract.add_liquidity(_amounts, _minMintAmount, Object.assign(Object.assign({}, this.curve.options), { gasLimit, value }))).hash;
         });
     },
     depositWrappedEstimateGas(amounts) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositWrappedCheck.call(this, amounts, true);
-            // @ts-ignore
-            return yield this._depositWrapped(_amounts, 0.1, true);
+            return yield depositWrapped2argsMixin._depositWrapped.call(this, _amounts, 0.1, true);
         });
     },
     depositWrapped(amounts, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositWrappedCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._depositWrapped(_amounts, slippage);
+            return yield depositWrapped2argsMixin._depositWrapped.call(this, _amounts, slippage);
         });
     },
 };
-// @ts-ignore
 export const depositWrapped3argsMixin = {
-    // @ts-ignore
     _depositWrapped(_amounts_1, slippage_1) {
         return __awaiter(this, arguments, void 0, function* (_amounts, slippage, estimateGas = false) {
             if (!estimateGas)
-                yield _ensureAllowance(this.wrappedCoinAddresses, _amounts, this.address);
-            // @ts-ignore
+                yield _ensureAllowance.call(this.curve, this.wrappedCoinAddresses, _amounts, this.address);
             const _minMintAmount = yield _depositWrappedMinAmount.call(this, _amounts, slippage);
             const ethIndex = getEthIndex(this.wrappedCoinAddresses);
-            const value = _amounts[ethIndex] || curve.parseUnits("0");
-            const contract = curve.contracts[this.address].contract;
-            const gas = yield contract.add_liquidity.estimateGas(_amounts, _minMintAmount, false, Object.assign(Object.assign({}, curve.constantOptions), { value }));
+            const value = _amounts[ethIndex] || this.curve.parseUnits("0");
+            const contract = this.curve.contracts[this.address].contract;
+            const gas = yield contract.add_liquidity.estimateGas(_amounts, _minMintAmount, false, Object.assign(Object.assign({}, this.curve.constantOptions), { value }));
             if (estimateGas)
                 return smartNumber(gas);
             const gasLimit = mulBy1_3(DIGas(gas));
-            return (yield contract.add_liquidity(_amounts, _minMintAmount, false, Object.assign(Object.assign({}, curve.options), { gasLimit, value }))).hash;
+            return (yield contract.add_liquidity(_amounts, _minMintAmount, false, Object.assign(Object.assign({}, this.curve.options), { gasLimit, value }))).hash;
         });
     },
     depositWrappedEstimateGas(amounts) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositWrappedCheck.call(this, amounts, true);
-            // @ts-ignore
-            return yield this._depositWrapped(_amounts, 0.1, true);
+            return yield depositWrapped3argsMixin._depositWrapped.call(this, _amounts, 0.1, true);
         });
     },
     depositWrapped(amounts, slippage) {
         return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
             const _amounts = yield _depositWrappedCheck.call(this, amounts);
-            // @ts-ignore
-            return yield this._depositWrapped(_amounts, slippage);
+            return yield depositWrapped3argsMixin._depositWrapped.call(this, _amounts, slippage);
         });
     },
 };

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

@@ -1,3 +1,7 @@
 import { IStatsPool } from "../subClasses/statsPool";
-export declare const poolBalancesMetaMixin: IStatsPool;
-export declare const poolBalancesLendingMixin: IStatsPool;
+export declare const poolBalancesMetaMixin: {
+    underlyingBalances(this: IStatsPool): Promise<string[]>;
+};
+export declare const poolBalancesLendingMixin: {
+    underlyingBalances(this: IStatsPool): Promise<string[]>;
+};

package/lib/pools/mixins/poolBalancesMixin.js

@@ -7,19 +7,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { curve } from "../../curve.js";
 import { PoolTemplate } from "../PoolTemplate.js";
 import { _calcExpectedAmounts, _calcExpectedUnderlyingAmountsMeta } from "./common.js";
-// @ts-ignore
 export const poolBalancesMetaMixin = {
     underlyingBalances() {
         return __awaiter(this, void 0, void 0, function* () {
+            const curve = this.pool.curve;
             const swapContract = curve.contracts[this.pool.address].multicallContract;
             const contractCalls = this.pool.wrappedCoins.map((_, i) => swapContract.balances(i));
             const _poolWrappedBalances = yield curve.multicallProvider.all(contractCalls);
             const [_poolMetaCoinBalance] = _poolWrappedBalances.splice(this.pool.metaCoinIdx, 1);
             const _poolUnderlyingBalances = _poolWrappedBalances;
-            const basePool = new PoolTemplate(this.pool.basePool);
+            const basePool = new PoolTemplate(this.pool.basePool, curve);
             const _basePoolExpectedAmounts = basePool.isMeta ?
                 yield _calcExpectedUnderlyingAmountsMeta.call(basePool, _poolMetaCoinBalance) :
                 yield _calcExpectedAmounts.call(basePool, _poolMetaCoinBalance);
@@ -28,14 +27,13 @@ export const poolBalancesMetaMixin = {
         });
     },
 };
-// @ts-ignore
 export const poolBalancesLendingMixin = {
     underlyingBalances() {
         return __awaiter(this, void 0, void 0, function* () {
+            const curve = this.pool.curve;
             const swapContract = curve.contracts[this.pool.address].multicallContract;
             const contractCalls = this.pool.wrappedCoins.map((_, i) => swapContract.balances(i));
             const _poolWrappedBalances = yield curve.multicallProvider.all(contractCalls);
-            // @ts-ignore
             const _rates = yield this.pool._getRates();
             const _poolUnderlyingBalances = _poolWrappedBalances.map((_b, i) => _b * _rates[i] / curve.parseUnits(String(Math.pow(10, 18)), 0));
             return _poolUnderlyingBalances.map((_b, i) => curve.formatUnits(_b, this.pool.underlyingDecimals[i]));

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

@@ -1,5 +1,21 @@
 import { PoolTemplate } from "../PoolTemplate.js";
-export declare const swapTricrypto2Mixin: PoolTemplate;
-export declare const swapMetaFactoryMixin: PoolTemplate;
-export declare const swapCryptoMetaFactoryMixin: PoolTemplate;
-export declare const swapMixin: PoolTemplate;
+export declare const swapTricrypto2Mixin: {
+    _swap(this: PoolTemplate, i: number, j: number, _amount: bigint, slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    swapEstimateGas(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string): Promise<number>;
+    swap(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string, slippage?: number): Promise<string>;
+};
+export declare const swapMetaFactoryMixin: {
+    _swap(this: PoolTemplate, i: number, j: number, _amount: bigint, slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    swapEstimateGas(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string): Promise<number>;
+    swap(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string, slippage?: number): Promise<string>;
+};
+export declare const swapCryptoMetaFactoryMixin: {
+    _swap(this: PoolTemplate, i: number, j: number, _amount: bigint, slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    swapEstimateGas(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string): Promise<number>;
+    swap(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string, slippage?: number): Promise<string>;
+};
+export declare const swapMixin: {
+    _swap(this: PoolTemplate, i: number, j: number, _amount: bigint, slippage?: number, estimateGas?: boolean): Promise<string | number | number[]>;
+    swapEstimateGas(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string): Promise<number>;
+    swap(this: PoolTemplate, inputCoin: string | number, outputCoin: string | number, amount: number | string, slippage?: number): Promise<string>;
+};