@gearbox-protocol/sdk 3.0.0-next.1 → 3.0.0-next.100

package/lib/utils/formatter.d.ts

@@ -1,11 +1,7 @@
 import { BigNumberish } from "ethers";
 export declare function rayToNumber(num: BigNumberish): number;
 export declare function formatRAY(num?: bigint): string;
-export declare function formatBN(num: BigNumberish | undefined, decimals: number, precision?: number): string;
-export declare function formatBn4dig(num: bigint, precision?: number): string;
-export declare function toHumanFormat(num: bigint, precision?: number): string;
 export declare function toSignificant(num: bigint, decimals: number): string;
-export declare const toBigInt: (v: BigNumberish) => bigint;
 export declare function toBN(num: string, decimals: number): bigint;
 export declare function shortAddress(address?: string): string;
 export declare function shortHash(address?: string): string;

package/lib/utils/formatter.js

@@ -1,83 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatDateTime = exports.formatLeverage = exports.formatPercentage = exports.formatDate = exports.shortHash = exports.shortAddress = exports.toBN = exports.toBigInt = exports.toSignificant = exports.toHumanFormat = exports.formatBn4dig = exports.formatBN = exports.formatRAY = exports.rayToNumber = void 0;
+exports.formatDateTime = exports.formatLeverage = exports.formatPercentage = exports.formatDate = exports.shortHash = exports.shortAddress = exports.toBN = exports.toSignificant = exports.formatRAY = exports.rayToNumber = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const decimal_js_light_1 = require("decimal.js-light");
 const moment_1 = require("moment");
 function rayToNumber(num) {
-    return Number((0, exports.toBigInt)(num) / 10n ** 21n) / 1000000;
+    return Number((0, sdk_gov_1.toBigInt)(num) / 10n ** 21n) / 1000000;
 }
 exports.rayToNumber = rayToNumber;
 function formatRAY(num = 0n) {
     return toSignificant(num, 27);
 }
 exports.formatRAY = formatRAY;
-const limitPrecision = (n, p) => {
-    const notZero = n !== 0n;
-    if (n <= 10n && notZero) {
-        return 6;
-    }
-    if (n <= 100n && notZero) {
-        return 5;
-    }
-    if (n <= 1000n && notZero) {
-        return 4;
-    }
-    if (n <= 10000n && notZero) {
-        return 3;
-    }
-    if (p === undefined && n > 10n ** 21n) {
-        return 2;
-    }
-    if (p === undefined && n > 10n ** 24n) {
-        return 0;
-    }
-    return p;
-};
-const limitNum = (n, d = 18) => {
-    let limited = n <= 2n ? 0n : n;
-    if (d <= 6) {
-        return limited * 10n ** BigInt(6 - d);
-    }
-    else {
-        return limited / 10n ** BigInt(d - 6);
-    }
-};
-function formatBN(num, decimals, precision) {
-    if (num === undefined)
-        return "-";
-    const numBInt = (0, exports.toBigInt)(num);
-    // GUSD: 2 decimals
-    const limitedNum = limitNum(numBInt, decimals);
-    const limitedPrecision = limitPrecision(limitedNum, precision);
-    return toHumanFormat(limitedNum, limitedPrecision);
-}
-exports.formatBN = formatBN;
-function formatBn4dig(num, precision = 2) {
-    if (precision > 6) {
-        throw new Error("Precision is too high, try <= 6");
-    }
-    const numStr = num.toString();
-    if (numStr.length <= 6) {
-        const completed = "0".repeat(6 - numStr.length) + numStr;
-        return `0.${completed.slice(0, precision)}`;
-    }
-    return `${numStr.slice(0, numStr.length - 6)}.${numStr.slice(numStr.length - 6, numStr.length - 6 + precision)}`;
-}
-exports.formatBn4dig = formatBn4dig;
-function toHumanFormat(num, precision = 2) {
-    if (num >= BigInt(1e15)) {
-        return `${formatBn4dig(num / BigInt(1e9), precision)}Bn`;
-    }
-    if (num >= BigInt(1e12)) {
-        return `${formatBn4dig(num / BigInt(1e6), precision)}M`;
-    }
-    if (num >= BigInt(1e9)) {
-        return `${formatBn4dig(num / BigInt(1e3), precision)}K`;
-    }
-    return formatBn4dig(num, precision);
-}
-exports.toHumanFormat = toHumanFormat;
 function toSignificant(num, decimals) {
     if (num === 1n)
         return "0";
@@ -86,13 +20,6 @@ function toSignificant(num, decimals) {
     return number.toSignificantDigits(6, 4).toString();
 }
 exports.toSignificant = toSignificant;
-const toBigInt = (v) => {
-    const value = typeof v === "object" && v.type === "BigNumber"
-        ? v.hex
-        : v.toString();
-    return BigInt(value);
-};
-exports.toBigInt = toBigInt;
 function toBN(num, decimals) {
     if (num === "")
         return 0n;

package/lib/utils/math.d.ts

@@ -7,4 +7,6 @@ export declare const nonNegativeBn: (v: bigint) => bigint;
 export declare class BigIntMath {
     static abs: (x: bigint) => bigint;
     static toHexString: (x: bigint) => string;
+    static max: (a: bigint, b: bigint) => bigint;
+    static min: (a: bigint, b: bigint) => bigint;
 }

package/lib/utils/math.js

@@ -41,5 +41,7 @@ exports.nonNegativeBn = nonNegativeBn;
 class BigIntMath {
     static abs = (x) => (x < 0n ? -x : x);
     static toHexString = (x) => ethers_1.BigNumber.from(x).toHexString();
+    static max = (a, b) => (a > b ? a : b);
+    static min = (a, b) => (a < b ? a : b);
 }
 exports.BigIntMath = BigIntMath;

package/lib/utils/types.d.ts

@@ -0,0 +1,5 @@
+import { BigNumber } from "ethers";
+export type BigintifyProps<T extends {}> = {
+    [K in keyof T]: T[K] extends BigNumber ? bigint : T[K];
+};
+export type PartialKeys<T, K extends keyof T> = Partial<Pick<T, K>> & Omit<T, K>;

package/lib/watchers/creditAccountWatcher.d.ts

@@ -10,11 +10,11 @@ interface BatchCreditAccountLoadOptions {
     atBlock?: number;
     chunkSize?: number;
 }
-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;
+export declare class CreditAccountWatcherV2 {
+    static IERC20: import("../types/IERC20").IERC20Interface;
+    static creditManagerInterface: import("../types/ICreditManagerV2.sol/ICreditManagerV2").ICreditManagerV2Interface;
+    static creditConfiguratorInterface: import("../types/ICreditConfiguratorV2.sol/ICreditConfiguratorV2").ICreditConfiguratorV2Interface;
+    static creditFacadeInterface: import("../types/ICreditFacadeV2.sol/ICreditFacadeV2").ICreditFacadeV2Interface;
     /**
      * Gets hashes of all opened credit accounts at toBlock (or "latest" by default)
      * @param creditManager CreditManagerData of desired CreditManager to check
@@ -23,7 +23,7 @@ export declare class CreditAccountWatcher {
      * @returns Arrays of hashes for opened accounts
      */
     static getOpenAccounts(creditManager: CreditManagerData, provider: providers.Provider, toBlock?: number): Promise<Array<CreditAccountHash>>;
-    static batchCreditAccountLoad(accs: Array<CreditAccountHash>, dataCompressor: string, signer: Signer | providers.Provider, options?: BatchCreditAccountLoadOptions | number): Promise<Array<CreditAccountData>>;
+    static batchCreditAccountLoad(accs: Array<CreditAccountHash>, dataCompressor210: string, signer: Signer | providers.Provider, options?: BatchCreditAccountLoadOptions | number): Promise<Array<CreditAccountData>>;
     /**
      * Tracks block logs and detects whichj acccounts were changed (created / modified) and which were deleted
      * @param logs Logs from last N blocks
@@ -32,5 +32,6 @@ export declare class CreditAccountWatcher {
      */
     static detectChanges(logs: Array<providers.Log>, creditManagers: Array<CreditManagerData>): CreditManagerUpdate;
     static trackDirectTransfers(freshLogs: Array<providers.Log>, tokensToTrack: Array<string>, accounts: Array<CreditAccountData>): Array<CreditAccountHash>;
+    private static assertCMSupported;
 }
 export {};

package/lib/watchers/creditAccountWatcher.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreditAccountWatcher = void 0;
+exports.CreditAccountWatcherV2 = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const creditAccount_1 = require("../core/creditAccount");
 const types_1 = require("../types");
-class CreditAccountWatcher {
+class CreditAccountWatcherV2 {
     static IERC20 = types_1.IERC20__factory.createInterface();
     static creditManagerInterface = types_1.ICreditManagerV2__factory.createInterface();
-    static creditConfiguratorInterface = types_1.ICreditConfigurator__factory.createInterface();
-    static creditFacadeInterface = types_1.ICreditFacade__factory.createInterface();
+    static creditConfiguratorInterface = types_1.ICreditConfiguratorV2__factory.createInterface();
+    static creditFacadeInterface = types_1.ICreditFacadeV2__factory.createInterface();
     /**
      * Gets hashes of all opened credit accounts at toBlock (or "latest" by default)
      * @param creditManager CreditManagerData of desired CreditManager to check
@@ -17,9 +17,7 @@ class CreditAccountWatcher {
      * @returns Arrays of hashes for opened accounts
      */
     static async getOpenAccounts(creditManager, provider, toBlock) {
-        if (!(creditManager.version === 2 || creditManager.version === 210)) {
-            throw new Error("Works for V2 only");
-        }
+        CreditAccountWatcherV2.assertCMSupported(creditManager);
         const eventsByDate = [];
         const addToEvents = (e, address, operation) => {
             eventsByDate.push({
@@ -34,12 +32,12 @@ class CreditAccountWatcher {
         const ccAddrs = (await cm.queryFilter(cm.filters.NewConfigurator(), undefined, toBlock)).map(e => e.args.newConfigurator);
         // get all historical creditFacades for this cm
         const cfUpgraded = (await Promise.all(ccAddrs.map(async (ccAddr) => {
-            const cc = types_1.ICreditConfigurator__factory.connect(ccAddr, provider);
+            const cc = types_1.ICreditConfiguratorV2__factory.connect(ccAddr, provider);
             const cfUpgradedEvents = await cc.queryFilter(cc.filters.CreditFacadeUpgraded(), undefined, toBlock);
             return cfUpgradedEvents.map(e => e.args.newCreditFacade);
         }))).flat();
         for (const creditFacade of cfUpgraded) {
-            const cf = types_1.ICreditFacade__factory.connect(creditFacade, provider);
+            const cf = types_1.ICreditFacadeV2__factory.connect(creditFacade, provider);
             const topics = {
                 OpenCreditAccount: cf.interface.getEventTopic("OpenCreditAccount"),
                 CloseCreditAccount: cf.interface.getEventTopic("CloseCreditAccount"),
@@ -83,7 +81,7 @@ class CreditAccountWatcher {
         });
         return Array.from(accounts.values()).map(borrower => creditAccount_1.CreditAccountData.hash(creditManager.address, borrower));
     }
-    static async batchCreditAccountLoad(accs, dataCompressor, signer, options) {
+    static async batchCreditAccountLoad(accs, dataCompressor210, signer, options) {
         let chunkSize = 1000;
         let atBlock;
         if (typeof options === "object") {
@@ -93,7 +91,8 @@ class CreditAccountWatcher {
         else {
             atBlock = options;
         }
-        const dcmc = new sdk_gov_1.MultiCallContract(dataCompressor, types_1.IDataCompressor__factory.createInterface(), signer);
+        const dcInterface = types_1.IDataCompressorV2_10__factory.createInterface();
+        const dcmc = new sdk_gov_1.MultiCallContract(dataCompressor210, dcInterface, signer);
         const calls = [];
         for (let i = 0; i < accs.length; i++) {
             const chunk = accs.slice(i * chunkSize, (i + 1) * chunkSize);
@@ -118,7 +117,10 @@ class CreditAccountWatcher {
      * @returns CreditManagerUpdate which contains updated (created / modified) and deleted accounts
      */
     static detectChanges(logs, creditManagers) {
-        const cms = creditManagers.map(c => c.address.toLowerCase());
+        const cms = creditManagers.map(cm => {
+            CreditAccountWatcherV2.assertCMSupported(cm);
+            return cm.address.toLowerCase();
+        });
         const cfToCm = {};
         const ccToCm = {};
         // maps credit manager addr to credit configurator addresses
@@ -134,7 +136,7 @@ class CreditAccountWatcher {
         for (let log of logs) {
             const logAddr = log.address.toLowerCase();
             if (cms.includes(logAddr)) {
-                const { name, args } = CreditAccountWatcher.creditManagerInterface.parseLog(log);
+                const { name, args } = CreditAccountWatcherV2.creditManagerInterface.parseLog(log);
                 if (name === "ExecuteOrder") {
                     const { borrower } = args;
                     if (!borrower)
@@ -150,14 +152,14 @@ class CreditAccountWatcher {
                 }
             }
             else if (logAddr in ccToCm) {
-                const { name, args } = CreditAccountWatcher.creditConfiguratorInterface.parseLog(log);
+                const { name, args } = CreditAccountWatcherV2.creditConfiguratorInterface.parseLog(log);
                 if (name === "CreditFacadeUpgraded") {
                     const newCreditFacade = args.newCreditFacade.toLowerCase();
                     cfToCm[newCreditFacade] = ccToCm[logAddr];
                 }
             }
             else if (logAddr in cfToCm) {
-                const { name, args } = CreditAccountWatcher.creditFacadeInterface.parseLog(log);
+                const { name, args } = CreditAccountWatcherV2.creditFacadeInterface.parseLog(log);
                 switch (name) {
                     case "OpenCreditAccount":
                     case "AddCollateral": {
@@ -224,7 +226,7 @@ class CreditAccountWatcher {
         });
         for (let log of freshLogs) {
             if (tkns.includes(log.address.toLocaleLowerCase())) {
-                const { name, args } = CreditAccountWatcher.IERC20.parseLog(log);
+                const { name, args } = CreditAccountWatcherV2.IERC20.parseLog(log);
                 if (name === "Transfer" &&
                     accAddresses.includes(args.to.toLowerCase())) {
                     modified.add(accToCa[args.to.toLowerCase()].hash());
@@ -233,5 +235,10 @@ class CreditAccountWatcher {
         }
         return Array.from(modified);
     }
+    static assertCMSupported(cm) {
+        if (cm.version < 2 || cm.version > 299) {
+            throw new Error(`CreditAccountWatcherV2 does not support credit manager version ${cm.version}`);
+        }
+    }
 }
-exports.CreditAccountWatcher = CreditAccountWatcher;
+exports.CreditAccountWatcherV2 = CreditAccountWatcherV2;

package/lib/watchers/creditAccountWatcher.spec.js

@@ -13,8 +13,8 @@ const CREDIT_CONFIGURATOR_NEW = "0xcb9a588a47dd0393af3d0d5f86e6f1c8fd252000";
 const BORROWER = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266";
 const expectedHash = `${CREDIT_MANAGER_ADDRESS.toLowerCase()}:${BORROWER.toLowerCase()}`;
 const creditManagerInterface = types_1.ICreditManagerV2__factory.createInterface();
-const creditFacadeInterface = types_1.ICreditFacade__factory.createInterface();
-const creditConfiguratorInterface = types_1.ICreditConfigurator__factory.createInterface();
+const creditFacadeInterface = types_1.ICreditFacadeV2__factory.createInterface();
+const creditConfiguratorInterface = types_1.ICreditConfiguratorV2__factory.createInterface();
 const cmDumb = {
     address: CREDIT_MANAGER_ADDRESS.toLowerCase(),
     creditFacade: CREDIT_FACADE_ADDRESS.toLowerCase(),
@@ -55,7 +55,7 @@ const newConfiguratorLog = (managerAddr = CREDIT_MANAGER_ADDRESS, configuratorAd
 ]);
 describe("CreditAccountTracker test", () => {
     it("detects update events correctly", () => {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog()], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([openLog()], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -63,7 +63,7 @@ describe("CreditAccountTracker test", () => {
             creditFacadeInterface.getEventTopic("IncreaseBorrowedAmount"),
             encode("address", BORROWER),
         ], ethers_1.utils.defaultAbiCoder.encode(["uint256"], [10]));
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -71,7 +71,7 @@ describe("CreditAccountTracker test", () => {
             creditFacadeInterface.getEventTopic("DecreaseBorrowedAmount"),
             encode("address", BORROWER),
         ], ethers_1.utils.defaultAbiCoder.encode(["uint256"], [10]));
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -80,7 +80,7 @@ describe("CreditAccountTracker test", () => {
             encode("address", BORROWER),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ], ethers_1.utils.defaultAbiCoder.encode(["uint256"], [10]));
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -88,7 +88,7 @@ describe("CreditAccountTracker test", () => {
             creditFacadeInterface.getEventTopic("MultiCallStarted"),
             encode("address", BORROWER),
         ]);
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -97,7 +97,7 @@ describe("CreditAccountTracker test", () => {
             encode("address", BORROWER),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ]);
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -106,7 +106,7 @@ describe("CreditAccountTracker test", () => {
             encode("address", BORROWER),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ]);
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -115,7 +115,7 @@ describe("CreditAccountTracker test", () => {
             encode("address", BORROWER),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ]);
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -124,7 +124,7 @@ describe("CreditAccountTracker test", () => {
     // DELETED
     //
     it("detects delete events correctly", () => {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([closeLog()], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([closeLog()], [cmDumb])).to.be.eql({
             updated: [],
             deleted: [expectedHash],
         });
@@ -135,7 +135,7 @@ describe("CreditAccountTracker test", () => {
             encode("address", sdk_gov_1.DUMB_ADDRESS),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ], ethers_1.utils.defaultAbiCoder.encode(["uint256"], [10]));
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [],
             deleted: [expectedHash],
         });
@@ -146,27 +146,27 @@ describe("CreditAccountTracker test", () => {
             encode("address", sdk_gov_1.DUMB_ADDRESS),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ], ethers_1.utils.defaultAbiCoder.encode(["uint256"], [10]));
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [],
             deleted: [expectedHash],
         });
     });
     it("doesn't make duplicated", () => {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog(), openLog(), openLog()], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.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.CreditAccountWatcherV2.detectChanges([closeLog(), closeLog(), closeLog()], [cmDumb])).to.be.eql({
             updated: [],
             deleted: [expectedHash],
         });
     });
     it("updates accounts were created and deleted in the batch", () => {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog(), closeLog()], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.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.CreditAccountWatcherV2.detectChanges([openLog(), closeLog(), openLog()], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [expectedHash],
         });
@@ -177,7 +177,7 @@ describe("CreditAccountTracker test", () => {
             encode("address", BORROWER),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ]);
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog(), transferLog], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([openLog(), transferLog], [cmDumb])).to.be.eql({
             updated: [
                 `${CREDIT_MANAGER_ADDRESS.toLowerCase()}:${sdk_gov_1.DUMB_ADDRESS.toLowerCase()}`,
             ],
@@ -185,7 +185,7 @@ describe("CreditAccountTracker test", () => {
         });
     });
     it("correctly handles credit configurator change", () => {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([
             openLog(),
             newConfiguratorLog(),
             upgradeFacadeLog(),
@@ -194,7 +194,7 @@ describe("CreditAccountTracker test", () => {
             updated: [],
             deleted: [expectedHash],
         });
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([
             openLog(),
             closeLog(),
             newConfiguratorLog(),

package/lib/watchers/creditManagerWatcher.d.ts

@@ -1,8 +1,10 @@
 import { providers, Signer } from "ethers";
 import { CreditManagerData } from "../core/creditManager";
 export declare class CreditManagerWatcher {
-    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 getV2CreditManagers(dataCompressor: string, signer: Signer | providers.Provider, atBlock?: number): Promise<Record<string, CreditManagerData>>;
+    private static newConfiguratorV2Topic;
+    private static newConfiguratorV3Topic;
+    static getAllCreditManagers(addressProvider: string, signer: Signer | providers.Provider, atBlock?: number): Promise<Record<string, CreditManagerData>>;
+    static getV2CreditManagers(dataCompressorV210: string, signer: Signer | providers.Provider, atBlock?: number): Promise<Record<string, CreditManagerData>>;
+    static getV3CreditManagers(dataCompressorV300: string, signer: Signer | providers.Provider, atBlock?: number): Promise<Record<string, CreditManagerData>>;
     static detectConfigChanges(freshLogs: Array<providers.Log>, creditManagers: Array<CreditManagerData>): boolean;
 }

package/lib/watchers/creditManagerWatcher.js

@@ -1,17 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreditManagerWatcher = void 0;
+const utils_1 = require("ethers/lib/utils");
 const creditManager_1 = require("../core/creditManager");
 const types_1 = require("../types");
 class CreditManagerWatcher {
-    static creditManagerInterface = types_1.ICreditManagerV2__factory.createInterface();
-    static creditConfiguratorInterface = types_1.ICreditConfigurator__factory.createInterface();
-    static async getV2CreditManagers(dataCompressor, signer, atBlock) {
+    static newConfiguratorV2Topic = types_1.ICreditManagerV2__factory.createInterface().getEventTopic("NewConfigurator");
+    static newConfiguratorV3Topic = types_1.ICreditManagerV3__factory.createInterface().getEventTopic("SetCreditConfigurator");
+    static async getAllCreditManagers(addressProvider, signer, atBlock) {
+        const ap = types_1.IAddressProviderV3__factory.connect(addressProvider, signer);
+        const [dc210, dc300] = await Promise.all([
+            ap.getAddressOrRevert((0, utils_1.formatBytes32String)("DATA_COMPRESSOR"), 210, {
+                blockTag: atBlock,
+            }),
+            ap.getAddressOrRevert((0, utils_1.formatBytes32String)("DATA_COMPRESSOR"), 300, {
+                blockTag: atBlock,
+            }),
+        ]);
+        const [cms2, cms3] = await Promise.all([
+            CreditManagerWatcher.getV2CreditManagers(dc210, signer, atBlock),
+            CreditManagerWatcher.getV3CreditManagers(dc300, signer, atBlock),
+        ]);
+        return { ...cms2, ...cms3 };
+    }
+    static async getV2CreditManagers(dataCompressorV210, signer, atBlock) {
+        const creditManagers = {};
+        const creditManagersPayload = await types_1.IDataCompressorV2_10__factory.connect(dataCompressorV210, signer).getCreditManagersV2List({ blockTag: atBlock });
+        creditManagersPayload.forEach(c => {
+            creditManagers[c.addr.toLowerCase()] = new creditManager_1.CreditManagerData(c);
+        });
+        return creditManagers;
+    }
+    static async getV3CreditManagers(dataCompressorV300, signer, atBlock) {
         const creditManagers = {};
-        const creditManagersPayload = await types_1.IDataCompressor__factory.connect(dataCompressor, signer).getCreditManagersList({ blockTag: atBlock });
-        creditManagersPayload
-            .filter(c => c.version === 2 || c.version === 210)
-            .forEach(c => {
+        const creditManagersPayload = await types_1.IDataCompressorV3_00__factory.connect(dataCompressorV300, signer).getCreditManagersV3List({ blockTag: atBlock });
+        creditManagersPayload.forEach(c => {
             creditManagers[c.addr.toLowerCase()] = new creditManager_1.CreditManagerData(c);
         });
         return creditManagers;
@@ -21,8 +44,8 @@ class CreditManagerWatcher {
         const ccs = creditManagers.map(c => c.creditConfigurator);
         for (let log of freshLogs) {
             if (cms.includes(log.address.toLowerCase())) {
-                const { name } = CreditManagerWatcher.creditManagerInterface.parseLog(log);
-                if (name === "NewConfigurator") {
+                if (log.topics[0] === CreditManagerWatcher.newConfiguratorV2Topic ||
+                    log.topics[0] === CreditManagerWatcher.newConfiguratorV3Topic) {
                     return true;
                 }
             }

package/lib/watchers/creditManagerWatcher.spec.js

@@ -26,22 +26,30 @@ const makeLog = (address, topics, data = sdk_gov_1.ADDRESS_0X0) => {
     };
 };
 describe("CreditManagerTracker test", () => {
-    it("detects CreditManager events correctly", () => {
-        const creditManagerInterface = types_1.ICreditManagerV2__factory.createInterface();
+    it("detects CreditManagerV2 events correctly", () => {
+        const cmV2Interface = types_1.ICreditManagerV2__factory.createInterface();
         let log = makeLog(CREDIT_MANAGER_ADDRESS, [
-            creditManagerInterface.getEventTopic("NewConfigurator"),
+            cmV2Interface.getEventTopic("NewConfigurator"),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ]);
         (0, chai_1.expect)(creditManagerWatcher_1.CreditManagerWatcher.detectConfigChanges([log], [cmDumb])).to.be.eq(true);
         log = makeLog(CREDIT_MANAGER_ADDRESS, [
-            creditManagerInterface.getEventTopic("ExecuteOrder"),
+            cmV2Interface.getEventTopic("ExecuteOrder"),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ]);
         (0, chai_1.expect)(creditManagerWatcher_1.CreditManagerWatcher.detectConfigChanges([log], [cmDumb])).to.be.eq(false);
     });
+    it("detects CreditManagerV3 events correctly", () => {
+        const cmV3Interface = types_1.ICreditManagerV3__factory.createInterface();
+        let log = makeLog(CREDIT_MANAGER_ADDRESS, [
+            cmV3Interface.getEventTopic("SetCreditConfigurator"),
+            encode("address", sdk_gov_1.DUMB_ADDRESS),
+        ]);
+        (0, chai_1.expect)(creditManagerWatcher_1.CreditManagerWatcher.detectConfigChanges([log], [cmDumb])).to.be.eq(true);
+    });
     it("detects CreditConfigurator events correctly", () => {
-        const ccInterface = types_1.ICreditConfigurator__factory.createInterface();
+        const ccInterface = types_1.ICreditConfiguratorV2__factory.createInterface();
         let log = makeLog(CREDIT_CONFIGIURATOR_ADDRESS, [
             ccInterface.getEventTopic("TokenLiquidationThresholdUpdated"),
             encode("address", sdk_gov_1.DUMB_ADDRESS),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-next.1",
+  "version": "3.0.0-next.100",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -17,30 +17,44 @@
     "decimals": "yarn ts-node ./scripts/generate_decimals.ts",
     "dev": "tsc -w --p tsconfig.build.json",
     "pub": "rm -rf ./src/types/hardhat.ts && cp ./src/types/*.d.ts ./lib/types && tsc --p tsconfig.build.json && yarn publish",
-    "copyTypes": "node ./scripts/copyTypes.js",
+    "types:clean": "rm -rf forge-out src/types",
+    "types:build": "forge build",
+    "types:generate": "typechain --target ethers-v5 --out-dir src/types ./forge-out/**/*.json",
+    "types": "yarn types:clean && yarn types:build && yarn types:generate",
     "prepare": "husky install",
     "prettier": "prettier --write .",
     "prettier:ci": "npx prettier --check .",
     "lint": "eslint \"**/*.ts\" --fix",
     "lint:ci": "eslint \"**/*.ts\"",
     "typecheck:ci": "tsc --noEmit",
-    "test": "npx mocha -r ts-node/register -r dotenv/config src/**/*.spec.ts"
+    "test": "npx mocha -r ts-node/register -r dotenv/config 'src/**/*.spec.ts'"
   },
   "dependencies": {
-    "@gearbox-protocol/sdk-gov": "^1.5.24",
-    "@types/deep-eql": "^4.0.0",
+    "@gearbox-protocol/sdk-gov": "^1.16.0",
     "axios": "^1.2.6",
     "decimal.js-light": "^2.5.1",
     "deep-eql": "^4.1.0",
     "moment": "^2.29.4"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.0.3",
+    "@1inch/farming": "^3.1.0",
+    "@1inch/solidity-utils": "^2.2.27",
+    "@commitlint/cli": "^17.6.3",
     "@commitlint/config-conventional": "^17.0.3",
+    "@gearbox-protocol/core-v2": "1.19.0-base.17",
+    "@gearbox-protocol/core-v3": "^1.45.8",
     "@gearbox-protocol/eslint-config": "^1.4.1",
+    "@gearbox-protocol/integrations-v3": "^1.27.2",
+    "@gearbox-protocol/oracles-v3": "^1.9.0",
+    "@gearbox-protocol/periphery-v3": "^1.3.12",
     "@gearbox-protocol/prettier-config": "^1.4.1",
-    "@typechain/ethers-v5": "10.0.0",
+    "@gearbox-protocol/router": "^1.5.5",
+    "@gearbox-protocol/router-v3": "^1.8.2",
+    "@openzeppelin/contracts": "^4.9.3",
+    "@redstone-finance/evm-connector": "^0.3.6",
+    "@typechain/ethers-v5": "^10.1.0",
     "@types/chai": "^4.3.3",
+    "@types/deep-eql": "^4.0.0",
     "@types/jest": "^28.1.7",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.7.6",