@curvefi/api 1.23.0 → 1.24.2

package/README.md

@@ -161,13 +161,12 @@ import curve from "@curvefi/api";
     console.log(await curve.getBalances(['aDAI', 'aSUSD']));
     // OR console.log(await curve.getBalances(['0x028171bCA77440897B824Ca71D1c56caC55b68A3', '0x6c5024cd4f8a59110119c56f8933403a539555eb']));
 
-    // [ '10000.000211315200513239', '10000.0' ]
+    // [ '10000.00017727177059715', '10000.000080108429034461' ]
+
 
-    
     // --- Pool ---
 
     const saave = new curve.Pool('saave');
-
     
     // 1. Current address balances (signer balances)
     
@@ -175,40 +174,46 @@ import curve from "@curvefi/api";
     // {
     //     lpToken: '0.0',
     //     gauge: '0.0',
-    //     DAI: '10000.0',
-    //     sUSD: '10000.0',
-    //     aDAI: '10000.000211315200513239',
-    //     aSUSD: '10000.0'
+    //     '0x6B175474E89094C44Da98b954EedeAC495271d0F': '10000.0',
+    //     '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51': '10000.0',
+    //     '0x028171bCA77440897B824Ca71D1c56caC55b68A3': '10000.00017727177059715',
+    //     '0x6c5024cd4f8a59110119c56f8933403a539555eb': '10000.000080108429034461'
     // }
 
     console.log(await saave.lpTokenBalances());
     // { lpToken: '0.0', gauge: '0.0' }
     
     console.log(await saave.underlyingCoinBalances());
-    // { DAI: '10000.0', sUSD: '10000.0' }
-
+    // {
+    //     '0x6B175474E89094C44Da98b954EedeAC495271d0F': '10000.0',
+    //     '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51': '10000.0'
+    // }
+    
     console.log(await saave.coinBalances());
-    // { aDAI: '10000.000211315200513239', aSUSD: '10000.0' }
+    // {
+    //     '0x028171bCA77440897B824Ca71D1c56caC55b68A3': '10000.00017727177059715',
+    //     '0x6c5024cd4f8a59110119c56f8933403a539555eb': '10000.000080108429034461'
+    // }
     
     console.log(await saave.allCoinBalances());
     // {
-    //     DAI: '10000.0',
-    //     sUSD: '10000.0',
-    //     aDAI: '10000.000211315200513239',
-    //     aSUSD: '10000.0'
+    //     '0x6B175474E89094C44Da98b954EedeAC495271d0F': '10000.0',
+    //     '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51': '10000.0',
+    //     '0x028171bCA77440897B824Ca71D1c56caC55b68A3': '10000.00017727177059715',
+    //     '0x6c5024cd4f8a59110119c56f8933403a539555eb': '10000.000080108429034461'
     // }
 
-    
+
     // 2. For every method above you can specify the address
     
     console.log(await saave.balances("0x0063046686E46Dc6F15918b61AE2B121458534a5"));
     // {
     //     lpToken: '0.0',
     //     gauge: '0.0',
-    //     DAI: '0.0',
-    //     sUSD: '0.0',
-    //     aDAI: '0.0',
-    //     aSUSD: '0.0'
+    //     '0x6B175474E89094C44Da98b954EedeAC495271d0F': '0.0',
+    //     '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51': '0.0',
+    //     '0x028171bCA77440897B824Ca71D1c56caC55b68A3': '0.0',
+    //     '0x6c5024cd4f8a59110119c56f8933403a539555eb': '0.0'
     // }
 
     // Or several addresses
@@ -217,21 +222,22 @@ import curve from "@curvefi/api";
     //     '0x0063046686E46Dc6F15918b61AE2B121458534a5': {
     //         lpToken: '0.0',
     //         gauge: '0.0',
-    //         DAI: '0.0',
-    //         sUSD: '0.0',
-    //         aDAI: '0.0',
-    //         aSUSD: '0.0'
+    //         '0x6B175474E89094C44Da98b954EedeAC495271d0F': '0.0',
+    //         '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51': '0.0',
+    //         '0x028171bCA77440897B824Ca71D1c56caC55b68A3': '0.0',
+    //         '0x6c5024cd4f8a59110119c56f8933403a539555eb': '0.0'
     //     },
     //     '0x66aB6D9362d4F35596279692F0251Db635165871': {
     //         lpToken: '0.0',
     //         gauge: '0.0',
-    //         DAI: '10000.0',
-    //         sUSD: '10000.0',
-    //         aDAI: '10000.000211315200513239',
-    //         aSUSD: '10000.0'
+    //         '0x6B175474E89094C44Da98b954EedeAC495271d0F': '10000.0',
+    //         '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51': '10000.0',
+    //         '0x028171bCA77440897B824Ca71D1c56caC55b68A3': '10000.00017727177059715',
+    //         '0x6c5024cd4f8a59110119c56f8933403a539555eb': '10000.000080108429034461'
     //     }
     // }
 
+
 })()
 ```
 
@@ -727,6 +733,10 @@ await pool.exchangeWrappedApprove("0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490",
 
 ### Exchange
 ```ts
+// Router
+await curve.routerExchangeisApproved("DAI", "0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3", "1000"); // DAI -> MIM
+await curve.routerExchangeApprove("DAI", "0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3", "1000"); // DAI -> MIM
+
 // Straight
 await curve.exchangeisApproved("DAI", "0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3", "1000"); // DAI -> MIM
 await curve.exchangeApprove("DAI", "0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3", "1000"); // DAI -> MIM

package/lib/constants/abis/json/registry_exchange.json

@@ -385,6 +385,36 @@
         "stateMutability": "view",
         "type": "function"
     },
+    {
+        "gas": "278915",
+        "inputs": [
+            {
+                "name": "_route",
+                "type": "address[9]"
+            },
+            {
+                "name": "_swap_params",
+                "type": "uint256[3][4]"
+            },
+            {
+                "name": "_amount",
+                "type": "uint256"
+            },
+            {
+                "name": "_pools",
+                "type": "address[4]"
+            }
+        ],
+        "name": "get_exchange_multiple_amount",
+        "outputs": [
+            {
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
     {
         "gas": "2654",
         "inputs": [

package/lib/curve.js

@@ -115,9 +115,9 @@ var Curve = /** @class */ (function () {
     ) {
         if (options === void 0) { options = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var cTokens, yTokens, ycTokens, aTokens, network, _a, customAbiTokens, _b, _i, _c, pool, _d, _e, coinAddr, _f, _g, coinAddr, _h, _j, coinAddr, _k, _l, rewardTokenAddr, addressProviderContract, _m;
-            return __generator(this, function (_o) {
-                switch (_o.label) {
+            var cTokens, yTokens, ycTokens, aTokens, network, _a, customAbiTokens, _b, _i, _c, pool, _d, _e, coinAddr, _f, _g, coinAddr, _h, _j, coinAddr, _k, _l, rewardTokenAddr, _m, _o, _p, _q, _r, addressProviderContract, _s;
+            return __generator(this, function (_t) {
+                switch (_t.label) {
                     case 0:
                         // JsonRpc provider
                         if (providerType.toLowerCase() === 'JsonRpc'.toLowerCase()) {
@@ -160,8 +160,8 @@ var Curve = /** @class */ (function () {
                         if (_a) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.provider._networkPromise];
                     case 1:
-                        _a = (_o.sent());
-                        _o.label = 2;
+                        _a = (_t.sent());
+                        _t.label = 2;
                     case 2:
                         network = _a;
                         console.log("CURVE-JS IS CONNECTED TO NETWORK:", network);
@@ -217,75 +217,100 @@ var Curve = /** @class */ (function () {
                         this.multicallProvider = new ethcall_1.Provider();
                         return [4 /*yield*/, this.multicallProvider.init(this.provider)];
                     case 3:
-                        _o.sent();
+                        _t.sent();
                         if (!this.signer) return [3 /*break*/, 5];
                         _b = this;
                         return [4 /*yield*/, this.signer.getAddress()];
                     case 4:
-                        _b.signerAddress = _o.sent();
+                        _b.signerAddress = _t.sent();
                         return [3 /*break*/, 6];
                     case 5:
                         this.signerAddress = '';
-                        _o.label = 6;
+                        _t.label = 6;
                     case 6:
                         this.feeData = { gasPrice: options.gasPrice, maxFeePerGas: options.maxFeePerGas, maxPriorityFeePerGas: options.maxPriorityFeePerGas };
                         return [4 /*yield*/, this.updateFeeData()];
                     case 7:
-                        _o.sent();
-                        // TODO delete toLowerCase()
-                        for (_i = 0, _c = Object.values(exports.POOLS_DATA); _i < _c.length; _i++) {
-                            pool = _c[_i];
-                            this.contracts[pool.swap_address] = {
-                                contract: new ethers_1.Contract(pool.swap_address, pool.swap_abi, this.signer || this.provider),
-                                multicallContract: new ethcall_1.Contract(pool.swap_address, pool.swap_abi),
+                        _t.sent();
+                        _i = 0, _c = Object.values(exports.POOLS_DATA);
+                        _t.label = 8;
+                    case 8:
+                        if (!(_i < _c.length)) return [3 /*break*/, 13];
+                        pool = _c[_i];
+                        this.contracts[pool.swap_address] = {
+                            contract: new ethers_1.Contract(pool.swap_address, pool.swap_abi, this.signer || this.provider),
+                            multicallContract: new ethcall_1.Contract(pool.swap_address, pool.swap_abi),
+                        };
+                        this.contracts[pool.swap_address.toLowerCase()] = {
+                            contract: new ethers_1.Contract(pool.swap_address, pool.swap_abi, this.signer || this.provider),
+                            multicallContract: new ethcall_1.Contract(pool.swap_address, pool.swap_abi),
+                        };
+                        if (pool.token_address !== pool.swap_address) {
+                            this.contracts[pool.token_address] = {
+                                contract: new ethers_1.Contract(pool.token_address, ERC20_json_1.default, this.signer || this.provider),
+                                multicallContract: new ethcall_1.Contract(pool.token_address, ERC20_json_1.default),
                             };
-                            this.contracts[pool.swap_address.toLowerCase()] = {
-                                contract: new ethers_1.Contract(pool.swap_address, pool.swap_abi, this.signer || this.provider),
-                                multicallContract: new ethcall_1.Contract(pool.swap_address, pool.swap_abi),
+                            this.contracts[pool.token_address.toLowerCase()] = {
+                                contract: new ethers_1.Contract(pool.token_address, ERC20_json_1.default, this.signer || this.provider),
+                                multicallContract: new ethcall_1.Contract(pool.token_address, ERC20_json_1.default),
                             };
-                            if (pool.token_address !== pool.swap_address) {
-                                this.contracts[pool.token_address] = {
-                                    contract: new ethers_1.Contract(pool.token_address, ERC20_json_1.default, this.signer || this.provider),
-                                    multicallContract: new ethcall_1.Contract(pool.token_address, ERC20_json_1.default),
-                                };
-                                this.contracts[pool.token_address.toLowerCase()] = {
-                                    contract: new ethers_1.Contract(pool.token_address, ERC20_json_1.default, this.signer || this.provider),
-                                    multicallContract: new ethcall_1.Contract(pool.token_address, ERC20_json_1.default),
-                                };
-                            }
-                            this.contracts[pool.gauge_address] = {
-                                contract: new ethers_1.Contract(pool.gauge_address, pool.gauge_abi, this.signer || this.provider),
-                                multicallContract: new ethcall_1.Contract(pool.gauge_address, pool.gauge_abi),
+                        }
+                        this.contracts[pool.gauge_address] = {
+                            contract: new ethers_1.Contract(pool.gauge_address, pool.gauge_abi, this.signer || this.provider),
+                            multicallContract: new ethcall_1.Contract(pool.gauge_address, pool.gauge_abi),
+                        };
+                        this.contracts[pool.gauge_address.toLowerCase()] = {
+                            contract: new ethers_1.Contract(pool.gauge_address, pool.gauge_abi, this.signer || this.provider),
+                            multicallContract: new ethcall_1.Contract(pool.gauge_address, pool.gauge_abi),
+                        };
+                        if (pool.deposit_address && this.contracts[pool.deposit_address] === undefined) {
+                            this.contracts[pool.deposit_address] = {
+                                contract: new ethers_1.Contract(pool.deposit_address, pool.deposit_abi, this.signer || this.provider),
+                                multicallContract: new ethcall_1.Contract(pool.deposit_address, pool.deposit_abi),
                             };
-                            this.contracts[pool.gauge_address.toLowerCase()] = {
-                                contract: new ethers_1.Contract(pool.gauge_address, pool.gauge_abi, this.signer || this.provider),
-                                multicallContract: new ethcall_1.Contract(pool.gauge_address, pool.gauge_abi),
+                            this.contracts[pool.deposit_address.toLowerCase()] = {
+                                contract: new ethers_1.Contract(pool.deposit_address, pool.deposit_abi, this.signer || this.provider),
+                                multicallContract: new ethcall_1.Contract(pool.deposit_address, pool.deposit_abi),
                             };
-                            if (pool.deposit_address && this.contracts[pool.deposit_address] === undefined) {
-                                this.contracts[pool.deposit_address] = {
-                                    contract: new ethers_1.Contract(pool.deposit_address, pool.deposit_abi, this.signer || this.provider),
-                                    multicallContract: new ethcall_1.Contract(pool.deposit_address, pool.deposit_abi),
-                                };
-                                this.contracts[pool.deposit_address.toLowerCase()] = {
-                                    contract: new ethers_1.Contract(pool.deposit_address, pool.deposit_abi, this.signer || this.provider),
-                                    multicallContract: new ethcall_1.Contract(pool.deposit_address, pool.deposit_abi),
-                                };
-                            }
-                            for (_d = 0, _e = pool.underlying_coin_addresses; _d < _e.length; _d++) {
-                                coinAddr = _e[_d];
+                        }
+                        for (_d = 0, _e = pool.underlying_coin_addresses; _d < _e.length; _d++) {
+                            coinAddr = _e[_d];
+                            this.contracts[coinAddr] = {
+                                contract: new ethers_1.Contract(coinAddr, ERC20_json_1.default, this.signer || this.provider),
+                                multicallContract: new ethcall_1.Contract(coinAddr, ERC20_json_1.default),
+                            };
+                            this.contracts[coinAddr.toLowerCase()] = {
+                                contract: new ethers_1.Contract(coinAddr, ERC20_json_1.default, this.signer || this.provider),
+                                multicallContract: new ethcall_1.Contract(coinAddr, ERC20_json_1.default),
+                            };
+                        }
+                        for (_f = 0, _g = pool.coin_addresses; _f < _g.length; _f++) {
+                            coinAddr = _g[_f];
+                            if (customAbiTokens.includes(coinAddr))
+                                continue;
+                            this.contracts[coinAddr] = {
+                                contract: new ethers_1.Contract(coinAddr, ERC20_json_1.default, this.signer || this.provider),
+                                multicallContract: new ethcall_1.Contract(coinAddr, ERC20_json_1.default),
+                            };
+                            this.contracts[coinAddr.toLowerCase()] = {
+                                contract: new ethers_1.Contract(coinAddr, ERC20_json_1.default, this.signer || this.provider),
+                                multicallContract: new ethcall_1.Contract(coinAddr, ERC20_json_1.default),
+                            };
+                        }
+                        // TODO add all coins
+                        for (_h = 0, _j = pool.coin_addresses; _h < _j.length; _h++) {
+                            coinAddr = _j[_h];
+                            if (cTokens.includes(coinAddr)) {
                                 this.contracts[coinAddr] = {
-                                    contract: new ethers_1.Contract(coinAddr, ERC20_json_1.default, this.signer || this.provider),
-                                    multicallContract: new ethcall_1.Contract(coinAddr, ERC20_json_1.default),
+                                    contract: new ethers_1.Contract(coinAddr, cERC20_json_1.default, this.signer || this.provider),
+                                    multicallContract: new ethcall_1.Contract(coinAddr, cERC20_json_1.default),
                                 };
                                 this.contracts[coinAddr.toLowerCase()] = {
-                                    contract: new ethers_1.Contract(coinAddr, ERC20_json_1.default, this.signer || this.provider),
-                                    multicallContract: new ethcall_1.Contract(coinAddr, ERC20_json_1.default),
+                                    contract: new ethers_1.Contract(coinAddr, cERC20_json_1.default, this.signer || this.provider),
+                                    multicallContract: new ethcall_1.Contract(coinAddr, cERC20_json_1.default),
                                 };
                             }
-                            for (_f = 0, _g = pool.coin_addresses; _f < _g.length; _f++) {
-                                coinAddr = _g[_f];
-                                if (customAbiTokens.includes(coinAddr))
-                                    continue;
+                            if (aTokens.includes(coinAddr)) {
                                 this.contracts[coinAddr] = {
                                     contract: new ethers_1.Contract(coinAddr, ERC20_json_1.default, this.signer || this.provider),
                                     multicallContract: new ethcall_1.Contract(coinAddr, ERC20_json_1.default),
@@ -295,62 +320,56 @@ var Curve = /** @class */ (function () {
                                     multicallContract: new ethcall_1.Contract(coinAddr, ERC20_json_1.default),
                                 };
                             }
-                            // TODO add all coins
-                            for (_h = 0, _j = pool.coin_addresses; _h < _j.length; _h++) {
-                                coinAddr = _j[_h];
-                                if (cTokens.includes(coinAddr)) {
-                                    this.contracts[coinAddr] = {
-                                        contract: new ethers_1.Contract(coinAddr, cERC20_json_1.default, this.signer || this.provider),
-                                        multicallContract: new ethcall_1.Contract(coinAddr, cERC20_json_1.default),
-                                    };
-                                    this.contracts[coinAddr.toLowerCase()] = {
-                                        contract: new ethers_1.Contract(coinAddr, cERC20_json_1.default, this.signer || this.provider),
-                                        multicallContract: new ethcall_1.Contract(coinAddr, cERC20_json_1.default),
-                                    };
-                                }
-                                if (aTokens.includes(coinAddr)) {
-                                    this.contracts[coinAddr] = {
-                                        contract: new ethers_1.Contract(coinAddr, ERC20_json_1.default, this.signer || this.provider),
-                                        multicallContract: new ethcall_1.Contract(coinAddr, ERC20_json_1.default),
-                                    };
-                                    this.contracts[coinAddr.toLowerCase()] = {
-                                        contract: new ethers_1.Contract(coinAddr, ERC20_json_1.default, this.signer || this.provider),
-                                        multicallContract: new ethcall_1.Contract(coinAddr, ERC20_json_1.default),
-                                    };
-                                }
-                                if (yTokens.includes(coinAddr) || ycTokens.includes(coinAddr)) {
-                                    this.contracts[coinAddr] = {
-                                        contract: new ethers_1.Contract(coinAddr, yERC20_json_1.default, this.signer || this.provider),
-                                        multicallContract: new ethcall_1.Contract(coinAddr, yERC20_json_1.default),
-                                    };
-                                    this.contracts[coinAddr.toLowerCase()] = {
-                                        contract: new ethers_1.Contract(coinAddr, yERC20_json_1.default, this.signer || this.provider),
-                                        multicallContract: new ethcall_1.Contract(coinAddr, yERC20_json_1.default),
-                                    };
-                                }
-                            }
-                            if (pool.reward_contract) {
-                                this.contracts[pool.reward_contract] = {
-                                    contract: new ethers_1.Contract(pool.reward_contract, streamer_json_1.default, this.signer || this.provider),
-                                    multicallContract: new ethcall_1.Contract(pool.reward_contract, streamer_json_1.default),
-                                };
-                                this.contracts[pool.reward_contract.toLowerCase()] = {
-                                    contract: new ethers_1.Contract(pool.reward_contract, streamer_json_1.default, this.signer || this.provider),
-                                    multicallContract: new ethcall_1.Contract(pool.reward_contract, streamer_json_1.default),
-                                };
-                            }
-                            for (_k = 0, _l = pool.reward_tokens || []; _k < _l.length; _k++) {
-                                rewardTokenAddr = _l[_k];
-                                this.contracts[rewardTokenAddr] = {
-                                    contract: new ethers_1.Contract(rewardTokenAddr, ERC20_json_1.default, this.signer || this.provider),
-                                    multicallContract: new ethcall_1.Contract(rewardTokenAddr, ERC20_json_1.default),
+                            if (yTokens.includes(coinAddr) || ycTokens.includes(coinAddr)) {
+                                this.contracts[coinAddr] = {
+                                    contract: new ethers_1.Contract(coinAddr, yERC20_json_1.default, this.signer || this.provider),
+                                    multicallContract: new ethcall_1.Contract(coinAddr, yERC20_json_1.default),
                                 };
-                                this.contracts[rewardTokenAddr.toLowerCase()] = {
-                                    contract: new ethers_1.Contract(rewardTokenAddr, ERC20_json_1.default, this.signer || this.provider),
-                                    multicallContract: new ethcall_1.Contract(rewardTokenAddr, ERC20_json_1.default),
+                                this.contracts[coinAddr.toLowerCase()] = {
+                                    contract: new ethers_1.Contract(coinAddr, yERC20_json_1.default, this.signer || this.provider),
+                                    multicallContract: new ethcall_1.Contract(coinAddr, yERC20_json_1.default),
                                 };
                             }
                         }
+                        if (pool.reward_contract) {
+                            this.contracts[pool.reward_contract] = {
+                                contract: new ethers_1.Contract(pool.reward_contract, streamer_json_1.default, this.signer || this.provider),
+                                multicallContract: new ethcall_1.Contract(pool.reward_contract, streamer_json_1.default),
+                            };
+                            this.contracts[pool.reward_contract.toLowerCase()] = {
+                                contract: new ethers_1.Contract(pool.reward_contract, streamer_json_1.default, this.signer || this.provider),
+                                multicallContract: new ethcall_1.Contract(pool.reward_contract, streamer_json_1.default),
+                            };
+                        }
+                        _k = 0, _l = pool.reward_tokens || [];
+                        _t.label = 9;
+                    case 9:
+                        if (!(_k < _l.length)) return [3 /*break*/, 12];
+                        rewardTokenAddr = _l[_k];
+                        this.contracts[rewardTokenAddr] = {
+                            contract: new ethers_1.Contract(rewardTokenAddr, ERC20_json_1.default, this.signer || this.provider),
+                            multicallContract: new ethcall_1.Contract(rewardTokenAddr, ERC20_json_1.default),
+                        };
+                        this.contracts[rewardTokenAddr.toLowerCase()] = {
+                            contract: new ethers_1.Contract(rewardTokenAddr, ERC20_json_1.default, this.signer || this.provider),
+                            multicallContract: new ethcall_1.Contract(rewardTokenAddr, ERC20_json_1.default),
+                        };
+                        _m = exports.DECIMALS_LOWER_CASE;
+                        _o = rewardTokenAddr.toLowerCase();
+                        _p = Number;
+                        _r = (_q = ethers_1.ethers.utils).formatUnits;
+                        return [4 /*yield*/, this.contracts[rewardTokenAddr].contract.decimals()];
+                    case 10:
+                        _m[_o] =
+                            _p.apply(void 0, [_r.apply(_q, [_t.sent(), 0])]);
+                        _t.label = 11;
+                    case 11:
+                        _k++;
+                        return [3 /*break*/, 9];
+                    case 12:
+                        _i++;
+                        return [3 /*break*/, 8];
+                    case 13:
                         this.contracts[exports.ALIASES.crv] = {
                             contract: new ethers_1.Contract(exports.ALIASES.crv, ERC20_json_1.default, this.signer || this.provider),
                             multicallContract: new ethcall_1.Contract(exports.ALIASES.crv, ERC20_json_1.default),
@@ -384,10 +403,10 @@ var Curve = /** @class */ (function () {
                             multicallContract: new ethcall_1.Contract(exports.ALIASES.address_provider, address_provider_json_1.default),
                         };
                         addressProviderContract = this.contracts[exports.ALIASES.address_provider].contract;
-                        _m = exports.ALIASES;
+                        _s = exports.ALIASES;
                         return [4 /*yield*/, addressProviderContract.get_address(2, this.constantOptions)];
-                    case 8:
-                        _m.registry_exchange = _o.sent();
+                    case 14:
+                        _s.registry_exchange = _t.sent();
                         this.contracts[exports.ALIASES.registry_exchange] = {
                             contract: new ethers_1.Contract(exports.ALIASES.registry_exchange, registry_exchange_json_1.default, this.signer || this.provider),
                             multicallContract: new ethcall_1.Contract(exports.ALIASES.registry_exchange, registry_exchange_json_1.default),

package/lib/factory/factory-api.js

@@ -145,7 +145,7 @@ function setFactoryZapContracts() {
 }
 function getFactoryPoolsDataFromApi(isCrypto) {
     return __awaiter(this, void 0, void 0, function () {
-        var network, factoryType, url, response, rawPoolList, FACTORY_POOLS_DATA;
+        var network, factoryType, url, response, rawPoolList, mainAddresses, FACTORY_POOLS_DATA;
         var _this = this;
         return __generator(this, function (_a) {
             switch (_a.label) {
@@ -157,6 +157,8 @@ function getFactoryPoolsDataFromApi(isCrypto) {
                 case 1:
                     response = _a.sent();
                     rawPoolList = response.data.data.poolData;
+                    mainAddresses = Object.values(this.constants.POOLS_DATA).map(function (pool) { return pool.swap_address.toLowerCase(); });
+                    rawPoolList = rawPoolList.filter(function (p) { return !mainAddresses.includes(p.address.toLowerCase()); });
                     setFactorySwapContracts.call(this, rawPoolList, isCrypto);
                     if (isCrypto)
                         setCryptoFactoryTokenContracts.call(this, rawPoolList);

package/lib/index.d.ts

@@ -73,7 +73,7 @@ declare const curve: {
         crossAssetExchangeApprove: (inputCoin: string, amount: string) => Promise<number>;
         crossAssetExchange: (inputCoin: string, outputCoin: string, amount: string, maxSlippage?: number) => Promise<number>;
         routerExchangeApprove: (inputCoin: string, amount: string) => Promise<number>;
-        routerExchange: (inputCoin: string, outputCoin: string, amount: string, maxSlippage?: number) => Promise<number>;
+        routerExchange: (inputCoin: string, outputCoin: string, amount: string) => Promise<number>;
     };
     boosting: {
         getCrv: (...addresses: string[] | string[][]) => Promise<string | import("./interfaces").DictInterface<string>>;

package/lib/interfaces.d.ts

@@ -146,7 +146,7 @@ export interface IRouteStep {
     outputCoinAddress: string;
     i: number;
     j: number;
-    swapType: 1 | 2 | 3 | 4 | 5;
+    swapType: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
     swapAddress: string;
 }
 export interface IRoute {

package/lib/pools.d.ts

@@ -263,5 +263,5 @@ export declare const routerExchangeExpected: (inputCoin: string, outputCoin: str
 export declare const routerExchangeIsApproved: (inputCoin: string, amount: string) => Promise<boolean>;
 export declare const routerExchangeApproveEstimateGas: (inputCoin: string, amount: string) => Promise<number>;
 export declare const routerExchangeApprove: (inputCoin: string, amount: string) => Promise<string[]>;
-export declare const routerExchangeEstimateGas: (inputCoin: string, outputCoin: string, amount: string, maxSlippage?: number) => Promise<number>;
+export declare const routerExchangeEstimateGas: (inputCoin: string, outputCoin: string, amount: string) => Promise<number>;
 export declare const routerExchange: (inputCoin: string, outputCoin: string, amount: string, maxSlippage?: number) => Promise<string>;

package/lib/pools.js

@@ -2026,9 +2026,9 @@ var Pool = /** @class */ (function () {
                     switch (_a.label) {
                         case 0:
                             if (!(this.gauge === ethers_1.ethers.constants.AddressZero)) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this._balances.apply(this, __spreadArray([__spreadArray(__spreadArray(['lpToken'], this.underlyingCoins, true), this.coins, true), __spreadArray(__spreadArray([this.lpToken], this.underlyingCoinAddresses, true), this.coinAddresses, true)], addresses, false))];
+                            return [4 /*yield*/, this._balances.apply(this, __spreadArray([__spreadArray(__spreadArray(['lpToken'], this.underlyingCoinAddresses, true), this.coinAddresses, true), __spreadArray(__spreadArray([this.lpToken], this.underlyingCoinAddresses, true), this.coinAddresses, true)], addresses, false))];
                         case 1: return [2 /*return*/, _a.sent()];
-                        case 2: return [4 /*yield*/, this._balances.apply(this, __spreadArray([__spreadArray(__spreadArray(['lpToken', 'gauge'], this.underlyingCoins, true), this.coins, true), __spreadArray(__spreadArray([this.lpToken, this.gauge], this.underlyingCoinAddresses, true), this.coinAddresses, true)], addresses, false))];
+                        case 2: return [4 /*yield*/, this._balances.apply(this, __spreadArray([__spreadArray(__spreadArray(['lpToken', 'gauge'], this.underlyingCoinAddresses, true), this.coinAddresses, true), __spreadArray(__spreadArray([this.lpToken, this.gauge], this.underlyingCoinAddresses, true), this.coinAddresses, true)], addresses, false))];
                         case 3: return [2 /*return*/, _a.sent()];
                     }
                 });
@@ -2060,7 +2060,7 @@ var Pool = /** @class */ (function () {
             return __awaiter(_this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this._balances.apply(this, __spreadArray([this.underlyingCoins, this.underlyingCoinAddresses], addresses, false))];
+                        case 0: return [4 /*yield*/, this._balances.apply(this, __spreadArray([this.underlyingCoinAddresses, this.underlyingCoinAddresses], addresses, false))];
                         case 1: return [2 /*return*/, _a.sent()];
                     }
                 });
@@ -2074,7 +2074,7 @@ var Pool = /** @class */ (function () {
             return __awaiter(_this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this._balances.apply(this, __spreadArray([this.coins, this.coinAddresses], addresses, false))];
+                        case 0: return [4 /*yield*/, this._balances.apply(this, __spreadArray([this.coinAddresses, this.coinAddresses], addresses, false))];
                         case 1: return [2 /*return*/, _a.sent()];
                     }
                 });
@@ -2088,7 +2088,7 @@ var Pool = /** @class */ (function () {
             return __awaiter(_this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this._balances.apply(this, __spreadArray([__spreadArray(__spreadArray([], this.underlyingCoins, true), this.coins, true), __spreadArray(__spreadArray([], this.underlyingCoinAddresses, true), this.coinAddresses, true)], addresses, false))];
+                        case 0: return [4 /*yield*/, this._balances.apply(this, __spreadArray([__spreadArray(__spreadArray([], this.underlyingCoinAddresses, true), this.coinAddresses, true), __spreadArray(__spreadArray([], this.underlyingCoinAddresses, true), this.coinAddresses, true)], addresses, false))];
                         case 1: return [2 /*return*/, _a.sent()];
                     }
                 });
@@ -4182,52 +4182,114 @@ var getUserPoolList = function (address) { return __awaiter(void 0, void 0, void
 }); };
 exports.getUserPoolList = getUserPoolList;
 // --------- Multi-Pool Exchange ---------
+// TODO make working or remove
 var IMBALANCED_POOLS = [];
 // Inspired by Dijkstra's algorithm
 var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __awaiter(void 0, void 0, void 0, function () {
-    var ALL_POOLS, markedCoins, curCoins, nextCoins, routes, step, _i, curCoins_1, inCoin, _a, ALL_POOLS_1, _c, poolId, poolData, coin_addresses, underlying_coin_addresses, meta_coin_addresses, inCoinIndexes, j, tvl, _d, swapType, _e, _f, inCoinRoute, poolAddress, j, tvl, _h, swapType, _j, _k, inCoinRoute, j, tvl, _l, swapType, _m, _o, inCoinRoute, tvl, _p, swapType, _q, _r, inCoinRoute;
-    var _s;
-    var _t, _u, _v, _w, _x, _y;
-    return __generator(this, function (_z) {
-        switch (_z.label) {
+    var ALL_POOLS, basePoolsSet, _i, ALL_POOLS_1, pool, basePoolIds, markedCoins, curCoins, nextCoins, routes, step, _a, curCoins_1, inCoin, _c, ALL_POOLS_2, _d, poolId, poolData, coin_addresses, underlying_coin_addresses, meta_coin_addresses, token_address, is_lending, inCoinIndexes, j, swapType, _e, _f, inCoinRoute, swapType, _h, _j, inCoinRoute, j, tvl, _k, swapType, _l, _m, inCoinRoute, poolAddress, j, tvl, _o, swapType, _p, _q, inCoinRoute, j, tvl, _r, swapType, _s, _t, inCoinRoute, tvl, _u, swapType, _v, _w, inCoinRoute;
+    var _x;
+    var _y, _z, _0, _1, _2, _3, _4, _5;
+    return __generator(this, function (_6) {
+        switch (_6.label) {
             case 0:
                 inputCoinAddress = inputCoinAddress.toLowerCase();
                 outputCoinAddress = outputCoinAddress.toLowerCase();
                 ALL_POOLS = Object.entries(__assign(__assign(__assign({}, curve_1.POOLS_DATA), curve_1.curve.constants.FACTORY_POOLS_DATA), curve_1.curve.constants.CRYPTO_FACTORY_POOLS_DATA));
+                basePoolsSet = new Set();
+                for (_i = 0, ALL_POOLS_1 = ALL_POOLS; _i < ALL_POOLS_1.length; _i++) {
+                    pool = ALL_POOLS_1[_i];
+                    if (pool[1].base_pool)
+                        basePoolsSet.add(pool[1].base_pool);
+                }
+                basePoolIds = Array.from(basePoolsSet);
                 markedCoins = [];
                 curCoins = [inputCoinAddress];
                 nextCoins = new Set();
-                routes = (_s = {},
-                    _s[inputCoinAddress] = [[]],
-                    _s);
+                routes = (_x = {},
+                    _x[inputCoinAddress] = [[]],
+                    _x);
                 step = 0;
-                _z.label = 1;
+                _6.label = 1;
             case 1:
                 if (!(step < 4)) return [3 /*break*/, 21];
-                _i = 0, curCoins_1 = curCoins;
-                _z.label = 2;
+                _a = 0, curCoins_1 = curCoins;
+                _6.label = 2;
             case 2:
-                if (!(_i < curCoins_1.length)) return [3 /*break*/, 19];
-                inCoin = curCoins_1[_i];
-                _a = 0, ALL_POOLS_1 = ALL_POOLS;
-                _z.label = 3;
+                if (!(_a < curCoins_1.length)) return [3 /*break*/, 19];
+                inCoin = curCoins_1[_a];
+                _c = 0, ALL_POOLS_2 = ALL_POOLS;
+                _6.label = 3;
             case 3:
-                if (!(_a < ALL_POOLS_1.length)) return [3 /*break*/, 18];
-                _c = ALL_POOLS_1[_a], poolId = _c[0], poolData = _c[1];
+                if (!(_c < ALL_POOLS_2.length)) return [3 /*break*/, 18];
+                _d = ALL_POOLS_2[_c], poolId = _d[0], poolData = _d[1];
                 coin_addresses = poolData.coin_addresses.map(function (a) { return a.toLowerCase(); });
                 underlying_coin_addresses = poolData.underlying_coin_addresses.map(function (a) { return a.toLowerCase(); });
-                meta_coin_addresses = ((_t = poolData.meta_coin_addresses) === null || _t === void 0 ? void 0 : _t.map(function (a) { return a.toLowerCase(); })) || [];
+                meta_coin_addresses = ((_y = poolData.meta_coin_addresses) === null || _y === void 0 ? void 0 : _y.map(function (a) { return a.toLowerCase(); })) || [];
+                token_address = poolData.token_address.toLowerCase();
+                is_lending = poolData.use_lending.includes(true);
                 inCoinIndexes = {
                     coin: coin_addresses.indexOf(inCoin),
                     underlying_coin: underlying_coin_addresses.indexOf(inCoin),
                     meta_coin: meta_coin_addresses ? meta_coin_addresses.indexOf(inCoin) : -1,
                 };
-                // No input coin in this pool --> slip
+                // Find all LP -> underlying coin "swaps" (actually remove_liquidity_one_coin)
+                if (basePoolIds.includes(poolId) && inCoin === token_address) {
+                    for (j = 0; j < underlying_coin_addresses.length; j++) {
+                        // If this coin already marked or will be marked on the current step, no need to consider it on the next step
+                        if (markedCoins.includes(underlying_coin_addresses[j]) || curCoins.includes(underlying_coin_addresses[j]))
+                            continue;
+                        // Looking for outputCoinAddress only on the final step
+                        if (step === 3 && underlying_coin_addresses[j] !== outputCoinAddress)
+                            continue;
+                        swapType = poolId === 'aave' ? 10 : 9;
+                        for (_e = 0, _f = routes[inCoin]; _e < _f.length; _e++) {
+                            inCoinRoute = _f[_e];
+                            routes[underlying_coin_addresses[j]] = ((_z = routes[underlying_coin_addresses[j]]) !== null && _z !== void 0 ? _z : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
+                                    {
+                                        poolId: poolId,
+                                        poolAddress: poolData.swap_address,
+                                        outputCoinAddress: underlying_coin_addresses[j],
+                                        i: 0,
+                                        j: j,
+                                        swapType: swapType,
+                                        swapAddress: ethers_1.ethers.constants.AddressZero,
+                                    },
+                                ], false)]);
+                        }
+                        nextCoins.add(underlying_coin_addresses[j]);
+                    }
+                }
+                // Find all underlying coin -> LP "swaps" (actually add_liquidity)
+                if (basePoolIds.includes(poolId) && underlying_coin_addresses.includes(inCoin)) {
+                    // If this coin already marked or will be marked on the current step, no need to consider it on the next step
+                    if (markedCoins.includes(token_address) || curCoins.includes(token_address))
+                        return [3 /*break*/, 17];
+                    // Looking for outputCoinAddress only on the final step
+                    if (step === 3 && token_address !== outputCoinAddress)
+                        return [3 /*break*/, 17];
+                    swapType = is_lending ? 8 : underlying_coin_addresses.length === 2 ? 6 : 7;
+                    for (_h = 0, _j = routes[inCoin]; _h < _j.length; _h++) {
+                        inCoinRoute = _j[_h];
+                        routes[token_address] = ((_0 = routes[token_address]) !== null && _0 !== void 0 ? _0 : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
+                                {
+                                    poolId: poolId,
+                                    poolAddress: poolData.swap_address,
+                                    outputCoinAddress: token_address,
+                                    i: underlying_coin_addresses.indexOf(inCoin),
+                                    j: 0,
+                                    swapType: swapType,
+                                    swapAddress: ethers_1.ethers.constants.AddressZero,
+                                },
+                            ], false)]);
+                    }
+                    nextCoins.add(token_address);
+                }
+                // No input coin in this pool --> skip
                 if (inCoinIndexes.coin === -1 && inCoinIndexes.underlying_coin === -1 && inCoinIndexes.meta_coin === -1)
                     return [3 /*break*/, 17];
                 if (!(inCoinIndexes.coin >= 0 && poolId !== "atricrypto3")) return [3 /*break*/, 7];
                 j = 0;
-                _z.label = 4;
+                _6.label = 4;
             case 4:
                 if (!(j < coin_addresses.length)) return [3 /*break*/, 7];
                 // If this coin already marked or will be marked on the current step, no need to consider it on the next step
@@ -4236,19 +4298,19 @@ var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __a
                 // Looking for outputCoinAddress only on the final step
                 if (step === 3 && coin_addresses[j] !== outputCoinAddress)
                     return [3 /*break*/, 6];
-                _d = Number;
+                _k = Number;
                 return [4 /*yield*/, (new Pool(poolId)).stats.getTotalLiquidity()];
             case 5:
-                tvl = _d.apply(void 0, [_z.sent()]);
+                tvl = _k.apply(void 0, [_6.sent()]);
                 if (tvl === 0)
                     return [3 /*break*/, 6];
                 // Skip imbalanced pools
                 if (IMBALANCED_POOLS.includes(poolId))
                     return [3 /*break*/, 6];
                 swapType = poolData.is_crypto ? 3 : 1;
-                for (_e = 0, _f = routes[inCoin]; _e < _f.length; _e++) {
-                    inCoinRoute = _f[_e];
-                    routes[coin_addresses[j]] = ((_u = routes[coin_addresses[j]]) !== null && _u !== void 0 ? _u : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
+                for (_l = 0, _m = routes[inCoin]; _l < _m.length; _l++) {
+                    inCoinRoute = _m[_l];
+                    routes[coin_addresses[j]] = ((_1 = routes[coin_addresses[j]]) !== null && _1 !== void 0 ? _1 : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
                             {
                                 poolId: poolId,
                                 poolAddress: poolData.swap_address,
@@ -4261,7 +4323,7 @@ var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __a
                         ], false)]);
                 }
                 nextCoins.add(coin_addresses[j]);
-                _z.label = 6;
+                _6.label = 6;
             case 6:
                 j++;
                 return [3 /*break*/, 4];
@@ -4270,7 +4332,7 @@ var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __a
                     (curve_1.curve.chainId === 137 && poolData.is_factory) ? poolData.deposit_address : poolData.swap_address;
                 if (!(coin_addresses.join("|") !== underlying_coin_addresses.join("|") && inCoinIndexes.underlying_coin >= 0)) return [3 /*break*/, 11];
                 j = 0;
-                _z.label = 8;
+                _6.label = 8;
             case 8:
                 if (!(j < underlying_coin_addresses.length)) return [3 /*break*/, 11];
                 if (poolId === "atricrypto3" && inCoinIndexes.meta_coin >= 0 && meta_coin_addresses.includes(underlying_coin_addresses[j]))
@@ -4281,19 +4343,19 @@ var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __a
                 // Looking for outputCoinAddress only on the final step
                 if (step === 3 && underlying_coin_addresses[j] !== outputCoinAddress)
                     return [3 /*break*/, 10];
-                _h = Number;
+                _o = Number;
                 return [4 /*yield*/, (new Pool(poolId)).stats.getTotalLiquidity()];
             case 9:
-                tvl = _h.apply(void 0, [_z.sent()]);
+                tvl = _o.apply(void 0, [_6.sent()]);
                 if (tvl === 0)
                     return [3 /*break*/, 10];
                 // Skip imbalanced pools
                 if (IMBALANCED_POOLS.includes(poolId))
                     return [3 /*break*/, 10];
                 swapType = poolData.is_crypto && (poolData.is_fake || poolData.is_meta) ? 4 : poolData.is_crypto ? 3 : 2;
-                for (_j = 0, _k = routes[inCoin]; _j < _k.length; _j++) {
-                    inCoinRoute = _k[_j];
-                    routes[underlying_coin_addresses[j]] = ((_v = routes[underlying_coin_addresses[j]]) !== null && _v !== void 0 ? _v : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
+                for (_p = 0, _q = routes[inCoin]; _p < _q.length; _p++) {
+                    inCoinRoute = _q[_p];
+                    routes[underlying_coin_addresses[j]] = ((_2 = routes[underlying_coin_addresses[j]]) !== null && _2 !== void 0 ? _2 : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
                             {
                                 poolId: poolId,
                                 poolAddress: poolAddress,
@@ -4306,14 +4368,14 @@ var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __a
                         ], false)]);
                 }
                 nextCoins.add(underlying_coin_addresses[j]);
-                _z.label = 10;
+                _6.label = 10;
             case 10:
                 j++;
                 return [3 /*break*/, 8];
             case 11:
                 if (!(inCoinIndexes.coin === 0 && meta_coin_addresses.length > 0 && poolId !== "atricrypto3")) return [3 /*break*/, 15];
                 j = 0;
-                _z.label = 12;
+                _6.label = 12;
             case 12:
                 if (!(j < meta_coin_addresses.length)) return [3 /*break*/, 15];
                 // If this coin already marked or will be marked on the current step, no need to consider it on the next step
@@ -4322,19 +4384,19 @@ var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __a
                 // Looking for outputCoinAddress only on the final step
                 if (step === 3 && meta_coin_addresses[j] !== outputCoinAddress)
                     return [3 /*break*/, 14];
-                _l = Number;
+                _r = Number;
                 return [4 /*yield*/, (new Pool(poolId)).stats.getTotalLiquidity()];
             case 13:
-                tvl = _l.apply(void 0, [_z.sent()]);
+                tvl = _r.apply(void 0, [_6.sent()]);
                 if (tvl === 0)
                     return [3 /*break*/, 14];
                 // Skip imbalanced pools
                 if (IMBALANCED_POOLS.includes(poolId))
                     return [3 /*break*/, 14];
                 swapType = (curve_1.curve.chainId === 137 && poolData.is_factory) ? 5 : poolData.is_crypto ? 4 : 2;
-                for (_m = 0, _o = routes[inCoin]; _m < _o.length; _m++) {
-                    inCoinRoute = _o[_m];
-                    routes[meta_coin_addresses[j]] = ((_w = routes[meta_coin_addresses[j]]) !== null && _w !== void 0 ? _w : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
+                for (_s = 0, _t = routes[inCoin]; _s < _t.length; _s++) {
+                    inCoinRoute = _t[_s];
+                    routes[meta_coin_addresses[j]] = ((_3 = routes[meta_coin_addresses[j]]) !== null && _3 !== void 0 ? _3 : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
                             {
                                 poolId: poolId,
                                 poolAddress: poolAddress,
@@ -4347,7 +4409,7 @@ var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __a
                         ], false)]);
                 }
                 nextCoins.add(meta_coin_addresses[j]);
-                _z.label = 14;
+                _6.label = 14;
             case 14:
                 j++;
                 return [3 /*break*/, 12];
@@ -4359,19 +4421,19 @@ var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __a
                 // Looking for outputCoinAddress only on the final step
                 if (step === 3 && coin_addresses[0] !== outputCoinAddress)
                     return [3 /*break*/, 17];
-                _p = Number;
+                _u = Number;
                 return [4 /*yield*/, (new Pool(poolId)).stats.getTotalLiquidity()];
             case 16:
-                tvl = _p.apply(void 0, [_z.sent()]);
+                tvl = _u.apply(void 0, [_6.sent()]);
                 if (tvl === 0)
                     return [3 /*break*/, 17];
                 // Skip imbalanced pools
                 if (IMBALANCED_POOLS.includes(poolId))
                     return [3 /*break*/, 17];
                 swapType = (curve_1.curve.chainId === 137 && poolData.is_factory) ? 5 : poolData.is_crypto ? 4 : 2;
-                for (_q = 0, _r = routes[inCoin]; _q < _r.length; _q++) {
-                    inCoinRoute = _r[_q];
-                    routes[coin_addresses[0]] = ((_x = routes[coin_addresses[0]]) !== null && _x !== void 0 ? _x : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
+                for (_v = 0, _w = routes[inCoin]; _v < _w.length; _v++) {
+                    inCoinRoute = _w[_v];
+                    routes[coin_addresses[0]] = ((_4 = routes[coin_addresses[0]]) !== null && _4 !== void 0 ? _4 : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
                             {
                                 poolId: poolId,
                                 poolAddress: poolAddress,
@@ -4384,12 +4446,12 @@ var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __a
                         ], false)]);
                     nextCoins.add(coin_addresses[0]);
                 }
-                _z.label = 17;
+                _6.label = 17;
             case 17:
-                _a++;
+                _c++;
                 return [3 /*break*/, 3];
             case 18:
-                _i++;
+                _a++;
                 return [3 /*break*/, 2];
             case 19:
                 // If target output coin is reached, search is finished. Assumption: the shorter route, the better.
@@ -4398,11 +4460,11 @@ var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __a
                 markedCoins.push.apply(markedCoins, curCoins);
                 curCoins = Array.from(nextCoins);
                 nextCoins = new Set();
-                _z.label = 20;
+                _6.label = 20;
             case 20:
                 step++;
                 return [3 /*break*/, 1];
-            case 21: return [2 /*return*/, (_y = routes[outputCoinAddress]) !== null && _y !== void 0 ? _y : []];
+            case 21: return [2 /*return*/, (_5 = routes[outputCoinAddress]) !== null && _5 !== void 0 ? _5 : []];
         }
     });
 }); };
@@ -4434,22 +4496,23 @@ var _getExchangeMultipleArgs = function (inputCoinAddress, route) {
 };
 var _estimatedGasForDifferentRoutesCache = {};
 var _estimateGasForDifferentRoutes = function (routes, inputCoinAddress, outputCoinAddress, _amount) { return __awaiter(void 0, void 0, void 0, function () {
-    var registryExchangeContract, gasPromises, _i, routes_1, route, routeKey, gasPromise, _a, _route, _swapParams, _factorySwapAddresses, _gasAmounts_2, err_3;
+    var contract, gasPromises, value, _i, routes_1, route, routeKey, gasPromise, _a, _route, _swapParams, _factorySwapAddresses, _gasAmounts_2, err_3;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
                 inputCoinAddress = inputCoinAddress.toLowerCase();
                 outputCoinAddress = outputCoinAddress.toLowerCase();
-                registryExchangeContract = curve_1.curve.contracts[curve_1.ALIASES.registry_exchange].contract;
+                contract = curve_1.curve.contracts[curve_1.ALIASES.registry_exchange].contract;
                 gasPromises = [];
+                value = (0, utils_1.isEth)(inputCoinAddress) ? _amount : ethers_1.ethers.BigNumber.from(0);
                 for (_i = 0, routes_1 = routes; _i < routes_1.length; _i++) {
                     route = routes_1[_i];
                     routeKey = _getRouteKey(route, inputCoinAddress, outputCoinAddress);
                     gasPromise = void 0;
                     _a = _getExchangeMultipleArgs(inputCoinAddress, route), _route = _a._route, _swapParams = _a._swapParams, _factorySwapAddresses = _a._factorySwapAddresses;
                     if ((((_c = _estimatedGasForDifferentRoutesCache[routeKey]) === null || _c === void 0 ? void 0 : _c.time) || 0) + 3600000 < Date.now()) {
-                        gasPromise = registryExchangeContract.estimateGas.exchange_multiple(_route, _swapParams, _amount, 0, _factorySwapAddresses, curve_1.curve.constantOptions);
+                        gasPromise = contract.estimateGas.exchange_multiple(_route, _swapParams, _amount, 0, _factorySwapAddresses, __assign(__assign({}, curve_1.curve.constantOptions), { value: value }));
                     }
                     else {
                         gasPromise = Promise.resolve(_estimatedGasForDifferentRoutesCache[routeKey].gas);
@@ -4475,63 +4538,66 @@ var _estimateGasForDifferentRoutes = function (routes, inputCoinAddress, outputC
     });
 }); };
 var _getBestRouteAndOutput = (0, memoizee_1.default)(function (inputCoinAddress, outputCoinAddress, amount) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, inputCoinDecimals, outputCoinDecimals, _amount, routesRaw, routes, _i, routesRaw_1, route, _outputAmount, _c, _d, routeStep, poolId, poolAddress, i, j, swapType, swapAddress, contract, _e, err_4, _f, gasAmounts, outputCoinUsdRate, gasData, ethUsdRate, gasPrice, expectedAmounts, expectedAmountsUsd, txCostsUsd;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var _a, inputCoinDecimals, outputCoinDecimals, _amount, routesRaw, routes, calls, promises, multicallContract, contract, _i, routesRaw_1, route, _c, _route, _swapParams, _factorySwapAddresses, calls_1, multicallContract_1, _d, routesRaw_2, route, _e, _route, _swapParams, _factorySwapAddresses, _outputAmounts, i, err_4, promises_1, contract_1, _f, routesRaw_3, route, _h, _route, _swapParams, _factorySwapAddresses, res, i, _j, gasAmounts, outputCoinUsdRate, gasData, ethUsdRate, gasPrice, expectedAmounts, expectedAmountsUsd, txCostsUsd;
+    return __generator(this, function (_k) {
+        switch (_k.label) {
             case 0:
                 _a = (0, utils_1._getCoinDecimals)(inputCoinAddress, outputCoinAddress), inputCoinDecimals = _a[0], outputCoinDecimals = _a[1];
                 _amount = ethers_1.ethers.utils.parseUnits(amount.toString(), inputCoinDecimals);
                 return [4 /*yield*/, (0, exports._findAllRoutes)(inputCoinAddress, outputCoinAddress)];
             case 1:
-                routesRaw = (_h.sent()).map(function (steps) { return ({ steps: steps, _output: ethers_1.ethers.BigNumber.from(0), outputUsd: 0, txCostUsd: 0 }); });
+                routesRaw = (_k.sent()).map(function (steps) { return ({ steps: steps, _output: ethers_1.ethers.BigNumber.from(0), outputUsd: 0, txCostUsd: 0 }); });
                 routes = [];
-                _i = 0, routesRaw_1 = routesRaw;
-                _h.label = 2;
+                calls = [];
+                promises = [];
+                multicallContract = curve_1.curve.contracts[curve_1.ALIASES.registry_exchange].multicallContract;
+                contract = curve_1.curve.contracts[curve_1.ALIASES.registry_exchange].contract;
+                for (_i = 0, routesRaw_1 = routesRaw; _i < routesRaw_1.length; _i++) {
+                    route = routesRaw_1[_i];
+                    _c = _getExchangeMultipleArgs(inputCoinAddress, route), _route = _c._route, _swapParams = _c._swapParams, _factorySwapAddresses = _c._factorySwapAddresses;
+                    calls.push(multicallContract.get_exchange_multiple_amount(_route, _swapParams, _amount, _factorySwapAddresses));
+                    promises.push(contract.get_exchange_multiple_amount(_route, _swapParams, _amount, _factorySwapAddresses, curve_1.curve.constantOptions));
+                }
+                _k.label = 2;
             case 2:
-                if (!(_i < routesRaw_1.length)) return [3 /*break*/, 13];
-                route = routesRaw_1[_i];
-                // If one of pools in the route is imbalanced
-                if (route.steps.reduce(function (acc, step) { return acc || IMBALANCED_POOLS.includes(step.poolId); }, false))
-                    return [3 /*break*/, 12];
-                _outputAmount = _amount;
-                _c = 0, _d = route.steps;
-                _h.label = 3;
+                _k.trys.push([2, 4, , 6]);
+                calls_1 = [];
+                multicallContract_1 = curve_1.curve.contracts[curve_1.ALIASES.registry_exchange].multicallContract;
+                for (_d = 0, routesRaw_2 = routesRaw; _d < routesRaw_2.length; _d++) {
+                    route = routesRaw_2[_d];
+                    _e = _getExchangeMultipleArgs(inputCoinAddress, route), _route = _e._route, _swapParams = _e._swapParams, _factorySwapAddresses = _e._factorySwapAddresses;
+                    calls_1.push(multicallContract_1.get_exchange_multiple_amount(_route, _swapParams, _amount, _factorySwapAddresses));
+                }
+                return [4 /*yield*/, curve_1.curve.multicallProvider.all(calls_1)];
             case 3:
-                if (!(_c < _d.length)) return [3 /*break*/, 11];
-                routeStep = _d[_c];
-                poolId = routeStep.poolId, poolAddress = routeStep.poolAddress, i = routeStep.i, j = routeStep.j, swapType = routeStep.swapType, swapAddress = routeStep.swapAddress;
-                contract = curve_1.curve.contracts[swapAddress === ethers_1.ethers.constants.AddressZero ? poolAddress : swapAddress].contract;
-                _h.label = 4;
+                _outputAmounts = _k.sent();
+                for (i = 0; i < _outputAmounts.length; i++) {
+                    routesRaw[i]._output = _outputAmounts[i];
+                    routes.push(routesRaw[i]);
+                }
+                return [3 /*break*/, 6];
             case 4:
-                _h.trys.push([4, 9, , 10]);
-                if (![2, 4, 5].includes(swapType)) return [3 /*break*/, 6];
-                return [4 /*yield*/, contract.get_dy_underlying(i, j, _outputAmount, curve_1.curve.constantOptions)];
+                err_4 = _k.sent();
+                promises_1 = [];
+                contract_1 = curve_1.curve.contracts[curve_1.ALIASES.registry_exchange].contract;
+                for (_f = 0, routesRaw_3 = routesRaw; _f < routesRaw_3.length; _f++) {
+                    route = routesRaw_3[_f];
+                    _h = _getExchangeMultipleArgs(inputCoinAddress, route), _route = _h._route, _swapParams = _h._swapParams, _factorySwapAddresses = _h._factorySwapAddresses;
+                    promises_1.push(contract_1.get_exchange_multiple_amount(_route, _swapParams, _amount, _factorySwapAddresses, curve_1.curve.constantOptions));
+                }
+                return [4 /*yield*/, Promise.allSettled(promises_1)];
             case 5:
-                _e = _h.sent();
-                return [3 /*break*/, 8];
-            case 6: return [4 /*yield*/, contract.get_dy(i, j, _outputAmount, curve_1.curve.constantOptions)];
-            case 7:
-                _e = _h.sent();
-                _h.label = 8;
-            case 8:
-                _outputAmount = _e;
-                return [3 /*break*/, 10];
-            case 9:
-                err_4 = _h.sent();
-                console.log("Pool ".concat(poolId, " is empty or very imbalanced"));
-                IMBALANCED_POOLS.push(poolId);
-                return [3 /*break*/, 12];
-            case 10:
-                _c++;
-                return [3 /*break*/, 3];
-            case 11:
-                route._output = _outputAmount;
-                routes.push(route);
-                _h.label = 12;
-            case 12:
-                _i++;
-                return [3 /*break*/, 2];
-            case 13:
+                res = _k.sent();
+                for (i = 0; i < res.length; i++) {
+                    if (res[i].status === 'rejected') {
+                        console.log("Route ".concat((routesRaw[i].steps.map(function (s) { return s.poolId; })).join(" --> "), " is anavailable"));
+                        continue;
+                    }
+                    routesRaw[i]._output = res[i].value;
+                    routes.push(routesRaw[i]);
+                }
+                return [3 /*break*/, 6];
+            case 6:
                 if (routes.length === 0) {
                     return [2 /*return*/, {
                             steps: [],
@@ -4548,8 +4614,8 @@ var _getBestRouteAndOutput = (0, memoizee_1.default)(function (inputCoinAddress,
                         axios_1.default.get("https://api.curve.fi/api/getGas"),
                         (0, utils_1._getUsdRate)(curve_1.curve.chainId === 137 ? curve_1.COINS.matic : curve_1.COINS.eth),
                     ])];
-            case 14:
-                _f = _h.sent(), gasAmounts = _f[0], outputCoinUsdRate = _f[1], gasData = _f[2], ethUsdRate = _f[3];
+            case 7:
+                _j = _k.sent(), gasAmounts = _j[0], outputCoinUsdRate = _j[1], gasData = _j[2], ethUsdRate = _j[3];
                 gasPrice = gasData.data.data.gas.standard;
                 expectedAmounts = (routes).map(function (route) { return Number(ethers_1.ethers.utils.formatUnits(route._output, outputCoinDecimals)); });
                 expectedAmountsUsd = expectedAmounts.map(function (a) { return a * outputCoinUsdRate; });
@@ -4616,36 +4682,24 @@ var routerExchangeApprove = function (inputCoin, amount) { return __awaiter(void
     });
 }); };
 exports.routerExchangeApprove = routerExchangeApprove;
-var routerExchangeEstimateGas = function (inputCoin, outputCoin, amount, maxSlippage) {
-    if (maxSlippage === void 0) { maxSlippage = 0.01; }
-    return __awaiter(void 0, void 0, void 0, function () {
-        var _a, inputCoinAddress, outputCoinAddress, _c, inputCoinDecimals, outputCoinDecimals, route, _d, _route, _swapParams, _factorySwapAddresses, _amount, minRecvAmountBN, _minRecvAmount, contract, value;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
-                case 0:
-                    _a = (0, utils_1._getCoinAddresses)(inputCoin, outputCoin), inputCoinAddress = _a[0], outputCoinAddress = _a[1];
-                    _c = (0, utils_1._getCoinDecimals)(inputCoinAddress, outputCoinAddress), inputCoinDecimals = _c[0], outputCoinDecimals = _c[1];
-                    return [4 /*yield*/, _getBestRouteAndOutput(inputCoinAddress, outputCoinAddress, amount)];
-                case 1:
-                    route = _e.sent();
-                    if (route.steps.length === 0) {
-                        throw new Error("This pair can't be exchanged");
-                    }
-                    _d = _getExchangeMultipleArgs(inputCoinAddress, route), _route = _d._route, _swapParams = _d._swapParams, _factorySwapAddresses = _d._factorySwapAddresses;
-                    _amount = ethers_1.ethers.utils.parseUnits(amount, inputCoinDecimals);
-                    minRecvAmountBN = (0, utils_1.toBN)(route._output, outputCoinDecimals).times(1 - maxSlippage);
-                    _minRecvAmount = (0, utils_1.fromBN)(minRecvAmountBN, outputCoinDecimals);
-                    contract = curve_1.curve.contracts[curve_1.ALIASES.registry_exchange].contract;
-                    value = (0, utils_1.isEth)(inputCoinAddress) ? _amount : ethers_1.ethers.BigNumber.from(0);
-                    return [4 /*yield*/, curve_1.curve.updateFeeData()];
-                case 2:
-                    _e.sent();
-                    return [4 /*yield*/, contract.estimateGas.exchange_multiple(_route, _swapParams, _amount, _minRecvAmount, _factorySwapAddresses, __assign(__assign({}, curve_1.curve.constantOptions), { value: value }))];
-                case 3: return [2 /*return*/, (_e.sent()).toNumber()];
-            }
-        });
+var routerExchangeEstimateGas = function (inputCoin, outputCoin, amount) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, inputCoinAddress, outputCoinAddress, inputCoinDecimals, route, _amount, gas;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                _a = (0, utils_1._getCoinAddresses)(inputCoin, outputCoin), inputCoinAddress = _a[0], outputCoinAddress = _a[1];
+                inputCoinDecimals = (0, utils_1._getCoinDecimals)(inputCoinAddress, outputCoinAddress)[0];
+                return [4 /*yield*/, _getBestRouteAndOutput(inputCoinAddress, outputCoinAddress, amount)];
+            case 1:
+                route = _c.sent();
+                _amount = ethers_1.ethers.utils.parseUnits(amount, inputCoinDecimals);
+                return [4 /*yield*/, _estimateGasForDifferentRoutes([route], inputCoinAddress, outputCoinAddress, _amount)];
+            case 2:
+                gas = (_c.sent())[0];
+                return [2 /*return*/, gas];
+        }
     });
-};
+}); };
 exports.routerExchangeEstimateGas = routerExchangeEstimateGas;
 var routerExchange = function (inputCoin, outputCoin, amount, maxSlippage) {
     if (maxSlippage === void 0) { maxSlippage = 0.01; }
@@ -4656,7 +4710,7 @@ var routerExchange = function (inputCoin, outputCoin, amount, maxSlippage) {
                 case 0:
                     _a = (0, utils_1._getCoinAddresses)(inputCoin, outputCoin), inputCoinAddress = _a[0], outputCoinAddress = _a[1];
                     _c = (0, utils_1._getCoinDecimals)(inputCoinAddress, outputCoinAddress), inputCoinDecimals = _c[0], outputCoinDecimals = _c[1];
-                    return [4 /*yield*/, (0, utils_1.ensureAllowance)([inputCoin], [amount], curve_1.ALIASES.registry_exchange)];
+                    return [4 /*yield*/, (0, exports.routerExchangeApprove)(inputCoin, amount)];
                 case 1:
                     _e.sent();
                     return [4 /*yield*/, _getBestRouteAndOutput(inputCoinAddress, outputCoinAddress, amount)];
@@ -4676,7 +4730,7 @@ var routerExchange = function (inputCoin, outputCoin, amount, maxSlippage) {
                     _e.sent();
                     return [4 /*yield*/, contract.estimateGas.exchange_multiple(_route, _swapParams, _amount, _minRecvAmount, _factorySwapAddresses, __assign(__assign({}, curve_1.curve.constantOptions), { value: value }))];
                 case 4:
-                    gasLimit = (_e.sent()).mul(130).div(100);
+                    gasLimit = (_e.sent()).mul(curve_1.curve.chainId === 1 ? 130 : 160).div(100);
                     return [4 /*yield*/, contract.exchange_multiple(_route, _swapParams, _amount, _minRecvAmount, _factorySwapAddresses, __assign(__assign({}, curve_1.curve.options), { value: value, gasLimit: gasLimit }))];
                 case 5: return [2 /*return*/, (_e.sent()).hash];
             }

package/package.json

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