@gearbox-protocol/sdk 3.0.0-next.7 → 3.0.0-next.71

package/lib/types/{IRouter.d.ts → interfaces/IRouter.d.ts}

@@ -1,7 +1,7 @@
 import type { BaseContract, BigNumber, BigNumberish, BytesLike, CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, Signer, utils } from "ethers";
 import type { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
 import type { Listener, Provider } from "@ethersproject/providers";
-import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from "./common";
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from "../common";
 export type SwapTaskStruct = {
     swapOperation: PromiseOrValue<BigNumberish>;
     creditAccount: PromiseOrValue<string>;
@@ -9,8 +9,7 @@ export type SwapTaskStruct = {
     tokenOut: PromiseOrValue<string>;
     connectors: PromiseOrValue<string>[];
     amount: PromiseOrValue<BigNumberish>;
-    slippage: PromiseOrValue<BigNumberish>;
-    externalSlippage: PromiseOrValue<boolean>;
+    leftoverAmount: PromiseOrValue<BigNumberish>;
 };
 export type SwapTaskStructOutput = [
     number,
@@ -19,8 +18,7 @@ export type SwapTaskStructOutput = [
     string,
     string[],
     BigNumber,
-    BigNumber,
-    boolean
+    BigNumber
 ] & {
     swapOperation: number;
     creditAccount: string;
@@ -28,8 +26,7 @@ export type SwapTaskStructOutput = [
     tokenOut: string;
     connectors: string[];
     amount: BigNumber;
-    slippage: BigNumber;
-    externalSlippage: boolean;
+    leftoverAmount: BigNumber;
 };
 export type MultiCallStruct = {
     target: PromiseOrValue<string>;
@@ -41,18 +38,29 @@ export type MultiCallStructOutput = [string, string] & {
 };
 export type RouterResultStruct = {
     amount: PromiseOrValue<BigNumberish>;
+    minAmount: PromiseOrValue<BigNumberish>;
     gasUsage: PromiseOrValue<BigNumberish>;
     calls: MultiCallStruct[];
 };
 export type RouterResultStructOutput = [
+    BigNumber,
     BigNumber,
     BigNumber,
     MultiCallStructOutput[]
 ] & {
     amount: BigNumber;
+    minAmount: BigNumber;
     gasUsage: BigNumber;
     calls: MultiCallStructOutput[];
 };
+export type BalanceStruct = {
+    token: PromiseOrValue<string>;
+    balance: PromiseOrValue<BigNumberish>;
+};
+export type BalanceStructOutput = [string, BigNumber] & {
+    token: string;
+    balance: BigNumber;
+};
 export type PathOptionStruct = {
     target: PromiseOrValue<string>;
     option: PromiseOrValue<BigNumberish>;
@@ -63,30 +71,25 @@ export type PathOptionStructOutput = [string, number, number] & {
     option: number;
     totalOptions: number;
 };
-export type BalanceStruct = {
-    token: PromiseOrValue<string>;
-    balance: PromiseOrValue<BigNumberish>;
-};
-export type BalanceStructOutput = [string, BigNumber] & {
-    token: string;
-    balance: BigNumber;
-};
 export interface IRouterInterface extends utils.Interface {
     functions: {
         "componentAddressById(uint8)": FunctionFragment;
-        "findAllSwaps((uint8,address,address,address,address[],uint256,uint256,bool))": FunctionFragment;
-        "findBestClosePath(address,address[],uint256,(address,uint8,uint8)[],uint256,bool)": FunctionFragment;
+        "findAllSwaps((uint8,address,address,address,address[],uint256,uint256),uint256)": FunctionFragment;
+        "findBestClosePath(address,(address,uint256)[],(address,uint256)[],address[],uint256,(address,uint8,uint8)[],uint256,bool)": FunctionFragment;
         "findOneTokenPath(address,uint256,address,address,address[],uint256)": FunctionFragment;
-        "findOpenStrategyPath(address,(address,uint256)[],address,address[],uint256)": FunctionFragment;
+        "findOpenStrategyPath(address,(address,uint256)[],(address,uint256)[],address,address[],uint256)": FunctionFragment;
+        "getGasPriceTokenOutRAY(address)": FunctionFragment;
         "isRouterConfigurator(address)": FunctionFragment;
         "tokenTypes(address)": FunctionFragment;
         "version()": FunctionFragment;
     };
-    getFunction(nameOrSignatureOrTopic: "componentAddressById" | "findAllSwaps" | "findBestClosePath" | "findOneTokenPath" | "findOpenStrategyPath" | "isRouterConfigurator" | "tokenTypes" | "version"): FunctionFragment;
+    getFunction(nameOrSignatureOrTopic: "componentAddressById" | "findAllSwaps" | "findBestClosePath" | "findOneTokenPath" | "findOpenStrategyPath" | "getGasPriceTokenOutRAY" | "isRouterConfigurator" | "tokenTypes" | "version"): FunctionFragment;
     encodeFunctionData(functionFragment: "componentAddressById", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "findAllSwaps", values: [SwapTaskStruct]): string;
+    encodeFunctionData(functionFragment: "findAllSwaps", values: [SwapTaskStruct, PromiseOrValue<BigNumberish>]): string;
     encodeFunctionData(functionFragment: "findBestClosePath", values: [
         PromiseOrValue<string>,
+        BalanceStruct[],
+        BalanceStruct[],
         PromiseOrValue<string>[],
         PromiseOrValue<BigNumberish>,
         PathOptionStruct[],
@@ -104,10 +107,12 @@ export interface IRouterInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "findOpenStrategyPath", values: [
         PromiseOrValue<string>,
         BalanceStruct[],
+        BalanceStruct[],
         PromiseOrValue<string>,
         PromiseOrValue<string>[],
         PromiseOrValue<BigNumberish>
     ]): string;
+    encodeFunctionData(functionFragment: "getGasPriceTokenOutRAY", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "isRouterConfigurator", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "tokenTypes", values: [PromiseOrValue<string>]): string;
     encodeFunctionData(functionFragment: "version", values?: undefined): string;
@@ -116,6 +121,7 @@ export interface IRouterInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "findBestClosePath", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "findOneTokenPath", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "findOpenStrategyPath", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getGasPriceTokenOutRAY", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "isRouterConfigurator", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "tokenTypes", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "version", data: BytesLike): Result;
@@ -173,42 +179,46 @@ export interface IRouter extends BaseContract {
     removeListener: OnEvent<this>;
     functions: {
         componentAddressById(arg0: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[string]>;
-        findAllSwaps(swapTask: SwapTaskStruct, overrides?: Overrides & {
+        findAllSwaps(swapTask: SwapTaskStruct, slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        findBestClosePath(creditAccount: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, pathOptions: PathOptionStruct[], iterations: PromiseOrValue<BigNumberish>, force: PromiseOrValue<boolean>, overrides?: Overrides & {
+        findBestClosePath(creditAccount: PromiseOrValue<string>, expectedBalances: BalanceStruct[], leftoverBalances: BalanceStruct[], connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, pathOptions: PathOptionStruct[], iterations: PromiseOrValue<BigNumberish>, force: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
         findOneTokenPath(tokenIn: PromiseOrValue<string>, amount: PromiseOrValue<BigNumberish>, tokenOut: PromiseOrValue<string>, creditAccount: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
-        findOpenStrategyPath(creditManager: PromiseOrValue<string>, balances: BalanceStruct[], target: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        findOpenStrategyPath(creditManager: PromiseOrValue<string>, balances: BalanceStruct[], leftoverBalances: BalanceStruct[], target: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<ContractTransaction>;
+        getGasPriceTokenOutRAY(token: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[BigNumber] & {
+            gasPrice: BigNumber;
+        }>;
         isRouterConfigurator(account: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[boolean]>;
         tokenTypes(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[number]>;
         version(overrides?: CallOverrides): Promise<[BigNumber]>;
     };
     componentAddressById(arg0: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>;
-    findAllSwaps(swapTask: SwapTaskStruct, overrides?: Overrides & {
+    findAllSwaps(swapTask: SwapTaskStruct, slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    findBestClosePath(creditAccount: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, pathOptions: PathOptionStruct[], iterations: PromiseOrValue<BigNumberish>, force: PromiseOrValue<boolean>, overrides?: Overrides & {
+    findBestClosePath(creditAccount: PromiseOrValue<string>, expectedBalances: BalanceStruct[], leftoverBalances: BalanceStruct[], connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, pathOptions: PathOptionStruct[], iterations: PromiseOrValue<BigNumberish>, force: PromiseOrValue<boolean>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
     findOneTokenPath(tokenIn: PromiseOrValue<string>, amount: PromiseOrValue<BigNumberish>, tokenOut: PromiseOrValue<string>, creditAccount: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
-    findOpenStrategyPath(creditManager: PromiseOrValue<string>, balances: BalanceStruct[], target: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+    findOpenStrategyPath(creditManager: PromiseOrValue<string>, balances: BalanceStruct[], leftoverBalances: BalanceStruct[], target: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
         from?: PromiseOrValue<string>;
     }): Promise<ContractTransaction>;
+    getGasPriceTokenOutRAY(token: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
     isRouterConfigurator(account: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>;
     tokenTypes(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<number>;
     version(overrides?: CallOverrides): Promise<BigNumber>;
     callStatic: {
         componentAddressById(arg0: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>;
-        findAllSwaps(swapTask: SwapTaskStruct, overrides?: CallOverrides): Promise<RouterResultStructOutput[]>;
-        findBestClosePath(creditAccount: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, pathOptions: PathOptionStruct[], iterations: PromiseOrValue<BigNumberish>, force: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<[
+        findAllSwaps(swapTask: SwapTaskStruct, slippage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<RouterResultStructOutput[]>;
+        findBestClosePath(creditAccount: PromiseOrValue<string>, expectedBalances: BalanceStruct[], leftoverBalances: BalanceStruct[], connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, pathOptions: PathOptionStruct[], iterations: PromiseOrValue<BigNumberish>, force: PromiseOrValue<boolean>, overrides?: CallOverrides): Promise<[
             RouterResultStructOutput,
             BigNumber
         ] & {
@@ -216,7 +226,8 @@ export interface IRouter extends BaseContract {
             gasPriceTargetRAY: BigNumber;
         }>;
         findOneTokenPath(tokenIn: PromiseOrValue<string>, amount: PromiseOrValue<BigNumberish>, tokenOut: PromiseOrValue<string>, creditAccount: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<RouterResultStructOutput>;
-        findOpenStrategyPath(creditManager: PromiseOrValue<string>, balances: BalanceStruct[], target: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BalanceStructOutput[], RouterResultStructOutput]>;
+        findOpenStrategyPath(creditManager: PromiseOrValue<string>, balances: BalanceStruct[], leftoverBalances: BalanceStruct[], target: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BalanceStructOutput[], RouterResultStructOutput]>;
+        getGasPriceTokenOutRAY(token: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         isRouterConfigurator(account: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>;
         tokenTypes(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<number>;
         version(overrides?: CallOverrides): Promise<BigNumber>;
@@ -231,36 +242,38 @@ export interface IRouter extends BaseContract {
     };
     estimateGas: {
         componentAddressById(arg0: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        findAllSwaps(swapTask: SwapTaskStruct, overrides?: Overrides & {
+        findAllSwaps(swapTask: SwapTaskStruct, slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        findBestClosePath(creditAccount: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, pathOptions: PathOptionStruct[], iterations: PromiseOrValue<BigNumberish>, force: PromiseOrValue<boolean>, overrides?: Overrides & {
+        findBestClosePath(creditAccount: PromiseOrValue<string>, expectedBalances: BalanceStruct[], leftoverBalances: BalanceStruct[], connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, pathOptions: PathOptionStruct[], iterations: PromiseOrValue<BigNumberish>, force: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
         findOneTokenPath(tokenIn: PromiseOrValue<string>, amount: PromiseOrValue<BigNumberish>, tokenOut: PromiseOrValue<string>, creditAccount: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
-        findOpenStrategyPath(creditManager: PromiseOrValue<string>, balances: BalanceStruct[], target: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        findOpenStrategyPath(creditManager: PromiseOrValue<string>, balances: BalanceStruct[], leftoverBalances: BalanceStruct[], target: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<BigNumber>;
+        getGasPriceTokenOutRAY(token: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         isRouterConfigurator(account: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         tokenTypes(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
         version(overrides?: CallOverrides): Promise<BigNumber>;
     };
     populateTransaction: {
         componentAddressById(arg0: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        findAllSwaps(swapTask: SwapTaskStruct, overrides?: Overrides & {
+        findAllSwaps(swapTask: SwapTaskStruct, slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        findBestClosePath(creditAccount: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, pathOptions: PathOptionStruct[], iterations: PromiseOrValue<BigNumberish>, force: PromiseOrValue<boolean>, overrides?: Overrides & {
+        findBestClosePath(creditAccount: PromiseOrValue<string>, expectedBalances: BalanceStruct[], leftoverBalances: BalanceStruct[], connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, pathOptions: PathOptionStruct[], iterations: PromiseOrValue<BigNumberish>, force: PromiseOrValue<boolean>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
         findOneTokenPath(tokenIn: PromiseOrValue<string>, amount: PromiseOrValue<BigNumberish>, tokenOut: PromiseOrValue<string>, creditAccount: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
-        findOpenStrategyPath(creditManager: PromiseOrValue<string>, balances: BalanceStruct[], target: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
+        findOpenStrategyPath(creditManager: PromiseOrValue<string>, balances: BalanceStruct[], leftoverBalances: BalanceStruct[], target: PromiseOrValue<string>, connectors: PromiseOrValue<string>[], slippage: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
             from?: PromiseOrValue<string>;
         }): Promise<PopulatedTransaction>;
+        getGasPriceTokenOutRAY(token: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         isRouterConfigurator(account: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         tokenTypes(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         version(overrides?: CallOverrides): Promise<PopulatedTransaction>;

package/lib/types/interfaces/IRouter.js

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

package/lib/types/interfaces/index.d.ts

@@ -0,0 +1 @@
+export type { IRouter } from "./IRouter";

package/lib/types/interfaces/index.js

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

package/lib/utils/formatter.d.ts

@@ -1,9 +1,6 @@
 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 function toBN(num: string, decimals: number): bigint;
 export declare function shortAddress(address?: string): string;

package/lib/utils/formatter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatDateTime = exports.formatLeverage = exports.formatPercentage = exports.formatDate = exports.shortHash = exports.shortAddress = exports.toBN = 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");
@@ -12,72 +12,6 @@ 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, sdk_gov_1.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";

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

@@ -2,3 +2,4 @@ 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,7 +10,7 @@ interface BatchCreditAccountLoadOptions {
     atBlock?: number;
     chunkSize?: number;
 }
-export declare class CreditAccountWatcher {
+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;
@@ -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,10 +1,10 @@
 "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.ICreditConfiguratorV2__factory.createInterface();
@@ -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({
@@ -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") {
@@ -94,7 +92,7 @@ class CreditAccountWatcher {
             atBlock = options;
         }
         const dcInterface = types_1.IDataCompressorV2_10__factory.createInterface();
-        const dcmc = new sdk_gov_1.MultiCallContract(dataCompressor, dcInterface, signer);
+        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);
@@ -119,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
@@ -135,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)
@@ -151,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": {
@@ -225,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());
@@ -234,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

@@ -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(),