@gearbox-protocol/sdk 14.12.0-next.73 → 14.12.0-next.75

package/dist/types/sdk/accounts/types.d.ts

@@ -1,14 +1,16 @@
-import { creditAccountCompressorAbi } from "../../abi/compressors/creditAccountCompressor.js";
 import { StrategyPosition } from "../../model/positions.js";
 import "../../model/index.js";
 import { ClaimableWithdrawal, DelayedIntent, PendingWithdrawal, RequestableWithdrawal } from "./withdrawal-compressor/types.js";
-import { Asset, ConnectedBotData, CreditAccountData } from "../base/types.js";
+import { Asset, ConnectedBotData, CreditAccountData, CreditAccountTokensSlice } from "../base/types.js";
+import { RWAOpenAccountRequirements, RWAOperationArgs } from "../market/rwa/types.js";
+import "../market/rwa/index.js";
 import { RouterCASlice, RouterCloseResult } from "../router/types.js";
 import "../router/index.js";
+import { GetCreditAccountsOptions, ListStrategyPositionsProps } from "./credit-account-compressor/types.js";
+import "./credit-account-compressor/index.js";
 import "./withdrawal-compressor/index.js";
-import { RWAOpenAccountRequirements, RWAOperationArgs } from "../market/rwa/types.js";
-import "../market/rwa/index.js";
 import { PriceUpdate } from "../market/pricefeeds/types.js";
+import { PartialLiquidationParams } from "../market/credit/types.js";
 import { CreditSuite } from "../market/credit/CreditSuite.js";
 import "../market/index.js";
 import { MultiCall, RawTx } from "../types/transactions.js";
@@ -16,116 +18,8 @@ import { OnchainSDK } from "../OnchainSDK.js";
 import { Construct } from "../base/Construct.js";
 import "../types/index.js";
 import "../base/index.js";
-import { Address, ContractFunctionArgs, Hex } from "viem";
+import { Address, Hex } from "viem";
 //#region src/sdk/accounts/types.d.ts
-/**
- * @internal
- * Arguments tuple for the credit account compressor's `getCreditAccounts` view method.
- **/
-type GetCreditAccountsArgs = ContractFunctionArgs<typeof creditAccountCompressorAbi, "pure" | "view", "getCreditAccounts">;
-/**
- * @internal
- * Filtering criteria applied to individual credit accounts when querying the compressor.
- **/
-interface CreditAccountFilter {
-  /**
-   * Filter by account owner address.
-   **/
-  owner: Address;
-  /**
-   * Whether to include accounts with zero outstanding debt.
-   **/
-  includeZeroDebt: boolean;
-  /**
-   * Minimum health factor threshold (inclusive).
-   * 18 digits precision (10^18 = 1)
-   **/
-  minHealthFactor: bigint;
-  /**
-   * Maximum health factor threshold (inclusive).
-   * 18 digits precision (10^18 = 1)
-   **/
-  maxHealthFactor: bigint;
-  /**
-   * Whether to return only accounts whose health computation reverts.
-   **/
-  reverting: boolean;
-}
-/**
- * @internal
- * Filtering criteria to select which credit managers to query.
- **/
-interface CreditManagerFilter {
-  /**
-   * Only include credit managers owned by these market configurators.
-   **/
-  configurators: readonly Address[];
-  /**
-   * Only include these specific credit manager addresses.
-   **/
-  creditManagers: readonly Address[];
-  /**
-   * Only include credit managers linked to these pool addresses.
-   **/
-  pools: readonly Address[];
-  /**
-   * Only include credit managers with this underlying token.
-   **/
-  underlying: Address;
-}
-/**
- * Options for fetching credit accounts, allowing filtering by credit manager, owner, and health factor range.
- **/
-interface GetCreditAccountsOptions {
-  /**
-   * If set, only return accounts from this credit manager; otherwise query all attached markets.
-   **/
-  creditManager?: Address;
-  /**
-   * If set, only return accounts owned by this address.
-   **/
-  owner?: Address;
-  /**
-   * Whether to include accounts with zero outstanding debt.
-   * @default false
-   **/
-  includeZeroDebt?: boolean;
-  /**
-   * Minimum health factor threshold (inclusive).
-   * 18 digits precision (10^18 = 1)
-   * @default 0n
-   **/
-  minHealthFactor?: bigint;
-  /**
-   * Maximum health factor threshold (inclusive).
-   * 18 digits precision (10^18 = 1)
-   * @default MAX_UINT256
-   **/
-  maxHealthFactor?: bigint;
-  /**
-   * If true, exclude reserve price feed updates from the query.
-   **/
-  ignoreReservePrices?: boolean;
-}
-/**
- * Props for {@link ICreditAccountsService.listPositions}.
- **/
-interface ListStrategyPositionsProps {
-  /**
-   * Wallet whose credit accounts to describe. RWA accounts are resolved from
-   * the investor EOA, see {@link ICreditAccountsService.getBorrowerCreditAccounts}.
-   **/
-  owner: Address;
-  /**
-   * Whether to include accounts that carry no debt.
-   **/
-  includeZeroDebt: boolean;
-}
-/**
- * Lightweight slice of credit-account data containing only token
- * balances and the enabled-tokens bitmask.
- **/
-type CreditAccountTokensSlice = Pick<CreditAccountData, "creditManager" | "creditAccount" | "tokens" | "enabledTokensMask">;
 /**
  * Result of closing or liquidating a credit account, including the router's optimal close path.
  **/
@@ -174,39 +68,6 @@ interface CreditManagerOperationResult {
    **/
   creditFacade: CreditSuite["creditFacade"];
 }
-/**
- * Close operation type: `"close"` fully closes the account, `"zeroDebt"` repays all debt but keeps the account open.
- **/
-type CloseOptions = "close" | "zeroDebt";
-interface CloseCreditAccountProps {
-  /**
-   * Close or zeroDebt
-   */
-  operation: CloseOptions;
-  /**
-   * Minimal credit account data on which operation is performed
-   */
-  creditAccount: RouterCASlice;
-  /**
-   * Tokens to withdraw from credit account.
-   * For credit account closing this is the underlying token, because during the closure,
-   * all tokens on account are swapped into the underlying,
-   * and only the underlying token will remain on the credit account
-   */
-  assetsToWithdraw: Array<Address>;
-  /**
-   * Wallet address to withdraw underlying to
-   */
-  to: Address;
-  /**
-   * Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
-   */
-  slippage?: bigint;
-  /**
-   * Result of findBestClosePath method from router; if omited, calls marketRegister.findCreditManager {@link RouterCloseResult}
-   */
-  closePath?: RouterCloseResult;
-}
 /**
  * Input for {@link ICreditAccountsService.assembleCloseCreditAccountCalls}.
  */
@@ -228,34 +89,6 @@ type AssembleCloseCreditAccountCallsProps = {
    */
   to: Address;
 };
-interface RepayAndLiquidateCreditAccountProps {
-  /**
-   * Tokens to repay debt.
-   * In the current implementation, this is the (debt+interest+fees) * buffer,
-   * where buffer refers to amount of tokens which will exceed current debt
-   * in order to cover possible debt increase over tx execution.
-   */
-  collateralAssets: Array<Asset>;
-  /**
-     * tokens to withdraw from credit account.
-        Typically all non zero ca assets (including unclaimed rewards)
-        plus underlying token (to withdraw any exceeding underlying token after repay)
-     */
-  assetsToWithdraw: Array<Asset>;
-  /**
-   * Minimal credit account data on which operation is performed.
-   */
-  creditAccount: RouterCASlice;
-  /**
-   * Wallet address to withdraw underlying to
-   */
-  to: Address;
-  /**
-   * Permits of tokens to withdraw (if any permittable token is present).
-   */
-  permits: Record<string, PermitResult>;
-  tokensToClaim: Asset[];
-}
 /**
  * Input for {@link ICreditAccountsService.assembleRepayCreditAccountCalls}.
  */
@@ -271,16 +104,6 @@ type AssembleRepayCreditAccountCallsProps = {
    */
   calls?: Array<MultiCall>;
 };
-interface RepayCreditAccountProps extends RepayAndLiquidateCreditAccountProps {
-  /**
-   * RWA wrap multicall entries (from getRWAWrapCalls).
-   */
-  calls?: Array<MultiCall>;
-  /**
-   * close or zeroDebt
-   */
-  operation: CloseOptions;
-}
 /**
  * Quota `Asset.balance` values are denominated in **pool underlying token
  * units**, not in the quoted token's own units.
@@ -300,44 +123,6 @@ interface PrepareUpdateQuotasProps {
    */
   minQuota: Array<Asset>;
 }
-interface UpdateQuotasProps extends PrepareUpdateQuotasProps {
-  /**
-   * Minimal credit account data on which operation is performed
-   */
-  creditAccount: RouterCASlice;
-}
-interface AddCollateralProps extends PrepareUpdateQuotasProps {
-  /**
-   * Asset to add as collateral
-   */
-  asset: Asset;
-  /**
-   * Native token amount to attach to tx
-   */
-  ethAmount: bigint;
-  /**
-   * Permit of collateral asset if it is permittable
-   */
-  permit: PermitResult | undefined;
-  /**
-   * Minimal credit account data on which operation is performed
-   */
-  creditAccount: RouterCASlice;
-}
-interface WithdrawCollateralProps extends PrepareUpdateQuotasProps {
-  /**
-   * list of assets which should be withdrawn
-   */
-  assetsToWithdraw: Array<Asset>;
-  /**
-   * Wallet address to withdraw token to
-   */
-  to: Address;
-  /**
-   * minimal credit account data on which operation is performed
-   */
-  creditAccount: RouterCASlice;
-}
 /**
  * Credit account and credit manager address pair, used for batch queries such as connected bot lookups.
  **/
@@ -351,16 +136,6 @@ type AccountToCheck = {
    **/
   creditManager: Address;
 };
-interface ExecuteSwapProps extends PrepareUpdateQuotasProps {
-  /**
-   * Array of MultiCall from router methods getSingleSwap or getAllSwaps
-   */
-  calls: Array<MultiCall>;
-  /**
-   * Minimal credit account data on which operation is performed
-   */
-  creditAccount: RouterCASlice;
-}
 interface PreviewDelayedWithdrawalProps {
   /**
    * Amount of source token (ex. cp0xlrt)
@@ -430,26 +205,6 @@ type AssembleClaimDelayedCallsProps = {
    */
   claimableNow: Pick<ClaimableWithdrawal, "outputs" | "claimCalls" | "withdrawalPhantomToken" | "withdrawalTokenSpent">;
 };
-interface StartDelayedWithdrawalProps extends PrepareUpdateQuotasProps {
-  /**
-   * Withdrawal preview
-   */
-  preview: RequestableWithdrawal;
-  /**
-   * Minimal credit account data on which operation is performed
-   */
-  creditAccount: RouterCASlice;
-}
-interface ClaimDelayedProps extends PrepareUpdateQuotasProps {
-  /**
-   * assets claimable now from getPendingWithdrawals
-   */
-  claimableNow: GetPendingWithdrawalsResult["claimableNow"][number];
-  /**
-   * Minimal credit account data on which operation is performed
-   */
-  creditAccount: RouterCASlice;
-}
 interface ClaimFarmRewardsProps extends PrepareUpdateQuotasProps {
   /**
       * Legacy property, v3.1 only enables token when quota is bought and when quota is bought token cannot be disabled.
@@ -529,27 +284,6 @@ interface OpenCAProps extends PrepareUpdateQuotasProps {
    */
   rwaOptions?: RWAOperationArgs;
 }
-interface ChangeDeptProps {
-  /**
-   * Minimal credit account data on which operation is performed
-   */
-  creditAccount: RouterCASlice;
-  /**
-   * Amount to change debt by
-   * 0 - prohibited value;
-   * negative value for debt decrease;
-   * positive value for debt increase.
-   */
-  amount: bigint;
-  /**
-   * Assets to add as collateral
-   */
-  collateral?: [Asset];
-  /**
-   * Assets to wrap
-   */
-  wrapAsset?: [Asset];
-}
 interface FullyLiquidateProps {
   /**
    * Credit account to liquidate
@@ -580,25 +314,7 @@ interface FullyLiquidateProps {
    */
   debtOnly?: boolean;
 }
-interface DefaultPartialLiquidationParams {
-  /**
-   * {@link PartiallyLiquidateProps.tokenOut}
-   */
-  tokenOut: Address;
-  /**
-   * {@link PartiallyLiquidateProps.repaidAmount}
-   */
-  repaidAmount: bigint;
-  /**
-   * {@link PartiallyLiquidateProps.minSeizedAmount}
-   */
-  minSeizedAmount: bigint;
-  /**
-   * {@link PartiallyLiquidateProps.optimalHF}
-   */
-  optimalHF: bigint;
-}
-interface PartiallyLiquidateProps {
+interface PartiallyLiquidateProps extends PartialLiquidationParams {
   /**
    * Credit account to liquidate
    */
@@ -607,30 +323,6 @@ interface PartiallyLiquidateProps {
    * Address to transfer underlying left after liquidation
    */
   to: Address;
-  /**
-   * Collateral token to seize.
-   * If omitted, the most valuable enabled non-underlying collateral token
-   * (by oracle)
-   */
-  tokenOut?: Address;
-  /**
-   * Amount of underlying token to repay.
-   * If omitted, computed internally
-   */
-  repaidAmount?: bigint;
-  /**
-   * Minimum amount of `token` to seize from `creditAccount`.
-   * If `token` is a phantom token, it's withdrawn first, and its `depositedToken` is then sent to the liquidator.
-   * In this case, `minSeizedAmount` is denominated in `depositedToken`.
-   * If omitted, computed internally.
-   */
-  minSeizedAmount?: bigint;
-  /**
-   * Target health factor for partial liquidation (4 digits precision, 10000 = 100%).
-   * If omitted, defaults to {@link ICreditAccountsService.getOptimalHFForPartialLiquidation}.
-   * Only used when `repaidAmount` is not explicitly provided.
-   */
-  optimalHF?: bigint;
 }
 /**
  * EIP-2612 permit signature data for a token, enabling gasless approval for credit account operations.
@@ -878,12 +570,6 @@ interface ICreditAccountsService extends Construct {
    * @returns Transaction data and optional loss policy data
    */
   fullyLiquidate(props: FullyLiquidateProps): Promise<FullyLiquidateResult>;
-  /**
-   * Calculates default partial liquidation parameters for a credit account
-   * These parameters are used as defaults for the {@link partiallyLiquidate} method.
-   * @param ca - Credit account to partially liquidate
-   */
-  defaultPartialLiquidationParams(ca: CreditAccountData): DefaultPartialLiquidationParams;
   /**
    * Generates transaction to partially liquidate credit account;
    *
@@ -897,64 +583,19 @@ interface ICreditAccountsService extends Construct {
    */
   partiallyLiquidate(props: PartiallyLiquidateProps): Promise<RawTx>;
   /**
-   * Builds close multicall calls without price feed updates.
-   *
-   * Same operation sequence as {@link closeCreditAccount} (close path swaps,
-   * disable quotas, decrease debt, withdraw assets), but does not prepend
-   * price updates and does not build the facade transaction.
+   * Builds close multicall calls without price feed updates: close path swaps,
+   * disable quotas, decrease debt, withdraw assets. Does not prepend price
+   * updates and does not build the facade transaction.
    *
    * @param props - {@link AssembleCloseCreditAccountCallsProps}
    * @returns Raw facade multicall payload for close (before price feed updates)
    */
   assembleCloseCreditAccountCalls(props: AssembleCloseCreditAccountCallsProps): Promise<Array<MultiCall>>;
-  /**
-   * Closes credit account or closes credit account and keeps it open with zero debt.
-   * - Ca is closed in the following order: price update -> close path to swap all tokens into underlying ->
-   * -> disable quotas of exiting tokens -> decrease debt -> disable exiting tokens -> withdraw underlying tokens
-   * @param props - {@link CloseCreditAccountProps}
-   * @returns All necessary data to execute the transaction (call, credit facade)
-   */
-  closeCreditAccount(props: CloseCreditAccountProps): Promise<CloseCreditAccountResult>;
-  /**
-   * Updates quota of credit account.
-   * CA quota updated in the following order: price update -> update quotas
-   * @param props - {@link UpdateQuotasProps}
-   * @returns All necessary data to execute the transaction (call, credit facade)
-   */
-  updateQuotas(props: UpdateQuotasProps): Promise<CreditAccountOperationResult>;
-  /**
-   * Adds a single collateral to credit account and updates quotas
-   * Collateral is added in the following order: price update -> add collateral (with permit) -> update quotas
-   * @param props - {@link AddCollateralProps}
-   * @returns All necessary data to execute the transaction (call, credit facade)
-   */
-  addCollateral(props: AddCollateralProps): Promise<CreditAccountOperationResult>;
-  /**
-   * Increases or decreases debt of credit account; debt decrease uses token ON CREDIT ACCOUNT
-   * Debt is changed in the following order: price update -> (enables underlying if it was disabled) -> change debt
-   * @param props - {@link ChangeDeptProps}
-   * @returns All necessary data to execute the transaction (call, credit facade)
-   */
-  changeDebt(props: ChangeDeptProps): Promise<CreditAccountOperationResult>;
-  /**
-   * Executes swap specified by given calls, update quotas of affected tokens
-   * Swap is executed in the following order: price update -> execute swap path -> update quotas
-   * @param props - {@link ExecuteSwapProps}
-   * @returns All necessary data to execute the transaction (call, credit facade)
-   */
-  executeSwap(props: ExecuteSwapProps): Promise<CreditAccountOperationResult>;
-  /**
-     * Start delayed withdrawal for given token
-       - Withdrawal is executed in the following order: price update -> execute withdraw calls -> update quotas
-     * @param props - {@link StartDelayedWithdrawalProps}
-     * @returns All necessary data to execute the transaction (call, credit facade)
-     */
-  startDelayedWithdrawal(props: StartDelayedWithdrawalProps): Promise<CreditAccountOperationResult>;
   /**
    * Builds start-delayed-withdrawal multicall calls without price feed updates
    * or quota updates.
    *
-   * Same balance bracket as {@link startDelayedWithdrawal}:
+   * Balance bracket:
    * `storeExpectedBalances` → `preview.requestCalls` → `compareBalances`.
    *
    * Besides the positive output deltas, the bracket carries a negative delta
@@ -966,13 +607,14 @@ interface ICreditAccountsService extends Construct {
    *
    * @param props - {@link AssembleStartDelayedWithdrawalCallsProps}
    * @returns Raw facade multicall payload for the delayed-withdrawal request
+   * @throws If `props.creditFacade` does not belong to a loaded market.
    */
   assembleStartDelayedWithdrawalCalls(props: AssembleStartDelayedWithdrawalCallsProps): Array<MultiCall>;
   /**
    * Builds claim-delayed-withdrawal multicall calls without price feed updates
    * or quota updates.
    *
-   * Same balance bracket as {@link claimDelayed}:
+   * Balance bracket:
    * `storeExpectedBalances` → `claimableNow.claimCalls` → `compareBalances`.
    *
    * Besides the positive output deltas, the bracket carries a negative delta
@@ -987,6 +629,7 @@ interface ICreditAccountsService extends Construct {
    *
    * @param props - {@link AssembleClaimDelayedCallsProps}
    * @returns Raw facade multicall payload for the claim
+   * @throws If `props.creditFacade` does not belong to a loaded market.
    */
   assembleClaimDelayedCalls(props: AssembleClaimDelayedCallsProps): Array<MultiCall>;
   /**
@@ -1001,13 +644,6 @@ interface ICreditAccountsService extends Construct {
    * @returns
    */
   getPendingWithdrawals(props: GetPendingWithdrawalsProps): Promise<GetPendingWithdrawalsResult>;
-  /**
-     * Claim tokens with delayed withdrawal
-       - Claim is executed in the following order: price update -> execute claim calls -> update quotas
-     * @param props - {@link ClaimDelayedProps}
-     * @returns
-    */
-  claimDelayed(props: ClaimDelayedProps): Promise<CreditAccountOperationResult>;
   /**
    * Returns address to which approval should be given on collateral token
    * It's credit manager for classical markets and special wallet for RWA markets
@@ -1033,20 +669,9 @@ interface ICreditAccountsService extends Construct {
    * - Strategy/trading: price update -> increase debt -> add collateral -> update quotas -> execute swap path
    * - In strategy is possible situation when collateral is added, but not swapped; the only swapped value in this case will be debt
    * @param props - {@link OpenCAProps}
-   * @returns All necessary data to execute the transaction (call, credit facade)
-   */
-  openCA(props: OpenCAProps): Promise<CreditAccountOperationResult>;
-  /**
-   * Returns borrow rate with 4 digits precision (10000 = 100%)
-   * @param ca
-   * @returns
-   */
-  getBorrowRate(ca: CreditAccountData): bigint;
-  /**
-   * Returns optimal HF for partial liquidation with 4 digits precision (10000 = 100%)
-   * @param ca
+   * @returns Raw transaction ready to be signed and sent
    */
-  getOptimalHFForPartialLiquidation(ca: CreditAccountData): bigint;
+  openCA(props: OpenCAProps): Promise<RawTx>;
   /**
    * Returns account price updates that can be used in credit facade multicall or liquidator calls
    * @param account - Credit account to get price updates for
@@ -1054,30 +679,6 @@ interface ICreditAccountsService extends Construct {
    * @returns Array of price updates
    */
   getOnDemandPriceUpdates(account: CreditAccountTokensSlice, ignoreReservePrices?: boolean): Promise<PriceUpdate[]>;
-  /**
-   * Executes a multicall on a credit account, automatically prepending
-   * necessary on-demand price feed updates.
-   *
-   * @param creditAccount - Credit account to execute multicall on
-   * @param calls - Array of multicall operations (price updates will be inferred)
-   * @param options - Optional settings for price update generation
-   * @returns Raw transaction ready to be signed and sent
-   */
-  multicall(creditAccount: RouterCASlice, calls: Array<MultiCall>, options?: {
-    ignoreReservePrices?: boolean;
-  }): Promise<RawTx>;
-  /**
-   * Executes a bot multicall on a credit account, automatically prepending
-   * necessary on-demand price feed updates.
-   *
-   * @param creditAccount - Credit account to execute bot multicall on
-   * @param calls - Array of multicall operations (price updates will be inferred)
-   * @param options - Optional settings for price update generation
-   * @returns Raw transaction ready to be signed and sent
-   */
-  botMulticall(creditAccount: RouterCASlice, calls: Array<MultiCall>, options?: {
-    ignoreReservePrices?: boolean;
-  }): Promise<RawTx>;
   /**
    * Analyzes a multicall array and prepends necessary on-demand price feed updates.
    *
@@ -1103,26 +704,42 @@ interface ICreditAccountsService extends Construct {
    *
    * @param props - Encodable operations and account context
    * @returns Array of facade / adapter multicall calls (without price feed updates)
+   * @throws If `props.creditFacade` does not belong to a loaded market.
    */
   assembleCaOperations(props: AssembleCaOperationsProps): Array<MultiCall>;
   /**
    * Encodes a facade `increaseDebt` multicall entry.
+   *
+   * @throws If `creditFacade` does not belong to a loaded market.
+   * @deprecated Use `creditSuite.creditFacade.prepareIncreaseDebt(debt)`.
    */
   prepareIncreaseDebt(creditFacade: Address, debt: bigint): MultiCall;
   /**
    * Encodes a facade `increaseDebt` or `decreaseDebt` multicall entry.
+   *
+   * @throws If `creditFacade` does not belong to a loaded market.
+   * @deprecated Use `creditSuite.creditFacade.prepareChangeDebt(change, isDecrease)`.
    */
   prepareChangeDebt(creditFacade: Address, change: bigint, isDecrease: boolean): MultiCall;
   /**
    * Encodes facade `addCollateral` / `addCollateralWithPermit` multicall entries.
+   *
+   * @throws If `creditFacade` does not belong to a loaded market.
+   * @deprecated Use `creditSuite.creditFacade.prepareAddCollateral(assets, permits)`.
    */
   prepareAddCollateral(creditFacade: Address, assets: Array<Asset>, permits: Record<string, PermitResult>): Array<MultiCall>;
   /**
    * Encodes a facade `withdrawCollateral` multicall entry.
+   *
+   * @throws If `creditFacade` does not belong to a loaded market.
+   * @deprecated Use `creditSuite.creditFacade.prepareWithdrawCollateral(token, amount, to)`.
    */
   prepareWithdrawToken(creditFacade: Address, token: Address, amount: bigint, to: Address): MultiCall;
   /**
    * Encodes facade `updateQuota` multicall entries from average/min quota assets.
+   *
+   * @throws If `creditFacade` does not belong to a loaded market.
+   * @deprecated Use `creditSuite.creditFacade.prepareUpdateQuotas(props)`.
    */
   prepareUpdateQuotas(creditFacade: Address, props: PrepareUpdateQuotasProps): Array<MultiCall>;
   /**
@@ -1132,15 +749,12 @@ interface ICreditAccountsService extends Construct {
    * @param creditAccount - Credit account to update
    * @param calls - Operation calls to execute
    * @param options - Optional price update and ETH value settings
-   * @returns Raw transaction and the final multicall payload
+   * @returns Raw transaction ready to be signed and sent
    */
   executeCaUpdate(creditAccount: RouterCASlice, calls: Array<MultiCall>, options?: {
     ignoreReservePrices?: boolean;
     ethAmount?: bigint;
-  }): Promise<{
-    tx: RawTx;
-    calls: Array<MultiCall>;
-  }>;
+  }): Promise<RawTx>;
   /**
    * Returns multicall entries to redeem (unwrap) RWA ERC-4626 vault shares into underlying for the given credit manager.
    * Used when withdrawing debt from a RWA market: redeems adapter vault shares so the underlying can be withdrawn.
@@ -1149,7 +763,7 @@ interface ICreditAccountsService extends Construct {
    * @param creditManager - Credit manager address
    * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not RWA or no adapter is configured
    */
-  getRWAUnwrapCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
+  assembleRWAUnwrapCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
   /**
    * Returns multicall entries to deposit (wrap) underlying into RWA ERC-4626 vault shares for the given credit manager.
    * Used when adding debt on a RWA market: deposits underlying into the adapter vault so shares are minted on the account.
@@ -1158,7 +772,7 @@ interface ICreditAccountsService extends Construct {
    * @param creditManager - Credit manager address
    * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not RWA or no adapter is configured
    */
-  getRWAWrapCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
+  assembleRWAWrapCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
   /**
    * Returns multicall entries to call redeemDiff on the RWA ERC-4626 adapter for the given credit manager.
    * Redeems the leftover vault shares (e.g. after repaying debt) so the account does not hold excess RWA vault tokens.
@@ -1167,7 +781,7 @@ interface ICreditAccountsService extends Construct {
    * @param creditManager - Credit manager address
    * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not RWA or no adapter is configured
    */
-  getRedeemDiffCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
+  assembleRedeemDiffCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
   /**
    * Returns multicall entries to call depositDiff on the RWA ERC-4626 adapter for the given credit manager.
    * Deposits the leftover underlying (e.g. after decreasing debt) into the vault so the account does not hold excess underlying.
@@ -1176,50 +790,25 @@ interface ICreditAccountsService extends Construct {
    * @param creditManager - Credit manager address
    * @returns Array of MultiCall to pass to credit facade multicall, or undefined if underlying is not RWA or no adapter is configured
    */
-  getDepositDiffCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
+  assembleDepositDiffCalls(amount: bigint, creditManager: Address): Promise<Array<MultiCall> | undefined>;
   /**
-   * Withdraws a single collateral from credit account to wallet to and updates quotas;
-   * technically can withdraw several tokens at once
-   *   - Collateral is withdrawn in the following order: price update -> withdraw token -> update quotas for affected tokens
-   * @param props - {@link WithdrawCollateralProps}
-   * @return All necessary data to execute the transaction (call, credit facade)
-   */
-  withdrawCollateral(props: WithdrawCollateralProps): Promise<CreditAccountOperationResult>;
-  /**
-   * Builds repay multicall calls without price feed updates.
-   *
-   * Same operation sequence as {@link repayCreditAccount} (add collateral, wrap calls,
-   * disable quotas, decrease debt, redeem/unwrap, claim rewards, withdraw assets),
-   * but does not prepend price updates and does not build the facade transaction.
+   * Builds repay multicall calls without price feed updates: add collateral,
+   * wrap calls, disable quotas, decrease debt, redeem/unwrap, claim rewards,
+   * withdraw assets. Does not prepend price updates and does not build the
+   * facade transaction.
    *
    * @param props - {@link AssembleRepayCreditAccountCallsProps}
    * @returns Raw facade multicall payload for repay (before price feed updates)
    */
   assembleRepayCreditAccountCalls(props: AssembleRepayCreditAccountCallsProps): Promise<Array<MultiCall>>;
-  /**
-   * Fully repays credit account or repays credit account and keeps it open with zero debt
-   * - Repays in the following order: price update -> add collateral to cover the debt ->
-   *   -> disable quotas for all tokens -> decrease debt -> disable tokens all tokens -> withdraw all tokens
-   * @param props - {@link RepayCreditAccountProps}
-   * @return All necessary data to execute the transaction (call, credit facade)
-   */
-  repayCreditAccount(props: RepayCreditAccountProps): Promise<CreditAccountOperationResult>;
-  /**
-   * Fully repays liquidatable account
-   * - Repay and liquidate is executed in the following order: price update -> add collateral to cover the debt ->
-   *   withdraw all tokens from credit account
-   * @param props - {@link RepayAndLiquidateCreditAccountProps}
-   * @return All necessary data to execute the transaction (call, credit facade)
-   */
-  repayAndLiquidateCreditAccount(props: RepayAndLiquidateCreditAccountProps): Promise<CreditAccountOperationResult>;
   /**
    * Claims farm rewards and optionally updates quotas
    *  - Claim rewards is executed in the following order: price update -> execute claim calls ->
    *   -> (optionally: update quotas)
    * @param props - {@link ClaimFarmRewardsProps}
-   * @return All necessary data to execute the transaction (call, credit facade)
+   * @return Raw transaction ready to be signed and sent
    */
-  claimFarmRewards(props: ClaimFarmRewardsProps): Promise<CreditAccountOperationResult>;
+  claimFarmRewards(props: ClaimFarmRewardsProps): Promise<RawTx>;
 }
 //#endregion
-export { AccountToCheck, AddCollateralProps, AssembleCaOperationsProps, AssembleClaimDelayedCallsProps, AssembleCloseCreditAccountCallsProps, AssembleRepayCreditAccountCallsProps, AssembleStartDelayedWithdrawalCallsProps, ChangeDeptProps, ClaimDelayedProps, ClaimFarmRewardsProps, CloseCreditAccountProps, CloseCreditAccountResult, CloseOptions, CreditAccountFilter, CreditAccountOperationResult, CreditAccountTokensSlice, CreditManagerFilter, CreditManagerOperationResult, DefaultPartialLiquidationParams, EncodableCreditAccountOperation, ExecuteSwapProps, FullyLiquidateProps, FullyLiquidateResult, GetApprovalAddressProps, GetConnectedBotsResult, GetConnectedMigrationBotsResult, GetCreditAccountsArgs, GetCreditAccountsOptions, GetOpenAccountRequirementsProps, GetPendingWithdrawalsProps, GetPendingWithdrawalsResult, ICreditAccountsService, ListStrategyPositionsProps, OpenCAProps, PartiallyLiquidateProps, PermitResult, PrepareUpdateQuotasProps, PreviewDelayedWithdrawalProps, RepayAndLiquidateCreditAccountProps, RepayCreditAccountProps, Rewards, SetBotProps, StartDelayedWithdrawalProps, UpdateQuotasProps, WithdrawCollateralProps };
+export { AccountToCheck, AssembleCaOperationsProps, AssembleClaimDelayedCallsProps, AssembleCloseCreditAccountCallsProps, AssembleRepayCreditAccountCallsProps, AssembleStartDelayedWithdrawalCallsProps, ClaimFarmRewardsProps, CloseCreditAccountResult, CreditAccountOperationResult, CreditManagerOperationResult, EncodableCreditAccountOperation, FullyLiquidateProps, FullyLiquidateResult, GetApprovalAddressProps, GetConnectedBotsResult, GetConnectedMigrationBotsResult, GetOpenAccountRequirementsProps, GetPendingWithdrawalsProps, GetPendingWithdrawalsResult, ICreditAccountsService, OpenCAProps, PartiallyLiquidateProps, PermitResult, PrepareUpdateQuotasProps, PreviewDelayedWithdrawalProps, Rewards, SetBotProps };