@gearbox-protocol/sdk 14.12.0-next.3 → 14.12.0-next.31

package/dist/cjs/sdk/accounts/CreditAccountsServiceV310.js

@@ -18,41 +18,23 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var CreditAccountsServiceV310_exports = {};
 __export(CreditAccountsServiceV310_exports, {
-  CreditAccountsServiceV310: () => CreditAccountsServiceV310,
-  getWithdrawalCompressorAddress: () => getWithdrawalCompressorAddress
+  CreditAccountsServiceV310: () => CreditAccountsServiceV310
 });
 module.exports = __toCommonJS(CreditAccountsServiceV310_exports);
-var import_integrations_v3 = require("@gearbox-protocol/integrations-v3");
 var import_viem = require("viem");
 var import_generated = require("../../abi/310/generated.js");
 var import_creditAccountCompressor = require("../../abi/compressors/creditAccountCompressor.js");
 var import_peripheryCompressor = require("../../abi/compressors/peripheryCompressor.js");
 var import_rewardsCompressor = require("../../abi/compressors/rewardsCompressor.js");
-var import_IWithdrawalCompressorV310 = require("../../abi/IWithdrawalCompressorV310.js");
-var import_IWithdrawalCompressorV311 = require("../../abi/IWithdrawalCompressorV311.js");
 var import_iBaseRewardPool = require("../../abi/iBaseRewardPool.js");
+var import_ierc4626Adapter = require("../../abi/ierc4626Adapter.js");
 var import_iRWAFactory = require("../../abi/rwa/iRWAFactory.js");
 var import_base = require("../base/index.js");
-var import_chains = require("../chain/chains.js");
 var import_constants = require("../constants/index.js");
 var import_market = require("../market/index.js");
-var import_router = require("../router/index.js");
 var import_utils = require("../utils/index.js");
 var import_viem2 = require("../utils/viem/index.js");
 var import_multicall_utils = require("./multicall-utils.js");
-const COMPRESSORS = {
-  [import_chains.chains.Mainnet.id]: {
-    address: "0x36F3d0Bb73CBC2E94fE24dF0f26a689409cF9023",
-    version: 310
-  },
-  [import_chains.chains.Monad.id]: {
-    address: "0x36F3d0Bb73CBC2E94fE24dF0f26a689409cF9023",
-    version: 310
-  }
-};
-function getWithdrawalCompressorAddress(chainId) {
-  return COMPRESSORS[chainId];
-}
 class CreditAccountsServiceV310 extends import_base.SDKConstruct {
   #compressor;
   #batchSize;
@@ -609,26 +591,17 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
     closePath
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    await this.sdk.tokensMeta.loadTokenData(cm.underlying);
-    const underlying = this.sdk.tokensMeta.mustGet(cm.underlying);
-    if (this.sdk.tokensMeta.isRWAUnderlying(underlying)) {
-      throw new Error(
-        "closeCreditAccount is not supported for RWA underlying credit accounts"
-      );
-    }
     const routerCloseResult = closePath || await this.sdk.routerFor(ca).findBestClosePath({
       creditAccount: ca,
       creditManager: cm.creditManager,
       slippage
     });
-    const operationCalls = [
-      ...routerCloseResult.calls,
-      ...this.#prepareDisableQuotas(ca),
-      ...this.#prepareDecreaseDebt(ca),
-      ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca.creditFacade, t, import_constants.MAX_UINT256, to)
-      )
-    ];
+    const operationCalls = await this.assembleCloseCreditAccountCalls({
+      creditAccount: ca,
+      routerCalls: routerCloseResult.calls,
+      assetsToWithdraw,
+      to
+    });
     const calls = operation === "close" ? operationCalls : await this.#prependPriceUpdates(ca.creditManager, operationCalls, ca);
     const tx = await this.#closeCreditAccountTx(
       cm,
@@ -638,6 +611,24 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
     );
     return { tx, calls, routerCloseResult, creditFacade: cm.creditFacade };
   }
+  /**
+   * {@inheritDoc ICreditAccountsService.assembleCloseCreditAccountCalls}
+   */
+  async assembleCloseCreditAccountCalls({
+    creditAccount: ca,
+    routerCalls,
+    assetsToWithdraw,
+    to
+  }) {
+    return [
+      ...routerCalls,
+      ...this.#prepareDisableQuotas(ca),
+      ...this.#prepareDecreaseDebt(ca),
+      ...assetsToWithdraw.map(
+        (t) => this.#prepareWithdrawToken(ca.creditFacade, t, import_constants.MAX_UINT256, to)
+      )
+    ];
+  }
   /**
    * {@inheritDoc ICreditAccountsService.updateQuotas}
    **/
@@ -777,24 +768,15 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
   async previewDelayedWithdrawal({
     creditAccount,
     amount,
-    token
+    token,
+    intent
   }) {
-    const compressor = getWithdrawalCompressorAddress(this.sdk.chainId);
-    if (!compressor)
-      throw new Error(
-        `No compressor for current chain ${this.sdk.networkType}`
-      );
-    const contract = (0, import_viem.getContract)({
-      address: compressor.address,
-      abi: compressor.version === 310 ? import_IWithdrawalCompressorV310.iWithdrawalCompressorV310Abi : import_IWithdrawalCompressorV311.iWithdrawalCompressorV311Abi,
-      client: this.client
-    });
-    const resp = await contract.read.getWithdrawalRequestResult([
+    return this.sdk.withdrawalCompressor.getWithdrawalRequestResult(
       creditAccount,
       token,
-      amount
-    ]);
-    return resp;
+      amount,
+      intent
+    );
   }
   /**
    * {@inheritDoc ICreditAccountsService.getPendingWithdrawals}
@@ -802,96 +784,59 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
   async getPendingWithdrawals({
     creditAccount
   }) {
-    const compressor = getWithdrawalCompressorAddress(this.sdk.chainId);
-    if (!compressor)
-      throw new Error(
-        `No compressor for current chain ${this.sdk.networkType}`
-      );
-    const contract = (0, import_viem.getContract)({
-      address: compressor.address,
-      abi: compressor.version === 310 ? import_IWithdrawalCompressorV310.iWithdrawalCompressorV310Abi : import_IWithdrawalCompressorV311.iWithdrawalCompressorV311Abi,
-      client: this.client
-    });
-    const resp = await contract.read.getCurrentWithdrawals([creditAccount]);
-    const claimableNow = resp?.[0] || [];
-    const pendingResult = [...resp?.[1] || []].sort(
-      (a, b) => a.claimableAt < b.claimableAt ? -1 : 1
-    );
-    const respResult = {
-      claimableNow: [...claimableNow],
-      pending: pendingResult
+    const { claimable, pending } = await this.sdk.withdrawalCompressor.getCurrentWithdrawals(creditAccount);
+    return {
+      claimableNow: claimable,
+      pending
     };
-    return respResult;
   }
   /**
-   * {@inheritDoc ICreditAccountsService.startDelayedWithdrawal}
+   * {@inheritDoc ICreditAccountsService.assembleStartDelayedWithdrawalCalls}
    **/
-  async startDelayedWithdrawal({
-    creditAccount,
-    minQuota,
-    averageQuota,
+  assembleStartDelayedWithdrawalCalls({
+    creditFacade,
     preview
   }) {
-    const cm = this.sdk.marketRegister.findCreditManager(
-      creditAccount.creditManager
-    );
     const record = preview.outputs.reduce((acc, o) => {
       const token = o.token.toLowerCase();
       acc[token] = (acc[token] || 0n) + o.amount;
       return acc;
     }, {});
     const balances = Object.entries(record).filter(([, a]) => a > 10n);
+    const deltas = balances.map(
+      ([token, amount]) => ({
+        token,
+        amount: amount > 10n ? amount - 10n : 0n
+      })
+    );
+    if (preview.amountIn > 0n) {
+      deltas.push({ token: preview.token, amount: -preview.amountIn });
+    }
     const storeExpectedBalances = {
-      target: cm.creditFacade.address,
+      target: creditFacade,
       callData: (0, import_viem.encodeFunctionData)({
         abi: import_generated.iCreditFacadeMulticallV310Abi,
         functionName: "storeExpectedBalances",
-        args: [
-          balances.map(([token, amount]) => ({
-            token,
-            amount: amount > 10n ? amount - 10n : 0n
-          }))
-        ]
+        args: [deltas]
       })
     };
     const compareBalances = {
-      target: cm.creditFacade.address,
+      target: creditFacade,
       callData: (0, import_viem.encodeFunctionData)({
         abi: import_generated.iCreditFacadeMulticallV310Abi,
         functionName: "compareBalances",
         args: []
       })
     };
-    const operationCalls = [
-      storeExpectedBalances,
-      ...preview.requestCalls,
-      compareBalances,
-      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, {
-        minQuota,
-        averageQuota
-      })
-    ];
-    const calls = await this.#prependPriceUpdates(
-      creditAccount.creditManager,
-      operationCalls,
-      creditAccount
-    );
-    const tx = await this.#multicallTx(cm, creditAccount.creditAccount, calls);
-    return { tx, calls, creditFacade: cm.creditFacade };
+    return [storeExpectedBalances, ...preview.requestCalls, compareBalances];
   }
   /**
-   * {@inheritDoc ICreditAccountsService.claimDelayed}
+   * {@inheritDoc ICreditAccountsService.assembleClaimDelayedCalls}
    **/
-  async claimDelayed({
-    creditAccount,
-    minQuota,
-    averageQuota,
+  assembleClaimDelayedCalls({
+    creditFacade,
     claimableNow
   }) {
-    const zeroDebt = creditAccount.debt === 0n;
-    const cm = this.sdk.marketRegister.findCreditManager(
-      creditAccount.creditManager
-    );
     const record = claimableNow.outputs.reduce(
       (acc, o) => {
         const token = o.token.toLowerCase();
@@ -901,35 +846,88 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
       {}
     );
     const balances = Object.entries(record).filter(([, a]) => a > 10n);
+    const deltas = balances.map(
+      ([token, amount]) => ({
+        token,
+        amount: amount > 10n ? amount - 10n : 0n
+      })
+    );
+    if (claimableNow.withdrawalTokenSpent > 0n) {
+      deltas.push({
+        token: claimableNow.withdrawalPhantomToken,
+        amount: -claimableNow.withdrawalTokenSpent
+      });
+    }
     const storeExpectedBalances = {
-      target: cm.creditFacade.address,
+      target: creditFacade,
       callData: (0, import_viem.encodeFunctionData)({
         abi: import_generated.iCreditFacadeMulticallV310Abi,
         functionName: "storeExpectedBalances",
-        args: [
-          balances.map(([token, amount]) => ({
-            token,
-            amount: amount > 10n ? amount - 10n : 0n
-          }))
-        ]
+        args: [deltas]
       })
     };
     const compareBalances = {
-      target: cm.creditFacade.address,
+      target: creditFacade,
       callData: (0, import_viem.encodeFunctionData)({
         abi: import_generated.iCreditFacadeMulticallV310Abi,
         functionName: "compareBalances",
         args: []
       })
     };
-    const quotaCalls = zeroDebt ? [] : this.#prepareUpdateQuotas(creditAccount.creditFacade, {
+    return [storeExpectedBalances, ...claimableNow.claimCalls, compareBalances];
+  }
+  /**
+   * {@inheritDoc ICreditAccountsService.startDelayedWithdrawal}
+   **/
+  async startDelayedWithdrawal({
+    creditAccount,
+    minQuota,
+    averageQuota,
+    preview
+  }) {
+    const cm = this.sdk.marketRegister.findCreditManager(
+      creditAccount.creditManager
+    );
+    const operationCalls = [
+      ...this.assembleStartDelayedWithdrawalCalls({
+        creditFacade: cm.creditFacade.address,
+        preview
+      }),
+      ...this.#prepareUpdateQuotas(cm.creditFacade.address, {
+        minQuota,
+        averageQuota
+      })
+    ];
+    const calls = await this.#prependPriceUpdates(
+      creditAccount.creditManager,
+      operationCalls,
+      creditAccount
+    );
+    const tx = await this.#multicallTx(cm, creditAccount.creditAccount, calls);
+    return { tx, calls, creditFacade: cm.creditFacade };
+  }
+  /**
+   * {@inheritDoc ICreditAccountsService.claimDelayed}
+   **/
+  async claimDelayed({
+    creditAccount,
+    minQuota,
+    averageQuota,
+    claimableNow
+  }) {
+    const zeroDebt = creditAccount.debt === 0n;
+    const cm = this.sdk.marketRegister.findCreditManager(
+      creditAccount.creditManager
+    );
+    const quotaCalls = zeroDebt ? [] : this.#prepareUpdateQuotas(cm.creditFacade.address, {
       minQuota,
       averageQuota
     });
     const operationCalls = [
-      storeExpectedBalances,
-      ...claimableNow.claimCalls,
-      compareBalances,
+      ...this.assembleClaimDelayedCalls({
+        creditFacade: cm.creditFacade.address,
+        claimableNow
+      }),
       ...quotaCalls
     ];
     const calls = zeroDebt ? operationCalls : await this.#prependPriceUpdates(
@@ -1126,7 +1124,7 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
       {
         target: adapterAddress,
         callData: (0, import_viem.encodeFunctionData)({
-          abi: import_integrations_v3.ierc4626AdapterAbi,
+          abi: import_ierc4626Adapter.ierc4626AdapterAbi,
           functionName: "redeem",
           args: [amount, import_constants.ADDRESS_0X0, import_constants.ADDRESS_0X0]
         })
@@ -1157,7 +1155,7 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
       {
         target: adapterAddress,
         callData: (0, import_viem.encodeFunctionData)({
-          abi: import_integrations_v3.ierc4626AdapterAbi,
+          abi: import_ierc4626Adapter.ierc4626AdapterAbi,
           functionName: "deposit",
           args: [amount, import_constants.ADDRESS_0X0]
         })
@@ -1188,7 +1186,7 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
       {
         target: adapterAddress,
         callData: (0, import_viem.encodeFunctionData)({
-          abi: import_integrations_v3.ierc4626AdapterAbi,
+          abi: import_ierc4626Adapter.ierc4626AdapterAbi,
           functionName: "redeemDiff",
           args: [amount]
         })
@@ -1219,7 +1217,7 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
       {
         target: adapterAddress,
         callData: (0, import_viem.encodeFunctionData)({
-          abi: import_integrations_v3.ierc4626AdapterAbi,
+          abi: import_ierc4626Adapter.ierc4626AdapterAbi,
           functionName: "depositDiff",
           args: [amount]
         })
@@ -1285,13 +1283,13 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
     const operationCalls = [
       ...assetsToWithdraw.map(
         (a) => this.#prepareWithdrawToken(
-          creditAccount.creditFacade,
+          cm.creditFacade.address,
           a.token,
           a.balance,
           to
         )
       ),
-      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, {
+      ...this.#prepareUpdateQuotas(cm.creditFacade.address, {
         minQuota,
         averageQuota
       })
@@ -1307,8 +1305,23 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
   /**
    * {@inheritDoc ICreditAccountsService.repayCreditAccount}
    */
-  async repayCreditAccount({
-    operation,
+  async repayCreditAccount(props) {
+    const { operation, creditAccount: ca } = props;
+    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+    const operationCalls = await this.assembleRepayCreditAccountCalls(props);
+    const calls = operation === "close" ? operationCalls : await this.#prependPriceUpdates(ca.creditManager, operationCalls, ca);
+    const tx = await this.#closeCreditAccountTx(
+      cm,
+      ca.creditAccount,
+      calls,
+      operation
+    );
+    return { tx, calls, creditFacade: cm.creditFacade };
+  }
+  /**
+   * {@inheritDoc ICreditAccountsService.assembleRepayCreditAccountCalls}
+   */
+  async assembleRepayCreditAccountCalls({
     collateralAssets,
     assetsToWithdraw,
     creditAccount: ca,
@@ -1317,7 +1330,6 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
     tokensToClaim,
     calls: wrapCalls = []
   }) {
-    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const router = this.sdk.routerFor(ca);
     const unwrapCalls = await this.getRedeemDiffCalls(1n, ca.creditManager) ?? [];
@@ -1336,14 +1348,7 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
         (t) => this.#prepareWithdrawToken(ca.creditFacade, t.token, import_constants.MAX_UINT256, to)
       )
     ];
-    const calls = operation === "close" ? operationCalls : await this.#prependPriceUpdates(ca.creditManager, operationCalls, ca);
-    const tx = await this.#closeCreditAccountTx(
-      cm,
-      ca.creditAccount,
-      calls,
-      operation
-    );
-    return { tx, calls, creditFacade: cm.creditFacade };
+    return operationCalls;
   }
   /**
    * {@inheritDoc ICreditAccountsService.repayAndLiquidateCreditAccount}
@@ -1564,19 +1569,13 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
     );
   }
   /**
-   * {@inheritDoc ICreditAccountsService.assembleCaUpdateCalls}
+   * {@inheritDoc ICreditAccountsService.assembleCaOperations}
    */
-  assembleCaUpdateCalls({
+  assembleCaOperations({
     operations,
-    routerCallGroups,
-    creditFacade,
-    withdrawTo,
-    creditAccount,
-    underlyingToken
+    creditFacade
   }) {
     const calls = [];
-    let swapGroupIndex = 0;
-    let routerGroupsConsumed = 0;
     for (const op of operations) {
       switch (op.type) {
         case "increaseDebt":
@@ -1600,22 +1599,15 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
               creditFacade,
               op.token,
               op.amount,
-              withdrawTo
+              op.to
             )
           );
           break;
-        case "swap": {
-          const routerCalls = routerCallGroups[swapGroupIndex];
-          if (!routerCalls) {
-            throw new Error(
-              `assembleCaUpdateCalls: missing router calls for swap leg ${swapGroupIndex}`
-            );
-          }
-          calls.push(...routerCalls);
-          swapGroupIndex += 1;
-          routerGroupsConsumed += 1;
+        case "swap":
+        case "wrapRwaCollateral":
+        case "unwrapRwaCollateral":
+          calls.push(...op.calls);
           break;
-        }
         case "changeQuota": {
           const quotaAssets = [...op.quotaIncrease, ...op.quotaDecrease];
           if (quotaAssets.length === 0) {
@@ -1629,58 +1621,14 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
           );
           break;
         }
-        case "closeCreditAccount": {
-          for (const group of routerCallGroups) {
-            calls.push(...group);
-            routerGroupsConsumed += 1;
-          }
-          calls.push(
-            ...this.#prepareDisableQuotas({
-              creditFacade,
-              tokens: Object.entries(creditAccount.initialQuotas).map(
-                ([token, { quota }]) => ({
-                  token,
-                  quota
-                })
-              )
-            })
-          );
-          if (creditAccount.debt > 0n) {
-            calls.push(
-              ...this.#prepareDecreaseDebt({
-                creditFacade,
-                debt: creditAccount.debt
-              })
-            );
-          }
-          const hasAssets = creditAccount.assets.some(
-            (asset) => asset.balance > 0n
-          );
-          if (hasAssets) {
-            calls.push(
-              this.#prepareWithdrawToken(
-                creditFacade,
-                underlyingToken,
-                import_constants.MAX_UINT256,
-                withdrawTo
-              )
-            );
-          }
-          break;
-        }
         default: {
           const _exhaustive = op;
           throw new Error(
-            `assembleCaUpdateCalls: unsupported operation ${_exhaustive}`
+            `assembleCaOperations: unsupported operation ${JSON.stringify(_exhaustive)}`
           );
         }
       }
     }
-    if (routerGroupsConsumed !== routerCallGroups.length) {
-      throw new Error(
-        `assembleCaUpdateCalls: router call group mismatch (consumed ${routerGroupsConsumed}, got ${routerCallGroups.length})`
-      );
-    }
     return calls;
   }
   /**
@@ -1723,10 +1671,10 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
     return calls;
   }
   #prepareUpdateQuotas(creditFacade, { averageQuota, minQuota }) {
-    const minRecord = (0, import_router.assetsMap)(minQuota);
+    const minRecord = new import_utils.AssetsMap(minQuota);
     const calls = averageQuota.map((q) => {
-      const minAsset = minRecord.get(q.token);
-      const min = minAsset && minAsset?.balance > 0 ? minAsset.balance : 0n;
+      const minBalance = minRecord.get(q.token);
+      const min = minBalance && minBalance > 0n ? minBalance : 0n;
       return {
         target: creditFacade,
         callData: (0, import_viem.encodeFunctionData)({
@@ -1906,6 +1854,5 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  CreditAccountsServiceV310,
-  getWithdrawalCompressorAddress
+  CreditAccountsServiceV310
 });

package/dist/cjs/sdk/accounts/index.js

@@ -17,8 +17,10 @@ var accounts_exports = {};
 module.exports = __toCommonJS(accounts_exports);
 __reExport(accounts_exports, require("./CreditAccountsServiceV310.js"), module.exports);
 __reExport(accounts_exports, require("./types.js"), module.exports);
+__reExport(accounts_exports, require("./withdrawal-compressor/index.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./CreditAccountsServiceV310.js"),
-  ...require("./types.js")
+  ...require("./types.js"),
+  ...require("./withdrawal-compressor/index.js")
 });