@gearbox-protocol/sdk 16.0.0-next.22 → 16.0.0-next.23

package/dist/cjs/onchain/pools/PoolService.js

@@ -21,6 +21,14 @@ require("../market/index.js");
 */
 const LIQUIDITY_SAFETY_NUM = 99999n;
 const LIQUIDITY_SAFETY_DENOM = 100000n;
+/**
+* What the pool can actually pay out right now, shaved by a hair so a
+* withdrawal sized against it does not fail on rounding.
+**/
+function payoutCeiling(market) {
+	const { pool } = market;
+	return market.priceOracle.toAmount(pool.underlying, pool.pool.availableLiquidity * LIQUIDITY_SAFETY_NUM / LIQUIDITY_SAFETY_DENOM);
+}
 var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 	/**
 	* {@inheritDoc IPoolsService.getDepositTokensIn}
@@ -126,7 +134,9 @@ var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 	*/
 	simulateDeposit(props) {
 		const { pool: poolAddr, amount } = props;
-		const { pool } = this.sdk.marketRegister.findByPool(poolAddr);
+		const market = this.sdk.marketRegister.findByPool(poolAddr);
+		const { pool } = market;
+		const { toTokenAmount } = market.priceOracle;
 		const tokenIn = props.tokenIn ?? pool.underlying;
 		const tokenOut = this.#resolveTokenOut(props.tokenOut, () => this.getDepositTokensOut(poolAddr, tokenIn), {
 			poolAddr,
@@ -135,14 +145,8 @@ var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		});
 		const { zapper } = this.getDepositMetadata(poolAddr, tokenIn, tokenOut);
 		return {
-			tokenIn: {
-				token: tokenIn,
-				balance: amount
-			},
-			tokenOut: {
-				token: tokenOut,
-				balance: toShares(pool.pool, amount)
-			},
+			tokenIn: toTokenAmount(tokenIn, amount),
+			tokenOut: toTokenAmount(tokenOut, toShares(pool.pool, amount)),
 			zapper: zapper?.baseParams.addr
 		};
 	}
@@ -151,7 +155,9 @@ var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 	*/
 	simulateWithdraw(props) {
 		const { pool: poolAddr, amount } = props;
-		const { pool } = this.sdk.marketRegister.findByPool(poolAddr);
+		const market = this.sdk.marketRegister.findByPool(poolAddr);
+		const { pool } = market;
+		const { toTokenAmount } = market.priceOracle;
 		const tokenIn = props.tokenIn ?? poolAddr;
 		const tokenOut = this.#resolveTokenOut(props.tokenOut, () => this.getWithdrawalTokensOut(poolAddr, tokenIn), {
 			poolAddr,
@@ -160,16 +166,10 @@ var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		});
 		const { zapper } = this.getWithdrawalMetadata(poolAddr, tokenIn, tokenOut);
 		return {
-			tokenIn: {
-				token: tokenIn,
-				balance: toSharesUp(pool.pool, amount)
-			},
-			tokenOut: {
-				token: tokenOut,
-				balance: amount
-			},
+			tokenIn: toTokenAmount(tokenIn, toSharesUp(pool.pool, amount)),
+			tokenOut: toTokenAmount(tokenOut, amount),
 			zapper: zapper?.baseParams.addr,
-			availableLiquidity: pool.pool.availableLiquidity * LIQUIDITY_SAFETY_NUM / LIQUIDITY_SAFETY_DENOM
+			availableLiquidity: payoutCeiling(market)
 		};
 	}
 	/**
@@ -177,7 +177,9 @@ var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 	*/
 	simulateRedeem(props) {
 		const { pool: poolAddr, amount } = props;
-		const { pool } = this.sdk.marketRegister.findByPool(poolAddr);
+		const market = this.sdk.marketRegister.findByPool(poolAddr);
+		const { pool } = market;
+		const { toTokenAmount } = market.priceOracle;
 		const tokenIn = props.tokenIn ?? poolAddr;
 		const tokenOut = this.#resolveTokenOut(props.tokenOut, () => this.getWithdrawalTokensOut(poolAddr, tokenIn), {
 			poolAddr,
@@ -186,16 +188,10 @@ var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		});
 		const { zapper } = this.getWithdrawalMetadata(poolAddr, tokenIn, tokenOut);
 		return {
-			tokenIn: {
-				token: tokenIn,
-				balance: amount
-			},
-			tokenOut: {
-				token: tokenOut,
-				balance: toAssets(pool.pool, amount)
-			},
+			tokenIn: toTokenAmount(tokenIn, amount),
+			tokenOut: toTokenAmount(tokenOut, toAssets(pool.pool, amount)),
 			zapper: zapper?.baseParams.addr,
-			availableLiquidity: pool.pool.availableLiquidity * LIQUIDITY_SAFETY_NUM / LIQUIDITY_SAFETY_DENOM
+			availableLiquidity: payoutCeiling(market)
 		};
 	}
 	/**

package/dist/cjs/preview/index.js

@@ -57,7 +57,7 @@ exports.checkPrerequisites = require_preview_prerequisites_checkPrerequisites.ch
 exports.checkSimulation = require_preview_validate_checkSimulation.checkSimulation;
 exports.classifyCloseOrRepay = require_preview_preview_detectCloseOrRepay.classifyCloseOrRepay;
 exports.classifyInnerOperations = require_preview_parse_classifyInnerOperations.classifyInnerOperations;
-exports.collateralIssuesOf = require_preview_validate_checkOperation.collateralIssuesOf;
+exports.collateralIssue = require_preview_validate_checkOperation.collateralIssue;
 exports.detectDelayedClaim = require_preview_preview_detectDelayedClaim.detectDelayedClaim;
 exports.detectDelayedOperation = require_preview_preview_detectDelayedOperation.detectDelayedOperation;
 exports.extractAdapterCallTraces = require_preview_trace_extractAdapterCallTraces.extractAdapterCallTraces;
@@ -67,6 +67,7 @@ exports.isCloseOrRepay = require_preview_preview_detectCloseOrRepay.isCloseOrRep
 exports.isPoolOperation = require_preview_parse_types.isPoolOperation;
 exports.isRWAOperation = require_preview_parse_types.isRWAOperation;
 exports.makeReplayState = require_preview_preview_replayInnerOperations.makeReplayState;
+exports.marketIssues = require_preview_validate_checkOperation.marketIssues;
 exports.parseFacadeOperationCalldata = require_preview_parse_parseFacadeOperationCalldata.parseFacadeOperationCalldata;
 exports.parseOperationCalldata = require_preview_parse_parseOperationCalldata.parseOperationCalldata;
 exports.parsePoolOperationCalldata = require_preview_parse_parsePoolOperationCalldata.parsePoolOperationCalldata;
@@ -74,6 +75,7 @@ exports.parseRWAFactoryOperationCalldata = require_preview_parse_parseRWAFactory
 exports.previewAdjustCreditAccount = require_preview_preview_previewAdjustCreditAccount.previewAdjustCreditAccount;
 exports.previewCloseOrRepayCreditAccount = require_preview_preview_previewCloseOrRepayCreditAccount.previewCloseOrRepayCreditAccount;
 exports.previewOperation = require_preview_preview_previewOperation.previewOperation;
+exports.quotaCountIssue = require_preview_validate_checkOperation.quotaCountIssue;
 exports.raise = require_onchain_validation_refusal.raise;
 exports.refuse = require_onchain_validation_refusal.refuse;
 exports.replayInnerOperations = require_preview_preview_replayInnerOperations.replayInnerOperations;

package/dist/cjs/preview/preview/buildDelayedPreview.js

@@ -18,7 +18,7 @@ let viem = require("viem");
 * nothing and set a non-fatal `ERROR_UNPRICEABLE_TOKEN` error on the
 * preview.
 *
-* The changes (e.g. `debtChange`) are reported relative to the account
+* The changes (e.g. `totalDebtChange`) are reported relative to the account
 * state before the whole transaction.
 *
 * @param afterInstant - Account state after the instant part of the
@@ -188,9 +188,9 @@ function buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk) {
 		creditAccount: post.creditAccount,
 		collateralAdded: [],
 		collateralWithdrawn: collateralWithdrawn.toAssets().map((a) => oracle.toTokenAmount(a.token, a.balance)),
-		totalValue,
-		debt: post.totalDebt,
-		debtChange: post.totalDebt - before.totalDebt,
+		totalValue: market.toUnderlyingAmount(totalValue),
+		totalDebt: market.toUnderlyingAmount(post.totalDebt),
+		totalDebtChange: market.toUnderlyingAmount(post.totalDebt - before.totalDebt),
 		quotas: quotas.map((q) => ({
 			token: sdk.tokensMeta.mustGetToken(q.token),
 			...oracle.toAmount(market.underlying, q.balance)

package/dist/cjs/preview/preview/previewAdjustCreditAccount.js

@@ -46,9 +46,9 @@ async function previewAdjustCreditAccount(input, operation, options) {
 		creditAccount: operation.creditAccount,
 		collateralAdded: collateralAdded.map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		collateralWithdrawn: after.collateralWithdrawn.toAssets().map((a) => oracle.toTokenAmount(a.token, a.balance)),
-		totalValue,
-		debt: account.totalDebt,
-		debtChange: account.totalDebt - before.totalDebt,
+		totalValue: market.toUnderlyingAmount(totalValue),
+		totalDebt: market.toUnderlyingAmount(account.totalDebt),
+		totalDebtChange: market.toUnderlyingAmount(account.totalDebt - before.totalDebt),
 		quotas: quotas.map((q) => ({
 			token: sdk.tokensMeta.mustGetToken(q.token),
 			...oracle.toAmount(market.underlying, q.balance)

package/dist/cjs/preview/preview/previewCloseOrRepayCreditAccount.js

@@ -57,7 +57,7 @@ function previewRepayCreditAccount(input, operation, permanent, replay) {
 		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
 		creditAccount: operation.creditAccount,
 		collateralAdded: collateralAdded.map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),
-		debtRepaid: before.totalDebt - after.account.totalDebt,
+		debtRepaid: market.toUnderlyingAmount(before.totalDebt - after.account.totalDebt),
 		collateralWithdrawn: after.collateralWithdrawn.toAssets().map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),
 		error
 	};

package/dist/cjs/preview/preview/previewOpenCreditAccount.js

@@ -17,7 +17,7 @@ async function previewOpenCreditAccount(input, operation) {
 	let error = await require_preview_preview_replayInnerOperations.replayInnerOperations(sdk, operation.multicall, state);
 	const account = state.account;
 	let priceError;
-	const collateralValue = state.collateralAdded.sum((token, balance) => {
+	const netValue = state.collateralAdded.sum((token, balance) => {
 		try {
 			return oracle.convert(token, market.underlying, balance);
 		} catch {
@@ -32,18 +32,18 @@ async function previewOpenCreditAccount(input, operation) {
 	error ??= unwrapError ?? priceError;
 	const assets = account.balances.toAssets(require_onchain_constants_math.DUST_THRESHOLD);
 	const quotas = account.quotas.toAssets(0n);
-	const totalValue = collateralValue + account.totalDebt;
+	const totalValue = netValue + account.totalDebt;
 	const snap = account.toSnapshot(totalValue);
 	const targetAsset = inferTargetAsset(operation.multicall, account.balances);
 	return {
 		operation: operation.operation,
 		creditManager: operation.creditManager,
 		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
-		target: targetAsset ? oracle.toTokenAmount(targetAsset.token, targetAsset.balance) : void 0,
-		collateral: collateral.map((a) => oracle.toTokenAmount(a.token, a.balance)),
-		collateralValue,
-		totalValue,
-		debt: account.debt,
+		targetCollateral: targetAsset ? oracle.toTokenAmount(targetAsset.token, targetAsset.balance) : void 0,
+		collateralAdded: collateral.map((a) => oracle.toTokenAmount(a.token, a.balance)),
+		netValue: market.toUnderlyingAmount(netValue),
+		totalValue: market.toUnderlyingAmount(totalValue),
+		totalDebt: market.toUnderlyingAmount(account.totalDebt),
 		quotas: quotas.map((q) => ({
 			token: sdk.tokensMeta.mustGetToken(q.token),
 			...oracle.toAmount(market.underlying, q.balance)

package/dist/cjs/preview/validate/checkOperation.js

@@ -31,7 +31,7 @@ function checkOperation(input, options = {}) {
 		case "RWAOpenCreditAccount":
 		case "AdjustCreditAccount": return creditIssues(sdk, preview, options);
 		case "CloseCreditAccount":
-		case "RepayCreditAccount": return marketIssues(sdk, preview.creditManager);
+		case "RepayCreditAccount": return marketIssues(sdk.marketRegister.findCreditManager(preview.creditManager));
 	}
 }
 function poolIssues(sdk, preview, options, isDeposit) {
@@ -50,8 +50,8 @@ function poolIssues(sdk, preview, options, isDeposit) {
 	})) || fundingIssue(options, [preview.tokenIn]);
 }
 /** What the market itself refuses, whatever the operation does. */
-function marketIssues(sdk, creditManager) {
-	const suite = sdk.marketRegister.findCreditManager(creditManager);
+function marketIssues(suite) {
+	const creditManager = suite.creditManager.address;
 	return require_onchain_validation_checks.checkCreditManagerPaused({
 		isPaused: suite.isPaused,
 		creditManager
@@ -66,29 +66,42 @@ function creditIssues(sdk, preview, options) {
 	const market = suite.market;
 	const underlying = require_onchain_validation_token.toToken(sdk, market.pool.underlying);
 	const isOpening = preview.operation === "OpenCreditAccount" || preview.operation === "RWAOpenCreditAccount";
-	return marketIssues(sdk, preview.creditManager) || require_onchain_validation_checks.checkDebtInBand({
-		debt: preview.debt,
+	return marketIssues(suite) || require_onchain_validation_checks.checkDebtInBand({
+		debt: preview.totalDebt.value,
 		minDebt: suite.creditFacade.minDebt,
 		maxDebt: suite.creditFacade.maxDebt,
 		underlying,
 		allowZero: !isOpening
-	}) || borrowIssue(suite, preview, underlying) || forbiddenIssue(suite, preview) || require_onchain_validation_checks.checkQuotaCount({
-		count: preview.quotas.filter((q) => q.value > 0n).length,
+	}) || borrowIssue(suite, preview, underlying) || forbiddenIssue(suite, preview) || quotaCountIssue(suite, preview) || quotaIssue(market, preview, underlying) || collateralIssue(preview, options) || fundingIssue(options, preview.collateralAdded);
+}
+/**
+* A bar that reads nothing but the projected account, so a parsed transaction
+* and a simulated one are held to it by the same code.
+*
+* These stay separate functions rather than one block because the order the
+* checks run in is the answer: `checkOperation` interleaves the checks that
+* need an operation's *delta* between them, and the caller acts on the first
+* issue reported.
+*/
+function quotaCountIssue(suite, projection) {
+	return require_onchain_validation_checks.checkQuotaCount({
+		count: projection.quotas.filter((q) => q.value > 0n).length,
 		max: suite.creditManager.maxEnabledTokens
-	}) || quotaIssue(market, preview, underlying) || (preview.debt === 0n ? null : collateralIssue(preview, options)) || fundingIssue(options, collateralOf(preview));
+	});
 }
 /**
 * What the transaction draws, against what the market can lend right now.
 *
 * Only a draw is weighed: repaying, or leaving the debt alone, can never exceed
-* a ceiling. Opening borrows the whole debt; adjusting borrows `debtChange`.
+* a ceiling. Opening borrows the whole debt; adjusting borrows
+* `totalDebtChange`.
 *
 * The engine holds every simulation to this already (`assertCanBorrow`), so
 * this is here for the transactions it never saw — a pasted calldata reaches
 * the confirm screen with nothing else standing between it and a revert.
 */
 function borrowIssue(suite, preview, underlying) {
-	const drawn = preview.operation === "AdjustCreditAccount" ? preview.debtChange : preview.debt;
+	const drawn = preview.operation === "AdjustCreditAccount" ? preview.totalDebtChange.value : preview.totalDebt.value;
 	if (drawn <= 0n) return null;
 	const { limit, binding } = require_onchain_accounts_intents_guards.borrowable(suite);
 	return require_onchain_validation_checks.checkBorrowLimit({
@@ -98,12 +111,27 @@ function borrowIssue(suite, preview, underlying) {
 		underlying
 	});
 }
-/** The account against whichever bars the caller holds it to. */
-function collateralIssue(preview, options) {
-	return collateralIssuesOf({
-		healthFactor: preview.healthFactor,
-		safeHealthFactor: preview.safeHealthFactor
-	}, options);
+/**
+* The account against whichever bars the caller holds it to.
+*
+* A loan-free account is nothing to weigh: the health factor reports its
+* zero-debt sentinel and no bar applies.
+*
+* {@inheritDoc quotaCountIssue}
+*/
+function collateralIssue(projection, options) {
+	const { minHealthFactor, minSafeHealthFactor, currentHealthFactor } = options;
+	if (projection.totalDebt.value === 0n) return null;
+	return (minHealthFactor === void 0 ? null : require_onchain_validation_checks.checkCollateralised({
+		healthFactor: projection.healthFactor,
+		required: minHealthFactor,
+		safePrices: false,
+		improvesFrom: currentHealthFactor
+	})) || (minSafeHealthFactor === void 0 || projection.safeHealthFactor === void 0 ? null : require_onchain_validation_checks.checkCollateralised({
+		healthFactor: projection.safeHealthFactor,
+		required: minSafeHealthFactor,
+		safePrices: true
+	}));
 }
 /** The wallet's side of the operation, against the balances it was given. */
 function fundingIssue(options, puts) {
@@ -119,12 +147,6 @@ function fundingIssue(options, puts) {
 	}
 	return null;
 }
-/** What the wallet puts in, which is what its balances have to cover. */
-function collateralOf(preview) {
-	if ("collateral" in preview) return preview.collateral;
-	if ("collateralAdded" in preview) return preview.collateralAdded;
-	return [];
-}
 function forbiddenIssue(suite, preview) {
 	const obtained = preview.operation === "AdjustCreditAccount" ? preview.assetsChange : preview.assets;
 	const forbidden = suite.forbiddenTokens;
@@ -154,20 +176,8 @@ function quotaIssue(market, preview, underlying) {
 	}
 	return null;
 }
-/** The two collateral bars, shared by the preview and the simulation paths. */
-function collateralIssuesOf(factors, options) {
-	const { minHealthFactor, minSafeHealthFactor, currentHealthFactor } = options;
-	return (minHealthFactor === void 0 ? null : require_onchain_validation_checks.checkCollateralised({
-		healthFactor: factors.healthFactor,
-		required: minHealthFactor,
-		safePrices: false,
-		improvesFrom: currentHealthFactor
-	})) || (minSafeHealthFactor === void 0 || factors.safeHealthFactor === void 0 ? null : require_onchain_validation_checks.checkCollateralised({
-		healthFactor: factors.safeHealthFactor,
-		required: minSafeHealthFactor,
-		safePrices: true
-	}));
-}
 //#endregion
 exports.checkOperation = checkOperation;
-exports.collateralIssuesOf = collateralIssuesOf;
+exports.collateralIssue = collateralIssue;
+exports.marketIssues = marketIssues;
+exports.quotaCountIssue = quotaCountIssue;

package/dist/cjs/preview/validate/checkSimulation.js

@@ -27,26 +27,13 @@ const require_preview_validate_checkOperation = require("./checkOperation.js");
 function checkSimulation(input, options = {}) {
 	const { sdk, state, creditManager } = input;
 	const suite = sdk.marketRegister.findCreditManager(creditManager);
-	return require_onchain_validation_checks.checkCreditManagerPaused({
-		isPaused: suite.isPaused,
-		creditManager
-	}) || require_onchain_validation_checks.checkMarketExpired({
-		isExpired: suite.isExpired,
-		creditManager,
-		expirationDate: suite.creditFacade.expirationDate
-	}) || require_onchain_validation_checks.checkDebtInBand({
-		debt: state.accountDebt,
+	return require_preview_validate_checkOperation.marketIssues(suite) || require_onchain_validation_checks.checkDebtInBand({
+		debt: state.totalDebt.value,
 		minDebt: suite.creditFacade.minDebt,
 		maxDebt: suite.creditFacade.maxDebt,
 		underlying: require_onchain_validation_token.toToken(sdk, suite.market.pool.underlying),
 		allowZero: true
-	}) || require_onchain_validation_checks.checkQuotaCount({
-		count: Object.values(state.quotas).filter((q) => q.balance > 0n).length,
-		max: suite.creditManager.maxEnabledTokens
-	}) || (state.accountDebt === 0n ? null : require_preview_validate_checkOperation.collateralIssuesOf({
-		healthFactor: state.healthFactor,
-		safeHealthFactor: state.safeHealthFactor
-	}, options));
+	}) || require_preview_validate_checkOperation.quotaCountIssue(suite, state) || require_preview_validate_checkOperation.collateralIssue(state, options);
 }
 //#endregion
 exports.checkSimulation = checkSimulation;

package/dist/cjs/preview/validate/index.js

@@ -3,4 +3,6 @@ const require_preview_validate_checkOperation = require("./checkOperation.js");
 const require_preview_validate_checkSimulation = require("./checkSimulation.js");
 exports.checkOperation = require_preview_validate_checkOperation.checkOperation;
 exports.checkSimulation = require_preview_validate_checkSimulation.checkSimulation;
-exports.collateralIssuesOf = require_preview_validate_checkOperation.collateralIssuesOf;
+exports.collateralIssue = require_preview_validate_checkOperation.collateralIssue;
+exports.marketIssues = require_preview_validate_checkOperation.marketIssues;
+exports.quotaCountIssue = require_preview_validate_checkOperation.quotaCountIssue;

package/dist/cjs/sdk/execute/ExecuteApi.js

@@ -25,21 +25,24 @@ function poolTx(sdk, request) {
 	const { pool, wallet, sim } = request;
 	const { tokenIn, tokenOut } = sim.preview;
 	if (request.op === "deposit") {
-		const meta = sdk.pools.getDepositMetadata(pool, tokenIn.token, tokenOut.token);
+		const meta = sdk.pools.getDepositMetadata(pool, tokenIn.token.address, tokenOut.token.address);
 		const result = sdk.pools.addLiquidity({
 			pool,
 			wallet,
-			collateral: tokenIn,
+			collateral: {
+				token: tokenIn.token.address,
+				balance: tokenIn.value
+			},
 			meta
 		});
-		if (!result) throw new Error(`pool ${pool} takes no deposit transaction for ${tokenIn.token} (${meta.type})`);
+		if (!result) throw new Error(`pool ${pool} takes no deposit transaction for ${tokenIn.token.address} (${meta.type})`);
 		return result.tx;
 	}
-	const meta = sdk.pools.getWithdrawalMetadata(pool, tokenIn.token, tokenOut.token);
+	const meta = sdk.pools.getWithdrawalMetadata(pool, tokenIn.token.address, tokenOut.token.address);
 	return sdk.pools.removeLiquidity({
 		pool,
 		wallet,
-		amount: request.op === "withdraw" ? tokenOut.balance : tokenIn.balance,
+		amount: request.op === "withdraw" ? tokenOut.value : tokenIn.value,
 		permit: void 0,
 		meta,
 		mode: request.op === "withdraw" ? "withdraw" : "redeem"
@@ -53,7 +56,7 @@ async function openTx(sdk, request) {
 		to: wallet,
 		collateral,
 		ethAmount,
-		debt: preview.debt,
+		debt: preview.totalDebt.value,
 		calls: preview.calls,
 		averageQuota: preview.averageQuota,
 		minQuota: preview.minQuota,

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

@@ -66,7 +66,10 @@ var PrepareApi = class extends require_onchain_base_MultichainConstruct.Multicha
 			tokenOut
 		});
 		const call = pools.addLiquidity({
-			collateral: preview.tokenIn,
+			collateral: {
+				token: preview.tokenIn.token.address,
+				balance: preview.tokenIn.value
+			},
 			pool: pool.pool,
 			wallet: params.wallet,
 			meta: pools.getDepositMetadata(pool.pool, tokenIn, tokenOut)

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

@@ -30,7 +30,7 @@ function maxWithdrawCollateral(props) {
 	const underlying = market.pool.underlying;
 	const target = creditAccount.tokens.find((t) => eq(t.token, token));
 	if (!target || target.balance <= 10n) return 0n;
-	if (creditAccount.accountDebt === 0n) return target.balance;
+	if (creditAccount.totalDebt === 0n) return target.balance;
 	const masked = creditAccount.enabledTokensMask !== 0n;
 	const counts = (t) => t.balance > 10n && (!masked || (t.mask & creditAccount.enabledTokensMask) !== 0n);
 	/** What a holding backs, in the check's units: USD × PERCENTAGE_FACTOR. */
@@ -47,7 +47,7 @@ function maxWithdrawCollateral(props) {
 		if (eq(t.token, token) || !counts(t)) continue;
 		otherMoney += weigh(t);
 	}
-	const borrowed = usd(priceOracle, underlying, creditAccount.accountDebt);
+	const borrowed = usd(priceOracle, underlying, creditAccount.totalDebt);
 	if (borrowed === void 0 || borrowed <= 0n) return 0n;
 	const required = borrowed * targetHF;
 	if (required <= otherMoney) return target.balance;

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

@@ -1,3 +1,4 @@
+import { calcPositionLeverage } from "../../market/math.js";
 import { IntentPreviewError } from "../../validation/refusal.js";
 import { assertCanBorrow, assertCollateralised, assertGrowthAllowed, assertMarketOperable, assertQuotaHeadroom } from "./guards.js";
 import { assertDebtInBand, assertLeverageAtLeastOne, debtForLeverage } from "./math.js";
@@ -37,7 +38,7 @@ async function previewOpenStrategy(props) {
 		underlying,
 		enabledTokensMask: 0n,
 		totalDebtUSD: 0n,
-		accountDebt: 0n,
+		totalDebt: 0n,
 		tokens: []
 	};
 	assertDebtInBand(sdk, debt, suite.creditFacade, underlying);
@@ -87,6 +88,7 @@ async function previewOpenStrategy(props) {
 	const projectedPool = { availableLiquidityChange: -debt };
 	const metrics = {
 		healthFactor: sdk.positions.healthFactor(snapshot),
+		safeHealthFactor: sdk.positions.healthFactor(snapshot, { safePrices: true }),
 		borrowRate: sdk.positions.borrowRate(snapshot, projectedPool),
 		timeToLiquidation: sdk.positions.timeToLiquidation(snapshot, projectedPool),
 		liquidationPrice: sdk.positions.liquidationPrice(snapshot)
@@ -98,9 +100,10 @@ async function previewOpenStrategy(props) {
 		toUnderlying: (from, amount) => convert(from, underlying, amount)
 	});
 	return {
-		debt,
-		collateral: margin,
-		totalValue: margin + debt,
+		totalDebt: market.toUnderlyingAmount(debt),
+		netValue: market.toUnderlyingAmount(margin),
+		totalValue: market.toUnderlyingAmount(margin + debt),
+		leverage: calcPositionLeverage(margin + debt, debt),
 		priceImpact,
 		averageAssets: averageAssets.map(priced),
 		minAssets: minAssets.map(priced),

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

@@ -35,7 +35,7 @@ async function realize(steps, props) {
 	const ledger = new OperationLedger({
 		initialAssets: creditAccount.tokens,
 		underlying,
-		debt: creditAccount.accountDebt,
+		debt: creditAccount.totalDebt,
 		convert: price
 	});
 	const operations = [];
@@ -271,7 +271,7 @@ async function realize(steps, props) {
 		totalDebt: debt,
 		totalValue
 	};
-	const projectedPool = { availableLiquidityChange: creditAccount.accountDebt - debt };
+	const projectedPool = { availableLiquidityChange: creditAccount.totalDebt - debt };
 	const metrics = {
 		healthFactor: sdk.positions.healthFactor(snapshot),
 		safeHealthFactor: paysOut ? sdk.positions.healthFactor(snapshot, { safePrices: true }) : void 0,
@@ -285,12 +285,16 @@ async function realize(steps, props) {
 		netValue: totalValue - debt,
 		toUnderlying: (from, amount) => price(from, underlying, amount)
 	});
+	const oracle = market.priceOracle;
 	const state = {
-		totalValue,
-		accountDebt: debt,
+		totalValue: market.toUnderlyingAmount(totalValue),
+		totalDebt: market.toUnderlyingAmount(debt),
 		leverage: calcPositionLeverage(totalValue, debt),
-		assets: assets.map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),
-		quotas: quotasAfter,
+		assets: assets.map((a) => oracle.toTokenAmount(a.token, a.balance)),
+		quotas: Object.values(quotasAfter).map((q) => ({
+			token: sdk.tokensMeta.mustGetToken(q.token),
+			...oracle.toAmount(underlying, q.balance)
+		})),
 		priceImpact,
 		...metrics
 	};

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

@@ -102,15 +102,16 @@ function projectedClaimable(request, phantom, phantomAmount, claim) {
 */
 function sliceAfter(creditAccount, after) {
 	const masks = new Map(creditAccount.tokens.map((t) => [t.token.toLowerCase(), t.mask]));
+	const quotas = new Map(after.quotas.map((q) => [q.token.address.toLowerCase(), q.value]));
 	return {
 		...creditAccount,
-		accountDebt: after.accountDebt,
+		totalDebt: after.totalDebt.value,
 		tokens: after.assets.map((a) => {
 			const token = a.token.address.toLowerCase();
 			return {
 				token,
 				balance: a.value,
-				quota: after.quotas[token]?.balance ?? 0n,
+				quota: quotas.get(token) ?? 0n,
 				mask: masks.get(token) ?? 0n,
 				success: true
 			};

package/dist/esm/onchain/accounts/intents/testing/market.js

@@ -142,7 +142,7 @@ function buildFixtureCreditAccount(args) {
 		underlying: UND,
 		enabledTokensMask: 0n,
 		totalDebtUSD: 0n,
-		accountDebt: args.accountDebt,
+		totalDebt: args.totalDebt,
 		tokens: args.tokens
 	};
 }

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

@@ -144,13 +144,30 @@ function buildMockSdk(args) {
 		return price;
 	};
 	const poolPaused = args.poolPaused ?? false;
+	/** {@inheritDoc MarketSuite.toUnderlyingAmount} */
+	const toUnderlyingAmount = (value) => {
+		const usd = safeUsd(args.underlying, value);
+		return {
+			token: tokenOf(args.rwaAssets?.[args.underlying.toLowerCase()] ?? args.underlying),
+			value,
+			valueUsd: usd === null ? null : usdToNumber(usd)
+		};
+	};
 	const market = {
+		toUnderlyingAmount,
 		priceOracle: {
 			convert,
 			safeConvert,
 			mainPrice: mainPriceOf,
 			reservePrice: reservePriceOf,
 			convertToUSD: _convertToUSD,
+			toAmount: (token, value) => {
+				const usd = safeUsd(token, value);
+				return {
+					value,
+					valueUsd: usd === null ? null : usdToNumber(usd)
+				};
+			},
 			toTokenAmount: (token, value) => {
 				const usd = safeUsd(token, value);
 				return {
@@ -349,7 +366,7 @@ function payloadOf(slice) {
 		owner: slice.creditAccount,
 		expirationDate: 0,
 		enabledTokensMask: slice.enabledTokensMask,
-		debt: slice.accountDebt,
+		debt: slice.totalDebt,
 		accruedInterest: 0n,
 		accruedFees: 0n,
 		totalDebtUSD: slice.totalDebtUSD,

package/dist/esm/onchain/accounts/intents/tests/add-collateral.fixtures.js

@@ -31,7 +31,7 @@ const case_position_token = {
 		amount: ADD_ANY
 	},
 	tokens: [caToken(UND, BASE_UND)],
-	accountDebt: DEBT,
+	totalDebt: DEBT,
 	totalValue: BASE_UND + valueInUnd(ADD_ANY, ANY),
 	ops: [{
 		type: "addCollateral",
@@ -56,7 +56,7 @@ const case_underlying = {
 		amount: ADD_UND
 	},
 	tokens: [caToken(ANY, ADD_ANY, QUOTA_ANY)],
-	accountDebt: DEBT,
+	totalDebt: DEBT,
 	totalValue: valueInUnd(ADD_ANY, ANY) + ADD_UND,
 	ops: [{
 		type: "addCollateral",
@@ -73,7 +73,7 @@ const case_rwa_asset = {
 		amount: ADD_RWA
 	},
 	tokens: [caToken(UND, BASE_UND)],
-	accountDebt: DEBT,
+	totalDebt: DEBT,
 	totalValue: BASE_UND + valueInUnd(ADD_RWA, RWA_ASSET),
 	ops: [{
 		type: "addCollateral",
@@ -98,7 +98,7 @@ function buildAddCollateralProps(c, sdk) {
 	return {
 		intent: c.intent,
 		creditAccount: buildFixtureCreditAccount({
-			accountDebt: c.accountDebt,
+			totalDebt: c.totalDebt,
 			tokens: c.tokens
 		}),
 		sdk,