@gearbox-protocol/sdk 16.0.0-next.9 → 16.0.0

package/dist/esm/onchain/accounts/index.js

@@ -5,8 +5,10 @@ import { CreditAccountCompressorV310Contract } from "./credit-account-compressor
 import { CreditAccountCompressor } from "./credit-account-compressor/CreditAccountCompressor.js";
 import "./credit-account-compressor/index.js";
 import { CreditAccountsServiceV310 } from "./CreditAccountsServiceV310.js";
-import { IntentPreviewError, refuse } from "./intents/refusal.js";
+import { isPhantomToken } from "./intents/utils/pick-token.js";
+import { borrowable } from "./intents/guards.js";
 import { fetchCreditAccountSlice, toCreditAccountSlice } from "./intents/utils/credit-account-slice.js";
+import { calcDefaultQuota, calcQuotaUpdate, calcRecommendedQuota, roundUpQuota } from "./quota-utils.js";
 import { CreditAccountOperationsService } from "./intents/index.js";
 import { LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS } from "./liquidations/constants.js";
 import { LiquidationsService } from "./liquidations/LiquidationsService.js";
@@ -16,7 +18,6 @@ import "./types.js";
 import { DELAYED_INTENT_TYPES, DELAYED_INTENT_VERSION, decodeDelayedIntent, encodeDelayedIntent } from "./withdrawal-compressor/intent-codec.js";
 import { AbstractWithdrawalCompressorContract, iCreditAccountAbi, toClaimableWithdrawal, toPendingWithdrawal, toRequestableWithdrawal } from "./withdrawal-compressor/AbstractWithdrawalCompressorContract.js";
 import { getWithdrawalCompressorAddress } from "./withdrawal-compressor/addresses.js";
-import { InvalidDelayedIntentError } from "./withdrawal-compressor/errors.js";
 import { RedemptionLoggerV310Contract } from "./withdrawal-compressor/RedemptionLoggerV310Contract.js";
 import { createRedemptionLogger } from "./withdrawal-compressor/createRedemptionLogger.js";
 import { WithdrawalCompressorV310Contract } from "./withdrawal-compressor/WithdrawalCompressorV310Contract.js";
@@ -25,4 +26,4 @@ import { toWithdrawalStatus } from "./withdrawal-compressor/types.js";
 import { WithdrawalCompressorV313Contract } from "./withdrawal-compressor/WithdrawalCompressorV313Contract.js";
 import { createWithdrawalCompressor } from "./withdrawal-compressor/createWithdrawalCompressor.js";
 import "./withdrawal-compressor/index.js";
-export { AbstractWithdrawalCompressorContract, AccountBotsService, CreditAccountCompressor, CreditAccountCompressorV310Contract, CreditAccountOperationsService, CreditAccountsServiceV310, DELAYED_INTENT_TYPES, DELAYED_INTENT_VERSION, IntentPreviewError, InvalidDelayedIntentError, LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS, LiquidationsService, MultichainLiquidationsService, PeripheryCompressorV310Contract, RedemptionLoggerV310Contract, WithdrawalCompressorV310Contract, WithdrawalCompressorV311Contract, WithdrawalCompressorV313Contract, createRedemptionLogger, createWithdrawalCompressor, decodeDelayedIntent, encodeDelayedIntent, fetchCreditAccountSlice, getWithdrawalCompressorAddress, iCreditAccountAbi, refuse, toClaimableWithdrawal, toCreditAccountSlice, toPendingWithdrawal, toRequestableWithdrawal, toWithdrawalStatus };
+export { AbstractWithdrawalCompressorContract, AccountBotsService, CreditAccountCompressor, CreditAccountCompressorV310Contract, CreditAccountOperationsService, CreditAccountsServiceV310, DELAYED_INTENT_TYPES, DELAYED_INTENT_VERSION, LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS, LiquidationsService, MultichainLiquidationsService, PeripheryCompressorV310Contract, RedemptionLoggerV310Contract, WithdrawalCompressorV310Contract, WithdrawalCompressorV311Contract, WithdrawalCompressorV313Contract, borrowable, calcDefaultQuota, calcQuotaUpdate, calcRecommendedQuota, createRedemptionLogger, createWithdrawalCompressor, decodeDelayedIntent, encodeDelayedIntent, fetchCreditAccountSlice, getWithdrawalCompressorAddress, iCreditAccountAbi, isPhantomToken, roundUpQuota, toClaimableWithdrawal, toCreditAccountSlice, toPendingWithdrawal, toRequestableWithdrawal, toWithdrawalStatus };

package/dist/esm/onchain/accounts/intents/guards.js

@@ -1,6 +1,6 @@
-import { PERCENTAGE_FACTOR } from "../../constants/math.js";
-import "../../constants/index.js";
-import { IntentPreviewError } from "./refusal.js";
+import { MIN_HEALTH_FACTOR_FACADE, checkBorrowLimit, checkCollateralised, checkCreditManagerPaused, checkForbiddenToken, checkMarketExpired, checkQuotaLimit } from "../../validation/checks.js";
+import { raise } from "../../validation/refusal.js";
+import { toToken } from "../../validation/token.js";
 import { eq } from "./utils/common.js";
 import { isPhantomToken } from "./utils/pick-token.js";
 //#region src/onchain/accounts/intents/guards.ts
@@ -24,11 +24,15 @@ import { isPhantomToken } from "./utils/pick-token.js";
 */
 function assertMarketOperable(suite) {
 	const creditManager = suite.creditManager.address;
-	if (suite.isPaused) throw new IntentPreviewError("marketPaused", { creditManager }, `${creditManager} is paused`);
-	if (suite.isExpired) throw new IntentPreviewError("marketExpired", {
+	raise(checkCreditManagerPaused({
+		isPaused: suite.isPaused,
+		creditManager
+	}), `${creditManager} is paused`);
+	raise(checkMarketExpired({
+		isExpired: suite.isExpired,
 		creditManager,
 		expirationDate: suite.creditFacade.expirationDate
-	}, `${creditManager} expired at ${suite.creditFacade.expirationDate}`);
+	}), `${creditManager} expired at ${suite.creditFacade.expirationDate}`);
 }
 /**
 * What the pool will hand this manager in one transaction: the tightest of its
@@ -39,30 +43,35 @@ function assertMarketOperable(suite) {
 function borrowable(suite) {
 	const { pool } = suite.market.pool;
 	const { maxDebtPerBlockMultiplier, maxDebt } = suite.creditFacade;
-	if (maxDebtPerBlockMultiplier === 0) return 0n;
+	if (maxDebtPerBlockMultiplier === 0) return {
+		limit: 0n,
+		binding: "facadePerBlockCap"
+	};
 	const available = pool.creditManagerDebtParams.get(suite.creditManager.address)?.available;
 	return [
-		pool.availableLiquidity,
-		maxDebt * BigInt(maxDebtPerBlockMultiplier),
-		...available === void 0 ? [] : [available]
-	].reduce((a, b) => a < b ? a : b);
+		{
+			limit: pool.availableLiquidity,
+			binding: "poolAvailableLiquidity"
+		},
+		{
+			limit: maxDebt * BigInt(maxDebtPerBlockMultiplier),
+			binding: "facadePerBlockCap"
+		},
+		...available === void 0 ? [] : [{
+			limit: available,
+			binding: "managerDebtAvailable"
+		}]
+	].reduce((a, b) => b.limit < a.limit ? b : a);
 }
 /** The pool has to be able to lend what the plan means to draw. */
-function assertCanBorrow(suite, amount) {
-	const limit = borrowable(suite);
-	if (amount > limit) {
-		const token = suite.market.pool.underlying;
-		throw new IntentPreviewError("insufficientPoolLiquidity", {
-			requested: {
-				token,
-				balance: amount
-			},
-			available: {
-				token,
-				balance: limit
-			}
-		}, `borrow: ${amount} exceeds what the pool can lend now (${limit})`);
-	}
+function assertCanBorrow(sdk, suite, amount) {
+	const { limit, binding } = borrowable(suite);
+	raise(checkBorrowLimit({
+		requested: amount,
+		available: limit,
+		binding,
+		underlying: toToken(sdk, suite.market.pool.underlying)
+	}), `borrow: ${amount} exceeds what the pool can lend now (${limit})`);
 }
 /**
 * What the account is allowed to end up holding more of than it started with.
@@ -82,16 +91,17 @@ function assertGrowthAllowed(args) {
 	const underlying = market.pool.underlying;
 	for (const { token, balance } of after) {
 		if (balance <= (before.find((a) => eq(a.token, token))?.balance ?? 0n)) continue;
-		if (forbidden.some((f) => eq(f, token))) throw new IntentPreviewError("forbiddenToken", { token }, `${token} is forbidden in this market and the plan buys more of it`);
+		raise(checkForbiddenToken({
+			token: toToken(sdk, token),
+			isForbidden: forbidden.some((f) => eq(f, token))
+		}), `${token} is forbidden in this market and the plan buys more of it`);
 		if (eq(token, underlying) || isPhantomToken(sdk, token)) continue;
-		if (!market.pool.pqk.hasActiveQuota(token)) throw new IntentPreviewError("quotaLimitReached", {
-			token,
+		if (!market.pool.pqk.hasActiveQuota(token)) raise(checkQuotaLimit({
+			token: toToken(sdk, token),
 			requested: void 0,
-			available: {
-				token: underlying,
-				balance: 0n
-			}
-		}, `${token} takes no quota in this market, so it counts as no collateral`);
+			available: 0n,
+			underlying: toToken(sdk, underlying)
+		}), `${token} takes no quota in this market, so it counts as no collateral`);
 	}
 }
 /**
@@ -106,7 +116,7 @@ function assertGrowthAllowed(args) {
 * - here, `1.0` — what the facade enforces, so what a plan must clear to land;
 * - `maxWithdrawCollateral` sizes at `MIN_HF_LIMITED + 2` — a *sizing* helper
 *   leaving headroom, which is not the same as a validity check;
-* - `validateHF` refuses at or below `MIN_HF_LIMITED` — a form's own caution.
+* - a form refuses at or below `MIN_HF_LIMITED` (`MIN_HEALTH_FACTOR_FORM`).
 *
 * Raising this one to `MIN_HF_LIMITED` was tried and reverted: it made
 * `maxWithdraw` hand back a ceiling this guard then refused, and it blocked
@@ -124,35 +134,30 @@ function assertGrowthAllowed(args) {
 * still be refused on-chain after passing here.
 */
 function assertCollateralised(healthFactorBps, safePrices) {
-	const required = Number(PERCENTAGE_FACTOR);
-	if (healthFactorBps < required) throw new IntentPreviewError("insufficientCollateral", {
+	const required = MIN_HEALTH_FACTOR_FACADE;
+	raise(checkCollateralised({
 		healthFactor: healthFactorBps,
 		required,
 		safePrices
-	}, `the account would end at a health factor of ${healthFactorBps}, below ${required}`);
+	}), `the account would end at a health factor of ${healthFactorBps}, below ${required}`);
 }
 /**
 * A quota can only be raised as far as the market still has room for: past the
 * token's limit the keeper takes nothing more, whoever is asking.
 */
-function assertQuotaHeadroom(market, increases) {
+function assertQuotaHeadroom(sdk, market, increases) {
 	const underlying = market.pool.underlying;
 	for (const { token, balance } of increases) {
 		if (balance <= 0n) continue;
 		const quota = market.pool.pqk.quotas.get(token);
 		if (!quota) continue;
 		const left = quota.limit - quota.totalQuoted;
-		if (balance > left) throw new IntentPreviewError("quotaLimitReached", {
-			token,
-			requested: {
-				token: underlying,
-				balance
-			},
-			available: {
-				token: underlying,
-				balance: left
-			}
-		}, `${token} has ${left} of quota left, the plan needs ${balance}`);
+		raise(checkQuotaLimit({
+			token: toToken(sdk, token),
+			requested: balance,
+			available: left,
+			underlying: toToken(sdk, underlying)
+		}), `${token} has ${left} of quota left, the plan needs ${balance}`);
 	}
 }
 //#endregion

package/dist/esm/onchain/accounts/intents/index.js

@@ -1,11 +1,13 @@
 import { SDKConstruct } from "../../base/SDKConstruct.js";
-import { MIN_HF_LIMITED } from "../../../common-utils/utils/validation/validate-hf.js";
-import { IntentPreviewError, refuse } from "./refusal.js";
-import { assertMarketOperable } from "./guards.js";
+import { MIN_HF_LIMITED } from "../../validation/checks.js";
+import { IntentPreviewError, refuse } from "../../validation/refusal.js";
+import { isPhantomToken } from "./utils/pick-token.js";
+import { assertMarketOperable, borrowable } from "./guards.js";
+import { calcLeverageBand } from "./leverage-band.js";
 import { maxProportionalWithdrawal } from "./math.js";
 import { maxWithdrawCollateral } from "./maxWithdrawCollateral.js";
 import { fetchCreditAccountSlice, toCreditAccountSlice } from "./utils/credit-account-slice.js";
-import { previewOpenStrategy } from "./open-strategy.js";
+import { buildOpenStrategyState } from "./open-strategy.js";
 import { planAddCollateral, planAdjustLeverage, planAdjustLeverageDelayed, planDeposit, planRepay, planWithdraw, planWithdrawAsset, planWithdrawDelayed } from "./plan.js";
 import { realize } from "./realize.js";
 import { accountView } from "./view.js";
@@ -43,17 +45,27 @@ var CreditAccountOperationsService = class extends SDKConstruct {
 		}));
 	}
 	/**
-	* Largest `WITHDRAW` amount (in underlying) the account can take out while
-	* keeping leverage and staying inside the facade's debt band — the ceiling a
-	* withdraw form should offer. Taking everything out is the same intent with
-	* `MAX_UINT256` for an amount, and needs none of this arithmetic.
+	* Both ends of what a `WITHDRAW` can take out, in underlying: the largest
+	* partial withdrawal that keeps leverage and stays inside the facade's debt
+	* band, and the net value an exit hands over. They are reported together
+	* because a withdraw form needs both — the range it may offer, and the one
+	* amount past it that is allowed — and because the distance between them is
+	* the account's own, not a constant a caller could assume.
+	*
+	* Takes no target health factor, unlike {@link maxWithdrawCollateral}: a
+	* proportional withdrawal leaves the factor where it found it, and the
+	* facade's `minDebt` is what bounds it.
 	*
 	* @param props - Account slice and the SDK holding its market
-	* @returns Amount in underlying units; `0n` when nothing can leave
+	* @returns The two ceilings, see {@link WithdrawCeilings} for the gap between
+	* them
 	*/
 	maxWithdraw(props) {
 		const view = accountView(props.creditAccount, props.sdk);
-		return maxProportionalWithdrawal(view, view.band);
+		return {
+			partial: maxProportionalWithdrawal(view, view.band),
+			exit: view.collateral > 0n ? view.collateral : 0n
+		};
 	}
 	/**
 	* Debt a `REPAY` would have to cover to settle the account, in underlying
@@ -72,20 +84,44 @@ var CreditAccountOperationsService = class extends SDKConstruct {
 		return accountView(props.creditAccount, props.sdk).debt;
 	}
 	/**
+	* The leverages a position of a given size can be opened at, or moved to.
+	*
+	* A credit manager's `maxLeverage` follows from the liquidation threshold
+	* alone, so it is the same for a hundred dollars and for a million. What a
+	* given deposit reaches is decided by the debt it implies and by the band
+	* the market puts that debt in — the range a leverage slider should offer.
+	*
+	* Unlike the other ceilings here this one reads no account: opening has none
+	* yet, and adjusting measures against the net value the caller already
+	* holds. Nothing is fetched, so a form can ask on every keystroke.
+	*
+	* @param props - The manager, the SDK holding its market, what stands
+	* behind the position, and optionally the health factor the ceiling should
+	* leave
+	* @returns The band, or nothing when the market has none to offer
+	*/
+	leverageBand(props) {
+		return calcLeverageBand(props);
+	}
+	/**
 	* Largest `WITHDRAW_ASSET` amount of one token the account can take out
-	* while its health factor stays at {@link MIN_HF_LIMITED} plus a basis
-	* point — the ceiling a withdraw-collateral form should offer. Thresholds,
-	* prices and quota activity come from the account's market, valued the way
-	* the facade values a call that pays out; zero debt frees the whole balance.
+	* while its health factor stays at `targetHF` — the ceiling a
+	* withdraw-collateral form should offer. Thresholds, prices and quota
+	* activity come from the account's market, valued the way the facade values
+	* a call that pays out; zero debt frees the whole balance.
 	*
-	* @param props - Account slice, the SDK holding its market, and the
-	* collateral to withdraw
+	* The default is {@link MIN_HF_LIMITED}, the bar a form holds an
+	* account to.
+	*
+	* @param props - Account slice, the SDK holding its market, the collateral
+	* to withdraw, and optionally the health factor to leave behind
 	* @returns Amount in the token's units; `0n` when nothing can leave
 	*/
 	maxWithdrawCollateral(props) {
+		const { targetHF = MIN_HF_LIMITED, ...rest } = props;
 		return maxWithdrawCollateral({
-			...props,
-			targetHF: MIN_HF_LIMITED + 2n
+			...rest,
+			targetHF: targetHF + 2n
 		});
 	}
 	/**
@@ -139,7 +175,7 @@ var CreditAccountOperationsService = class extends SDKConstruct {
 			});
 			return {
 				...result,
-				preview: tail.state,
+				state: tail.state,
 				delayed
 			};
 		} catch (e) {
@@ -199,17 +235,36 @@ var CreditAccountOperationsService = class extends SDKConstruct {
 	* whole tail: the tokens land on the account and only their quota has to
 	* catch up.
 	*
+	* A claim that brought only part of what the request queued — a legacy Mellow
+	* multivault, which pays out what it holds liquid and re-queues the rest — is
+	* served in proportion, and what it did not settle comes back as `remainder`:
+	* the withdrawal still in flight and the intent to finish it with.
+	*
 	* @param props - The recorded intent, the account slice as it stands now, and
 	* the matured claimable
-	* @returns Shaped exactly like {@link startIntent}'s result, so both halves of
-	* an operation are consumed the same way
+	* @returns Shaped exactly like {@link startIntent}'s result with the remainder
+	* beside it, so both halves of an operation are consumed the same way
 	*/
 	async finishIntent(props) {
-		return plain(await this.#preview(props, () => planTail({
-			intent: props.intent,
-			claimable: props.claimable,
-			view: accountView(props.creditAccount, props.sdk)
-		})));
+		let remainder;
+		const result = await this.#preview(props, () => {
+			const tail = planTail({
+				intent: props.intent,
+				claimable: props.claimable,
+				view: accountView(props.creditAccount, props.sdk)
+			});
+			remainder = tail.remainder;
+			return tail.steps;
+		});
+		if (!result.ok) return result;
+		const { operations, state, calls } = result;
+		return {
+			ok: true,
+			operations,
+			state,
+			calls,
+			remainder
+		};
 	}
 	/**
 	* Previews opening a brand-new leveraged position.
@@ -227,7 +282,7 @@ var CreditAccountOperationsService = class extends SDKConstruct {
 		try {
 			return {
 				ok: true,
-				preview: await previewOpenStrategy(props)
+				state: await buildOpenStrategyState(props)
 			};
 		} catch (e) {
 			return asFailure(e);
@@ -246,7 +301,7 @@ var CreditAccountOperationsService = class extends SDKConstruct {
 			return {
 				ok: true,
 				operations,
-				preview: state,
+				state,
 				calls,
 				delayed
 			};
@@ -258,11 +313,11 @@ var CreditAccountOperationsService = class extends SDKConstruct {
 /** Drops the delayed half for the flows that cannot produce one. */
 function plain(result) {
 	if (!result.ok) return result;
-	const { operations, preview, calls } = result;
+	const { operations, state, calls } = result;
 	return {
 		ok: true,
 		operations,
-		preview,
+		state,
 		calls
 	};
 }
@@ -285,4 +340,4 @@ function isUnroutable(e) {
 	return false;
 }
 //#endregion
-export { CreditAccountOperationsService, IntentPreviewError, fetchCreditAccountSlice, refuse, toCreditAccountSlice };
+export { CreditAccountOperationsService, borrowable, fetchCreditAccountSlice, isPhantomToken, toCreditAccountSlice };

package/dist/esm/onchain/accounts/intents/leverage-band.js

@@ -0,0 +1,69 @@
+import { BigIntMath } from "../../utils/bigint-math.js";
+import { LEVERAGE_DECIMALS } from "../../constants/math.js";
+//#region src/onchain/accounts/intents/leverage-band.ts
+/**
+* The leverages this market will actually fund for a position of this size.
+*
+* A credit manager's `maxLeverage` follows from the liquidation threshold
+* alone, so it is the same for a hundred dollars and for a million. What a
+* given deposit reaches is decided by the debt it implies —
+* `debt = netValue × (leverage − 1)` — and by the band the market puts that
+* debt in. This inverts that relation.
+*
+* Rounding is asymmetric because the forward direction truncates: the floor
+* rounds **up** so the leverage it names really does clear `minDebt`, and the
+* ceiling rounds **down** so it really does stay under the borrow limit.
+*
+* Nothing here is fetched or simulated — every input is loaded market state,
+* so a form can call this on each keystroke.
+*
+* @param props - {@link LeverageBandProps}
+* @returns The band, or `undefined` when there is nothing to offer: an
+* unknown manager, a market with no strategy, or a deposit too small to reach
+* `minDebt` at any leverage the threshold allows.
+*
+* @example
+* ```ts
+* // minDebt 1k, borrow limit 100k, threshold ceiling 9x, deposit worth 10k
+* calcLeverageBand({ sdk, creditManager, collateral }) // { min: 1.1, max: 9 }
+* ```
+**/
+function calcLeverageBand({ sdk, creditManager, collateral, targetHF }) {
+	const found = resolve(sdk, creditManager);
+	if (!found) return;
+	const { suite, market } = found;
+	const target = suite.strategyTargetCollateral;
+	if (!target) return;
+	const ceiling = suite.creditManager.maxLeverage(target, targetHF);
+	const underlying = market.pool.underlying;
+	const convert = (from, to, amount) => market.priceOracle.safeConvert(from, to, amount).value;
+	const netValue = collateral.reduce((acc, a) => acc + convert(a.token, underlying, a.balance), 0n);
+	if (netValue <= 0n) return {
+		min: 1,
+		max: ceiling
+	};
+	const { minDebt, maxDebt } = suite.creditFacade;
+	const available = market.pool.pool.creditManagerDebtParams.get(suite.creditManager.address)?.available;
+	const borrowLimit = available === void 0 ? maxDebt : BigIntMath.min(maxDebt, available);
+	const floor = BigIntMath.ceilDiv(LEVERAGE_DECIMALS * minDebt, netValue);
+	const roof = LEVERAGE_DECIMALS * borrowLimit / netValue;
+	const min = 1 + Number(floor) / Number(LEVERAGE_DECIMALS);
+	const max = Math.min(ceiling, 1 + Number(roof) / Number(LEVERAGE_DECIMALS));
+	return min > max ? void 0 : {
+		min,
+		max
+	};
+}
+/** The manager's suite and market, or nothing while they cannot be resolved. */
+function resolve(sdk, creditManager) {
+	try {
+		return {
+			suite: sdk.marketRegister.findCreditManager(creditManager),
+			market: sdk.marketRegister.findByCreditManager(creditManager)
+		};
+	} catch {
+		return;
+	}
+}
+//#endregion
+export { calcLeverageBand };

package/dist/esm/onchain/accounts/intents/math.js

@@ -1,6 +1,8 @@
 import { BigIntMath } from "../../utils/bigint-math.js";
 import { LEVERAGE_DECIMALS } from "../../constants/math.js";
-import { IntentPreviewError } from "./refusal.js";
+import { checkDebtInBand, checkLeverageAtLeastOne } from "../../validation/checks.js";
+import { IntentPreviewError, raise } from "../../validation/refusal.js";
+import { toToken } from "../../validation/token.js";
 //#region src/onchain/accounts/intents/math.ts
 /** Debt that realises `leverage` on `collateral`: `D = C · (L − 1)`. */
 function debtForLeverage(collateral, leverage) {
@@ -37,32 +39,23 @@ function maxProportionalWithdrawal(position, band) {
 }
 /** Total leverage cannot drop below 1x — that would be negative debt. */
 function assertLeverageAtLeastOne(leverage) {
-	if (leverage < 100n) throw new IntentPreviewError("leverageOutOfRange", {
-		requested: leverage,
+	raise(checkLeverageAtLeastOne({
+		leverage,
 		min: LEVERAGE_DECIMALS
-	}, `target leverage ${leverage} is below 1x`);
+	}), `target leverage ${leverage} is below 1x`);
 }
 /**
 * Rejects a debt the facade would revert on: zero is always fine (no loan at
 * all), anything else has to sit inside `[minDebt, maxDebt]`.
 */
-function assertDebtInBand(debt, band, underlying) {
-	const detail = {
-		requested: {
-			token: underlying,
-			balance: debt
-		},
-		minDebt: {
-			token: underlying,
-			balance: band.minDebt
-		},
-		maxDebt: {
-			token: underlying,
-			balance: band.maxDebt
-		}
-	};
-	if (debt > band.maxDebt) throw new IntentPreviewError("debtOutOfRange", detail, `debt ${debt} exceeds maxDebt ${band.maxDebt}`);
-	if (debt > 0n && debt < band.minDebt) throw new IntentPreviewError("debtOutOfRange", detail, `debt ${debt} is below minDebt ${band.minDebt}`);
+function assertDebtInBand(sdk, debt, band, underlying) {
+	raise(checkDebtInBand({
+		debt,
+		minDebt: band.minDebt,
+		maxDebt: band.maxDebt,
+		underlying: toToken(sdk, underlying),
+		allowZero: true
+	}), debt > band.maxDebt ? `debt ${debt} exceeds maxDebt ${band.maxDebt}` : `debt ${debt} is below minDebt ${band.minDebt}`);
 }
 //#endregion
 export { assertDebtInBand, assertLeverageAtLeastOne, debtForLeverage, maxProportionalWithdrawal, proportionalDebt };

package/dist/esm/onchain/accounts/intents/maxWithdrawCollateral.js

@@ -11,9 +11,11 @@ import { eq } from "./utils/common.js";
 * check counts: a holding backed by a quota contributes the lesser of the
 * quota and its threshold-weighted value, an unquoted one — the underlying —
 * its weighted value alone, and dust or a disabled balance nothing at all.
-* Collateral is valued at the lower of its two feeds, the way the facade
-* values a call that hands funds over; the debt is valued at the main feed,
-* as the check does. Zero debt frees the whole balance.
+* Collateral is valued at the protocol safe price (`min` of the two feeds,
+* 0 when there is no reserve), the way the facade values a call that hands
+* funds over; the underlying is exempt and is valued at the main feed, as
+* `CreditManagerV3._safeConvertToUSD` does. The debt is valued at the main
+* feed, as the check does. Zero debt frees the whole balance.
 *
 * Rounding always favours the account, so the answer clears the check rather
 * than landing a wei short of it.
@@ -30,13 +32,13 @@ function maxWithdrawCollateral(props) {
 	const underlying = market.pool.underlying;
 	const target = creditAccount.tokens.find((t) => eq(t.token, token));
 	if (!target || target.balance <= 10n) return 0n;
-	if (creditAccount.accountDebt === 0n) return target.balance;
+	if (creditAccount.totalDebt === 0n) return target.balance;
 	const masked = creditAccount.enabledTokensMask !== 0n;
 	const counts = (t) => t.balance > 10n && (!masked || (t.mask & creditAccount.enabledTokensMask) !== 0n);
 	/** What a holding backs, in the check's units: USD × PERCENTAGE_FACTOR. */
 	const weigh = (t) => {
 		const lt = BigInt(creditManager.liquidationThresholds.get(t.token) ?? 0);
-		const weighted = (safeUsd(priceOracle, t.token, t.balance) ?? 0n) * lt;
+		const weighted = (eq(t.token, underlying) ? usd(priceOracle, t.token, t.balance) ?? 0n : priceOracle.safeConvertMinUSD(t.token, t.balance).value) * lt;
 		if (t.quota === 0n) return weighted;
 		return BigIntMath.min(quotaUsd(t) * PERCENTAGE_FACTOR, weighted);
 	};
@@ -47,15 +49,15 @@ function maxWithdrawCollateral(props) {
 		if (eq(t.token, token) || !counts(t)) continue;
 		otherMoney += weigh(t);
 	}
-	const borrowed = usd(priceOracle, underlying, creditAccount.accountDebt);
+	const borrowed = usd(priceOracle, underlying, creditAccount.totalDebt);
 	if (borrowed === void 0 || borrowed <= 0n) return 0n;
 	const required = borrowed * targetHF;
 	if (required <= otherMoney) return target.balance;
 	const shortfall = required - otherMoney;
 	if (target.quota > 0n && quotaUsd(target) * 10000n < shortfall) return 0n;
 	const targetLt = BigInt(creditManager.liquidationThresholds.get(target.token) ?? 0);
-	const targetUsd = safeUsd(priceOracle, target.token, target.balance);
-	if (targetLt === 0n || !targetUsd) return 0n;
+	const targetUsd = eq(target.token, underlying) ? usd(priceOracle, target.token, target.balance) ?? 0n : priceOracle.safeConvertMinUSD(target.token, target.balance).value;
+	if (targetLt === 0n || targetUsd === 0n) return 0n;
 	const keptUsd = BigIntMath.ceilDiv(shortfall, targetLt);
 	const kept = BigIntMath.ceilDiv(target.balance * keptUsd, targetUsd);
 	return kept >= target.balance ? 0n : target.balance - kept;
@@ -68,18 +70,5 @@ function usd(oracle, token, amount) {
 		return;
 	}
 }
-/**
-* USD value at the lower of the token's two feeds — what a call handing funds
-* over is judged at. Falls back to the main feed where there is no second one.
-**/
-function safeUsd(oracle, token, amount) {
-	const main = usd(oracle, token, amount);
-	if (main === void 0) return;
-	try {
-		return BigIntMath.min(main, oracle.convertToUSD(token, amount, true));
-	} catch {
-		return main;
-	}
-}
 //#endregion
 export { maxWithdrawCollateral };