@gearbox-protocol/sdk 3.0.0-next.10 → 3.0.0-next.101

package/lib/pathfinder/pathfinder.d.ts

@@ -1,45 +1,73 @@
 import { NetworkType, SupportedToken } from "@gearbox-protocol/sdk-gov";
-import { BigNumberish, providers, Signer } from "ethers";
+import { providers, Signer } from "ethers";
+import { Asset } from "../core/assets";
 import { CreditAccountData } from "../core/creditAccount";
 import { CreditManagerData } from "../core/creditManager";
-import { IRouter } from "../types";
-import { MultiCall, PathFinderCloseResult, PathFinderOpenStrategyResult, PathFinderResult, SwapOperation } from "./core";
-export interface CloseResult {
+import { IRouterV3 } from "../types";
+import { PathFinderCloseResult, PathFinderOpenStrategyResult, PathFinderResult, SwapOperation } from "./core";
+interface FindAllSwapsProps {
+    creditAccount: CreditAccountData;
+    swapOperation: SwapOperation;
+    tokenIn: string;
+    tokenOut: string;
     amount: bigint;
-    calls: Array<MultiCall>;
-    gasUsage: bigint;
+    leftoverAmount: bigint;
+    slippage: number;
+}
+interface FindOneTokenPathProps {
+    creditAccount: CreditAccountData;
+    tokenIn: string;
+    tokenOut: string;
+    amount: bigint;
+    slippage: number;
+}
+interface FindBestClosePathProps {
+    creditAccount: CreditAccountData;
+    creditManager: CreditManagerData;
+    expectedBalances: Record<string, Asset>;
+    leftoverBalances: Record<string, Asset>;
+    slippage: number;
+    noConcurrency?: boolean;
+}
+interface FindOpenStrategyPathProps {
+    creditManager: CreditManagerData;
+    expectedBalances: Record<string, Asset>;
+    leftoverBalances: Record<string, Asset>;
+    target: string;
+    slippage: number;
 }
 export declare class PathFinder {
-    pathFinder: IRouter;
+    pathFinder: IRouterV3;
     network: NetworkType;
     static connectors: Array<SupportedToken>;
     protected readonly _connectors: Array<string>;
     constructor(address: string, provider: Signer | providers.Provider, network?: NetworkType, connectors?: SupportedToken[]);
-    findAllSwaps(creditAccount: CreditAccountData, swapOperation: SwapOperation, tokenIn: SupportedToken | string, tokenOut: SupportedToken | string, amount: BigNumberish, slippage: number): Promise<Array<PathFinderResult>>;
-    findOneTokenPath(creditAccount: CreditAccountData, tokenIn: SupportedToken | string, tokenOut: SupportedToken | string, amount: BigNumberish, slippage: number): Promise<PathFinderResult>;
+    findAllSwaps({ creditAccount, swapOperation, tokenIn, tokenOut, amount, leftoverAmount, slippage, }: FindAllSwapsProps): Promise<Array<PathFinderResult>>;
+    findOneTokenPath({ creditAccount, tokenIn, tokenOut, amount, slippage, }: FindOneTokenPathProps): Promise<PathFinderResult>;
     /**
-     * @dev Finds the best path for opening credit account and converting all NORMAL tokens and LP token in the way to TARGET
-     * @param cm CreditManagerData which represents credit manager you want to use to open credit account
+     * @dev Finds the best path for opening Credit Account and converting all NORMAL tokens and LP token in the way to TARGET
+     * @param cm CreditManagerData which represents credit manager you want to use to open Credit Account
      * @param expectedBalances Expected balances which would be on account accounting also debt. For example,
-     *    if you open an USDC credit account, borrow 50_000 USDC and provide 10 WETH and 10_USDC as collateral
+     *    if you open an USDC Credit Account, borrow 50_000 USDC and provide 10 WETH and 10_USDC as collateral
      *    from your own funds, expectedBalances should be: { "USDC": 60_000 * (10**6), "<address of WETH>": WAD.mul(10) }
      *
      * @param target Address of symbol of desired token
      * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
      * @returns PathFinderOpenStrategyResult which
      */
-    findOpenStrategyPath(cm: CreditManagerData, expectedBalances: Record<SupportedToken | string, BigNumberish>, target: SupportedToken | string, slippage: number): Promise<PathFinderOpenStrategyResult>;
+    findOpenStrategyPath({ creditManager: cm, expectedBalances, leftoverBalances, target, slippage, }: FindOpenStrategyPathProps): Promise<PathFinderOpenStrategyResult>;
     /**
      * @dev Finds the path to swap / withdraw all assets from CreditAccount into underlying asset
-     *   Can bu used for closing credit account and for liquidations as well.
+     *   Can bu used for closing Credit Account and for liquidations as well.
      * @param creditAccount CreditAccountData object used for close path computation
      * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
      * @return The best option in PathFinderCloseResult format, which
      *          - underlyingBalance - total balance of underlying token
      *          - calls - list of calls which should be done to swap & unwrap everything to underlying token
      */
-    findBestClosePath(creditAccount: CreditAccountData, slippage: number, noConcurency?: boolean): Promise<PathFinderCloseResult>;
-    static compare(r1: CloseResult, r2: CloseResult, gasPriceRAY: bigint): CloseResult;
+    findBestClosePath({ creditAccount, creditManager: cm, expectedBalances, leftoverBalances, slippage, noConcurrency, }: FindBestClosePathProps): Promise<PathFinderCloseResult>;
+    static compare(r1: PathFinderResult, r2: PathFinderResult, gasPriceRAY: bigint): PathFinderResult;
     getAvailableConnectors(availableList: Record<string, bigint> | Record<string, true>): string[];
     static getAvailableConnectors(availableList: Record<string, bigint> | Record<string, true>, connectors: string[]): string[];
 }
+export {};

package/lib/pathfinder/pathfinder.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PathFinder = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-const ethers_1 = require("ethers");
 const types_1 = require("../types");
 const pathOptions_1 = require("./pathOptions");
 const MAX_GAS_PER_ROUTE = 200e6;
@@ -13,114 +12,132 @@ class PathFinder {
     static connectors = [
         "USDC",
         "WETH",
-        "DAI",
+        "USDT",
         "FRAX",
     ];
     _connectors;
     constructor(address, provider, network = "Mainnet", connectors = PathFinder.connectors) {
-        this.pathFinder = types_1.IRouter__factory.connect(address, provider);
+        this.pathFinder = types_1.IRouterV3__factory.connect(address, provider);
         this.network = network;
         this._connectors = connectors
             .map(c => sdk_gov_1.tokenDataByNetwork[this.network][c]?.toLowerCase())
             .filter(t => !!t);
     }
-    async findAllSwaps(creditAccount, swapOperation, tokenIn, tokenOut, amount, slippage) {
+    async findAllSwaps({ creditAccount, swapOperation, tokenIn, tokenOut, amount, leftoverAmount, slippage, }) {
         const connectors = this.getAvailableConnectors(creditAccount.balances);
         const swapTask = {
             swapOperation: swapOperation,
             creditAccount: creditAccount.addr,
-            tokenIn: sdk_gov_1.tokenDataByNetwork[this.network][tokenIn] || tokenIn,
-            tokenOut: sdk_gov_1.tokenDataByNetwork[this.network][tokenOut] ||
-                tokenOut,
+            tokenIn,
+            tokenOut,
             connectors,
-            amount: ethers_1.BigNumber.from(amount),
-            slippage: ethers_1.BigNumber.from(slippage),
-            externalSlippage: false,
+            amount,
+            leftoverAmount,
         };
-        const results = await this.pathFinder.callStatic.findAllSwaps(swapTask, {
+        const results = await this.pathFinder.callStatic.findAllSwaps(swapTask, slippage, {
             gasLimit: GAS_PER_BLOCK,
         });
         const unique = {};
         results.forEach(r => {
-            const key = `${r.amount.toHexString()}${r.calls
+            const key = `${r.minAmount.toHexString()}${r.calls
                 .map(c => `${c.target.toLowerCase()}${c.callData}`)
                 .join("-")}`;
             unique[key] = {
                 amount: (0, sdk_gov_1.toBigInt)(r.amount),
+                minAmount: (0, sdk_gov_1.toBigInt)(r.minAmount),
+                gasUsage: (0, sdk_gov_1.toBigInt)(r.gasUsage),
                 calls: r.calls,
             };
         });
         return Object.values(unique);
     }
-    async findOneTokenPath(creditAccount, tokenIn, tokenOut, amount, slippage) {
-        const tokenInAddr = sdk_gov_1.tokenDataByNetwork[this.network][tokenIn] || tokenIn;
+    async findOneTokenPath({ creditAccount, tokenIn, tokenOut, amount, slippage, }) {
         const connectors = this.getAvailableConnectors(creditAccount.balances);
-        const result = await this.pathFinder.callStatic.findOneTokenPath(tokenInAddr, amount, sdk_gov_1.tokenDataByNetwork[this.network][tokenOut] || tokenOut, creditAccount.addr, connectors, slippage, {
+        const result = await this.pathFinder.callStatic.findOneTokenPath(tokenIn, amount, tokenOut, creditAccount.addr, connectors, slippage, {
             gasLimit: GAS_PER_BLOCK,
         });
         return {
             amount: (0, sdk_gov_1.toBigInt)(result.amount),
+            minAmount: (0, sdk_gov_1.toBigInt)(result.minAmount),
+            gasUsage: (0, sdk_gov_1.toBigInt)(result.gasUsage),
             calls: result.calls,
         };
     }
     /**
-     * @dev Finds the best path for opening credit account and converting all NORMAL tokens and LP token in the way to TARGET
-     * @param cm CreditManagerData which represents credit manager you want to use to open credit account
+     * @dev Finds the best path for opening Credit Account and converting all NORMAL tokens and LP token in the way to TARGET
+     * @param cm CreditManagerData which represents credit manager you want to use to open Credit Account
      * @param expectedBalances Expected balances which would be on account accounting also debt. For example,
-     *    if you open an USDC credit account, borrow 50_000 USDC and provide 10 WETH and 10_USDC as collateral
+     *    if you open an USDC Credit Account, borrow 50_000 USDC and provide 10 WETH and 10_USDC as collateral
      *    from your own funds, expectedBalances should be: { "USDC": 60_000 * (10**6), "<address of WETH>": WAD.mul(10) }
      *
      * @param target Address of symbol of desired token
      * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
      * @returns PathFinderOpenStrategyResult which
      */
-    async findOpenStrategyPath(cm, expectedBalances, target, slippage) {
-        const targetAddr = sdk_gov_1.tokenDataByNetwork[this.network][target] || target;
-        const expectedBalancesAddr = Object.entries(expectedBalances).reduce((acc, [token, balance]) => {
-            const tokenAddr = sdk_gov_1.tokenDataByNetwork[this.network][token] || token;
-            acc[tokenAddr.toLowerCase()] = balance;
-            return acc;
-        }, {});
-        const balances = cm.collateralTokens.map(token => ({
+    async findOpenStrategyPath({ creditManager: cm, expectedBalances, leftoverBalances, target, slippage, }) {
+        const input = cm.collateralTokens.map(token => ({
             token,
-            balance: expectedBalancesAddr[token] || 0,
+            balance: expectedBalances[token]?.balance || 0n,
+        }));
+        const leftover = cm.collateralTokens.map(token => ({
+            token,
+            balance: leftoverBalances[token]?.balance || 1n,
         }));
         const connectors = this.getAvailableConnectors(cm.supportedTokens);
-        const result = await this.pathFinder.callStatic.findOpenStrategyPath(cm.address, balances, targetAddr, connectors, slippage, {
+        const [outBalances, result] = await this.pathFinder.callStatic.findOpenStrategyPath(cm.address, input, leftover, target, connectors, slippage, {
             gasLimit: GAS_PER_BLOCK,
         });
-        const balancesAfter = result[0].reduce((acc, b) => {
+        const balancesAfter = outBalances.reduce((acc, b) => {
             acc[b.token.toLowerCase()] = (0, sdk_gov_1.toBigInt)(b.balance);
             return acc;
         }, {});
         return {
-            balances: balancesAfter,
-            calls: result[1].calls,
+            balances: {
+                ...balancesAfter,
+                [target]: (expectedBalances[target]?.balance || 0n) + (0, sdk_gov_1.toBigInt)(result.amount),
+            },
+            minBalances: {
+                ...balancesAfter,
+                [target]: (expectedBalances[target]?.balance || 0n) +
+                    (0, sdk_gov_1.toBigInt)(result.minAmount),
+            },
+            calls: result.calls,
+            minAmount: (0, sdk_gov_1.toBigInt)(result.minAmount),
+            amount: (0, sdk_gov_1.toBigInt)(result.amount),
+            gasUsage: (0, sdk_gov_1.toBigInt)(result.gasUsage),
         };
     }
     /**
      * @dev Finds the path to swap / withdraw all assets from CreditAccount into underlying asset
-     *   Can bu used for closing credit account and for liquidations as well.
+     *   Can bu used for closing Credit Account and for liquidations as well.
      * @param creditAccount CreditAccountData object used for close path computation
      * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
      * @return The best option in PathFinderCloseResult format, which
      *          - underlyingBalance - total balance of underlying token
      *          - calls - list of calls which should be done to swap & unwrap everything to underlying token
      */
-    async findBestClosePath(creditAccount, slippage, noConcurency = false) {
+    async findBestClosePath({ creditAccount, creditManager: cm, expectedBalances, leftoverBalances, slippage, noConcurrency = false, }) {
         const loopsPerTx = Math.floor(GAS_PER_BLOCK / MAX_GAS_PER_ROUTE);
         const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, loopsPerTx);
+        const expected = cm.collateralTokens.map(token => ({
+            token,
+            balance: expectedBalances[token]?.balance || 0n,
+        }));
+        const leftover = cm.collateralTokens.map(token => ({
+            token,
+            balance: leftoverBalances[token]?.balance || 1n,
+        }));
         const connectors = this.getAvailableConnectors(creditAccount.balances);
         let results = [];
-        if (noConcurency) {
+        if (noConcurrency) {
             for (const po of pathOptions) {
-                results.push(await this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, connectors, slippage, po, loopsPerTx, false, {
+                results.push(await this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, expected, leftover, connectors, slippage, po, loopsPerTx, false, {
                     gasLimit: GAS_PER_BLOCK,
                 }));
             }
         }
         else {
-            const requests = pathOptions.map(po => this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, connectors, slippage, po, loopsPerTx, false, {
+            const requests = pathOptions.map(po => this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, expected, leftover, connectors, slippage, po, loopsPerTx, false, {
                 gasLimit: GAS_PER_BLOCK,
             }));
             results = await Promise.all(requests);
@@ -128,21 +145,23 @@ class PathFinder {
         const bestResult = results.reduce((best, [pathFinderResult, gasPriceRAY]) => PathFinder.compare(best, {
             calls: pathFinderResult.calls,
             amount: (0, sdk_gov_1.toBigInt)(pathFinderResult.amount),
+            minAmount: (0, sdk_gov_1.toBigInt)(pathFinderResult.minAmount),
             gasUsage: (0, sdk_gov_1.toBigInt)(pathFinderResult.gasUsage),
         }, (0, sdk_gov_1.toBigInt)(gasPriceRAY)), {
             amount: 0n,
+            minAmount: 0n,
             gasUsage: 0n,
             calls: [],
         });
         return {
-            underlyingBalance: bestResult.amount +
+            ...bestResult,
+            underlyingBalance: bestResult.minAmount +
                 creditAccount.allBalances[creditAccount.underlyingToken.toLowerCase()]
                     .balance,
-            calls: bestResult.calls,
         };
     }
     static compare(r1, r2, gasPriceRAY) {
-        const comparator = ({ amount, gasUsage }, gasPrice) => amount - (gasUsage * gasPrice) / sdk_gov_1.RAY;
+        const comparator = ({ minAmount, gasUsage }, gasPrice) => minAmount - (gasUsage * gasPrice) / sdk_gov_1.RAY;
         return comparator(r1, gasPriceRAY) > comparator(r2, gasPriceRAY) ? r1 : r2;
     }
     getAvailableConnectors(availableList) {

package/lib/pathfinder/pathfinder.spec.js

@@ -7,12 +7,14 @@ const pathfinder_1 = require("./pathfinder");
 describe("PathFinder test", () => {
     it("compare works correctly", () => {
         const r1 = {
-            amount: 2000n,
+            minAmount: 2000n,
+            amount: 20000n,
             gasUsage: 1000n,
             calls: [],
         };
         const r2 = {
-            amount: 3000n,
+            minAmount: 3000n,
+            amount: 30000n,
             gasUsage: 2000n,
             calls: [],
         };
@@ -28,11 +30,13 @@ describe("PathFinder test", () => {
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: true,
             [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: true,
             [sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX.toLowerCase()]: true,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDT.toLowerCase()]: true,
         };
         (0, chai_1.expect)(pf.getAvailableConnectors(allowedTokens)).to.be.deep.equal([
             sdk_gov_1.tokenDataByNetwork.Mainnet.USDC.toLowerCase(),
             sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
-            sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
+            // tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
+            sdk_gov_1.tokenDataByNetwork.Mainnet.USDT.toLowerCase(),
             sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX.toLowerCase(),
         ]);
     });

package/lib/pathfinder/v1/core.d.ts

@@ -0,0 +1,16 @@
+import { ExcludeArrayProps } from "@gearbox-protocol/sdk-gov";
+import { SwapTaskStructOutput } from "../../types/IRouter";
+import { MultiCall } from "../core";
+export type SwapTaskV1 = ExcludeArrayProps<SwapTaskStructOutput>;
+export interface PathFinderV1Result {
+    amount: bigint;
+    calls: Array<MultiCall>;
+}
+export interface PathFinderV1OpenStrategyResult {
+    balances: Record<string, bigint>;
+    calls: Array<MultiCall>;
+}
+export interface PathFinderV1CloseResult {
+    underlyingBalance: bigint;
+    calls: Array<MultiCall>;
+}

package/lib/pathfinder/v1/pathfinderv1.d.ts

@@ -0,0 +1,46 @@
+import { NetworkType, SupportedToken } from "@gearbox-protocol/sdk-gov";
+import { BigNumberish, providers, Signer } from "ethers";
+import { CreditAccountData } from "../../core/creditAccount";
+import { CreditManagerData } from "../../core/creditManager";
+import { IRouter } from "../../types";
+import { MultiCall, SwapOperation } from "../core";
+import { PathFinderV1CloseResult, PathFinderV1OpenStrategyResult, PathFinderV1Result } from "./core";
+export interface CloseResult {
+    amount: bigint;
+    calls: Array<MultiCall>;
+    gasUsage: bigint;
+}
+export declare class PathFinderV1 {
+    pathFinder: IRouter;
+    network: NetworkType;
+    static connectors: Array<SupportedToken>;
+    protected readonly _connectors: Array<string>;
+    constructor(address: string, provider: Signer | providers.Provider, network?: NetworkType, connectors?: SupportedToken[]);
+    findAllSwaps(creditAccount: CreditAccountData, swapOperation: SwapOperation, tokenIn: SupportedToken | string, tokenOut: SupportedToken | string, amount: BigNumberish, slippage: number): Promise<Array<PathFinderV1Result>>;
+    findOneTokenPath(creditAccount: CreditAccountData, tokenIn: SupportedToken | string, tokenOut: SupportedToken | string, amount: BigNumberish, slippage: number): Promise<PathFinderV1Result>;
+    /**
+     * @dev Finds the best path for opening credit account and converting all NORMAL tokens and LP token in the way to TARGET
+     * @param cm CreditManagerData which represents credit manager you want to use to open credit account
+     * @param expectedBalances Expected balances which would be on account accounting also debt. For example,
+     *    if you open an USDC credit account, borrow 50_000 USDC and provide 10 WETH and 10_USDC as collateral
+     *    from your own funds, expectedBalances should be: { "USDC": 60_000 * (10**6), "<address of WETH>": WAD.mul(10) }
+     *
+     * @param target Address of symbol of desired token
+     * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
+     * @returns PathFinderOpenStrategyResult which
+     */
+    findOpenStrategyPath(cm: CreditManagerData, expectedBalances: Record<SupportedToken | string, BigNumberish>, target: SupportedToken | string, slippage: number): Promise<PathFinderV1OpenStrategyResult>;
+    /**
+     * @dev Finds the path to swap / withdraw all assets from CreditAccount into underlying asset
+     *   Can bu used for closing credit account and for liquidations as well.
+     * @param creditAccount CreditAccountData object used for close path computation
+     * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
+     * @return The best option in PathFinderCloseResult format, which
+     *          - underlyingBalance - total balance of underlying token
+     *          - calls - list of calls which should be done to swap & unwrap everything to underlying token
+     */
+    findBestClosePath(creditAccount: CreditAccountData, slippage: number, noConcurency?: boolean): Promise<PathFinderV1CloseResult>;
+    static compare(r1: CloseResult, r2: CloseResult, gasPriceRAY: bigint): CloseResult;
+    getAvailableConnectors(availableList: Record<string, bigint> | Record<string, true>): string[];
+    static getAvailableConnectors(availableList: Record<string, bigint> | Record<string, true>, connectors: string[]): string[];
+}

package/lib/pathfinder/v1/pathfinderv1.js

@@ -0,0 +1,155 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PathFinderV1 = void 0;
+const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
+const ethers_1 = require("ethers");
+const types_1 = require("../../types");
+const pathOptions_1 = require("../pathOptions");
+const MAX_GAS_PER_ROUTE = 200e6;
+const GAS_PER_BLOCK = 400e6;
+class PathFinderV1 {
+    pathFinder;
+    network;
+    static connectors = [
+        "USDC",
+        "WETH",
+        "USDT",
+        "FRAX",
+    ];
+    _connectors;
+    constructor(address, provider, network = "Mainnet", connectors = PathFinderV1.connectors) {
+        this.pathFinder = types_1.IRouter__factory.connect(address, provider);
+        this.network = network;
+        this._connectors = connectors
+            .map(c => sdk_gov_1.tokenDataByNetwork[this.network][c]?.toLowerCase())
+            .filter(t => !!t);
+    }
+    async findAllSwaps(creditAccount, swapOperation, tokenIn, tokenOut, amount, slippage) {
+        const connectors = this.getAvailableConnectors(creditAccount.balances);
+        const swapTask = {
+            swapOperation: swapOperation,
+            creditAccount: creditAccount.addr,
+            tokenIn: sdk_gov_1.tokenDataByNetwork[this.network][tokenIn] || tokenIn,
+            tokenOut: sdk_gov_1.tokenDataByNetwork[this.network][tokenOut] ||
+                tokenOut,
+            connectors,
+            amount: ethers_1.BigNumber.from(amount),
+            slippage: ethers_1.BigNumber.from(slippage),
+            externalSlippage: false,
+        };
+        const results = await this.pathFinder.callStatic.findAllSwaps(swapTask, {
+            gasLimit: GAS_PER_BLOCK,
+        });
+        const unique = {};
+        results.forEach(r => {
+            const key = `${r.amount.toHexString()}${r.calls
+                .map(c => `${c.target.toLowerCase()}${c.callData}`)
+                .join("-")}`;
+            unique[key] = {
+                amount: (0, sdk_gov_1.toBigInt)(r.amount),
+                calls: r.calls,
+            };
+        });
+        return Object.values(unique);
+    }
+    async findOneTokenPath(creditAccount, tokenIn, tokenOut, amount, slippage) {
+        const tokenInAddr = sdk_gov_1.tokenDataByNetwork[this.network][tokenIn] || tokenIn;
+        const connectors = this.getAvailableConnectors(creditAccount.balances);
+        const result = await this.pathFinder.callStatic.findOneTokenPath(tokenInAddr, amount, sdk_gov_1.tokenDataByNetwork[this.network][tokenOut] || tokenOut, creditAccount.addr, connectors, slippage, {
+            gasLimit: GAS_PER_BLOCK,
+        });
+        return {
+            amount: (0, sdk_gov_1.toBigInt)(result.amount),
+            calls: result.calls,
+        };
+    }
+    /**
+     * @dev Finds the best path for opening credit account and converting all NORMAL tokens and LP token in the way to TARGET
+     * @param cm CreditManagerData which represents credit manager you want to use to open credit account
+     * @param expectedBalances Expected balances which would be on account accounting also debt. For example,
+     *    if you open an USDC credit account, borrow 50_000 USDC and provide 10 WETH and 10_USDC as collateral
+     *    from your own funds, expectedBalances should be: { "USDC": 60_000 * (10**6), "<address of WETH>": WAD.mul(10) }
+     *
+     * @param target Address of symbol of desired token
+     * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
+     * @returns PathFinderOpenStrategyResult which
+     */
+    async findOpenStrategyPath(cm, expectedBalances, target, slippage) {
+        const targetAddr = sdk_gov_1.tokenDataByNetwork[this.network][target] || target;
+        const expectedBalancesAddr = Object.entries(expectedBalances).reduce((acc, [token, balance]) => {
+            const tokenAddr = sdk_gov_1.tokenDataByNetwork[this.network][token] || token;
+            acc[tokenAddr.toLowerCase()] = balance;
+            return acc;
+        }, {});
+        const balances = cm.collateralTokens.map(token => ({
+            token,
+            balance: expectedBalancesAddr[token] || 0,
+        }));
+        const connectors = this.getAvailableConnectors(cm.supportedTokens);
+        const result = await this.pathFinder.callStatic.findOpenStrategyPath(cm.address, balances, targetAddr, connectors, slippage, {
+            gasLimit: GAS_PER_BLOCK,
+        });
+        const balancesAfter = result[0].reduce((acc, b) => {
+            acc[b.token.toLowerCase()] = (0, sdk_gov_1.toBigInt)(b.balance);
+            return acc;
+        }, {});
+        return {
+            balances: balancesAfter,
+            calls: result[1].calls,
+        };
+    }
+    /**
+     * @dev Finds the path to swap / withdraw all assets from CreditAccount into underlying asset
+     *   Can bu used for closing credit account and for liquidations as well.
+     * @param creditAccount CreditAccountData object used for close path computation
+     * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
+     * @return The best option in PathFinderCloseResult format, which
+     *          - underlyingBalance - total balance of underlying token
+     *          - calls - list of calls which should be done to swap & unwrap everything to underlying token
+     */
+    async findBestClosePath(creditAccount, slippage, noConcurency = false) {
+        const loopsPerTx = Math.floor(GAS_PER_BLOCK / MAX_GAS_PER_ROUTE);
+        const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, loopsPerTx);
+        const connectors = this.getAvailableConnectors(creditAccount.balances);
+        let results = [];
+        if (noConcurency) {
+            for (const po of pathOptions) {
+                results.push(await this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, connectors, slippage, po, loopsPerTx, false, {
+                    gasLimit: GAS_PER_BLOCK,
+                }));
+            }
+        }
+        else {
+            const requests = pathOptions.map(po => this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, connectors, slippage, po, loopsPerTx, false, {
+                gasLimit: GAS_PER_BLOCK,
+            }));
+            results = await Promise.all(requests);
+        }
+        const bestResult = results.reduce((best, [pathFinderResult, gasPriceRAY]) => PathFinderV1.compare(best, {
+            calls: pathFinderResult.calls,
+            amount: (0, sdk_gov_1.toBigInt)(pathFinderResult.amount),
+            gasUsage: (0, sdk_gov_1.toBigInt)(pathFinderResult.gasUsage),
+        }, (0, sdk_gov_1.toBigInt)(gasPriceRAY)), {
+            amount: 0n,
+            gasUsage: 0n,
+            calls: [],
+        });
+        return {
+            underlyingBalance: bestResult.amount +
+                creditAccount.allBalances[creditAccount.underlyingToken.toLowerCase()]
+                    .balance,
+            calls: bestResult.calls,
+        };
+    }
+    static compare(r1, r2, gasPriceRAY) {
+        const comparator = ({ amount, gasUsage }, gasPrice) => amount - (gasUsage * gasPrice) / sdk_gov_1.RAY;
+        return comparator(r1, gasPriceRAY) > comparator(r2, gasPriceRAY) ? r1 : r2;
+    }
+    getAvailableConnectors(availableList) {
+        return PathFinderV1.getAvailableConnectors(availableList, this._connectors);
+    }
+    static getAvailableConnectors(availableList, connectors) {
+        return connectors.filter(t => availableList[t] !== undefined);
+    }
+}
+exports.PathFinderV1 = PathFinderV1;

package/lib/pathfinder/v1/pathfinderv1.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/pathfinder/v1/pathfinderv1.spec.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
+const chai_1 = require("chai");
+const ethers_1 = require("ethers");
+const pathfinderv1_1 = require("./pathfinderv1");
+describe("PathFinderV1 test", () => {
+    it("compare works correctly", () => {
+        const r1 = {
+            amount: 2000n,
+            gasUsage: 1000n,
+            calls: [],
+        };
+        const r2 = {
+            amount: 3000n,
+            gasUsage: 2000n,
+            calls: [],
+        };
+        let result = pathfinderv1_1.PathFinderV1.compare(r1, r2, sdk_gov_1.RAY);
+        (0, chai_1.expect)(result).to.be.eql(r2);
+        result = pathfinderv1_1.PathFinderV1.compare(r1, r2, sdk_gov_1.RAY * 2n);
+        (0, chai_1.expect)(result).to.be.eql(r1);
+    });
+    it("has all expected connectors", () => {
+        const pf = new pathfinderv1_1.PathFinderV1("", new ethers_1.providers.JsonRpcProvider(), "Mainnet");
+        const allowedTokens = {
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC.toLowerCase()]: true,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: true,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDT.toLowerCase()]: true,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX.toLowerCase()]: true,
+        };
+        (0, chai_1.expect)(pf.getAvailableConnectors(allowedTokens)).to.be.deep.equal([
+            sdk_gov_1.tokenDataByNetwork.Mainnet.USDC.toLowerCase(),
+            sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
+            sdk_gov_1.tokenDataByNetwork.Mainnet.USDT.toLowerCase(),
+            sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX.toLowerCase(),
+        ]);
+    });
+});

package/lib/payload/creditAccount.d.ts

@@ -1,6 +1,5 @@
 import { ExcludeArrayProps } from "@gearbox-protocol/sdk-gov";
-import { CreditAccountDataStructOutput, ScheduledWithdrawalStructOutput, TokenBalanceStructOutput } from "../types/IDataCompressorV3_00";
-import { BigintifyProps } from "../utils/types";
+import { CreditAccountDataStructOutput, TokenBalanceStructOutput } from "../types/IDataCompressorV3_00";
+import { BigintifyProps, PartialKeys } from "../utils/types";
 export type CaTokenBalance = BigintifyProps<ExcludeArrayProps<TokenBalanceStructOutput>>;
-export type ScheduledWithdrawal = BigintifyProps<ExcludeArrayProps<ScheduledWithdrawalStructOutput>>;
-export type CreditAccountDataPayload = ExcludeArrayProps<CreditAccountDataStructOutput>;
+export type CreditAccountDataPayload = PartialKeys<ExcludeArrayProps<CreditAccountDataStructOutput>, "accruedInterest" | "accruedFees" | "healthFactor" | "totalValue">;

package/lib/payload/creditManager.d.ts

@@ -14,8 +14,11 @@ export type CreditManagerDataPayload = ExcludeArrayProps<CreditManagerDataStruct
 export interface ChartsCreditManagerPayload {
     addr: string;
     underlyingToken: string;
+    configurator: string;
+    creditFacade: string;
     isWeth: boolean;
     poolAddress: string;
+    name: string;
     maxAmount: BigNumberish;
     minAmount: BigNumberish;
     maxLeverageFactor: number;

package/lib/payload/creditSession.d.ts

@@ -12,6 +12,9 @@ interface CreditSessionReward {
     pool: string;
     symbol: string;
 }
+export interface SecondaryStatus {
+    secStatus: Array<[block: number, status: number]>;
+}
 export interface CreditSessionPayload {
     id: string;
     status: number;
@@ -52,6 +55,11 @@ export interface CreditSessionPayload {
     currentTimestamp: number;
     cvxUnclaimedRewards: Record<string, CreditSessionReward>;
     balances: Record<string, CreditSessionBalancePayload>;
+    baseBorrowAPY7DAverage: number;
+    baseBorrowAPY_RAY: string;
+    baseToken: string;
+    pool: string;
+    teritaryStatus: null | SecondaryStatus;
 }
 export interface CreditSessionFilteredPayload {
     balances: Record<string, CreditSessionBalancePayload>;
@@ -72,6 +80,9 @@ export interface CreditSessionFilteredPayload {
     pnl: number;
     pnlUSD: number;
     tfIndex: number;
+    closedAtTimestamp: number;
+    sinceTimestamp: number;
+    teritaryStatus: null | SecondaryStatus;
 }
 export interface CreditSessionsAggregatedStatsPayload {
     healthFactor: BigNumberish;