@gearbox-protocol/sdk 0.0.102 → 0.0.103

package/lib/core/price.js

@@ -2,8 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calcTotalPrice = void 0;
 var ethers_1 = require("ethers");
+var constants_1 = require("./constants");
 var calcTotalPrice = function (price, amount, decimals) {
     if (decimals === void 0) { decimals = 18; }
-    return amount.mul(price).div(ethers_1.BigNumber.from(10).pow(decimals));
+    return amount
+        .mul(constants_1.WAD)
+        .mul(price)
+        .div(ethers_1.BigNumber.from(10).pow(decimals))
+        .div(constants_1.PRICE_DECIMALS);
 };
 exports.calcTotalPrice = calcTotalPrice;

package/lib/core/strategy.d.ts

@@ -26,11 +26,9 @@ export declare class Strategy {
     leveragableCollateral: Array<string>;
     baseAssets: Array<string>;
     constructor(payload: StrategyPayload);
-    maxAPY(apy: number, maxLeverage: number, poolApy: PoolList): number;
+    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 roi;
-    private minBorrowApy;
     private farmLev;
     private inBaseAssets;
     private inLeveragableAssets;

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 constants_1 = require("../core/constants");
-var price_1 = require("../core/price");
+var constants_1 = require("./constants");
+var price_1 = require("./price");
 var Strategy = /** @class */ (function () {
     function Strategy(payload) {
         this.apy = payload.apy;
@@ -14,14 +14,15 @@ var Strategy = /** @class */ (function () {
         this.leveragableCollateral = payload.leveragableCollateral;
         this.baseAssets = payload.baseAssets;
     }
-    Strategy.prototype.maxAPY = function (apy, maxLeverage, poolApy) {
-        var minApy = this.minBorrowApy(poolApy);
-        return this.roi(apy, maxLeverage, maxLeverage - constants_1.LEVERAGE_DECIMALS, minApy);
+    Strategy.prototype.maxAPY = function (maxLeverage, poolApy) {
+        var minApy = minBorrowApy(poolApy);
+        return roi(this.apy || 0, maxLeverage, maxLeverage - constants_1.LEVERAGE_DECIMALS, minApy);
     };
     Strategy.prototype.overallAPY = function (apy, leverage, depositCollateral, borrowAPY) {
         var farmLev = this.farmLev(leverage, depositCollateral);
-        return this.roi(apy, farmLev, leverage - constants_1.LEVERAGE_DECIMALS, borrowAPY);
+        return roi(apy, farmLev, leverage - constants_1.LEVERAGE_DECIMALS, borrowAPY);
     };
+    // eslint-disable-next-line class-methods-use-this
     Strategy.prototype.liquidationPrice = function (borrowed, collateral, lp, ltCollateral) {
         var borrowedMoney = (0, price_1.calcTotalPrice)(borrowed.price, borrowed.amount, borrowed.decimals);
         var collateralMoney = (0, price_1.calcTotalPrice)(collateral.price, collateral.amount, collateral.decimals)
@@ -32,13 +33,6 @@ var Strategy = /** @class */ (function () {
             ? borrowedMoney.sub(collateralMoney).mul(constants_1.WAD).div(lpMoney)
             : ethers_1.BigNumber.from(0);
     };
-    Strategy.prototype.roi = function (apy, farmLev, debtLev, borrowAPY) {
-        return (apy * farmLev - borrowAPY * debtLev) / constants_1.LEVERAGE_DECIMALS;
-    };
-    Strategy.prototype.minBorrowApy = function (poolApy) {
-        var apys = Object.values(poolApy).sort(function (a, b) { return a.borrowRate - b.borrowRate; });
-        return apys.length > 0 ? apys[0].borrowRate : 0;
-    };
     Strategy.prototype.farmLev = function (leverage, depositCollateral) {
         return this.inBaseAssets(depositCollateral) ||
             this.inLeveragableAssets(depositCollateral)
@@ -54,3 +48,10 @@ var Strategy = /** @class */ (function () {
     return Strategy;
 }());
 exports.Strategy = Strategy;
+function roi(apy, farmLev, debtLev, borrowAPY) {
+    return (apy * farmLev - borrowAPY * debtLev) / constants_1.LEVERAGE_DECIMALS;
+}
+function minBorrowApy(poolApy) {
+    var apys = Object.values(poolApy).sort(function (a, b) { return a.borrowRate - b.borrowRate; });
+    return apys.length > 0 ? apys[0].borrowRate : 0;
+}

package/lib/core/tokenDistributor.js

@@ -5,5 +5,5 @@ var VotingPower;
 (function (VotingPower) {
     VotingPower[VotingPower["A"] = 0] = "A";
     VotingPower[VotingPower["B"] = 1] = "B";
-    VotingPower[VotingPower["ZERO_VOTING_POWER"] = 2] = "ZERO_VOTING_POWER";
+    VotingPower[VotingPower["ZERO_VOTING_POWER"] = 2] = "ZERO_VOTING_POWER"; // zero voting power & B-type vesting parameters
 })(VotingPower = exports.VotingPower || (exports.VotingPower = {}));

package/lib/core/transactions.d.ts

@@ -2,7 +2,7 @@ import { BigNumber } from "ethers";
 import { TokenData } from "../tokens/tokenData";
 import { EVMTx, EVMTxProps } from "./eventOrTx";
 export interface TxSerialized {
-    type: "TxAddLiquidity" | "TxRemoveLiquidity" | "TxSwap" | "TxAddCollateral" | "TxIncreaseBorrowAmount" | "TxOpenAccount" | "TxRepayAccount" | "TxCloseAccount" | "TxApprove";
+    type: "TxAddLiquidity" | "TxRemoveLiquidity" | "TxSwap" | "TxAddCollateral" | "TxIncreaseBorrowAmount" | "TxOpenAccount" | "TxRepayAccount" | "TxCloseAccount" | "TxApprove" | "TxOpenMultitokenAccount";
     content: string;
 }
 export declare class TxSerializer {
@@ -97,13 +97,28 @@ export declare class TxOpenAccount extends EVMTx {
     toString(tokenData: Record<string, TokenData>): string;
     serialize(): TxSerialized;
 }
+interface TxOpenMultitokenAccountProps extends EVMTxProps {
+    borrowedAmount: BigNumber;
+    creditManager: string;
+    underlyingToken: string;
+    assets: Array<string>;
+}
+export declare class TxOpenMultitokenAccount extends EVMTx {
+    readonly borrowedAmount: BigNumber;
+    readonly creditManager: string;
+    readonly underlyingToken: string;
+    readonly assets: Array<string>;
+    constructor(opts: TxOpenMultitokenAccountProps);
+    toString(tokenData: Record<string, TokenData>): string;
+    serialize(): TxSerialized;
+}
 interface RepayAccountProps extends EVMTxProps {
     creditManager: string;
 }
 export declare class TxRepayAccount extends EVMTx {
     readonly creditManager: string;
     constructor(opts: RepayAccountProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
     serialize(): TxSerialized;
 }
 interface CloseAccountProps extends EVMTxProps {
@@ -112,7 +127,7 @@ interface CloseAccountProps extends EVMTxProps {
 export declare class TxCloseAccount extends EVMTx {
     readonly creditManager: string;
     constructor(opts: CloseAccountProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
     serialize(): TxSerialized;
 }
 interface ApproveProps extends EVMTxProps {

package/lib/core/transactions.js

@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TxApprove = exports.TxCloseAccount = exports.TxRepayAccount = exports.TxOpenAccount = exports.TxIncreaseBorrowAmount = exports.TxAddCollateral = exports.TXSwap = exports.TxRemoveLiquidity = exports.TxAddLiquidity = exports.TxSerializer = void 0;
+exports.TxApprove = exports.TxCloseAccount = exports.TxRepayAccount = exports.TxOpenMultitokenAccount = exports.TxOpenAccount = exports.TxIncreaseBorrowAmount = exports.TxAddCollateral = exports.TXSwap = exports.TxRemoveLiquidity = exports.TxAddLiquidity = exports.TxSerializer = void 0;
 var ethers_1 = require("ethers");
 var formatter_1 = require("../utils/formatter");
 var eventOrTx_1 = require("./eventOrTx");
@@ -49,6 +49,8 @@ var TxSerializer = /** @class */ (function () {
                     return new TxCloseAccount(params);
                 case "TxApprove":
                     return new TxApprove(params);
+                case "TxOpenMultitokenAccount":
+                    return new TxOpenMultitokenAccount(params);
                 default:
                     throw new Error("Unknown transaction for parsing");
             }
@@ -231,6 +233,40 @@ var TxOpenAccount = /** @class */ (function (_super) {
     return TxOpenAccount;
 }(eventOrTx_1.EVMTx));
 exports.TxOpenAccount = TxOpenAccount;
+var TxOpenMultitokenAccount = /** @class */ (function (_super) {
+    __extends(TxOpenMultitokenAccount, _super);
+    function TxOpenMultitokenAccount(opts) {
+        var _this = _super.call(this, {
+            block: opts.block,
+            txHash: opts.txHash,
+            txStatus: opts.txStatus,
+            timestamp: opts.timestamp
+        }) || this;
+        _this.borrowedAmount = ethers_1.BigNumber.from(opts.borrowedAmount);
+        _this.underlyingToken = opts.underlyingToken;
+        _this.creditManager = opts.creditManager;
+        _this.assets = opts.assets;
+        return _this;
+    }
+    TxOpenMultitokenAccount.prototype.toString = function (tokenData) {
+        var underlyingToken = tokenData[this.underlyingToken.toLowerCase()];
+        var assetSymbols = this.assets.reduce(function (acc, assetAddress) {
+            var token = tokenData[assetAddress.toLowerCase()];
+            if (token)
+                acc.push(token.symbol);
+            return acc;
+        }, []);
+        return "Credit account ".concat((0, contractsRegister_1.getContractName)(this.creditManager), ": opening. Borrowed amount: ").concat((0, formatter_1.formatBN)(this.borrowedAmount, (underlyingToken === null || underlyingToken === void 0 ? void 0 : underlyingToken.decimals) || 18), " ").concat(underlyingToken === null || underlyingToken === void 0 ? void 0 : underlyingToken.symbol, "; assets: ").concat(assetSymbols.join(", "));
+    };
+    TxOpenMultitokenAccount.prototype.serialize = function () {
+        return {
+            type: "TxOpenMultitokenAccount",
+            content: JSON.stringify(this)
+        };
+    };
+    return TxOpenMultitokenAccount;
+}(eventOrTx_1.EVMTx));
+exports.TxOpenMultitokenAccount = TxOpenMultitokenAccount;
 var TxRepayAccount = /** @class */ (function (_super) {
     __extends(TxRepayAccount, _super);
     function TxRepayAccount(opts) {
@@ -243,7 +279,7 @@ var TxRepayAccount = /** @class */ (function (_super) {
         _this.creditManager = opts.creditManager;
         return _this;
     }
-    TxRepayAccount.prototype.toString = function (_) {
+    TxRepayAccount.prototype.toString = function () {
         return "Credit account ".concat((0, contractsRegister_1.getContractName)(this.creditManager), ": Repaying account");
     };
     TxRepayAccount.prototype.serialize = function () {
@@ -267,7 +303,7 @@ var TxCloseAccount = /** @class */ (function (_super) {
         _this.creditManager = opts.creditManager;
         return _this;
     }
-    TxCloseAccount.prototype.toString = function (_) {
+    TxCloseAccount.prototype.toString = function () {
         return "Credit account ".concat((0, contractsRegister_1.getContractName)(this.creditManager), ": Closing account");
     };
     TxCloseAccount.prototype.serialize = function () {

package/lib/index.d.ts

@@ -23,12 +23,10 @@ export * from "./payload/token";
 export * from "./utils/formatter";
 export * from "./utils/loading";
 export * from "./utils/validate";
-export * from "./utils/events";
 export * from "./utils/math";
 export * from "./payload/graphPayload";
 export * from "./types/index";
 export * from "./core/strategy";
-export type { IDataCompressor, IWETHGateway } from "./types";
 export { TokenType } from "./tokens/tokenType";
 export * from "./tokens/token";
 export * from "./tokens/tokenData";
@@ -43,6 +41,7 @@ export * from "./apy/convexAPY";
 export * from "./core/history";
 export * from "./utils/multicall";
 export * from "./utils/types";
+export * from "./utils/errors";
 export { callRepeater } from "./utils/repeater";
 export { getContractName } from "./contracts/contractsRegister";
 export { AdapterInterface } from "./contracts/adapters";

package/lib/index.js

@@ -40,7 +40,6 @@ __exportStar(require("./payload/token"), exports);
 __exportStar(require("./utils/formatter"), exports);
 __exportStar(require("./utils/loading"), exports);
 __exportStar(require("./utils/validate"), exports);
-__exportStar(require("./utils/events"), exports);
 __exportStar(require("./utils/math"), exports);
 __exportStar(require("./payload/graphPayload"), exports);
 __exportStar(require("./types/index"), exports);
@@ -61,6 +60,7 @@ __exportStar(require("./apy/convexAPY"), exports);
 __exportStar(require("./core/history"), exports);
 __exportStar(require("./utils/multicall"), exports);
 __exportStar(require("./utils/types"), exports);
+__exportStar(require("./utils/errors"), exports);
 var repeater_1 = require("./utils/repeater");
 Object.defineProperty(exports, "callRepeater", { enumerable: true, get: function () { return repeater_1.callRepeater; } });
 var contractsRegister_1 = require("./contracts/contractsRegister");

package/lib/oracles/priceFeeds.js

@@ -446,7 +446,7 @@ exports.priceFeedsByNetwork = {
             curveSymbol: "gusd3CRV"
         }
     },
-    //GEARBOX
+    // GEARBOX
     dDAI: {
         priceFeedETH: {
             type: oracles_1.OracleType.CHAINLINK_ORACLE,

package/lib/pathfinder/convexLP.d.ts

@@ -1,4 +1,4 @@
-import { LPWithdrawPathFinder, Path } from "./path";
+import type { LPWithdrawPathFinder, Path } from "./path";
 export declare class ConvexLPPathFinder implements LPWithdrawPathFinder {
     findWithdrawPaths(p: Path): Promise<Array<Path>>;
 }

package/lib/pathfinder/convexLP.js

@@ -38,40 +38,37 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConvexLPPathFinder = void 0;
 var convex_1 = require("../tokens/convex");
+var mappers_1 = require("../utils/mappers");
 var ConvexLPPathFinder = /** @class */ (function () {
     function ConvexLPPathFinder() {
     }
+    // eslint-disable-next-line class-methods-use-this
     ConvexLPPathFinder.prototype.findWithdrawPaths = function (p) {
         return __awaiter(this, void 0, void 0, function () {
-            var pids, _i, _a, _b, cvxToken, tokenData, currentBalance;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        pids = new Set();
-                        for (_i = 0, _a = Object.entries(convex_1.convexTokens); _i < _a.length; _i++) {
-                            _b = _a[_i], cvxToken = _b[0], tokenData = _b[1];
-                            currentBalance = p.popBalance(cvxToken);
-                            if (currentBalance.gt(1)) {
-                                pids.add(tokenData.pid);
-                            }
-                        }
-                        return [4 /*yield*/, p.withdrawTokens()];
-                    case 1: 
-                    // const convexPathFinder = ConvexPathFinder__factory.connect(
-                    //     pathFindersByNetwork[p.networkType].CONVEX_PATH_FINDER,
-                    //     p.provider
-                    // );
-                    // const tokenBalances = await convexPathFinder.calcRewards(
-                    //     p.creditAccount.addr,
-                    //     Array.from(pids)
-                    // );
-                    // for (let balance of tokenBalances) {
-                    //     p.balances[balance.token] = p.balances[balance.token].add(
-                    //         balance.balance
-                    //     );
-                    // }
-                    return [2 /*return*/, _c.sent()];
-                }
+            var pids;
+            return __generator(this, function (_a) {
+                pids = (0, mappers_1.objectEntries)(convex_1.convexTokens).reduce(function (acc, _a) {
+                    var cvxToken = _a[0], tokenData = _a[1];
+                    var currentBalance = p.popBalance(cvxToken);
+                    if (currentBalance.gt(1)) {
+                        pids.add(tokenData.pid);
+                    }
+                    return acc;
+                }, new Set());
+                // const convexPathFinder = ConvexPathFinder__factory.connect(
+                //     pathFindersByNetwork[p.networkType].CONVEX_PATH_FINDER,
+                //     p.provider
+                // );
+                // const tokenBalances = await convexPathFinder.calcRewards(
+                //     p.creditAccount.addr,
+                //     Array.from(pids)
+                // );
+                // for (let balance of tokenBalances) {
+                //     p.balances[balance.token] = p.balances[balance.token].add(
+                //         balance.balance
+                //     );
+                // }
+                return [2 /*return*/, p.withdrawTokens()];
             });
         });
     };

package/lib/pathfinder/curveLP.d.ts

@@ -1,4 +1,4 @@
-import { LPWithdrawPathFinder, Path } from "./path";
+import type { LPWithdrawPathFinder, Path } from "./path";
 import { CurveLPToken } from "../tokens/curveLP";
 import { CurvePoolContract } from "../contracts/contracts";
 export declare class CurvePathFinder implements LPWithdrawPathFinder {

package/lib/pathfinder/curveLP.js

@@ -45,12 +45,11 @@ var types_1 = require("../types");
 var CurvePathFinder = /** @class */ (function () {
     function CurvePathFinder(token) {
         this.lpToken = token;
-        var curvePools = curveLP_1.curveTokens[this.lpToken].lpActions.filter(function (a) { return a.type == tradeTypes_1.TradeType.CurveWithdrawLP; });
+        var curvePools = curveLP_1.curveTokens[this.lpToken].lpActions.filter(function (a) { return a.type === tradeTypes_1.TradeType.CurveWithdrawLP; });
         if (curvePools.length !== 1)
             throw new Error("Cant find Withdrawer");
         this.contract = curvePools[0].contract;
-        var wrapper = contracts_1.contractParams[curvePools[0].contract]
-            .wrapper;
+        var wrapper = contracts_1.contractParams[curvePools[0].contract].wrapper;
         if (wrapper) {
             this.contract = wrapper;
         }
@@ -66,9 +65,8 @@ var CurvePathFinder = /** @class */ (function () {
                         lpBalance = p.popBalance(this.lpToken);
                         multiCallContract = new multicall_1.MultiCallContract(contracts_1.contractsByAddress[this.contract], types_1.ICurvePool__factory.createInterface(), p.provider);
                         data = [];
-                        for (i = 0; i < nCoins; i++) {
+                        for (i = 0; i < nCoins; i += 1) {
                             data.push({
-                                // @ts-ignore
                                 method: "calc_withdraw_one_coin(uint256,int128)",
                                 params: [lpBalance, i]
                             });
@@ -76,9 +74,9 @@ var CurvePathFinder = /** @class */ (function () {
                         return [4 /*yield*/, multiCallContract.call(data)];
                     case 1:
                         balances = _a.sent();
-                        console.log(balances);
+                        console.debug(balances);
                         paths = [];
-                        for (i = 0; i < nCoins; i++) {
+                        for (i = 0; i < nCoins; i += 1) {
                             newPath = p.clone();
                             // newPath.balances[coins[i]] = newPath.balances[coins[i]].add(balances[i]);
                             // newPath.calls.push({

package/lib/pathfinder/path.d.ts

@@ -24,7 +24,7 @@ export declare class Path {
         totalGasLimit: number;
     });
     popBalance(token: SupportedToken): BigNumber;
-    private comparedByPriority;
+    private static comparedByPriority;
     static findBestPath(creditAccount: CreditAccountData, creditManager: CreditManagerData, provider: ethers.providers.Provider): Promise<void>;
     withdrawTokens(): Promise<Array<Path>>;
     clone(): Path;

package/lib/pathfinder/path.js

@@ -76,15 +76,15 @@ var Path = /** @class */ (function () {
         this.balances[token] = ethers_1.BigNumber.from(1);
         return currentBalance.sub(1);
     };
-    Path.prototype.comparedByPriority = function (_a, _b) {
-        var tokenA = _a[0], _balanceA = _a[1];
-        var tokenB = _b[0], _balanceB = _b[1];
+    Path.comparedByPriority = function (_a, _b) {
+        var tokenA = _a[0];
+        var tokenB = _b[0];
         var priorityTokenA = priority_1.priority[token_1.supportedTokens[tokenA].type];
         var priorityTokenB = priority_1.priority[token_1.supportedTokens[tokenB].type];
         if (priorityTokenA > priorityTokenB) {
             return -1;
         }
-        else if (priorityTokenA < priorityTokenB) {
+        if (priorityTokenA < priorityTokenB) {
             return 1;
         }
         return 0;
@@ -123,8 +123,8 @@ var Path = /** @class */ (function () {
                     case 2:
                         lpPaths = _a.sent();
                         pathFinder = types_1.PathFinder__factory.connect(contracts_1.pathFindersByNetwork[networkType].PATH_FINDER, provider);
-                        console.log(lpPaths);
-                        console.log(pathFinder);
+                        console.debug(lpPaths);
+                        console.debug(pathFinder);
                         return [2 /*return*/];
                 }
             });
@@ -134,43 +134,39 @@ var Path = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             var existingTokens, nextToken, lpPathFinder;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        existingTokens = Object.entries(this.balances)
-                            .filter(function (_a) {
-                            var _token = _a[0], balance = _a[1];
-                            return balance.gt(1);
-                        })
-                            .sort(this.comparedByPriority);
-                        // TODO: Add checks for lenght
-                        if (existingTokens.length === 0)
-                            throw new Error("No tokens with balance >1");
-                        nextToken = existingTokens[0][0];
-                        // Get balances and keep non-zero only
-                        // Find token with highest priority
-                        // Get token type of this token
-                        switch (token_1.supportedTokens[nextToken].type) {
-                            case tokenType_1.TokenType.NORMAL_TOKEN:
-                            case tokenType_1.TokenType.CONNECTOR:
-                                return [2 /*return*/, [this]];
-                            case tokenType_1.TokenType.YEARN_VAULT_OF_CURVE_LP:
-                            case tokenType_1.TokenType.YEARN_VAULT_OF_META_CURVE_LP:
-                            case tokenType_1.TokenType.YEARN_VAULT:
-                                lpPathFinder = new yVault_1.YearnVaultPathFinder(nextToken);
-                                break;
-                            case tokenType_1.TokenType.CONVEX_LP_TOKEN:
-                                lpPathFinder = new convexLP_1.ConvexLPPathFinder();
-                                break;
-                            case tokenType_1.TokenType.META_CURVE_LP:
-                            case tokenType_1.TokenType.CURVE_LP:
-                                lpPathFinder = new curveLP_1.CurvePathFinder(nextToken);
-                                break;
-                            default:
-                                throw new Error("Token type not supported yet");
-                        }
-                        return [4 /*yield*/, lpPathFinder.findWithdrawPaths(this)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                existingTokens = Object.entries(this.balances)
+                    .filter(function (_a) {
+                    var balance = _a[1];
+                    return balance.gt(1);
+                })
+                    .sort(Path.comparedByPriority);
+                // TODO: Add checks for lenght
+                if (existingTokens.length === 0)
+                    throw new Error("No tokens with balance >1");
+                nextToken = existingTokens[0][0];
+                // Get balances and keep non-zero only
+                // Find token with highest priority
+                // Get token type of this token
+                switch (token_1.supportedTokens[nextToken].type) {
+                    case tokenType_1.TokenType.NORMAL_TOKEN:
+                    case tokenType_1.TokenType.CONNECTOR:
+                        return [2 /*return*/, [this]];
+                    case tokenType_1.TokenType.YEARN_VAULT_OF_CURVE_LP:
+                    case tokenType_1.TokenType.YEARN_VAULT_OF_META_CURVE_LP:
+                    case tokenType_1.TokenType.YEARN_VAULT:
+                        lpPathFinder = new yVault_1.YearnVaultPathFinder(nextToken);
+                        break;
+                    case tokenType_1.TokenType.CONVEX_LP_TOKEN:
+                        lpPathFinder = new convexLP_1.ConvexLPPathFinder();
+                        break;
+                    case tokenType_1.TokenType.META_CURVE_LP:
+                    case tokenType_1.TokenType.CURVE_LP:
+                        lpPathFinder = new curveLP_1.CurvePathFinder(nextToken);
+                        break;
+                    default:
+                        throw new Error("Token type not supported yet");
                 }
+                return [2 /*return*/, lpPathFinder.findWithdrawPaths(this)];
             });
         });
     };

package/lib/pathfinder/trade.d.ts

@@ -1,5 +1,4 @@
-import { BigNumber } from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
+import { BigNumber, BytesLike } from "ethers";
 import { SwapType } from "./tradeTypes";
 export interface CloseTradePath {
     path: Array<string>;

package/lib/pathfinder/tradeTypes.d.ts

@@ -1,8 +1,8 @@
-import { ConvexPoolContract, CurvePoolContract, UniswapV2Contract, YearnVaultContract } from "../contracts/contracts";
-import { NormalToken } from "../tokens/normal";
-import { CurveLPToken } from "../tokens/curveLP";
-import { YearnLPToken } from "../tokens/yearn";
-import { ConvexLPToken, ConvexStakedPhantomToken } from "../tokens/convex";
+import type { ConvexPoolContract, CurvePoolContract, UniswapV2Contract, YearnVaultContract } from "../contracts/contracts";
+import type { NormalToken } from "../tokens/normal";
+import type { CurveLPToken } from "../tokens/curveLP";
+import type { YearnLPToken } from "../tokens/yearn";
+import type { ConvexLPToken, ConvexStakedPhantomToken } from "../tokens/convex";
 export declare enum TradeType {
     UniswapV2Swap = 0,
     UniswapV3Swap = 1,

package/lib/pathfinder/yVault.d.ts

@@ -1,10 +1,10 @@
-import { Path, LPWithdrawPathFinder } from "./path";
 import { YearnLPToken } from "../tokens/yearn";
 import { NormalToken } from "../tokens/normal";
 import { CurveLPToken } from "../tokens/curveLP";
+import type { Path, LPWithdrawPathFinder } from "./path";
 export declare class YearnVaultPathFinder implements LPWithdrawPathFinder {
     _vault: YearnLPToken;
     token: NormalToken | CurveLPToken;
     constructor(vault: YearnLPToken);
-    findWithdrawPaths(p: Path): Promise<Array<Path>>;
+    findWithdrawPaths(path: Path): Promise<Array<Path>>;
 }

package/lib/pathfinder/yVault.js

@@ -38,10 +38,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.YearnVaultPathFinder = void 0;
 var ethers_1 = require("ethers");
-var types_1 = require("../types");
 var yearn_1 = require("../tokens/yearn");
 var token_1 = require("../tokens/token");
 var multicall_1 = require("../utils/multicall");
+var mappers_1 = require("../utils/mappers");
+var types_1 = require("../types");
 var YearnVaultPathFinder = /** @class */ (function () {
     function YearnVaultPathFinder(vault) {
         this._vault = vault;
@@ -49,23 +50,26 @@ var YearnVaultPathFinder = /** @class */ (function () {
         // Yearn Vault only has one lp action
         this.token = currentTokenData.underlying;
     }
-    YearnVaultPathFinder.prototype.findWithdrawPaths = function (p) {
+    // eslint-disable-next-line class-methods-use-this
+    YearnVaultPathFinder.prototype.findWithdrawPaths = function (path) {
         return __awaiter(this, void 0, void 0, function () {
-            var vaultBalances, _i, _a, _b, yVault, tokenData, currentBalance, vaultList, multicallData, prices, i, vault, vb, tokenAddress, adapterAddress, callData;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var p, vaultBalances, vaultList, multicallData, prices, i, vault, vb, tokenAddress, adapterAddress, callData;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        vaultBalances = {};
-                        for (_i = 0, _a = Object.entries(yearn_1.yearnTokens); _i < _a.length; _i++) {
-                            _b = _a[_i], yVault = _b[0], tokenData = _b[1];
-                            currentBalance = p.popBalance(yVault);
+                        p = Object.assign(Object.create(Object.getPrototypeOf(path)), path);
+                        vaultBalances = (0, mappers_1.objectEntries)(yearn_1.yearnTokens).reduce(function (acc, _a) {
+                            var yVault = _a[0], tokenData = _a[1];
+                            var typedVault = yVault;
+                            var currentBalance = p.popBalance(typedVault);
                             if (currentBalance.gt(1)) {
-                                vaultBalances[yVault] = {
+                                acc[typedVault] = {
                                     token: tokenData.underlying,
                                     balance: currentBalance
                                 };
                             }
-                        }
+                            return acc;
+                        }, {});
                         vaultList = Object.keys(vaultBalances);
                         multicallData = vaultList
                             .map(function (t) { return token_1.tokenDataByNetwork[p.networkType][t]; })
@@ -76,8 +80,8 @@ var YearnVaultPathFinder = /** @class */ (function () {
                         }); });
                         return [4 /*yield*/, (0, multicall_1.multicall)(multicallData, p.provider)];
                     case 1:
-                        prices = _c.sent();
-                        for (i = 0; i < vaultList.length; i++) {
+                        prices = _a.sent();
+                        for (i = 0; i < vaultList.length; i += 1) {
                             vault = vaultList[i];
                             vb = vaultBalances[vault];
                             p.balances[vb.token] = (p.balances[vb.token] || ethers_1.BigNumber.from(0)).add(ethers_1.BigNumber.from((vb === null || vb === void 0 ? void 0 : vb.balance) || 0).mul(prices[i]));
@@ -86,8 +90,7 @@ var YearnVaultPathFinder = /** @class */ (function () {
                             callData = types_1.IYVault__factory.createInterface().encodeFunctionData("withdraw()");
                             p.calls.push({ target: adapterAddress, callData: callData });
                         }
-                        return [4 /*yield*/, p.withdrawTokens()];
-                    case 2: return [2 /*return*/, _c.sent()];
+                        return [2 /*return*/, p.withdrawTokens()];
                 }
             });
         });