@gearbox-protocol/sdk 3.0.0-next.29 → 3.0.0-next.290

package/lib/pathfinder/pathOptions.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PathOptionFactory = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
+const aura_1 = require("@gearbox-protocol/sdk-gov/lib/tokens/aura");
 class PathOptionFactory {
-    static generatePathOptions(balances, loopsInTx) {
+    static generatePathOptions(balances, loopsInTx, network) {
         const curvePools = PathOptionFactory.getCurvePools(balances);
-        const network = PathOptionFactory.detectNetwork(Object.keys(balances)[0]);
-        const initPO = curvePools.map(symbol => {
+        const balancerPools = PathOptionFactory.getBalancerPools(balances);
+        const curveInitPO = curvePools.map(symbol => {
             return {
                 target: sdk_gov_1.tokenDataByNetwork[network][symbol],
                 option: 0,
@@ -14,6 +15,14 @@ class PathOptionFactory {
                     .tokens.length,
             };
         });
+        const balancerInitPO = balancerPools.map(symbol => {
+            return {
+                target: sdk_gov_1.tokenDataByNetwork[network][symbol],
+                option: 0,
+                totalOptions: sdk_gov_1.balancerLpTokens[symbol].underlying.length,
+            };
+        });
+        const initPO = [...curveInitPO, ...balancerInitPO];
         const totalLoops = initPO.reduce((acc, item) => acc * item.totalOptions, 1);
         const result = [];
         let currentPo = [...initPO];
@@ -28,24 +37,21 @@ class PathOptionFactory {
         return result;
     }
     static getCurvePools(balances) {
-        const curveSymbols = Object.keys(sdk_gov_1.curveTokens);
-        const curvePools = Object.entries(balances)
-            .filter(([, balance]) => (0, sdk_gov_1.toBigInt)(balance.balance) > 1)
+        const nonZeroBalances = Object.entries(balances).filter(([, balance]) => balance.balance > 1);
+        const curvePools = nonZeroBalances
             .map(([token]) => sdk_gov_1.tokenSymbolByAddress[token.toLowerCase()])
-            .filter(symbol => curveSymbols.includes(symbol));
+            .filter(symbol => (0, sdk_gov_1.isCurveLPToken)(symbol));
         const yearnCurveTokens = Object.entries(sdk_gov_1.yearnTokens)
-            .filter(([, data]) => curveSymbols.includes(data.underlying))
+            .filter(([, data]) => (0, sdk_gov_1.isCurveLPToken)(data.underlying))
             .map(([token]) => token);
-        const curvePoolsFromYearn = Object.entries(balances)
-            .filter(([, balance]) => (0, sdk_gov_1.toBigInt)(balance.balance) > 1)
+        const curvePoolsFromYearn = nonZeroBalances
             .map(([token]) => sdk_gov_1.tokenSymbolByAddress[token.toLowerCase()])
             .filter(symbol => yearnCurveTokens.includes(symbol))
             .map(symbol => sdk_gov_1.yearnTokens[symbol].underlying);
         const convexCurveTokens = Object.entries(sdk_gov_1.convexTokens)
-            .filter(([, data]) => curveSymbols.includes(data.underlying))
+            .filter(([, data]) => (0, sdk_gov_1.isCurveLPToken)(data.underlying))
             .map(([token]) => token);
-        const curvePoolsFromConvex = Object.entries(balances)
-            .filter(([, balance]) => (0, sdk_gov_1.toBigInt)(balance.balance) > 1)
+        const curvePoolsFromConvex = nonZeroBalances
             .map(([token]) => sdk_gov_1.tokenSymbolByAddress[token.toLowerCase()])
             .filter(symbol => convexCurveTokens.includes(symbol))
             .map(symbol => sdk_gov_1.convexTokens[symbol].underlying);
@@ -56,6 +62,21 @@ class PathOptionFactory {
         ]);
         return Array.from(curveSet.values());
     }
+    static getBalancerPools(balances) {
+        const nonZeroBalances = Object.entries(balances).filter(([, balance]) => balance.balance > 1);
+        const balancerPools = nonZeroBalances
+            .map(([token]) => sdk_gov_1.tokenSymbolByAddress[token.toLowerCase()])
+            .filter(symbol => (0, sdk_gov_1.isBalancerLPToken)(symbol));
+        const balancerAuraTokens = Object.entries(aura_1.auraTokens)
+            .filter(([, data]) => (0, sdk_gov_1.isBalancerLPToken)(data.underlying))
+            .map(([token]) => token);
+        const balancerTokensFromAura = nonZeroBalances
+            .map(([token]) => sdk_gov_1.tokenSymbolByAddress[token.toLowerCase()])
+            .filter(symbol => balancerAuraTokens.includes(symbol))
+            .map(symbol => aura_1.auraTokens[symbol].underlying);
+        const balancerSet = new Set([...balancerPools, ...balancerTokensFromAura]);
+        return Array.from(balancerSet.values());
+    }
     static next(path) {
         let newPath = [...path];
         for (let i = path.length - 1; i >= 0; i--) {
@@ -68,10 +89,5 @@ class PathOptionFactory {
         }
         throw new Error("Path options overflow");
     }
-    static detectNetwork(underlying) {
-        return sdk_gov_1.tokenDataByNetwork.Mainnet[sdk_gov_1.tokenSymbolByAddress[underlying.toLowerCase()]].toLowerCase() === underlying.toLowerCase()
-            ? "Mainnet"
-            : "Arbitrum";
-    }
 }
 exports.PathOptionFactory = PathOptionFactory;

package/lib/pathfinder/pathOptions.spec.js

@@ -61,30 +61,35 @@ describe("PathOptionFactory test", () => {
             [sdk_gov_1.tokenDataByNetwork.Mainnet["3Crv"]]: { balance: 200n },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC]: { balance: 200n },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX3CRV]: { balance: 200n },
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.LUSD3CRV]: { balance: 200n },
         };
-        const result = pathOptions_1.PathOptionFactory.generatePathOptions(balances, 4);
+        const result = pathOptions_1.PathOptionFactory.generatePathOptions(balances, 4, "Mainnet");
         const expected = [
-            {
-                target: sdk_gov_1.tokenDataByNetwork.Mainnet["3Crv"],
-                option: 0,
-                totalOptions: 3,
-            },
-            {
-                target: sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX3CRV,
-                option: 0,
-                totalOptions: 2,
-            },
-            {
-                target: sdk_gov_1.tokenDataByNetwork.Mainnet.LUSD3CRV,
-                option: 0,
-                totalOptions: 2,
-            },
+            [
+                {
+                    target: sdk_gov_1.tokenDataByNetwork.Mainnet["3Crv"],
+                    option: 0,
+                    totalOptions: 3,
+                },
+                {
+                    target: sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX3CRV,
+                    option: 0,
+                    totalOptions: 2,
+                },
+            ],
+            [
+                {
+                    target: sdk_gov_1.tokenDataByNetwork.Mainnet["3Crv"],
+                    option: 2,
+                    totalOptions: 3,
+                },
+                {
+                    target: sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX3CRV,
+                    option: 0,
+                    totalOptions: 2,
+                },
+            ],
         ];
-        for (let i = 0; i < 3; i++) {
-            expected[0].option = i;
-            (0, chai_1.expect)(expected).to.be.eql(result[i]);
-        }
+        (0, chai_1.expect)(expected).to.be.eql(result);
     });
     it(" getCurvePools works correctly", () => {
         let balances = {
@@ -135,7 +140,4 @@ describe("PathOptionFactory test", () => {
         expectedCurvePools = ["3Crv", "steCRV"];
         (0, chai_1.expect)(pathOptions_1.PathOptionFactory.getCurvePools(balances)).to.be.eql(expectedCurvePools);
     });
-    it("detectNetwork works correctly", () => {
-        (0, chai_1.expect)(pathOptions_1.PathOptionFactory.detectNetwork(sdk_gov_1.tokenDataByNetwork.Mainnet["1INCH"])).to.be.eq("Mainnet");
-    });
 });

package/lib/pathfinder/pathfinder.d.ts

@@ -1,45 +1,84 @@
-import { NetworkType, SupportedToken } from "@gearbox-protocol/sdk-gov";
-import { BigNumberish, providers, Signer } from "ethers";
+import { NetworkType } from "@gearbox-protocol/sdk-gov";
+import { Address, GetContractReturnType, PublicClient } from "viem";
+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 { iRouterV3Abi } from "../types";
+import { PathFinderCloseResult, PathFinderOpenStrategyResult, PathFinderResult, SwapOperation } from "./core";
+interface FindAllSwapsProps {
+    creditAccount: CreditAccountData;
+    swapOperation: SwapOperation;
+    tokenIn: Address;
+    tokenOut: Address;
     amount: bigint;
-    calls: Array<MultiCall>;
-    gasUsage: bigint;
+    leftoverAmount: bigint;
+    slippage: number;
+}
+interface FindOneTokenPathProps {
+    creditAccount: CreditAccountData;
+    creditManager: CreditManagerData;
+    tokenIn: Address;
+    tokenOut: Address;
+    amount: bigint;
+    slippage: number;
+}
+interface FindBestClosePathProps {
+    creditAccount: CreditAccountData;
+    creditManager: CreditManagerData;
+    expectedBalances: Record<Address, Asset>;
+    leftoverBalances: Record<Address, Asset>;
+    slippage: number;
+    network: NetworkType;
+}
+interface FindOpenStrategyPathProps {
+    creditManager: CreditManagerData;
+    expectedBalances: Record<Address, Asset>;
+    leftoverBalances: Record<Address, Asset>;
+    target: Address;
+    slippage: number;
 }
 export declare class PathFinder {
-    pathFinder: IRouter;
+    pathFinder: GetContractReturnType<typeof iRouterV3Abi, PublicClient>;
     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>;
+    protected readonly _client: PublicClient;
+    protected readonly _connectors: Array<Address>;
+    constructor(address: Address, provider: PublicClient, network?: NetworkType);
+    findAllSwaps({ creditAccount, swapOperation, tokenIn, tokenOut, amount, leftoverAmount, slippage, }: FindAllSwapsProps): Promise<Array<PathFinderResult>>;
+    findOneTokenPath(props: FindOneTokenPathProps): Promise<PathFinderResult>;
+    overridePTRedeem({ creditAccount, creditManager, tokenIn, tokenOut, amount, slippage, }: FindOneTokenPathProps): Promise<{
+        result: {
+            amount: bigint;
+            minAmount: bigint;
+            calls: {
+                target: `0x${string}`;
+                callData: `0x${string}`;
+            }[];
+        };
+    }>;
     /**
-     * @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: targetUntyped, 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;
-    getAvailableConnectors(availableList: Record<string, bigint> | Record<string, true>): string[];
-    static getAvailableConnectors(availableList: Record<string, bigint> | Record<string, true>, connectors: string[]): string[];
+    findBestClosePath({ creditAccount, creditManager: cm, expectedBalances, leftoverBalances, slippage, network, }: FindBestClosePathProps): Promise<PathFinderCloseResult>;
+    static compare(r1: PathFinderResult, r2: PathFinderResult): PathFinderResult;
+    getAvailableConnectors(availableList: Record<Address, bigint> | Record<Address, true>): `0x${string}`[];
+    static getAvailableConnectors(availableList: Record<Address, bigint> | Record<Address, true>, connectors: Address[]): `0x${string}`[];
 }
+export {};

package/lib/pathfinder/pathfinder.js

@@ -2,151 +2,236 @@
 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 viem_1 = require("viem");
 const types_1 = require("../types");
 const pathOptions_1 = require("./pathOptions");
-const MAX_GAS_PER_ROUTE = 200e6;
-const GAS_PER_BLOCK = 400e6;
+const MAX_GAS_PER_ROUTE = 200000000n;
+const GAS_PER_BLOCK = 400000000n;
+const PT_IN = {
+    ["0xEe9085fC268F6727d5D4293dBABccF901ffDCC29".toLowerCase()]: "PT_sUSDe_26DEC2024",
+    ["0xE00bd3Df25fb187d6ABBB620b3dfd19839947b81".toLowerCase()]: "PT_sUSDe_27MAR20251",
+    ["0xE00bd3Df25fb187d6ABBB620b3dfd19839947b81".toLowerCase()]: "PT_sUSDe_29MAY2025",
+};
+const OUT = {
+    ["0x9D39A5DE30e57443BfF2A8307A4256c8797A3497".toLowerCase()]: "sUSDe",
+};
 class PathFinder {
     pathFinder;
     network;
-    static connectors = [
-        "USDC",
-        "WETH",
-        "DAI",
-        "FRAX",
-    ];
+    _client;
     _connectors;
-    constructor(address, provider, network = "Mainnet", connectors = PathFinder.connectors) {
-        this.pathFinder = types_1.IRouter__factory.connect(address, provider);
+    constructor(address, provider, network = "Mainnet") {
+        this.pathFinder = (0, viem_1.getContract)({
+            address,
+            abi: types_1.iRouterV3Abi,
+            client: provider,
+        });
         this.network = network;
-        this._connectors = connectors
-            .map(c => sdk_gov_1.tokenDataByNetwork[this.network][c]?.toLowerCase())
-            .filter(t => !!t);
+        this._connectors = (0, sdk_gov_1.getConnectors)(network);
+        this._client = provider;
     }
-    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, {
-            gasLimit: GAS_PER_BLOCK,
+        const { result: results } = await this.pathFinder.simulate.findAllSwaps([swapTask, BigInt(slippage)], {
+            gas: GAS_PER_BLOCK,
         });
         const unique = {};
         results.forEach(r => {
-            const key = `${r.amount.toHexString()}${r.calls
+            const key = `${r.minAmount.toString()}${r.calls
                 .map(c => `${c.target.toLowerCase()}${c.callData}`)
                 .join("-")}`;
             unique[key] = {
-                amount: (0, sdk_gov_1.toBigInt)(r.amount),
+                amount: r.amount,
+                minAmount: r.minAmount,
                 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(props) {
+        const { creditAccount, tokenIn, tokenOut, amount, slippage } = props;
         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,
-        });
+        const isPTOverrideRedeem = PT_IN[tokenIn.toLowerCase()] && OUT[tokenOut.toLowerCase()];
+        const { result } = await (isPTOverrideRedeem
+            ? this.overridePTRedeem(props)
+            : this.pathFinder.simulate.findOneTokenPath([
+                tokenIn,
+                amount,
+                tokenOut,
+                creditAccount.addr,
+                connectors,
+                BigInt(slippage),
+            ], {
+                gas: GAS_PER_BLOCK,
+            }));
         return {
-            amount: (0, sdk_gov_1.toBigInt)(result.amount),
+            amount: result.amount,
+            minAmount: result.minAmount,
             calls: result.calls,
         };
     }
+    async overridePTRedeem({ creditAccount, creditManager, tokenIn, tokenOut, amount, slippage, }) {
+        const pendleSwapperAddress = await this.pathFinder.read.componentAddressById([37]);
+        const adapterAddress = creditManager.adapters[sdk_gov_1.contractsByNetwork[this.network].PENDLE_ROUTER.toLowerCase()];
+        const pendleSwapper = (0, viem_1.getContract)({
+            address: pendleSwapperAddress,
+            abi: types_1.pendleSwapperAbi,
+            client: this._client,
+        });
+        const result = await pendleSwapper.simulate.getBestDirectPairSwap([
+            {
+                swapOperation: 1,
+                creditAccount: creditAccount.addr,
+                tokenIn: tokenIn,
+                tokenOut: tokenOut,
+                connectors: [],
+                amount,
+                leftoverAmount: 0n,
+            },
+            adapterAddress,
+        ]);
+        const minAmount = (result.result.amount * (sdk_gov_1.PERCENTAGE_FACTOR - BigInt(slippage))) /
+            sdk_gov_1.PERCENTAGE_FACTOR;
+        const storeExpectedBalances = {
+            target: creditManager.creditFacade,
+            callData: (0, viem_1.encodeFunctionData)({
+                abi: types_1.iCreditFacadeV3MulticallAbi,
+                functionName: "storeExpectedBalances",
+                args: [[{ token: tokenOut, amount: minAmount }]],
+            }),
+        };
+        const compareBalances = {
+            target: creditManager.creditFacade,
+            callData: (0, viem_1.encodeFunctionData)({
+                abi: types_1.iCreditFacadeV3MulticallAbi,
+                functionName: "compareBalances",
+                args: [],
+            }),
+        };
+        return {
+            result: {
+                amount: result.result.amount,
+                minAmount,
+                calls: [
+                    storeExpectedBalances,
+                    result.result.multiCall,
+                    compareBalances,
+                ],
+            },
+        };
+    }
     /**
-     * @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: targetUntyped, slippage, }) {
+        const target = targetUntyped;
+        const input = cm.collateralTokens.map(token => ({
+            token,
+            balance: expectedBalances[token]?.balance || 0n,
+        }));
+        const leftover = cm.collateralTokens.map(token => ({
             token,
-            balance: expectedBalancesAddr[token] || 0,
+            balance: leftoverBalances[token]?.balance || 1n,
         }));
         const connectors = this.getAvailableConnectors(cm.supportedTokens);
-        const result = await this.pathFinder.callStatic.findOpenStrategyPath(cm.address, balances, targetAddr, connectors, slippage, {
-            gasLimit: GAS_PER_BLOCK,
+        const { result: [outBalances, result], } = await this.pathFinder.simulate.findOpenStrategyPath([cm.address, input, leftover, target, connectors, BigInt(slippage)], {
+            gas: GAS_PER_BLOCK,
         });
-        const balancesAfter = result[0].reduce((acc, b) => {
-            acc[b.token.toLowerCase()] = (0, sdk_gov_1.toBigInt)(b.balance);
+        const balancesAfter = outBalances.reduce((acc, b) => {
+            acc[b.token.toLowerCase()] = b.balance;
             return acc;
         }, {});
         return {
-            balances: balancesAfter,
-            calls: result[1].calls,
+            balances: {
+                ...balancesAfter,
+                [target]: (expectedBalances[target]?.balance || 0n) + result.amount,
+            },
+            minBalances: {
+                ...balancesAfter,
+                [target]: (expectedBalances[target]?.balance || 0n) + result.minAmount,
+            },
+            calls: result.calls,
+            minAmount: result.minAmount,
+            amount: result.amount,
         };
     }
     /**
      * @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) {
-        const loopsPerTx = Math.floor(GAS_PER_BLOCK / MAX_GAS_PER_ROUTE);
-        const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, loopsPerTx);
+    async findBestClosePath({ creditAccount, creditManager: cm, expectedBalances, leftoverBalances, slippage, network, }) {
+        const loopsPerTx = GAS_PER_BLOCK / MAX_GAS_PER_ROUTE;
+        const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, Number(loopsPerTx), network);
+        const expected = cm.collateralTokens.map(token => {
+            // When we pass expected balances explicitly, we need to mimic router behaviour by filtering out leftover tokens
+            // for example, we can have stETH balance of 2, because 1 transforms to 2 because of rebasing
+            // https://github.com/Gearbox-protocol/router-v3/blob/c230a3aa568bb432e50463cfddc877fec8940cf5/contracts/RouterV3.sol#L222
+            const actual = expectedBalances[token]?.balance || 0n;
+            return {
+                token,
+                balance: actual > 10n ? actual : 0n,
+            };
+        });
+        const leftover = cm.collateralTokens.map(token => ({
+            token,
+            balance: leftoverBalances[token]?.balance || 1n,
+        }));
         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]) => PathFinder.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)), {
+        const results = await Promise.all(pathOptions.map(po => this.pathFinder.simulate.findBestClosePath([
+            creditAccount.addr,
+            expected,
+            leftover,
+            connectors,
+            BigInt(slippage),
+            po,
+            loopsPerTx,
+            false,
+        ], {
+            gas: GAS_PER_BLOCK,
+        })));
+        const bestResult = results.reduce((best, pathFinderResult) => PathFinder.compare(best, {
+            calls: pathFinderResult.result.calls,
+            amount: pathFinderResult.result.amount,
+            minAmount: pathFinderResult.result.minAmount,
+        }), {
             amount: 0n,
-            gasUsage: 0n,
+            minAmount: 0n,
             calls: [],
         });
         return {
-            underlyingBalance: bestResult.amount +
-                creditAccount.allBalances[creditAccount.underlyingToken.toLowerCase()]
-                    .balance,
-            calls: bestResult.calls,
+            ...bestResult,
+            underlyingBalance: bestResult.minAmount +
+                creditAccount.allBalances[creditAccount.underlyingToken.toLowerCase()].balance,
         };
     }
-    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;
+    static compare(r1, r2) {
+        return r1.amount > r2.amount ? r1 : r2;
     }
     getAvailableConnectors(availableList) {
-        return PathFinder.getAvailableConnectors(availableList, this._connectors);
+        const connectors = PathFinder.getAvailableConnectors(availableList, this._connectors);
+        return connectors;
     }
     static getAvailableConnectors(availableList, connectors) {
         return connectors.filter(t => availableList[t] !== undefined);

package/lib/pathfinder/pathfinder.spec.js

@@ -2,38 +2,51 @@
 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 viem_1 = require("viem");
 const pathfinder_1 = require("./pathfinder");
 describe("PathFinder test", () => {
     it("compare works correctly", () => {
         const r1 = {
-            amount: 2000n,
-            gasUsage: 1000n,
+            minAmount: 2000n,
+            amount: 20000n,
             calls: [],
         };
         const r2 = {
-            amount: 3000n,
-            gasUsage: 2000n,
+            minAmount: 3000n,
+            amount: 30000n,
             calls: [],
         };
-        let result = pathfinder_1.PathFinder.compare(r1, r2, sdk_gov_1.RAY);
+        let result = pathfinder_1.PathFinder.compare(r1, r2);
         (0, chai_1.expect)(result).to.be.eql(r2);
-        result = pathfinder_1.PathFinder.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 pathfinder_1.PathFinder("", new ethers_1.providers.JsonRpcProvider(), "Mainnet");
+        const pf = new pathfinder_1.PathFinder("", (0, viem_1.createPublicClient)({ transport: (0, viem_1.http)("https://mainnet.infura.io/v3/") }), "Mainnet");
         const allowedTokens = {
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC.toLowerCase()]: true,
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: true,
             [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: true,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC.toLowerCase()]: true,
             [sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX.toLowerCase()]: true,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.rETH.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(),
+            sdk_gov_1.tokenDataByNetwork.Mainnet.USDC.toLowerCase(),
             sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX.toLowerCase(),
+            sdk_gov_1.tokenDataByNetwork.Mainnet.rETH.toLowerCase(),
+        ]);
+    });
+    it("has all expected connectors, when gew are disabled", () => {
+        const pf = new pathfinder_1.PathFinder("", (0, viem_1.createPublicClient)({ transport: (0, viem_1.http)("https://mainnet.infura.io/v3/") }), "Mainnet");
+        const allowedTokens = {
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: true,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: true,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.rETH.toLowerCase()]: true,
+        };
+        (0, chai_1.expect)(pf.getAvailableConnectors(allowedTokens)).to.be.deep.equal([
+            sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
+            sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
+            sdk_gov_1.tokenDataByNetwork.Mainnet.rETH.toLowerCase(),
         ]);
     });
 });