@gearbox-protocol/sdk 3.0.0-vfour.83 → 3.0.0-vfour.85

package/dist/cjs/sdk/index.cjs

@@ -22440,17 +22440,16 @@ var CreditAccountsService = class extends SDKConstruct {
    * @param slippage
    * @returns
    */
-  async closeCreditAccount(operation, ca, assetsToKeep, to, slippage = 50n, closeCall) {
-    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const { calls } = closeCall ? { calls: closeCall } : await this.#prepareCloseCreditAccount(
-      ca,
-      cm,
-      assetsToKeep,
-      to,
-      slippage
+  async closeCreditAccount(props) {
+    const cm = this.sdk.marketRegister.findCreditManager(
+      props.ca.creditManager
     );
-    const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
-    return { tx };
+    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);
+    return { tx, calls, routerCloseResult };
   }
   /**
    * Internal wrapper for CreditAccountCompressor.getCreditAccounts + price updates wrapped into multicall
@@ -22540,15 +22539,16 @@ var CreditAccountsService = class extends SDKConstruct {
     const updates = await this.getOnDemandPriceUpdates(acc);
     return cm.creditFacade.encodeOnDemandPriceUpdates(updates);
   }
-  async #prepareCloseCreditAccount(ca, cm, assetsToKeep, to, slippage = 50n) {
-    const routerCloseResult = await this.sdk.router.findBestClosePath(
-      ca,
-      cm.creditManager,
-      slippage
-    );
-    const priceUpdates = await this.getPriceUpdatesForFacade(ca);
+  async #prepareCloseCreditAccount({
+    ca,
+    cm,
+    assetsToKeep,
+    to,
+    slippage = 50n,
+    closePath
+  }) {
+    const routerCloseResult = closePath || await this.sdk.router.findBestClosePath(ca, cm.creditManager, slippage);
     const calls = [
-      ...priceUpdates,
       ...routerCloseResult.calls,
       ...this.#prepareDisableQuotas(ca),
       ...this.#prepareDecreaseDebt(ca),
@@ -22557,7 +22557,7 @@ var CreditAccountsService = class extends SDKConstruct {
         (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
       )
     ];
-    return { calls };
+    return { calls, routerCloseResult };
   }
   #prepareDisableQuotas(ca) {
     const calls = [];
@@ -22576,7 +22576,7 @@ var CreditAccountsService = class extends SDKConstruct {
     return calls;
   }
   #prepareDecreaseDebt(ca) {
-    if (ca.totalDebtUSD > 0n) {
+    if (ca.debt > 0n) {
       return [
         {
           target: ca.creditFacade,

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

@@ -24946,7 +24946,7 @@ interface CreditManagerSlice {
     address: Address;
     collateralTokens: Address[];
 }
-type CreditAccountDataSlice = Pick<CreditAccountData, "tokens" | "enabledTokensMask" | "underlying" | "creditAccount" | "creditFacade" | "totalDebtUSD" | "creditManager">;
+type CreditAccountDataSlice = Pick<CreditAccountData, "tokens" | "enabledTokensMask" | "underlying" | "creditAccount" | "creditFacade" | "debt" | "creditManager">;
 declare class RouterV3Contract extends BaseContract<abi> implements IHooks<RouterHooks> {
     #private;
     constructor(sdk: GearboxSDK, address: Address);
@@ -25184,6 +25184,16 @@ interface FullyLiquidateAccountResult {
 }
 interface CloseCreditAccountResult {
     tx: RawTx;
+    calls: Array<MultiCall>;
+    routerCloseResult: RouterCloseResult;
+}
+interface CloseCreditAccountProps {
+    operation: "close" | "zeroDebt";
+    ca: CreditAccountDataSlice;
+    assetsToKeep: Address[];
+    to: Address;
+    slippage?: bigint;
+    closePath?: RouterCloseResult;
 }
 declare class CreditAccountsService extends SDKConstruct {
     #private;
@@ -25225,7 +25235,7 @@ declare class CreditAccountsService extends SDKConstruct {
      * @param slippage
      * @returns
      */
-    closeCreditAccount(operation: "close" | "zeroDebt", ca: CreditAccountDataSlice, assetsToKeep: Address[], to: Address, slippage?: bigint, closeCall?: Array<MultiCall>): Promise<CloseCreditAccountResult>;
+    closeCreditAccount(props: CloseCreditAccountProps): Promise<CloseCreditAccountResult>;
     /**
      * 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

@@ -24946,7 +24946,7 @@ interface CreditManagerSlice {
     address: Address;
     collateralTokens: Address[];
 }
-type CreditAccountDataSlice = Pick<CreditAccountData, "tokens" | "enabledTokensMask" | "underlying" | "creditAccount" | "creditFacade" | "totalDebtUSD" | "creditManager">;
+type CreditAccountDataSlice = Pick<CreditAccountData, "tokens" | "enabledTokensMask" | "underlying" | "creditAccount" | "creditFacade" | "debt" | "creditManager">;
 declare class RouterV3Contract extends BaseContract<abi> implements IHooks<RouterHooks> {
     #private;
     constructor(sdk: GearboxSDK, address: Address);
@@ -25184,6 +25184,16 @@ interface FullyLiquidateAccountResult {
 }
 interface CloseCreditAccountResult {
     tx: RawTx;
+    calls: Array<MultiCall>;
+    routerCloseResult: RouterCloseResult;
+}
+interface CloseCreditAccountProps {
+    operation: "close" | "zeroDebt";
+    ca: CreditAccountDataSlice;
+    assetsToKeep: Address[];
+    to: Address;
+    slippage?: bigint;
+    closePath?: RouterCloseResult;
 }
 declare class CreditAccountsService extends SDKConstruct {
     #private;
@@ -25225,7 +25235,7 @@ declare class CreditAccountsService extends SDKConstruct {
      * @param slippage
      * @returns
      */
-    closeCreditAccount(operation: "close" | "zeroDebt", ca: CreditAccountDataSlice, assetsToKeep: Address[], to: Address, slippage?: bigint, closeCall?: Array<MultiCall>): Promise<CloseCreditAccountResult>;
+    closeCreditAccount(props: CloseCreditAccountProps): Promise<CloseCreditAccountResult>;
     /**
      * 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

@@ -22438,17 +22438,16 @@ var CreditAccountsService = class extends SDKConstruct {
    * @param slippage
    * @returns
    */
-  async closeCreditAccount(operation, ca, assetsToKeep, to, slippage = 50n, closeCall) {
-    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const { calls } = closeCall ? { calls: closeCall } : await this.#prepareCloseCreditAccount(
-      ca,
-      cm,
-      assetsToKeep,
-      to,
-      slippage
+  async closeCreditAccount(props) {
+    const cm = this.sdk.marketRegister.findCreditManager(
+      props.ca.creditManager
     );
-    const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
-    return { tx };
+    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);
+    return { tx, calls, routerCloseResult };
   }
   /**
    * Internal wrapper for CreditAccountCompressor.getCreditAccounts + price updates wrapped into multicall
@@ -22538,15 +22537,16 @@ var CreditAccountsService = class extends SDKConstruct {
     const updates = await this.getOnDemandPriceUpdates(acc);
     return cm.creditFacade.encodeOnDemandPriceUpdates(updates);
   }
-  async #prepareCloseCreditAccount(ca, cm, assetsToKeep, to, slippage = 50n) {
-    const routerCloseResult = await this.sdk.router.findBestClosePath(
-      ca,
-      cm.creditManager,
-      slippage
-    );
-    const priceUpdates = await this.getPriceUpdatesForFacade(ca);
+  async #prepareCloseCreditAccount({
+    ca,
+    cm,
+    assetsToKeep,
+    to,
+    slippage = 50n,
+    closePath
+  }) {
+    const routerCloseResult = closePath || await this.sdk.router.findBestClosePath(ca, cm.creditManager, slippage);
     const calls = [
-      ...priceUpdates,
       ...routerCloseResult.calls,
       ...this.#prepareDisableQuotas(ca),
       ...this.#prepareDecreaseDebt(ca),
@@ -22555,7 +22555,7 @@ var CreditAccountsService = class extends SDKConstruct {
         (t) => this.#prepareWithdrawToken(ca, t, MAX_UINT256, to)
       )
     ];
-    return { calls };
+    return { calls, routerCloseResult };
   }
   #prepareDisableQuotas(ca) {
     const calls = [];
@@ -22574,7 +22574,7 @@ var CreditAccountsService = class extends SDKConstruct {
     return calls;
   }
   #prepareDecreaseDebt(ca) {
-    if (ca.totalDebtUSD > 0n) {
+    if (ca.debt > 0n) {
       return [
         {
           target: ca.creditFacade,

package/package.json

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