@gearbox-protocol/sdk 3.0.0-next.20 → 3.0.0-next.201

package/lib/pathfinder/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./core"), exports);
+__exportStar(require("./pathfinder"), exports);
+__exportStar(require("./pathOptions"), exports);
+__exportStar(require("./utils"), exports);

package/lib/pathfinder/pathOptions.d.ts

@@ -1,4 +1,4 @@
-import { CurveLPToken, NetworkType } from "@gearbox-protocol/sdk-gov";
+import { BalancerLPToken, CurveLPToken, NetworkType } from "@gearbox-protocol/sdk-gov";
 import { CaTokenBalance } from "../payload/creditAccount";
 export interface PathOption {
     target: string;
@@ -8,8 +8,8 @@ export interface PathOption {
 export type PathOptionSerie = Array<PathOption>;
 export type BalanceInterface = Pick<CaTokenBalance, "balance">;
 export declare class PathOptionFactory {
-    static generatePathOptions(balances: Record<string, BalanceInterface>, loopsInTx: number): Array<PathOptionSerie>;
+    static generatePathOptions(balances: Record<string, BalanceInterface>, loopsInTx: number, network: NetworkType): Array<PathOptionSerie>;
     static getCurvePools(balances: Record<string, BalanceInterface>): Array<CurveLPToken>;
+    static getBalancerPools(balances: Record<string, BalanceInterface>): Array<BalancerLPToken>;
     static next(path: PathOptionSerie): PathOptionSerie;
-    static detectNetwork(underlying: string): NetworkType;
 }

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,9 +61,9 @@ 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 },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet["50OHM_50DAI"]]: { 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"],
@@ -76,7 +76,7 @@ describe("PathOptionFactory test", () => {
                 totalOptions: 2,
             },
             {
-                target: sdk_gov_1.tokenDataByNetwork.Mainnet.LUSD3CRV,
+                target: sdk_gov_1.tokenDataByNetwork.Mainnet["50OHM_50DAI"],
                 option: 0,
                 totalOptions: 2,
             },
@@ -135,7 +135,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,73 @@
-import { NetworkType, SupportedToken } from "@gearbox-protocol/sdk-gov";
-import { BigNumberish, providers, Signer } from "ethers";
+import { NetworkType } from "@gearbox-protocol/sdk-gov";
+import { Provider, 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;
+    network: NetworkType;
+}
+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>;
+    constructor(address: string, provider: Signer | Provider, network?: NetworkType);
+    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, network, }: FindBestClosePathProps): Promise<PathFinderCloseResult>;
+    static compare(r1: PathFinderResult, r2: PathFinderResult): 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;
@@ -10,143 +9,155 @@ const GAS_PER_BLOCK = 400e6;
 class PathFinder {
     pathFinder;
     network;
-    static connectors = [
-        "USDC",
-        "WETH",
-        "DAI",
-        "FRAX",
-    ];
     _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 = 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);
+        this._connectors = (0, sdk_gov_1.getConnectors)(network);
     }
-    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.findAllSwaps.staticCall(swapTask, slippage, {
             gasLimit: 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({ 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.findOneTokenPath.staticCall(tokenIn, amount, tokenOut, creditAccount.addr, connectors, slippage, {
             gasLimit: GAS_PER_BLOCK,
         });
         return {
-            amount: (0, sdk_gov_1.toBigInt)(result.amount),
+            amount: result.amount,
+            minAmount: result.minAmount,
             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.findOpenStrategyPath.staticCall(cm.address, input, leftover, target, connectors, slippage, {
             gasLimit: 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) {
+    async findBestClosePath({ creditAccount, creditManager: cm, expectedBalances, leftoverBalances, slippage, noConcurrency = false, network, }) {
         const loopsPerTx = Math.floor(GAS_PER_BLOCK / MAX_GAS_PER_ROUTE);
-        const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, loopsPerTx);
+        const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, 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) {
+        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.findBestClosePath.staticCall(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.findBestClosePath.staticCall(creditAccount.addr, expected, leftover, connectors, slippage, po, loopsPerTx, false, {
                 gasLimit: GAS_PER_BLOCK,
             }));
             results = await Promise.all(requests);
         }
-        const bestResult = results.reduce((best, [pathFinderResult, gasPriceRAY]) => PathFinder.compare(best, {
+        const bestResult = results.reduce((best, pathFinderResult) => 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)), {
+            amount: pathFinderResult.amount,
+            minAmount: pathFinderResult.minAmount,
+        }), {
             amount: 0n,
-            gasUsage: 0n,
+            minAmount: 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;
-        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

@@ -7,33 +7,46 @@ 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("", new ethers_1.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.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("", new ethers_1.JsonRpcProvider(), "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(),
         ]);
     });
 });

package/lib/pathfinder/utils.d.ts

@@ -0,0 +1,35 @@
+import { Interface, Provider } from "ethers";
+import { MultiCall } from "./core";
+export interface FeeInfo {
+    type: KnownFeeTypes;
+    value: bigint;
+}
+type KnownFeeTypes = "curve" | "lido" | "uniswap_v2" | "uniswap_v3" | "balancer";
+export declare const BALANCER_VAULT_ABI: {
+    inputs: never[];
+    name: string;
+    outputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    stateMutability: string;
+    type: string;
+}[];
+export declare const BALANCER_VAULT_INTERFACE: Interface;
+interface FindPathFeesProps {
+    calls: Array<MultiCall>;
+    provider: Provider;
+    contractsByAdapter: Record<string, string>;
+}
+export declare class PathFinderUtils {
+    static findPathFees({ calls, provider, contractsByAdapter, }: FindPathFeesProps): Promise<FeeInfo[]>;
+    private static getUniswapV2Fee;
+    private static getUniswapV3Fee;
+    private static getCurveFeeCall;
+    private static getCurveFee;
+    private static getBalancerFeeCall;
+    private static getBalancerFee;
+    private static getLidoFee;
+}
+export {};