@gearbox-protocol/sdk 0.0.101 → 0.0.104

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,14 @@ export * from "./apy/convexAPY";
 export * from "./core/history";
 export * from "./utils/multicall";
 export * from "./utils/types";
+export * from "./utils/errors";
+export * from "./strategies/convex";
+export * from "./strategies/creditFacade";
+export * from "./strategies/curve";
+export * from "./strategies/lido";
+export * from "./strategies/uniswapV2";
+export * from "./strategies/uniswapV3";
+export * from "./strategies/yearn";
 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,14 @@ __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);
+__exportStar(require("./strategies/convex"), exports);
+__exportStar(require("./strategies/creditFacade"), exports);
+__exportStar(require("./strategies/curve"), exports);
+__exportStar(require("./strategies/lido"), exports);
+__exportStar(require("./strategies/uniswapV2"), exports);
+__exportStar(require("./strategies/uniswapV3"), exports);
+__exportStar(require("./strategies/yearn"), 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;
-            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,21 +80,17 @@ 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]));
-                            // !!!!!!!!!
-                            // p.calls.push({
-                            //   targetContract:
-                            //     p.creditManager.adapters[tokenDataByNetwork[p.networkType][vault]],
-                            //   callData:
-                            //     IYVault__factory.createInterface().encodeFunctionData("withdraw()")
-                            // });
+                            tokenAddress = token_1.tokenDataByNetwork[p.networkType][vault];
+                            adapterAddress = p.creditManager.adapters[tokenAddress];
+                            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()];
                 }
             });
         });

package/lib/payload/creditAccount.d.ts

@@ -1,4 +1,4 @@
-import { CreditAccountDataStructOutput } from "../types/contracts/core/DataCompressor";
-export declare type TokenBalancePayload = CreditAccountDataStructOutput["balances"];
-export declare type CreditAccountDataPayload = CreditAccountDataStructOutput;
-export declare type CreditAccountDataExtendedPayload = CreditAccountDataStructOutput;
+import { CreditAccountDataStruct } from "../types/contracts/core/DataCompressor";
+export declare type TokenBalancePayload = CreditAccountDataStruct["balances"];
+export declare type CreditAccountDataPayload = CreditAccountDataStruct;
+export declare type CreditAccountDataExtendedPayload = CreditAccountDataStruct;

package/lib/payload/creditManager.d.ts

@@ -1,21 +1,11 @@
-import { BigNumberish, BigNumber } from "ethers";
-import { CreditManagerDataStructOutput } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
+import { BigNumberish } from "ethers";
+import { CreditManagerDataStruct } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
 export interface AdapterPayload {
     allowedContract: string;
     adapter: string;
 }
-export declare type CreditManagerDataPayload = CreditManagerDataStructOutput;
+export declare type CreditManagerDataPayload = CreditManagerDataStruct;
 export interface CreditManagerStatPayload extends CreditManagerDataPayload {
-    addr: string;
-    underlyingToken?: string;
-    isWETH: boolean;
-    canBorrow: boolean;
-    borrowRate: BigNumber;
-    minAmount: BigNumber;
-    maxAmount: BigNumber;
-    maxLeverageFactor: BigNumber;
-    availableLiquidity: BigNumber;
-    allowedTokens: Array<string>;
     allowedContracts?: Array<string>;
     uniqueUsers: number;
     openedAccountsCount?: number;

package/lib/payload/pool.d.ts

@@ -1,2 +1,2 @@
-import { PoolDataStructOutput } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
-export declare type PoolDataPayload = PoolDataStructOutput;
+import { PoolDataStruct } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
+export declare type PoolDataPayload = PoolDataStruct;

package/lib/strategies/convex.d.ts

@@ -1,4 +1,7 @@
 import { BigNumberish } from "ethers";
+import { ConvexPoolContract } from "src/contracts/contracts";
+import { NetworkType } from "src/core/constants";
+import { CreditManagerData } from "src/core/creditManager";
 import { MultiCallStruct } from "../types/contracts/interfaces/ICreditFacade.sol/ICreditFacade";
 export declare class ConvexBoosterCalls {
     static deposit(pid: BigNumberish, amount: BigNumberish, stake: boolean): string;
@@ -20,6 +23,7 @@ export declare class ConvexClaimZapCalls {
 export declare class ConvexBoosterMulticaller {
     private readonly _address;
     constructor(address: string);
+    static connect(address: string): ConvexBoosterMulticaller;
     deposit(pid: BigNumberish, amount: BigNumberish, stake: boolean): MultiCallStruct;
     depositAll(pid: BigNumberish, stake: boolean): MultiCallStruct;
     withdraw(pid: BigNumberish, amount: BigNumberish): MultiCallStruct;
@@ -28,6 +32,7 @@ export declare class ConvexBoosterMulticaller {
 export declare class ConvexPoolMulticaller {
     private readonly _address;
     constructor(address: string);
+    static connect(address: string): ConvexPoolMulticaller;
     stake(amount: BigNumberish): MultiCallStruct;
     stakeAll(): MultiCallStruct;
     withdraw(amount: BigNumberish, claim: boolean): MultiCallStruct;
@@ -41,5 +46,12 @@ export declare class ConvexPoolMulticaller {
 export declare class ConvexClaimZapMulticaller {
     private readonly _address;
     constructor(address: string);
+    static connect(address: string): ConvexClaimZapMulticaller;
     claimRewards(rewardContracts: Array<string>, extraRewardContracts: Array<string>, tokenRewardContracts: Array<string>, tokenRewardTokens: Array<string>, depositCrvMaxAmount: BigNumberish, minAmountOut: BigNumberish, depositCvxMaxAmount: BigNumberish, spendCvxAmount: BigNumberish, options: BigNumberish): MultiCallStruct;
 }
+export declare class ConvexStrategies {
+    static underlyingToStakedConvex(data: CreditManagerData, network: NetworkType, convexPool: ConvexPoolContract, underlyingAmount: BigNumberish): MultiCallStruct[];
+    static stakedConvexToUnderlying(data: CreditManagerData, network: NetworkType, convexPool: ConvexPoolContract, convexLpAmount: BigNumberish, sellRewards: boolean): MultiCallStruct[];
+    static allStakedConvexToUnderlying(data: CreditManagerData, network: NetworkType, convexPool: ConvexPoolContract, sellRewards: boolean): MultiCallStruct[];
+    static sellRewards(data: CreditManagerData, network: NetworkType, convexPool: ConvexPoolContract): MultiCallStruct[];
+}

package/lib/strategies/convex.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConvexClaimZapMulticaller = exports.ConvexPoolMulticaller = exports.ConvexBoosterMulticaller = exports.ConvexClaimZapCalls = exports.ConvexPoolCalls = exports.ConvexBoosterCalls = void 0;
+exports.ConvexStrategies = exports.ConvexClaimZapMulticaller = exports.ConvexPoolMulticaller = exports.ConvexBoosterMulticaller = exports.ConvexClaimZapCalls = exports.ConvexPoolCalls = exports.ConvexBoosterCalls = void 0;
+var contracts_1 = require("src/contracts/contracts");
+var token_1 = require("src/tokens/token");
 var types_1 = require("../types");
+var curve_1 = require("./curve");
+var uniswapV2_1 = require("./uniswapV2");
 var ConvexBoosterCalls = /** @class */ (function () {
     function ConvexBoosterCalls() {
     }
@@ -67,6 +71,9 @@ var ConvexBoosterMulticaller = /** @class */ (function () {
     function ConvexBoosterMulticaller(address) {
         this._address = address;
     }
+    ConvexBoosterMulticaller.connect = function (address) {
+        return new ConvexBoosterMulticaller(address);
+    };
     ConvexBoosterMulticaller.prototype.deposit = function (pid, amount, stake) {
         return {
             target: this._address,
@@ -98,6 +105,9 @@ var ConvexPoolMulticaller = /** @class */ (function () {
     function ConvexPoolMulticaller(address) {
         this._address = address;
     }
+    ConvexPoolMulticaller.connect = function (address) {
+        return new ConvexPoolMulticaller(address);
+    };
     ConvexPoolMulticaller.prototype.stake = function (amount) {
         return {
             target: this._address,
@@ -141,6 +151,9 @@ var ConvexClaimZapMulticaller = /** @class */ (function () {
     function ConvexClaimZapMulticaller(address) {
         this._address = address;
     }
+    ConvexClaimZapMulticaller.connect = function (address) {
+        return new ConvexClaimZapMulticaller(address);
+    };
     ConvexClaimZapMulticaller.prototype.claimRewards = function (rewardContracts, extraRewardContracts, tokenRewardContracts, tokenRewardTokens, depositCrvMaxAmount, minAmountOut, depositCvxMaxAmount, spendCvxAmount, options) {
         return {
             target: this._address,
@@ -150,3 +163,63 @@ var ConvexClaimZapMulticaller = /** @class */ (function () {
     return ConvexClaimZapMulticaller;
 }());
 exports.ConvexClaimZapMulticaller = ConvexClaimZapMulticaller;
+var ConvexStrategies = /** @class */ (function () {
+    function ConvexStrategies() {
+    }
+    ConvexStrategies.underlyingToStakedConvex = function (data, network, convexPool, underlyingAmount) {
+        var calls = [];
+        var convexParams = contracts_1.contractParams[convexPool];
+        var stakedToken = convexParams.stakedToken;
+        var stakedTokenParams = token_1.supportedTokens[stakedToken];
+        var curveLpToken = stakedTokenParams.underlying;
+        var curveLpTokenData = token_1.supportedTokens[curveLpToken];
+        var curvePool = curveLpTokenData.pool;
+        calls = curve_1.CurveStrategies.underlyingToCurveLP(data, network, curvePool, underlyingAmount);
+        calls.push(ConvexBoosterMulticaller.connect(data.adapters[contracts_1.contractsByNetwork[network].CONVEX_BOOSTER]).depositAll(stakedTokenParams.pid, true));
+        return calls;
+    };
+    ConvexStrategies.stakedConvexToUnderlying = function (data, network, convexPool, convexLpAmount, sellRewards) {
+        var calls = [];
+        var convexParams = contracts_1.contractParams[convexPool];
+        var stakedToken = convexParams.stakedToken;
+        var stakedTokenParams = token_1.supportedTokens[stakedToken];
+        var curveLpToken = stakedTokenParams.underlying;
+        var curveLpTokenData = token_1.supportedTokens[curveLpToken];
+        var curvePool = curveLpTokenData.pool;
+        calls.push(ConvexPoolMulticaller.connect(data.adapters[contracts_1.contractsByNetwork[network][convexPool]]).withdrawAndUnwrap(convexLpAmount, true));
+        calls.push.apply(calls, curve_1.CurveStrategies.allCurveLPToUnderlying(data, network, curvePool));
+        if (sellRewards) {
+            calls.push.apply(calls, ConvexStrategies.sellRewards(data, network, convexPool));
+        }
+        return calls;
+    };
+    ConvexStrategies.allStakedConvexToUnderlying = function (data, network, convexPool, sellRewards) {
+        var calls = [];
+        var convexParams = contracts_1.contractParams[convexPool];
+        var stakedToken = convexParams.stakedToken;
+        var stakedTokenParams = token_1.supportedTokens[stakedToken];
+        var curveLpToken = stakedTokenParams.underlying;
+        var curveLpTokenData = token_1.supportedTokens[curveLpToken];
+        var curvePool = curveLpTokenData.pool;
+        calls.push(ConvexPoolMulticaller.connect(data.adapters[contracts_1.contractsByNetwork[network][convexPool]]).withdrawAllAndUnwrap(true));
+        calls.push.apply(calls, curve_1.CurveStrategies.allCurveLPToUnderlying(data, network, curvePool));
+        if (sellRewards) {
+            calls.push.apply(calls, ConvexStrategies.sellRewards(data, network, convexPool));
+        }
+        return calls;
+    };
+    ConvexStrategies.sellRewards = function (data, network, convexPool) {
+        var calls = [];
+        var convexParams = contracts_1.contractParams[convexPool];
+        calls.push(uniswapV2_1.UniswapV2Multicaller.connect(data.adapters[contracts_1.contractsByNetwork[network].UNISWAP_V2_ROUTER]).swapAllTokensForTokens(0, [token_1.tokenDataByNetwork[network].CRV, data.underlyingToken], Math.floor(new Date().getTime() / 1000) + 3600), uniswapV2_1.UniswapV2Multicaller.connect(data.adapters[contracts_1.contractsByNetwork[network].UNISWAP_V2_ROUTER]).swapAllTokensForTokens(0, [token_1.tokenDataByNetwork[network].CVX, data.underlyingToken], Math.floor(new Date().getTime() / 1000) + 3600));
+        convexParams.extraRewards.forEach(function (extraReward) {
+            uniswapV2_1.UniswapV2Multicaller.connect(data.adapters[contracts_1.contractsByNetwork[network].UNISWAP_V2_ROUTER]).swapAllTokensForTokens(0, [
+                token_1.tokenDataByNetwork[network][extraReward.rewardToken],
+                data.underlyingToken
+            ], Math.floor(new Date().getTime() / 1000) + 3600);
+        });
+        return calls;
+    };
+    return ConvexStrategies;
+}());
+exports.ConvexStrategies = ConvexStrategies;

package/lib/strategies/creditFacade.d.ts

@@ -9,6 +9,7 @@ export declare class CreditFacadeCalls {
 export declare class CreditFacadeMulticaller {
     private readonly _address;
     constructor(address: string);
+    static connect(address: string): CreditFacadeMulticaller;
     addCollateral(onBehalfOf: string, token: string, amount: BigNumberish): MultiCallStruct;
     increaseDebt(amount: BigNumberish): MultiCallStruct;
     decreaseDebt(amount: BigNumberish): MultiCallStruct;

package/lib/strategies/creditFacade.js

@@ -24,6 +24,9 @@ var CreditFacadeMulticaller = /** @class */ (function () {
     function CreditFacadeMulticaller(address) {
         this._address = address;
     }
+    CreditFacadeMulticaller.connect = function (address) {
+        return new CreditFacadeMulticaller(address);
+    };
     CreditFacadeMulticaller.prototype.addCollateral = function (onBehalfOf, token, amount) {
         return {
             target: this._address,