@gearbox-protocol/sdk 17.6.1 → 17.7.0

package/dist/cjs/onchain/accounts/intents/borrow.js

@@ -55,7 +55,7 @@ async function buildBorrowState(props) {
 		totalDebt: market.toUnderlyingAmount(debt),
 		netValue: market.toUnderlyingAmount(margin - debt)
 	});
-	require_onchain_accounts_intents_math.assertDebtLimits(sdk, debt, suite.creditFacade, underlying, suite.maxBorrowAmount());
+	require_onchain_accounts_intents_math.assertDebtLimits(sdk, debt, suite.creditFacade, underlying, { maxBorrowAmount: existing ? void 0 : suite.maxBorrowAmount() });
 	require_onchain_accounts_intents_guards.assertCanBorrow(sdk, suite, debt);
 	const account = existing ?? require_onchain_accounts_intents_utils_credit_account_slice.unopenedAccountSlice({
 		creditManager,

package/dist/cjs/onchain/accounts/intents/collateral-valuation.js

@@ -4,8 +4,10 @@ const require_onchain_constants_math = require("../../constants/math.js");
 require("../../utils/index.js");
 const require_onchain_accounts_intents_utils_common = require("./utils/common.js");
 //#region src/onchain/accounts/intents/collateral-valuation.ts
-/** {@inheritDoc CollateralValuation} */
-function collateralValuation(creditAccount, sdk) {
+/** {@inheritDoc CollateralValuation}
+* Set `safePrices` to false to value the same counted holdings at main prices.
+*/
+function collateralValuation(creditAccount, sdk, safePrices = true) {
 	const { market, creditManager } = sdk.marketRegister.findCreditManager(creditAccount.creditManager);
 	const { priceOracle } = market;
 	const { pqk } = market.pool;
@@ -19,7 +21,7 @@ function collateralValuation(creditAccount, sdk) {
 		}
 	};
 	const lt = (token) => BigInt(creditManager.liquidationThresholds.get(token) ?? 0);
-	const checkedUsd = (holding) => require_onchain_accounts_intents_utils_common.eq(holding.token, underlying) ? mainUsd(holding.token, holding.balance) ?? 0n : priceOracle.safeConvertMinUSD(holding.token, holding.balance).value;
+	const checkedUsd = (holding) => !safePrices || require_onchain_accounts_intents_utils_common.eq(holding.token, underlying) ? mainUsd(holding.token, holding.balance) ?? 0n : priceOracle.safeConvertMinUSD(holding.token, holding.balance).value;
 	/** A quota is underlying-denominated, and a closed market backs nothing. */
 	const quotaValue = (holding) => pqk.hasActiveQuota(holding.token) ? (mainUsd(underlying, holding.quota) ?? 0n) * require_onchain_constants_math.PERCENTAGE_FACTOR : 0n;
 	const weigh = (holding) => {

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

@@ -46,13 +46,14 @@ function assertMarketOperable(suite) {
 	}), `${creditManager} expired at ${suite.creditFacade.expirationDate}`);
 }
 /** The pool has to be able to lend what the plan means to draw. */
-function assertCanBorrow(sdk, suite, amount) {
+function assertCanBorrow(sdk, suite, amount, options = {}) {
 	const maxBorrowAmount = suite.maxBorrowAmount();
 	require_onchain_validation_raise.raise(require_onchain_validation_checks_checkBorrowLimit.checkBorrowLimit({
 		requested: amount,
 		available: maxBorrowAmount.amount.value,
 		limit: maxBorrowAmount.limit,
-		underlying: require_onchain_validation_helpers_token.toToken(sdk, suite.market.pool.underlying)
+		underlying: require_onchain_validation_helpers_token.toToken(sdk, suite.market.pool.underlying),
+		getCollateralLimits: options.getCollateralLimits
 	}), `borrow: ${amount} exceeds what the pool can lend now (${maxBorrowAmount.amount.value})`);
 }
 /**

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

@@ -64,18 +64,23 @@ var CreditAccountOperationsService = class extends require_onchain_base_SDKConst
 	* it as `safePartial`. The second is the one to offer — see
 	* {@link WithdrawCeilings}.
 	*
-	* Takes no target health factor, unlike {@link maxWithdrawCollateral}. A
-	* proportional withdrawal leaves the factor where it found it, so there is
-	* no room to choose: what these answer to is the facade's own threshold,
-	* which is also what {@link startIntent} refuses against.
+	* The default target health factor is the facade's own threshold, which is
+	* also what {@link startIntent} refuses against. A form holding the account
+	* to something stricter passes its own, as with
+	* {@link maxWithdrawCollateral}.
 	*
-	* @param props - Account slice, the SDK holding its market, and optionally
-	* the collateral the withdrawal would be funded from
+	* @param props - Account slice, the SDK holding its market, optionally the
+	* collateral the withdrawal would be funded from, and optionally the health
+	* factor the ceiling should leave
 	* @returns The three limits, see {@link WithdrawCeilings} for the gap
 	* between them
 	*/
 	maxWithdraw(props) {
-		return require_onchain_accounts_intents_withdraw_limits.withdrawLimits(props);
+		const { targetHF = BigInt(require_onchain_validation_helpers_health_factor_limits.MIN_HEALTH_FACTOR_FACADE), ...rest } = props;
+		return require_onchain_accounts_intents_withdraw_limits.withdrawLimits({
+			...rest,
+			targetHF: targetHF + 2n
+		});
 	}
 	/**
 	* Debt a `REPAY` would have to cover to settle the account, in underlying
@@ -115,23 +120,23 @@ var CreditAccountOperationsService = class extends require_onchain_base_SDKConst
 	}
 	/**
 	* Largest `WITHDRAW_ASSET` amount of one token the account can take out
-	* while its health factor stays at `targetHF` — the ceiling a
+	* while its main and safe health factors clear their targets — 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 withdraws collateral; zero debt frees the whole balance.
 	*
-	* The default is {@link MIN_HF_LIMITED}, the threshold a form holds an
-	* account to.
+	* Defaults are the independent main and safe form thresholds.
 	*
 	* @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 = require_onchain_validation_helpers_health_factor_limits.MIN_HF_LIMITED, ...rest } = props;
+		const { targetHF = BigInt(require_onchain_validation_helpers_health_factor_limits.MIN_HEALTH_FACTOR_FORM), targetSafeHF = BigInt(require_onchain_validation_helpers_health_factor_limits.MIN_SAFE_HEALTH_FACTOR_FORM), ...rest } = props;
 		return require_onchain_accounts_intents_maxWithdrawCollateral.maxWithdrawCollateral({
 			...rest,
-			targetHF: targetHF + 2n
+			targetHF: targetHF + 2n,
+			targetSafeHF: targetSafeHF + 2n
 		});
 	}
 	/**

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

@@ -48,7 +48,7 @@ function calcLeverageBand({ sdk, creditManager, collateral, targetHF }) {
 	const available = market.pool.pool.creditManagerDebtParams.get(suite.creditManager.address)?.available;
 	const borrowLimit = available === void 0 ? maxDebt : require_onchain_utils_bigint_math.BigIntMath.min(maxDebt, available);
 	const floor = require_onchain_utils_bigint_math.BigIntMath.ceilDiv(require_onchain_constants_math.LEVERAGE_DECIMALS * minDebt, netValue);
-	const roof = require_onchain_constants_math.LEVERAGE_DECIMALS * borrowLimit / netValue;
+	const roof = require_onchain_utils_bigint_math.BigIntMath.ceilDiv(require_onchain_constants_math.LEVERAGE_DECIMALS * (borrowLimit + 1n), netValue) - 1n;
 	const min = 1 + Number(floor) / Number(require_onchain_constants_math.LEVERAGE_DECIMALS);
 	const max = Math.min(ceiling, 1 + Number(roof) / Number(require_onchain_constants_math.LEVERAGE_DECIMALS));
 	return min > max ? void 0 : {

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

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_utils_bigint_math = require("../../utils/bigint-math.js");
 const require_onchain_constants_math = require("../../constants/math.js");
+require("../../constants/index.js");
 const require_model_errors_operation_errors = require("../../../model/errors/operation-errors.js");
 require("../../../model/index.js");
 const require_onchain_validation_helpers_token = require("../../validation/helpers/token.js");
@@ -53,22 +54,63 @@ function assertLeverageAtLeastOne(leverage) {
 	}), `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]`.
+* Rejects a debt the facade would revert on: anything else has to sit inside
+* `[minDebt, maxDebt]`. Zero is fine only `allowZero`-ing it: an adjustment
+* may end owing nothing, an opening may not.
 */
-function assertDebtLimits(sdk, debt, debtLimits, underlying, maxBorrowAmount) {
+function assertDebtLimits(sdk, debt, debtLimits, underlying, options = {}) {
+	const { allowZero = true, getCollateralLimits, maxBorrowAmount } = options;
 	require_onchain_validation_raise.raise(require_onchain_validation_checks_checkDebtLimits.checkDebtLimits({
 		debt,
 		minDebt: debtLimits.minDebt,
 		maxDebt: debtLimits.maxDebt,
 		underlying: require_onchain_validation_helpers_token.toToken(sdk, underlying),
-		allowZero: true,
+		allowZero,
+		getCollateralLimits,
 		maxBorrowAmount
 	}), debt > debtLimits.maxDebt ? `debt ${debt} exceeds maxDebt ${debtLimits.maxDebt}` : `debt ${debt} is below minDebt ${debtLimits.minDebt}`);
 }
+/** Finds single-token Open amounts whose projected debt fits the market limits. */
+function openCollateralForDebtLimits({ suite, collateral, leverage }) {
+	if (collateral.length !== 1 || leverage <= 100n) return void 0;
+	const [{ token }] = collateral;
+	const { market } = suite;
+	const limits = {
+		minDebt: suite.creditFacade.minDebt,
+		maxDebt: suite.maxBorrowAmount().amount.value
+	};
+	if (limits.maxDebt < limits.minDebt) return void 0;
+	const debtAt = (amount) => {
+		const converted = market.priceOracle.safeConvert(token, market.pool.underlying, amount);
+		return converted.error ? void 0 : debtForLeverage(converted.value, leverage);
+	};
+	const lastDebt = debtAt(require_onchain_constants_math.MAX_UINT256);
+	if (lastDebt === void 0 || lastDebt < limits.minDebt) return void 0;
+	const firstAtLeast = (threshold) => {
+		let low = 0n;
+		let high = require_onchain_constants_math.MAX_UINT256;
+		while (low < high) {
+			const middle = (low + high) / 2n;
+			const debt = debtAt(middle);
+			if (debt === void 0) return void 0;
+			if (debt < threshold) low = middle + 1n;
+			else high = middle;
+		}
+		return low;
+	};
+	const min = firstAtLeast(limits.minDebt > 0n ? limits.minDebt : 1n);
+	const above = lastDebt > limits.maxDebt ? firstAtLeast(limits.maxDebt + 1n) : void 0;
+	if (min === void 0 || lastDebt > limits.maxDebt && above === void 0) return void 0;
+	const max = above === void 0 ? require_onchain_constants_math.MAX_UINT256 : above - 1n;
+	return min <= max ? {
+		min: market.priceOracle.toTokenAmount(token, min),
+		max: market.priceOracle.toTokenAmount(token, max)
+	} : void 0;
+}
 //#endregion
 exports.assertDebtLimits = assertDebtLimits;
 exports.assertLeverageAtLeastOne = assertLeverageAtLeastOne;
 exports.debtForLeverage = debtForLeverage;
 exports.maxProportionalWithdrawal = maxProportionalWithdrawal;
+exports.openCollateralForDebtLimits = openCollateralForDebtLimits;
 exports.proportionalDebt = proportionalDebt;

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

@@ -7,7 +7,7 @@ const require_onchain_accounts_intents_collateral_valuation = require("./collate
 //#region src/onchain/accounts/intents/maxWithdrawCollateral.ts
 /**
 * Largest amount of one collateral the account can withdraw while its health
-* factor stays at or above `targetHF`.
+* factors stay at or above `targetHF` and `targetSafeHF`.
 *
 * This is the collateral check solved for one balance, and it counts what that
 * check counts — see {@link collateralValuation} for it, safe prices included.
@@ -22,11 +22,14 @@ const require_onchain_accounts_intents_collateral_valuation = require("./collate
 * underlying has no price
 **/
 function maxWithdrawCollateral(props) {
-	const { creditAccount, sdk, token, targetHF } = props;
+	return require_onchain_utils_bigint_math.BigIntMath.min(ceilingAtPrice(props, props.targetHF, false), ceilingAtPrice(props, props.targetSafeHF, true));
+}
+function ceilingAtPrice(props, targetHF, safePrices) {
+	const { creditAccount, sdk, token } = props;
 	const target = creditAccount.tokens.find((t) => require_onchain_accounts_intents_utils_common.eq(t.token, token));
 	if (!target || target.balance <= 10n) return 0n;
 	if (creditAccount.totalDebt === 0n) return target.balance;
-	const valuation = require_onchain_accounts_intents_collateral_valuation.collateralValuation(creditAccount, sdk);
+	const valuation = require_onchain_accounts_intents_collateral_valuation.collateralValuation(creditAccount, sdk, safePrices);
 	let otherValue = 0n;
 	for (const t of creditAccount.tokens) {
 		if (require_onchain_accounts_intents_utils_common.eq(t.token, token) || !valuation.counts(t)) continue;

package/dist/cjs/onchain/accounts/intents/open-strategy.js

@@ -45,8 +45,17 @@ async function buildOpenStrategyState(props) {
 		creditFacade: suite.creditFacade.address,
 		underlying
 	});
-	require_onchain_accounts_intents_math.assertDebtLimits(sdk, debt, suite.creditFacade, underlying, suite.maxBorrowAmount());
-	require_onchain_accounts_intents_guards.assertCanBorrow(sdk, suite, debt);
+	const getCollateralLimits = () => require_onchain_accounts_intents_math.openCollateralForDebtLimits({
+		suite,
+		collateral,
+		leverage
+	});
+	require_onchain_accounts_intents_math.assertDebtLimits(sdk, debt, suite.creditFacade, underlying, {
+		allowZero: false,
+		maxBorrowAmount: suite.maxBorrowAmount(),
+		getCollateralLimits
+	});
+	require_onchain_accounts_intents_guards.assertCanBorrow(sdk, suite, debt, { getCollateralLimits });
 	const paths = require_onchain_accounts_intents_utils_router_path.createRouterPaths({
 		sdk,
 		creditAccount: account,

package/dist/cjs/onchain/accounts/intents/plan.js

@@ -43,7 +43,7 @@ function planDeposit(intent, view) {
 	const aU = view.price(intent.token, U, intent.amount);
 	const debtDelta = intent.targetLeverage === void 0 ? require_onchain_accounts_intents_math.proportionalDebt(view, aU) : require_onchain_accounts_intents_math.debtForLeverage(view.collateral + aU, intent.targetLeverage) - view.debt;
 	if (debtDelta < 0n) throw new require_onchain_validation_raise.IntentPreviewError(require_model_errors_operation_errors.leverageOutOfRange(), `deposit: target leverage ${intent.targetLeverage} would require repaying debt`);
-	require_onchain_accounts_intents_math.assertDebtLimits(view.sdk, view.debt + debtDelta, view.debtLimits, U, view.maxBorrowAmount);
+	require_onchain_accounts_intents_math.assertDebtLimits(view.sdk, view.debt + debtDelta, view.debtLimits, U);
 	const T = intent.positionToken ?? positionToken(view, "deposit");
 	const depositStays = require_onchain_accounts_intents_utils_common.eq(intent.token, T);
 	return [
@@ -74,12 +74,11 @@ function planRepay(intent, view) {
 	if (view.debt <= 0n) throw new require_onchain_validation_raise.IntentPreviewError(require_model_errors_operation_errors.debtOutOfRange({
 		requested: require_onchain_validation_helpers_token.toTokenAmount(view.sdk, U, view.debt),
 		minDebt: require_onchain_validation_helpers_token.toTokenAmount(view.sdk, U, view.debtLimits.minDebt),
-		maxDebt: require_onchain_validation_helpers_token.toTokenAmount(view.sdk, U, view.debtLimits.maxDebt),
-		maxBorrowAmount: view.maxBorrowAmount
+		maxDebt: require_onchain_validation_helpers_token.toTokenAmount(view.sdk, U, view.debtLimits.maxDebt)
 	}), "repay: the account owes nothing");
 	const funding = everything(intent.amount) ? view.price(U, intent.token, withMargin(view.debt)) : intent.amount;
 	const repaid = min(view.price(intent.token, U, funding), view.debt);
-	require_onchain_accounts_intents_math.assertDebtLimits(view.sdk, view.debt - repaid, view.debtLimits, view.underlying, view.maxBorrowAmount);
+	require_onchain_accounts_intents_math.assertDebtLimits(view.sdk, view.debt - repaid, view.debtLimits, view.underlying);
 	return [
 		add(intent.token, funding, intent.value),
 		...fundsInU ? [] : [convert(intent.token, U, funding)],
@@ -308,7 +307,7 @@ function withdrawShape(intent, view) {
 		};
 	}
 	const dD = require_onchain_accounts_intents_math.proportionalDebt(view, WU);
-	require_onchain_accounts_intents_math.assertDebtLimits(view.sdk, view.debt - dD, view.debtLimits, view.underlying, view.maxBorrowAmount);
+	require_onchain_accounts_intents_math.assertDebtLimits(view.sdk, view.debt - dD, view.debtLimits, view.underlying);
 	return {
 		U,
 		T,
@@ -327,7 +326,7 @@ function leverageShape(intent, view) {
 	require_onchain_accounts_intents_math.assertLeverageAtLeastOne(intent.targetLeverage);
 	if (view.collateral <= 0n) throw new require_onchain_validation_raise.IntentPreviewError(require_model_errors_operation_errors.insufficientBalance(), "adjustLeverage: account has no collateral to lever");
 	const target = require_onchain_accounts_intents_math.debtForLeverage(view.collateral, intent.targetLeverage);
-	require_onchain_accounts_intents_math.assertDebtLimits(view.sdk, target, view.debtLimits, view.underlying, view.maxBorrowAmount);
+	require_onchain_accounts_intents_math.assertDebtLimits(view.sdk, target, view.debtLimits, view.underlying);
 	return {
 		U: view.underlying,
 		delta: target - view.debt

package/dist/cjs/onchain/accounts/intents/testing/sdk-mock.js

@@ -113,7 +113,7 @@ function buildMockSdk(args) {
 		reservePrice: lookup(args.reservePrices, token)
 	};
 	const priceOracle = new require_TestPriceOracle_mock.TestPriceOracle(tokenCfgs);
-	const convert = (from, to, amount) => priceOracle.convert(from, to, amount);
+	const convert = (from, to, amount) => priceOracle.safeConvert(from, to, amount).value;
 	const fullQuota = (q) => ({
 		cumulativeIndexLU: 0n,
 		totalQuoted: 0n,

package/dist/cjs/onchain/accounts/intents/view.js

@@ -13,7 +13,7 @@ function accountView(creditAccount, sdk) {
 	const { underlying, creditManager } = creditAccount;
 	const oracle = sdk.marketRegister.findByCreditManager(creditManager).priceOracle;
 	const price = (from, to, amount) => oracle.safeConvert(from, to, amount).value;
-	const creditSuite = sdk.marketRegister.findCreditManager(creditManager);
+	const { creditFacade } = sdk.marketRegister.findCreditManager(creditManager);
 	let totalValue = 0n;
 	for (const t of creditAccount.tokens) totalValue += price(t.token, underlying, t.balance);
 	return {
@@ -23,10 +23,9 @@ function accountView(creditAccount, sdk) {
 		debt: creditAccount.totalDebt,
 		collateral: totalValue - creditAccount.totalDebt,
 		debtLimits: {
-			minDebt: creditSuite.creditFacade.minDebt,
-			maxDebt: creditSuite.creditFacade.maxDebt
+			minDebt: creditFacade.minDebt,
+			maxDebt: creditFacade.maxDebt
 		},
-		maxBorrowAmount: creditSuite.maxBorrowAmount(),
 		balanceOf: (token) => creditAccount.tokens.find((t) => require_onchain_accounts_intents_utils_common.eq(t.token, token))?.balance ?? 0n,
 		price,
 		fattest: (exclude) => require_onchain_accounts_intents_utils_pick_token.pickFattestNonPhantomToken({

package/dist/cjs/onchain/accounts/intents/withdraw-limits.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_utils_bigint_math = require("../../utils/bigint-math.js");
 require("../../utils/index.js");
-const require_onchain_validation_helpers_health_factor_limits = require("../../validation/helpers/health-factor-limits.js");
+require("../../validation/helpers/health-factor-limits.js");
 require("../../validation/index.js");
 const require_onchain_accounts_intents_utils_common = require("./utils/common.js");
 const require_onchain_accounts_intents_math = require("./math.js");
@@ -21,12 +21,12 @@ const require_onchain_accounts_intents_view = require("./view.js");
 * @returns The three limits, see {@link WithdrawCeilings}
 **/
 function withdrawLimits(props) {
-	const { creditAccount, sdk } = props;
+	const { creditAccount, sdk, targetHF } = props;
 	const view = require_onchain_accounts_intents_view.accountView(creditAccount, sdk);
 	const partial = require_onchain_accounts_intents_math.maxProportionalWithdrawal(view, view.debtLimits);
 	const safe = maxSafeWithdrawal({
 		...props,
-		targetHF: BigInt(require_onchain_validation_helpers_health_factor_limits.MIN_HEALTH_FACTOR_FACADE)
+		targetHF: targetHF ?? BigInt(1e4)
 	});
 	return {
 		partial,

package/dist/cjs/onchain/validation/checks/checkBorrowLimit.js

@@ -15,6 +15,7 @@ function checkBorrowLimit(args) {
 	const { requested, available, limit, underlying, maxBorrowAmount } = args;
 	if (requested <= available) return [];
 	return [require_model_errors_operation_errors.insufficientPoolLiquidity({
+		collateralLimits: args.getCollateralLimits?.(),
 		requested: require_onchain_validation_helpers_amount.amountOf(underlying, requested),
 		available: require_onchain_validation_helpers_amount.amountOf(underlying, available),
 		limit,

package/dist/cjs/onchain/validation/checks/checkDebtLimits.js

@@ -9,6 +9,7 @@ function checkDebtLimits(args) {
 	const { debt, minDebt, maxDebt, underlying, allowZero, maxBorrowAmount } = args;
 	if (!(debt > maxDebt || debt < minDebt && !(allowZero && debt === 0n))) return [];
 	return [require_model_errors_operation_errors.debtOutOfRange({
+		collateralLimits: args.getCollateralLimits?.(),
 		requested: require_onchain_validation_helpers_amount.amountOf(underlying, debt),
 		minDebt: require_onchain_validation_helpers_amount.amountOf(underlying, minDebt),
 		maxDebt: require_onchain_validation_helpers_amount.amountOf(underlying, maxDebt),

package/dist/cjs/sdk/prepare/PrepareApi.js

@@ -307,13 +307,14 @@ var PrepareApi = class extends require_onchain_base_MultichainConstruct.Multicha
 	/**
 	* {@inheritDoc IOpportunitiesPrepare.maxWithdraw}
 	**/
-	async maxWithdraw(position, sourceToken) {
+	async maxWithdraw(position, sourceToken, targetHF) {
 		const sdk = await this.#chain(position.chainId);
 		const creditAccount = await this.#account(sdk, position);
 		return service(sdk).maxWithdraw({
 			creditAccount,
 			sdk,
-			sourceToken
+			sourceToken,
+			targetHF
 		});
 	}
 	/**
@@ -391,14 +392,14 @@ var PrepareApi = class extends require_onchain_base_MultichainConstruct.Multicha
 	/**
 	* {@inheritDoc IOpportunitiesPrepare.maxWithdrawCollateral}
 	**/
-	async maxWithdrawCollateral(position, token, targetHF) {
+	async maxWithdrawCollateral(position, token, options) {
 		const sdk = await this.#chain(position.chainId);
 		const creditAccount = await this.#account(sdk, position);
 		return service(sdk).maxWithdrawCollateral({
 			creditAccount,
 			sdk,
 			token,
-			targetHF
+			...options
 		});
 	}
 	/**

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

@@ -54,7 +54,7 @@ async function buildBorrowState(props) {
 		totalDebt: market.toUnderlyingAmount(debt),
 		netValue: market.toUnderlyingAmount(margin - debt)
 	});
-	assertDebtLimits(sdk, debt, suite.creditFacade, underlying, suite.maxBorrowAmount());
+	assertDebtLimits(sdk, debt, suite.creditFacade, underlying, { maxBorrowAmount: existing ? void 0 : suite.maxBorrowAmount() });
 	assertCanBorrow(sdk, suite, debt);
 	const account = existing ?? unopenedAccountSlice({
 		creditManager,

package/dist/esm/onchain/accounts/intents/collateral-valuation.js

@@ -3,8 +3,10 @@ import { PERCENTAGE_FACTOR } from "../../constants/math.js";
 import "../../utils/index.js";
 import { eq } from "./utils/common.js";
 //#region src/onchain/accounts/intents/collateral-valuation.ts
-/** {@inheritDoc CollateralValuation} */
-function collateralValuation(creditAccount, sdk) {
+/** {@inheritDoc CollateralValuation}
+* Set `safePrices` to false to value the same counted holdings at main prices.
+*/
+function collateralValuation(creditAccount, sdk, safePrices = true) {
 	const { market, creditManager } = sdk.marketRegister.findCreditManager(creditAccount.creditManager);
 	const { priceOracle } = market;
 	const { pqk } = market.pool;
@@ -18,7 +20,7 @@ function collateralValuation(creditAccount, sdk) {
 		}
 	};
 	const lt = (token) => BigInt(creditManager.liquidationThresholds.get(token) ?? 0);
-	const checkedUsd = (holding) => eq(holding.token, underlying) ? mainUsd(holding.token, holding.balance) ?? 0n : priceOracle.safeConvertMinUSD(holding.token, holding.balance).value;
+	const checkedUsd = (holding) => !safePrices || eq(holding.token, underlying) ? mainUsd(holding.token, holding.balance) ?? 0n : priceOracle.safeConvertMinUSD(holding.token, holding.balance).value;
 	/** A quota is underlying-denominated, and a closed market backs nothing. */
 	const quotaValue = (holding) => pqk.hasActiveQuota(holding.token) ? (mainUsd(underlying, holding.quota) ?? 0n) * PERCENTAGE_FACTOR : 0n;
 	const weigh = (holding) => {

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

@@ -45,13 +45,14 @@ function assertMarketOperable(suite) {
 	}), `${creditManager} expired at ${suite.creditFacade.expirationDate}`);
 }
 /** The pool has to be able to lend what the plan means to draw. */
-function assertCanBorrow(sdk, suite, amount) {
+function assertCanBorrow(sdk, suite, amount, options = {}) {
 	const maxBorrowAmount = suite.maxBorrowAmount();
 	raise(checkBorrowLimit({
 		requested: amount,
 		available: maxBorrowAmount.amount.value,
 		limit: maxBorrowAmount.limit,
-		underlying: toToken(sdk, suite.market.pool.underlying)
+		underlying: toToken(sdk, suite.market.pool.underlying),
+		getCollateralLimits: options.getCollateralLimits
 	}), `borrow: ${amount} exceeds what the pool can lend now (${maxBorrowAmount.amount.value})`);
 }
 /**

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

@@ -2,7 +2,7 @@ import { SDKConstruct } from "../../base/SDKConstruct.js";
 import { unsupportedTokenPair } from "../../../model/errors/prepare-errors.js";
 import { sdkErr } from "../../../model/result.js";
 import "../../../model/index.js";
-import { MIN_HF_LIMITED } from "../../validation/helpers/health-factor-limits.js";
+import { MIN_HEALTH_FACTOR_FACADE, MIN_HEALTH_FACTOR_FORM, MIN_HF_LIMITED, MIN_SAFE_HEALTH_FACTOR_FORM } from "../../validation/helpers/health-factor-limits.js";
 import { IntentPreviewError } from "../../validation/raise.js";
 import "../../validation/index.js";
 import { isPhantomToken } from "./utils/pick-token.js";
@@ -63,18 +63,23 @@ var CreditAccountOperationsService = class extends SDKConstruct {
 	* it as `safePartial`. The second is the one to offer — see
 	* {@link WithdrawCeilings}.
 	*
-	* Takes no target health factor, unlike {@link maxWithdrawCollateral}. A
-	* proportional withdrawal leaves the factor where it found it, so there is
-	* no room to choose: what these answer to is the facade's own threshold,
-	* which is also what {@link startIntent} refuses against.
+	* The default target health factor is the facade's own threshold, which is
+	* also what {@link startIntent} refuses against. A form holding the account
+	* to something stricter passes its own, as with
+	* {@link maxWithdrawCollateral}.
 	*
-	* @param props - Account slice, the SDK holding its market, and optionally
-	* the collateral the withdrawal would be funded from
+	* @param props - Account slice, the SDK holding its market, optionally the
+	* collateral the withdrawal would be funded from, and optionally the health
+	* factor the ceiling should leave
 	* @returns The three limits, see {@link WithdrawCeilings} for the gap
 	* between them
 	*/
 	maxWithdraw(props) {
-		return withdrawLimits(props);
+		const { targetHF = BigInt(MIN_HEALTH_FACTOR_FACADE), ...rest } = props;
+		return withdrawLimits({
+			...rest,
+			targetHF: targetHF + 2n
+		});
 	}
 	/**
 	* Debt a `REPAY` would have to cover to settle the account, in underlying
@@ -114,23 +119,23 @@ var CreditAccountOperationsService = class extends SDKConstruct {
 	}
 	/**
 	* Largest `WITHDRAW_ASSET` amount of one token the account can take out
-	* while its health factor stays at `targetHF` — the ceiling a
+	* while its main and safe health factors clear their targets — 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 withdraws collateral; zero debt frees the whole balance.
 	*
-	* The default is {@link MIN_HF_LIMITED}, the threshold a form holds an
-	* account to.
+	* Defaults are the independent main and safe form thresholds.
 	*
 	* @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;
+		const { targetHF = BigInt(MIN_HEALTH_FACTOR_FORM), targetSafeHF = BigInt(MIN_SAFE_HEALTH_FACTOR_FORM), ...rest } = props;
 		return maxWithdrawCollateral({
 			...rest,
-			targetHF: targetHF + 2n
+			targetHF: targetHF + 2n,
+			targetSafeHF: targetSafeHF + 2n
 		});
 	}
 	/**

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

@@ -47,7 +47,7 @@ function calcLeverageBand({ sdk, creditManager, collateral, targetHF }) {
 	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 roof = BigIntMath.ceilDiv(LEVERAGE_DECIMALS * (borrowLimit + 1n), netValue) - 1n;
 	const min = 1 + Number(floor) / Number(LEVERAGE_DECIMALS);
 	const max = Math.min(ceiling, 1 + Number(roof) / Number(LEVERAGE_DECIMALS));
 	return min > max ? void 0 : {

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

@@ -1,5 +1,6 @@
 import { BigIntMath } from "../../utils/bigint-math.js";
-import { LEVERAGE_DECIMALS, PERCENTAGE_FACTOR } from "../../constants/math.js";
+import { LEVERAGE_DECIMALS, MAX_UINT256, PERCENTAGE_FACTOR } from "../../constants/math.js";
+import "../../constants/index.js";
 import { insufficientBalance } from "../../../model/errors/operation-errors.js";
 import "../../../model/index.js";
 import { toToken } from "../../validation/helpers/token.js";
@@ -52,18 +53,58 @@ function assertLeverageAtLeastOne(leverage) {
 	}), `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]`.
+* Rejects a debt the facade would revert on: anything else has to sit inside
+* `[minDebt, maxDebt]`. Zero is fine only `allowZero`-ing it: an adjustment
+* may end owing nothing, an opening may not.
 */
-function assertDebtLimits(sdk, debt, debtLimits, underlying, maxBorrowAmount) {
+function assertDebtLimits(sdk, debt, debtLimits, underlying, options = {}) {
+	const { allowZero = true, getCollateralLimits, maxBorrowAmount } = options;
 	raise(checkDebtLimits({
 		debt,
 		minDebt: debtLimits.minDebt,
 		maxDebt: debtLimits.maxDebt,
 		underlying: toToken(sdk, underlying),
-		allowZero: true,
+		allowZero,
+		getCollateralLimits,
 		maxBorrowAmount
 	}), debt > debtLimits.maxDebt ? `debt ${debt} exceeds maxDebt ${debtLimits.maxDebt}` : `debt ${debt} is below minDebt ${debtLimits.minDebt}`);
 }
+/** Finds single-token Open amounts whose projected debt fits the market limits. */
+function openCollateralForDebtLimits({ suite, collateral, leverage }) {
+	if (collateral.length !== 1 || leverage <= 100n) return void 0;
+	const [{ token }] = collateral;
+	const { market } = suite;
+	const limits = {
+		minDebt: suite.creditFacade.minDebt,
+		maxDebt: suite.maxBorrowAmount().amount.value
+	};
+	if (limits.maxDebt < limits.minDebt) return void 0;
+	const debtAt = (amount) => {
+		const converted = market.priceOracle.safeConvert(token, market.pool.underlying, amount);
+		return converted.error ? void 0 : debtForLeverage(converted.value, leverage);
+	};
+	const lastDebt = debtAt(MAX_UINT256);
+	if (lastDebt === void 0 || lastDebt < limits.minDebt) return void 0;
+	const firstAtLeast = (threshold) => {
+		let low = 0n;
+		let high = MAX_UINT256;
+		while (low < high) {
+			const middle = (low + high) / 2n;
+			const debt = debtAt(middle);
+			if (debt === void 0) return void 0;
+			if (debt < threshold) low = middle + 1n;
+			else high = middle;
+		}
+		return low;
+	};
+	const min = firstAtLeast(limits.minDebt > 0n ? limits.minDebt : 1n);
+	const above = lastDebt > limits.maxDebt ? firstAtLeast(limits.maxDebt + 1n) : void 0;
+	if (min === void 0 || lastDebt > limits.maxDebt && above === void 0) return void 0;
+	const max = above === void 0 ? MAX_UINT256 : above - 1n;
+	return min <= max ? {
+		min: market.priceOracle.toTokenAmount(token, min),
+		max: market.priceOracle.toTokenAmount(token, max)
+	} : void 0;
+}
 //#endregion
-export { assertDebtLimits, assertLeverageAtLeastOne, debtForLeverage, maxProportionalWithdrawal, proportionalDebt };
+export { assertDebtLimits, assertLeverageAtLeastOne, debtForLeverage, maxProportionalWithdrawal, openCollateralForDebtLimits, proportionalDebt };

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

@@ -6,7 +6,7 @@ import { collateralValuation } from "./collateral-valuation.js";
 //#region src/onchain/accounts/intents/maxWithdrawCollateral.ts
 /**
 * Largest amount of one collateral the account can withdraw while its health
-* factor stays at or above `targetHF`.
+* factors stay at or above `targetHF` and `targetSafeHF`.
 *
 * This is the collateral check solved for one balance, and it counts what that
 * check counts — see {@link collateralValuation} for it, safe prices included.
@@ -21,11 +21,14 @@ import { collateralValuation } from "./collateral-valuation.js";
 * underlying has no price
 **/
 function maxWithdrawCollateral(props) {
-	const { creditAccount, sdk, token, targetHF } = props;
+	return BigIntMath.min(ceilingAtPrice(props, props.targetHF, false), ceilingAtPrice(props, props.targetSafeHF, true));
+}
+function ceilingAtPrice(props, targetHF, safePrices) {
+	const { creditAccount, sdk, token } = props;
 	const target = creditAccount.tokens.find((t) => eq(t.token, token));
 	if (!target || target.balance <= 10n) return 0n;
 	if (creditAccount.totalDebt === 0n) return target.balance;
-	const valuation = collateralValuation(creditAccount, sdk);
+	const valuation = collateralValuation(creditAccount, sdk, safePrices);
 	let otherValue = 0n;
 	for (const t of creditAccount.tokens) {
 		if (eq(t.token, token) || !valuation.counts(t)) continue;

package/dist/esm/onchain/accounts/intents/open-strategy.js

@@ -2,7 +2,7 @@ import { insufficientBalance } from "../../../model/errors/operation-errors.js";
 import "../../../model/index.js";
 import { IntentPreviewError } from "../../validation/raise.js";
 import { assertCanBorrow, assertCollateralised, assertGrowthAllowed, assertMarketOperable, assertQuotaAvailable } from "./guards.js";
-import { assertDebtLimits, assertLeverageAtLeastOne, debtForLeverage } from "./math.js";
+import { assertDebtLimits, assertLeverageAtLeastOne, debtForLeverage, openCollateralForDebtLimits } from "./math.js";
 import { unopenedAccountSlice } from "./utils/credit-account-slice.js";
 import { collectPriceImpact } from "./utils/price-impact.js";
 import { getQuotasForUpdate } from "./utils/quotas-for-update.js";
@@ -44,8 +44,17 @@ async function buildOpenStrategyState(props) {
 		creditFacade: suite.creditFacade.address,
 		underlying
 	});
-	assertDebtLimits(sdk, debt, suite.creditFacade, underlying, suite.maxBorrowAmount());
-	assertCanBorrow(sdk, suite, debt);
+	const getCollateralLimits = () => openCollateralForDebtLimits({
+		suite,
+		collateral,
+		leverage
+	});
+	assertDebtLimits(sdk, debt, suite.creditFacade, underlying, {
+		allowZero: false,
+		maxBorrowAmount: suite.maxBorrowAmount(),
+		getCollateralLimits
+	});
+	assertCanBorrow(sdk, suite, debt, { getCollateralLimits });
 	const paths = createRouterPaths({
 		sdk,
 		creditAccount: account,

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

@@ -42,7 +42,7 @@ function planDeposit(intent, view) {
 	const aU = view.price(intent.token, U, intent.amount);
 	const debtDelta = intent.targetLeverage === void 0 ? proportionalDebt(view, aU) : debtForLeverage(view.collateral + aU, intent.targetLeverage) - view.debt;
 	if (debtDelta < 0n) throw new IntentPreviewError(leverageOutOfRange(), `deposit: target leverage ${intent.targetLeverage} would require repaying debt`);
-	assertDebtLimits(view.sdk, view.debt + debtDelta, view.debtLimits, U, view.maxBorrowAmount);
+	assertDebtLimits(view.sdk, view.debt + debtDelta, view.debtLimits, U);
 	const T = intent.positionToken ?? positionToken(view, "deposit");
 	const depositStays = eq(intent.token, T);
 	return [
@@ -73,12 +73,11 @@ function planRepay(intent, view) {
 	if (view.debt <= 0n) throw new IntentPreviewError(debtOutOfRange({
 		requested: toTokenAmount(view.sdk, U, view.debt),
 		minDebt: toTokenAmount(view.sdk, U, view.debtLimits.minDebt),
-		maxDebt: toTokenAmount(view.sdk, U, view.debtLimits.maxDebt),
-		maxBorrowAmount: view.maxBorrowAmount
+		maxDebt: toTokenAmount(view.sdk, U, view.debtLimits.maxDebt)
 	}), "repay: the account owes nothing");
 	const funding = everything(intent.amount) ? view.price(U, intent.token, withMargin(view.debt)) : intent.amount;
 	const repaid = min(view.price(intent.token, U, funding), view.debt);
-	assertDebtLimits(view.sdk, view.debt - repaid, view.debtLimits, view.underlying, view.maxBorrowAmount);
+	assertDebtLimits(view.sdk, view.debt - repaid, view.debtLimits, view.underlying);
 	return [
 		add(intent.token, funding, intent.value),
 		...fundsInU ? [] : [convert(intent.token, U, funding)],
@@ -307,7 +306,7 @@ function withdrawShape(intent, view) {
 		};
 	}
 	const dD = proportionalDebt(view, WU);
-	assertDebtLimits(view.sdk, view.debt - dD, view.debtLimits, view.underlying, view.maxBorrowAmount);
+	assertDebtLimits(view.sdk, view.debt - dD, view.debtLimits, view.underlying);
 	return {
 		U,
 		T,
@@ -326,7 +325,7 @@ function leverageShape(intent, view) {
 	assertLeverageAtLeastOne(intent.targetLeverage);
 	if (view.collateral <= 0n) throw new IntentPreviewError(insufficientBalance(), "adjustLeverage: account has no collateral to lever");
 	const target = debtForLeverage(view.collateral, intent.targetLeverage);
-	assertDebtLimits(view.sdk, target, view.debtLimits, view.underlying, view.maxBorrowAmount);
+	assertDebtLimits(view.sdk, target, view.debtLimits, view.underlying);
 	return {
 		U: view.underlying,
 		delta: target - view.debt

package/dist/esm/onchain/accounts/intents/testing/sdk-mock.js

@@ -113,7 +113,7 @@ function buildMockSdk(args) {
 		reservePrice: lookup(args.reservePrices, token)
 	};
 	const priceOracle = new TestPriceOracle(tokenCfgs);
-	const convert = (from, to, amount) => priceOracle.convert(from, to, amount);
+	const convert = (from, to, amount) => priceOracle.safeConvert(from, to, amount).value;
 	const fullQuota = (q) => ({
 		cumulativeIndexLU: 0n,
 		totalQuoted: 0n,

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

@@ -12,7 +12,7 @@ function accountView(creditAccount, sdk) {
 	const { underlying, creditManager } = creditAccount;
 	const oracle = sdk.marketRegister.findByCreditManager(creditManager).priceOracle;
 	const price = (from, to, amount) => oracle.safeConvert(from, to, amount).value;
-	const creditSuite = sdk.marketRegister.findCreditManager(creditManager);
+	const { creditFacade } = sdk.marketRegister.findCreditManager(creditManager);
 	let totalValue = 0n;
 	for (const t of creditAccount.tokens) totalValue += price(t.token, underlying, t.balance);
 	return {
@@ -22,10 +22,9 @@ function accountView(creditAccount, sdk) {
 		debt: creditAccount.totalDebt,
 		collateral: totalValue - creditAccount.totalDebt,
 		debtLimits: {
-			minDebt: creditSuite.creditFacade.minDebt,
-			maxDebt: creditSuite.creditFacade.maxDebt
+			minDebt: creditFacade.minDebt,
+			maxDebt: creditFacade.maxDebt
 		},
-		maxBorrowAmount: creditSuite.maxBorrowAmount(),
 		balanceOf: (token) => creditAccount.tokens.find((t) => eq(t.token, token))?.balance ?? 0n,
 		price,
 		fattest: (exclude) => pickFattestNonPhantomToken({

package/dist/esm/onchain/accounts/intents/withdraw-limits.js

@@ -1,6 +1,6 @@
 import { BigIntMath } from "../../utils/bigint-math.js";
 import "../../utils/index.js";
-import { MIN_HEALTH_FACTOR_FACADE } from "../../validation/helpers/health-factor-limits.js";
+import "../../validation/helpers/health-factor-limits.js";
 import "../../validation/index.js";
 import { eq } from "./utils/common.js";
 import { maxProportionalWithdrawal } from "./math.js";
@@ -20,12 +20,12 @@ import { accountView } from "./view.js";
 * @returns The three limits, see {@link WithdrawCeilings}
 **/
 function withdrawLimits(props) {
-	const { creditAccount, sdk } = props;
+	const { creditAccount, sdk, targetHF } = props;
 	const view = accountView(creditAccount, sdk);
 	const partial = maxProportionalWithdrawal(view, view.debtLimits);
 	const safe = maxSafeWithdrawal({
 		...props,
-		targetHF: BigInt(MIN_HEALTH_FACTOR_FACADE)
+		targetHF: targetHF ?? BigInt(1e4)
 	});
 	return {
 		partial,

package/dist/esm/onchain/validation/checks/checkBorrowLimit.js

@@ -14,6 +14,7 @@ function checkBorrowLimit(args) {
 	const { requested, available, limit, underlying, maxBorrowAmount } = args;
 	if (requested <= available) return [];
 	return [insufficientPoolLiquidity({
+		collateralLimits: args.getCollateralLimits?.(),
 		requested: amountOf(underlying, requested),
 		available: amountOf(underlying, available),
 		limit,

package/dist/esm/onchain/validation/checks/checkDebtLimits.js

@@ -8,6 +8,7 @@ function checkDebtLimits(args) {
 	const { debt, minDebt, maxDebt, underlying, allowZero, maxBorrowAmount } = args;
 	if (!(debt > maxDebt || debt < minDebt && !(allowZero && debt === 0n))) return [];
 	return [debtOutOfRange({
+		collateralLimits: args.getCollateralLimits?.(),
 		requested: amountOf(underlying, debt),
 		minDebt: amountOf(underlying, minDebt),
 		maxDebt: amountOf(underlying, maxDebt),

package/dist/esm/sdk/prepare/PrepareApi.js

@@ -306,13 +306,14 @@ var PrepareApi = class extends MultichainConstruct {
 	/**
 	* {@inheritDoc IOpportunitiesPrepare.maxWithdraw}
 	**/
-	async maxWithdraw(position, sourceToken) {
+	async maxWithdraw(position, sourceToken, targetHF) {
 		const sdk = await this.#chain(position.chainId);
 		const creditAccount = await this.#account(sdk, position);
 		return service(sdk).maxWithdraw({
 			creditAccount,
 			sdk,
-			sourceToken
+			sourceToken,
+			targetHF
 		});
 	}
 	/**
@@ -390,14 +391,14 @@ var PrepareApi = class extends MultichainConstruct {
 	/**
 	* {@inheritDoc IOpportunitiesPrepare.maxWithdrawCollateral}
 	**/
-	async maxWithdrawCollateral(position, token, targetHF) {
+	async maxWithdrawCollateral(position, token, options) {
 		const sdk = await this.#chain(position.chainId);
 		const creditAccount = await this.#account(sdk, position);
 		return service(sdk).maxWithdrawCollateral({
 			creditAccount,
 			sdk,
 			token,
-			targetHF
+			...options
 		});
 	}
 	/**

package/dist/types/model/errors/operation-errors.d.ts

@@ -64,6 +64,11 @@ declare function poolSunset(pool: Address): PoolSunsetError;
  **/
 interface InsufficientPoolLiquidityError extends IGearboxError {
   code: "insufficientPoolLiquidity";
+  /** Single-token Open amounts whose projected debt fits the current debt limits. */
+  collateralLimits?: {
+    min: TokenAmount;
+    max: TokenAmount;
+  };
   /** Both in the market's underlying. */
   requested: TokenAmount;
   available: TokenAmount;
@@ -85,6 +90,11 @@ declare function insufficientPoolLiquidity(args: Omit<InsufficientPoolLiquidityE
  **/
 interface DebtOutOfRangeError extends IGearboxError {
   code: "debtOutOfRange";
+  /** Single-token Open amounts whose projected debt fits the current debt limits. */
+  collateralLimits?: {
+    min: TokenAmount;
+    max: TokenAmount;
+  };
   /** All three in the market's underlying. */
   requested: TokenAmount;
   minDebt: TokenAmount;

package/dist/types/onchain/accounts/intents/collateral-valuation.d.ts

@@ -36,7 +36,9 @@ interface CollateralValuation {
   /** Liquidation threshold in basis points; 0 for a token the manager refuses. */
   lt(token: Address): bigint;
 }
-/** {@inheritDoc CollateralValuation} */
-declare function collateralValuation(creditAccount: CreditAccountSlice, sdk: OnchainSDK): CollateralValuation;
+/** {@inheritDoc CollateralValuation}
+ * Set `safePrices` to false to value the same counted holdings at main prices.
+ */
+declare function collateralValuation(creditAccount: CreditAccountSlice, sdk: OnchainSDK, safePrices?: boolean): CollateralValuation;
 //#endregion
 export { CollateralValuation, Holding, collateralValuation };

package/dist/types/onchain/accounts/intents/guards.d.ts

@@ -1,4 +1,5 @@
 import { Bps, TokenAmount } from "../../../model/primitives.js";
+import { InsufficientPoolLiquidityError } from "../../../model/errors/operation-errors.js";
 import "../../../model/index.js";
 import { Asset } from "../../base/types.js";
 import { MarketSuite } from "../../market/MarketSuite.js";
@@ -28,7 +29,9 @@ import "../../index.js";
  */
 declare function assertMarketOperable(suite: CreditSuite): void;
 /** The pool has to be able to lend what the plan means to draw. */
-declare function assertCanBorrow(sdk: OnchainSDK, suite: CreditSuite, amount: bigint): void;
+declare function assertCanBorrow(sdk: OnchainSDK, suite: CreditSuite, amount: bigint, options?: {
+  getCollateralLimits?: () => InsufficientPoolLiquidityError["collateralLimits"];
+}): void;
 /**
  * What the account is allowed to end up holding more of than it started with.
  *

package/dist/types/onchain/accounts/intents/index.d.ts

@@ -74,18 +74,20 @@ declare class CreditAccountOperationsService extends SDKConstruct {
    * it as `safePartial`. The second is the one to offer — see
    * {@link WithdrawCeilings}.
    *
-   * Takes no target health factor, unlike {@link maxWithdrawCollateral}. A
-   * proportional withdrawal leaves the factor where it found it, so there is
-   * no room to choose: what these answer to is the facade's own threshold,
-   * which is also what {@link startIntent} refuses against.
+   * The default target health factor is the facade's own threshold, which is
+   * also what {@link startIntent} refuses against. A form holding the account
+   * to something stricter passes its own, as with
+   * {@link maxWithdrawCollateral}.
    *
-   * @param props - Account slice, the SDK holding its market, and optionally
-   * the collateral the withdrawal would be funded from
+   * @param props - Account slice, the SDK holding its market, optionally the
+   * collateral the withdrawal would be funded from, and optionally the health
+   * factor the ceiling should leave
    * @returns The three limits, see {@link WithdrawCeilings} for the gap
    * between them
    */
   maxWithdraw(props: Pick<StartIntentProps, "creditAccount" | "sdk"> & {
     sourceToken?: Address;
+    targetHF?: bigint;
   }): WithdrawCeilings;
   /**
    * Debt a `REPAY` would have to cover to settle the account, in underlying
@@ -121,13 +123,12 @@ declare class CreditAccountOperationsService extends SDKConstruct {
   leverageBand(props: LeverageBandProps): LeverageBand | undefined;
   /**
    * Largest `WITHDRAW_ASSET` amount of one token the account can take out
-   * while its health factor stays at `targetHF` — the ceiling a
+   * while its main and safe health factors clear their targets — 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 withdraws collateral; zero debt frees the whole balance.
    *
-   * The default is {@link MIN_HF_LIMITED}, the threshold a form holds an
-   * account to.
+   * Defaults are the independent main and safe form thresholds.
    *
    * @param props - Account slice, the SDK holding its market, the collateral
    * to withdraw, and optionally the health factor to leave behind
@@ -136,6 +137,7 @@ declare class CreditAccountOperationsService extends SDKConstruct {
   maxWithdrawCollateral(props: Pick<StartIntentProps, "creditAccount" | "sdk"> & {
     token: Address;
     targetHF?: bigint;
+    targetSafeHF?: bigint;
   }): bigint;
   /**
    * Largest loan a given collateral supports at `targetHF`, in the payout

package/dist/types/onchain/accounts/intents/math.d.ts

@@ -1,6 +1,11 @@
+import { DebtOutOfRangeError } from "../../../model/errors/operation-errors.js";
+import "../../../model/index.js";
+import { Asset } from "../../base/types.js";
 import { MaxBorrowAmount } from "../../market/credit/types.js";
+import { CreditSuite } from "../../market/credit/CreditSuite.js";
 import "../../market/index.js";
 import { OnchainSDK } from "../../OnchainSDK.js";
+import "../../base/index.js";
 import { Address } from "viem";
 //#region src/onchain/accounts/intents/math.d.ts
 /**
@@ -43,9 +48,20 @@ declare function maxProportionalWithdrawal(position: Position, debtLimits: DebtL
 /** Total leverage cannot drop below 1x — that would be negative debt. */
 declare function assertLeverageAtLeastOne(leverage: bigint): void;
 /**
- * Rejects a debt the facade would revert on: zero is always fine (no loan at
- * all), anything else has to sit inside `[minDebt, maxDebt]`.
+ * Rejects a debt the facade would revert on: anything else has to sit inside
+ * `[minDebt, maxDebt]`. Zero is fine only `allowZero`-ing it: an adjustment
+ * may end owing nothing, an opening may not.
  */
-declare function assertDebtLimits(sdk: OnchainSDK, debt: bigint, debtLimits: DebtLimits, underlying: Address, maxBorrowAmount: MaxBorrowAmount): void;
+declare function assertDebtLimits(sdk: OnchainSDK, debt: bigint, debtLimits: DebtLimits, underlying: Address, options?: {
+  allowZero?: boolean;
+  maxBorrowAmount?: MaxBorrowAmount;
+  getCollateralLimits?: () => DebtOutOfRangeError["collateralLimits"];
+}): void;
+/** Finds single-token Open amounts whose projected debt fits the market limits. */
+declare function openCollateralForDebtLimits({ suite, collateral, leverage }: {
+  suite: CreditSuite;
+  collateral: readonly Asset[];
+  leverage: bigint;
+}): DebtOutOfRangeError["collateralLimits"];
 //#endregion
-export { DebtLimits, Position, assertDebtLimits, assertLeverageAtLeastOne, debtForLeverage, maxProportionalWithdrawal, proportionalDebt };
+export { DebtLimits, Position, assertDebtLimits, assertLeverageAtLeastOne, debtForLeverage, maxProportionalWithdrawal, openCollateralForDebtLimits, proportionalDebt };

package/dist/types/onchain/accounts/intents/maxWithdrawCollateral.d.ts

@@ -10,10 +10,12 @@ interface MaxWithdrawCollateralProps {
   token: Address;
   /** Health factor the withdrawal has to leave behind, in basis points. */
   targetHF: bigint;
+  /** Safe-price health factor the withdrawal has to leave behind. */
+  targetSafeHF: bigint;
 }
 /**
  * Largest amount of one collateral the account can withdraw while its health
- * factor stays at or above `targetHF`.
+ * factors stay at or above `targetHF` and `targetSafeHF`.
  *
  * This is the collateral check solved for one balance, and it counts what that
  * check counts — see {@link collateralValuation} for it, safe prices included.

package/dist/types/onchain/accounts/intents/plan.d.ts

@@ -1,8 +1,6 @@
 import { DelayedIntent } from "../../../model/delayed-intents.js";
 import "../../../model/index.js";
 import { ClaimableWithdrawal } from "../withdrawal-compressor/types.js";
-import { MaxBorrowAmount } from "../../market/credit/types.js";
-import "../../market/index.js";
 import { OnchainSDK } from "../../OnchainSDK.js";
 import { AddCollateralIntent, AdjustLeverageIntent, DepositStrategyIntent, RepayStrategyIntent, WithdrawAssetIntent, WithdrawStrategyIntent } from "./types.js";
 import { DebtLimits } from "./math.js";
@@ -111,7 +109,6 @@ interface AccountView {
   /** TVL − debt, in underlying. */
   collateral: bigint;
   debtLimits: DebtLimits;
-  maxBorrowAmount: MaxBorrowAmount;
   balanceOf(token: Address): bigint;
   /** Oracle conversion; unpriceable tokens contribute 0n. */
   price(from: Address, to: Address, amount: bigint): bigint;

package/dist/types/onchain/accounts/intents/withdraw-limits.d.ts

@@ -12,6 +12,13 @@ interface WithdrawLimitsProps {
    * names none.
    */
   sourceToken?: Address;
+  /**
+   * Health factor `safePartial` has to leave behind, in basis points. The
+   * default is the facade's own threshold — what the collateral guard refuses
+   * against, and what the guard quotes back; a form holding the account to
+   * something stricter passes its own.
+   */
+  targetHF?: bigint;
 }
 /**
  * Every limit a `WITHDRAW` answers to, in underlying units.

package/dist/types/onchain/validation/checks/checkBorrowLimit.d.ts

@@ -7,6 +7,7 @@ interface BorrowLimitArgs {
   available: bigint;
   limit: BorrowLimitCause;
   underlying: Token;
+  getCollateralLimits?: () => InsufficientPoolLiquidityError["collateralLimits"];
   maxBorrowAmount?: bigint;
 }
 /**

package/dist/types/onchain/validation/checks/checkDebtLimits.d.ts

@@ -9,6 +9,7 @@ interface DebtLimitsArgs {
   minDebt: bigint;
   maxDebt: bigint;
   underlying: Token;
+  getCollateralLimits?: () => DebtOutOfRangeError["collateralLimits"];
   /**
    * Whether ending with no loan at all is acceptable. The one place the two
    * callers genuinely disagree: an account being adjusted may end owing
@@ -17,7 +18,7 @@ interface DebtLimitsArgs {
    */
   allowZero: boolean;
   /** From the caller's suite; a caller that raises to throw advises nobody. */
-  maxBorrowAmount: MaxBorrowAmount;
+  maxBorrowAmount?: MaxBorrowAmount;
 }
 /** A debt the facade would revert on. */
 declare function checkDebtLimits(args: DebtLimitsArgs): DebtOutOfRangeError[];

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

@@ -5,7 +5,7 @@ import { LeverageBand } from "../onchain/accounts/intents/leverage-band.js";
 import { PoolOperationError } from "../onchain/validation/bundles/checkPoolOperation.js";
 import { IAnalytics, IAnalyticsByMode } from "./analytics/types.js";
 import { ILiquidations, ILiquidationsByMode } from "./liquidations/types.js";
-import { AccountFlowError, AddCollateralParams, AdjustLeverageParams, BorrowParams, BorrowResult, DelayedStrategyResult, DepositStrategyParams, EmptyCreditAccountResult, FinalizeParams, FinalizeResult, IOpportunitiesPrepare, LpParams, LpRedeemParams, LpResult, LpState, MaxBorrowParams, OpenFlowError, OpenStrategyParams, OpenStrategyResult, PoolInput, PositionInput, PrepareOptions, RepayStrategyParams, StrategyInput, StrategyResult, StrategyRoutesResult, WithRouteErrors, WithdrawCollateralParams, WithdrawStrategyParams } from "./prepare/types.js";
+import { AccountFlowError, AddCollateralParams, AdjustLeverageParams, BorrowParams, BorrowResult, DelayedStrategyResult, DepositStrategyParams, EmptyCreditAccountResult, FinalizeParams, FinalizeResult, IOpportunitiesPrepare, LpParams, LpRedeemParams, LpResult, LpState, MaxBorrowParams, MaxWithdrawCollateralOptions, OpenFlowError, OpenStrategyParams, OpenStrategyResult, PoolInput, PositionInput, PrepareOptions, RepayStrategyParams, StrategyInput, StrategyResult, StrategyRoutesResult, WithRouteErrors, WithdrawCollateralParams, WithdrawStrategyParams } from "./prepare/types.js";
 import { ChainOf, PrepareApi } from "./prepare/PrepareApi.js";
 import "./prepare/index.js";
 import { AccountPrepareRequest, BorrowPrepareRequest, IOpportunitiesExecute, OpenEmptyPrepareRequest, OpenPrepareRequest, PoolPrepareRequest, PrepareRequest } from "./execute/types.js";
@@ -39,4 +39,4 @@ import { SourceUnavailableError } from "./errors/SourceUnavailableError.js";
 import { assertSameChains } from "./errors/assertSameChains.js";
 import { everyChainFailed } from "./errors/everyChainFailed.js";
 import "./errors/index.js";
-export { AbstractNamespace, AccountFlowError, AccountPrepareRequest, AddCollateralParams, AdjustLeverageParams, AllSourcesFailedError, AnalyticsNamespace, BorrowParams, BorrowPrepareRequest, BorrowResult, type BorrowState, ChainOf, ChainRef, CheckOperationProps, type CreditAccountNotEmptyError, type CreditAccountNotFoundError, DEFAULT_MAX_OFFCHAIN_LAG, DEFAULT_MAX_STATE_AGE, DelayedStrategyResult, DepositStrategyParams, EmptyCreditAccountResult, EnsureFreshChains, type EntityMerger, ExecuteApi, type ExecutionCost, type FilterResult, FinalizeParams, FinalizeResult, GearboxSDK, GearboxSDKOptions, IAnalytics, IAnalyticsByMode, IGearboxSDK, ILiquidations, ILiquidationsByMode, INotices, INoticesByMode, IOpportunities, IOpportunitiesBase, IOpportunitiesByMode, IOpportunitiesExecute, IOpportunitiesOffchainBranch, IOpportunitiesOffchainOnly, IOpportunitiesOnchainBranch, IOpportunitiesOnchainOnly, IOpportunitiesPrepare, IOpportunityMergers, IPositionMergers, IPositions, IPositionsBase, IPositionsByMode, IPositionsOffchainBranch, IPositionsOffchainOnly, IPositionsOnchainBranch, IPositionsOnchainOnly, IPreview, IPreviewByMode, type LeverageBand, LiquidationsNamespace, type ListMerger, LpParams, LpRedeemParams, LpResult, LpState, MaxBorrowParams, type MergeListResult, MergedQuery, MissingSourceError, Mode, type MultipleDelayedWithdrawalsError, NamespaceOptions, type NoDelayedRouteError, type NoRecordedIntentError, NoSourceServedError, type NoStrategyTargetCollateralError, OffchainByMode, OffchainSource, OnchainByMode, OnchainSource, OpenEmptyPrepareRequest, OpenFlowError, OpenPrepareRequest, OpenStrategyParams, OpenStrategyResult, type OperationState, OpportunitiesNamespace, type PathLossRate, PlainMultichainSDKOptions, PoolInput, type PoolOperationError, PoolPrepareRequest, PositionInput, PositionsNamespace, PrepareApi, PrepareOptions, PrepareRequest, PreviewNamespace, RepayStrategyParams, type RouteErrors, SourceChainMismatchError, SourceUnavailableError, StrategyInput, StrategyResult, StrategyRoutesResult, type UnexpectedFailureError, type UnsupportedCollateralTokenError, type UnsupportedTokenPairError, type WithPartialState, WithRouteErrors, type WithdrawCeilings, WithdrawCollateralParams, WithdrawStrategyParams, type WithdrawalInProgressError, assertSameChains, creditAccountNotEmpty, creditAccountNotFound, everyChainFailed, filterResponse, mergeChainList, mergeChainOne, noStrategyTargetCollateral, unexpectedFailure };
+export { AbstractNamespace, AccountFlowError, AccountPrepareRequest, AddCollateralParams, AdjustLeverageParams, AllSourcesFailedError, AnalyticsNamespace, BorrowParams, BorrowPrepareRequest, BorrowResult, type BorrowState, ChainOf, ChainRef, CheckOperationProps, type CreditAccountNotEmptyError, type CreditAccountNotFoundError, DEFAULT_MAX_OFFCHAIN_LAG, DEFAULT_MAX_STATE_AGE, DelayedStrategyResult, DepositStrategyParams, EmptyCreditAccountResult, EnsureFreshChains, type EntityMerger, ExecuteApi, type ExecutionCost, type FilterResult, FinalizeParams, FinalizeResult, GearboxSDK, GearboxSDKOptions, IAnalytics, IAnalyticsByMode, IGearboxSDK, ILiquidations, ILiquidationsByMode, INotices, INoticesByMode, IOpportunities, IOpportunitiesBase, IOpportunitiesByMode, IOpportunitiesExecute, IOpportunitiesOffchainBranch, IOpportunitiesOffchainOnly, IOpportunitiesOnchainBranch, IOpportunitiesOnchainOnly, IOpportunitiesPrepare, IOpportunityMergers, IPositionMergers, IPositions, IPositionsBase, IPositionsByMode, IPositionsOffchainBranch, IPositionsOffchainOnly, IPositionsOnchainBranch, IPositionsOnchainOnly, IPreview, IPreviewByMode, type LeverageBand, LiquidationsNamespace, type ListMerger, LpParams, LpRedeemParams, LpResult, LpState, MaxBorrowParams, MaxWithdrawCollateralOptions, type MergeListResult, MergedQuery, MissingSourceError, Mode, type MultipleDelayedWithdrawalsError, NamespaceOptions, type NoDelayedRouteError, type NoRecordedIntentError, NoSourceServedError, type NoStrategyTargetCollateralError, OffchainByMode, OffchainSource, OnchainByMode, OnchainSource, OpenEmptyPrepareRequest, OpenFlowError, OpenPrepareRequest, OpenStrategyParams, OpenStrategyResult, type OperationState, OpportunitiesNamespace, type PathLossRate, PlainMultichainSDKOptions, PoolInput, type PoolOperationError, PoolPrepareRequest, PositionInput, PositionsNamespace, PrepareApi, PrepareOptions, PrepareRequest, PreviewNamespace, RepayStrategyParams, type RouteErrors, SourceChainMismatchError, SourceUnavailableError, StrategyInput, StrategyResult, StrategyRoutesResult, type UnexpectedFailureError, type UnsupportedCollateralTokenError, type UnsupportedTokenPairError, type WithPartialState, WithRouteErrors, type WithdrawCeilings, WithdrawCollateralParams, WithdrawStrategyParams, type WithdrawalInProgressError, assertSameChains, creditAccountNotEmpty, creditAccountNotFound, everyChainFailed, filterResponse, mergeChainList, mergeChainOne, noStrategyTargetCollateral, unexpectedFailure };

package/dist/types/sdk/prepare/PrepareApi.d.ts

@@ -14,7 +14,7 @@ import { LeverageBand } from "../../onchain/accounts/intents/leverage-band.js";
 import { OpenStrategyState } from "../../onchain/accounts/intents/open-strategy.js";
 import { PoolOperationError } from "../../onchain/validation/bundles/checkPoolOperation.js";
 import "../../onchain/index.js";
-import { AccountFlowError, AddCollateralParams, AdjustLeverageParams, BorrowParams, BorrowResult, DepositStrategyParams, EmptyCreditAccountResult, FinalizeParams, FinalizeResult, IOpportunitiesPrepare, LpParams, LpRedeemParams, LpResult, LpState, MaxBorrowParams, OpenFlowError, OpenStrategyParams, OpenStrategyResult, PoolInput, PositionInput, RepayStrategyParams, StrategyInput, StrategyResult, StrategyRoutesResult, WithRouteErrors, WithdrawCollateralParams, WithdrawStrategyParams } from "./types.js";
+import { AccountFlowError, AddCollateralParams, AdjustLeverageParams, BorrowParams, BorrowResult, DepositStrategyParams, EmptyCreditAccountResult, FinalizeParams, FinalizeResult, IOpportunitiesPrepare, LpParams, LpRedeemParams, LpResult, LpState, MaxBorrowParams, MaxWithdrawCollateralOptions, OpenFlowError, OpenStrategyParams, OpenStrategyResult, PoolInput, PositionInput, RepayStrategyParams, StrategyInput, StrategyResult, StrategyRoutesResult, WithRouteErrors, WithdrawCollateralParams, WithdrawStrategyParams } from "./types.js";
 import { EnsureFreshChains } from "../types.js";
 import { Address } from "viem";
 //#region src/sdk/prepare/PrepareApi.d.ts
@@ -89,7 +89,7 @@ declare class PrepareApi extends MultichainConstruct implements IOpportunitiesPr
   /**
    * {@inheritDoc IOpportunitiesPrepare.maxWithdraw}
    **/
-  maxWithdraw(position: PositionInput, sourceToken?: Address): Promise<WithdrawCeilings>;
+  maxWithdraw(position: PositionInput, sourceToken?: Address, targetHF?: bigint): Promise<WithdrawCeilings>;
   /**
    * {@inheritDoc IOpportunitiesPrepare.repayStrategy}
    **/
@@ -121,7 +121,7 @@ declare class PrepareApi extends MultichainConstruct implements IOpportunitiesPr
   /**
    * {@inheritDoc IOpportunitiesPrepare.maxWithdrawCollateral}
    **/
-  maxWithdrawCollateral(position: PositionInput, token: Address, targetHF?: bigint): Promise<bigint>;
+  maxWithdrawCollateral(position: PositionInput, token: Address, options?: MaxWithdrawCollateralOptions): Promise<bigint>;
   /**
    * {@inheritDoc IOpportunitiesPrepare.maxBorrow}
    **/

package/dist/types/sdk/prepare/index.d.ts

@@ -4,6 +4,6 @@ import { ExecutionCost, OperationState, PathLossRate, RouteErrors, WithPartialSt
 import { BorrowState } from "../../onchain/accounts/intents/borrow.js";
 import { LeverageBand } from "../../onchain/accounts/intents/leverage-band.js";
 import { PoolOperationError } from "../../onchain/validation/bundles/checkPoolOperation.js";
-import { AccountFlowError, AddCollateralParams, AdjustLeverageParams, BorrowParams, BorrowResult, DelayedStrategyResult, DepositStrategyParams, EmptyCreditAccountResult, FinalizeParams, FinalizeResult, IOpportunitiesPrepare, LpParams, LpRedeemParams, LpResult, LpState, MaxBorrowParams, OpenFlowError, OpenStrategyParams, OpenStrategyResult, PoolInput, PositionInput, PrepareOptions, RepayStrategyParams, StrategyInput, StrategyResult, StrategyRoutesResult, WithRouteErrors, WithdrawCollateralParams, WithdrawStrategyParams } from "./types.js";
+import { AccountFlowError, AddCollateralParams, AdjustLeverageParams, BorrowParams, BorrowResult, DelayedStrategyResult, DepositStrategyParams, EmptyCreditAccountResult, FinalizeParams, FinalizeResult, IOpportunitiesPrepare, LpParams, LpRedeemParams, LpResult, LpState, MaxBorrowParams, MaxWithdrawCollateralOptions, OpenFlowError, OpenStrategyParams, OpenStrategyResult, PoolInput, PositionInput, PrepareOptions, RepayStrategyParams, StrategyInput, StrategyResult, StrategyRoutesResult, WithRouteErrors, WithdrawCollateralParams, WithdrawStrategyParams } from "./types.js";
 import { ChainOf, PrepareApi } from "./PrepareApi.js";
-export { AccountFlowError, AddCollateralParams, AdjustLeverageParams, BorrowParams, BorrowResult, type BorrowState, ChainOf, type CreditAccountNotEmptyError, type CreditAccountNotFoundError, DelayedStrategyResult, DepositStrategyParams, EmptyCreditAccountResult, type ExecutionCost, FinalizeParams, FinalizeResult, IOpportunitiesPrepare, type LeverageBand, LpParams, LpRedeemParams, LpResult, LpState, MaxBorrowParams, type MultipleDelayedWithdrawalsError, type NoDelayedRouteError, type NoRecordedIntentError, type NoStrategyTargetCollateralError, OpenFlowError, OpenStrategyParams, OpenStrategyResult, type OperationState, type PathLossRate, PoolInput, type PoolOperationError, PositionInput, PrepareApi, PrepareOptions, RepayStrategyParams, type RouteErrors, StrategyInput, StrategyResult, StrategyRoutesResult, type UnexpectedFailureError, type UnsupportedCollateralTokenError, type UnsupportedTokenPairError, type WithPartialState, WithRouteErrors, type WithdrawCeilings, WithdrawCollateralParams, WithdrawStrategyParams, type WithdrawalInProgressError, creditAccountNotEmpty, creditAccountNotFound, noStrategyTargetCollateral, unexpectedFailure };
+export { AccountFlowError, AddCollateralParams, AdjustLeverageParams, BorrowParams, BorrowResult, type BorrowState, ChainOf, type CreditAccountNotEmptyError, type CreditAccountNotFoundError, DelayedStrategyResult, DepositStrategyParams, EmptyCreditAccountResult, type ExecutionCost, FinalizeParams, FinalizeResult, IOpportunitiesPrepare, type LeverageBand, LpParams, LpRedeemParams, LpResult, LpState, MaxBorrowParams, MaxWithdrawCollateralOptions, type MultipleDelayedWithdrawalsError, type NoDelayedRouteError, type NoRecordedIntentError, type NoStrategyTargetCollateralError, OpenFlowError, OpenStrategyParams, OpenStrategyResult, type OperationState, type PathLossRate, PoolInput, type PoolOperationError, PositionInput, PrepareApi, PrepareOptions, RepayStrategyParams, type RouteErrors, StrategyInput, StrategyResult, StrategyRoutesResult, type UnexpectedFailureError, type UnsupportedCollateralTokenError, type UnsupportedTokenPairError, type WithPartialState, WithRouteErrors, type WithdrawCeilings, WithdrawCollateralParams, WithdrawStrategyParams, type WithdrawalInProgressError, creditAccountNotEmpty, creditAccountNotFound, noStrategyTargetCollateral, unexpectedFailure };

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

@@ -19,6 +19,12 @@ import { PoolOperationError } from "../../onchain/validation/bundles/checkPoolOp
 import "../../onchain/index.js";
 import { Address } from "viem";
 //#region src/sdk/prepare/types.d.ts
+interface MaxWithdrawCollateralOptions {
+  /** Main-price HF threshold, in basis points; defaults to 10101. */
+  targetHF?: bigint;
+  /** Safe-price HF threshold, in basis points; defaults to 10001. */
+  targetSafeHF?: bigint;
+}
 /**
  * What any operation on an existing account can answer with: the engine's
  * shared guards, the missing account, and a wrapped crash.
@@ -663,6 +669,11 @@ interface IOpportunitiesPrepare {
    * amounts; omitted, both this and the flow itself reach for the account's
    * largest non-phantom balance.
    *
+   * `targetHF` is the health factor `safePartial` has to leave behind, in
+   * basis points. The default is the facade's own threshold; a form holding
+   * the account to something stricter passes its own, so the ceiling it
+   * offers clears its own bar rather than landing a basis point under it.
+   *
    * Taking everything out needs none of the figures: send `MAX_UINT256` to
    * {@link withdrawStrategy} and the exit is what runs, named rather than
    * priced.
@@ -670,7 +681,7 @@ interface IOpportunitiesPrepare {
    * A bare read: it answers its numbers, and throws on an account or a chain
    * the SDK does not hold.
    **/
-  maxWithdraw(position: PositionInput, sourceToken?: Address): Promise<WithdrawCeilings>;
+  maxWithdraw(position: PositionInput, sourceToken?: Address, targetHF?: bigint): Promise<WithdrawCeilings>;
   /**
    * Paying debt down with funds from the wallet: collateral stays where it is,
    * so net value grows by what was repaid, leverage falls and the health factor
@@ -766,13 +777,13 @@ interface IOpportunitiesPrepare {
    * requires. Zero debt frees the whole balance — the ceiling a
    * withdraw-collateral form should offer.
    *
-   * `targetHF` names the health factor to leave the account at, in basis
-   * points; omitted, the SDK holds it to the threshold a form would.
+   * Options name independent main and safe price health-factor thresholds in
+   * basis points. The SDK defaults to the form thresholds and adds its margin.
    *
    * A bare read: it answers its number, and throws on an account or a chain
    * the SDK does not hold.
    **/
-  maxWithdrawCollateral(position: PositionInput, token: Address, targetHF?: bigint): Promise<bigint>;
+  maxWithdrawCollateral(position: PositionInput, token: Address, options?: MaxWithdrawCollateralOptions): Promise<bigint>;
   /**
    * Largest loan {@link borrow} can draw against a given collateral while the
    * account stays safely collateralised, in the payout token's units — the
@@ -829,4 +840,4 @@ interface IOpportunitiesPrepare {
   finalize(position: PositionInput, params: FinalizeParams): Promise<SDKReturn<FinalizeResult, (AccountFlowError | NoRecordedIntentError | NoDelayedRouteError | WithdrawalInProgressError | UnsupportedTokenPairError) & WithPartialState<OperationState>>>;
 }
 //#endregion
-export { AccountFlowError, AddCollateralParams, AdjustLeverageParams, BorrowParams, BorrowResult, type BorrowState, type CreditAccountNotEmptyError, type CreditAccountNotFoundError, DelayedStrategyResult, DepositStrategyParams, EmptyCreditAccountResult, type ExecutionCost, FinalizeParams, FinalizeResult, IOpportunitiesPrepare, type LeverageBand, LpParams, LpRedeemParams, LpResult, LpState, MaxBorrowParams, type MultipleDelayedWithdrawalsError, type NoDelayedRouteError, type NoRecordedIntentError, type NoStrategyTargetCollateralError, OpenFlowError, OpenStrategyParams, OpenStrategyResult, type OperationState, type PathLossRate, PoolInput, type PoolOperationError, PositionInput, PrepareOptions, RepayStrategyParams, type RouteErrors, StrategyInput, StrategyResult, StrategyRoutesResult, type UnexpectedFailureError, type UnsupportedCollateralTokenError, type UnsupportedTokenPairError, type WithPartialState, WithRouteErrors, type WithdrawCeilings, WithdrawCollateralParams, WithdrawStrategyParams, type WithdrawalInProgressError };
+export { AccountFlowError, AddCollateralParams, AdjustLeverageParams, BorrowParams, BorrowResult, type BorrowState, type CreditAccountNotEmptyError, type CreditAccountNotFoundError, DelayedStrategyResult, DepositStrategyParams, EmptyCreditAccountResult, type ExecutionCost, FinalizeParams, FinalizeResult, IOpportunitiesPrepare, type LeverageBand, LpParams, LpRedeemParams, LpResult, LpState, MaxBorrowParams, MaxWithdrawCollateralOptions, type MultipleDelayedWithdrawalsError, type NoDelayedRouteError, type NoRecordedIntentError, type NoStrategyTargetCollateralError, OpenFlowError, OpenStrategyParams, OpenStrategyResult, type OperationState, type PathLossRate, PoolInput, type PoolOperationError, PositionInput, PrepareOptions, RepayStrategyParams, type RouteErrors, StrategyInput, StrategyResult, StrategyRoutesResult, type UnexpectedFailureError, type UnsupportedCollateralTokenError, type UnsupportedTokenPairError, type WithPartialState, WithRouteErrors, type WithdrawCeilings, WithdrawCollateralParams, WithdrawStrategyParams, type WithdrawalInProgressError };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "17.6.1",
+  "version": "17.7.0",
   "description": "Gearbox SDK",
   "license": "MIT",
   "repository": {