@gearbox-protocol/sdk 0.0.107 → 0.0.110

package/lib/contracts/contractsRegister.js

@@ -13,6 +13,7 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getContractName = exports.deployedContracts = void 0;
 var mappers_1 = require("../utils/mappers");
+var formatter_1 = require("../utils/formatter");
 var contracts_1 = require("./contracts");
 exports.deployedContracts = {
     // MAINNET
@@ -65,6 +66,6 @@ var contractNames = Object.entries(contracts_1.contractsByAddress).reduce(functi
 }, {});
 var contractsFullList = __assign(__assign({}, (0, mappers_1.keyToLowercase)(exports.deployedContracts)), contractNames);
 function getContractName(address) {
-    return contractsFullList[address.toLowerCase()] || address;
+    return contractsFullList[address.toLowerCase()] || (0, formatter_1.shortAddress)(address);
 }
 exports.getContractName = getContractName;

package/lib/core/creditAccount.d.ts

@@ -25,8 +25,9 @@ export declare class CreditAccountData {
     constructor(payload: CreditAccountDataPayload);
     balancesSorted(prices: Record<string, BigNumber>, tokens: Record<string, TokenData>): Array<Balance>;
 }
-export declare function sortBalances(balances: Record<string, BigNumber>, prices: Record<string, BigNumber>, tokens: Record<string, TokenData>): [string, BigNumber][];
+export declare function sortBalances(balances: Record<string, BigNumber>, prices: Record<string, BigNumber>, tokens: Record<string, TokenData>): Array<[string, BigNumber]>;
 export declare function tokensAbcComparator(t1?: TokenData, t2?: TokenData): 1 | -1;
+export declare function amountAbcComparator(t1: BigNumber, t2: BigNumber): 1 | -1;
 export declare class CreditAccountDataExtended extends CreditAccountData {
     readonly repayAmount: BigNumber;
     readonly liquidationAmount: BigNumber;

package/lib/core/creditAccount.js

@@ -15,10 +15,10 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreditAccountDataExtended = exports.tokensAbcComparator = exports.sortBalances = exports.CreditAccountData = void 0;
+exports.CreditAccountDataExtended = exports.amountAbcComparator = exports.tokensAbcComparator = exports.sortBalances = exports.CreditAccountData = void 0;
 var ethers_1 = require("ethers");
+var price_1 = require("../utils/price");
 var constants_1 = require("./constants");
-var price_1 = require("./price");
 var CreditAccountData = /** @class */ (function () {
     function CreditAccountData(payload) {
         var _this = this;
@@ -27,12 +27,12 @@ var CreditAccountData = /** @class */ (function () {
         this.balances = {};
         this.allBalances = {};
         this.version = 1;
-        this.id = payload.creditManager;
-        this.addr = payload.addr;
-        this.borrower = payload.borrower;
+        this.id = payload.creditManager.toLowerCase();
+        this.addr = payload.addr.toLowerCase();
+        this.borrower = payload.borrower.toLowerCase();
         this.inUse = payload.inUse;
-        this.creditManager = payload.creditManager;
-        this.underlyingToken = payload.underlying;
+        this.creditManager = payload.creditManager.toLowerCase();
+        this.underlyingToken = payload.underlying.toLowerCase();
         this.borrowedAmountPlusInterest = ethers_1.BigNumber.from(payload.borrowedAmountPlusInterest);
         this.totalValue = ethers_1.BigNumber.from(payload.totalValue);
         this.healthFactor =
@@ -44,12 +44,13 @@ var CreditAccountData = /** @class */ (function () {
                 .div(constants_1.RAY)
                 .toNumber() / constants_1.PERCENTAGE_FACTOR;
         (payload.balances || []).forEach(function (b) {
+            var tokenLC = b.token.toLowerCase();
             if (b.isAllowed) {
-                _this.balances[b.token] = ethers_1.BigNumber.from(b.balance);
-                _this.allowedTokens.push(b.token);
+                _this.balances[tokenLC] = ethers_1.BigNumber.from(b.balance);
+                _this.allowedTokens.push(tokenLC);
             }
-            _this.allBalances[b.token] = ethers_1.BigNumber.from(b.balance);
-            _this.allTokens.push(b.token);
+            _this.allBalances[tokenLC] = ethers_1.BigNumber.from(b.balance);
+            _this.allTokens.push(tokenLC);
         });
         this.isDeleting = false;
     }
@@ -75,7 +76,9 @@ function sortBalances(balances, prices, tokens) {
         var totalPrice1 = (0, price_1.calcTotalPrice)(price1, amount1, token1 === null || token1 === void 0 ? void 0 : token1.decimals);
         var totalPrice2 = (0, price_1.calcTotalPrice)(price2, amount2, token2 === null || token2 === void 0 ? void 0 : token2.decimals);
         if (totalPrice1.eq(totalPrice2)) {
-            return tokensAbcComparator(token1, token2);
+            return amount1.eq(amount2)
+                ? tokensAbcComparator(token1, token2)
+                : amountAbcComparator(amount1, amount2);
         }
         if (totalPrice1.gt(totalPrice2)) {
             return -1;
@@ -90,6 +93,10 @@ function tokensAbcComparator(t1, t2) {
     return symbol1 > symbol2 ? 1 : -1;
 }
 exports.tokensAbcComparator = tokensAbcComparator;
+function amountAbcComparator(t1, t2) {
+    return (t1 === null || t1 === void 0 ? void 0 : t1.gt(t2)) ? -1 : 1;
+}
+exports.amountAbcComparator = amountAbcComparator;
 var CreditAccountDataExtended = /** @class */ (function (_super) {
     __extends(CreditAccountDataExtended, _super);
     function CreditAccountDataExtended(payload) {

package/lib/core/creditManager.d.ts

@@ -29,7 +29,9 @@ export declare class CreditManagerData {
     encodeAddCollateral(accountAddress: string, tokenAddress: string, amount: BigNumber): MultiCall;
     encodeIncreaseDebt(amount: BigNumber): MultiCall;
     encodeDecreaseDebt(amount: BigNumber): MultiCall;
-    validateOpenAccount(totalAmount: BigNumber, leverage: number): true;
+    validateOpenAccount(collateral: BigNumber, debt: BigNumber): true;
+    protected validateOpenAccountV1(collateral: BigNumber, debt: BigNumber): true;
+    protected validateOpenAccountV2(debt: BigNumber): true;
 }
 export declare function calcMaxIncreaseBorrow(healthFactor: number, borrowAmountPlusInterest: BigNumber, maxLeverageFactor: number): BigNumber;
 export declare function calcHealthFactorAfterIncreasingBorrow(healthFactor: number | undefined, borrowAmountPlusInterest: BigNumber | undefined, additional: BigNumber): number;

package/lib/core/creditManager.js

@@ -49,7 +49,9 @@ var CreditManagerData = /** @class */ (function () {
         this.maxAmount = ethers_1.BigNumber.from(payload.maxAmount || 0);
         this.maxLeverageFactor = ethers_1.BigNumber.from(payload.maxLeverageFactor || 0).toNumber();
         this.availableLiquidity = ethers_1.BigNumber.from(payload.availableLiquidity || 0);
-        this.allowedTokens = (payload.collateralTokens || []).map(function (t) { return t.toLowerCase(); });
+        this.allowedTokens = (payload.collateralTokens || []).map(function (t) {
+            return t.toLowerCase();
+        });
         this.adapters = (payload.adapters || []).reduce(function (acc, _a) {
             var _b;
             var allowedContract = _a.allowedContract, adapter = _a.adapter;
@@ -58,7 +60,7 @@ var CreditManagerData = /** @class */ (function () {
         this.liquidationThresholds = (payload.liquidationThresholds || []).reduce(function (acc, threshold, index) {
             var address = payload.collateralTokens[index];
             if (address)
-                acc[address] = ethers_1.BigNumber.from(threshold);
+                acc[address.toLowerCase()] = ethers_1.BigNumber.from(threshold);
             return acc;
         }, {});
         this.version = ethers_1.BigNumber.from(payload.version || 1).toNumber();
@@ -98,17 +100,31 @@ var CreditManagerData = /** @class */ (function () {
             callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("decreaseDebt", [amount])
         };
     };
-    CreditManagerData.prototype.validateOpenAccount = function (totalAmount, leverage) {
-        if (totalAmount.lt(this.minAmount))
+    CreditManagerData.prototype.validateOpenAccount = function (collateral, debt) {
+        return this.version === 2
+            ? this.validateOpenAccountV2(debt)
+            : this.validateOpenAccountV1(collateral, debt);
+    };
+    CreditManagerData.prototype.validateOpenAccountV1 = function (collateral, debt) {
+        if (collateral.lt(this.minAmount))
             throw new errors_1.OpenAccountError("amountLessMin", this.minAmount);
-        if (totalAmount.gt(this.maxAmount))
+        if (collateral.gt(this.maxAmount))
             throw new errors_1.OpenAccountError("amountGreaterMax", this.maxAmount);
+        var leverage = debt.mul(constants_1.LEVERAGE_DECIMALS).div(collateral).toNumber();
+        if (!leverage || leverage < 0)
+            throw new errors_1.OpenAccountError("wrongLeverage", ethers_1.BigNumber.from(0));
         if (leverage > this.maxLeverageFactor)
             throw new errors_1.OpenAccountError("leverageGreaterMax", ethers_1.BigNumber.from(this.maxLeverageFactor));
-        if (totalAmount
-            .mul(leverage)
-            .div(constants_1.LEVERAGE_DECIMALS)
-            .gt(this.availableLiquidity))
+        if (debt.gt(this.availableLiquidity))
+            throw new errors_1.OpenAccountError("insufficientPoolLiquidity", ethers_1.BigNumber.from(this.availableLiquidity));
+        return true;
+    };
+    CreditManagerData.prototype.validateOpenAccountV2 = function (debt) {
+        if (debt.lt(this.minAmount))
+            throw new errors_1.OpenAccountError("amountLessMin", this.minAmount);
+        if (debt.gt(this.maxAmount))
+            throw new errors_1.OpenAccountError("amountGreaterMax", this.maxAmount);
+        if (debt.gt(this.availableLiquidity))
             throw new errors_1.OpenAccountError("insufficientPoolLiquidity", ethers_1.BigNumber.from(this.availableLiquidity));
         return true;
     };

package/lib/core/errors.d.ts

@@ -25,7 +25,7 @@ export declare class PathNotFoundError extends Error {
 export declare class AccountsInAlllCreditManagersError extends Error {
     constructor();
 }
-export declare type OpenAccountErrorTypes = "insufficientPoolLiquidity" | "leverageGreaterMax" | "amountGreaterMax" | "amountLessMin";
+export declare type OpenAccountErrorTypes = "insufficientPoolLiquidity" | "leverageGreaterMax" | "wrongLeverage" | "amountGreaterMax" | "amountLessMin";
 export declare class OpenAccountError extends Error {
     message: OpenAccountErrorTypes;
     payload: {

package/lib/core/pool.js

@@ -8,10 +8,10 @@ var constants_1 = require("./constants");
 var PoolData = /** @class */ (function () {
     function PoolData(payload) {
         this.isPaused = false;
-        this.id = payload.addr;
-        this.address = payload.addr;
-        this.underlyingToken = payload.underlying || "";
-        this.dieselToken = payload.dieselToken || "";
+        this.id = payload.addr.toLowerCase();
+        this.address = payload.addr.toLowerCase();
+        this.underlyingToken = payload.underlying.toLowerCase();
+        this.dieselToken = payload.dieselToken.toLowerCase();
         this.isWETH = payload.isWETH || false;
         this.expectedLiquidity = ethers_1.BigNumber.from(payload.expectedLiquidity);
         this.expectedLiquidityLimit = ethers_1.BigNumber.from(payload.expectedLiquidityLimit || 0);

package/lib/core/strategy.d.ts

@@ -1,6 +1,8 @@
 import { BigNumber } from "ethers";
+import { TokensWithAPY } from "../apy";
 export interface StrategyPayload {
     apy?: number;
+    apyTokenSymbol: TokensWithAPY;
     name: string;
     lpToken: string;
     pools: Array<string>;
@@ -29,8 +31,8 @@ export declare class Strategy {
     maxAPY(maxLeverage: number, poolApy: PoolList): number;
     overallAPY(apy: number, leverage: number, depositCollateral: string, borrowAPY: number): number;
     liquidationPrice(borrowed: TokenDescription, collateral: TokenDescription, lp: TokenDescription, ltCollateral: BigNumber): BigNumber;
-    private farmLev;
-    private inBaseAssets;
-    private inLeveragableAssets;
+    protected farmLev(leverage: number, depositCollateral: string): number;
+    protected inBaseAssets(depositCollateral: string): boolean;
+    protected inLeveragableAssets(depositCollateral: string): boolean;
 }
 export {};

package/lib/core/strategy.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Strategy = void 0;
 var ethers_1 = require("ethers");
+var price_1 = require("../utils/price");
 var constants_1 = require("./constants");
-var price_1 = require("./price");
 var Strategy = /** @class */ (function () {
     function Strategy(payload) {
         this.apy = payload.apy;
@@ -29,9 +29,11 @@ var Strategy = /** @class */ (function () {
             .mul(ltCollateral)
             .div(constants_1.PERCENTAGE_FACTOR);
         var lpMoney = (0, price_1.calcTotalPrice)(lp.price, lp.amount, lp.decimals);
-        return lpMoney.gt(0)
-            ? borrowedMoney.sub(collateralMoney).mul(constants_1.WAD).div(lpMoney)
-            : ethers_1.BigNumber.from(0);
+        if (lpMoney.gt(0)) {
+            var lqPrice = borrowedMoney.sub(collateralMoney).mul(constants_1.WAD).div(lpMoney);
+            return lqPrice.gte(0) ? lqPrice : ethers_1.BigNumber.from(0);
+        }
+        return ethers_1.BigNumber.from(0);
     };
     Strategy.prototype.farmLev = function (leverage, depositCollateral) {
         return this.inBaseAssets(depositCollateral) ||

package/lib/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./core/constants";
-export * from "./core/price";
 export * from "./core/creditAccount";
 export * from "./core/creditManager";
 export * from "./core/creditSession";
@@ -36,12 +35,12 @@ export * from "./tokens/curveLP";
 export * from "./tokens/gear";
 export * from "./tokens/normal";
 export * from "./tokens/yearn";
-export * from "./apy/lidoAPY";
-export * from "./apy/convexAPY";
+export * from "./apy";
 export * from "./core/history";
 export * from "./utils/multicall";
 export * from "./utils/types";
 export * from "./utils/errors";
+export * from "./utils/price";
 export * from "./strategies/convex";
 export * from "./strategies/creditFacade";
 export * from "./strategies/curve";
@@ -53,4 +52,5 @@ export { callRepeater } from "./utils/repeater";
 export { getContractName } from "./contracts/contractsRegister";
 export { AdapterInterface } from "./contracts/adapters";
 export { objectEntries, swapKeyValue, keyToLowercase } from "./utils/mappers";
-export { SwapType } from "./pathfinder/tradeTypes";
+export { getPoolTokens, getUnderlyingToken } from "./utils/extracter";
+export * from "./pathfinder/tradeTypes";

package/lib/index.js

@@ -14,9 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SwapType = exports.keyToLowercase = exports.swapKeyValue = exports.objectEntries = exports.AdapterInterface = exports.getContractName = exports.callRepeater = exports.TokenType = void 0;
+exports.getUnderlyingToken = exports.getPoolTokens = exports.keyToLowercase = exports.swapKeyValue = exports.objectEntries = exports.AdapterInterface = exports.getContractName = exports.callRepeater = exports.TokenType = void 0;
 __exportStar(require("./core/constants"), exports);
-__exportStar(require("./core/price"), exports);
 __exportStar(require("./core/creditAccount"), exports);
 __exportStar(require("./core/creditManager"), exports);
 __exportStar(require("./core/creditSession"), exports);
@@ -55,12 +54,12 @@ __exportStar(require("./tokens/curveLP"), exports);
 __exportStar(require("./tokens/gear"), exports);
 __exportStar(require("./tokens/normal"), exports);
 __exportStar(require("./tokens/yearn"), exports);
-__exportStar(require("./apy/lidoAPY"), exports);
-__exportStar(require("./apy/convexAPY"), exports);
+__exportStar(require("./apy"), exports);
 __exportStar(require("./core/history"), exports);
 __exportStar(require("./utils/multicall"), exports);
 __exportStar(require("./utils/types"), exports);
 __exportStar(require("./utils/errors"), exports);
+__exportStar(require("./utils/price"), exports);
 __exportStar(require("./strategies/convex"), exports);
 __exportStar(require("./strategies/creditFacade"), exports);
 __exportStar(require("./strategies/curve"), exports);
@@ -78,5 +77,7 @@ var mappers_1 = require("./utils/mappers");
 Object.defineProperty(exports, "objectEntries", { enumerable: true, get: function () { return mappers_1.objectEntries; } });
 Object.defineProperty(exports, "swapKeyValue", { enumerable: true, get: function () { return mappers_1.swapKeyValue; } });
 Object.defineProperty(exports, "keyToLowercase", { enumerable: true, get: function () { return mappers_1.keyToLowercase; } });
-var tradeTypes_1 = require("./pathfinder/tradeTypes");
-Object.defineProperty(exports, "SwapType", { enumerable: true, get: function () { return tradeTypes_1.SwapType; } });
+var extracter_1 = require("./utils/extracter");
+Object.defineProperty(exports, "getPoolTokens", { enumerable: true, get: function () { return extracter_1.getPoolTokens; } });
+Object.defineProperty(exports, "getUnderlyingToken", { enumerable: true, get: function () { return extracter_1.getUnderlyingToken; } });
+__exportStar(require("./pathfinder/tradeTypes"), exports);

package/lib/strategies/curve.js

@@ -155,14 +155,12 @@ var CurveStrategies = /** @class */ (function () {
         var calls = [];
         var curveParams = contracts_1.contractParams[curvePool];
         var tokenToDeposit = curveParams.tokens[0];
-        if (data.underlyingToken !== token_1.tokenDataByNetwork[network][tokenToDeposit]) {
-            calls.push(uniswapV2_1.UniswapV2Multicaller.connect(data.adapters[contracts_1.contractsByNetwork[network].UNISWAP_V2_ROUTER.toLowerCase()]).swapExactTokensForTokens(underlyingAmount, 0, [data.underlyingToken, token_1.tokenDataByNetwork[network][tokenToDeposit]], constants_1.ADDRESS_0X0, Math.floor(new Date().getTime() / 1000) + 3600));
-        }
-        if (data.underlyingToken === token_1.tokenDataByNetwork[network][tokenToDeposit]) {
-            calls.push(CurveMulticaller.connect(data.adapters[contracts_1.contractsByNetwork[network][curvePool].toLowerCase()]).add_liquidity_one_coin(underlyingAmount, 0, 0));
+        if (data.underlyingToken.toLowerCase() !==
+            token_1.tokenDataByNetwork[network][tokenToDeposit].toLowerCase()) {
+            calls.push(uniswapV2_1.UniswapV2Multicaller.connect(data.adapters[contracts_1.contractsByNetwork[network].UNISWAP_V2_ROUTER.toLowerCase()]).swapExactTokensForTokens(underlyingAmount, 0, [data.underlyingToken, token_1.tokenDataByNetwork[network][tokenToDeposit]], constants_1.ADDRESS_0X0, Math.floor(new Date().getTime() / 1000) + 3600), CurveMulticaller.connect(data.adapters[contracts_1.contractsByNetwork[network][curvePool].toLowerCase()]).add_all_liquidity_one_coin(0, 0));
         }
         else {
-            calls.push(CurveMulticaller.connect(data.adapters[contracts_1.contractsByNetwork[network][curvePool].toLowerCase()]).add_all_liquidity_one_coin(0, 0));
+            calls.push(CurveMulticaller.connect(data.adapters[contracts_1.contractsByNetwork[network][curvePool].toLowerCase()]).add_liquidity_one_coin(underlyingAmount, 0, 0));
         }
         return calls;
     };
@@ -179,8 +177,8 @@ var CurveStrategies = /** @class */ (function () {
                 data.adapters[contracts_1.contractsByNetwork[network][curvePool].toLowerCase()];
         }
         calls.push(CurveMulticaller.connect(curveContractAddress).remove_liquidity_one_coin(curveLPAmount, 0, 0));
-        if (token_1.tokenDataByNetwork[network][curveParams.tokens[0]] !==
-            data.underlyingToken) {
+        if (token_1.tokenDataByNetwork[network][curveParams.tokens[0]].toLowerCase() !==
+            data.underlyingToken.toLowerCase()) {
             calls.push(uniswapV2_1.UniswapV2Multicaller.connect(data.adapters[contracts_1.contractsByNetwork[network].UNISWAP_V2_ROUTER.toLowerCase()]).swapAllTokensForTokens(0, [
                 token_1.tokenDataByNetwork[network][curveParams.tokens[0]],
                 data.underlyingToken
@@ -201,8 +199,8 @@ var CurveStrategies = /** @class */ (function () {
                 data.adapters[contracts_1.contractsByNetwork[network][curvePool].toLowerCase()];
         }
         calls.push(CurveMulticaller.connect(curveContractAddress).remove_all_liquidity_one_coin(0, 0));
-        if (token_1.tokenDataByNetwork[network][curveParams.tokens[0]] !==
-            data.underlyingToken) {
+        if (token_1.tokenDataByNetwork[network][curveParams.tokens[0]].toLowerCase() !==
+            data.underlyingToken.toLowerCase()) {
             calls.push(uniswapV2_1.UniswapV2Multicaller.connect(data.adapters[contracts_1.contractsByNetwork[network].UNISWAP_V2_ROUTER.toLowerCase()]).swapAllTokensForTokens(0, [
                 token_1.tokenDataByNetwork[network][curveParams.tokens[0]],
                 data.underlyingToken

package/lib/strategies/yearn.js

@@ -85,14 +85,18 @@ var YearnV2Strategies = /** @class */ (function () {
         var yearnToken = vaultParams.shareToken;
         var yearnParams = token_1.supportedTokens[yearnToken];
         if (yearnParams.type === tokenType_1.TokenType.YEARN_VAULT) {
-            if (data.underlyingToken !==
-                token_1.tokenDataByNetwork[network][yearnParams.underlying]) {
+            if (data.underlyingToken.toLowerCase() !==
+                token_1.tokenDataByNetwork[network][yearnParams.underlying].toLowerCase()) {
                 // This should be a pathfinder call
                 calls.push(uniswapV2_1.UniswapV2Multicaller.connect(data.adapters[contracts_1.contractsByNetwork[network].UNISWAP_V2_ROUTER.toLowerCase()]).swapExactTokensForTokens(underlyingAmount, 0, [
                     data.underlyingToken,
                     token_1.tokenDataByNetwork[network][yearnParams.underlying]
                 ], constants_1.ADDRESS_0X0, Math.floor(new Date().getTime() / 1000) + 3600));
             }
+            else {
+                calls.push(YearnV2Multicaller.connect(data.adapters[contracts_1.contractsByNetwork[network][yearnVault].toLowerCase()]).deposit(underlyingAmount));
+                return calls;
+            }
         }
         else if (yearnParams.type === tokenType_1.TokenType.YEARN_VAULT_OF_CURVE_LP ||
             yearnParams.type === tokenType_1.TokenType.YEARN_VAULT_OF_META_CURVE_LP) {
@@ -113,8 +117,8 @@ var YearnV2Strategies = /** @class */ (function () {
         var yearnParams = token_1.supportedTokens[yearnToken];
         calls.push(YearnV2Multicaller.connect(data.adapters[contracts_1.contractsByNetwork[network][yearnVault].toLowerCase()]).withdraw(yearnSharesAmount));
         if (yearnParams.type === tokenType_1.TokenType.YEARN_VAULT) {
-            if (data.underlyingToken !==
-                token_1.tokenDataByNetwork[network][yearnParams.underlying]) {
+            if (data.underlyingToken.toLowerCase() !==
+                token_1.tokenDataByNetwork[network][yearnParams.underlying].toLowerCase()) {
                 // This should be a pathfinder call
                 calls.push(uniswapV2_1.UniswapV2Multicaller.connect(data.adapters[contracts_1.contractsByNetwork[network].UNISWAP_V2_ROUTER.toLowerCase()]).swapAllTokensForTokens(0, [
                     token_1.tokenDataByNetwork[network][yearnParams.underlying],

package/lib/tokens/convex.d.ts

@@ -22,4 +22,7 @@ export declare type ConvexPhantomTokenData = {
     lpToken: ConvexLPToken;
 } & BaseConvexToken;
 export declare const convexTokens: Record<ConvexLPToken | ConvexStakedPhantomToken, ConvexLPTokenData | ConvexPhantomTokenData>;
+export declare const isConvexToken: (t: unknown) => t is ConvexLPToken | ConvexStakedPhantomToken;
+export declare const isConvexLPToken: (t: unknown) => t is ConvexLPToken;
+export declare const isConvexStakedPhantomToken: (t: unknown) => t is ConvexStakedPhantomToken;
 export {};

package/lib/tokens/convex.js

@@ -1,12 +1,22 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convexTokens = void 0;
+exports.isConvexStakedPhantomToken = exports.isConvexLPToken = exports.isConvexToken = exports.convexTokens = void 0;
 var tradeTypes_1 = require("../pathfinder/tradeTypes");
 var tokenType_1 = require("./tokenType");
-exports.convexTokens = {
-    // CONVEX LP TOKENS
+var convexLpTokens = {
     cvx3Crv: {
-        name: "cvx3Crv",
+        name: "Convex cvx3Crv",
         decimals: 18,
         symbol: "cvx3Crv",
         type: tokenType_1.TokenType.CONVEX_LP_TOKEN,
@@ -28,7 +38,7 @@ exports.convexTokens = {
         ]
     },
     cvxsteCRV: {
-        name: "cvxsteCRV",
+        name: "Convex cvxsteCRV",
         decimals: 18,
         symbol: "cvxsteCRV",
         type: tokenType_1.TokenType.CONVEX_LP_TOKEN,
@@ -50,7 +60,7 @@ exports.convexTokens = {
         ]
     },
     cvxFRAX3CRV: {
-        name: "cvxFRAX3CRV-f",
+        name: "Convex cvxFRAX3CRV-f",
         decimals: 18,
         symbol: "cvxFRAX3CRV",
         type: tokenType_1.TokenType.CONVEX_LP_TOKEN,
@@ -72,7 +82,7 @@ exports.convexTokens = {
         ]
     },
     cvxLUSD3CRV: {
-        name: "cvxLUSD3CRV-f",
+        name: "Convex cvxLUSD3CRV-f",
         decimals: 18,
         symbol: "cvxLUSD3CRV",
         type: tokenType_1.TokenType.CONVEX_LP_TOKEN,
@@ -94,7 +104,7 @@ exports.convexTokens = {
         ]
     },
     cvxcrvPlain3andSUSD: {
-        name: "cvxcrvPlain3andSUSD",
+        name: "Convex cvxcrvPlain3andSUSD",
         decimals: 18,
         symbol: "cvxcrvPlain3andSUSD",
         type: tokenType_1.TokenType.CONVEX_LP_TOKEN,
@@ -116,7 +126,7 @@ exports.convexTokens = {
         ]
     },
     cvxgusd3CRV: {
-        name: "cvxgusd3CRV",
+        name: "Convex cvxgusd3CRV",
         decimals: 18,
         symbol: "cvxgusd3CRV",
         type: tokenType_1.TokenType.CONVEX_LP_TOKEN,
@@ -136,10 +146,11 @@ exports.convexTokens = {
                 tokenOut: "stkcvxgusd3CRV"
             }
         ]
-    },
-    // STAKED CONVEX
+    }
+};
+var convexStakedPhantomTokens = {
     stkcvx3Crv: {
-        name: "stkcvx3Crv",
+        name: "Convex stkcvx3Crv",
         decimals: 18,
         symbol: "stkcvx3Crv",
         type: tokenType_1.TokenType.CONVEX_STAKED_PHANTOM_TOKEN,
@@ -161,7 +172,7 @@ exports.convexTokens = {
         ]
     },
     stkcvxsteCRV: {
-        name: "stkcvxsteCRV",
+        name: "Convex stkcvxsteCRV",
         decimals: 18,
         symbol: "stkcvxsteCRV",
         type: tokenType_1.TokenType.CONVEX_STAKED_PHANTOM_TOKEN,
@@ -183,7 +194,7 @@ exports.convexTokens = {
         ]
     },
     stkcvxFRAX3CRV: {
-        name: "stkcvxFRAX3CRV-f",
+        name: "Convex stkcvxFRAX3CRV-f",
         decimals: 18,
         symbol: "stkcvxFRAX3CRV",
         type: tokenType_1.TokenType.CONVEX_STAKED_PHANTOM_TOKEN,
@@ -205,12 +216,12 @@ exports.convexTokens = {
         ]
     },
     stkcvxLUSD3CRV: {
-        name: "stkcvxLUSD3CRV-f",
+        name: "Convex stkcvxLUSD3CRV-f",
         decimals: 18,
         symbol: "stkcvxLUSD3CRV",
         type: tokenType_1.TokenType.CONVEX_STAKED_PHANTOM_TOKEN,
         pool: "CONVEX_LUSD3CRV_POOL",
-        pid: 32,
+        pid: 33,
         underlying: "LUSD3CRV",
         lpToken: "cvxLUSD3CRV",
         lpActions: [
@@ -227,7 +238,7 @@ exports.convexTokens = {
         ]
     },
     stkcvxcrvPlain3andSUSD: {
-        name: "stkcvxcrvPlain3andSUSD",
+        name: "Convex stkcvxcrvPlain3andSUSD",
         decimals: 18,
         symbol: "stkcvxcrvPlain3andSUSD",
         type: tokenType_1.TokenType.CONVEX_STAKED_PHANTOM_TOKEN,
@@ -249,7 +260,7 @@ exports.convexTokens = {
         ]
     },
     stkcvxgusd3CRV: {
-        name: "stkcvxgusd3CRV",
+        name: "Convex stkcvxgusd3CRV",
         decimals: 18,
         symbol: "stkcvxgusd3CRV",
         type: tokenType_1.TokenType.CONVEX_STAKED_PHANTOM_TOKEN,
@@ -271,3 +282,18 @@ exports.convexTokens = {
         ]
     }
 };
+exports.convexTokens = __assign(__assign({}, convexLpTokens), convexStakedPhantomTokens);
+var isConvexToken = function (t) {
+    return typeof t === "string" &&
+        !!exports.convexTokens[t];
+};
+exports.isConvexToken = isConvexToken;
+var isConvexLPToken = function (t) {
+    return typeof t === "string" && !!convexLpTokens[t];
+};
+exports.isConvexLPToken = isConvexLPToken;
+var isConvexStakedPhantomToken = function (t) {
+    return typeof t === "string" &&
+        !!convexStakedPhantomTokens[t];
+};
+exports.isConvexStakedPhantomToken = isConvexStakedPhantomToken;

package/lib/tokens/curveLP.d.ts

@@ -22,3 +22,4 @@ export declare type MetaCurveLPTokenData = {
 } & TokenBase;
 export declare const Curve3CrvUnderlyingTokenIndex: PartialRecord<SupportedToken, BigNumber>;
 export declare const curveTokens: Record<CurveLPToken, CurveLPTokenData | MetaCurveLPTokenData>;
+export declare const isCurveLPToken: (t: unknown) => t is CurveLPToken;

package/lib/tokens/curveLP.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.curveTokens = exports.Curve3CrvUnderlyingTokenIndex = void 0;
+exports.isCurveLPToken = exports.curveTokens = exports.Curve3CrvUnderlyingTokenIndex = void 0;
 var ethers_1 = require("ethers");
 var tradeTypes_1 = require("../pathfinder/tradeTypes");
 var tokenType_1 = require("./tokenType");
@@ -12,7 +12,7 @@ exports.Curve3CrvUnderlyingTokenIndex = {
 exports.curveTokens = {
     // CURVE LP TOKENS
     "3Crv": {
-        name: "3Crv",
+        name: "Curve 3Crv",
         decimals: 18,
         symbol: "3Crv",
         type: tokenType_1.TokenType.CURVE_LP,
@@ -36,7 +36,7 @@ exports.curveTokens = {
         ]
     },
     steCRV: {
-        name: "steCRV",
+        name: "Curve steCRV",
         decimals: 18,
         symbol: "steCRV",
         type: tokenType_1.TokenType.CURVE_LP,
@@ -60,7 +60,7 @@ exports.curveTokens = {
         ]
     },
     crvPlain3andSUSD: {
-        name: "crvPlain3andSUSD",
+        name: "Curve crvPlain3andSUSD",
         decimals: 18,
         symbol: "crvPlain3andSUSD",
         type: tokenType_1.TokenType.CURVE_LP,
@@ -86,7 +86,7 @@ exports.curveTokens = {
     },
     //  META CURVE LP TOKENS
     FRAX3CRV: {
-        name: "FRAX3CRV-f",
+        name: "Curve FRAX3CRV-f",
         decimals: 18,
         symbol: "FRAX3CRV",
         type: tokenType_1.TokenType.META_CURVE_LP,
@@ -110,7 +110,7 @@ exports.curveTokens = {
         ]
     },
     LUSD3CRV: {
-        name: "LUSD3CRV-f",
+        name: "Curve LUSD3CRV-f",
         decimals: 18,
         symbol: "LUSD3CRV",
         type: tokenType_1.TokenType.META_CURVE_LP,
@@ -124,7 +124,7 @@ exports.curveTokens = {
         ]
     },
     gusd3CRV: {
-        name: "gusd3CRV",
+        name: "Curve gusd3CRV",
         decimals: 18,
         symbol: "gusd3CRV",
         type: tokenType_1.TokenType.META_CURVE_LP,
@@ -148,3 +148,7 @@ exports.curveTokens = {
         ]
     }
 };
+var isCurveLPToken = function (t) {
+    return typeof t === "string" && !!exports.curveTokens[t];
+};
+exports.isCurveLPToken = isCurveLPToken;

package/lib/tokens/normal.d.ts

@@ -9,3 +9,4 @@ export declare type NormalTokenData = {
     lpActions?: Array<TradeAction>;
 } & TokenBase;
 export declare const normalTokens: Record<NormalToken, NormalTokenData>;
+export declare const isNormalToken: (t: unknown) => t is NormalToken;

package/lib/tokens/normal.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalTokens = void 0;
+exports.isNormalToken = exports.normalTokens = void 0;
 var tradeTypes_1 = require("../pathfinder/tradeTypes");
 var tokenType_1 = require("./tokenType");
 exports.normalTokens = {
@@ -714,3 +714,7 @@ exports.normalTokens = {
         ]
     }
 };
+var isNormalToken = function (t) {
+    return typeof t === "string" && !!exports.normalTokens[t];
+};
+exports.isNormalToken = isNormalToken;