@gearbox-protocol/sdk 0.0.101 → 0.0.104

package/lib/core/events.d.ts

@@ -1,5 +1,5 @@
-import { TokenData } from "../tokens/tokenData";
 import { BigNumber } from "ethers";
+import { TokenData } from "../tokens/tokenData";
 import { EVMEvent, EVMTx, EVMEventProps } from "./eventOrTx";
 export interface EventSerialized {
     type: "EventAddLiquidity" | "EventRemoveLiquidity" | "EventOpenCreditAccount" | "EventCloseCreditAccount" | "EventLiquidateCreditAccount" | "EventRepayCreditAccount" | "EventAddCollateral" | "EventIncreaseBorrowAmount" | "EventCMNewParameters" | "EventTokenAllowed" | "EventTokenForbidden" | "EventContractAllowed" | "EventContractForbidden" | "EventNewFastCheckParameters" | "EventPriceOracleUpdated" | "EventTransferPluginAllowed" | "EventNewInterestRateModel" | "EventNewCreditManagerConnected" | "EventBorrowForbidden" | "EventNewExpectedLiquidityLimit" | "EventNewWithdrawFee" | "EventNewPriceFeed" | "EventTakeForever" | "EventPaused" | "EventUnPaused" | "EventPausableAdminAdded" | "EventPausableAdminRemoved" | "EventUnpausableAdminAdded" | "EventUnpausableAdminRemoved" | "EventOwnershipTransferred";
@@ -82,7 +82,7 @@ export declare class EventRepayCreditAccount extends EVMEvent {
     readonly underlyingToken: string;
     readonly creditManager: string;
     constructor(opts: RepayCreditAccountProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface AddCollateralProps extends EVMEventProps {
     amount: string;
@@ -182,7 +182,7 @@ export declare class EventContractAllowed extends EVMEvent {
     readonly adapter: string;
     readonly status: EventContractAllowedStatus;
     constructor(opts: ContractAllowedProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface ContractForbiddenProps extends EVMEventProps {
     creditManager: string;
@@ -192,7 +192,7 @@ export declare class EventContractForbidden extends EVMEvent {
     readonly creditManager: string;
     readonly protocol: string;
     constructor(opts: ContractForbiddenProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface NewFastCheckParametersProps extends EVMEventProps {
     creditManager: string;
@@ -208,7 +208,7 @@ export declare class EventNewFastCheckParameters extends EVMEvent {
     readonly prevChiThreshold?: number;
     readonly prevFastCheckDelay?: number;
     constructor(opts: NewFastCheckParametersProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface PriceOracleUpdatedProps extends EVMEventProps {
     creditManager: string;
@@ -218,7 +218,7 @@ export declare class EventPriceOracleUpdated extends EVMEvent {
     readonly creditManager: string;
     readonly priceOracle: string;
     constructor(opts: PriceOracleUpdatedProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface TransferPluginAllowedProps extends EVMEventProps {
     creditManager: string;
@@ -230,7 +230,7 @@ export declare class EventTransferPluginAllowed extends EVMEvent {
     readonly plugin: string;
     readonly state: boolean;
     constructor(opts: TransferPluginAllowedProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface NewInterestRateModelProps extends EVMEventProps {
     pool: string;
@@ -240,7 +240,7 @@ export declare class EventNewInterestRateModel extends EVMEvent {
     readonly pool: string;
     readonly newInterestRateModel: string;
     constructor(opts: NewInterestRateModelProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface NewCreditManagerConnectedProps extends EVMEventProps {
     pool: string;
@@ -250,7 +250,7 @@ export declare class EventNewCreditManagerConnected extends EVMEvent {
     readonly pool: string;
     readonly creditManager: string;
     constructor(opts: NewCreditManagerConnectedProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface BorrowForbiddenProps extends EVMEventProps {
     pool: string;
@@ -260,7 +260,7 @@ export declare class EventBorrowForbidden extends EVMEvent {
     readonly pool: string;
     readonly creditManager: string;
     constructor(opts: BorrowForbiddenProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface NewExpectedLiquidityLimitProps extends EVMEventProps {
     pool: string;
@@ -288,7 +288,7 @@ export declare class EventNewWithdrawFee extends EVMEvent {
     readonly newFee: number;
     readonly prevFee: number;
     constructor(opts: NewWithdrawFeeProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface NewPriceFeedProps extends EVMEventProps {
     token: string;
@@ -308,7 +308,7 @@ export declare class EventTakeForever extends EVMEvent {
     readonly creditAccount: string;
     readonly to: string;
     constructor(opts: TakeForeverProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface PausedProps extends EVMEventProps {
     contract: string;
@@ -316,7 +316,7 @@ interface PausedProps extends EVMEventProps {
 export declare class EventPaused extends EVMEvent {
     readonly contract: string;
     constructor(opts: PausedProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface UnPausedProps extends EVMEventProps {
     contract: string;
@@ -324,7 +324,7 @@ interface UnPausedProps extends EVMEventProps {
 export declare class EventUnPaused extends EVMEvent {
     readonly contract: string;
     constructor(opts: UnPausedProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface PausableAdminAddedProps extends EVMEventProps {
     admin: string;
@@ -332,7 +332,7 @@ interface PausableAdminAddedProps extends EVMEventProps {
 export declare class EventPausableAdminAdded extends EVMEvent {
     readonly admin: string;
     constructor(opts: PausableAdminAddedProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface PausableAdminRemovedProps extends EVMEventProps {
     admin: string;
@@ -340,7 +340,7 @@ interface PausableAdminRemovedProps extends EVMEventProps {
 export declare class EventPausableAdminRemoved extends EVMEvent {
     readonly admin: string;
     constructor(opts: PausableAdminRemovedProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface UnPausableAdminAddedProps extends EVMEventProps {
     admin: string;
@@ -348,7 +348,7 @@ interface UnPausableAdminAddedProps extends EVMEventProps {
 export declare class EventUnPausableAdminAdded extends EVMEvent {
     readonly admin: string;
     constructor(opts: UnPausableAdminAddedProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface UnPausableAdminRemovedProps extends EVMEventProps {
     admin: string;
@@ -356,7 +356,7 @@ interface UnPausableAdminRemovedProps extends EVMEventProps {
 export declare class EventUnPausableAdminRemoved extends EVMEvent {
     readonly admin: string;
     constructor(opts: UnPausableAdminRemovedProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 interface TransferOwnershipProps extends EVMEventProps {
     admin: string;
@@ -364,6 +364,6 @@ interface TransferOwnershipProps extends EVMEventProps {
 export declare class EventTransferOwnership extends EVMEvent {
     readonly newOwner: string;
     constructor(opts: TransferOwnershipProps);
-    toString(_: Record<string, TokenData>): string;
+    toString(): string;
 }
 export {};

package/lib/core/events.js

@@ -95,9 +95,7 @@ var EventParser = /** @class */ (function () {
         }
     };
     EventParser.deserializeArray = function (data) {
-        return data.map(function (e) {
-            return EventParser.deserialize(e);
-        });
+        return data.map(function (e) { return EventParser.deserialize(e); });
     };
     return EventParser;
 }());
@@ -218,7 +216,7 @@ var EventRepayCreditAccount = /** @class */ (function (_super) {
         _this.creditManager = opts.creditManager;
         return _this;
     }
-    EventRepayCreditAccount.prototype.toString = function (_) {
+    EventRepayCreditAccount.prototype.toString = function () {
         return "Credit account ".concat((0, contractsRegister_1.getContractName)(this.creditManager), ": was repaid");
     };
     return EventRepayCreditAccount;
@@ -339,6 +337,8 @@ var EventTokenAllowed = /** @class */ (function (_super) {
                 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) / constants_1.PERCENTAGE_DECIMALS, " => ").concat(this.liquidityThreshold / constants_1.PERCENTAGE_DECIMALS, "%");
+            default:
+                return "Error: TokenAllowedProps";
         }
     };
     return EventTokenAllowed;
@@ -377,13 +377,15 @@ var EventContractAllowed = /** @class */ (function (_super) {
         _this.status = opts.status;
         return _this;
     }
-    EventContractAllowed.prototype.toString = function (_) {
+    EventContractAllowed.prototype.toString = function () {
         var msg = "Credit manager ".concat((0, contractsRegister_1.getContractName)(this.creditManager), " updated");
         switch (this.status) {
             case "Connected":
                 return "".concat(msg, " : ").concat((0, contractsRegister_1.getContractName)(this.protocol), " was connected. Adapter at: ").concat(this.adapter);
             case "AdapterUpdate":
                 return "".concat(msg, " : ").concat((0, contractsRegister_1.getContractName)(this.protocol), " adapter was updated. New adapter:  ").concat(this.adapter);
+            default:
+                return "Error: EventContractAllowed";
         }
     };
     return EventContractAllowed;
@@ -401,7 +403,7 @@ var EventContractForbidden = /** @class */ (function (_super) {
         _this.protocol = opts.protocol;
         return _this;
     }
-    EventContractForbidden.prototype.toString = function (_) {
+    EventContractForbidden.prototype.toString = function () {
         return "Credit manager ".concat((0, contractsRegister_1.getContractName)(this.creditManager), " updated: ").concat((0, contractsRegister_1.getContractName)(this.protocol));
     };
     return EventContractForbidden;
@@ -422,7 +424,7 @@ var EventNewFastCheckParameters = /** @class */ (function (_super) {
         _this.prevFastCheckDelay = opts.prevFastCheckDelay;
         return _this;
     }
-    EventNewFastCheckParameters.prototype.toString = function (_) {
+    EventNewFastCheckParameters.prototype.toString = function () {
         var msg = "Credit manager ".concat((0, contractsRegister_1.getContractName)(this.creditManager), " updated: ");
         if (this.chiThreshold !== this.prevChiThreshold) {
             msg += "Chi threshold: ".concat(this.prevChiThreshold, " => ").concat(this.chiThreshold, ", ");
@@ -447,7 +449,7 @@ var EventPriceOracleUpdated = /** @class */ (function (_super) {
         _this.priceOracle = opts.priceOracle;
         return _this;
     }
-    EventPriceOracleUpdated.prototype.toString = function (_) {
+    EventPriceOracleUpdated.prototype.toString = function () {
         return "Credit manager ".concat((0, contractsRegister_1.getContractName)(this.creditManager), " updated: price oracle was updated. New price oracle ").concat((0, contractsRegister_1.getContractName)(this.priceOracle));
     };
     return EventPriceOracleUpdated;
@@ -466,7 +468,7 @@ var EventTransferPluginAllowed = /** @class */ (function (_super) {
         _this.state = opts.state;
         return _this;
     }
-    EventTransferPluginAllowed.prototype.toString = function (_) {
+    EventTransferPluginAllowed.prototype.toString = function () {
         return "Credit manager ".concat((0, contractsRegister_1.getContractName)(this.creditManager), " updated: transfer plugin  ").concat((0, contractsRegister_1.getContractName)(this.plugin), " was ").concat(this.state ? "allowed" : "forbidden");
     };
     return EventTransferPluginAllowed;
@@ -484,7 +486,7 @@ var EventNewInterestRateModel = /** @class */ (function (_super) {
         _this.newInterestRateModel = opts.newInterestRateModel;
         return _this;
     }
-    EventNewInterestRateModel.prototype.toString = function (_) {
+    EventNewInterestRateModel.prototype.toString = function () {
         return "Pool ".concat((0, contractsRegister_1.getContractName)(this.pool), " updated: interest rate model was updated. New model: ").concat((0, contractsRegister_1.getContractName)(this.newInterestRateModel));
     };
     return EventNewInterestRateModel;
@@ -502,7 +504,7 @@ var EventNewCreditManagerConnected = /** @class */ (function (_super) {
         _this.creditManager = opts.creditManager;
         return _this;
     }
-    EventNewCreditManagerConnected.prototype.toString = function (_) {
+    EventNewCreditManagerConnected.prototype.toString = function () {
         return "Pool ".concat((0, contractsRegister_1.getContractName)(this.pool), " updated: new credit manager ").concat((0, contractsRegister_1.getContractName)(this.creditManager), " was connected");
     };
     return EventNewCreditManagerConnected;
@@ -520,7 +522,7 @@ var EventBorrowForbidden = /** @class */ (function (_super) {
         _this.creditManager = opts.creditManager;
         return _this;
     }
-    EventBorrowForbidden.prototype.toString = function (_) {
+    EventBorrowForbidden.prototype.toString = function () {
         return "Pool ".concat((0, contractsRegister_1.getContractName)(this.pool), " updated: credit manager ").concat((0, contractsRegister_1.getContractName)(this.creditManager), " was forbidden to borrow");
     };
     return EventBorrowForbidden;
@@ -563,7 +565,7 @@ var EventNewWithdrawFee = /** @class */ (function (_super) {
         _this.prevFee = Number(opts.oldFee);
         return _this;
     }
-    EventNewWithdrawFee.prototype.toString = function (_) {
+    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 / 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, "%");
@@ -602,7 +604,7 @@ var EventTakeForever = /** @class */ (function (_super) {
         _this.to = opts.to;
         return _this;
     }
-    EventTakeForever.prototype.toString = function (_) {
+    EventTakeForever.prototype.toString = function () {
         return "AccountFactory: account ".concat(this.creditAccount, " was taken forever and transferred to ").concat(this.to);
     };
     return EventTakeForever;
@@ -619,7 +621,7 @@ var EventPaused = /** @class */ (function (_super) {
         _this.contract = opts.contract;
         return _this;
     }
-    EventPaused.prototype.toString = function (_) {
+    EventPaused.prototype.toString = function () {
         return "".concat((0, contractsRegister_1.getContractName)(this.contract), " was paused");
     };
     return EventPaused;
@@ -636,7 +638,7 @@ var EventUnPaused = /** @class */ (function (_super) {
         _this.contract = opts.contract;
         return _this;
     }
-    EventUnPaused.prototype.toString = function (_) {
+    EventUnPaused.prototype.toString = function () {
         return "".concat((0, contractsRegister_1.getContractName)(this.contract), " was unpaused");
     };
     return EventUnPaused;
@@ -653,7 +655,7 @@ var EventPausableAdminAdded = /** @class */ (function (_super) {
         _this.admin = opts.admin;
         return _this;
     }
-    EventPausableAdminAdded.prototype.toString = function (_) {
+    EventPausableAdminAdded.prototype.toString = function () {
         return "ACL: pausable admin ".concat(this.admin, " was added");
     };
     return EventPausableAdminAdded;
@@ -670,7 +672,7 @@ var EventPausableAdminRemoved = /** @class */ (function (_super) {
         _this.admin = opts.admin;
         return _this;
     }
-    EventPausableAdminRemoved.prototype.toString = function (_) {
+    EventPausableAdminRemoved.prototype.toString = function () {
         return "ACL: pausable admin ".concat(this.admin, " was removed");
     };
     return EventPausableAdminRemoved;
@@ -687,7 +689,7 @@ var EventUnPausableAdminAdded = /** @class */ (function (_super) {
         _this.admin = opts.admin;
         return _this;
     }
-    EventUnPausableAdminAdded.prototype.toString = function (_) {
+    EventUnPausableAdminAdded.prototype.toString = function () {
         return "ACL: unpausable admin ".concat(this.admin, " was added");
     };
     return EventUnPausableAdminAdded;
@@ -704,7 +706,7 @@ var EventUnPausableAdminRemoved = /** @class */ (function (_super) {
         _this.admin = opts.admin;
         return _this;
     }
-    EventUnPausableAdminRemoved.prototype.toString = function (_) {
+    EventUnPausableAdminRemoved.prototype.toString = function () {
         return "ACL: unpausable admin ".concat(this.admin, " was removed");
     };
     return EventUnPausableAdminRemoved;
@@ -722,7 +724,7 @@ var EventTransferOwnership = /** @class */ (function (_super) {
         _this.newOwner = opts.admin;
         return _this;
     }
-    EventTransferOwnership.prototype.toString = function (_) {
+    EventTransferOwnership.prototype.toString = function () {
         return "ACL: configurator was changed to ".concat(this.newOwner);
     };
     return EventTransferOwnership;

package/lib/core/pool.d.ts

@@ -19,9 +19,9 @@ export declare class PoolData {
     readonly withdrawFee: number;
     readonly timestampLU: BigNumber;
     readonly cumulativeIndex_RAY: BigNumber;
+    readonly isPaused: boolean;
     constructor(payload: PoolDataPayload);
     getContractETH(signer: Signer): IPoolService;
-    get isPaused(): boolean;
 }
 export interface PoolsStat {
     tvl: number;

package/lib/core/pool.js

@@ -7,6 +7,7 @@ var types_1 = require("../types");
 var constants_1 = require("./constants");
 var PoolData = /** @class */ (function () {
     function PoolData(payload) {
+        this.isPaused = false;
         this.id = payload.addr;
         this.address = payload.addr;
         this.underlyingToken = payload.underlying || "";
@@ -29,13 +30,6 @@ var PoolData = /** @class */ (function () {
     PoolData.prototype.getContractETH = function (signer) {
         return types_1.IPoolService__factory.connect(this.address, signer);
     };
-    Object.defineProperty(PoolData.prototype, "isPaused", {
-        get: function () {
-            return false;
-        },
-        enumerable: false,
-        configurable: true
-    });
     return PoolData;
 }());
 exports.PoolData = PoolData;

package/lib/core/price.d.ts

@@ -1,4 +1,2 @@
 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;
+export declare const calcTotalPrice: (price: BigNumber, amount: BigNumber, decimals?: number) => BigNumber;

package/lib/core/price.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.priceCalc = exports.PRICE_DECIMALS = void 0;
+exports.calcTotalPrice = 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;
+var constants_1 = require("./constants");
+var calcTotalPrice = function (price, amount, decimals) {
+    if (decimals === void 0) { decimals = 18; }
     return amount
-        .mul(Math.floor(exports.PRICE_DECIMALS * price))
-        .div(ethers_1.BigNumber.from(10).pow(decimals));
+        .mul(constants_1.WAD)
+        .mul(price)
+        .div(ethers_1.BigNumber.from(10).pow(decimals))
+        .div(constants_1.PRICE_DECIMALS);
 };
-exports.priceCalc = priceCalc;
+exports.calcTotalPrice = calcTotalPrice;

package/lib/core/strategy.d.ts

@@ -1,3 +1,4 @@
+import { BigNumber } from "ethers";
 export interface StrategyPayload {
     apy?: number;
     name: string;
@@ -11,6 +12,11 @@ interface PoolStats {
     borrowRate: number;
 }
 declare type PoolList = Record<string, PoolStats>;
+interface TokenDescription {
+    price: BigNumber;
+    amount: BigNumber;
+    decimals: number | undefined;
+}
 export declare class Strategy {
     apy: number | undefined;
     name: string;
@@ -20,13 +26,9 @@ export declare class Strategy {
     leveragableCollateral: Array<string>;
     baseAssets: Array<string>;
     constructor(payload: StrategyPayload);
-    roiMax(apy: number, maxLeverage: number, poolApy: PoolList): number;
+    maxAPY(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;
+    liquidationPrice(borrowed: TokenDescription, collateral: TokenDescription, lp: TokenDescription, ltCollateral: BigNumber): BigNumber;
     private farmLev;
     private inBaseAssets;
     private inLeveragableAssets;

package/lib/core/strategy.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Strategy = void 0;
-var constants_1 = require("../core/constants");
+var ethers_1 = require("ethers");
+var constants_1 = require("./constants");
+var price_1 = require("./price");
 var Strategy = /** @class */ (function () {
     function Strategy(payload) {
         this.apy = payload.apy;
@@ -12,33 +14,24 @@ var Strategy = /** @class */ (function () {
         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.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);
-    };
-    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;
+        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)
+            .mul(ltCollateral)
+            .div(constants_1.PERCENTAGE_FACTOR);
+        var lpMoney = (0, price_1.calcTotalPrice)(lp.price, lp.amount, lp.decimals);
+        return lpMoney.gt(0)
+            ? borrowedMoney.sub(collateralMoney).mul(constants_1.WAD).div(lpMoney)
+            : ethers_1.BigNumber.from(0);
     };
     Strategy.prototype.farmLev = function (leverage, depositCollateral) {
         return this.inBaseAssets(depositCollateral) ||
@@ -55,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 () {