@gearbox-protocol/sdk 1.5.14 → 1.5.17

package/lib/core/adapter.d.ts

@@ -1,8 +1,5 @@
-import { Signer } from "ethers";
 import { AdapterInterface } from "../contracts/adapters";
 import { SupportedContract } from "../contracts/contracts";
-import { EVMTx } from "./eventOrTx";
-import { TradePath } from "./trade";
 interface BaseAdapterProps {
     name: string;
     adapterInterface: AdapterInterface;
@@ -11,11 +8,6 @@ interface BaseAdapterProps {
     contractSymbol: SupportedContract;
     creditManager: string;
 }
-interface ExecuteProps {
-    tradePath: TradePath;
-    slippage: number;
-    signer: Signer;
-}
 export declare class BaseAdapter {
     readonly name: string;
     readonly adapterInterface: AdapterInterface;
@@ -24,6 +16,5 @@ export declare class BaseAdapter {
     readonly contractSymbol: SupportedContract;
     readonly creditManager: string;
     constructor(props: BaseAdapterProps);
-    execute(props: ExecuteProps): Promise<EVMTx>;
 }
 export {};

package/lib/core/adapter.js

@@ -1,40 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseAdapter = void 0;
 var BaseAdapter = /** @class */ (function () {
@@ -46,14 +10,6 @@ var BaseAdapter = /** @class */ (function () {
         this.contractSymbol = props.contractSymbol;
         this.creditManager = props.creditManager;
     }
-    BaseAdapter.prototype.execute = function (props) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                console.debug(props);
-                return [2 /*return*/, {}];
-            });
-        });
-    };
     return BaseAdapter;
 }());
 exports.BaseAdapter = BaseAdapter;

package/lib/core/creditAccount.d.ts

@@ -3,18 +3,22 @@ import { LpTokensAPY } from "../apy";
 import { CreditAccountDataExtendedPayload, CreditAccountDataPayload } from "../payload/creditAccount";
 import { TokenData } from "../tokens/tokenData";
 import { Asset, LpAsset } from "./assets";
+import { CreditManagerData } from "./creditManager";
+import { PriceOracleData } from "./priceOracle";
 export declare class CreditAccountData {
-    readonly id: string;
     readonly addr: string;
     readonly borrower: string;
     readonly inUse: boolean;
     readonly creditManager: string;
     readonly underlyingToken: string;
+    readonly since: number;
+    readonly cumulativeIndexAtOpen: BigNumber;
+    readonly borrowedAmount: BigNumber;
     borrowedAmountPlusInterest: BigNumber;
     totalValue: BigNumber;
     healthFactor: number;
     borrowRate: number;
-    readonly allowedTokens: Array<string>;
+    readonly collateralTokens: Array<string>;
     readonly allTokens: Array<string>;
     balances: Record<string, BigNumber>;
     allBalances: Record<string, BigNumber>;
@@ -22,6 +26,11 @@ export declare class CreditAccountData {
     readonly version: number;
     constructor(payload: CreditAccountDataPayload);
     balancesSorted(prices: Record<string, BigNumber>, tokens: Record<string, TokenData>): Array<Asset>;
+    calcBorrowAmountPlusInterestRate(currentCumulativeIndex: BigNumber): BigNumber;
+    updateHealthFactor(creditManager: CreditManagerData, currentCumulativeIndex: BigNumber, priceOracle: PriceOracleData): void;
+    get id(): string;
+    protected hash(): string;
+    protected static hash(creditManager: string, borrower: string): string;
 }
 export declare function sortBalances(balances: Record<string, BigNumber>, prices: Record<string, BigNumber>, tokens: Record<string, TokenData>): Array<[string, BigNumber]>;
 export declare function tokensAbcComparator(t1?: TokenData, t2?: TokenData): 1 | -1;

package/lib/core/creditAccount.js

@@ -23,17 +23,19 @@ var constants_1 = require("./constants");
 var CreditAccountData = /** @class */ (function () {
     function CreditAccountData(payload) {
         var _this = this;
-        this.allowedTokens = [];
+        this.collateralTokens = [];
         this.allTokens = [];
         this.balances = {};
         this.allBalances = {};
         this.version = 1;
-        this.id = payload.creditManager.toLowerCase();
         this.addr = payload.addr.toLowerCase();
         this.borrower = payload.borrower.toLowerCase();
         this.inUse = payload.inUse;
         this.creditManager = payload.creditManager.toLowerCase();
         this.underlyingToken = payload.underlying.toLowerCase();
+        this.since = ethers_1.BigNumber.from(payload.since).toNumber();
+        this.cumulativeIndexAtOpen = ethers_1.BigNumber.from(payload.cumulativeIndexAtOpen);
+        this.borrowedAmount = ethers_1.BigNumber.from(payload.borrowedAmount);
         this.borrowedAmountPlusInterest = ethers_1.BigNumber.from(payload.borrowedAmountPlusInterest);
         this.totalValue = ethers_1.BigNumber.from(payload.totalValue);
         this.healthFactor =
@@ -48,7 +50,7 @@ var CreditAccountData = /** @class */ (function () {
             var tokenLC = b.token.toLowerCase();
             if (b.isAllowed) {
                 _this.balances[tokenLC] = ethers_1.BigNumber.from(b.balance);
-                _this.allowedTokens.push(tokenLC);
+                _this.collateralTokens.push(tokenLC);
             }
             _this.allBalances[tokenLC] = ethers_1.BigNumber.from(b.balance);
             _this.allTokens.push(tokenLC);
@@ -62,6 +64,39 @@ var CreditAccountData = /** @class */ (function () {
             return ({ token: token, balance: balance });
         });
     };
+    CreditAccountData.prototype.calcBorrowAmountPlusInterestRate = function (currentCumulativeIndex) {
+        return this.borrowedAmount
+            .mul(currentCumulativeIndex)
+            .div(this.cumulativeIndexAtOpen);
+    };
+    CreditAccountData.prototype.updateHealthFactor = function (creditManager, currentCumulativeIndex, priceOracle) {
+        var _this = this;
+        var twvUSDValue = this.collateralTokens
+            .map(function (token) {
+            return priceOracle
+                .convertToUSD(_this.balances[token], token)
+                .mul(creditManager.liquidationThresholds[token]);
+        })
+            .reduce(function (a, b) { return a.add(b); });
+        this.healthFactor =
+            priceOracle
+                .convertFromUSD(twvUSDValue, this.underlyingToken)
+                .div(this.calcBorrowAmountPlusInterestRate(currentCumulativeIndex))
+                .toNumber() / constants_1.PERCENTAGE_FACTOR;
+    };
+    Object.defineProperty(CreditAccountData.prototype, "id", {
+        get: function () {
+            return this.creditManager;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    CreditAccountData.prototype.hash = function () {
+        return CreditAccountData.hash(this.creditManager, this.borrower);
+    };
+    CreditAccountData.hash = function (creditManager, borrower) {
+        return "".concat(creditManager.toLowerCase(), ":").concat(borrower.toLowerCase());
+    };
     return CreditAccountData;
 }());
 exports.CreditAccountData = CreditAccountData;

package/lib/core/creditManager.d.ts

@@ -1,9 +1,9 @@
 import { BigNumber, ethers, Signer } from "ethers";
+import { MultiCall } from "../pathfinder/core";
 import { CreditManagerDataPayload, CreditManagerStatPayload } from "../payload/creditManager";
 import { TokenData } from "../tokens/tokenData";
 import { ICreditManager } from "../types";
 import { Asset } from "./assets";
-import { MultiCall } from "./multicall";
 export declare class CreditManagerData {
     readonly id: string;
     readonly address: string;

package/lib/core/priceOracle.d.ts

@@ -0,0 +1,14 @@
+import { BigNumber, BigNumberish } from "ethers";
+export interface PriceUpdate {
+    token: string;
+    price: BigNumberish;
+}
+export declare class PriceOracleData {
+    protected _prices: Record<string, BigNumber>;
+    constructor(prices: Array<PriceUpdate>);
+    updatePrices(prices: Array<PriceUpdate>): void;
+    convert(amount: BigNumber, from: string, to: string): BigNumber;
+    convertFromUSD(amount: BigNumber, token: string): BigNumber;
+    convertToUSD(amount: BigNumber, token: string): BigNumber;
+    getPrice(token: string): BigNumber;
+}

package/lib/core/priceOracle.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PriceOracleData = void 0;
+var ethers_1 = require("ethers");
+var token_1 = require("../tokens/token");
+var PriceOracleData = /** @class */ (function () {
+    function PriceOracleData(prices) {
+        this._prices = {};
+        this.updatePrices(prices);
+    }
+    PriceOracleData.prototype.updatePrices = function (prices) {
+        var _this = this;
+        prices.forEach(function (p) {
+            _this._prices[p.token.toLowerCase()] = ethers_1.BigNumber.from(p.price);
+        });
+    };
+    PriceOracleData.prototype.convert = function (amount, from, to) {
+        return this.convertFromUSD(this.convertToUSD(amount, from), to);
+    };
+    PriceOracleData.prototype.convertFromUSD = function (amount, token) {
+        return amount
+            .mul(ethers_1.BigNumber.from(10).pow((0, token_1.getDecimals)(token)))
+            .div(this.getPrice(token));
+    };
+    PriceOracleData.prototype.convertToUSD = function (amount, token) {
+        return amount
+            .mul(this.getPrice(token))
+            .div(ethers_1.BigNumber.from(10).pow((0, token_1.getDecimals)(token)));
+    };
+    PriceOracleData.prototype.getPrice = function (token) {
+        var price = this._prices[token.toLowerCase()];
+        if (!price)
+            throw new Error("Price for ".concat(token, " not found"));
+        return price;
+    };
+    return PriceOracleData;
+}());
+exports.PriceOracleData = PriceOracleData;

package/lib/core/trade.d.ts

@@ -1,32 +1,29 @@
 import { BigNumber } from "ethers";
 import { AdapterInterface } from "../contracts/adapters";
-import { SwapType } from "../pathfinder/tradeTypes";
+import { PathFinderResult, SwapOperation } from "../pathfinder/core";
 import { ICreditFacade } from "../types";
-import { PathFinderResultStruct, PathFinderResultStructOutput } from "../types/contracts/pathfinder/interfaces/IPathFinder";
 import { BaseAdapter } from "./adapter";
 import { EVMTx } from "./eventOrTx";
 import { TXSwap } from "./transactions";
-export declare type TradePath = Pick<PathFinderResultStructOutput, keyof PathFinderResultStruct>;
-export interface BaseTradeInterface {
-    swapType: SwapType;
+interface BaseTradeInterface {
+    swapType: SwapOperation;
     sourceAmount: BigNumber;
     expectedAmount: BigNumber;
-    rate: BigNumber;
     tokenFrom: string;
     tokenTo: string;
     operationName: TradeOperations;
 }
 export interface TradeProps extends BaseTradeInterface {
     adapter: BaseAdapter;
-    tradePath: TradePath;
+    tradePath: PathFinderResult;
     creditFacade: ICreditFacade;
 }
 export declare type TradeOperations = "farmWithdraw" | "farmDeposit" | "swap" | "unknownOperation";
 export declare class Trade implements BaseTradeInterface {
     protected helper: BaseAdapter;
-    protected tradePath: TradePath;
+    protected tradePath: PathFinderResult;
     protected creditFacade: ICreditFacade;
-    readonly swapType: SwapType;
+    readonly swapType: SwapOperation;
     readonly sourceAmount: BigNumber;
     readonly expectedAmount: BigNumber;
     readonly rate: BigNumber;
@@ -45,3 +42,4 @@ export declare class Trade implements BaseTradeInterface {
     getToAmount(slippage: number): BigNumber;
     static getOperationName(tokenInAddress: string, tokenOutAddress: string): TradeOperations;
 }
+export {};

package/lib/core/trade.js

@@ -56,7 +56,7 @@ var Trade = /** @class */ (function () {
         this.swapType = props.swapType;
         this.sourceAmount = props.sourceAmount;
         this.expectedAmount = props.expectedAmount;
-        this.rate = props.rate;
+        this.rate = constants_1.WAD.mul(props.expectedAmount).div(props.sourceAmount);
         this.tokenFrom = props.tokenFrom;
         this.tokenTo = props.tokenTo;
         this.operationName = props.operationName;

package/lib/core/wcOperation.d.ts

@@ -15,7 +15,7 @@ export interface TxInfo {
     amountTo?: BigNumber;
     functionFragment: FunctionFragment;
 }
-export declare class SwapOperation {
+export declare class WcSwapOperation {
     readonly id: number;
     operation?: string;
     from?: string;
@@ -39,7 +39,7 @@ export declare class SwapOperation {
         amountFrom: BigNumber;
         amountTo: BigNumber;
         raw: RawTransaction;
-    }): SwapOperation;
+    }): WcSwapOperation;
     static NewLPOperation(params: {
         adapter: string;
         operation: string;
@@ -48,7 +48,7 @@ export declare class SwapOperation {
         farm: string;
         type: LpOperationType;
         raw: RawTransaction;
-    }): SwapOperation;
-    static NewUnsupportedOperation(raw: RawTransaction): SwapOperation;
-    static NewApproveOperation(creditManager: string, raw: RawTransaction, token: string): SwapOperation;
+    }): WcSwapOperation;
+    static NewUnsupportedOperation(raw: RawTransaction): WcSwapOperation;
+    static NewApproveOperation(creditManager: string, raw: RawTransaction, token: string): WcSwapOperation;
 }

package/lib/core/wcOperation.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SwapOperation = void 0;
+exports.WcSwapOperation = void 0;
 var types_1 = require("../types");
-var SwapOperation = /** @class */ (function () {
-    function SwapOperation(raw, kind) {
+var WcSwapOperation = /** @class */ (function () {
+    function WcSwapOperation(raw, kind) {
         this.id = raw.id;
         this.raw = raw;
         this.kind = kind;
         this.isPending = false;
     }
-    SwapOperation.NewSwapOperation = function (params) {
+    WcSwapOperation.NewSwapOperation = function (params) {
         var _a, _b;
-        var newOperation = new SwapOperation(params.raw, "swap");
+        var newOperation = new WcSwapOperation(params.raw, "swap");
         newOperation.operation = params.operation;
         newOperation.from = params.from;
         newOperation.to = params.to;
@@ -25,9 +25,9 @@ var SwapOperation = /** @class */ (function () {
         };
         return newOperation;
     };
-    SwapOperation.NewLPOperation = function (params) {
+    WcSwapOperation.NewLPOperation = function (params) {
         var _a, _b;
-        var newOperation = new SwapOperation(params.raw, "lp");
+        var newOperation = new WcSwapOperation(params.raw, "lp");
         newOperation.operation = params.operation;
         newOperation.from = params.from;
         newOperation.amountFrom = params.amountFrom;
@@ -41,12 +41,12 @@ var SwapOperation = /** @class */ (function () {
         newOperation.lpOperationType = params.type;
         return newOperation;
     };
-    SwapOperation.NewUnsupportedOperation = function (raw) {
-        return new SwapOperation(raw, "unsupported");
+    WcSwapOperation.NewUnsupportedOperation = function (raw) {
+        return new WcSwapOperation(raw, "unsupported");
     };
-    SwapOperation.NewApproveOperation = function (creditManager, raw, token) {
+    WcSwapOperation.NewApproveOperation = function (creditManager, raw, token) {
         var _a, _b;
-        var operation = new SwapOperation(raw, "approve");
+        var operation = new WcSwapOperation(raw, "approve");
         operation.to = token;
         operation.calldata = (_a = raw === null || raw === void 0 ? void 0 : raw.params[0]) === null || _a === void 0 ? void 0 : _a.data;
         var tokenI = types_1.IERC20__factory.createInterface();
@@ -67,10 +67,10 @@ var SwapOperation = /** @class */ (function () {
         }
         catch (e) {
             console.error(e);
-            return SwapOperation.NewUnsupportedOperation(raw);
+            return WcSwapOperation.NewUnsupportedOperation(raw);
         }
     };
-    SwapOperation.tokens = {};
-    return SwapOperation;
+    WcSwapOperation.tokens = {};
+    return WcSwapOperation;
 }());
-exports.SwapOperation = SwapOperation;
+exports.WcSwapOperation = WcSwapOperation;

package/lib/index.d.ts

@@ -34,6 +34,8 @@ export { AdapterInterface } from "./contracts/adapters";
 export { getContractName } from "./contracts/contractsRegister";
 export * from "./core/history";
 export * from "./parsers/txParser";
+export * from "./pathfinder/core";
+export * from "./pathfinder/pathfinder";
 export * from "./pathfinder/tradeTypes";
 export * from "./strategies/convex";
 export * from "./strategies/creditFacade";

package/lib/index.js

@@ -54,6 +54,8 @@ var contractsRegister_1 = require("./contracts/contractsRegister");
 Object.defineProperty(exports, "getContractName", { enumerable: true, get: function () { return contractsRegister_1.getContractName; } });
 __exportStar(require("./core/history"), exports);
 __exportStar(require("./parsers/txParser"), exports);
+__exportStar(require("./pathfinder/core"), exports);
+__exportStar(require("./pathfinder/pathfinder"), exports);
 __exportStar(require("./pathfinder/tradeTypes"), exports);
 __exportStar(require("./strategies/convex"), exports);
 __exportStar(require("./strategies/creditFacade"), exports);

package/lib/pathfinder/tradeTypes.d.ts

@@ -77,7 +77,3 @@ export declare type TradeAction = {
     contract: ConvexPoolContract;
     tokenOut: CurveLPToken;
 };
-export declare enum SwapType {
-    ExactInput = 1,
-    ExactOutput = 2
-}

package/lib/pathfinder/tradeTypes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SwapType = exports.TradeType = void 0;
+exports.TradeType = void 0;
 var TradeType;
 (function (TradeType) {
     TradeType[TradeType["UniswapV2Swap"] = 0] = "UniswapV2Swap";
@@ -19,8 +19,3 @@ var TradeType;
     TradeType[TradeType["ConvexWithdraw"] = 13] = "ConvexWithdraw";
     TradeType[TradeType["ConvexWithdrawAndUnwrap"] = 14] = "ConvexWithdrawAndUnwrap";
 })(TradeType = exports.TradeType || (exports.TradeType = {}));
-var SwapType;
-(function (SwapType) {
-    SwapType[SwapType["ExactInput"] = 1] = "ExactInput";
-    SwapType[SwapType["ExactOutput"] = 2] = "ExactOutput";
-})(SwapType = exports.SwapType || (exports.SwapType = {}));

package/lib/types/contracts/interfaces/ICreditFacade.sol/ICreditFacade.d.ts

@@ -124,7 +124,7 @@ export declare type AddCollateralEvent = TypedEvent<[
 ], AddCollateralEventObject>;
 export declare type AddCollateralEventFilter = TypedEventFilter<AddCollateralEvent>;
 export interface CloseCreditAccountEventObject {
-    owner: string;
+    borrower: string;
     to: string;
 }
 export declare type CloseCreditAccountEvent = TypedEvent<[
@@ -151,7 +151,7 @@ export declare type IncreaseBorrowedAmountEvent = TypedEvent<[
 ], IncreaseBorrowedAmountEventObject>;
 export declare type IncreaseBorrowedAmountEventFilter = TypedEventFilter<IncreaseBorrowedAmountEvent>;
 export interface LiquidateCreditAccountEventObject {
-    owner: string;
+    borrower: string;
     liquidator: string;
     to: string;
     remainingFunds: BigNumber;
@@ -164,7 +164,7 @@ export declare type LiquidateCreditAccountEvent = TypedEvent<[
 ], LiquidateCreditAccountEventObject>;
 export declare type LiquidateCreditAccountEventFilter = TypedEventFilter<LiquidateCreditAccountEvent>;
 export interface LiquidateExpiredCreditAccountEventObject {
-    owner: string;
+    borrower: string;
     liquidator: string;
     to: string;
     remainingFunds: BigNumber;
@@ -202,7 +202,7 @@ export declare type OpenCreditAccountEvent = TypedEvent<[
 ], OpenCreditAccountEventObject>;
 export declare type OpenCreditAccountEventFilter = TypedEventFilter<OpenCreditAccountEvent>;
 export interface TokenDisabledEventObject {
-    creditAccount: string;
+    borrower: string;
     token: string;
 }
 export declare type TokenDisabledEvent = TypedEvent<[
@@ -211,7 +211,7 @@ export declare type TokenDisabledEvent = TypedEvent<[
 ], TokenDisabledEventObject>;
 export declare type TokenDisabledEventFilter = TypedEventFilter<TokenDisabledEvent>;
 export interface TokenEnabledEventObject {
-    creditAccount: string;
+    borrower: string;
     token: string;
 }
 export declare type TokenEnabledEvent = TypedEvent<[
@@ -434,26 +434,26 @@ export interface ICreditFacade extends BaseContract {
     filters: {
         "AddCollateral(address,address,uint256)"(onBehalfOf?: string | null, token?: string | null, value?: null): AddCollateralEventFilter;
         AddCollateral(onBehalfOf?: string | null, token?: string | null, value?: null): AddCollateralEventFilter;
-        "CloseCreditAccount(address,address)"(owner?: string | null, to?: string | null): CloseCreditAccountEventFilter;
-        CloseCreditAccount(owner?: string | null, to?: string | null): CloseCreditAccountEventFilter;
+        "CloseCreditAccount(address,address)"(borrower?: string | null, to?: string | null): CloseCreditAccountEventFilter;
+        CloseCreditAccount(borrower?: string | null, to?: string | null): CloseCreditAccountEventFilter;
         "DecreaseBorrowedAmount(address,uint256)"(borrower?: string | null, amount?: null): DecreaseBorrowedAmountEventFilter;
         DecreaseBorrowedAmount(borrower?: string | null, amount?: null): DecreaseBorrowedAmountEventFilter;
         "IncreaseBorrowedAmount(address,uint256)"(borrower?: string | null, amount?: null): IncreaseBorrowedAmountEventFilter;
         IncreaseBorrowedAmount(borrower?: string | null, amount?: null): IncreaseBorrowedAmountEventFilter;
-        "LiquidateCreditAccount(address,address,address,uint256)"(owner?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateCreditAccountEventFilter;
-        LiquidateCreditAccount(owner?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateCreditAccountEventFilter;
-        "LiquidateExpiredCreditAccount(address,address,address,uint256)"(owner?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateExpiredCreditAccountEventFilter;
-        LiquidateExpiredCreditAccount(owner?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateExpiredCreditAccountEventFilter;
+        "LiquidateCreditAccount(address,address,address,uint256)"(borrower?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateCreditAccountEventFilter;
+        LiquidateCreditAccount(borrower?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateCreditAccountEventFilter;
+        "LiquidateExpiredCreditAccount(address,address,address,uint256)"(borrower?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateExpiredCreditAccountEventFilter;
+        LiquidateExpiredCreditAccount(borrower?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateExpiredCreditAccountEventFilter;
         "MultiCallFinished()"(): MultiCallFinishedEventFilter;
         MultiCallFinished(): MultiCallFinishedEventFilter;
         "MultiCallStarted(address)"(borrower?: string | null): MultiCallStartedEventFilter;
         MultiCallStarted(borrower?: string | null): MultiCallStartedEventFilter;
         "OpenCreditAccount(address,address,uint256,uint16)"(onBehalfOf?: string | null, creditAccount?: string | null, borrowAmount?: null, referralCode?: null): OpenCreditAccountEventFilter;
         OpenCreditAccount(onBehalfOf?: string | null, creditAccount?: string | null, borrowAmount?: null, referralCode?: null): OpenCreditAccountEventFilter;
-        "TokenDisabled(address,address)"(creditAccount?: null, token?: null): TokenDisabledEventFilter;
-        TokenDisabled(creditAccount?: null, token?: null): TokenDisabledEventFilter;
-        "TokenEnabled(address,address)"(creditAccount?: null, token?: null): TokenEnabledEventFilter;
-        TokenEnabled(creditAccount?: null, token?: null): TokenEnabledEventFilter;
+        "TokenDisabled(address,address)"(borrower?: null, token?: null): TokenDisabledEventFilter;
+        TokenDisabled(borrower?: null, token?: null): TokenDisabledEventFilter;
+        "TokenEnabled(address,address)"(borrower?: null, token?: null): TokenEnabledEventFilter;
+        TokenEnabled(borrower?: null, token?: null): TokenEnabledEventFilter;
         "TransferAccount(address,address)"(oldOwner?: string | null, newOwner?: string | null): TransferAccountEventFilter;
         TransferAccount(oldOwner?: string | null, newOwner?: string | null): TransferAccountEventFilter;
         "TransferAccountAllowed(address,address,bool)"(from?: string | null, to?: string | null, state?: null): TransferAccountAllowedEventFilter;

package/lib/types/contracts/interfaces/ICreditFacade.sol/ICreditFacadeEvents.d.ts

@@ -45,7 +45,7 @@ export declare type AddCollateralEvent = TypedEvent<[
 ], AddCollateralEventObject>;
 export declare type AddCollateralEventFilter = TypedEventFilter<AddCollateralEvent>;
 export interface CloseCreditAccountEventObject {
-    owner: string;
+    borrower: string;
     to: string;
 }
 export declare type CloseCreditAccountEvent = TypedEvent<[
@@ -72,7 +72,7 @@ export declare type IncreaseBorrowedAmountEvent = TypedEvent<[
 ], IncreaseBorrowedAmountEventObject>;
 export declare type IncreaseBorrowedAmountEventFilter = TypedEventFilter<IncreaseBorrowedAmountEvent>;
 export interface LiquidateCreditAccountEventObject {
-    owner: string;
+    borrower: string;
     liquidator: string;
     to: string;
     remainingFunds: BigNumber;
@@ -85,7 +85,7 @@ export declare type LiquidateCreditAccountEvent = TypedEvent<[
 ], LiquidateCreditAccountEventObject>;
 export declare type LiquidateCreditAccountEventFilter = TypedEventFilter<LiquidateCreditAccountEvent>;
 export interface LiquidateExpiredCreditAccountEventObject {
-    owner: string;
+    borrower: string;
     liquidator: string;
     to: string;
     remainingFunds: BigNumber;
@@ -123,7 +123,7 @@ export declare type OpenCreditAccountEvent = TypedEvent<[
 ], OpenCreditAccountEventObject>;
 export declare type OpenCreditAccountEventFilter = TypedEventFilter<OpenCreditAccountEvent>;
 export interface TokenDisabledEventObject {
-    creditAccount: string;
+    borrower: string;
     token: string;
 }
 export declare type TokenDisabledEvent = TypedEvent<[
@@ -132,7 +132,7 @@ export declare type TokenDisabledEvent = TypedEvent<[
 ], TokenDisabledEventObject>;
 export declare type TokenDisabledEventFilter = TypedEventFilter<TokenDisabledEvent>;
 export interface TokenEnabledEventObject {
-    creditAccount: string;
+    borrower: string;
     token: string;
 }
 export declare type TokenEnabledEvent = TypedEvent<[
@@ -179,26 +179,26 @@ export interface ICreditFacadeEvents extends BaseContract {
     filters: {
         "AddCollateral(address,address,uint256)"(onBehalfOf?: string | null, token?: string | null, value?: null): AddCollateralEventFilter;
         AddCollateral(onBehalfOf?: string | null, token?: string | null, value?: null): AddCollateralEventFilter;
-        "CloseCreditAccount(address,address)"(owner?: string | null, to?: string | null): CloseCreditAccountEventFilter;
-        CloseCreditAccount(owner?: string | null, to?: string | null): CloseCreditAccountEventFilter;
+        "CloseCreditAccount(address,address)"(borrower?: string | null, to?: string | null): CloseCreditAccountEventFilter;
+        CloseCreditAccount(borrower?: string | null, to?: string | null): CloseCreditAccountEventFilter;
         "DecreaseBorrowedAmount(address,uint256)"(borrower?: string | null, amount?: null): DecreaseBorrowedAmountEventFilter;
         DecreaseBorrowedAmount(borrower?: string | null, amount?: null): DecreaseBorrowedAmountEventFilter;
         "IncreaseBorrowedAmount(address,uint256)"(borrower?: string | null, amount?: null): IncreaseBorrowedAmountEventFilter;
         IncreaseBorrowedAmount(borrower?: string | null, amount?: null): IncreaseBorrowedAmountEventFilter;
-        "LiquidateCreditAccount(address,address,address,uint256)"(owner?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateCreditAccountEventFilter;
-        LiquidateCreditAccount(owner?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateCreditAccountEventFilter;
-        "LiquidateExpiredCreditAccount(address,address,address,uint256)"(owner?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateExpiredCreditAccountEventFilter;
-        LiquidateExpiredCreditAccount(owner?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateExpiredCreditAccountEventFilter;
+        "LiquidateCreditAccount(address,address,address,uint256)"(borrower?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateCreditAccountEventFilter;
+        LiquidateCreditAccount(borrower?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateCreditAccountEventFilter;
+        "LiquidateExpiredCreditAccount(address,address,address,uint256)"(borrower?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateExpiredCreditAccountEventFilter;
+        LiquidateExpiredCreditAccount(borrower?: string | null, liquidator?: string | null, to?: string | null, remainingFunds?: null): LiquidateExpiredCreditAccountEventFilter;
         "MultiCallFinished()"(): MultiCallFinishedEventFilter;
         MultiCallFinished(): MultiCallFinishedEventFilter;
         "MultiCallStarted(address)"(borrower?: string | null): MultiCallStartedEventFilter;
         MultiCallStarted(borrower?: string | null): MultiCallStartedEventFilter;
         "OpenCreditAccount(address,address,uint256,uint16)"(onBehalfOf?: string | null, creditAccount?: string | null, borrowAmount?: null, referralCode?: null): OpenCreditAccountEventFilter;
         OpenCreditAccount(onBehalfOf?: string | null, creditAccount?: string | null, borrowAmount?: null, referralCode?: null): OpenCreditAccountEventFilter;
-        "TokenDisabled(address,address)"(creditAccount?: null, token?: null): TokenDisabledEventFilter;
-        TokenDisabled(creditAccount?: null, token?: null): TokenDisabledEventFilter;
-        "TokenEnabled(address,address)"(creditAccount?: null, token?: null): TokenEnabledEventFilter;
-        TokenEnabled(creditAccount?: null, token?: null): TokenEnabledEventFilter;
+        "TokenDisabled(address,address)"(borrower?: null, token?: null): TokenDisabledEventFilter;
+        TokenDisabled(borrower?: null, token?: null): TokenDisabledEventFilter;
+        "TokenEnabled(address,address)"(borrower?: null, token?: null): TokenEnabledEventFilter;
+        TokenEnabled(borrower?: null, token?: null): TokenEnabledEventFilter;
         "TransferAccount(address,address)"(oldOwner?: string | null, newOwner?: string | null): TransferAccountEventFilter;
         TransferAccount(oldOwner?: string | null, newOwner?: string | null): TransferAccountEventFilter;
         "TransferAccountAllowed(address,address,bool)"(from?: string | null, to?: string | null, state?: null): TransferAccountAllowedEventFilter;

package/lib/types/factories/contracts/interfaces/ICreditFacade.sol/ICreditFacadeEvents__factory.js

@@ -37,7 +37,7 @@ var _abi = [
             {
                 indexed: true,
                 internalType: "address",
-                name: "owner",
+                name: "borrower",
                 type: "address",
             },
             {
@@ -94,7 +94,7 @@ var _abi = [
             {
                 indexed: true,
                 internalType: "address",
-                name: "owner",
+                name: "borrower",
                 type: "address",
             },
             {
@@ -125,7 +125,7 @@ var _abi = [
             {
                 indexed: true,
                 internalType: "address",
-                name: "owner",
+                name: "borrower",
                 type: "address",
             },
             {
@@ -206,7 +206,7 @@ var _abi = [
             {
                 indexed: false,
                 internalType: "address",
-                name: "creditAccount",
+                name: "borrower",
                 type: "address",
             },
             {
@@ -225,7 +225,7 @@ var _abi = [
             {
                 indexed: false,
                 internalType: "address",
-                name: "creditAccount",
+                name: "borrower",
                 type: "address",
             },
             {

package/lib/types/factories/contracts/interfaces/ICreditFacade.sol/ICreditFacade__factory.js

@@ -193,7 +193,7 @@ var _abi = [
             {
                 indexed: true,
                 internalType: "address",
-                name: "owner",
+                name: "borrower",
                 type: "address",
             },
             {
@@ -250,7 +250,7 @@ var _abi = [
             {
                 indexed: true,
                 internalType: "address",
-                name: "owner",
+                name: "borrower",
                 type: "address",
             },
             {
@@ -281,7 +281,7 @@ var _abi = [
             {
                 indexed: true,
                 internalType: "address",
-                name: "owner",
+                name: "borrower",
                 type: "address",
             },
             {
@@ -362,7 +362,7 @@ var _abi = [
             {
                 indexed: false,
                 internalType: "address",
-                name: "creditAccount",
+                name: "borrower",
                 type: "address",
             },
             {
@@ -381,7 +381,7 @@ var _abi = [
             {
                 indexed: false,
                 internalType: "address",
-                name: "creditAccount",
+                name: "borrower",
                 type: "address",
             },
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "1.5.14",
+  "version": "1.5.17",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

package/lib/core/multicall.d.ts

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

package/lib/core/multicall.js

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