@gearbox-protocol/sdk 1.20.3 → 1.20.5

package/lib/core/creditManager.d.ts

@@ -1,6 +1,6 @@
 import { BigNumber, ethers, Signer } from "ethers";
 import { MultiCall } from "../pathfinder/core";
-import { CreditManagerDataPayload, CreditManagerStatPayload } from "../payload/creditManager";
+import { ChartsCreditManagerPayload, CreditManagerDataPayload } from "../payload/creditManager";
 import { ICreditManager } from "../types";
 import { Asset } from "./assets";
 export declare class CreditManagerData {
@@ -42,7 +42,7 @@ export declare class CreditManagerData {
     protected validateOpenAccountV2(debt: BigNumber): true;
     get id(): string;
 }
-export declare class CreditManagerStat extends CreditManagerData {
+export declare class ChartsCreditManagerData extends CreditManagerData {
     readonly uniqueUsers: number;
     readonly openedAccountsCount: number;
     readonly totalOpenedAccounts: number;
@@ -54,7 +54,16 @@ export declare class CreditManagerStat extends CreditManagerData {
     readonly totalRepaid: BigNumber;
     readonly totalProfit: BigNumber;
     readonly totalLosses: BigNumber;
-    constructor(payload: CreditManagerStatPayload);
+    readonly totalBorrowedInUSD: number;
+    readonly totalLossesInUSD: number;
+    readonly totalProfitInUSD: number;
+    readonly totalRepaidInUSD: number;
+    readonly availableLiquidityInUSD: number;
+    readonly openedAccountsCountChange: number;
+    readonly totalOpenedAccountsChange: number;
+    readonly totalClosedAccountsChange: number;
+    readonly totalLiquidatedAccountsChange: number;
+    constructor(payload: ChartsCreditManagerPayload);
 }
 export interface CalcHealthFactorProps {
     assets: Array<Asset>;

package/lib/core/creditManager.js

@@ -26,7 +26,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calcHealthFactor = exports.CreditManagerStat = exports.CreditManagerData = void 0;
+exports.calcHealthFactor = exports.ChartsCreditManagerData = exports.CreditManagerData = void 0;
 var ethers_1 = require("ethers");
 var txParser_1 = require("../parsers/txParser");
 var decimals_1 = require("../tokens/decimals");
@@ -154,26 +154,63 @@ var CreditManagerData = /** @class */ (function () {
     return CreditManagerData;
 }());
 exports.CreditManagerData = CreditManagerData;
-var CreditManagerStat = /** @class */ (function (_super) {
-    __extends(CreditManagerStat, _super);
-    function CreditManagerStat(payload) {
-        var _this = _super.call(this, payload) || this;
-        _this.uniqueUsers = payload.uniqueUsers;
+var ChartsCreditManagerData = /** @class */ (function (_super) {
+    __extends(ChartsCreditManagerData, _super);
+    function ChartsCreditManagerData(payload) {
+        var _this = _super.call(this, {
+            canBorrow: true,
+            adapters: [],
+            liquidationThresholds: [],
+            collateralTokens: [],
+            creditFacade: "",
+            creditConfigurator: "",
+            isDegenMode: false,
+            degenNFT: "",
+            isIncreaseDebtForbidden: false,
+            forbiddenTokenMask: ethers_1.BigNumber.from(0),
+            maxEnabledTokensLength: 12,
+            feeInterest: payload.feeInterest,
+            feeLiquidation: payload.feeLiquidation,
+            liquidationDiscount: 0,
+            feeLiquidationExpired: payload.feeLiquidationExpired,
+            liquidationDiscountExpired: 0,
+            pool: payload.poolAddress,
+            version: payload.version,
+            addr: payload.addr,
+            isWETH: payload.isWeth,
+            availableLiquidity: ethers_1.BigNumber.from(payload.availableLiquidity || 0),
+            borrowRate: ethers_1.BigNumber.from(payload.borrowRate || 0),
+            maxAmount: ethers_1.BigNumber.from(payload.maxAmount || 0),
+            minAmount: ethers_1.BigNumber.from(payload.minAmount || 0),
+            maxLeverageFactor: ethers_1.BigNumber.from(payload.maxLeverageFactor || 0),
+            underlying: payload.underlyingToken,
+        }) || this;
+        _this.uniqueUsers = 0;
         _this.openedAccountsCount = payload.openedAccountsCount || 0;
         _this.totalOpenedAccounts = payload.totalOpenedAccounts || 0;
         _this.totalClosedAccounts = payload.totalClosedAccounts || 0;
         _this.totalRepaidAccounts = payload.totalRepaidAccounts || 0;
         _this.totalLiquidatedAccounts = payload.totalLiquidatedAccounts || 0;
         _this.totalBorrowed = ethers_1.BigNumber.from(payload.totalBorrowed || 0);
-        _this.cumulativeBorrowed = ethers_1.BigNumber.from(payload.cumulativeBorrowed || 0);
+        _this.cumulativeBorrowed = ethers_1.BigNumber.from(0);
         _this.totalRepaid = ethers_1.BigNumber.from(payload.totalRepaid || 0);
         _this.totalProfit = ethers_1.BigNumber.from(payload.totalProfit || 0);
         _this.totalLosses = ethers_1.BigNumber.from(payload.totalLosses || 0);
+        _this.totalBorrowedInUSD = payload.totalBorrowedInUSD || 0;
+        _this.totalLossesInUSD = payload.totalLossesInUSD || 0;
+        _this.totalProfitInUSD = payload.totalProfitInUSD || 0;
+        _this.totalRepaidInUSD = payload.totalRepaidInUSD || 0;
+        _this.availableLiquidityInUSD = payload.availableLiquidityInUSD || 0;
+        _this.openedAccountsCountChange = payload.openedAccountsCountChange || 0;
+        _this.totalOpenedAccountsChange = payload.totalOpenedAccountsChange || 0;
+        _this.totalClosedAccountsChange = payload.totalClosedAccountsChange || 0;
+        _this.totalLiquidatedAccountsChange =
+            payload.totalLiquidatedAccountsChange || 0;
         return _this;
     }
-    return CreditManagerStat;
+    return ChartsCreditManagerData;
 }(CreditManagerData));
-exports.CreditManagerStat = CreditManagerStat;
+exports.ChartsCreditManagerData = ChartsCreditManagerData;
 function calcHealthFactor(_a) {
     var assets = _a.assets, prices = _a.prices, liquidationThresholds = _a.liquidationThresholds, underlyingToken = _a.underlyingToken, borrowed = _a.borrowed;
     var assetLTMoney = assets.reduce(function (acc, _a) {

package/lib/core/pool.d.ts

@@ -1,5 +1,5 @@
 import { BigNumber, Signer } from "ethers";
-import { PoolDataPayload } from "../payload/pool";
+import { ChartsPoolDataPayload, PoolDataPayload } from "../payload/pool";
 import { IPoolService } from "../types";
 export declare class PoolData {
     readonly id: string;
@@ -23,7 +23,15 @@ export declare class PoolData {
     constructor(payload: PoolDataPayload);
     getContractETH(signer: Signer): IPoolService;
 }
-export interface PoolsStat {
-    tvl: number;
-    totalBorrowed: number;
+export declare class ChartsPoolData extends PoolData {
+    readonly expectedLiquidityInUSD: number;
+    readonly expectedLiquidityLimitInUSD: number;
+    readonly availableLiquidityInUSD: number;
+    readonly caLockedValueInUSD: number;
+    readonly totalBorrowedInUSD: number;
+    readonly uniqueLPs: number;
+    readonly depositAPY7D: number;
+    readonly depositAPY30D: number;
+    readonly lmAPY: number;
+    constructor({ expectedLiquidityInUSD, expectedLiquidityLimitInUSD, availableLiquidityInUSD, totalBorrowedInUSD, caLockedValueInUSD, uniqueLPs, dieselAPY7D, dieselAPY30D, lmAPY, ...restPayload }: ChartsPoolDataPayload);
 }

package/lib/core/pool.js

@@ -1,6 +1,43 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        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);
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PoolData = void 0;
+exports.ChartsPoolData = exports.PoolData = void 0;
 var ethers_1 = require("ethers");
 var types_1 = require("../types");
 var formatter_1 = require("../utils/formatter");
@@ -33,3 +70,24 @@ var PoolData = /** @class */ (function () {
     return PoolData;
 }());
 exports.PoolData = PoolData;
+var ChartsPoolData = /** @class */ (function (_super) {
+    __extends(ChartsPoolData, _super);
+    function ChartsPoolData(_a) {
+        var _this = this;
+        var expectedLiquidityInUSD = _a.expectedLiquidityInUSD, expectedLiquidityLimitInUSD = _a.expectedLiquidityLimitInUSD, availableLiquidityInUSD = _a.availableLiquidityInUSD, totalBorrowedInUSD = _a.totalBorrowedInUSD, caLockedValueInUSD = _a.caLockedValueInUSD, uniqueLPs = _a.uniqueLPs, _b = _a.dieselAPY7D, dieselAPY7D = _b === void 0 ? 0 : _b, _c = _a.dieselAPY30D, dieselAPY30D = _c === void 0 ? 0 : _c, lmAPY = _a.lmAPY, restPayload = __rest(_a, ["expectedLiquidityInUSD", "expectedLiquidityLimitInUSD", "availableLiquidityInUSD", "totalBorrowedInUSD", "caLockedValueInUSD", "uniqueLPs", "dieselAPY7D", "dieselAPY30D", "lmAPY"]);
+        var _d = restPayload.underlying, underlying = _d === void 0 ? restPayload.underlyingToken : _d, _e = restPayload.linearCumulativeIndex, linearCumulativeIndex = _e === void 0 ? 0 : _e, _f = restPayload.cumulativeIndex_RAY, cumulativeIndexRAY = _f === void 0 ? 0 : _f, _g = restPayload.timestampLU, timestampLU = _g === void 0 ? 0 : _g, _h = restPayload.version, version = _h === void 0 ? 1 : _h, v1Props = __rest(restPayload, ["underlying", "linearCumulativeIndex", "cumulativeIndex_RAY", "timestampLU", "version"]);
+        _this = _super.call(this, __assign(__assign({}, v1Props), { underlying: underlying, linearCumulativeIndex: linearCumulativeIndex, cumulativeIndex_RAY: cumulativeIndexRAY, timestampLU: timestampLU, version: version })) || this;
+        _this.expectedLiquidityInUSD = expectedLiquidityInUSD;
+        _this.expectedLiquidityLimitInUSD = expectedLiquidityLimitInUSD;
+        _this.availableLiquidityInUSD = availableLiquidityInUSD;
+        _this.totalBorrowedInUSD = totalBorrowedInUSD;
+        _this.uniqueLPs = uniqueLPs;
+        _this.depositAPY7D = dieselAPY7D / constants_1.PERCENTAGE_DECIMALS;
+        _this.depositAPY30D = dieselAPY30D / constants_1.PERCENTAGE_DECIMALS;
+        _this.caLockedValueInUSD = caLockedValueInUSD;
+        _this.lmAPY = lmAPY / constants_1.PERCENTAGE_FACTOR;
+        return _this;
+    }
+    return ChartsPoolData;
+}(PoolData));
+exports.ChartsPoolData = ChartsPoolData;

package/lib/payload/creditManager.d.ts

@@ -1,4 +1,3 @@
-import { BigNumberish } from "ethers";
 import { CreditManagerDataStructOutput } from "../types/@gearbox-protocol/core-v2/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
 import { ExcludeArrayProps } from "../utils/types";
 export interface AdapterPayload {
@@ -6,17 +5,38 @@ export interface AdapterPayload {
     adapter: string;
 }
 export declare type CreditManagerDataPayload = ExcludeArrayProps<CreditManagerDataStructOutput>;
-export interface CreditManagerStatPayload extends CreditManagerDataPayload {
-    allowedContracts?: Array<string>;
-    uniqueUsers: number;
-    openedAccountsCount?: number;
-    totalOpenedAccounts?: number;
-    totalClosedAccounts?: number;
-    totalRepaidAccounts?: number;
-    totalLiquidatedAccounts?: number;
-    totalBorrowed?: BigNumberish;
-    cumulativeBorrowed?: BigNumberish;
-    totalRepaid?: BigNumberish;
-    totalProfit?: BigNumberish;
-    totalLosses?: BigNumberish;
+export interface ChartsCreditManagerPayload {
+    addr: string;
+    availableLiquidity: string;
+    borrowRate: string;
+    isWeth: boolean;
+    maxAmount: string;
+    maxLeverageFactor: number;
+    minAmount: string;
+    openedAccountsCount: number;
+    totalBorrowed: string;
+    totalClosedAccounts: number;
+    totalLiquidatedAccounts: number;
+    totalLosses: string;
+    totalOpenedAccounts: number;
+    totalProfit: string;
+    totalRepaid: string;
+    totalRepaidAccounts: number;
+    poolAddress: string;
+    underlyingToken: string;
+    availableLiquidityInUSD: number;
+    totalBorrowedInUSD: number;
+    totalLossesInUSD: number;
+    totalProfitInUSD: number;
+    totalRepaidInUSD: number;
+    openedAccountsCountChange: number;
+    totalOpenedAccountsChange: number;
+    totalClosedAccountsChange: number;
+    totalLiquidatedAccountsChange: number;
+    feeInterest: number;
+    feeLiquidation: number;
+    feeLiquidationExpired: number;
+    liquidationPremium: number;
+    liquidationPremiumExpired: number;
+    version: number;
 }

package/lib/payload/pool.d.ts

@@ -1,3 +1,47 @@
+import { BigNumberish } from "ethers";
 import { PoolDataStruct } from "../types/@gearbox-protocol/core-v2/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
 import { ExcludeArrayProps } from "../utils/types";
 export declare type PoolDataPayload = ExcludeArrayProps<PoolDataStruct>;
+export interface ChartsPoolDataPayload {
+    addr: string;
+    underlyingToken: string;
+    dieselToken: string;
+    isWETH: boolean;
+    expectedLiquidity: string;
+    expectedLiquidityLimit: string;
+    availableLiquidity: string;
+    totalBorrowed: string;
+    depositAPY_RAY: string;
+    borrowAPY_RAY: string;
+    dieselRate_RAY: string;
+    withdrawFee: number;
+    lmAPY: number;
+    underlying: string;
+    linearCumulativeIndex: BigNumberish;
+    cumulativeIndex_RAY: BigNumberish;
+    timestampLU: BigNumberish;
+    version: number;
+    expectedLiquidityInUSD: number;
+    expectedLiquidityLimitInUSD: number;
+    availableLiquidityInUSD: number;
+    totalBorrowedInUSD: number;
+    uniqueLPs: number;
+    dieselAPY7D?: number;
+    dieselAPY30D?: number;
+    addLiqCount: number;
+    addedLiquidity: number;
+    caLockedValue: number;
+    caLockedValueInUSD: number;
+    earned7D: number;
+    earned7DInUSD: number;
+    expectedLiqWeekAgo: number;
+    removeLiqCount: number;
+    removedLiquidity: number;
+}
+export interface ChartsAggregatedStats {
+    uniqueLPs: number;
+    earned7D: number;
+}
+export interface ChartsAggregatedPoolPayload extends ChartsAggregatedStats {
+    pools: Array<ChartsPoolDataPayload>;
+}

package/lib/watchers/creditAccountWatcher.d.ts

@@ -13,6 +13,7 @@ interface BatchCreditAccountLoadOptions {
 export declare class CreditAccountWatcher {
     static IERC20: import("../types/@openzeppelin/contracts/token/ERC20/IERC20").IERC20Interface;
     static creditManagerInterface: import("../types/@gearbox-protocol/core-v2/contracts/interfaces/ICreditManagerV2.sol/ICreditManagerV2").ICreditManagerV2Interface;
+    static creditConfiguratorInterface: import("../types/@gearbox-protocol/core-v2/contracts/interfaces/ICreditConfigurator.sol/ICreditConfigurator").ICreditConfiguratorInterface;
     static creditFacadeInterface: import("../types/@gearbox-protocol/core-v2/contracts/interfaces/ICreditFacade.sol/ICreditFacade").ICreditFacadeInterface;
     /**
      * Gets hashes of all opened credit accounts at toBlock (or "latest" by default)

package/lib/watchers/creditAccountWatcher.js

@@ -52,7 +52,8 @@ var CreditAccountWatcher = /** @class */ (function () {
      */
     CreditAccountWatcher.getOpenAccounts = function (creditManager, provider, toBlock) {
         return __awaiter(this, void 0, void 0, function () {
-            var eventsByDate, addToEvents, accounts, creditConfigurator, cc, cfUpgraded, _loop_1, _i, cfUpgraded_1, creditFacade;
+            var eventsByDate, addToEvents, accounts, cm, ccAddrs, cfUpgraded, _loop_1, _i, cfUpgraded_1, creditFacade;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -67,11 +68,25 @@ var CreditAccountWatcher = /** @class */ (function () {
                             });
                         };
                         accounts = new Set();
-                        creditConfigurator = creditManager.creditConfigurator;
-                        cc = types_1.ICreditConfigurator__factory.connect(creditConfigurator, provider);
-                        return [4 /*yield*/, cc.queryFilter(cc.filters.CreditFacadeUpgraded(), undefined, toBlock)];
+                        cm = types_1.ICreditManagerV2__factory.connect(creditManager.address, provider);
+                        return [4 /*yield*/, cm.queryFilter(cm.filters.NewConfigurator(), undefined, toBlock)];
                     case 1:
-                        cfUpgraded = (_a.sent()).map(function (e) { return e.args.newCreditFacade; });
+                        ccAddrs = (_a.sent()).map(function (e) { return e.args.newConfigurator; });
+                        return [4 /*yield*/, Promise.all(ccAddrs.map(function (ccAddr) { return __awaiter(_this, void 0, void 0, function () {
+                                var cc, cfUpgradedEvents;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            cc = types_1.ICreditConfigurator__factory.connect(ccAddr, provider);
+                                            return [4 /*yield*/, cc.queryFilter(cc.filters.CreditFacadeUpgraded(), undefined, toBlock)];
+                                        case 1:
+                                            cfUpgradedEvents = _a.sent();
+                                            return [2 /*return*/, cfUpgradedEvents.map(function (e) { return e.args.newCreditFacade; })];
+                                    }
+                                });
+                            }); }))];
+                    case 2:
+                        cfUpgraded = (_a.sent()).flat();
                         _loop_1 = function (creditFacade) {
                             var cf, topics, logs;
                             return __generator(this, function (_b) {
@@ -113,18 +128,18 @@ var CreditAccountWatcher = /** @class */ (function () {
                             });
                         };
                         _i = 0, cfUpgraded_1 = cfUpgraded;
-                        _a.label = 2;
-                    case 2:
-                        if (!(_i < cfUpgraded_1.length)) return [3 /*break*/, 5];
+                        _a.label = 3;
+                    case 3:
+                        if (!(_i < cfUpgraded_1.length)) return [3 /*break*/, 6];
                         creditFacade = cfUpgraded_1[_i];
                         return [5 /*yield**/, _loop_1(creditFacade)];
-                    case 3:
-                        _a.sent();
-                        _a.label = 4;
                     case 4:
-                        _i++;
-                        return [3 /*break*/, 2];
+                        _a.sent();
+                        _a.label = 5;
                     case 5:
+                        _i++;
+                        return [3 /*break*/, 3];
+                    case 6:
                         eventsByDate
                             .sort(function (a, b) {
                             return a.time > b.time ? 1 : -1;
@@ -196,18 +211,18 @@ var CreditAccountWatcher = /** @class */ (function () {
      * @returns CreditManagerUpdate which contains updated (created / modified) and deleted accounts
      */
     CreditAccountWatcher.detectChanges = function (logs, creditManagers) {
-        var cms = creditManagers.map(function (c) { return c.address; });
-        var cfs = creditManagers.map(function (c) { return c.creditFacade; });
-        var cfToCm = creditManagers.reduce(function (acc, item) {
-            acc[item.creditFacade] = item.address;
-            return acc;
-        }, {});
+        var cms = creditManagers.map(function (c) { return c.address.toLowerCase(); });
+        var cfToCm = {};
+        var ccToCm = {};
+        // maps credit manager addr to credit configurator addresses
         var trackers = {};
-        cms.forEach(function (cm) {
-            trackers[cm] = {
+        creditManagers.forEach(function (cm) {
+            trackers[cm.address.toLowerCase()] = {
                 updated: new Set(),
                 deleted: new Set(),
             };
+            ccToCm[cm.creditConfigurator.toLowerCase()] = cm.address.toLowerCase();
+            cfToCm[cm.creditFacade.toLowerCase()] = cm.address.toLowerCase();
         });
         for (var _i = 0, logs_1 = logs; _i < logs_1.length; _i++) {
             var log = logs_1[_i];
@@ -219,13 +234,24 @@ var CreditAccountWatcher = /** @class */ (function () {
                     if (!borrower)
                         throw new Error("Cant parser event ".concat(log));
                     /// Excludes credit facade which represents borrower in multicall
-                    if (!cfs.includes(borrower.toLowerCase())) {
+                    if (!(borrower.toLowerCase() in cfToCm)) {
                         trackers[logAddr].updated.add(borrower);
                     }
                 }
+                else if (name === "NewConfigurator") {
+                    var newConfigurator = args.newConfigurator.toLowerCase();
+                    ccToCm[newConfigurator] = logAddr;
+                }
+            }
+            else if (logAddr in ccToCm) {
+                var _b = CreditAccountWatcher.creditConfiguratorInterface.parseLog(log), name = _b.name, args = _b.args;
+                if (name === "CreditFacadeUpgraded") {
+                    var newCreditFacade = args.newCreditFacade.toLowerCase();
+                    cfToCm[newCreditFacade] = ccToCm[logAddr];
+                }
             }
-            else if (cfs.includes(logAddr)) {
-                var _b = CreditAccountWatcher.creditFacadeInterface.parseLog(log), name = _b.name, args = _b.args;
+            else if (logAddr in cfToCm) {
+                var _c = CreditAccountWatcher.creditFacadeInterface.parseLog(log), name = _c.name, args = _c.args;
                 switch (name) {
                     case "OpenCreditAccount":
                     case "AddCollateral": {
@@ -304,6 +330,7 @@ var CreditAccountWatcher = /** @class */ (function () {
     };
     CreditAccountWatcher.IERC20 = types_1.IERC20__factory.createInterface();
     CreditAccountWatcher.creditManagerInterface = types_1.ICreditManagerV2__factory.createInterface();
+    CreditAccountWatcher.creditConfiguratorInterface = types_1.ICreditConfigurator__factory.createInterface();
     CreditAccountWatcher.creditFacadeInterface = types_1.ICreditFacade__factory.createInterface();
     return CreditAccountWatcher;
 }());

package/lib/watchers/creditAccountWatcher.spec.js

@@ -7,13 +7,18 @@ var types_1 = require("../types");
 var creditAccountWatcher_1 = require("./creditAccountWatcher");
 var CREDIT_MANAGER_ADDRESS = constants_1.DUMB_ADDRESS;
 var CREDIT_FACADE_ADDRESS = "0xcb9a588a47dd0393af3d0d5f86e6f1c8fd252c48";
+var CREDIT_FACADE_NEW = "0xcb9a588a47dd0393af3d0d5f86e6f1c8fd252ccc";
+var CREDIT_CONFIGURATOR_ADDRESS = "0xcb9a588a47dd0393af3d0d5f86e6f1c8fd252aaa";
+var CREDIT_CONFIGURATOR_NEW = "0xcb9a588a47dd0393af3d0d5f86e6f1c8fd252000";
 var BORROWER = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266";
 var expectedHash = "".concat(CREDIT_MANAGER_ADDRESS.toLowerCase(), ":").concat(BORROWER.toLowerCase());
 var creditManagerInterface = types_1.ICreditManagerV2__factory.createInterface();
 var creditFacadeInterface = types_1.ICreditFacade__factory.createInterface();
+var creditConfiguratorInterface = types_1.ICreditConfigurator__factory.createInterface();
 var cmDumb = {
     address: CREDIT_MANAGER_ADDRESS.toLowerCase(),
     creditFacade: CREDIT_FACADE_ADDRESS.toLowerCase(),
+    creditConfigurator: CREDIT_CONFIGURATOR_ADDRESS.toLowerCase(),
 };
 var encode = function (abiType, value) {
     return ethers_1.utils.defaultAbiCoder.encode([abiType], [value]);
@@ -32,20 +37,42 @@ var makeLog = function (address, topics, data) {
         logIndex: 0,
     };
 };
-var openLog = makeLog(CREDIT_FACADE_ADDRESS, [
-    creditFacadeInterface.getEventTopic("OpenCreditAccount"),
-    encode("address", BORROWER),
-    encode("address", constants_1.DUMB_ADDRESS),
-], ethers_1.utils.defaultAbiCoder.encode(["uint256", "uint16"], [10, 10]));
-var closeLog = makeLog(CREDIT_FACADE_ADDRESS, [
-    creditFacadeInterface.getEventTopic("CloseCreditAccount"),
-    encode("address", BORROWER),
-    encode("address", constants_1.DUMB_ADDRESS),
-    encode("address", constants_1.DUMB_ADDRESS),
-]);
+var openLog = function (facadeAddr) {
+    if (facadeAddr === void 0) { facadeAddr = CREDIT_FACADE_ADDRESS; }
+    return makeLog(facadeAddr, [
+        creditFacadeInterface.getEventTopic("OpenCreditAccount"),
+        encode("address", BORROWER),
+        encode("address", constants_1.DUMB_ADDRESS),
+    ], ethers_1.utils.defaultAbiCoder.encode(["uint256", "uint16"], [10, 10]));
+};
+var closeLog = function (facadeAddr) {
+    if (facadeAddr === void 0) { facadeAddr = CREDIT_FACADE_ADDRESS; }
+    return makeLog(facadeAddr, [
+        creditFacadeInterface.getEventTopic("CloseCreditAccount"),
+        encode("address", BORROWER),
+        encode("address", constants_1.DUMB_ADDRESS),
+        encode("address", constants_1.DUMB_ADDRESS),
+    ]);
+};
+var upgradeFacadeLog = function (configuratorAddr, facadeAddr) {
+    if (configuratorAddr === void 0) { configuratorAddr = CREDIT_CONFIGURATOR_NEW; }
+    if (facadeAddr === void 0) { facadeAddr = CREDIT_FACADE_NEW; }
+    return makeLog(configuratorAddr, [
+        creditConfiguratorInterface.getEventTopic("CreditFacadeUpgraded"),
+        encode("address", facadeAddr),
+    ]);
+};
+var newConfiguratorLog = function (managerAddr, configuratorAddr) {
+    if (managerAddr === void 0) { managerAddr = CREDIT_MANAGER_ADDRESS; }
+    if (configuratorAddr === void 0) { configuratorAddr = CREDIT_CONFIGURATOR_NEW; }
+    return makeLog(managerAddr, [
+        creditManagerInterface.getEventTopic("NewConfigurator"),
+        encode("address", configuratorAddr),
+    ]);
+};
 describe("CreditAccountTracker test", function () {
     it("detects update events correctly", function () {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog()], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -114,7 +141,7 @@ describe("CreditAccountTracker test", function () {
     // DELETED
     //
     it("detects delete events correctly", function () {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([closeLog], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([closeLog()], [cmDumb])).to.be.eql({
             updated: [],
             deleted: [expectedHash],
         });
@@ -142,21 +169,21 @@ describe("CreditAccountTracker test", function () {
         });
     });
     it("doesn't make duplicated", function () {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog, openLog, openLog], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog(), openLog(), openLog()], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([closeLog, closeLog, closeLog], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([closeLog(), closeLog(), closeLog()], [cmDumb])).to.be.eql({
             updated: [],
             deleted: [expectedHash],
         });
     });
     it("updates accounts were created and deleted in the batch", function () {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog, closeLog], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog(), closeLog()], [cmDumb])).to.be.eql({
             updated: [],
             deleted: [expectedHash],
         });
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog, closeLog, openLog], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog(), closeLog(), openLog()], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [expectedHash],
         });
@@ -167,11 +194,32 @@ describe("CreditAccountTracker test", function () {
             encode("address", BORROWER),
             encode("address", constants_1.DUMB_ADDRESS),
         ]);
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog, transferLog], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog(), transferLog], [cmDumb])).to.be.eql({
             updated: [
                 "".concat(CREDIT_MANAGER_ADDRESS.toLowerCase(), ":").concat(constants_1.DUMB_ADDRESS.toLowerCase()),
             ],
             deleted: [expectedHash],
         });
     });
+    it("correctly handles credit configurator change", function () {
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([
+            openLog(),
+            newConfiguratorLog(),
+            upgradeFacadeLog(),
+            closeLog(CREDIT_FACADE_NEW),
+        ], [cmDumb])).to.be.eql({
+            updated: [],
+            deleted: [expectedHash],
+        });
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([
+            openLog(),
+            closeLog(),
+            newConfiguratorLog(),
+            upgradeFacadeLog(),
+            openLog(CREDIT_FACADE_NEW),
+        ], [cmDumb])).to.be.eql({
+            updated: [expectedHash],
+            deleted: [expectedHash],
+        });
+    });
 });

package/package.json

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