@gearbox-protocol/sdk 0.0.98 → 0.0.101

package/lib/core/creditManager.d.ts

@@ -1,6 +1,7 @@
 import { BigNumber, ethers, Signer } from "ethers";
 import { CreditManagerDataPayload, CreditManagerStatPayload } from "../payload/creditManager";
 import { ICreditManager } from "../types";
+import { MultiCall } from "./multicall";
 export declare class CreditManagerData {
     readonly id: string;
     readonly address: string;
@@ -14,11 +15,21 @@ export declare class CreditManagerData {
     readonly availableLiquidity: BigNumber;
     readonly allowedTokens: Array<string>;
     readonly adapters: Record<string, string>;
+    readonly liquidationThresholds: Record<string, BigNumber>;
     readonly version: number;
+    readonly creditFacade: string;
+    readonly isDegenMode: boolean;
+    readonly degenNFT: string;
+    readonly isIncreaseDebtForbidden: boolean;
+    readonly forbiddenTokenMask: BigNumber;
     constructor(payload: CreditManagerDataPayload);
-    validateOpenAccount(balance: BigNumber, decimals: number, amount_BN: BigNumber, leverage: number): string | null;
-    getContractETH(signer: Signer | ethers.providers.Provider): ICreditManager;
     get isPaused(): boolean;
+    getContractETH(signer: Signer | ethers.providers.Provider): ICreditManager;
+    contractToAdapter(contractAddress: string): string | undefined;
+    encodeAddCollateral(accountAddress: string, tokenAddress: string, amount: BigNumber): MultiCall;
+    encodeIncreaseDebt(amount: BigNumber): MultiCall;
+    encodeDecreaseDebt(amount: BigNumber): MultiCall;
+    validateOpenAccount(totalAmount: BigNumber, leverage: number): 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

@@ -14,54 +14,59 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+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.CreditManagerStat = exports.calcHealthFactorAfterAddingCollateral = exports.calcHealthFactorAfterIncreasingBorrow = exports.calcMaxIncreaseBorrow = exports.CreditManagerData = void 0;
 var ethers_1 = require("ethers");
-var formatter_1 = require("../utils/formatter");
-var constants_1 = require("./constants");
 var types_1 = require("../types");
+var constants_1 = require("./constants");
+var errors_1 = require("./errors");
 var CreditManagerData = /** @class */ (function () {
     function CreditManagerData(payload) {
-        var _this = this;
-        var _a;
-        this.adapters = {};
-        this.version = 1;
         this.id = payload.addr;
         this.address = payload.addr;
-        this.underlyingToken = payload.underlyingToken || "";
+        this.underlyingToken = payload.underlying || "";
         this.isWETH = payload.isWETH || false;
         this.canBorrow = payload.canBorrow || false;
         this.borrowRate =
             ethers_1.BigNumber.from(payload.borrowRate || 0)
                 .mul(constants_1.PERCENTAGE_FACTOR)
-                .mul(100)
+                .mul(constants_1.PERCENTAGE_DECIMALS)
                 .div(constants_1.RAY)
                 .toNumber() / constants_1.PERCENTAGE_FACTOR;
         this.minAmount = ethers_1.BigNumber.from(payload.minAmount || 0);
         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.allowedTokens || [];
-        (_a = payload.adapters) === null || _a === void 0 ? void 0 : _a.forEach(function (a) {
-            _this.adapters[a.allowedContract] = a.adapter;
-        });
+        this.allowedTokens = payload.collateralTokens || [];
+        this.adapters = (payload.adapters || []).reduce(function (acc, _a) {
+            var _b;
+            var allowedContract = _a.allowedContract, adapter = _a.adapter;
+            return (__assign(__assign({}, acc), (_b = {}, _b[allowedContract] = adapter, _b)));
+        }, {});
+        this.liquidationThresholds = payload.liquidationThresholds.reduce(function (acc, threshold, index) {
+            var address = payload.collateralTokens[index];
+            if (address)
+                acc[address.toLowerCase()] = threshold;
+            return acc;
+        }, {});
+        this.version = payload.version || 1;
+        this.creditFacade = payload.creditFacade || "";
+        this.isDegenMode = payload.isDegenMode || false;
+        this.degenNFT = payload.degenNFT || "";
+        this.isIncreaseDebtForbidden = payload.isIncreaseDebtForbidden || false;
+        this.forbiddenTokenMask = ethers_1.BigNumber.from(payload.forbiddenTokenMask || 0);
     }
-    CreditManagerData.prototype.validateOpenAccount = function (balance, decimals, amount_BN, leverage) {
-        if (balance.lt(amount_BN))
-            return "Insufficient funds";
-        if (amount_BN.lt(this.minAmount))
-            return "Amount is less than minimal (".concat((0, formatter_1.formatBN)(this.minAmount, decimals), ")");
-        if (amount_BN.gt(this.maxAmount))
-            return "Amount is greater than maximum (".concat((0, formatter_1.formatBN)(this.maxAmount, decimals), ")");
-        if (leverage > this.maxLeverageFactor)
-            return "Leverage is bigger than max";
-        if (amount_BN.mul(leverage).div(100).gt(this.availableLiquidity))
-            return "Insufficient liquidity in the pool";
-        return null;
-    };
-    CreditManagerData.prototype.getContractETH = function (signer) {
-        return types_1.ICreditManager__factory.connect(this.address, signer);
-    };
     Object.defineProperty(CreditManagerData.prototype, "isPaused", {
         get: function () {
             return false;
@@ -69,12 +74,57 @@ var CreditManagerData = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    CreditManagerData.prototype.getContractETH = function (signer) {
+        return types_1.ICreditManager__factory.connect(this.address, signer);
+    };
+    CreditManagerData.prototype.contractToAdapter = function (contractAddress) {
+        return this.adapters[contractAddress];
+    };
+    CreditManagerData.prototype.encodeAddCollateral = function (accountAddress, tokenAddress, amount) {
+        if (this.version !== 2)
+            throw new Error("Multicall is eligible only for version 2");
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("addCollateral", [accountAddress, tokenAddress, amount])
+        };
+    };
+    CreditManagerData.prototype.encodeIncreaseDebt = function (amount) {
+        if (this.version !== 2)
+            throw new Error("Multicall is eligible only for version 2");
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("increaseDebt", [amount])
+        };
+    };
+    CreditManagerData.prototype.encodeDecreaseDebt = function (amount) {
+        if (this.version !== 2)
+            throw new Error("Multicall is eligible only for version 2");
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("decreaseDebt", [amount])
+        };
+    };
+    CreditManagerData.prototype.validateOpenAccount = function (totalAmount, leverage) {
+        if (totalAmount.lt(this.minAmount))
+            throw new errors_1.OpenAccountError("amountLessMin", this.minAmount);
+        if (totalAmount.gt(this.maxAmount))
+            throw new errors_1.OpenAccountError("amountGreaterMax", this.maxAmount);
+        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))
+            throw new errors_1.OpenAccountError("insufficientPoolLiquidity", ethers_1.BigNumber.from(this.availableLiquidity));
+        return true;
+    };
     return CreditManagerData;
 }());
 exports.CreditManagerData = CreditManagerData;
 function calcMaxIncreaseBorrow(healthFactor, borrowAmountPlusInterest, maxLeverageFactor) {
     var healthFactorPercentage = Math.floor(healthFactor * constants_1.PERCENTAGE_FACTOR);
-    var minHealthFactor = Math.floor((constants_1.UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD * (maxLeverageFactor + 100)) /
+    var minHealthFactor = Math.floor((constants_1.UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD *
+        (maxLeverageFactor + constants_1.LEVERAGE_DECIMALS)) /
         maxLeverageFactor);
     var result = borrowAmountPlusInterest
         .mul(healthFactorPercentage - minHealthFactor)

package/lib/core/errors.d.ts

@@ -1,3 +1,4 @@
+import { BigNumber } from "ethers";
 export interface MetamaskError {
     code: number;
     message: string;
@@ -24,3 +25,12 @@ export declare class PathNotFoundError extends Error {
 export declare class AccountsInAlllCreditManagersError extends Error {
     constructor();
 }
+export declare type OpenAccountErrorTypes = "insufficientPoolLiquidity" | "leverageGreaterMax" | "amountGreaterMax" | "amountLessMin";
+export declare class OpenAccountError extends Error {
+    message: OpenAccountErrorTypes;
+    payload: {
+        amount: BigNumber;
+    };
+    constructor(errorType: OpenAccountErrorTypes, amount: BigNumber);
+    static isOpenAccountError(e: unknown): e is OpenAccountError;
+}

package/lib/core/errors.js

@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccountsInAlllCreditManagersError = exports.PathNotFoundError = exports.UserHasNotAccountError = exports.CreditManagerNotExistsError = exports.PoolNotExistsError = exports.IncorrectEthAddressError = exports.NetworkError = void 0;
+exports.OpenAccountError = exports.AccountsInAlllCreditManagersError = exports.PathNotFoundError = exports.UserHasNotAccountError = exports.CreditManagerNotExistsError = exports.PoolNotExistsError = exports.IncorrectEthAddressError = exports.NetworkError = void 0;
 var NetworkError = /** @class */ (function (_super) {
     __extends(NetworkError, _super);
     function NetworkError() {
@@ -72,3 +72,18 @@ var AccountsInAlllCreditManagersError = /** @class */ (function (_super) {
     return AccountsInAlllCreditManagersError;
 }(Error));
 exports.AccountsInAlllCreditManagersError = AccountsInAlllCreditManagersError;
+var OpenAccountError = /** @class */ (function (_super) {
+    __extends(OpenAccountError, _super);
+    function OpenAccountError(errorType, amount) {
+        var _this = _super.call(this) || this;
+        Object.setPrototypeOf(_this, OpenAccountError.prototype);
+        _this.message = errorType;
+        _this.payload = { amount: amount };
+        return _this;
+    }
+    OpenAccountError.isOpenAccountError = function (e) {
+        return e instanceof OpenAccountError;
+    };
+    return OpenAccountError;
+}(Error));
+exports.OpenAccountError = OpenAccountError;

package/lib/core/events.js

@@ -298,16 +298,16 @@ var EventCMNewParameters = /** @class */ (function (_super) {
             msg += "max amount: ".concat((0, formatter_1.formatBN)(this.prevMaxAmount, token.decimals), " => ").concat((0, formatter_1.formatBN)(this.maxAmount, token.decimals), " ").concat(token.symbol, ", ");
         }
         if (this.maxLeverage !== this.prevMaxLeverage) {
-            msg += "max leverage: ".concat(this.prevMaxLeverage / 100 + 1, " => ").concat(this.maxLeverage / 100 + 1, ", ");
+            msg += "max leverage: ".concat(this.prevMaxLeverage / constants_1.LEVERAGE_DECIMALS + 1, " => ").concat(this.maxLeverage / constants_1.LEVERAGE_DECIMALS + 1, ", ");
         }
         if (this.feeInterest !== this.prevFeeInterest) {
-            msg += "interest fee: ".concat(this.prevFeeInterest / 100, "% => ").concat(this.feeInterest / 100, "%, ");
+            msg += "interest fee: ".concat(this.prevFeeInterest / constants_1.PERCENTAGE_DECIMALS, "% => ").concat(this.feeInterest / constants_1.PERCENTAGE_DECIMALS, "%, ");
         }
         if (this.feeLiquidation !== this.prevFeeLiquidation) {
-            msg += "liquidation fee: ".concat(this.prevFeeLiquidation / 100, "% => ").concat(this.feeLiquidation / 100, "%, ");
+            msg += "liquidation fee: ".concat(this.prevFeeLiquidation / constants_1.PERCENTAGE_DECIMALS, "% => ").concat(this.feeLiquidation / constants_1.PERCENTAGE_DECIMALS, "%, ");
         }
         if (this.liquidationDiscount !== this.prevLiquidationDiscount) {
-            msg += "liquidation premium: ".concat(100 - this.prevLiquidationDiscount / 100, "% => ").concat(100 - this.liquidationDiscount / 100, "%, ");
+            msg += "liquidation premium: ".concat(constants_1.PERCENTAGE_DECIMALS - this.prevLiquidationDiscount / constants_1.PERCENTAGE_DECIMALS, "% => ").concat(constants_1.PERCENTAGE_DECIMALS - this.liquidationDiscount / constants_1.PERCENTAGE_DECIMALS, "%, ");
         }
         return msg.slice(0, msg.length - 2);
     };
@@ -334,11 +334,11 @@ var EventTokenAllowed = /** @class */ (function (_super) {
         var msg = "Credit manager ".concat((0, contractsRegister_1.getContractName)(this.creditManager), " updated ");
         switch (this.status) {
             case "NewToken":
-                return "".concat(msg, ": New token allowed: ").concat(token.symbol, ", liquidation threshold: ").concat(this.liquidityThreshold / 100, "%");
+                return "".concat(msg, ": New token allowed: ").concat(token.symbol, ", liquidation threshold: ").concat(this.liquidityThreshold / constants_1.PERCENTAGE_DECIMALS, "%");
             case "Allowed":
-                return "".concat(msg, ": ").concat(token.symbol, " is allowed now, liquidation threshold: ").concat(this.liquidityThreshold / 100, "%");
+                return "".concat(msg, ": ").concat(token.symbol, " is allowed now, liquidation threshold: ").concat(this.liquidityThreshold / constants_1.PERCENTAGE_DECIMALS, "%");
             case "LTUpdated":
-                return "".concat(msg, ": ").concat(token.symbol, " liquidation threshold: ").concat((this.prevLiquidationThreshold || 0) / 100, " => ").concat(this.liquidityThreshold / 100, "%");
+                return "".concat(msg, ": ").concat(token.symbol, " liquidation threshold: ").concat((this.prevLiquidationThreshold || 0) / constants_1.PERCENTAGE_DECIMALS, " => ").concat(this.liquidityThreshold / constants_1.PERCENTAGE_DECIMALS, "%");
         }
     };
     return EventTokenAllowed;
@@ -565,8 +565,8 @@ var EventNewWithdrawFee = /** @class */ (function (_super) {
     }
     EventNewWithdrawFee.prototype.toString = function (_) {
         return this.prevFee === 0
-            ? "Pool ".concat((0, contractsRegister_1.getContractName)(this.pool), " updated: withdraw fee was set to: ").concat(this.newFee / 100, "%")
-            : "Pool ".concat((0, contractsRegister_1.getContractName)(this.pool), " updated: withdraw fee was ").concat(this.newFee > this.prevFee ? "increased" : "decreased", ": ").concat(this.prevFee / 100, "% => ").concat(this.newFee / 100, "%");
+            ? "Pool ".concat((0, contractsRegister_1.getContractName)(this.pool), " updated: withdraw fee was set to: ").concat(this.newFee / constants_1.PERCENTAGE_DECIMALS, "%")
+            : "Pool ".concat((0, contractsRegister_1.getContractName)(this.pool), " updated: withdraw fee was ").concat(this.newFee > this.prevFee ? "increased" : "decreased", ": ").concat(this.prevFee / constants_1.PERCENTAGE_DECIMALS, "% => ").concat(this.newFee / constants_1.PERCENTAGE_DECIMALS, "%");
     };
     return EventNewWithdrawFee;
 }(eventOrTx_1.EVMEvent));

package/lib/core/multicall.d.ts

@@ -1,5 +1,5 @@
 import { BytesLike } from "ethers";
 export interface MultiCall {
-    targetContract: string;
+    target: string;
     callData: BytesLike;
 }

package/lib/core/pool.d.ts

@@ -1,6 +1,6 @@
 import { BigNumber, Signer } from "ethers";
-import { IPoolService } from "../types";
 import { PoolDataPayload } from "../payload/pool";
+import { IPoolService } from "../types";
 export declare class PoolData {
     readonly id: string;
     readonly address: string;

package/lib/core/pool.js

@@ -2,25 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PoolData = void 0;
 var ethers_1 = require("ethers");
-var types_1 = require("../types");
 var formatter_1 = require("../utils/formatter");
+var types_1 = require("../types");
+var constants_1 = require("./constants");
 var PoolData = /** @class */ (function () {
     function PoolData(payload) {
         this.id = payload.addr;
         this.address = payload.addr;
-        this.underlyingToken = payload.underlyingToken || "";
+        this.underlyingToken = payload.underlying || "";
         this.dieselToken = payload.dieselToken || "";
         this.isWETH = payload.isWETH || false;
         this.expectedLiquidity = ethers_1.BigNumber.from(payload.expectedLiquidity);
         this.expectedLiquidityLimit = ethers_1.BigNumber.from(payload.expectedLiquidityLimit || 0);
         this.availableLiquidity = ethers_1.BigNumber.from(payload.availableLiquidity);
         this.totalBorrowed = ethers_1.BigNumber.from(payload.totalBorrowed);
-        this.depositAPY = (0, formatter_1.rayToNumber)(payload.depositAPY_RAY) * 100;
-        this.borrowAPY = (0, formatter_1.rayToNumber)(payload.borrowAPY_RAY) * 100;
+        this.depositAPY = (0, formatter_1.rayToNumber)(payload.depositAPY_RAY) * constants_1.PERCENTAGE_DECIMALS;
+        this.borrowAPY = (0, formatter_1.rayToNumber)(payload.borrowAPY_RAY) * constants_1.PERCENTAGE_DECIMALS;
         this.borrowAPYRay = ethers_1.BigNumber.from(payload.borrowAPY_RAY);
         this.dieselRate = (0, formatter_1.rayToNumber)(payload.dieselRate_RAY);
         this.dieselRateRay = ethers_1.BigNumber.from(payload.dieselRate_RAY);
-        this.withdrawFee = ethers_1.BigNumber.from(payload.withdrawFee).toNumber() / 100;
+        this.withdrawFee =
+            ethers_1.BigNumber.from(payload.withdrawFee).toNumber() / constants_1.PERCENTAGE_DECIMALS;
         this.timestampLU = ethers_1.BigNumber.from(payload.timestampLU || 0);
         this.cumulativeIndex_RAY = ethers_1.BigNumber.from(payload.cumulativeIndex_RAY || 0);
     }

package/lib/core/price.d.ts

@@ -0,0 +1,4 @@
+import { BigNumber } from "ethers";
+import { TokenData } from "../tokens/tokenData";
+export declare const PRICE_DECIMALS = 1000;
+export declare const priceCalc: (price: number, amount: BigNumber, token: TokenData | undefined) => BigNumber;

package/lib/core/price.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.priceCalc = exports.PRICE_DECIMALS = void 0;
+var ethers_1 = require("ethers");
+exports.PRICE_DECIMALS = 1000;
+var priceCalc = function (price, amount, token) {
+    var _a = (token || {}).decimals, decimals = _a === void 0 ? 18 : _a;
+    return amount
+        .mul(Math.floor(exports.PRICE_DECIMALS * price))
+        .div(ethers_1.BigNumber.from(10).pow(decimals));
+};
+exports.priceCalc = priceCalc;

package/lib/core/strategy.d.ts

@@ -0,0 +1,34 @@
+export interface StrategyPayload {
+    apy?: number;
+    name: string;
+    lpToken: string;
+    pools: Array<string>;
+    unleveragableCollateral: Array<string>;
+    leveragableCollateral: Array<string>;
+    baseAssets: Array<string>;
+}
+interface PoolStats {
+    borrowRate: number;
+}
+declare type PoolList = Record<string, PoolStats>;
+export declare class Strategy {
+    apy: number | undefined;
+    name: string;
+    lpToken: string;
+    pools: Array<string>;
+    unleveragableCollateral: Array<string>;
+    leveragableCollateral: Array<string>;
+    baseAssets: Array<string>;
+    constructor(payload: StrategyPayload);
+    roiMax(apy: number, maxLeverage: number, poolApy: PoolList): number;
+    overallAPY(apy: number, leverage: number, depositCollateral: string, borrowAPY: number): number;
+    liquidationPrice(leverage: number, ltStrategy: number, ltCollateral: number, depositCollateral: string): number;
+    ltStrategyLP(maxLeverage: number): number;
+    maxLeverage(ltStrategyLP: number): number;
+    private roi;
+    private minBorrowApy;
+    private farmLev;
+    private inBaseAssets;
+    private inLeveragableAssets;
+}
+export {};

package/lib/core/strategy.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Strategy = void 0;
+var constants_1 = require("../core/constants");
+var Strategy = /** @class */ (function () {
+    function Strategy(payload) {
+        this.apy = payload.apy;
+        this.name = payload.name;
+        this.lpToken = payload.lpToken;
+        this.pools = payload.pools;
+        this.unleveragableCollateral = payload.unleveragableCollateral;
+        this.leveragableCollateral = payload.leveragableCollateral;
+        this.baseAssets = payload.baseAssets;
+    }
+    Strategy.prototype.roiMax = function (apy, maxLeverage, poolApy) {
+        var minApy = this.minBorrowApy(poolApy);
+        return this.roi(apy, 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);
+    };
+    Strategy.prototype.liquidationPrice = function (leverage, ltStrategy, ltCollateral, depositCollateral) {
+        var farmLev = this.farmLev(leverage, depositCollateral);
+        return (1 -
+            (leverage - constants_1.LEVERAGE_DECIMALS - ltCollateral * (leverage - farmLev)) /
+                (ltStrategy * farmLev));
+    };
+    Strategy.prototype.ltStrategyLP = function (maxLeverage) {
+        return 1 - constants_1.LEVERAGE_DECIMALS / maxLeverage;
+    };
+    Strategy.prototype.maxLeverage = function (ltStrategyLP) {
+        var leverage = Math.floor(1 / (1 - ltStrategyLP));
+        return Math.floor(leverage * constants_1.LEVERAGE_DECIMALS);
+    };
+    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)
+            ? leverage
+            : leverage - constants_1.LEVERAGE_DECIMALS;
+    };
+    Strategy.prototype.inBaseAssets = function (depositCollateral) {
+        return this.baseAssets.some(function (c) { return c.toLowerCase() === depositCollateral.toLowerCase(); });
+    };
+    Strategy.prototype.inLeveragableAssets = function (depositCollateral) {
+        return this.leveragableCollateral.some(function (c) { return c.toLowerCase() === depositCollateral.toLowerCase(); });
+    };
+    return Strategy;
+}());
+exports.Strategy = Strategy;

package/lib/index.d.ts

@@ -1,8 +1,10 @@
 export * from "./core/constants";
+export * from "./core/price";
 export * from "./core/creditAccount";
 export * from "./core/creditManager";
 export * from "./core/creditSession";
 export * from "./contracts/contracts";
+export * from "./core/eventOrTx";
 export * from "./core/events";
 export * from "./core/errors";
 export * from "./core/pool";
@@ -25,6 +27,7 @@ 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";
@@ -35,8 +38,11 @@ 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 "./core/history";
-export { MultiCallContract } from "./utils/multicall";
+export * from "./utils/multicall";
+export * from "./utils/types";
 export { callRepeater } from "./utils/repeater";
 export { getContractName } from "./contracts/contractsRegister";
 export { AdapterInterface } from "./contracts/adapters";

package/lib/index.js

@@ -14,12 +14,14 @@ 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.MultiCallContract = exports.TokenType = void 0;
+exports.SwapType = 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);
 __exportStar(require("./contracts/contracts"), exports);
+__exportStar(require("./core/eventOrTx"), exports);
 __exportStar(require("./core/events"), exports);
 __exportStar(require("./core/errors"), exports);
 __exportStar(require("./core/pool"), exports);
@@ -42,6 +44,7 @@ __exportStar(require("./utils/events"), exports);
 __exportStar(require("./utils/math"), exports);
 __exportStar(require("./payload/graphPayload"), exports);
 __exportStar(require("./types/index"), exports);
+__exportStar(require("./core/strategy"), exports);
 // Tokens
 var tokenType_1 = require("./tokens/tokenType");
 Object.defineProperty(exports, "TokenType", { enumerable: true, get: function () { return tokenType_1.TokenType; } });
@@ -53,9 +56,11 @@ __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("./core/history"), exports);
-var multicall_1 = require("./utils/multicall");
-Object.defineProperty(exports, "MultiCallContract", { enumerable: true, get: function () { return multicall_1.MultiCallContract; } });
+__exportStar(require("./utils/multicall"), exports);
+__exportStar(require("./utils/types"), 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/pathfinder/path.js

@@ -145,7 +145,7 @@ var Path = /** @class */ (function () {
                         // TODO: Add checks for lenght
                         if (existingTokens.length === 0)
                             throw new Error("No tokens with balance >1");
-                        nextToken = existingTokens.at(0)[0];
+                        nextToken = existingTokens[0][0];
                         // Get balances and keep non-zero only
                         // Find token with highest priority
                         // Get token type of this token

package/lib/pathfinder/yVault.js

@@ -81,10 +81,13 @@ var YearnVaultPathFinder = /** @class */ (function () {
                             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[token_1.tokenDataByNetwork[p.networkType][vault]],
-                                callData: types_1.IYVault__factory.createInterface().encodeFunctionData("withdraw()")
-                            });
+                            // !!!!!!!!!
+                            // p.calls.push({
+                            //   targetContract:
+                            //     p.creditManager.adapters[tokenDataByNetwork[p.networkType][vault]],
+                            //   callData:
+                            //     IYVault__factory.createInterface().encodeFunctionData("withdraw()")
+                            // });
                         }
                         return [4 /*yield*/, p.withdrawTokens()];
                     case 2: return [2 /*return*/, _c.sent()];

package/lib/payload/creditAccount.d.ts

@@ -1,26 +1,4 @@
-import { BigNumberish } from "ethers";
-export interface TokenBalancePayload {
-    token: string;
-    balance: BigNumberish;
-    isAllowed: boolean;
-}
-export interface CreditAccountDataPayload {
-    addr: string;
-    borrower: string;
-    inUse: boolean;
-    creditManager: string;
-    underlyingToken: string;
-    borrowedAmountPlusInterest: BigNumberish;
-    totalValue: BigNumberish;
-    healthFactor: BigNumberish;
-    borrowRate: BigNumberish;
-    balances?: Array<TokenBalancePayload>;
-}
-export interface CreditAccountDataExtendedPayload extends CreditAccountDataPayload {
-    repayAmount: BigNumberish;
-    liquidationAmount: BigNumberish;
-    canBeClosed?: boolean;
-    borrowedAmount: BigNumberish;
-    cumulativeIndexAtOpen: BigNumberish;
-    since: BigNumberish;
-}
+import { CreditAccountDataStructOutput } from "../types/contracts/core/DataCompressor";
+export declare type TokenBalancePayload = CreditAccountDataStructOutput["balances"];
+export declare type CreditAccountDataPayload = CreditAccountDataStructOutput;
+export declare type CreditAccountDataExtendedPayload = CreditAccountDataStructOutput;

package/lib/payload/creditManager.d.ts

@@ -1,33 +1,21 @@
-import { BigNumberish } from "ethers";
+import { BigNumberish, BigNumber } from "ethers";
+import { CreditManagerDataStructOutput } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
 export interface AdapterPayload {
     allowedContract: string;
     adapter: string;
 }
-export interface CreditManagerDataPayload {
+export declare type CreditManagerDataPayload = CreditManagerDataStructOutput;
+export interface CreditManagerStatPayload extends CreditManagerDataPayload {
     addr: string;
-    hasAccount?: boolean;
     underlyingToken?: string;
-    isWETH?: boolean;
-    canBorrow?: boolean;
-    borrowRate?: BigNumberish;
-    minAmount?: BigNumberish;
-    maxAmount?: BigNumberish;
-    maxLeverageFactor?: BigNumberish;
-    availableLiquidity?: BigNumberish;
-    allowedTokens?: Array<string>;
-    adapters?: Array<AdapterPayload>;
-}
-export interface CreditManagerStatPayload {
-    addr: string;
-    underlyingToken?: string;
-    isWETH?: boolean;
-    canBorrow?: boolean;
-    borrowRate?: BigNumberish;
-    minAmount?: BigNumberish;
-    maxAmount?: BigNumberish;
-    maxLeverageFactor?: BigNumberish;
-    availableLiquidity?: BigNumberish;
-    allowedTokens?: Array<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,17 +1,2 @@
-import { BigNumberish } from "ethers";
-export interface PoolDataPayload {
-    addr: string;
-    underlyingToken: string;
-    dieselToken: string;
-    isWETH: boolean;
-    expectedLiquidity: BigNumberish;
-    expectedLiquidityLimit?: BigNumberish;
-    availableLiquidity: BigNumberish;
-    totalBorrowed: BigNumberish;
-    depositAPY_RAY: BigNumberish;
-    borrowAPY_RAY: BigNumberish;
-    dieselRate_RAY: BigNumberish;
-    withdrawFee: BigNumberish;
-    timestampLU?: BigNumberish;
-    cumulativeIndex_RAY?: BigNumberish;
-}
+import { PoolDataStructOutput } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
+export declare type PoolDataPayload = PoolDataStructOutput;

package/lib/payload/pool.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//