@gearbox-protocol/sdk 3.0.0-vfour.86 → 3.0.0-vfour.88

package/dist/cjs/sdk/index.cjs

@@ -22418,11 +22418,11 @@ var CreditAccountsService = class extends SDKConstruct {
    */
   async fullyLiquidate(account, to, slippage = 50n) {
     const cm = this.sdk.marketRegister.findCreditManager(account.creditManager);
-    const routerCloseResult = await this.sdk.router.findBestClosePath(
-      account,
-      cm.creditManager,
+    const routerCloseResult = await this.sdk.router.findBestClosePath({
+      creditAccount: account,
+      creditManager: cm.creditManager,
       slippage
-    );
+    });
     const priceUpdates = await this.getPriceUpdatesForFacade(account);
     const tx = cm.creditFacade.liquidateCreditAccount(
       account.creditAccount,
@@ -22434,39 +22434,104 @@ var CreditAccountsService = class extends SDKConstruct {
   /**
    * Closes credit account or sets debt to zero (but keep account)
    * @param operation
-   * @param ca
+   * @param creditAccount
    * @param assetsToWithdraw Tokens to withdraw from credit account
    * @param to Address to withdraw underlying to
    * @param slippage
+   * @param closePath
    * @returns
    */
-  async closeCreditAccount(props) {
-    const cm = this.sdk.marketRegister.findCreditManager(
-      props.ca.creditManager
-    );
-    const { calls, routerCloseResult } = await this.#prepareCloseCreditAccount({
-      ...props,
-      cm
+  async closeCreditAccount({
+    operation,
+    assetsToWithdraw,
+    creditAccount: ca,
+    to,
+    slippage = 50n,
+    closePath
+  }) {
+    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    const routerCloseResult = closePath || await this.sdk.router.findBestClosePath({
+      creditAccount: ca,
+      creditManager: cm.creditManager,
+      slippage
     });
-    const tx = props.operation === "close" ? cm.creditFacade.closeCreditAccount(props.ca.creditAccount, calls) : cm.creditFacade.multicall(props.ca.creditAccount, calls);
+    const calls = [
+      ...routerCloseResult.calls,
+      ...this.#prepareDisableQuotas(ca),
+      ...this.#prepareDecreaseDebt(ca),
+      ...this.#prepareDisableTokens(ca),
+      ...assetsToWithdraw.map(
+        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
+      )
+    ];
+    const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
     return { tx, calls, routerCloseResult };
   }
   /**
    * Repays credit account or sets debt to zero (but keep account)
    * @param operation
-   * @param ca
+   * @param creditAccount
    * @param assetsToWithdraw Tokens to withdraw from credit account
    * @param collateralAssets Tokens to pay for
    * @param to Address to withdraw underlying to
    * @param slippage
+   * @param permits
    * @returns
    */
-  async repayCreditAccount(props) {
-    const cm = this.sdk.marketRegister.findCreditManager(
-      props.ca.creditManager
+  async repayCreditAccount({
+    operation,
+    collateralAssets,
+    assetsToWithdraw,
+    creditAccount: ca,
+    permits,
+    to
+  }) {
+    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    const addCollateral = collateralAssets.filter((a) => a.balance > 0);
+    const calls = [
+      ...this.#prepareAddCollateralCalls(addCollateral, ca, permits),
+      ...this.#prepareDisableQuotas(ca),
+      ...this.#prepareDecreaseDebt(ca),
+      ...this.#prepareDisableTokens(ca),
+      // TODO: probably needs a way to handle reward tokens
+      ...assetsToWithdraw.map(
+        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
+      )
+    ];
+    const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
+    return { tx, calls };
+  }
+  /**
+   * Repays liquidatable credit account
+   * @param creditAccount
+   * @param assetsToWithdraw Tokens to withdraw from credit account
+   * @param collateralAssets Tokens to pay for
+   * @param to Address to withdraw underlying to
+   * @param slippage
+   * @returns
+   */
+  async repayAndLiquidateCreditAccount({
+    collateralAssets,
+    assetsToWithdraw,
+    creditAccount: ca,
+    permits,
+    to
+  }) {
+    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    const priceUpdates = await this.getPriceUpdatesForFacade(ca);
+    const addCollateral = collateralAssets.filter((a) => a.balance > 0);
+    const calls = [
+      ...priceUpdates,
+      ...this.#prepareAddCollateralCalls(addCollateral, ca, permits),
+      ...assetsToWithdraw.map(
+        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
+      )
+    ];
+    const tx = cm.creditFacade.liquidateCreditAccount(
+      ca.creditAccount,
+      to,
+      calls
     );
-    const { calls } = await this.#prepareRepayCreditAccount(props);
-    const tx = props.operation === "close" ? cm.creditFacade.closeCreditAccount(props.ca.creditAccount, calls) : cm.creditFacade.multicall(props.ca.creditAccount, calls);
     return { tx, calls };
   }
   /**
@@ -22557,45 +22622,6 @@ var CreditAccountsService = class extends SDKConstruct {
     const updates = await this.getOnDemandPriceUpdates(acc);
     return cm.creditFacade.encodeOnDemandPriceUpdates(updates);
   }
-  async #prepareCloseCreditAccount({
-    ca,
-    cm,
-    assetsToWithdraw,
-    to,
-    slippage = 50n,
-    closePath
-  }) {
-    const routerCloseResult = closePath || await this.sdk.router.findBestClosePath(ca, cm.creditManager, slippage);
-    const calls = [
-      ...routerCloseResult.calls,
-      ...this.#prepareDisableQuotas(ca),
-      ...this.#prepareDecreaseDebt(ca),
-      ...this.#prepareDisableTokens(ca),
-      ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
-      )
-    ];
-    return { calls, routerCloseResult };
-  }
-  async #prepareRepayCreditAccount({
-    ca,
-    assetsToWithdraw,
-    to,
-    collateralAssets,
-    permits
-  }) {
-    const addCollateral = collateralAssets.filter((a) => a.balance > 0);
-    const calls = [
-      ...this.#prepareAddCollateralCalls(addCollateral, ca, permits),
-      ...this.#prepareDisableQuotas(ca),
-      ...this.#prepareDecreaseDebt(ca),
-      ...this.#prepareDisableTokens(ca),
-      ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
-      )
-    ];
-    return { calls };
-  }
   #prepareDisableQuotas(ca) {
     const calls = [];
     for (const { token, quota } of ca.tokens) {
@@ -23001,7 +23027,16 @@ var RouterV3Contract = class extends BaseContract {
    * @param slippage
    * @returns
    */
-  async findAllSwaps(ca, cm, swapOperation, tokenIn, tokenOut, amount, leftoverAmount, slippage) {
+  async findAllSwaps({
+    creditAccount: ca,
+    creditManager: cm,
+    swapOperation,
+    tokenIn,
+    tokenOut,
+    amount,
+    leftoverAmount,
+    slippage
+  }) {
     const connectors = this.getAvailableConnectors(cm.collateralTokens);
     const swapTask = {
       swapOperation: SWAP_OPERATIONS[swapOperation],
@@ -23031,15 +23066,22 @@ var RouterV3Contract = class extends BaseContract {
   }
   /**
    * Finds best path to swap all Normal tokens and tokens "on the way" to target one and vice versa
-   * @param ca
-   * @param cm
+   * @param creditAccount
+   * @param creditManager
    * @param tokenIn
    * @param tokenOut
    * @param amount
    * @param slippage
    * @returns
    */
-  async findOneTokenPath(ca, cm, tokenIn, tokenOut, amount, slippage) {
+  async findOneTokenPath({
+    creditAccount: ca,
+    creditManager: cm,
+    tokenIn,
+    tokenOut,
+    amount,
+    slippage
+  }) {
     const connectors = this.getAvailableConnectors(cm.collateralTokens);
     const { result } = await this.contract.simulate.findOneTokenPath(
       [
@@ -23062,7 +23104,7 @@ var RouterV3Contract = class extends BaseContract {
   }
   /**
    * @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 creditManager 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) }
@@ -23071,7 +23113,13 @@ var RouterV3Contract = class extends BaseContract {
    * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
    * @returns PathFinderOpenStrategyResult which
    */
-  async findOpenStrategyPath(cm, expectedBalances, leftoverBalances, target, slippage) {
+  async findOpenStrategyPath({
+    creditManager: cm,
+    expectedBalances,
+    leftoverBalances,
+    target,
+    slippage
+  }) {
     const [expectedMap, leftoverMap] = [
       balancesMap(expectedBalances),
       balancesMap(leftoverBalances)
@@ -23113,14 +23161,19 @@ var RouterV3Contract = class extends BaseContract {
   /**
    * @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 ca CreditAccountStruct object used for close path computation
-   * @param cm CreditManagerSlice for corresponding credit manager
+   * @param creditAccount CreditAccountStruct object used for close path computation
+   * @param creditManager CreditManagerSlice for corresponding credit manager
    * @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(ca, cm, slippage, balances) {
+  async findBestClosePath({
+    creditAccount: ca,
+    creditManager: cm,
+    slippage,
+    balances
+  }) {
     const { pathOptions, expected, leftover, connectors } = this.getFindClosePathInput(
       ca,
       cm,

package/dist/cjs/sdk/index.d.ts

@@ -24891,7 +24891,7 @@ interface PathOption {
 }
 type PathOptionSerie = PathOption[];
 interface SwapTask {
-    swapOperation: bigint;
+    swapOperation: number;
     creditAccount: Address;
     tokenIn: Address;
     tokenOut: Address;
@@ -24921,6 +24921,37 @@ interface Asset {
 }
 
 type abi = typeof routerV3Abi;
+interface FindAllSwapsProps {
+    creditAccount: CreditAccountDataSlice;
+    creditManager: CreditManagerSlice;
+    swapOperation: SwapOperation;
+    tokenIn: Address;
+    tokenOut: Address;
+    amount: bigint;
+    leftoverAmount: bigint;
+    slippage: number | bigint;
+}
+interface FindOneTokenPathProps {
+    creditAccount: CreditAccountDataSlice;
+    creditManager: CreditManagerSlice;
+    tokenIn: Address;
+    tokenOut: Address;
+    amount: bigint;
+    slippage: number | bigint;
+}
+interface FindOpenStrategyPathProps {
+    creditManager: CreditManagerSlice;
+    expectedBalances: Asset[];
+    leftoverBalances: Asset[];
+    target: Address;
+    slippage: number | bigint;
+}
+interface FindBestClosePathProps {
+    creditAccount: CreditAccountDataSlice;
+    creditManager: CreditManagerSlice;
+    slippage: bigint | number;
+    balances?: ClosePathBalances;
+}
 interface FindClosePathInput {
     pathOptions: PathOptionSerie[];
     expected: Asset[];
@@ -24964,21 +24995,21 @@ declare class RouterV3Contract extends BaseContract<abi> implements IHooks<Route
      * @param slippage
      * @returns
      */
-    findAllSwaps(ca: CreditAccountDataSlice, cm: CreditManagerSlice, swapOperation: SwapOperation, tokenIn: Address, tokenOut: Address, amount: bigint, leftoverAmount: bigint, slippage: number | bigint): Promise<RouterResult[]>;
+    findAllSwaps({ creditAccount: ca, creditManager: cm, swapOperation, tokenIn, tokenOut, amount, leftoverAmount, slippage, }: FindAllSwapsProps): Promise<RouterResult[]>;
     /**
      * Finds best path to swap all Normal tokens and tokens "on the way" to target one and vice versa
-     * @param ca
-     * @param cm
+     * @param creditAccount
+     * @param creditManager
      * @param tokenIn
      * @param tokenOut
      * @param amount
      * @param slippage
      * @returns
      */
-    findOneTokenPath(ca: CreditAccountDataSlice, cm: CreditManagerSlice, tokenIn: Address, tokenOut: Address, amount: bigint, slippage: number | bigint): Promise<RouterResult>;
+    findOneTokenPath({ creditAccount: ca, creditManager: cm, tokenIn, tokenOut, amount, slippage, }: FindOneTokenPathProps): Promise<RouterResult>;
     /**
      * @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 creditManager 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) }
@@ -24987,18 +25018,18 @@ declare class RouterV3Contract extends BaseContract<abi> implements IHooks<Route
      * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
      * @returns PathFinderOpenStrategyResult which
      */
-    findOpenStrategyPath(cm: CreditManagerSlice, expectedBalances: Asset[], leftoverBalances: Asset[], target: Address, slippage: number | bigint): Promise<OpenStrategyResult>;
+    findOpenStrategyPath({ creditManager: cm, expectedBalances, leftoverBalances, target, slippage, }: FindOpenStrategyPathProps): Promise<OpenStrategyResult>;
     /**
      * @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 ca CreditAccountStruct object used for close path computation
-     * @param cm CreditManagerSlice for corresponding credit manager
+     * @param creditAccount CreditAccountStruct object used for close path computation
+     * @param creditManager CreditManagerSlice for corresponding credit manager
      * @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(ca: CreditAccountDataSlice, cm: CreditManagerSlice, slippage: bigint | number, balances?: ClosePathBalances): Promise<RouterCloseResult>;
+    findBestClosePath({ creditAccount: ca, creditManager: cm, slippage, balances, }: FindBestClosePathProps): Promise<RouterCloseResult>;
     /**
      * Finds input to be used with findBestClosePath
      * @param ca
@@ -25192,24 +25223,21 @@ interface RepayCreditAccountResult {
     calls: Array<MultiCall>;
 }
 type CloseOptions = "close" | "zeroDebt";
-interface CloseCreditAccountProps extends Omit<PrepareCloseCreditAccountProps, "cm"> {
+interface CloseCreditAccountProps {
     operation: CloseOptions;
-}
-interface PrepareCloseCreditAccountProps {
-    cm: CreditFactory;
-    ca: CreditAccountDataSlice;
+    creditAccount: CreditAccountDataSlice;
     assetsToWithdraw: Address[];
     to: Address;
     slippage?: bigint;
     closePath?: RouterCloseResult;
 }
-interface RepayCreditAccountProps extends PrepareRepayCreditAccountProps {
+interface RepayCreditAccountProps extends RepayAndLiquidateCreditAccountProps {
     operation: CloseOptions;
 }
-interface PrepareRepayCreditAccountProps {
+interface RepayAndLiquidateCreditAccountProps {
     collateralAssets: Asset[];
     assetsToWithdraw: Address[];
-    ca: CreditAccountDataSlice;
+    creditAccount: CreditAccountDataSlice;
     to: Address;
     permits: Record<string, PermitResult>;
 }
@@ -25258,24 +25286,36 @@ declare class CreditAccountsService extends SDKConstruct {
     /**
      * Closes credit account or sets debt to zero (but keep account)
      * @param operation
-     * @param ca
+     * @param creditAccount
      * @param assetsToWithdraw Tokens to withdraw from credit account
      * @param to Address to withdraw underlying to
      * @param slippage
+     * @param closePath
      * @returns
      */
-    closeCreditAccount(props: CloseCreditAccountProps): Promise<CloseCreditAccountResult>;
+    closeCreditAccount({ operation, assetsToWithdraw, creditAccount: ca, to, slippage, closePath, }: CloseCreditAccountProps): Promise<CloseCreditAccountResult>;
     /**
      * Repays credit account or sets debt to zero (but keep account)
      * @param operation
-     * @param ca
+     * @param creditAccount
+     * @param assetsToWithdraw Tokens to withdraw from credit account
+     * @param collateralAssets Tokens to pay for
+     * @param to Address to withdraw underlying to
+     * @param slippage
+     * @param permits
+     * @returns
+     */
+    repayCreditAccount({ operation, collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, }: RepayCreditAccountProps): Promise<RepayCreditAccountResult>;
+    /**
+     * Repays liquidatable credit account
+     * @param creditAccount
      * @param assetsToWithdraw Tokens to withdraw from credit account
      * @param collateralAssets Tokens to pay for
      * @param to Address to withdraw underlying to
      * @param slippage
      * @returns
      */
-    repayCreditAccount(props: RepayCreditAccountProps): Promise<RepayCreditAccountResult>;
+    repayAndLiquidateCreditAccount({ collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, }: RepayAndLiquidateCreditAccountProps): Promise<RepayCreditAccountResult>;
     /**
      * Returns raw txs that are needed to update all price feeds so that all credit accounts (possibly from different markets) compute
      * @param accounts

package/dist/esm/sdk/index.d.mts

@@ -24891,7 +24891,7 @@ interface PathOption {
 }
 type PathOptionSerie = PathOption[];
 interface SwapTask {
-    swapOperation: bigint;
+    swapOperation: number;
     creditAccount: Address;
     tokenIn: Address;
     tokenOut: Address;
@@ -24921,6 +24921,37 @@ interface Asset {
 }
 
 type abi = typeof routerV3Abi;
+interface FindAllSwapsProps {
+    creditAccount: CreditAccountDataSlice;
+    creditManager: CreditManagerSlice;
+    swapOperation: SwapOperation;
+    tokenIn: Address;
+    tokenOut: Address;
+    amount: bigint;
+    leftoverAmount: bigint;
+    slippage: number | bigint;
+}
+interface FindOneTokenPathProps {
+    creditAccount: CreditAccountDataSlice;
+    creditManager: CreditManagerSlice;
+    tokenIn: Address;
+    tokenOut: Address;
+    amount: bigint;
+    slippage: number | bigint;
+}
+interface FindOpenStrategyPathProps {
+    creditManager: CreditManagerSlice;
+    expectedBalances: Asset[];
+    leftoverBalances: Asset[];
+    target: Address;
+    slippage: number | bigint;
+}
+interface FindBestClosePathProps {
+    creditAccount: CreditAccountDataSlice;
+    creditManager: CreditManagerSlice;
+    slippage: bigint | number;
+    balances?: ClosePathBalances;
+}
 interface FindClosePathInput {
     pathOptions: PathOptionSerie[];
     expected: Asset[];
@@ -24964,21 +24995,21 @@ declare class RouterV3Contract extends BaseContract<abi> implements IHooks<Route
      * @param slippage
      * @returns
      */
-    findAllSwaps(ca: CreditAccountDataSlice, cm: CreditManagerSlice, swapOperation: SwapOperation, tokenIn: Address, tokenOut: Address, amount: bigint, leftoverAmount: bigint, slippage: number | bigint): Promise<RouterResult[]>;
+    findAllSwaps({ creditAccount: ca, creditManager: cm, swapOperation, tokenIn, tokenOut, amount, leftoverAmount, slippage, }: FindAllSwapsProps): Promise<RouterResult[]>;
     /**
      * Finds best path to swap all Normal tokens and tokens "on the way" to target one and vice versa
-     * @param ca
-     * @param cm
+     * @param creditAccount
+     * @param creditManager
      * @param tokenIn
      * @param tokenOut
      * @param amount
      * @param slippage
      * @returns
      */
-    findOneTokenPath(ca: CreditAccountDataSlice, cm: CreditManagerSlice, tokenIn: Address, tokenOut: Address, amount: bigint, slippage: number | bigint): Promise<RouterResult>;
+    findOneTokenPath({ creditAccount: ca, creditManager: cm, tokenIn, tokenOut, amount, slippage, }: FindOneTokenPathProps): Promise<RouterResult>;
     /**
      * @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 creditManager 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) }
@@ -24987,18 +25018,18 @@ declare class RouterV3Contract extends BaseContract<abi> implements IHooks<Route
      * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
      * @returns PathFinderOpenStrategyResult which
      */
-    findOpenStrategyPath(cm: CreditManagerSlice, expectedBalances: Asset[], leftoverBalances: Asset[], target: Address, slippage: number | bigint): Promise<OpenStrategyResult>;
+    findOpenStrategyPath({ creditManager: cm, expectedBalances, leftoverBalances, target, slippage, }: FindOpenStrategyPathProps): Promise<OpenStrategyResult>;
     /**
      * @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 ca CreditAccountStruct object used for close path computation
-     * @param cm CreditManagerSlice for corresponding credit manager
+     * @param creditAccount CreditAccountStruct object used for close path computation
+     * @param creditManager CreditManagerSlice for corresponding credit manager
      * @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(ca: CreditAccountDataSlice, cm: CreditManagerSlice, slippage: bigint | number, balances?: ClosePathBalances): Promise<RouterCloseResult>;
+    findBestClosePath({ creditAccount: ca, creditManager: cm, slippage, balances, }: FindBestClosePathProps): Promise<RouterCloseResult>;
     /**
      * Finds input to be used with findBestClosePath
      * @param ca
@@ -25192,24 +25223,21 @@ interface RepayCreditAccountResult {
     calls: Array<MultiCall>;
 }
 type CloseOptions = "close" | "zeroDebt";
-interface CloseCreditAccountProps extends Omit<PrepareCloseCreditAccountProps, "cm"> {
+interface CloseCreditAccountProps {
     operation: CloseOptions;
-}
-interface PrepareCloseCreditAccountProps {
-    cm: CreditFactory;
-    ca: CreditAccountDataSlice;
+    creditAccount: CreditAccountDataSlice;
     assetsToWithdraw: Address[];
     to: Address;
     slippage?: bigint;
     closePath?: RouterCloseResult;
 }
-interface RepayCreditAccountProps extends PrepareRepayCreditAccountProps {
+interface RepayCreditAccountProps extends RepayAndLiquidateCreditAccountProps {
     operation: CloseOptions;
 }
-interface PrepareRepayCreditAccountProps {
+interface RepayAndLiquidateCreditAccountProps {
     collateralAssets: Asset[];
     assetsToWithdraw: Address[];
-    ca: CreditAccountDataSlice;
+    creditAccount: CreditAccountDataSlice;
     to: Address;
     permits: Record<string, PermitResult>;
 }
@@ -25258,24 +25286,36 @@ declare class CreditAccountsService extends SDKConstruct {
     /**
      * Closes credit account or sets debt to zero (but keep account)
      * @param operation
-     * @param ca
+     * @param creditAccount
      * @param assetsToWithdraw Tokens to withdraw from credit account
      * @param to Address to withdraw underlying to
      * @param slippage
+     * @param closePath
      * @returns
      */
-    closeCreditAccount(props: CloseCreditAccountProps): Promise<CloseCreditAccountResult>;
+    closeCreditAccount({ operation, assetsToWithdraw, creditAccount: ca, to, slippage, closePath, }: CloseCreditAccountProps): Promise<CloseCreditAccountResult>;
     /**
      * Repays credit account or sets debt to zero (but keep account)
      * @param operation
-     * @param ca
+     * @param creditAccount
+     * @param assetsToWithdraw Tokens to withdraw from credit account
+     * @param collateralAssets Tokens to pay for
+     * @param to Address to withdraw underlying to
+     * @param slippage
+     * @param permits
+     * @returns
+     */
+    repayCreditAccount({ operation, collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, }: RepayCreditAccountProps): Promise<RepayCreditAccountResult>;
+    /**
+     * Repays liquidatable credit account
+     * @param creditAccount
      * @param assetsToWithdraw Tokens to withdraw from credit account
      * @param collateralAssets Tokens to pay for
      * @param to Address to withdraw underlying to
      * @param slippage
      * @returns
      */
-    repayCreditAccount(props: RepayCreditAccountProps): Promise<RepayCreditAccountResult>;
+    repayAndLiquidateCreditAccount({ collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, }: RepayAndLiquidateCreditAccountProps): Promise<RepayCreditAccountResult>;
     /**
      * Returns raw txs that are needed to update all price feeds so that all credit accounts (possibly from different markets) compute
      * @param accounts

package/dist/esm/sdk/index.mjs

@@ -22416,11 +22416,11 @@ var CreditAccountsService = class extends SDKConstruct {
    */
   async fullyLiquidate(account, to, slippage = 50n) {
     const cm = this.sdk.marketRegister.findCreditManager(account.creditManager);
-    const routerCloseResult = await this.sdk.router.findBestClosePath(
-      account,
-      cm.creditManager,
+    const routerCloseResult = await this.sdk.router.findBestClosePath({
+      creditAccount: account,
+      creditManager: cm.creditManager,
       slippage
-    );
+    });
     const priceUpdates = await this.getPriceUpdatesForFacade(account);
     const tx = cm.creditFacade.liquidateCreditAccount(
       account.creditAccount,
@@ -22432,39 +22432,104 @@ var CreditAccountsService = class extends SDKConstruct {
   /**
    * Closes credit account or sets debt to zero (but keep account)
    * @param operation
-   * @param ca
+   * @param creditAccount
    * @param assetsToWithdraw Tokens to withdraw from credit account
    * @param to Address to withdraw underlying to
    * @param slippage
+   * @param closePath
    * @returns
    */
-  async closeCreditAccount(props) {
-    const cm = this.sdk.marketRegister.findCreditManager(
-      props.ca.creditManager
-    );
-    const { calls, routerCloseResult } = await this.#prepareCloseCreditAccount({
-      ...props,
-      cm
+  async closeCreditAccount({
+    operation,
+    assetsToWithdraw,
+    creditAccount: ca,
+    to,
+    slippage = 50n,
+    closePath
+  }) {
+    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    const routerCloseResult = closePath || await this.sdk.router.findBestClosePath({
+      creditAccount: ca,
+      creditManager: cm.creditManager,
+      slippage
     });
-    const tx = props.operation === "close" ? cm.creditFacade.closeCreditAccount(props.ca.creditAccount, calls) : cm.creditFacade.multicall(props.ca.creditAccount, calls);
+    const calls = [
+      ...routerCloseResult.calls,
+      ...this.#prepareDisableQuotas(ca),
+      ...this.#prepareDecreaseDebt(ca),
+      ...this.#prepareDisableTokens(ca),
+      ...assetsToWithdraw.map(
+        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
+      )
+    ];
+    const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
     return { tx, calls, routerCloseResult };
   }
   /**
    * Repays credit account or sets debt to zero (but keep account)
    * @param operation
-   * @param ca
+   * @param creditAccount
    * @param assetsToWithdraw Tokens to withdraw from credit account
    * @param collateralAssets Tokens to pay for
    * @param to Address to withdraw underlying to
    * @param slippage
+   * @param permits
    * @returns
    */
-  async repayCreditAccount(props) {
-    const cm = this.sdk.marketRegister.findCreditManager(
-      props.ca.creditManager
+  async repayCreditAccount({
+    operation,
+    collateralAssets,
+    assetsToWithdraw,
+    creditAccount: ca,
+    permits,
+    to
+  }) {
+    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    const addCollateral = collateralAssets.filter((a) => a.balance > 0);
+    const calls = [
+      ...this.#prepareAddCollateralCalls(addCollateral, ca, permits),
+      ...this.#prepareDisableQuotas(ca),
+      ...this.#prepareDecreaseDebt(ca),
+      ...this.#prepareDisableTokens(ca),
+      // TODO: probably needs a way to handle reward tokens
+      ...assetsToWithdraw.map(
+        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
+      )
+    ];
+    const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
+    return { tx, calls };
+  }
+  /**
+   * Repays liquidatable credit account
+   * @param creditAccount
+   * @param assetsToWithdraw Tokens to withdraw from credit account
+   * @param collateralAssets Tokens to pay for
+   * @param to Address to withdraw underlying to
+   * @param slippage
+   * @returns
+   */
+  async repayAndLiquidateCreditAccount({
+    collateralAssets,
+    assetsToWithdraw,
+    creditAccount: ca,
+    permits,
+    to
+  }) {
+    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    const priceUpdates = await this.getPriceUpdatesForFacade(ca);
+    const addCollateral = collateralAssets.filter((a) => a.balance > 0);
+    const calls = [
+      ...priceUpdates,
+      ...this.#prepareAddCollateralCalls(addCollateral, ca, permits),
+      ...assetsToWithdraw.map(
+        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
+      )
+    ];
+    const tx = cm.creditFacade.liquidateCreditAccount(
+      ca.creditAccount,
+      to,
+      calls
     );
-    const { calls } = await this.#prepareRepayCreditAccount(props);
-    const tx = props.operation === "close" ? cm.creditFacade.closeCreditAccount(props.ca.creditAccount, calls) : cm.creditFacade.multicall(props.ca.creditAccount, calls);
     return { tx, calls };
   }
   /**
@@ -22555,45 +22620,6 @@ var CreditAccountsService = class extends SDKConstruct {
     const updates = await this.getOnDemandPriceUpdates(acc);
     return cm.creditFacade.encodeOnDemandPriceUpdates(updates);
   }
-  async #prepareCloseCreditAccount({
-    ca,
-    cm,
-    assetsToWithdraw,
-    to,
-    slippage = 50n,
-    closePath
-  }) {
-    const routerCloseResult = closePath || await this.sdk.router.findBestClosePath(ca, cm.creditManager, slippage);
-    const calls = [
-      ...routerCloseResult.calls,
-      ...this.#prepareDisableQuotas(ca),
-      ...this.#prepareDecreaseDebt(ca),
-      ...this.#prepareDisableTokens(ca),
-      ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
-      )
-    ];
-    return { calls, routerCloseResult };
-  }
-  async #prepareRepayCreditAccount({
-    ca,
-    assetsToWithdraw,
-    to,
-    collateralAssets,
-    permits
-  }) {
-    const addCollateral = collateralAssets.filter((a) => a.balance > 0);
-    const calls = [
-      ...this.#prepareAddCollateralCalls(addCollateral, ca, permits),
-      ...this.#prepareDisableQuotas(ca),
-      ...this.#prepareDecreaseDebt(ca),
-      ...this.#prepareDisableTokens(ca),
-      ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
-      )
-    ];
-    return { calls };
-  }
   #prepareDisableQuotas(ca) {
     const calls = [];
     for (const { token, quota } of ca.tokens) {
@@ -22999,7 +23025,16 @@ var RouterV3Contract = class extends BaseContract {
    * @param slippage
    * @returns
    */
-  async findAllSwaps(ca, cm, swapOperation, tokenIn, tokenOut, amount, leftoverAmount, slippage) {
+  async findAllSwaps({
+    creditAccount: ca,
+    creditManager: cm,
+    swapOperation,
+    tokenIn,
+    tokenOut,
+    amount,
+    leftoverAmount,
+    slippage
+  }) {
     const connectors = this.getAvailableConnectors(cm.collateralTokens);
     const swapTask = {
       swapOperation: SWAP_OPERATIONS[swapOperation],
@@ -23029,15 +23064,22 @@ var RouterV3Contract = class extends BaseContract {
   }
   /**
    * Finds best path to swap all Normal tokens and tokens "on the way" to target one and vice versa
-   * @param ca
-   * @param cm
+   * @param creditAccount
+   * @param creditManager
    * @param tokenIn
    * @param tokenOut
    * @param amount
    * @param slippage
    * @returns
    */
-  async findOneTokenPath(ca, cm, tokenIn, tokenOut, amount, slippage) {
+  async findOneTokenPath({
+    creditAccount: ca,
+    creditManager: cm,
+    tokenIn,
+    tokenOut,
+    amount,
+    slippage
+  }) {
     const connectors = this.getAvailableConnectors(cm.collateralTokens);
     const { result } = await this.contract.simulate.findOneTokenPath(
       [
@@ -23060,7 +23102,7 @@ var RouterV3Contract = class extends BaseContract {
   }
   /**
    * @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 creditManager 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) }
@@ -23069,7 +23111,13 @@ var RouterV3Contract = class extends BaseContract {
    * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
    * @returns PathFinderOpenStrategyResult which
    */
-  async findOpenStrategyPath(cm, expectedBalances, leftoverBalances, target, slippage) {
+  async findOpenStrategyPath({
+    creditManager: cm,
+    expectedBalances,
+    leftoverBalances,
+    target,
+    slippage
+  }) {
     const [expectedMap, leftoverMap] = [
       balancesMap(expectedBalances),
       balancesMap(leftoverBalances)
@@ -23111,14 +23159,19 @@ var RouterV3Contract = class extends BaseContract {
   /**
    * @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 ca CreditAccountStruct object used for close path computation
-   * @param cm CreditManagerSlice for corresponding credit manager
+   * @param creditAccount CreditAccountStruct object used for close path computation
+   * @param creditManager CreditManagerSlice for corresponding credit manager
    * @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(ca, cm, slippage, balances) {
+  async findBestClosePath({
+    creditAccount: ca,
+    creditManager: cm,
+    slippage,
+    balances
+  }) {
     const { pathOptions, expected, leftover, connectors } = this.getFindClosePathInput(
       ca,
       cm,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-vfour.86",
+  "version": "3.0.0-vfour.88",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.cjs",