@gearbox-protocol/sdk 16.3.2 → 16.4.0-next.2

package/dist/cjs/onchain/preview/preview/previewOperation.js

@@ -34,9 +34,13 @@ async function previewOperation(sdk, input, options, creditAccount) {
 	if (!parsed.ok) return parsed;
 	const operation = parsed.data;
 	if (require_onchain_preview_parse_types.isPoolOperation(operation)) return require_onchain_preview_preview_previewPoolPositionOperation.previewPoolPositionOperation(sdk, operation, options);
-	if (operation.operation === "OpenCreditAccount" || operation.operation === "RWAOpenCreditAccount") return require_onchain_preview_preview_previewOpenStrategyPosition.previewOpenStrategyPosition(sdk, input, operation);
+	if (operation.operation === "OpenCreditAccount" || operation.operation === "RWAOpenCreditAccount") {
+		const replayed = require_onchain_preview_preview_replayMulticall.replayMulticall(sdk, operation);
+		if (!replayed.ok) return replayed;
+		return require_onchain_preview_preview_previewOpenStrategyPosition.previewOpenStrategyPosition(sdk, input, operation, replayed.data);
+	}
 	if (operation.operation === "CloseCreditAccount") {
-		const resolved = await resolveCreditAccount(sdk, operation, options, creditAccount);
+		const resolved = await resolveCreditAccount(sdk, operation.creditAccount, options, creditAccount);
 		if (!resolved.ok) return resolved;
 		const replayed = require_onchain_preview_preview_replayMulticall.replayMulticall(sdk, operation, resolved.data);
 		if (!replayed.ok) return replayed;
@@ -48,7 +52,7 @@ async function previewOperation(sdk, input, options, creditAccount) {
 		return preview;
 	}
 	if (operation.operation === "MultiCall" || operation.operation === "BotMulticall" || operation.operation === "RWAMulticall") {
-		const resolved = await resolveCreditAccount(sdk, operation, options, creditAccount);
+		const resolved = await resolveCreditAccount(sdk, operation.creditAccount, options, creditAccount);
 		if (!resolved.ok) return resolved;
 		const replayed = require_onchain_preview_preview_replayMulticall.replayMulticall(sdk, operation, resolved.data);
 		if (!replayed.ok) return replayed;
@@ -65,20 +69,24 @@ async function previewOperation(sdk, input, options, creditAccount) {
 * injected state when present, otherwise fetches it from the credit account
 * compressor.
 */
-async function resolveCreditAccount(sdk, operation, options, creditAccount) {
-	let resolved = creditAccount;
-	if (!resolved) resolved = await sdk.accounts.getCreditAccountData(operation.creditAccount, options?.blockNumber);
-	if (!resolved) return require_model_result.sdkErr(require_model_errors_prepare_errors.creditAccountNotFound(operation.creditAccount));
+async function resolveCreditAccount(sdk, address, options, data) {
+	let resolved = data;
+	if (!resolved) resolved = await sdk.accounts.getCreditAccountData(address, options?.blockNumber);
+	if (!resolved) return require_model_result.sdkErr(require_model_errors_prepare_errors.creditAccountNotFound(address));
 	return require_model_result.sdkOk(resolved);
 }
 /**
 * Previews a plain/bot/RWA multicall: classifies the instant preview
-* (zero-debt closure/repay vs adjustment) and, when the multicall requests a
-* delayed withdrawal, wraps the instant preview into a
-* `DelayedCreditAccountOperation` together with the best-effort preview of
-* the state after the withdrawal is claimed.
+* (reopening a zero-debt account, zero-debt closure/repay, or adjustment)
+* and, when the multicall requests a delayed withdrawal, wraps the instant
+* preview into a `DelayedCreditAccountOperation` together with the
+* best-effort preview of the state after the withdrawal is claimed.
+*
+* A reopening is reported as `OpenCreditAccount` and never as a delayed
+* withdrawal: an opening requests no redemption.
 */
 async function previewMulticallOperation(sdk, input, operation, replay, blockNumber) {
+	if (replay.before.totalDebt === 0n && replay.before.quotas.toAssets(0n).length === 0 && replay.after.account.totalDebt > 0n) return require_onchain_preview_preview_previewOpenStrategyPosition.previewOpenStrategyPosition(sdk, input, operation, replay);
 	let instantPreview;
 	if (require_onchain_preview_preview_detectCloseOrRepay.isCloseOrRepay(operation.multicall)) {
 		const instant = require_onchain_preview_preview_previewExitOrRepayStrategyPosition.previewExitOrRepayStrategyPosition(sdk, input, operation, false, replay);

package/dist/cjs/onchain/preview/preview/replayMulticall.js

@@ -5,11 +5,12 @@ const require_onchain_preview_preview_CreditAccountState = require("./CreditAcco
 const require_onchain_preview_preview_replayInnerOperations = require("./replayInnerOperations.js");
 //#region src/onchain/preview/preview/replayMulticall.ts
 /**
-* Replays the operation's multicall over the account's pre-resolved
-* pre-state via {@link replayInnerOperations}.
+* Replays the operation's multicall via {@link replayInnerOperations}.
+* When `creditAccount` is omitted, the seed is
+* {@link CreditAccountState.beforeOpen} (a fresh opening).
 */
 function replayMulticall(sdk, operation, creditAccount) {
-	const before = require_onchain_preview_preview_CreditAccountState.CreditAccountState.fromCreditAccountData(creditAccount);
+	const before = creditAccount ? require_onchain_preview_preview_CreditAccountState.CreditAccountState.fromCreditAccountData(creditAccount) : require_onchain_preview_preview_CreditAccountState.CreditAccountState.beforeOpen(operation.creditManager, sdk.marketRegister.findByCreditManager(operation.creditManager).underlying);
 	const after = require_onchain_preview_preview_replayInnerOperations.makeReplayState(before.clone());
 	const error = require_onchain_preview_preview_replayInnerOperations.replayInnerOperations(sdk, operation.multicall, after);
 	if (error) return require_model_result.sdkErr(error);

package/dist/cjs/onchain/validation/bundles/checkCollateralFunding.js

@@ -23,13 +23,13 @@ async function checkCollateralFunding(input) {
 	if (held.size === 0) return [];
 	let spender;
 	try {
-		if (preview.operation === "OpenCreditAccount" || preview.operation === "RWAOpenCreditAccount") spender = await sdk.accounts.getApprovalAddress({
+		if (preview.creditAccount) spender = await sdk.accounts.getApprovalAddress({
 			creditManager: preview.creditManager,
-			borrower: sender
+			creditAccount: preview.creditAccount
 		});
 		else spender = await sdk.accounts.getApprovalAddress({
 			creditManager: preview.creditManager,
-			creditAccount: preview.creditAccount
+			borrower: sender
 		});
 	} catch (cause) {
 		return [require_model_errors_prepare_errors.unexpectedFailure(cause, "resolve the approval address")];

package/dist/cjs/onchain/validation/bundles/checkCreditOperation.js

@@ -26,7 +26,8 @@ async function checkCreditOperation(args) {
 	const suite = sdk.marketRegister.findCreditManager(preview.creditManager);
 	const market = suite.market;
 	const underlying = require_onchain_validation_helpers_token.toToken(sdk, market.pool.underlying);
-	const isOpening = preview.operation === "OpenCreditAccount" || preview.operation === "RWAOpenCreditAccount";
+	const isOpening = preview.operation === "OpenCreditAccount";
+	const isEmptyOpening = preview.operation === "OpenCreditAccount" && preview.totalDebt.value === 0n && preview.collateralAdded.length === 0 && preview.quotas.length === 0;
 	const protocol = [
 		...require_onchain_validation_bundles_checkMarket.checkMarket(suite),
 		...require_onchain_validation_checks_checkDebtLimits.checkDebtLimits({
@@ -34,7 +35,7 @@ async function checkCreditOperation(args) {
 			minDebt: suite.creditFacade.minDebt,
 			maxDebt: suite.creditFacade.maxDebt,
 			underlying,
-			allowZero: !isOpening,
+			allowZero: !isOpening || isEmptyOpening,
 			maxBorrowAmount: suite.maxBorrowAmount()
 		}),
 		...require_onchain_validation_bundles_checkIncreaseDebt.checkIncreaseDebt(suite, preview, underlying),
@@ -52,7 +53,7 @@ async function checkCreditOperation(args) {
 		preview,
 		sender,
 		blockNumber
-	}), preview.operation === "OpenCreditAccount" || preview.operation === "RWAOpenCreditAccount" ? require_onchain_validation_bundles_checkRWAOpening.checkRWAOpening({
+	}), isOpening ? require_onchain_validation_bundles_checkRWAOpening.checkRWAOpening({
 		sdk,
 		preview,
 		sender

package/dist/cjs/onchain/validation/bundles/checkRWAOpening.js

@@ -12,13 +12,12 @@ async function checkRWAOpening(input) {
 	if (!nft) return [];
 	const gated = new require_onchain_utils_AddressSet.AddressSet(await nft.getTokens());
 	const candidates = new require_onchain_utils_AddressSet.AddressSet([...preview.collateralAdded.map((a) => a.token.address), ...preview.quotas.map((q) => q.token.address)]);
-	const providedArgs = preview.operation === "RWAOpenCreditAccount" ? preview.rwaArgs : void 0;
 	return (await Promise.all([...candidates].filter((token) => gated.has(token)).map((token) => require_onchain_validation_bundles_checkRWAOpenRequirements.checkRWAOpenRequirements({
 		sdk,
 		wallet: sender,
 		creditManager: preview.creditManager,
 		token,
-		providedArgs
+		providedArgs: preview.rwaArgs
 	})))).flat();
 }
 //#endregion

package/dist/cjs/onchain/validation/checkOperation.js

@@ -43,7 +43,6 @@ async function checkOperation(input, options = {}) {
 			sender
 		}, options);
 		case "OpenCreditAccount":
-		case "RWAOpenCreditAccount":
 		case "AdjustCreditAccount": return require_onchain_validation_bundles_checkCreditOperation.checkCreditOperation({
 			sdk,
 			preview,

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

@@ -0,0 +1,30 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_model_errors_operation_errors = require("../../../model/errors/operation-errors.js");
+require("../../../model/index.js");
+//#region src/onchain/validation/checks/checkReservePriceLimited.ts
+/**
+* Whether a failed collateral check is the reserve price feed's doing.
+*
+* A call that hands funds over is weighed at safe prices — `min` of a token's
+* two feeds, and nothing at all where governance registered no reserve feed —
+* so an account that covers its debt at the main feed can still be refused.
+* The two are worth telling apart: a position that is genuinely too small is
+* fixed by adding collateral or requesting less, while this one is a valuation
+* the account does not control, and requesting less only helps as far as
+* `withdrawable` says it does.
+*
+* Runs after `checkCollateralised` and answers only when that one refused, so
+* the caller keeps its own threshold rather than restating it here.
+*/
+function checkReservePriceLimited(args) {
+	const { healthFactor, atMainPrices, healthFactorThreshold, withdrawable } = args;
+	if (healthFactor >= healthFactorThreshold || atMainPrices < healthFactorThreshold) return [];
+	return [require_model_errors_operation_errors.reservePriceLimited({
+		healthFactor,
+		atMainPrices,
+		healthFactorThreshold,
+		withdrawable
+	})];
+}
+//#endregion
+exports.checkReservePriceLimited = checkReservePriceLimited;

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

@@ -14,6 +14,7 @@ const require_onchain_validation_checks_checkPoolPaused = require("./checkPoolPa
 const require_onchain_validation_checks_checkPoolSunset = require("./checkPoolSunset.js");
 const require_onchain_validation_checks_checkQuotaCount = require("./checkQuotaCount.js");
 const require_onchain_validation_checks_checkQuotaLimit = require("./checkQuotaLimit.js");
+const require_onchain_validation_checks_checkReservePriceLimited = require("./checkReservePriceLimited.js");
 exports.checkBorrowLimit = require_onchain_validation_checks_checkBorrowLimit.checkBorrowLimit;
 exports.checkCollateralised = require_onchain_validation_checks_checkCollateralised.checkCollateralised;
 exports.checkCreditAccountFrozen = require_onchain_validation_checks_checkCreditAccountFrozen.checkCreditAccountFrozen;
@@ -29,3 +30,4 @@ exports.checkPoolPaused = require_onchain_validation_checks_checkPoolPaused.chec
 exports.checkPoolSunset = require_onchain_validation_checks_checkPoolSunset.checkPoolSunset;
 exports.checkQuotaCount = require_onchain_validation_checks_checkQuotaCount.checkQuotaCount;
 exports.checkQuotaLimit = require_onchain_validation_checks_checkQuotaLimit.checkQuotaLimit;
+exports.checkReservePriceLimited = require_onchain_validation_checks_checkReservePriceLimited.checkReservePriceLimited;

package/dist/cjs/onchain/validation/index.js

@@ -18,6 +18,7 @@ const require_onchain_validation_checks_checkPoolPaused = require("./checks/chec
 const require_onchain_validation_checks_checkPoolSunset = require("./checks/checkPoolSunset.js");
 const require_onchain_validation_checks_checkQuotaCount = require("./checks/checkQuotaCount.js");
 const require_onchain_validation_checks_checkQuotaLimit = require("./checks/checkQuotaLimit.js");
+const require_onchain_validation_checks_checkReservePriceLimited = require("./checks/checkReservePriceLimited.js");
 require("./checks/index.js");
 const require_onchain_validation_bundles_checkAccountQuotas = require("./bundles/checkAccountQuotas.js");
 const require_onchain_validation_bundles_checkWalletAllowance = require("./bundles/checkWalletAllowance.js");
@@ -77,6 +78,7 @@ exports.checkQuotaCount = require_onchain_validation_checks_checkQuotaCount.chec
 exports.checkQuotaLimit = require_onchain_validation_checks_checkQuotaLimit.checkQuotaLimit;
 exports.checkRWAOpenRequirements = require_onchain_validation_bundles_checkRWAOpenRequirements.checkRWAOpenRequirements;
 exports.checkRWAOpening = require_onchain_validation_bundles_checkRWAOpening.checkRWAOpening;
+exports.checkReservePriceLimited = require_onchain_validation_checks_checkReservePriceLimited.checkReservePriceLimited;
 exports.checkSimulation = require_onchain_validation_checkSimulation.checkSimulation;
 exports.checkWallet = require_onchain_validation_bundles_checkWallet.checkWallet;
 exports.checkWalletAllowance = require_onchain_validation_bundles_checkWalletAllowance.checkWalletAllowance;

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

@@ -259,12 +259,13 @@ var PrepareApi = class extends require_onchain_base_MultichainConstruct.Multicha
 	/**
 	* {@inheritDoc IOpportunitiesPrepare.maxWithdraw}
 	**/
-	async maxWithdraw(position) {
+	async maxWithdraw(position, sourceToken) {
 		const sdk = await this.#chain(position.chainId);
 		const creditAccount = await this.#account(sdk, position);
 		return service(sdk).maxWithdraw({
 			creditAccount,
-			sdk
+			sdk,
+			sourceToken
 		});
 	}
 	/**

package/dist/esm/dev/midasUtils.js

@@ -1,5 +1,5 @@
 import { writeAndWait } from "./kycUtils.js";
-import { parseAbi, parseEther, toFunctionSelector } from "viem";
+import { parseAbi, parseEther } from "viem";
 //#region src/dev/midasUtils.ts
 /**
 * Midas vaults inherit their own `Pausable`, whose global pause is guarded by
@@ -9,24 +9,14 @@ const iMidasPausableVaultAbi = parseAbi([
 	"function paused() external view returns (bool)",
 	"function pause() external",
 	"function unpause() external",
-	"function fnPaused(bytes4 fn) external view returns (bool)",
-	"function pauseFn(bytes4 fn) external",
-	"function unpauseFn(bytes4 fn) external",
 	"function pauseAdminRole() external view returns (bytes32)",
 	"function accessControl() external view returns (address)"
 ]);
 const iMidasAccessControlAbi = parseAbi(["function hasRole(bytes32 role, address account) external view returns (bool)", "function grantRole(bytes32 role, address account) external"]);
 /**
-* Selector for `DepositVault.depositInstant(address,uint256,uint256,bytes32)`,
-* the 4-arg mint Gearbox adapters encode. Distinct from the custom-recipient
-* overload.
-*/
-const DEPOSIT_INSTANT_SELECTOR = toFunctionSelector("depositInstant(address,uint256,uint256,bytes32)");
-/**
-* Unpauses a Midas issuance vault on an anvil fork so that `depositInstant`
-* stops reverting with `Pausable: paused` (global) or `Pausable: fn paused`
-* (per-selector), and returns a callback that restores the original pause
-* state of each layer that was cleared.
+* Unpauses a globally paused Midas issuance vault on an anvil fork, so that
+* `depositInstant` stops reverting with `Pausable: paused`, and returns a
+* callback that restores the original pause state.
 *
 * Impersonates `admin` and grants it `pauseAdminRole()` when missing, same as
 * `greenlistMidasGateway` does with the greenlist roles. The grant is not
@@ -34,20 +24,11 @@ const DEPOSIT_INSTANT_SELECTOR = toFunctionSelector("depositInstant(address,uint
 */
 async function unpauseMidasIssuanceVault(props) {
 	const { anvil, vault, admin, logger } = props;
-	const [paused, depositInstantPaused] = await anvil.multicall({
-		allowFailure: false,
-		contracts: [{
-			address: vault,
-			abi: iMidasPausableVaultAbi,
-			functionName: "paused"
-		}, {
-			address: vault,
-			abi: iMidasPausableVaultAbi,
-			functionName: "fnPaused",
-			args: [DEPOSIT_INSTANT_SELECTOR]
-		}]
-	});
-	if (!paused && !depositInstantPaused) {
+	if (!await anvil.readContract({
+		address: vault,
+		abi: iMidasPausableVaultAbi,
+		functionName: "paused"
+	})) {
 		logger?.debug(`midas: issuance vault ${vault} is not paused`);
 		return async () => {};
 	}
@@ -69,7 +50,7 @@ async function unpauseMidasIssuanceVault(props) {
 		functionName: "hasRole",
 		args: [pauseAdminRole, admin]
 	});
-	logger?.debug(`midas: unpausing issuance vault ${vault} as ${admin}, access control ${accessControl}, pause admin role ${pauseAdminRole}` + (paused ? ", global" : "") + (depositInstantPaused ? ", depositInstant" : ""));
+	logger?.debug(`midas: unpausing issuance vault ${vault} as ${admin}, access control ${accessControl}, pause admin role ${pauseAdminRole}`);
 	await anvil.impersonateAccount({ address: admin });
 	try {
 		await anvil.setBalance({
@@ -87,21 +68,13 @@ async function unpauseMidasIssuanceVault(props) {
 			});
 			logger?.debug(`midas: granted pause admin role to ${admin}`);
 		}
-		if (paused) await writeAndWait(anvil, {
+		await writeAndWait(anvil, {
 			account: admin,
 			chain: anvil.chain,
 			address: vault,
 			abi: iMidasPausableVaultAbi,
 			functionName: "unpause"
 		});
-		if (depositInstantPaused) await writeAndWait(anvil, {
-			account: admin,
-			chain: anvil.chain,
-			address: vault,
-			abi: iMidasPausableVaultAbi,
-			functionName: "unpauseFn",
-			args: [DEPOSIT_INSTANT_SELECTOR]
-		});
 	} finally {
 		await anvil.stopImpersonatingAccount({ address: admin });
 	}
@@ -116,21 +89,13 @@ async function unpauseMidasIssuanceVault(props) {
 				address: admin,
 				value: parseEther("100")
 			});
-			if (paused) await writeAndWait(anvil, {
+			await writeAndWait(anvil, {
 				account: admin,
 				chain: anvil.chain,
 				address: vault,
 				abi: iMidasPausableVaultAbi,
 				functionName: "pause"
 			});
-			if (depositInstantPaused) await writeAndWait(anvil, {
-				account: admin,
-				chain: anvil.chain,
-				address: vault,
-				abi: iMidasPausableVaultAbi,
-				functionName: "pauseFn",
-				args: [DEPOSIT_INSTANT_SELECTOR]
-			});
 		} catch (e) {
 			logger?.warn(`midas: failed to pause issuance vault ${vault} back: ${e}`);
 		} finally {

package/dist/esm/model/errors/index.js

@@ -1,7 +1,7 @@
 import "./base.js";
 import { creditAccountFrozen, liquidatorNotEligible, notEmergencyLiquidator } from "./liquidation-errors.js";
-import { creditManagerPaused, debtOutOfRange, forbiddenToken, insufficientAllowance, insufficientBalance, insufficientCollateral, insufficientPoolLiquidity, leverageOutOfRange, marketExpired, poolPaused, poolSunset, quotaCountExceeded, quotaLimitReached, rwaOpenRequirementsNotMet } from "./operation-errors.js";
+import { creditManagerPaused, debtOutOfRange, forbiddenToken, insufficientAllowance, insufficientBalance, insufficientCollateral, insufficientPoolLiquidity, leverageOutOfRange, marketExpired, poolPaused, poolSunset, quotaCountExceeded, quotaLimitReached, reservePriceLimited, rwaOpenRequirementsNotMet } from "./operation-errors.js";
 import { unpriceableTokenError } from "./oracle-errors.js";
 import { creditAccountNotEmpty, creditAccountNotFound, multipleDelayedWithdrawals, noDelayedRoute, noRecordedIntent, noStrategyTargetCollateral, unexpectedFailure, unsupportedCollateralToken, unsupportedTokenPair, withdrawalInProgress } from "./prepare-errors.js";
 import { malformedTransaction } from "./preview-errors.js";
-export { creditAccountFrozen, creditAccountNotEmpty, creditAccountNotFound, creditManagerPaused, debtOutOfRange, forbiddenToken, insufficientAllowance, insufficientBalance, insufficientCollateral, insufficientPoolLiquidity, leverageOutOfRange, liquidatorNotEligible, malformedTransaction, marketExpired, multipleDelayedWithdrawals, noDelayedRoute, noRecordedIntent, noStrategyTargetCollateral, notEmergencyLiquidator, poolPaused, poolSunset, quotaCountExceeded, quotaLimitReached, rwaOpenRequirementsNotMet, unexpectedFailure, unpriceableTokenError, unsupportedCollateralToken, unsupportedTokenPair, withdrawalInProgress };
+export { creditAccountFrozen, creditAccountNotEmpty, creditAccountNotFound, creditManagerPaused, debtOutOfRange, forbiddenToken, insufficientAllowance, insufficientBalance, insufficientCollateral, insufficientPoolLiquidity, leverageOutOfRange, liquidatorNotEligible, malformedTransaction, marketExpired, multipleDelayedWithdrawals, noDelayedRoute, noRecordedIntent, noStrategyTargetCollateral, notEmergencyLiquidator, poolPaused, poolSunset, quotaCountExceeded, quotaLimitReached, reservePriceLimited, rwaOpenRequirementsNotMet, unexpectedFailure, unpriceableTokenError, unsupportedCollateralToken, unsupportedTokenPair, withdrawalInProgress };

package/dist/esm/model/errors/operation-errors.js

@@ -66,6 +66,14 @@ function insufficientCollateral(args) {
 		...args
 	};
 }
+/** {@inheritDoc ReservePriceLimitedError} */
+function reservePriceLimited(args) {
+	return {
+		code: "reservePriceLimited",
+		message: `The reserve price feed values this collateral below what the operation pays out: the account covers its debt at ${args.atMainPrices} on the main feed and only ${args.healthFactor} at the reserve one, below ${args.healthFactorThreshold}.`,
+		...args
+	};
+}
 /** {@inheritDoc ForbiddenTokenError} */
 function forbiddenToken(token) {
 	return {
@@ -118,4 +126,4 @@ function rwaOpenRequirementsNotMet(args) {
 	};
 }
 //#endregion
-export { creditManagerPaused, debtOutOfRange, forbiddenToken, insufficientAllowance, insufficientBalance, insufficientCollateral, insufficientPoolLiquidity, leverageOutOfRange, marketExpired, poolPaused, poolSunset, quotaCountExceeded, quotaLimitReached, rwaOpenRequirementsNotMet };
+export { creditManagerPaused, debtOutOfRange, forbiddenToken, insufficientAllowance, insufficientBalance, insufficientCollateral, insufficientPoolLiquidity, leverageOutOfRange, marketExpired, poolPaused, poolSunset, quotaCountExceeded, quotaLimitReached, reservePriceLimited, rwaOpenRequirementsNotMet };

package/dist/esm/model/index.js

@@ -15,7 +15,7 @@ import { ANALYTICS_POSITIONS_DEFAULT_LIMIT, ANALYTICS_POSITIONS_MAX_LIMIT, analy
 import "./curators.js";
 import "./delayed-intents.js";
 import { creditAccountFrozen, liquidatorNotEligible, notEmergencyLiquidator } from "./errors/liquidation-errors.js";
-import { creditManagerPaused, debtOutOfRange, forbiddenToken, insufficientAllowance, insufficientBalance, insufficientCollateral, insufficientPoolLiquidity, leverageOutOfRange, marketExpired, poolPaused, poolSunset, quotaCountExceeded, quotaLimitReached, rwaOpenRequirementsNotMet } from "./errors/operation-errors.js";
+import { creditManagerPaused, debtOutOfRange, forbiddenToken, insufficientAllowance, insufficientBalance, insufficientCollateral, insufficientPoolLiquidity, leverageOutOfRange, marketExpired, poolPaused, poolSunset, quotaCountExceeded, quotaLimitReached, reservePriceLimited, rwaOpenRequirementsNotMet } from "./errors/operation-errors.js";
 import { unpriceableTokenError } from "./errors/oracle-errors.js";
 import { creditAccountNotEmpty, creditAccountNotFound, multipleDelayedWithdrawals, noDelayedRoute, noRecordedIntent, noStrategyTargetCollateral, unexpectedFailure, unsupportedCollateralToken, unsupportedTokenPair, withdrawalInProgress } from "./errors/prepare-errors.js";
 import { malformedTransaction } from "./errors/preview-errors.js";
@@ -32,4 +32,4 @@ import { chainFailedSchema, chainMetadataSchema, chainSucceededSchema, dataSourc
 import { safeValue, sdkErr, sdkOk } from "./result.js";
 import "./withdrawals.js";
 import { positionClaimableWithdrawalSchema, positionPendingWithdrawalSchema, positionWithdrawalsSchema, withdrawalOutputAmountSchema } from "./withdrawals.schema.js";
-export { ANALYTICS_POSITIONS_DEFAULT_LIMIT, ANALYTICS_POSITIONS_MAX_LIMIT, CHART_METRIC_UNITS, CHART_RANGES, CHART_UNAVAILABLE_CODES, FILTER_ALL, KYC_REGISTRATION_LINKS, POOL_OPPORTUNITY_CHART_METRICS, POOL_POSITION_CHART_METRICS, PROTOCOL_CHART_METRICS, RWA_FACTORY_SECURITIZE, RWA_FACTORY_TYPES, RWA_PROTOCOLS, SECURITIZE_REGISTER_VAULT_TYPES, STRATEGY_OPPORTUNITY_CHART_METRICS, STRATEGY_POSITION_CHART_METRICS, STRATEGY_POSITION_COLLATERAL_ERROR, amountSchema, analyticsChartQueryOptionsSchema, analyticsChartQueryParamsSchema, analyticsChartQuerySchema, analyticsPositionListOptionsSchema, analyticsPositionListQueryParamsSchema, analyticsPositionListQuerySchema, analyticsPositionPageSchema, analyticsPositionSchema, analyticsPositionSortFieldSchema, analyticsSortDirectionSchema, apyBreakdownSchema, asEstimated, assetTypeSchema, backendPreferred, booleanParamSchema, borrowRateBreakdownSchema, bpsSchema, chainFailedSchema, chainIdSchema, chainMetadataSchema, chainSucceededSchema, chartBundleSchemaFor, chartDenominationSchema, chartMetricSchema, chartQueryCodec, chartQueryParamsSchema, chartQuerySchema, chartRangeSchema, chartSeriesSchema, chartValueSchema, chartWindowSchema, compareTagOf, creditAccountFrozen, creditAccountNotEmpty, creditAccountNotFound, creditManagerPaused, curatorNameSchema, curatorSchema, dataSourceSchema, debtOutOfRange, delayedReceivedAssetSchema, encodeFlag, filterAllSchema, filterable, forbiddenToken, instantReceivedAssetSchema, insufficientAllowance, insufficientBalance, insufficientCollateral, insufficientPoolLiquidity, isFilterSet, kycRequirementSchema, leverageOutOfRange, leverageSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionId, liquidationPositionSchema, liquidatorNotEligible, malformedTransaction, marketExpired, matchesLiquidatableAccountFilter, matchesOpportunityFilter, matchesPositionFilter, multipleDelayedWithdrawals, noDelayedRoute, noRecordedIntent, noStrategyTargetCollateral, notEmergencyLiquidator, noticeKindSchema, noticeSchema, offchainOnly, onchainOnly, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterQueryParamsSchema, opportunityFilterQuerySchema, opportunityFilterSchema, opportunityId, opportunityKeySchema, opportunityKindSchema, opportunitySchema, opportunityTotalsSchema, pnlBreakdownSchema, pointRewardsSchema, pointsProgramPnLSchema, pointsProgramSchema, pointsRewardsPnLSchema, poolOpportunityChartMetricSchema, poolOpportunityDetailSchema, poolOpportunityId, poolOpportunityKeySchema, poolOpportunitySchema, poolPaused, poolPositionChartMetricSchema, poolPositionId, poolPositionKeySchema, poolPositionSchema, poolSunset, positionClaimableWithdrawalSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionId, positionKeySchema, positionKindSchema, positionPendingWithdrawalSchema, positionSchema, positionTransactionKindSchema, positionTransactionSchema, positionWithdrawalsSchema, positionsTotalsSchema, priceFeedDataSchema, priceFeedSummarySchema, protocolChartMetricSchema, quotaAssetSchema, quotaCountExceeded, quotaLimitReached, rateCurvePointSchema, rateCurveSchema, receivedAssetSchema, responseMetadataSchema, responseSchema, rewardsPnLSchema, rewardsSchema, rwaOpenRequirementsNotMet, rwaProtocolSchema, safeValue, sdkErr, sdkOk, strategyOpportunityChartMetricSchema, strategyOpportunityDetailSchema, strategyOpportunityId, strategyOpportunityKeySchema, strategyOpportunitySchema, strategyPositionChartMetricSchema, strategyPositionId, strategyPositionKeySchema, strategyPositionSchema, timestampSchema, tokenAmountSchema, tokenQuotaRateSchema, tokenRewardsPnLSchema, tokenRewardsSchema, tokenSchema, tolerance, txCallSchema, underlyingTokenSchema, unexpectedFailure, unpriceableTokenError, unsupportedCollateralToken, unsupportedTokenPair, withdrawalInProgress, withdrawalOutputAmountSchema };
+export { ANALYTICS_POSITIONS_DEFAULT_LIMIT, ANALYTICS_POSITIONS_MAX_LIMIT, CHART_METRIC_UNITS, CHART_RANGES, CHART_UNAVAILABLE_CODES, FILTER_ALL, KYC_REGISTRATION_LINKS, POOL_OPPORTUNITY_CHART_METRICS, POOL_POSITION_CHART_METRICS, PROTOCOL_CHART_METRICS, RWA_FACTORY_SECURITIZE, RWA_FACTORY_TYPES, RWA_PROTOCOLS, SECURITIZE_REGISTER_VAULT_TYPES, STRATEGY_OPPORTUNITY_CHART_METRICS, STRATEGY_POSITION_CHART_METRICS, STRATEGY_POSITION_COLLATERAL_ERROR, amountSchema, analyticsChartQueryOptionsSchema, analyticsChartQueryParamsSchema, analyticsChartQuerySchema, analyticsPositionListOptionsSchema, analyticsPositionListQueryParamsSchema, analyticsPositionListQuerySchema, analyticsPositionPageSchema, analyticsPositionSchema, analyticsPositionSortFieldSchema, analyticsSortDirectionSchema, apyBreakdownSchema, asEstimated, assetTypeSchema, backendPreferred, booleanParamSchema, borrowRateBreakdownSchema, bpsSchema, chainFailedSchema, chainIdSchema, chainMetadataSchema, chainSucceededSchema, chartBundleSchemaFor, chartDenominationSchema, chartMetricSchema, chartQueryCodec, chartQueryParamsSchema, chartQuerySchema, chartRangeSchema, chartSeriesSchema, chartValueSchema, chartWindowSchema, compareTagOf, creditAccountFrozen, creditAccountNotEmpty, creditAccountNotFound, creditManagerPaused, curatorNameSchema, curatorSchema, dataSourceSchema, debtOutOfRange, delayedReceivedAssetSchema, encodeFlag, filterAllSchema, filterable, forbiddenToken, instantReceivedAssetSchema, insufficientAllowance, insufficientBalance, insufficientCollateral, insufficientPoolLiquidity, isFilterSet, kycRequirementSchema, leverageOutOfRange, leverageSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionId, liquidationPositionSchema, liquidatorNotEligible, malformedTransaction, marketExpired, matchesLiquidatableAccountFilter, matchesOpportunityFilter, matchesPositionFilter, multipleDelayedWithdrawals, noDelayedRoute, noRecordedIntent, noStrategyTargetCollateral, notEmergencyLiquidator, noticeKindSchema, noticeSchema, offchainOnly, onchainOnly, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterQueryParamsSchema, opportunityFilterQuerySchema, opportunityFilterSchema, opportunityId, opportunityKeySchema, opportunityKindSchema, opportunitySchema, opportunityTotalsSchema, pnlBreakdownSchema, pointRewardsSchema, pointsProgramPnLSchema, pointsProgramSchema, pointsRewardsPnLSchema, poolOpportunityChartMetricSchema, poolOpportunityDetailSchema, poolOpportunityId, poolOpportunityKeySchema, poolOpportunitySchema, poolPaused, poolPositionChartMetricSchema, poolPositionId, poolPositionKeySchema, poolPositionSchema, poolSunset, positionClaimableWithdrawalSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionId, positionKeySchema, positionKindSchema, positionPendingWithdrawalSchema, positionSchema, positionTransactionKindSchema, positionTransactionSchema, positionWithdrawalsSchema, positionsTotalsSchema, priceFeedDataSchema, priceFeedSummarySchema, protocolChartMetricSchema, quotaAssetSchema, quotaCountExceeded, quotaLimitReached, rateCurvePointSchema, rateCurveSchema, receivedAssetSchema, reservePriceLimited, responseMetadataSchema, responseSchema, rewardsPnLSchema, rewardsSchema, rwaOpenRequirementsNotMet, rwaProtocolSchema, safeValue, sdkErr, sdkOk, strategyOpportunityChartMetricSchema, strategyOpportunityDetailSchema, strategyOpportunityId, strategyOpportunityKeySchema, strategyOpportunitySchema, strategyPositionChartMetricSchema, strategyPositionId, strategyPositionKeySchema, strategyPositionSchema, timestampSchema, tokenAmountSchema, tokenQuotaRateSchema, tokenRewardsPnLSchema, tokenRewardsSchema, tokenSchema, tolerance, txCallSchema, underlyingTokenSchema, unexpectedFailure, unpriceableTokenError, unsupportedCollateralToken, unsupportedTokenPair, withdrawalInProgress, withdrawalOutputAmountSchema };

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

@@ -0,0 +1,40 @@
+import { BigIntMath } from "../../utils/bigint-math.js";
+import { PERCENTAGE_FACTOR } from "../../constants/math.js";
+import "../../utils/index.js";
+import { eq } from "./utils/common.js";
+//#region src/onchain/accounts/intents/collateral-money.ts
+/** {@inheritDoc CollateralMoney} */
+function collateralMoney(creditAccount, sdk) {
+	const { market, creditManager } = sdk.marketRegister.findCreditManager(creditAccount.creditManager);
+	const { priceOracle } = market;
+	const { pqk } = market.pool;
+	const underlying = market.pool.underlying;
+	const masked = creditAccount.enabledTokensMask !== 0n;
+	const mainUsd = (token, amount) => {
+		try {
+			return priceOracle.convertToUSD(token, amount);
+		} catch {
+			return;
+		}
+	};
+	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;
+	/** A quota is underlying-denominated, and a closed market backs nothing. */
+	const quotaMoney = (holding) => pqk.hasActiveQuota(holding.token) ? (mainUsd(underlying, holding.quota) ?? 0n) * PERCENTAGE_FACTOR : 0n;
+	const weigh = (holding) => {
+		const weighted = checkedUsd(holding) * lt(holding.token);
+		if (holding.quota === 0n) return weighted;
+		return BigIntMath.min(quotaMoney(holding), weighted);
+	};
+	return {
+		underlying,
+		counts: (holding) => holding.balance > 10n && (!masked || (holding.mask & creditAccount.enabledTokensMask) !== 0n),
+		weigh,
+		quotaMoney,
+		mainUsd,
+		checkedUsd,
+		lt
+	};
+}
+//#endregion
+export { collateralMoney };

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

@@ -6,6 +6,7 @@ import { checkCreditManagerPaused } from "../../validation/checks/checkCreditMan
 import { checkForbiddenToken } from "../../validation/checks/checkForbiddenToken.js";
 import { checkMarketExpired } from "../../validation/checks/checkMarketExpired.js";
 import { checkQuotaLimit } from "../../validation/checks/checkQuotaLimit.js";
+import { checkReservePriceLimited } from "../../validation/checks/checkReservePriceLimited.js";
 import { raise } from "../../validation/raise.js";
 import "../../validation/index.js";
 import { eq } from "./utils/common.js";
@@ -111,13 +112,24 @@ function assertGrowthAllowed(args) {
 * whose reserve feed the SDK cannot read keeps its main price, so a plan can
 * still be refused on-chain after passing here.
 */
-function assertCollateralised(healthFactorBps, safePrices) {
+function assertCollateralised(healthFactorBps, safePrices, atSafePrices) {
 	const healthFactorThreshold = MIN_HEALTH_FACTOR_FACADE;
-	raise(checkCollateralised({
+	const errors = checkCollateralised({
 		healthFactor: healthFactorBps,
 		healthFactorThreshold,
 		safePrices
-	}), `the account would end at a health factor of ${healthFactorBps}, below ${healthFactorThreshold}`);
+	});
+	if (errors.length === 0) return;
+	if (safePrices && atSafePrices) {
+		const { atMainPrices, withdrawable } = atSafePrices();
+		raise(checkReservePriceLimited({
+			healthFactor: healthFactorBps,
+			atMainPrices,
+			healthFactorThreshold,
+			withdrawable
+		}), `the account covers its debt at ${atMainPrices} on the main feed and only ${healthFactorBps} at the reserve one, below ${healthFactorThreshold}`);
+	}
+	raise(errors, `the account would end at a health factor of ${healthFactorBps}, below ${healthFactorThreshold}`);
 }
 /**
 * A quota can only be raised as far as the market still has room for: past the

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

@@ -8,13 +8,13 @@ import "../../validation/index.js";
 import { isPhantomToken } from "./utils/pick-token.js";
 import { assertMarketOperable } 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 { 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";
+import { withdrawLimits } from "./withdraw-limits.js";
+import { realize } from "./realize.js";
 import { planTail, projectTail } from "./tail.js";
 //#region src/onchain/accounts/intents/index.ts
 /**
@@ -50,26 +50,29 @@ var CreditAccountOperationsService = class extends SDKConstruct {
 	}
 	/**
 	* Both ends of what a `WITHDRAW` can take out, in underlying: the largest
-	* partial withdrawal that keeps leverage and stays inside the facade's
-	* `debtLimits`, 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.
+	* partial withdrawal that keeps leverage, 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.
+	* Two rules bound the partial end and both are reported: the facade's
+	* `debtLimits` as `partial`, and the safe-price collateral check on top of
+	* it as `safePartial`. The second is the one to offer — see
+	* {@link WithdrawCeilings}.
 	*
-	* @param props - Account slice and the SDK holding its market
-	* @returns The two ceilings, see {@link WithdrawCeilings} for the gap between
-	* them
+	* 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.
+	*
+	* @param props - Account slice, the SDK holding its market, and optionally
+	* the collateral the withdrawal would be funded from
+	* @returns The three limits, see {@link WithdrawCeilings} for the gap
+	* between them
 	*/
 	maxWithdraw(props) {
-		const view = accountView(props.creditAccount, props.sdk);
-		return {
-			partial: maxProportionalWithdrawal(view, view.debtLimits),
-			exit: view.collateral > 0n ? view.collateral : 0n
-		};
+		return withdrawLimits(props);
 	}
 	/**
 	* Debt a `REPAY` would have to cover to settle the account, in underlying