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

package/dist/cjs/sdk/index.cjs

@@ -22438,17 +22438,29 @@ var CreditAccountsService = class extends SDKConstruct {
    * @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
-    });
-    const tx = props.operation === "close" ? cm.creditFacade.closeCreditAccount(props.ca.creditAccount, calls) : cm.creditFacade.multicall(props.ca.creditAccount, calls);
+  async closeCreditAccount({
+    operation,
+    assetsToWithdraw,
+    ca,
+    to,
+    slippage = 50n,
+    closePath
+  }) {
+    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    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)
+      )
+    ];
+    const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
     return { tx, calls, routerCloseResult };
   }
   /**
@@ -22459,14 +22471,62 @@ var CreditAccountsService = class extends SDKConstruct {
    * @param collateralAssets Tokens to pay for
    * @param to Address to withdraw underlying to
    * @param slippage
+   * @param permits
+   * @returns
+   */
+  async repayCreditAccount({
+    operation,
+    collateralAssets,
+    assetsToWithdraw,
+    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),
+      ...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 ca
+   * @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 repayCreditAccount(props) {
-    const cm = this.sdk.marketRegister.findCreditManager(
-      props.ca.creditManager
+  async repayAndLiquidateCreditAccount({
+    collateralAssets,
+    assetsToWithdraw,
+    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 +22617,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) {

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

@@ -25192,21 +25192,18 @@ 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;
     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;
@@ -25262,9 +25259,10 @@ declare class CreditAccountsService extends SDKConstruct {
      * @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, ca, to, slippage, closePath, }: CloseCreditAccountProps): Promise<CloseCreditAccountResult>;
     /**
      * Repays credit account or sets debt to zero (but keep account)
      * @param operation
@@ -25273,9 +25271,20 @@ declare class CreditAccountsService extends SDKConstruct {
      * @param collateralAssets Tokens to pay for
      * @param to Address to withdraw underlying to
      * @param slippage
+     * @param permits
+     * @returns
+     */
+    repayCreditAccount({ operation, collateralAssets, assetsToWithdraw, ca, permits, to, }: RepayCreditAccountProps): Promise<RepayCreditAccountResult>;
+    /**
+     * Repays liquidatable credit account
+     * @param ca
+     * @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, 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

@@ -25192,21 +25192,18 @@ 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;
     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;
@@ -25262,9 +25259,10 @@ declare class CreditAccountsService extends SDKConstruct {
      * @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, ca, to, slippage, closePath, }: CloseCreditAccountProps): Promise<CloseCreditAccountResult>;
     /**
      * Repays credit account or sets debt to zero (but keep account)
      * @param operation
@@ -25273,9 +25271,20 @@ declare class CreditAccountsService extends SDKConstruct {
      * @param collateralAssets Tokens to pay for
      * @param to Address to withdraw underlying to
      * @param slippage
+     * @param permits
+     * @returns
+     */
+    repayCreditAccount({ operation, collateralAssets, assetsToWithdraw, ca, permits, to, }: RepayCreditAccountProps): Promise<RepayCreditAccountResult>;
+    /**
+     * Repays liquidatable credit account
+     * @param ca
+     * @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, 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

@@ -22436,17 +22436,29 @@ var CreditAccountsService = class extends SDKConstruct {
    * @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
-    });
-    const tx = props.operation === "close" ? cm.creditFacade.closeCreditAccount(props.ca.creditAccount, calls) : cm.creditFacade.multicall(props.ca.creditAccount, calls);
+  async closeCreditAccount({
+    operation,
+    assetsToWithdraw,
+    ca,
+    to,
+    slippage = 50n,
+    closePath
+  }) {
+    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    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)
+      )
+    ];
+    const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
     return { tx, calls, routerCloseResult };
   }
   /**
@@ -22457,14 +22469,62 @@ var CreditAccountsService = class extends SDKConstruct {
    * @param collateralAssets Tokens to pay for
    * @param to Address to withdraw underlying to
    * @param slippage
+   * @param permits
+   * @returns
+   */
+  async repayCreditAccount({
+    operation,
+    collateralAssets,
+    assetsToWithdraw,
+    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),
+      ...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 ca
+   * @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 repayCreditAccount(props) {
-    const cm = this.sdk.marketRegister.findCreditManager(
-      props.ca.creditManager
+  async repayAndLiquidateCreditAccount({
+    collateralAssets,
+    assetsToWithdraw,
+    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 +22615,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) {

package/package.json

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