@curvefi/api 2.25.3 → 2.25.5

package/README.md

@@ -1055,6 +1055,8 @@ import curve from "@curvefi/api";
     //     '0x07f6daedb705446cb56ab42c18ba9ec5302ef5ed9c7ef0bb5c3c92493abcfc79'
     // ]
     
+    curve.boosting.calcUnlockTime(365);  // now (by default) + 365 days, rounded down by WEEK
+    // 1657152000000
     await curve.boosting.createLock(1000, 365);
     // 99000.0 CRV
     // { lockedAmount: '1000.0', unlockTime: 1657152000000 }
@@ -1067,6 +1069,9 @@ import curve from "@curvefi/api";
     // 372.289692732093137414 veCRV
     // 0.000009285953543912 veCRV %
 
+    const { unlockTime: currentUnlockTime } = await curve.boosting.getLockedAmountAndUnlockTime();
+    curve.boosting.calcUnlockTime(365, currentUnlockTime);  // currentUnlockTime + 365 days, rounded down by WEEK
+    // 1688601600000
     await curve.boosting.increaseUnlockTime(365);
     // 98500.0 CRV
     // { lockedAmount: '1500.0', unlockTime: 1688601600000 }

package/lib/boosting.d.ts

@@ -13,6 +13,7 @@ export declare const isApproved: (amount: number | string) => Promise<boolean>;
 export declare const approveEstimateGas: (amount: number | string) => Promise<number>;
 export declare const approve: (amount: number | string) => Promise<string[]>;
 export declare const createLockEstimateGas: (amount: number | string, days: number) => Promise<number>;
+export declare const calcUnlockTime: (days: number, start?: number) => number;
 export declare const createLock: (amount: number | string, days: number) => Promise<string>;
 export declare const increaseAmountEstimateGas: (amount: number | string) => Promise<number>;
 export declare const increaseAmount: (amount: number | string) => Promise<string>;

package/lib/boosting.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.claimFees = exports.claimFeesEstimateGas = exports.claimableFees = exports.withdrawLockedCrv = exports.withdrawLockedCrvEstimateGas = exports.increaseUnlockTime = exports.increaseUnlockTimeEstimateGas = exports.increaseAmount = exports.increaseAmountEstimateGas = exports.createLock = exports.createLockEstimateGas = exports.approve = exports.approveEstimateGas = exports.isApproved = exports.getVeCrvPct = exports.getVeCrv = exports.getLockedAmountAndUnlockTime = exports.getCrv = void 0;
+exports.claimFees = exports.claimFeesEstimateGas = exports.claimableFees = exports.withdrawLockedCrv = exports.withdrawLockedCrvEstimateGas = exports.increaseUnlockTime = exports.increaseUnlockTimeEstimateGas = exports.increaseAmount = exports.increaseAmountEstimateGas = exports.createLock = exports.calcUnlockTime = exports.createLockEstimateGas = exports.approve = exports.approveEstimateGas = exports.isApproved = exports.getVeCrvPct = exports.getVeCrv = exports.getLockedAmountAndUnlockTime = exports.getCrv = void 0;
 var ethers_1 = require("ethers");
 var curve_1 = require("./curve");
 var fee_distributor_view_json_1 = __importDefault(require("./constants/abis/fee_distributor_view.json"));
@@ -218,13 +218,21 @@ var createLockEstimateGas = function (amount, days) { return __awaiter(void 0, v
     });
 }); };
 exports.createLockEstimateGas = createLockEstimateGas;
+var calcUnlockTime = function (days, start) {
+    if (start === void 0) { start = Date.now(); }
+    var week = 86400 * 7;
+    var now = start / 1000;
+    var unlockTime = now + (86400 * days);
+    return Math.floor(unlockTime / week) * week * 1000;
+};
+exports.calcUnlockTime = calcUnlockTime;
 var createLock = function (amount, days) { return __awaiter(void 0, void 0, void 0, function () {
     var _amount, unlockTime, contract, gasLimit;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 _amount = (0, utils_2.parseUnits)(amount);
-                unlockTime = Math.floor(Date.now() / 1000) + (days * 86400);
+                unlockTime = Math.floor(Date.now() / 1000) + (86400 * days);
                 return [4 /*yield*/, (0, utils_2._ensureAllowance)([curve_1.curve.constants.ALIASES.crv], [_amount], curve_1.curve.constants.ALIASES.voting_escrow)];
             case 1:
                 _a.sent();

package/lib/curve.js

@@ -449,34 +449,19 @@ var Curve = /** @class */ (function () {
                         _o.sent();
                         for (_i = 0, _e = Object.values(this.constants.POOLS_DATA); _i < _e.length; _i++) {
                             pool = _e[_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.setContract(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.setContract(pool.token_address, ERC20_json_1.default);
                             }
                             if (pool.gauge_address !== ethers_1.ethers.constants.AddressZero) {
-                                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.setContract(pool.gauge_address, pool.gauge_abi);
                             }
                             if (pool.deposit_address && !this.contracts[pool.deposit_address]) {
-                                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.setContract(pool.deposit_address, pool.deposit_abi);
                             }
                             for (_f = 0, _g = pool.underlying_coin_addresses; _f < _g.length; _f++) {
                                 coinAddr = _g[_f];
-                                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.setContract(coinAddr, ERC20_json_1.default);
                             }
                             for (_h = 0, _j = pool.wrapped_coin_addresses; _h < _j.length; _h++) {
                                 coinAddr = _j[_h];
@@ -484,135 +469,52 @@ var Curve = /** @class */ (function () {
                                     continue;
                                 if (coinAddr in this.contracts)
                                     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.setContract(coinAddr, ERC20_json_1.default);
                             }
                             // TODO add all coins
                             for (_k = 0, _l = pool.wrapped_coin_addresses; _k < _l.length; _k++) {
                                 coinAddr = _l[_k];
                                 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.setContract(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.setContract(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.setContract(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.setContract(pool.reward_contract, streamer_json_1.default);
                             }
                             if (pool.sCurveRewards_address) {
-                                this.contracts[pool.sCurveRewards_address] = {
-                                    contract: new ethers_1.Contract(pool.sCurveRewards_address, pool.sCurveRewards_abi, this.signer || this.provider),
-                                    multicallContract: new ethcall_1.Contract(pool.sCurveRewards_address, pool.sCurveRewards_abi),
-                                };
+                                this.setContract(pool.sCurveRewards_address, pool.sCurveRewards_abi);
                             }
                         }
                         this.setContract(this.constants.NATIVE_TOKEN.wrappedAddress, ERC20_json_1.default);
-                        this.contracts[this.constants.ALIASES.crv] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.crv, ERC20_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.crv, ERC20_json_1.default),
-                        };
-                        this.contracts[this.constants.ALIASES.crv.toLowerCase()] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.crv, ERC20_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.crv, ERC20_json_1.default),
-                        };
+                        this.setContract(this.constants.ALIASES.crv, ERC20_json_1.default);
                         this.constants.DECIMALS[this.constants.ALIASES.crv] = 18;
                         _minterABI = this.chainId === 1 ? minter_json_1.default : minter_child_json_1.default;
-                        this.contracts[this.constants.ALIASES.minter] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.minter, _minterABI, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.minter, _minterABI),
-                        };
-                        this.contracts[this.constants.ALIASES.minter.toLowerCase()] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.minter, _minterABI, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.minter, _minterABI),
-                        };
-                        this.contracts[this.constants.ALIASES.voting_escrow] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.voting_escrow, votingescrow_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.voting_escrow, votingescrow_json_1.default),
-                        };
-                        this.contracts[this.constants.ALIASES.voting_escrow.toLowerCase()] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.voting_escrow, votingescrow_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.voting_escrow, votingescrow_json_1.default),
-                        };
+                        this.setContract(this.constants.ALIASES.minter, _minterABI);
+                        this.setContract(this.constants.ALIASES.voting_escrow, votingescrow_json_1.default);
                         this.setContract(this.constants.ALIASES.fee_distributor, fee_distributor_json_1.default);
-                        this.contracts[this.constants.ALIASES.address_provider] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.address_provider, address_provider_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.address_provider, address_provider_json_1.default),
-                        };
-                        this.contracts[this.constants.ALIASES.address_provider.toLowerCase()] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.address_provider, address_provider_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.address_provider, address_provider_json_1.default),
-                        };
+                        this.setContract(this.constants.ALIASES.address_provider, address_provider_json_1.default);
                         addressProviderContract = this.contracts[this.constants.ALIASES.address_provider].contract;
                         _m = this.constants.ALIASES;
                         return [4 /*yield*/, addressProviderContract.get_address(2, this.constantOptions)];
                     case 12:
-                        _m.registry_exchange = _o.sent();
-                        this.contracts[this.constants.ALIASES.registry_exchange] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.registry_exchange, registry_exchange_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.registry_exchange, registry_exchange_json_1.default),
-                        };
-                        this.contracts[this.constants.ALIASES.registry_exchange.toLowerCase()] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.registry_exchange, registry_exchange_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.registry_exchange, registry_exchange_json_1.default),
-                        };
-                        this.contracts[this.constants.ALIASES.gauge_controller] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.gauge_controller, gaugecontroller_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.gauge_controller, gaugecontroller_json_1.default),
-                        };
-                        this.contracts[this.constants.ALIASES.gauge_controller.toLowerCase()] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.gauge_controller, gaugecontroller_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.gauge_controller, gaugecontroller_json_1.default),
-                        };
-                        this.contracts[this.constants.ALIASES.router] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.router, router_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.router, router_json_1.default),
-                        };
-                        this.contracts[this.constants.ALIASES.router.toLowerCase()] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.router, router_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.router, router_json_1.default),
-                        };
+                        _m.registry_exchange = (_o.sent()).toLowerCase();
+                        this.setContract(this.constants.ALIASES.registry_exchange, registry_exchange_json_1.default);
+                        this.setContract(this.constants.ALIASES.gauge_controller, gaugecontroller_json_1.default);
+                        this.setContract(this.constants.ALIASES.router, router_json_1.default);
                         if (this.chainId === 137) {
                             this.setContract(this.constants.ALIASES.deposit_and_stake, deposit_and_stake_6coins_json_1.default);
-                            this.setContract(this.constants.ALIASES.deposit_and_stake.toLowerCase(), deposit_and_stake_6coins_json_1.default);
                         }
                         else {
                             this.setContract(this.constants.ALIASES.deposit_and_stake, deposit_and_stake_json_1.default);
-                            this.setContract(this.constants.ALIASES.deposit_and_stake.toLowerCase(), deposit_and_stake_json_1.default);
                         }
-                        this.contracts[this.constants.ALIASES.factory] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.factory, factory_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.factory, factory_json_1.default),
-                        };
-                        this.contracts[this.constants.ALIASES.factory.toLowerCase()] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.factory, factory_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.factory, factory_json_1.default),
-                        };
-                        this.contracts[this.constants.ALIASES.crypto_factory] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.crypto_factory, factory_crypto_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.crypto_factory, factory_crypto_json_1.default),
-                        };
-                        this.contracts[this.constants.ALIASES.crypto_factory.toLowerCase()] = {
-                            contract: new ethers_1.Contract(this.constants.ALIASES.crypto_factory, factory_crypto_json_1.default, this.signer || this.provider),
-                            multicallContract: new ethcall_1.Contract(this.constants.ALIASES.crypto_factory, factory_crypto_json_1.default),
-                        };
+                        this.setContract(this.constants.ALIASES.factory, factory_json_1.default);
+                        this.setContract(this.constants.ALIASES.crypto_factory, factory_crypto_json_1.default);
                         return [2 /*return*/];
                 }
             });

package/lib/index.d.ts

@@ -96,6 +96,7 @@ declare const curve: {
         }>;
         getVeCrv: (...addresses: string[] | string[][]) => Promise<string | import("./interfaces").IDict<string>>;
         getVeCrvPct: (...addresses: string[] | string[][]) => Promise<string | import("./interfaces").IDict<string>>;
+        calcUnlockTime: (days: number, start?: number) => number;
         isApproved: (amount: string | number) => Promise<boolean>;
         approve: (amount: string | number) => Promise<string[]>;
         createLock: (amount: string | number, days: number) => Promise<string>;

package/lib/index.js

@@ -175,6 +175,7 @@ var curve = {
         getLockedAmountAndUnlockTime: boosting_1.getLockedAmountAndUnlockTime,
         getVeCrv: boosting_1.getVeCrv,
         getVeCrvPct: boosting_1.getVeCrvPct,
+        calcUnlockTime: boosting_1.calcUnlockTime,
         isApproved: boosting_1.isApproved,
         approve: boosting_1.approve,
         createLock: boosting_1.createLock,

package/lib/router.d.ts

@@ -1,8 +1,5 @@
 import { ethers } from "ethers";
 import { IRouteStep } from "./interfaces";
-export declare const _findAllRoutesTheShorterTheBetter: (inputCoinAddress: string, outputCoinAddress: string) => Promise<IRouteStep[][]>;
-export declare const _findAllRoutesTvl: (inputCoinAddress: string, outputCoinAddress: string) => Promise<IRouteStep[][]>;
-export declare const _findAllRoutes: (inputCoinAddress: string, outputCoinAddress: string) => Promise<IRouteStep[][]>;
 export declare const getBestRouteAndOutput: (inputCoin: string, outputCoin: string, amount: number | string) => Promise<{
     route: IRouteStep[];
     output: string;

package/lib/router.js

@@ -59,7 +59,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSwappedAmount = exports.swap = exports.swapEstimateGas = exports.swapApprove = exports.swapApproveEstimateGas = exports.swapIsApproved = exports.swapPriceImpact = exports.swapExpected = exports.getBestRouteAndOutput = exports._findAllRoutes = exports._findAllRoutesTvl = exports._findAllRoutesTheShorterTheBetter = void 0;
+exports.getSwappedAmount = exports.swap = exports.swapEstimateGas = exports.swapApprove = exports.swapApproveEstimateGas = exports.swapIsApproved = exports.swapPriceImpact = exports.swapExpected = exports.getBestRouteAndOutput = void 0;
 var axios_1 = __importDefault(require("axios"));
 var memoizee_1 = __importDefault(require("memoizee"));
 var ethers_1 = require("ethers");
@@ -67,228 +67,6 @@ var curve_1 = require("./curve");
 var utils_1 = require("./utils");
 var pools_1 = require("./pools");
 var utils_2 = require("./pools/utils");
-// --------------------------- LEGACY ROUTER ---------------------------
-// Inspired by Dijkstra's algorithm
-var _findAllRoutesTheShorterTheBetter = function (inputCoinAddress, outputCoinAddress) { return __awaiter(void 0, void 0, void 0, function () {
-    var ALL_POOLS, basePoolsSet, _i, ALL_POOLS_1, pool, basePoolIds, markedCoins, curCoins, nextCoins, routes, step, _a, curCoins_1, inCoin, _b, ALL_POOLS_2, _c, poolId, poolData, wrapped_coin_addresses, underlying_coin_addresses, base_pool, meta_coin_addresses, token_address, is_lending, inCoinIndexes, j, swapType, _d, _e, inCoinRoute, flag, swapType, _f, _h, inCoinRoute, j, tvl, _j, swapType, _k, _l, inCoinRoute, poolAddress, j, tvl, _m, hasEth, swapType, _o, _p, inCoinRoute;
-    var _q;
-    var _r, _s, _t, _u, _v, _w;
-    return __generator(this, function (_x) {
-        switch (_x.label) {
-            case 0:
-                inputCoinAddress = inputCoinAddress.toLowerCase();
-                outputCoinAddress = outputCoinAddress.toLowerCase();
-                ALL_POOLS = Object.entries(__assign(__assign(__assign({}, curve_1.curve.constants.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].wrapped_coin_addresses.length < 6)
-                        basePoolsSet.add(pool[0]);
-                }
-                basePoolIds = Array.from(basePoolsSet);
-                markedCoins = [];
-                curCoins = [inputCoinAddress];
-                nextCoins = new Set();
-                routes = (_q = {},
-                    _q[inputCoinAddress] = [[]],
-                    _q);
-                step = 0;
-                _x.label = 1;
-            case 1:
-                if (!(step < 4)) return [3 /*break*/, 15];
-                _a = 0, curCoins_1 = curCoins;
-                _x.label = 2;
-            case 2:
-                if (!(_a < curCoins_1.length)) return [3 /*break*/, 13];
-                inCoin = curCoins_1[_a];
-                _b = 0, ALL_POOLS_2 = ALL_POOLS;
-                _x.label = 3;
-            case 3:
-                if (!(_b < ALL_POOLS_2.length)) return [3 /*break*/, 12];
-                _c = ALL_POOLS_2[_b], poolId = _c[0], poolData = _c[1];
-                wrapped_coin_addresses = poolData.wrapped_coin_addresses.map(function (a) { return a.toLowerCase(); });
-                underlying_coin_addresses = poolData.underlying_coin_addresses.map(function (a) { return a.toLowerCase(); });
-                base_pool = poolData.is_meta ? curve_1.curve.constants.POOLS_DATA[poolData.base_pool] : null;
-                meta_coin_addresses = base_pool ? base_pool.underlying_coin_addresses.map(function (a) { return a.toLowerCase(); }) : [];
-                token_address = poolData.token_address.toLowerCase();
-                is_lending = (_r = poolData.is_lending) !== null && _r !== void 0 ? _r : false;
-                inCoinIndexes = {
-                    wrapped_coin: wrapped_coin_addresses.indexOf(inCoin),
-                    underlying_coin: underlying_coin_addresses.indexOf(inCoin),
-                    meta_coin: meta_coin_addresses ? meta_coin_addresses.indexOf(inCoin) : -1,
-                };
-                // LP -> wrapped coin "swaps" (actually remove_liquidity_one_coin)
-                if (basePoolIds.includes(poolId) && inCoin === token_address) {
-                    for (j = 0; j < wrapped_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(wrapped_coin_addresses[j]) || curCoins.includes(wrapped_coin_addresses[j]))
-                            continue;
-                        // Looking for outputCoinAddress only on the final step
-                        if (step === 3 && wrapped_coin_addresses[j] !== outputCoinAddress)
-                            continue;
-                        swapType = poolId === 'aave' ? 11 : 10;
-                        for (_d = 0, _e = routes[inCoin]; _d < _e.length; _d++) {
-                            inCoinRoute = _e[_d];
-                            routes[wrapped_coin_addresses[j]] = ((_s = routes[wrapped_coin_addresses[j]]) !== null && _s !== void 0 ? _s : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
-                                    {
-                                        poolId: poolId,
-                                        poolAddress: poolData.swap_address,
-                                        inputCoinAddress: inCoin,
-                                        outputCoinAddress: wrapped_coin_addresses[j],
-                                        i: 0,
-                                        j: j,
-                                        swapType: swapType,
-                                        swapAddress: ethers_1.ethers.constants.AddressZero,
-                                    },
-                                ], false)]);
-                        }
-                        nextCoins.add(wrapped_coin_addresses[j]);
-                    }
-                }
-                // Wrapped coin -> LP "swaps" (actually add_liquidity)
-                if (basePoolIds.includes(poolId) && wrapped_coin_addresses.includes(inCoin)) {
-                    flag = true;
-                    // 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))
-                        flag = false;
-                    // Looking for outputCoinAddress only on the final step
-                    if (step === 3 && token_address !== outputCoinAddress)
-                        flag = false;
-                    if (flag) {
-                        swapType = is_lending ? 9 : wrapped_coin_addresses.length === 2 ? 7 : 8;
-                        for (_f = 0, _h = routes[inCoin]; _f < _h.length; _f++) {
-                            inCoinRoute = _h[_f];
-                            routes[token_address] = ((_t = routes[token_address]) !== null && _t !== void 0 ? _t : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
-                                    {
-                                        poolId: poolId,
-                                        poolAddress: poolData.swap_address,
-                                        inputCoinAddress: inCoin,
-                                        outputCoinAddress: token_address,
-                                        i: wrapped_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.wrapped_coin === -1 && inCoinIndexes.underlying_coin === -1 && inCoinIndexes.meta_coin === -1)
-                    return [3 /*break*/, 11];
-                if (!(inCoinIndexes.wrapped_coin >= 0 && !poolData.is_fake)) return [3 /*break*/, 7];
-                j = 0;
-                _x.label = 4;
-            case 4:
-                if (!(j < wrapped_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
-                if (markedCoins.includes(wrapped_coin_addresses[j]) || curCoins.includes(wrapped_coin_addresses[j]))
-                    return [3 /*break*/, 6];
-                // Native swaps spend less gas
-                if (wrapped_coin_addresses[j] !== outputCoinAddress && wrapped_coin_addresses[j] === curve_1.curve.constants.NATIVE_TOKEN.wrappedAddress)
-                    return [3 /*break*/, 6];
-                // Looking for outputCoinAddress only on the final step
-                if (step === 3 && wrapped_coin_addresses[j] !== outputCoinAddress)
-                    return [3 /*break*/, 6];
-                _j = Number;
-                return [4 /*yield*/, ((0, pools_1.getPool)(poolId)).stats.totalLiquidity()];
-            case 5:
-                tvl = _j.apply(void 0, [_x.sent()]);
-                if (tvl === 0)
-                    return [3 /*break*/, 6];
-                swapType = poolData.is_crypto ? 3 : 1;
-                for (_k = 0, _l = routes[inCoin]; _k < _l.length; _k++) {
-                    inCoinRoute = _l[_k];
-                    routes[wrapped_coin_addresses[j]] = ((_u = routes[wrapped_coin_addresses[j]]) !== null && _u !== void 0 ? _u : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
-                            {
-                                poolId: poolId,
-                                poolAddress: poolData.swap_address,
-                                inputCoinAddress: inCoin,
-                                outputCoinAddress: wrapped_coin_addresses[j],
-                                i: inCoinIndexes.wrapped_coin,
-                                j: j,
-                                swapType: swapType,
-                                swapAddress: ethers_1.ethers.constants.AddressZero,
-                            },
-                        ], false)]);
-                }
-                nextCoins.add(wrapped_coin_addresses[j]);
-                _x.label = 6;
-            case 6:
-                j++;
-                return [3 /*break*/, 4];
-            case 7:
-                poolAddress = (poolData.is_crypto && poolData.is_meta) || ((base_pool === null || base_pool === void 0 ? void 0 : base_pool.is_lending) && poolData.is_factory) ?
-                    poolData.deposit_address : poolData.swap_address;
-                if (!(!poolData.is_plain && inCoinIndexes.underlying_coin >= 0)) return [3 /*break*/, 11];
-                j = 0;
-                _x.label = 8;
-            case 8:
-                if (!(j < underlying_coin_addresses.length)) return [3 /*break*/, 11];
-                // Don't swap metacoins since they can be swapped directly in base pool
-                if (inCoinIndexes.meta_coin >= 0 && meta_coin_addresses.includes(underlying_coin_addresses[j]))
-                    return [3 /*break*/, 10];
-                // 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]))
-                    return [3 /*break*/, 10];
-                // Looking for outputCoinAddress only on the final step
-                if (step === 3 && underlying_coin_addresses[j] !== outputCoinAddress)
-                    return [3 /*break*/, 10];
-                _m = Number;
-                return [4 /*yield*/, ((0, pools_1.getPool)(poolId)).stats.totalLiquidity()];
-            case 9:
-                tvl = _m.apply(void 0, [_x.sent()]);
-                if (tvl === 0)
-                    return [3 /*break*/, 10];
-                hasEth = (inCoin === curve_1.curve.constants.NATIVE_TOKEN.address || underlying_coin_addresses[j] === curve_1.curve.constants.NATIVE_TOKEN.address);
-                swapType = (poolData.is_crypto && poolData.is_meta && poolData.is_factory) ? 6
-                    : ((base_pool === null || base_pool === void 0 ? void 0 : base_pool.is_lending) && poolData.is_factory) ? 5
-                        : hasEth ? 3
-                            : poolData.is_crypto ? 4
-                                : 2;
-                for (_o = 0, _p = routes[inCoin]; _o < _p.length; _o++) {
-                    inCoinRoute = _p[_o];
-                    routes[underlying_coin_addresses[j]] = ((_v = routes[underlying_coin_addresses[j]]) !== null && _v !== void 0 ? _v : []).concat([__spreadArray(__spreadArray([], inCoinRoute, true), [
-                            {
-                                poolId: poolId,
-                                poolAddress: poolAddress,
-                                inputCoinAddress: inCoin,
-                                outputCoinAddress: underlying_coin_addresses[j],
-                                i: inCoinIndexes.underlying_coin,
-                                j: j,
-                                swapType: swapType,
-                                swapAddress: (swapType === 5 || swapType === 6) ? poolData.swap_address : ethers_1.ethers.constants.AddressZero,
-                            },
-                        ], false)]);
-                }
-                nextCoins.add(underlying_coin_addresses[j]);
-                _x.label = 10;
-            case 10:
-                j++;
-                return [3 /*break*/, 8];
-            case 11:
-                _b++;
-                return [3 /*break*/, 3];
-            case 12:
-                _a++;
-                return [3 /*break*/, 2];
-            case 13:
-                // If target output coin is reached, search is finished. Assumption: the shorter route, the better.
-                if (outputCoinAddress in routes)
-                    return [3 /*break*/, 15];
-                markedCoins.push.apply(markedCoins, curCoins);
-                curCoins = Array.from(nextCoins);
-                nextCoins = new Set();
-                _x.label = 14;
-            case 14:
-                step++;
-                return [3 /*break*/, 1];
-            case 15: return [2 /*return*/, (_w = routes[outputCoinAddress]) !== null && _w !== void 0 ? _w : []];
-        }
-    });
-}); };
-exports._findAllRoutesTheShorterTheBetter = _findAllRoutesTheShorterTheBetter;
 var getNewRoute = function (route, poolId, poolAddress, inputCoinAddress, outputCoinAddress, i, j, swapType, swapAddress, tvl) {
     var routePoolIds = route.steps.map(function (s) { return s.poolId; });
     // Steps <= 4
@@ -303,14 +81,15 @@ var getNewRoute = function (route, poolId, poolAddress, inputCoinAddress, output
         totalTvl: route.totalTvl + tvl,
     };
 };
-// --------------------------- MAIN ROUTER ---------------------------
 var MAX_ROUTES_FOR_ONE_COIN = 3;
 var filterRoutes = function (routes, inputCoinAddress, sortFn) {
-    var routesByPoolIds = routes.map(function (r) { return r.steps.map(function (s) { return s.poolId; }).toString(); });
     return routes
         .filter(function (r) { return r.steps.length > 0; })
         .filter(function (r) { return r.steps[0].inputCoinAddress === inputCoinAddress; }) // Truncated routes
-        .filter(function (r, i) { return routesByPoolIds.indexOf(r.steps.map(function (s) { return s.poolId; }).toString()) === i; }) // Route duplications
+        .filter(function (r, i, _routes) {
+        var routesByPoolIds = _routes.map(function (r) { return r.steps.map(function (s) { return s.poolId; }).toString(); });
+        return routesByPoolIds.indexOf(r.steps.map(function (s) { return s.poolId; }).toString()) === i;
+    }) // Route duplications
         .sort(sortFn).slice(0, MAX_ROUTES_FOR_ONE_COIN);
 };
 var sortByTvl = function (a, b) { return b.minTvl - a.minTvl || b.totalTvl - a.totalTvl || a.steps.length - b.steps.length; };
@@ -323,8 +102,8 @@ var filterMaticFactory83Route = function (routes) {
     });
 };
 // Inspired by Dijkstra's algorithm
-var _findAllRoutesTvl = function (inputCoinAddress, outputCoinAddress) { return __awaiter(void 0, void 0, void 0, function () {
-    var ALL_POOLS, amplificationCoefficientDict, curCoins, nextCoins, routesByTvl, routesByLength, step, _loop_1, _i, curCoins_2, inCoin, routes;
+var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __awaiter(void 0, void 0, void 0, function () {
+    var ALL_POOLS, amplificationCoefficientDict, curCoins, nextCoins, routesByTvl, routesByLength, step, _loop_1, _i, curCoins_1, inCoin, routes;
     var _a, _b;
     var _c, _d, _e, _f, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     return __generator(this, function (_s) {
@@ -349,7 +128,7 @@ var _findAllRoutesTvl = function (inputCoinAddress, outputCoinAddress) { return
             case 2:
                 if (!(step < 4)) return [3 /*break*/, 8];
                 _loop_1 = function (inCoin) {
-                    var outCoin_1, newRoutesByTvl, newRoutesByLength, _loop_2, _t, ALL_POOLS_3, _u, poolId, poolData;
+                    var outCoin_1, newRoutesByTvl, newRoutesByLength, _loop_2, _t, ALL_POOLS_1, _u, poolId, poolData;
                     return __generator(this, function (_v) {
                         switch (_v.label) {
                             case 0:
@@ -518,11 +297,11 @@ var _findAllRoutesTvl = function (inputCoinAddress, outputCoinAddress) { return
                                         }
                                     });
                                 };
-                                _t = 0, ALL_POOLS_3 = ALL_POOLS;
+                                _t = 0, ALL_POOLS_1 = ALL_POOLS;
                                 _v.label = 1;
                             case 1:
-                                if (!(_t < ALL_POOLS_3.length)) return [3 /*break*/, 4];
-                                _u = ALL_POOLS_3[_t], poolId = _u[0], poolData = _u[1];
+                                if (!(_t < ALL_POOLS_1.length)) return [3 /*break*/, 4];
+                                _u = ALL_POOLS_1[_t], poolId = _u[0], poolData = _u[1];
                                 return [5 /*yield**/, _loop_2(poolId, poolData)];
                             case 2:
                                 _v.sent();
@@ -534,11 +313,11 @@ var _findAllRoutesTvl = function (inputCoinAddress, outputCoinAddress) { return
                         }
                     });
                 };
-                _i = 0, curCoins_2 = curCoins;
+                _i = 0, curCoins_1 = curCoins;
                 _s.label = 3;
             case 3:
-                if (!(_i < curCoins_2.length)) return [3 /*break*/, 6];
-                inCoin = curCoins_2[_i];
+                if (!(_i < curCoins_1.length)) return [3 /*break*/, 6];
+                inCoin = curCoins_1[_i];
                 return [5 /*yield**/, _loop_1(inCoin)];
             case 4:
                 _s.sent();
@@ -562,16 +341,6 @@ var _findAllRoutesTvl = function (inputCoinAddress, outputCoinAddress) { return
         }
     });
 }); };
-exports._findAllRoutesTvl = _findAllRoutesTvl;
-var _findAllRoutes = function (inputCoinAddress, outputCoinAddress) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports._findAllRoutesTvl)(inputCoinAddress, outputCoinAddress)];
-            case 1: return [2 /*return*/, _a.sent()];
-        }
-    });
-}); };
-exports._findAllRoutes = _findAllRoutes;
 var _getRouteKey = function (route, inputCoinAddress, outputCoinAddress) {
     var sortedCoins = [inputCoinAddress, outputCoinAddress].sort();
     var key = "".concat(sortedCoins[0], "-->");
@@ -654,7 +423,7 @@ var _getBestRouteAndOutput = (0, memoizee_1.default)(function (inputCoinAddress,
                             outputUsd: 0,
                             txCostUsd: 0,
                         }];
-                return [4 /*yield*/, (0, exports._findAllRoutes)(inputCoinAddress, outputCoinAddress)];
+                return [4 /*yield*/, _findAllRoutes(inputCoinAddress, outputCoinAddress)];
             case 1:
                 routesRaw = (_f.sent()).map(function (steps) { return ({ steps: steps, _output: ethers_1.ethers.BigNumber.from(0), outputUsd: 0, txCostUsd: 0 }); });
                 routes = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/api",
-  "version": "2.25.3",
+  "version": "2.25.5",
   "description": "JavaScript library for curve.fi",
   "main": "lib/index.js",
   "author": "Macket",