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

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

@@ -1,16 +1,15 @@
 import { iBaseRewardPoolAbi } from "../../abi/iBaseRewardPool.js";
 import { ierc4626AdapterAbi } from "../../abi/ierc4626Adapter.js";
-import { iBotListV310Abi, iCreditFacadeMulticallV310Abi } from "../../abi/310/generated.js";
+import { iBotListV310Abi } from "../../abi/310/generated.js";
 import { creditAccountCompressorAbi } from "../../abi/compressors/creditAccountCompressor.js";
 import { peripheryCompressorAbi } from "../../abi/compressors/peripheryCompressor.js";
 import { rewardsCompressorAbi } from "../../abi/compressors/rewardsCompressor.js";
 import { iRWAFactoryAbi } from "../../abi/rwa/iRWAFactory.js";
 import { AddressMap } from "../utils/AddressMap.js";
 import { AddressSet } from "../utils/AddressSet.js";
-import { AssetsMap } from "../utils/AssetsMap.js";
 import { AP_CREDIT_ACCOUNT_COMPRESSOR, AP_PERIPHERY_COMPRESSOR, AP_REWARDS_COMPRESSOR } from "../constants/address-provider.js";
 import { ADDRESS_0X0 } from "../constants/addresses.js";
-import { MAX_UINT256, MIN_INT96, PERCENTAGE_FACTOR, RAY } from "../constants/math.js";
+import { MAX_UINT256 } from "../constants/math.js";
 import { VERSION_RANGE_310 } from "../constants/versions.js";
 import "../constants/index.js";
 import { hexEq } from "../utils/hex.js";
@@ -18,12 +17,11 @@ import "../utils/index.js";
 import { SDKConstruct } from "../base/SDKConstruct.js";
 import "../base/index.js";
 import { borrowApyBps, healthFactorBps, positionLeverage, usdToNumber } from "../market/math.js";
+import { dominantCollateral } from "../market/credit/dominantCollateral.js";
 import { simulateWithPriceUpdates } from "../utils/viem/simulateWithPriceUpdates.js";
 import "../utils/viem/index.js";
 import { getRawPriceUpdates } from "../market/pricefeeds/getRawPriceUpdates.js";
 import "../market/index.js";
-import "./constants.js";
-import { dominantCollateral } from "./dominantCollateral.js";
 import { extractPriceUpdates, extractQuotaTokens, mergePriceUpdates } from "./multicall-utils.js";
 import { encodeFunctionData, getContract } from "viem";
 //#region src/sdk/accounts/CreditAccountsServiceV310.ts
@@ -436,212 +434,30 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 		};
 	}
 	/**
-	* {@inheritDoc ICreditAccountsService.defaultPartialLiquidationParams}
-	*/
-	defaultPartialLiquidationParams(ca) {
-		const tokenOut = this.#getBestTokenOut(ca);
-		const optimalHF = this.getOptimalHFForPartialLiquidation(ca);
-		const repaidAmount = this.#calcOptimalRepaidAmount(ca, tokenOut, optimalHF);
-		return {
-			tokenOut,
-			optimalHF,
-			repaidAmount,
-			minSeizedAmount: this.#calcMinSeizedAmount(ca, tokenOut, repaidAmount)
-		};
-	}
-	/**
 	* {@inheritDoc ICreditAccountsService.partiallyLiquidate}
 	*/
 	async partiallyLiquidate(props) {
 		const { account, to } = props;
-		const tokenOut = props.tokenOut ?? this.#getBestTokenOut(account);
-		const optimalHF = props.optimalHF ?? this.getOptimalHFForPartialLiquidation(account);
-		const repaidAmount = props.repaidAmount ?? this.#calcOptimalRepaidAmount(account, tokenOut, optimalHF);
-		const minSeizedAmount = props.minSeizedAmount ?? this.#calcMinSeizedAmount(account, tokenOut, repaidAmount);
 		const cm = this.sdk.marketRegister.findCreditManager(account.creditManager);
+		const { tokenOut, repaidAmount, minSeizedAmount } = cm.partialLiquidationParams(account, props);
 		const updates = await this.getOnDemandPriceUpdates(account, true);
 		return cm.creditFacade.partiallyLiquidateCreditAccount(account.creditAccount, tokenOut, repaidAmount, minSeizedAmount, to, updates);
 	}
 	/**
-	* Picks the most valuable enabled non-underlying collateral token on the
-	* credit account (by oracle value in underlying).
-	*
-	* Ported from solidity:
-	* https://github.com/Gearbox-protocol/router-v3/blob/main/contracts/liquidation/AbstractLiquidator.sol#L270
-	*/
-	#getBestTokenOut(account) {
-		const market = this.sdk.marketRegister.findByCreditManager(account.creditManager);
-		const underlying = market.underlying;
-		let bestVal = 0n;
-		let bestToken;
-		for (const t of account.tokens) {
-			if (t.token === underlying) continue;
-			if ((t.mask & account.enabledTokensMask) === 0n) continue;
-			if (t.balance === 0n) continue;
-			const val = market.priceOracle.convert(t.token, underlying, t.balance);
-			if (val > bestVal) {
-				bestVal = val;
-				bestToken = t.token;
-			}
-		}
-		if (!bestToken) throw new Error(`cannot determine tokenOut for partial liquidation of ${this.sdk.labelAddress(account.creditAccount)}: no enabled non-underlying collateral with value`);
-		return bestToken;
-	}
-	/**
-	* Returns the minimum amount of `token` collateral that must be seized when
-	* repaying `repaidAmount` of underlying. Mirrors the on-chain liquidation
-	* discount math, expired-aware.
-	*/
-	#calcMinSeizedAmount(account, token, repaidAmount) {
-		const market = this.sdk.marketRegister.findByCreditManager(account.creditManager);
-		const suite = this.sdk.marketRegister.findCreditManager(account.creditManager);
-		const fee = suite.isExpired ? suite.creditManager.liquidationDiscountExpired : suite.creditManager.liquidationDiscount;
-		return market.priceOracle.convert(market.underlying, token, repaidAmount) * 9990n / BigInt(fee);
-	}
-	/**
-	* Computes the optimal `repaidAmount` (in underlying) that brings the credit
-	* account's health factor close to `optimalHF` after partial liquidation.
-	*
-	* Ported from solidity:
-	* https://github.com/Gearbox-protocol/router-v3/blob/56e2d515ec6d9bb1e324e71c3708e59710779b24/contracts/liquidation/AbstractLiquidator.sol#L292
-	*/
-	#calcOptimalRepaidAmount(account, token, optimalHF) {
-		const suite = this.sdk.marketRegister.findCreditManager(account.creditManager);
-		const market = this.sdk.marketRegister.findByCreditManager(account.creditManager);
-		const cm = suite.creditManager;
-		const feeLiquidation = suite.isExpired ? cm.feeLiquidationExpired : cm.feeLiquidation;
-		const liquidationDiscount = suite.isExpired ? cm.liquidationDiscountExpired : cm.liquidationDiscount;
-		const discount = BigInt(liquidationDiscount) - BigInt(feeLiquidation);
-		const ltTokenOut = cm.liquidationThresholds.get(token);
-		if (ltTokenOut === void 0) throw new Error(`token ${this.sdk.labelAddress(token)} is not a collateral token in credit manager ${this.sdk.labelAddress(account.creditManager)}`);
-		const totalDebt = account.debt + account.accruedInterest + account.accruedFees;
-		const twvUnderlying = market.priceOracle.convertFromUSD(market.underlying, account.twvUSD);
-		const denominator = discount * optimalHF / PERCENTAGE_FACTOR - BigInt(ltTokenOut);
-		if (denominator <= 0n) throw new Error("cannot compute optimal repaid amount: invalid liquidation parameters (discount * hfOptimal <= ltTokenOut)");
-		const numerator = totalDebt * optimalHF - twvUnderlying * PERCENTAGE_FACTOR;
-		if (numerator <= 0n) return 0n;
-		let repaidAmount = numerator / denominator * discount / PERCENTAGE_FACTOR;
-		const minDebt = suite.creditFacade.minDebt;
-		if (totalDebt < minDebt) return 0n;
-		const surplusDebt = totalDebt - minDebt;
-		if (repaidAmount > surplusDebt) repaidAmount = surplusDebt * 999n / 1000n;
-		return repaidAmount;
-	}
-	/**
-	* {@inheritDoc ICreditAccountsService.closeCreditAccount}
-	**/
-	async closeCreditAccount({ operation, assetsToWithdraw, creditAccount: ca, to, slippage = 50n, closePath }) {
-		const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-		const routerCloseResult = closePath || await this.sdk.routerFor(ca).findBestClosePath({
-			creditAccount: ca,
-			creditManager: cm.creditManager,
-			slippage
-		});
-		const operationCalls = await this.assembleCloseCreditAccountCalls({
-			creditAccount: ca,
-			routerCalls: routerCloseResult.calls,
-			assetsToWithdraw,
-			to
-		});
-		const calls = operation === "close" ? operationCalls : await this.#prependPriceUpdates(ca.creditManager, operationCalls, ca);
-		return {
-			tx: await this.#closeCreditAccountTx(cm, ca.creditAccount, calls, operation),
-			calls,
-			routerCloseResult,
-			creditFacade: cm.creditFacade
-		};
-	}
-	/**
 	* {@inheritDoc ICreditAccountsService.assembleCloseCreditAccountCalls}
 	*/
 	async assembleCloseCreditAccountCalls({ creditAccount: ca, routerCalls, assetsToWithdraw, to }) {
-		const unwrapCalls = await this.getRedeemDiffCalls(1n, ca.creditManager) ?? [];
+		const unwrapCalls = await this.assembleRedeemDiffCalls(1n, ca.creditManager) ?? [];
+		const { creditFacade } = this.sdk.marketRegister.findCreditManager(ca.creditManager);
 		return [
 			...routerCalls,
-			...this.#prepareDisableQuotas(ca),
-			...this.#prepareDecreaseDebt(ca),
+			...creditFacade.prepareDisableQuotas([...ca.tokens]),
+			...ca.debt > 0n ? [creditFacade.prepareDecreaseDebtFull()] : [],
 			...unwrapCalls,
-			...assetsToWithdraw.map((t) => this.prepareWithdrawToken(ca.creditFacade, t, MAX_UINT256, to))
+			...assetsToWithdraw.map((t) => creditFacade.prepareWithdrawCollateral(t, MAX_UINT256, to))
 		];
 	}
 	/**
-	* {@inheritDoc ICreditAccountsService.updateQuotas}
-	**/
-	async updateQuotas({ minQuota, averageQuota, creditAccount }) {
-		const cm = this.sdk.marketRegister.findCreditManager(creditAccount.creditManager);
-		const operationCalls = this.prepareUpdateQuotas(creditAccount.creditFacade, {
-			minQuota,
-			averageQuota
-		});
-		const calls = await this.#prependPriceUpdates(creditAccount.creditManager, operationCalls, creditAccount);
-		return {
-			tx: await this.#multicallTx(cm, creditAccount.creditAccount, calls),
-			calls,
-			creditFacade: cm.creditFacade
-		};
-	}
-	/**
-	* {@inheritDoc ICreditAccountsService.addCollateral}
-	**/
-	async addCollateral({ creditAccount, asset, permit, ethAmount, minQuota, averageQuota }) {
-		const cm = this.sdk.marketRegister.findCreditManager(creditAccount.creditManager);
-		const operationCalls = [...this.prepareAddCollateral(creditAccount.creditFacade, [asset], permit ? { [asset.token]: permit } : {}), ...this.prepareUpdateQuotas(creditAccount.creditFacade, {
-			minQuota,
-			averageQuota
-		})];
-		const calls = await this.#prependPriceUpdates(creditAccount.creditManager, operationCalls, creditAccount);
-		const tx = await this.#multicallTx(cm, creditAccount.creditAccount, calls);
-		tx.value = ethAmount.toString(10);
-		return {
-			tx,
-			calls,
-			creditFacade: cm.creditFacade
-		};
-	}
-	/**
-	* {@inheritDoc ICreditAccountsService.changeDebt}
-	**/
-	async changeDebt({ creditAccount, amount, collateral }) {
-		if (amount === 0n) throw new Error("debt increase or decrease must be non-zero");
-		const isDecrease = amount < 0n;
-		const change = amount > 0n ? amount : -amount;
-		const cm = this.sdk.marketRegister.findCreditManager(creditAccount.creditManager);
-		const addCollateralCalls = collateral && isDecrease ? this.prepareAddCollateral(creditAccount.creditFacade, [{
-			token: collateral[0].token,
-			balance: collateral[0].balance
-		}], {}) : [];
-		const unwrapCalls = collateral && isDecrease ? await this.getRWAUnwrapCalls(collateral[0].balance, creditAccount.creditManager) || [] : [];
-		if (addCollateralCalls.length > 0 && unwrapCalls.length === 0 && collateral && collateral?.[0].token !== creditAccount.underlying) throw new Error("Can't use collateral other than underlying for non RWA market");
-		const operationCalls = [
-			...addCollateralCalls,
-			...unwrapCalls,
-			this.prepareChangeDebt(creditAccount.creditFacade, change, isDecrease)
-		];
-		const calls = await this.#prependPriceUpdates(creditAccount.creditManager, operationCalls, creditAccount);
-		return {
-			tx: await this.#multicallTx(cm, creditAccount.creditAccount, calls),
-			calls,
-			creditFacade: cm.creditFacade
-		};
-	}
-	/**
-	* {@inheritDoc ICreditAccountsService.executeSwap}
-	**/
-	async executeSwap({ creditAccount, calls: swapCalls, minQuota, averageQuota }) {
-		if (swapCalls.length === 0) throw new Error("No path to execute");
-		const cm = this.sdk.marketRegister.findCreditManager(creditAccount.creditManager);
-		const operationCalls = [...swapCalls, ...this.prepareUpdateQuotas(creditAccount.creditFacade, {
-			minQuota,
-			averageQuota
-		})];
-		const calls = await this.#prependPriceUpdates(creditAccount.creditManager, operationCalls, creditAccount);
-		return {
-			tx: await this.#multicallTx(cm, creditAccount.creditAccount, calls),
-			calls,
-			creditFacade: cm.creditFacade
-		};
-	}
-	/**
 	* {@inheritDoc ICreditAccountsService.previewDelayedWithdrawal}
 	**/
 	async previewDelayedWithdrawal({ creditAccount, amount, token, withdrawalPhantomToken, intent }) {
@@ -664,25 +480,6 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 		};
 	}
 	/**
-	* {@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);
-		return {
-			tx: await this.#multicallTx(cm, creditAccount.creditAccount, calls),
-			calls,
-			creditFacade: cm.creditFacade
-		};
-	}
-	/**
 	* {@inheritDoc ICreditAccountsService.assembleStartDelayedWithdrawalCalls}
 	**/
 	assembleStartDelayedWithdrawalCalls({ creditFacade, preview }) {
@@ -699,50 +496,14 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 			token: preview.token,
 			amount: -preview.amountIn
 		});
-		const storeExpectedBalances = {
-			target: creditFacade,
-			callData: encodeFunctionData({
-				abi: iCreditFacadeMulticallV310Abi,
-				functionName: "storeExpectedBalances",
-				args: [deltas]
-			})
-		};
-		const compareBalances = {
-			target: creditFacade,
-			callData: encodeFunctionData({
-				abi: iCreditFacadeMulticallV310Abi,
-				functionName: "compareBalances",
-				args: []
-			})
-		};
+		const facade = this.sdk.marketRegister.findCreditFacade(creditFacade);
 		return [
-			storeExpectedBalances,
+			facade.prepareStoreExpectedBalances(deltas),
 			...preview.requestCalls,
-			compareBalances
+			facade.prepareCompareBalances()
 		];
 	}
 	/**
-	* {@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 = [...this.assembleClaimDelayedCalls({
-			creditFacade: cm.creditFacade.address,
-			claimableNow
-		}), ...quotaCalls];
-		const calls = zeroDebt ? operationCalls : await this.#prependPriceUpdates(creditAccount.creditManager, operationCalls, creditAccount);
-		return {
-			tx: await this.#multicallTx(cm, creditAccount.creditAccount, calls),
-			calls,
-			creditFacade: cm.creditFacade
-		};
-	}
-	/**
 	* {@inheritDoc ICreditAccountsService.assembleClaimDelayedCalls}
 	**/
 	assembleClaimDelayedCalls({ creditFacade, claimableNow }) {
@@ -759,26 +520,11 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 			token: claimableNow.withdrawalPhantomToken,
 			amount: -claimableNow.withdrawalTokenSpent
 		});
-		const storeExpectedBalances = {
-			target: creditFacade,
-			callData: encodeFunctionData({
-				abi: iCreditFacadeMulticallV310Abi,
-				functionName: "storeExpectedBalances",
-				args: [deltas]
-			})
-		};
-		const compareBalances = {
-			target: creditFacade,
-			callData: encodeFunctionData({
-				abi: iCreditFacadeMulticallV310Abi,
-				functionName: "compareBalances",
-				args: []
-			})
-		};
+		const facade = this.sdk.marketRegister.findCreditFacade(creditFacade);
 		return [
-			storeExpectedBalances,
+			facade.prepareStoreExpectedBalances(deltas),
 			...claimableNow.claimCalls,
-			compareBalances
+			facade.prepareCompareBalances()
 		];
 	}
 	/**
@@ -809,12 +555,13 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 		let tokenToWithdraw;
 		if (withdrawToken === true) tokenToWithdraw = cm.underlying;
 		else if (typeof withdrawToken === "string") tokenToWithdraw = withdrawToken;
+		const { creditFacade } = cmSuite;
 		const operationCalls = [
-			this.prepareIncreaseDebt(cm.creditFacade, debt),
-			...this.prepareAddCollateral(cm.creditFacade, collateral, permits),
+			creditFacade.prepareIncreaseDebt(debt),
+			...creditFacade.prepareAddCollateral(collateral, permits),
 			...openPathCalls,
-			...tokenToWithdraw ? [this.prepareWithdrawToken(cm.creditFacade, tokenToWithdraw, MAX_UINT256, to)] : [],
-			...this.prepareUpdateQuotas(cm.creditFacade, {
+			...tokenToWithdraw ? [creditFacade.prepareWithdrawCollateral(tokenToWithdraw, MAX_UINT256, to)] : [],
+			...creditFacade.prepareUpdateQuotas({
 				minQuota,
 				averageQuota
 			}),
@@ -825,39 +572,7 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 		if (reopenCreditAccount) tx = await this.#multicallTx(cmSuite, reopenCreditAccount, calls);
 		else tx = await this.#openCreditAccountTx(cmSuite, to, calls, referralCode, rwaOptions);
 		tx.value = ethAmount.toString(10);
-		return {
-			calls,
-			tx,
-			creditFacade: cmSuite.creditFacade
-		};
-	}
-	/**
-	* {@inheritDoc ICreditAccountsService.getBorrowRate}
-	**/
-	getBorrowRate(ca) {
-		const { creditManager } = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-		const { pool } = this.sdk.marketRegister.findByCreditManager(ca.creditManager);
-		const { feeInterest } = creditManager;
-		const { baseInterestRate } = pool.pool;
-		const baseRateWithFee = baseInterestRate * (BigInt(feeInterest) + PERCENTAGE_FACTOR);
-		const totalDebt = ca.debt + ca.accruedInterest + ca.accruedFees;
-		const r = ca.debt * baseRateWithFee / (totalDebt * RAY);
-		const caTokens = new AddressMap(ca.tokens.map((t) => [t.token, t]));
-		let qr = 0n;
-		for (const t of creditManager.collateralTokens) {
-			const b = caTokens.get(t);
-			if (b) qr += b.quota * BigInt(pool.pqk.quotas.get(t)?.rate ?? 0);
-		}
-		qr = qr * (BigInt(feeInterest) + PERCENTAGE_FACTOR) / PERCENTAGE_FACTOR;
-		qr /= totalDebt;
-		return r + qr;
-	}
-	/**
-	* {@inheritDoc ICreditAccountsService.getOptimalHFForPartialLiquidation}
-	**/
-	getOptimalHFForPartialLiquidation(ca) {
-		const borrowRate = this.getBorrowRate(ca);
-		return PERCENTAGE_FACTOR + (borrowRate < 100n ? borrowRate : 100n);
+		return tx;
 	}
 	/**
 	* Internal wrapper for CreditAccountCompressor.getCreditAccounts + price updates wrapped into multicall
@@ -901,7 +616,7 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 	* @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
 	*/
-	async getRWAUnwrapCalls(amount, creditManager) {
+	async assembleRWAUnwrapCalls(amount, creditManager) {
 		const suite = this.sdk.marketRegister.findCreditManager(creditManager);
 		const meta = this.sdk.tokensMeta.mustGet(suite.underlying);
 		if (!this.sdk.tokensMeta.isRWAUnderlying(meta)) return;
@@ -928,7 +643,7 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 	* @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
 	*/
-	async getRWAWrapCalls(amount, creditManager) {
+	async assembleRWAWrapCalls(amount, creditManager) {
 		const suite = this.sdk.marketRegister.findCreditManager(creditManager);
 		const meta = this.sdk.tokensMeta.mustGet(suite.underlying);
 		if (!this.sdk.tokensMeta.isRWAUnderlying(meta)) return;
@@ -951,7 +666,7 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 	* @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
 	*/
-	async getRedeemDiffCalls(amount, creditManager) {
+	async assembleRedeemDiffCalls(amount, creditManager) {
 		const suite = this.sdk.marketRegister.findCreditManager(creditManager);
 		const meta = this.sdk.tokensMeta.mustGet(suite.underlying);
 		if (!this.sdk.tokensMeta.isRWAUnderlying(meta)) return;
@@ -974,7 +689,7 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 	* @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
 	*/
-	async getDepositDiffCalls(amount, creditManager) {
+	async assembleDepositDiffCalls(amount, creditManager) {
 		const suite = this.sdk.marketRegister.findCreditManager(creditManager);
 		const meta = this.sdk.tokensMeta.mustGet(suite.underlying);
 		if (!this.sdk.tokensMeta.isRWAUnderlying(meta)) return;
@@ -1009,14 +724,7 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 				stateMutability: "view"
 			}]
 		}).read.requiredPermissions();
-		const addBotCall = {
-			target: cm.creditFacade.address,
-			callData: encodeFunctionData({
-				abi: iCreditFacadeMulticallV310Abi,
-				functionName: "setBotPermissions",
-				args: [botAddress, permissions]
-			})
-		};
+		const addBotCall = cm.creditFacade.prepareSetBotPermissions(botAddress, permissions);
 		const calls = targetContract.type === "creditAccount" ? await this.#prependPriceUpdates(targetContract.creditManager, [addBotCall], targetContract) : [addBotCall];
 		return {
 			tx: targetContract.type === "creditAccount" ? await this.#multicallTx(cm, targetContract.creditAccount, calls) : void 0,
@@ -1025,79 +733,26 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 		};
 	}
 	/**
-	* {@inheritDoc ICreditAccountsService.withdrawCollateral}
-	*/
-	async withdrawCollateral({ creditAccount, assetsToWithdraw, to, minQuota, averageQuota }) {
-		const cm = this.sdk.marketRegister.findCreditManager(creditAccount.creditManager);
-		const operationCalls = [...assetsToWithdraw.map((a) => this.prepareWithdrawToken(cm.creditFacade.address, a.token, a.balance, to)), ...this.prepareUpdateQuotas(cm.creditFacade.address, {
-			minQuota,
-			averageQuota
-		})];
-		const calls = await this.#prependPriceUpdates(creditAccount.creditManager, operationCalls, creditAccount);
-		return {
-			tx: await this.#multicallTx(cm, creditAccount.creditAccount, calls),
-			calls,
-			creditFacade: cm.creditFacade
-		};
-	}
-	/**
-	* {@inheritDoc ICreditAccountsService.repayCreditAccount}
-	*/
-	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);
-		return {
-			tx: await this.#closeCreditAccountTx(cm, ca.creditAccount, calls, operation),
-			calls,
-			creditFacade: cm.creditFacade
-		};
-	}
-	/**
 	* {@inheritDoc ICreditAccountsService.assembleRepayCreditAccountCalls}
 	*/
 	async assembleRepayCreditAccountCalls({ collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, tokensToClaim, calls: wrapCalls = [] }) {
 		const addCollateral = collateralAssets.filter((a) => a.balance > 0);
 		const router = this.sdk.routerFor(ca);
-		const unwrapCalls = await this.getRedeemDiffCalls(1n, ca.creditManager) ?? [];
+		const unwrapCalls = await this.assembleRedeemDiffCalls(1n, ca.creditManager) ?? [];
 		const claimPath = await router.findClaimAllRewards({
 			tokensToClaim,
 			creditAccount: ca
 		});
+		const { creditFacade } = this.sdk.marketRegister.findCreditManager(ca.creditManager);
 		return [
-			...this.prepareAddCollateral(ca.creditFacade, addCollateral, permits),
+			...creditFacade.prepareAddCollateral(addCollateral, permits),
 			...wrapCalls,
-			...this.#prepareDisableQuotas(ca),
-			...this.#prepareDecreaseDebt(ca),
+			...creditFacade.prepareDisableQuotas([...ca.tokens]),
+			...ca.debt > 0n ? [creditFacade.prepareDecreaseDebtFull()] : [],
 			...unwrapCalls,
 			...claimPath.calls,
-			...assetsToWithdraw.map((t) => this.prepareWithdrawToken(ca.creditFacade, t.token, MAX_UINT256, to))
-		];
-	}
-	/**
-	* {@inheritDoc ICreditAccountsService.repayAndLiquidateCreditAccount}
-	*/
-	async repayAndLiquidateCreditAccount({ collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, tokensToClaim }) {
-		const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-		const claimPath = await this.sdk.routerFor(ca).findClaimAllRewards({
-			tokensToClaim,
-			creditAccount: ca
-		});
-		const wrapCalls = await this.getDepositDiffCalls(1n, ca.creditManager) ?? [];
-		const addCollateral = collateralAssets.filter((a) => a.balance > 0);
-		const operationCalls = [
-			...this.prepareAddCollateral(ca.creditFacade, addCollateral, permits),
-			...claimPath.calls,
-			...wrapCalls,
-			...assetsToWithdraw.map((t) => this.prepareWithdrawToken(ca.creditFacade, t.token, MAX_UINT256, to))
+			...assetsToWithdraw.map((t) => creditFacade.prepareWithdrawCollateral(t.token, MAX_UINT256, to))
 		];
-		const calls = await this.#prependPriceUpdates(ca.creditManager, operationCalls, ca);
-		return {
-			tx: cm.creditFacade.liquidateCreditAccount(ca.creditAccount, to, calls),
-			calls,
-			creditFacade: cm.creditFacade
-		};
 	}
 	/**
 	* {@inheritDoc ICreditAccountsService.claimFarmRewards}
@@ -1112,16 +767,12 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 			creditAccount: ca
 		});
 		if (claimPath.calls.length === 0) throw new Error("No path to execute");
-		const operationCalls = [...claimPath.calls, ...this.prepareUpdateQuotas(ca.creditFacade, {
+		const operationCalls = [...claimPath.calls, ...cm.creditFacade.prepareUpdateQuotas({
 			minQuota,
 			averageQuota
 		})];
 		const calls = await this.#prependPriceUpdates(ca.creditManager, operationCalls, ca);
-		return {
-			tx: await this.#multicallTx(cm, ca.creditAccount, calls),
-			calls,
-			creditFacade: cm.creditFacade
-		};
+		return await this.#multicallTx(cm, ca.creditAccount, calls);
 	}
 	/**
 	* Returns raw txs that are needed to update all price feeds so that all credit accounts (possibly from different markets) compute
@@ -1151,7 +802,8 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 	*/
 	async #prependPriceUpdates(creditManager, calls, ca, options) {
 		const market = this.sdk.marketRegister.findByCreditManager(creditManager);
-		const cm = this.sdk.marketRegister.findCreditManager(creditManager).creditManager;
+		const suite = this.sdk.marketRegister.findCreditManager(creditManager);
+		const cm = suite.creditManager;
 		const { priceUpdates: existingUpdates, remainingCalls } = extractPriceUpdates(calls);
 		const tokens = new AddressSet([cm.underlying, ...extractQuotaTokens(calls)]);
 		if (ca) for (const t of ca.tokens) {
@@ -1172,14 +824,7 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 		const generatedUpdates = await this.sdk.priceFeeds.generatePriceFeedsUpdates(priceFeeds);
 		const merged = mergePriceUpdates(existingUpdates, generatedUpdates);
 		if (merged.length === 0) return remainingCalls;
-		return [{
-			target: cm.creditFacade,
-			callData: encodeFunctionData({
-				abi: iCreditFacadeMulticallV310Abi,
-				functionName: "onDemandPriceUpdates",
-				args: [merged]
-			})
-		}, ...remainingCalls];
+		return [suite.creditFacade.prepareOnDemandPriceUpdates(merged), ...remainingCalls];
 	}
 	async #getUpdateForAccount(account, ignoreReservePrices) {
 		const { creditManager, creditAccount, enabledTokensMask } = account;
@@ -1203,22 +848,6 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 		return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(priceFeeds);
 	}
 	/**
-	* {@inheritDoc ICreditAccountsService.multicall}
-	*/
-	async multicall(creditAccount, calls, options) {
-		const cm = this.sdk.marketRegister.findCreditManager(creditAccount.creditManager);
-		const callsWithPrices = await this.#prependPriceUpdates(creditAccount.creditManager, calls, creditAccount, options);
-		return cm.creditFacade.multicall(creditAccount.creditAccount, callsWithPrices);
-	}
-	/**
-	* {@inheritDoc ICreditAccountsService.botMulticall}
-	*/
-	async botMulticall(creditAccount, calls, options) {
-		const cm = this.sdk.marketRegister.findCreditManager(creditAccount.creditManager);
-		const callsWithPrices = await this.#prependPriceUpdates(creditAccount.creditManager, calls, creditAccount, options);
-		return cm.creditFacade.botMulticall(creditAccount.creditAccount, callsWithPrices);
-	}
-	/**
 	* {@inheritDoc ICreditAccountsService.prependPriceUpdates}
 	*/
 	async prependPriceUpdates(creditManager, calls, creditAccount, options) {
@@ -1228,22 +857,23 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 	* {@inheritDoc ICreditAccountsService.assembleCaOperations}
 	*/
 	assembleCaOperations({ operations, creditFacade }) {
+		const facade = this.sdk.marketRegister.findCreditFacade(creditFacade);
 		const calls = [];
 		for (const op of operations) switch (op.type) {
 			case "increaseDebt":
-				calls.push(this.prepareIncreaseDebt(creditFacade, op.amount));
+				calls.push(facade.prepareIncreaseDebt(op.amount));
 				break;
 			case "decreaseDebt":
-				calls.push(this.prepareChangeDebt(creditFacade, op.amount, true));
+				calls.push(facade.prepareChangeDebt(op.amount, true));
 				break;
 			case "addCollateral":
-				calls.push(...this.prepareAddCollateral(creditFacade, [{
+				calls.push(...facade.prepareAddCollateral([{
 					token: op.token,
 					balance: op.amount
 				}], {}));
 				break;
 			case "withdrawCollateral":
-				calls.push(this.prepareWithdrawToken(creditFacade, op.token, op.amount, op.to));
+				calls.push(facade.prepareWithdrawCollateral(op.token, op.amount, op.to));
 				break;
 			case "swap":
 			case "wrapRwaCollateral":
@@ -1253,7 +883,7 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 			case "changeQuota": {
 				const quotaAssets = [...op.quotaIncrease, ...op.quotaDecrease];
 				if (quotaAssets.length === 0) break;
-				calls.push(...this.prepareUpdateQuotas(creditFacade, {
+				calls.push(...facade.prepareUpdateQuotas({
 					averageQuota: quotaAssets,
 					minQuota: quotaAssets
 				}));
@@ -1271,133 +901,37 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 		const callsWithPrices = await this.#prependPriceUpdates(creditAccount.creditManager, calls, creditAccount, { ignoreReservePrices: options?.ignoreReservePrices });
 		const tx = await this.#multicallTx(cm, creditAccount.creditAccount, callsWithPrices);
 		if (options?.ethAmount && options.ethAmount > 0n) tx.value = options.ethAmount.toString(10);
-		return {
-			tx,
-			calls: callsWithPrices
-		};
-	}
-	#prepareDisableQuotas(ca) {
-		const calls = [];
-		for (const { token, quota } of ca.tokens) if (quota > 0n) calls.push({
-			target: ca.creditFacade,
-			callData: encodeFunctionData({
-				abi: iCreditFacadeMulticallV310Abi,
-				functionName: "updateQuota",
-				args: [
-					token,
-					MIN_INT96,
-					0n
-				]
-			})
-		});
-		return calls;
+		return tx;
 	}
 	/**
 	* {@inheritDoc ICreditAccountsService.prepareUpdateQuotas}
 	*/
-	prepareUpdateQuotas(creditFacade, { averageQuota, minQuota }) {
-		const minRecord = new AssetsMap(minQuota);
-		return averageQuota.map((q) => {
-			const minBalance = minRecord.get(q.token);
-			const min = minBalance && minBalance > 0n ? minBalance : 0n;
-			return {
-				target: creditFacade,
-				callData: encodeFunctionData({
-					abi: iCreditFacadeMulticallV310Abi,
-					functionName: "updateQuota",
-					args: [
-						q.token,
-						q.balance,
-						min
-					]
-				})
-			};
-		});
-	}
-	#prepareDecreaseDebt(ca) {
-		if (ca.debt > 0n) return [{
-			target: ca.creditFacade,
-			callData: encodeFunctionData({
-				abi: iCreditFacadeMulticallV310Abi,
-				functionName: "decreaseDebt",
-				args: [MAX_UINT256]
-			})
-		}];
-		return [];
+	prepareUpdateQuotas(creditFacade, props) {
+		return this.sdk.marketRegister.findCreditFacade(creditFacade).prepareUpdateQuotas(props);
 	}
 	/**
 	* {@inheritDoc ICreditAccountsService.prepareWithdrawToken}
 	*/
 	prepareWithdrawToken(creditFacade, token, amount, to) {
-		return {
-			target: creditFacade,
-			callData: encodeFunctionData({
-				abi: iCreditFacadeMulticallV310Abi,
-				functionName: "withdrawCollateral",
-				args: [
-					token,
-					amount,
-					to
-				]
-			})
-		};
+		return this.sdk.marketRegister.findCreditFacade(creditFacade).prepareWithdrawCollateral(token, amount, to);
 	}
 	/**
 	* {@inheritDoc ICreditAccountsService.prepareIncreaseDebt}
 	*/
 	prepareIncreaseDebt(creditFacade, debt) {
-		return {
-			target: creditFacade,
-			callData: encodeFunctionData({
-				abi: iCreditFacadeMulticallV310Abi,
-				functionName: "increaseDebt",
-				args: [debt]
-			})
-		};
+		return this.sdk.marketRegister.findCreditFacade(creditFacade).prepareIncreaseDebt(debt);
 	}
 	/**
 	* {@inheritDoc ICreditAccountsService.prepareChangeDebt}
 	*/
 	prepareChangeDebt(creditFacade, change, isDecrease) {
-		return {
-			target: creditFacade,
-			callData: encodeFunctionData({
-				abi: iCreditFacadeMulticallV310Abi,
-				functionName: isDecrease ? "decreaseDebt" : "increaseDebt",
-				args: [change]
-			})
-		};
+		return this.sdk.marketRegister.findCreditFacade(creditFacade).prepareChangeDebt(change, isDecrease);
 	}
 	/**
 	* {@inheritDoc ICreditAccountsService.prepareAddCollateral}
 	*/
 	prepareAddCollateral(creditFacade, assets, permits) {
-		return assets.map(({ token, balance }) => {
-			const p = permits[token];
-			if (p) return {
-				target: creditFacade,
-				callData: encodeFunctionData({
-					abi: iCreditFacadeMulticallV310Abi,
-					functionName: "addCollateralWithPermit",
-					args: [
-						token,
-						balance,
-						p.deadline,
-						p.v,
-						p.r,
-						p.s
-					]
-				})
-			};
-			return {
-				target: creditFacade,
-				callData: encodeFunctionData({
-					abi: iCreditFacadeMulticallV310Abi,
-					functionName: "addCollateral",
-					args: [token, balance]
-				})
-			};
-		});
+		return this.sdk.marketRegister.findCreditFacade(creditFacade).prepareAddCollateral(assets, permits);
 	}
 	/**
 	* Returns addresses of market configurators
@@ -1446,24 +980,6 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 		return suite.creditFacade.multicall(creditAccount, calls);
 	}
 	/**
-	* Wrapper that selects between credit facade and RWA factory
-	* @param suite
-	* @param creditAccount
-	* @param calls
-	* @param operation
-	* @param rwaOptions
-	* @returns
-	*/
-	async #closeCreditAccountTx(suite, creditAccount, calls, operation, rwaOptions) {
-		const factory = this.sdk.marketRegister.findByCreditManager(suite.creditManager.address).rwaFactory;
-		if (operation === "close") {
-			if (factory) throw new Error("CloseOptions=close is not supported for RWA underlying credit accounts");
-			return suite.creditFacade.closeCreditAccount(creditAccount, calls);
-		}
-		if (factory) return factory.multicall(creditAccount, calls, rwaOptions);
-		return suite.creditFacade.multicall(creditAccount, calls);
-	}
-	/**
 	* Withdrawal compressor of the current chain.
 	* @throws If no withdrawal compressor is supported on the current chain.
 	**/