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

package/dist/cjs/onchain/accounts/intents/tests/finish-decrease-leverage.fixtures.js

@@ -50,7 +50,7 @@ function buildDecreaseTailProps(args) {
 			underlying: require_market.UND,
 			enabledTokensMask: 0n,
 			totalDebtUSD: 0n,
-			accountDebt: DECREASE_PRE_D,
+			totalDebt: DECREASE_PRE_D,
 			tokens: args.tokens ?? [{
 				token: "0xb1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1",
 				balance: args.claimedAmount,
@@ -181,7 +181,7 @@ function buildMatrixDecreaseTailProps(c) {
 		underlying: require_market.UND,
 		enabledTokensMask: 0n,
 		totalDebtUSD: 0n,
-		accountDebt: M7_DEBT,
+		totalDebt: M7_DEBT,
 		tokens: [{
 			token: require_market.POS,
 			balance: M7_POS_LEFT,

package/dist/cjs/onchain/accounts/intents/tests/finish-withdraw.fixtures.js

@@ -64,7 +64,7 @@ function buildWithdrawFinishProps(args) {
 		underlying: require_market.UND,
 		enabledTokensMask: 0n,
 		totalDebtUSD: 0n,
-		accountDebt: WITHDRAW_PRE_D,
+		totalDebt: WITHDRAW_PRE_D,
 		tokens: args.tokens ?? [
 			{
 				token: "0x1111111111111111111111111111111111111111",
@@ -309,7 +309,7 @@ function buildMatrixWithdrawTailProps(c) {
 		underlying: require_market.UND,
 		enabledTokensMask: 0n,
 		totalDebtUSD: 0n,
-		accountDebt: M4_DEBT,
+		totalDebt: M4_DEBT,
 		tokens: [{
 			token: require_market.POS,
 			balance: M4_SPEND,

package/dist/cjs/onchain/accounts/intents/tests/withdraw-asset.fixtures.js

@@ -36,7 +36,7 @@ const case_any_token = {
 		to: require_market.WALLET
 	},
 	tokens: [require_market.caToken(require_market.UND, HELD_UND), require_market.caToken(require_market.ANY, HELD_ANY, QUOTA_ANY_BEFORE)],
-	accountDebt: DEBT,
+	totalDebt: DEBT,
 	totalValue: HELD_UND + require_market.valueInUnd(HELD_ANY - OUT_ANY, require_market.ANY),
 	ops: [{
 		type: "withdrawCollateral",
@@ -62,7 +62,7 @@ const case_underlying = {
 		to: require_market.WALLET
 	},
 	tokens: [require_market.caToken(require_market.UND, HELD_UND)],
-	accountDebt: DEBT,
+	totalDebt: DEBT,
 	totalValue: HELD_UND - OUT_UND,
 	ops: [{
 		type: "withdrawCollateral",
@@ -83,7 +83,7 @@ const case_rwa_underlying = {
 		to: require_market.WALLET
 	},
 	tokens: [require_market.caToken(require_market.UND, HELD_UND)],
-	accountDebt: DEBT,
+	totalDebt: DEBT,
 	totalValue: HELD_UND - OUT_UND,
 	ops: [{
 		type: "unwrapRwaCollateral",
@@ -106,7 +106,7 @@ function buildWithdrawAssetProps(c, sdk) {
 	return {
 		intent: c.intent,
 		creditAccount: require_market.buildFixtureCreditAccount({
-			accountDebt: c.accountDebt,
+			totalDebt: c.totalDebt,
 			tokens: c.tokens
 		}),
 		sdk,

package/dist/cjs/onchain/accounts/intents/tests/withdraw.fixtures.js

@@ -27,9 +27,9 @@ const QUOTA_AFTER = quotaOf(TVL_AFTER);
 /** Quota ops carry signed deltas. */
 const QUOTA_DELTA = QUOTA_AFTER - QUOTA_BEFORE;
 const base = {
-	accountDebt: DEBT_BEFORE,
+	totalDebt: DEBT_BEFORE,
 	totalValue: TVL_AFTER,
-	accountDebtAfter: DEBT_AFTER
+	totalDebtAfter: DEBT_AFTER
 };
 /** Row 1 — S = U, T = U: repay, then hand over the underlying. */
 const case_und_und = {
@@ -291,9 +291,9 @@ const case_matrix_4_1 = {
 		sourceToken: require_market.POS
 	},
 	tokens: [require_market.caToken(require_market.POS, M4_BALANCE, quotaOf(M4_BALANCE))],
-	accountDebt: M4_DEBT,
+	totalDebt: M4_DEBT,
 	totalValue: M4_SPEND,
-	accountDebtAfter: M4_DD,
+	totalDebtAfter: M4_DD,
 	ops: [
 		{
 			type: "swap",
@@ -342,9 +342,9 @@ const case_matrix_4_2 = {
 		sourceToken: require_market.POS
 	},
 	tokens: [require_market.caToken(require_market.POS, M4_BALANCE, quotaOf(M4_BALANCE))],
-	accountDebt: M4_DEBT,
+	totalDebt: M4_DEBT,
 	totalValue: M4_SPEND,
-	accountDebtAfter: M4_DD,
+	totalDebtAfter: M4_DD,
 	ops: [
 		{
 			type: "swap",
@@ -391,7 +391,7 @@ function buildWithdrawProps(c, sdk) {
 	return {
 		intent: c.intent,
 		creditAccount: require_market.buildFixtureCreditAccount({
-			accountDebt: c.accountDebt,
+			totalDebt: c.totalDebt,
 			tokens: c.tokens
 		}),
 		sdk,

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

@@ -1,17 +1 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-//#region src/onchain/accounts/intents/types.ts
-/**
-* Validation failure that maps onto {@link PreviewErrorReason} rather than
-* crashing the caller: thrown by builders, converted to `{ ok: false }` by
-* `CreditAccountOperationsService.startIntent`.
-*/
-var IntentPreviewError = class extends Error {
-	reason;
-	constructor(reason, message) {
-		super(message ?? reason);
-		this.name = "IntentPreviewError";
-		this.reason = reason;
-	}
-};
-//#endregion
-exports.IntentPreviewError = IntentPreviewError;

package/dist/cjs/onchain/accounts/intents/utils/adjust-state-to-snapshot.js

@@ -2,8 +2,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 //#region src/onchain/accounts/intents/utils/adjust-state-to-snapshot.ts
 /**
 * Maps an intents {@link OperationState} onto the {@link AccountSnapshot} that
-* position-metric functions take. `accountDebt` is treated as total debt
-* (principal plus accrued interest and fees).
+* position-metric functions take: the state prices what it reports, a snapshot
+* only names it.
 **/
 function adjustStateToSnapshot(creditManager, state) {
 	return {
@@ -12,9 +12,12 @@ function adjustStateToSnapshot(creditManager, state) {
 			token: a.token.address,
 			balance: a.value
 		})),
-		quotas: Object.values(state.quotas),
-		totalDebt: state.accountDebt,
-		totalValue: state.totalValue
+		quotas: state.quotas.map((q) => ({
+			token: q.token.address,
+			balance: q.value
+		})),
+		totalDebt: state.totalDebt.value,
+		totalValue: state.totalValue.value
 	};
 }
 //#endregion

package/dist/cjs/onchain/accounts/intents/utils/common.js

@@ -15,7 +15,7 @@ function toTargetDecimals(fromAmount, fromToken, toToken, sdk) {
 * with balance from the projection (0n when absent), new tokens get quota 0n.
 */
 function toRouterCaSlice(creditAccount, expectedBalances = []) {
-	const { accountDebt, underlying, creditFacade, creditManager, creditAccount: creditAccountAddress, tokens: _, ...restCA } = creditAccount;
+	const { totalDebt, underlying, creditFacade, creditManager, creditAccount: creditAccountAddress, tokens: _, ...restCA } = creditAccount;
 	const expected = new require_onchain_utils_AddressMap.AddressMap([]);
 	for (const asset of expectedBalances ?? []) expected.upsert(asset.token, (expected.get(asset.token) ?? 0n) + asset.balance);
 	const tokens = creditAccount.tokens.map((t) => {
@@ -33,7 +33,7 @@ function toRouterCaSlice(creditAccount, expectedBalances = []) {
 		creditAccount: creditAccountAddress.toLowerCase(),
 		creditFacade: creditFacade.toLowerCase(),
 		creditManager: creditManager.toLowerCase(),
-		debt: creditAccount.accountDebt,
+		debt: creditAccount.totalDebt,
 		tokens
 	};
 }

package/dist/cjs/onchain/accounts/intents/utils/credit-account-slice.js

@@ -4,9 +4,9 @@ const require_onchain_accounts_intents_utils_borrowed_amount_plus_interest_and_f
 /**
 * Narrows full account data down to the slice the intent engine operates on.
 *
-* `accountDebt` is the total repayable debt (principal + accrued interest +
-* accrued fees) rather than the principal, because every debt-touching intent
-* settles the full outstanding amount.
+* `totalDebt` is the total repayable debt (principal + accrued interest +
+* accrued fees) rather than `CreditAccountData.debt`'s principal, because every
+* debt-touching intent settles the full outstanding amount.
 *
 * Addresses are lowercased so that `eq` comparisons and `AddressMap` lookups
 * behave consistently everywhere downstream.
@@ -19,7 +19,7 @@ function toCreditAccountSlice(ca) {
 		underlying: ca.underlying.toLowerCase(),
 		enabledTokensMask: ca.enabledTokensMask,
 		totalDebtUSD: ca.totalDebtUSD,
-		accountDebt: require_onchain_accounts_intents_utils_borrowed_amount_plus_interest_and_fees.calcBorrowedAmountPlusInterestAndFees(ca),
+		totalDebt: require_onchain_accounts_intents_utils_borrowed_amount_plus_interest_and_fees.calcBorrowedAmountPlusInterestAndFees(ca),
 		tokens: ca.tokens.map((t) => ({
 			...t,
 			token: t.token.toLowerCase()
@@ -30,7 +30,7 @@ function toCreditAccountSlice(ca) {
 * Reads an account by address and narrows it to {@link CreditAccountSlice}.
 *
 * The shared read model's `StrategyPosition` carries neither `tokens` nor
-* `enabledTokensMask` / `creditFacade` / `totalDebtUSD`, so simulating against
+* `enabledTokensMask` / `creditFacade` / `totalDebtUSD`, so preparing against
 * an existing position costs one account read.
 *
 * @throws When the account is not found in the connected markets.

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

@@ -1,12 +1,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_accounts_intents_utils_common = require("./common.js");
-const require_onchain_accounts_intents_utils_convert_amount = require("./convert-amount.js");
 const require_onchain_accounts_intents_utils_pick_token = require("./pick-token.js");
 const require_onchain_accounts_intents_utils_adjust_state_to_snapshot = require("./adjust-state-to-snapshot.js");
 const require_onchain_accounts_intents_utils_assemble_operation_calls = require("./assemble-operation-calls.js");
 const require_onchain_accounts_intents_utils_borrowed_amount_plus_interest_and_fees = require("./borrowed-amount-plus-interest-and-fees.js");
 const require_onchain_accounts_intents_utils_credit_account_slice = require("./credit-account-slice.js");
 const require_onchain_accounts_intents_utils_ledger = require("./ledger.js");
+const require_onchain_accounts_intents_utils_price_impact = require("./price-impact.js");
 const require_onchain_accounts_intents_utils_quotas_for_update = require("./quotas-for-update.js");
 const require_onchain_accounts_intents_utils_router_path = require("./router-path.js");
 exports.OperationLedger = require_onchain_accounts_intents_utils_ledger.OperationLedger;
@@ -14,7 +14,7 @@ exports.adjustStateToSnapshot = require_onchain_accounts_intents_utils_adjust_st
 exports.assembleOperationCalls = require_onchain_accounts_intents_utils_assemble_operation_calls.assembleOperationCalls;
 exports.calcBorrowedAmountPlusInterestAndFees = require_onchain_accounts_intents_utils_borrowed_amount_plus_interest_and_fees.calcBorrowedAmountPlusInterestAndFees;
 exports.clearedQuotas = require_onchain_accounts_intents_utils_quotas_for_update.clearedQuotas;
-exports.convertAmount = require_onchain_accounts_intents_utils_convert_amount.convertAmount;
+exports.collectPriceImpact = require_onchain_accounts_intents_utils_price_impact.collectPriceImpact;
 exports.createOraclePaths = require_onchain_accounts_intents_utils_router_path.createOraclePaths;
 exports.createRouterPaths = require_onchain_accounts_intents_utils_router_path.createRouterPaths;
 exports.eq = require_onchain_accounts_intents_utils_common.eq;
@@ -22,9 +22,11 @@ exports.fetchCreditAccountSlice = require_onchain_accounts_intents_utils_credit_
 exports.getQuotasForUpdate = require_onchain_accounts_intents_utils_quotas_for_update.getQuotasForUpdate;
 exports.isPhantomToken = require_onchain_accounts_intents_utils_pick_token.isPhantomToken;
 exports.isRedemptionPhantomToken = require_onchain_accounts_intents_utils_pick_token.isRedemptionPhantomToken;
+exports.lossRate = require_onchain_accounts_intents_utils_price_impact.lossRate;
 exports.pickFattestNonPhantomToken = require_onchain_accounts_intents_utils_pick_token.pickFattestNonPhantomToken;
 exports.quotasAfterUpdate = require_onchain_accounts_intents_utils_quotas_for_update.quotasAfterUpdate;
 exports.rankAccountTokens = require_onchain_accounts_intents_utils_pick_token.rankAccountTokens;
+exports.startProbe = require_onchain_accounts_intents_utils_price_impact.startProbe;
 exports.toCreditAccountSlice = require_onchain_accounts_intents_utils_credit_account_slice.toCreditAccountSlice;
 exports.toRouterCaSlice = require_onchain_accounts_intents_utils_common.toRouterCaSlice;
 exports.toTargetDecimals = require_onchain_accounts_intents_utils_common.toTargetDecimals;

package/dist/cjs/onchain/accounts/intents/utils/pick-token.js

@@ -1,7 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_base_token_types = require("../../../base/token-types.js");
 const require_onchain_accounts_intents_utils_common = require("./common.js");
-const require_onchain_accounts_intents_utils_convert_amount = require("./convert-amount.js");
 //#region src/onchain/accounts/intents/utils/pick-token.ts
 /** Prefix marking every phantom-token contract type in the registry. */
 const PHANTOM_TOKEN_PREFIX = "PHANTOM_TOKEN::";
@@ -37,7 +36,8 @@ function isRedemptionPhantomToken(sdk, token) {
 */
 function rankAccountTokens(args) {
 	const { creditAccount, sdk, exclude = [] } = args;
-	const convert = require_onchain_accounts_intents_utils_convert_amount.convertAmount(sdk, creditAccount.creditManager);
+	const oracle = sdk.marketRegister.findByCreditManager(creditAccount.creditManager).priceOracle;
+	const convert = (from, to, amount) => oracle.safeConvert(from, to, amount).value;
 	const candidates = [];
 	for (const t of creditAccount.tokens) {
 		if (t.balance <= 0n) continue;

package/dist/cjs/onchain/accounts/intents/utils/price-impact.js

@@ -0,0 +1,99 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_onchain_constants_math = require("../../../constants/math.js");
+//#region src/onchain/accounts/intents/utils/price-impact.ts
+/** `b1 = b0 / V0`: a dollar of the basket, the reference implementation's anchor. */
+const PROBE_UNIT_USD_WAD = require_onchain_constants_math.WAD;
+/**
+* `V0 = Σ b0ᵢ·pᵢ`, then `b1 = b0 / V0`, proportions kept.
+*
+* Refuses only what the reference refuses — a basket worth nothing, or one that
+* rounds away entirely. Stricter guards here would report nothing where the old
+* client reported a number.
+*/
+function probeBasket(balances, oracle) {
+	if (balances.length === 0) return;
+	let basketWad = 0n;
+	for (const asset of balances) {
+		if (asset.balance <= 0n) continue;
+		const usd = oracle.safeConvertToUSD(asset.token, asset.balance).value;
+		if (usd > 0n) basketWad += usd * require_onchain_constants_math.WAD / require_onchain_constants_math.PRICE_DECIMALS;
+	}
+	if (basketWad <= 0n) return;
+	const probeWad = PROBE_UNIT_USD_WAD;
+	const scaled = balances.map((asset) => ({
+		token: asset.token,
+		balance: asset.balance * probeWad / basketWad
+	}));
+	if (!scaled.some((a) => a.balance > 0n)) return;
+	return {
+		balances: scaled,
+		basketWad,
+		probeWad
+	};
+}
+/** Fires the marginal-price quote for one leg; `undefined` if it cannot be measured. */
+function startProbe(args) {
+	const basket = probeBasket(args.basket, args.oracle);
+	if (!basket) return;
+	return {
+		tokenOut: args.tokenOut,
+		basketWad: basket.basketWad,
+		probeWad: basket.probeWad,
+		probe: args.route(basket.balances).catch(() => void 0)
+	};
+}
+/** `convert` answers `0` for a negative amount, so convert the magnitude and re-sign. */
+function toUnderlyingSigned(convert, token, amount) {
+	if (amount === 0n) return 0n;
+	const converted = convert(token, amount < 0n ? -amount : amount);
+	if (converted <= 0n) return;
+	return amount < 0n ? -converted : converted;
+}
+/**
+* In `PERCENTAGE_FACTOR_1KK` (1_000_000 = 100%), negative for a loss. A base
+* that is not positive falls back to the routed output.
+*/
+function lossRate(args) {
+	const { lossUnd, expectedUnd, totalValue, netValue } = args;
+	const against = (base) => -(require_onchain_constants_math.PERCENTAGE_FACTOR_1KK * lossUnd / (base > 0n ? base : expectedUnd));
+	return {
+		pathPriceImpact: against(expectedUnd),
+		netValuePriceImpact: against(netValue),
+		totalValuePriceImpact: against(totalValue)
+	};
+}
+/**
+* Folds every leg into one rate, in the underlying — the unit its bases are in.
+*
+* All or nothing: a partial sum would understate the loss and draw a better
+* price than the route offers.
+*/
+async function collectPriceImpact(probes, ctx) {
+	if (probes.length === 0) return;
+	const quotes = await Promise.all(probes.map((leg) => leg.probe));
+	let expectedUnd = 0n;
+	let lossUnd = 0n;
+	for (const [index, leg] of probes.entries()) {
+		const unit = quotes[index];
+		if (unit === void 0 || unit <= 0n) return;
+		const expected = unit * leg.basketWad / leg.probeWad;
+		if (expected <= 0n) return;
+		const expectedInUnd = ctx.toUnderlying(leg.tokenOut, expected);
+		if (expectedInUnd <= 0n) return;
+		const loss = toUnderlyingSigned(ctx.toUnderlying, leg.tokenOut, expected - leg.realAmount);
+		if (loss === void 0) return;
+		expectedUnd += expectedInUnd;
+		lossUnd += loss;
+	}
+	if (expectedUnd <= 0n) return;
+	return lossRate({
+		lossUnd,
+		expectedUnd,
+		totalValue: ctx.totalValue,
+		netValue: ctx.netValue
+	});
+}
+//#endregion
+exports.collectPriceImpact = collectPriceImpact;
+exports.lossRate = lossRate;
+exports.startProbe = startProbe;

package/dist/cjs/onchain/accounts/intents/utils/quotas-for-update.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_constants_math = require("../../../constants/math.js");
 const require_onchain_utils_mappers = require("../../../utils/mappers.js");
-const require_common_utils_utils_creditAccount_quota_utils = require("../../../../common-utils/utils/creditAccount/quota-utils.js");
+const require_onchain_accounts_quota_utils = require("../../quota-utils.js");
 //#region src/onchain/accounts/intents/utils/quotas-for-update.ts
 function getQuotasForUpdate({ assetsBefore, assetsAfter, initialQuotas, quotaReserve = 0, liquidationThresholds: liquidationThresholdsMap, quotas: quotasMap, maxDebt, underlyingToken, convert }) {
 	const underlyingTokenLc = underlyingToken.toLowerCase();
@@ -40,7 +40,7 @@ function getQuotasForUpdate({ assetsBefore, assetsAfter, initialQuotas, quotaRes
 			amountInTarget: convert(a.token, underlyingTokenLc, a.balance)
 		};
 	});
-	const quotaResult = require_common_utils_utils_creditAccount_quota_utils.calcQuotaUpdate({
+	const quotaResult = require_onchain_accounts_quota_utils.calcQuotaUpdate({
 		quotas,
 		initialQuotas: initialQuotasRecord,
 		assetsAfterUpdate: constructAssetRecord(assetsWithAmountInTarget),
@@ -124,7 +124,7 @@ function collectQuotaChange(assetsBefore, assetsAfter) {
 }
 /**
 * SDK `getSingleQuotaChange` requires `assetAfter` to emit quota decreases.
-* Simulation drops zero balances, so fully spent collaterals (e.g. claim
+* The ledger drops zero balances, so fully spent collaterals (e.g. claim
 * phantom) vanish — reinsert them with balance 0 when they still have
 * initial quota so `calcQuotaUpdate` can zero / remove that quota.
 */

package/dist/cjs/onchain/accounts/intents/utils/router-path.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_accounts_intents_utils_common = require("./common.js");
-const require_onchain_accounts_intents_utils_convert_amount = require("./convert-amount.js");
+const require_onchain_accounts_intents_utils_price_impact = require("./price-impact.js");
 //#region src/onchain/accounts/intents/utils/router-path.ts
 /**
 * The engine's only door to the pathfinder.
@@ -18,68 +18,124 @@ function createRouterPaths(args) {
 		collateralTokens: suite.creditManager.collateralTokens.map((t) => t.toLowerCase())
 	};
 	const router = sdk.routerFor({ creditFacade: suite.creditFacade.address });
+	const { priceOracle } = sdk.marketRegister.findByCreditManager(creditAccount.creditManager);
+	const quoteSwap = (input) => {
+		const spending = [{
+			token: input.tokenIn,
+			balance: input.amount + input.keep
+		}];
+		return input.keep > 0n ? router.findManyToOnePath({
+			creditAccount: require_onchain_accounts_intents_utils_common.toRouterCaSlice(creditAccount, spending),
+			creditManager: cmSlice,
+			expectedBalances: spending,
+			leftoverBalances: [{
+				token: input.tokenIn,
+				balance: input.keep
+			}],
+			target: input.tokenOut,
+			slippage
+		}) : router.findOneTokenPath({
+			creditAccount: require_onchain_accounts_intents_utils_common.toRouterCaSlice(creditAccount, spending),
+			creditManager: cmSlice,
+			tokenIn: input.tokenIn,
+			tokenOut: input.tokenOut,
+			amount: input.amount,
+			slippage
+		});
+	};
+	const quoteClose = (balances) => router.findBestClosePath({
+		creditAccount: require_onchain_accounts_intents_utils_common.toRouterCaSlice(creditAccount, balances),
+		creditManager: cmSlice,
+		balances: {
+			expectedBalances: balances,
+			leftoverBalances: [],
+			tokensToClaim: []
+		},
+		slippage
+	});
+	const quoteOpen = (expectedBalances, leftoverBalances, target) => router.findOpenStrategyPath({
+		creditManager: cmSlice,
+		expectedBalances,
+		leftoverBalances,
+		target,
+		slippage
+	});
 	return {
 		async swap({ tokenIn, tokenOut, amount, keep = 0n }) {
 			if (amount <= 0n) return {
 				amount: 0n,
 				minAmount: 0n,
-				calls: []
+				calls: [],
+				probe: void 0
 			};
 			if (keep < 0n) throw new Error(`swap: spending ${amount} of ${tokenIn} exceeds its balance`);
-			if (keep > 0n) {
-				const expectedBalances = [{
-					token: tokenIn,
-					balance: amount + keep
-				}];
-				return router.findManyToOnePath({
-					creditAccount: require_onchain_accounts_intents_utils_common.toRouterCaSlice(creditAccount, expectedBalances),
-					creditManager: cmSlice,
-					expectedBalances,
-					leftoverBalances: [{
-						token: tokenIn,
-						balance: keep
-					}],
-					target: tokenOut,
-					slippage
-				});
-			}
-			return router.findOneTokenPath({
-				creditAccount: require_onchain_accounts_intents_utils_common.toRouterCaSlice(creditAccount, [{
+			const probe = require_onchain_accounts_intents_utils_price_impact.startProbe({
+				basket: [{
 					token: tokenIn,
 					balance: amount
-				}]),
-				creditManager: cmSlice,
+				}],
+				tokenOut,
+				oracle: priceOracle,
+				route: async ([only]) => {
+					if (!only) return 0n;
+					return (await quoteSwap({
+						tokenIn: only.token,
+						tokenOut,
+						amount: only.balance,
+						keep: 0n
+					})).amount;
+				}
+			});
+			const leg = await quoteSwap({
 				tokenIn,
 				tokenOut,
 				amount,
-				slippage
+				keep
 			});
+			return {
+				...leg,
+				probe: probe && {
+					...probe,
+					realAmount: leg.amount
+				}
+			};
 		},
 		async closeAll({ balances }) {
-			const { amount, minAmount, calls } = await router.findBestClosePath({
-				creditAccount: require_onchain_accounts_intents_utils_common.toRouterCaSlice(creditAccount, balances),
-				creditManager: cmSlice,
-				balances: {
-					expectedBalances: balances,
-					leftoverBalances: [],
-					tokensToClaim: []
-				},
-				slippage
+			const probe = require_onchain_accounts_intents_utils_price_impact.startProbe({
+				basket: balances,
+				tokenOut: creditAccount.underlying,
+				oracle: priceOracle,
+				route: async (quoted) => (await quoteClose(quoted)).amount
 			});
-			return {
+			const { amount, minAmount, calls } = await quoteClose(balances);
+			const leg = {
 				amount,
 				minAmount,
 				calls: [...calls]
 			};
+			return {
+				...leg,
+				probe: probe && {
+					...probe,
+					realAmount: leg.amount
+				}
+			};
 		},
 		async openStrategy({ expectedBalances, leftoverBalances, target }) {
-			return router.findOpenStrategyPath({
-				creditManager: cmSlice,
-				expectedBalances,
-				leftoverBalances,
-				target,
-				slippage
+			const probe = require_onchain_accounts_intents_utils_price_impact.startProbe({
+				basket: expectedBalances,
+				tokenOut: target,
+				oracle: priceOracle,
+				route: async (balances) => (await quoteOpen(balances, [], target)).amount
 			});
+			const leg = await quoteOpen(expectedBalances, leftoverBalances, target);
+			return {
+				...leg,
+				probe: probe && {
+					...probe,
+					realAmount: leg.amount
+				}
+			};
 		}
 	};
 }
@@ -95,11 +151,13 @@ function createRouterPaths(args) {
 */
 function createOraclePaths(args) {
 	const { sdk, creditAccount } = args;
-	const price = require_onchain_accounts_intents_utils_convert_amount.convertAmount(sdk, creditAccount.creditManager);
+	const oracle = sdk.marketRegister.findByCreditManager(creditAccount.creditManager).priceOracle;
+	const price = (from, to, amount) => oracle.safeConvert(from, to, amount).value;
 	const estimate = (amount) => ({
 		amount,
 		minAmount: amount,
-		calls: []
+		calls: [],
+		probe: void 0
 	});
 	return {
 		async swap({ tokenIn, tokenOut, amount }) {

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

@@ -1,26 +1,27 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_accounts_intents_utils_common = require("./utils/common.js");
-const require_onchain_accounts_intents_utils_convert_amount = require("./utils/convert-amount.js");
 const require_onchain_accounts_intents_utils_pick_token = require("./utils/pick-token.js");
 //#region src/onchain/accounts/intents/view.ts
 /**
 * The account as the planners see it: a handful of numbers in underlying units
 * plus balance / price lookups. Read once per preview.
 *
-* TVL uses the RWA-aware conversion so an `rwa.asset` balance without a direct
-* pool price still counts at its wrapped value instead of throwing.
+* TVL uses the market oracle: an unpriceable token contributes 0n rather
+* than throwing.
 */
 function accountView(creditAccount, sdk) {
 	const { underlying, creditManager } = creditAccount;
-	const price = require_onchain_accounts_intents_utils_convert_amount.convertAmount(sdk, creditManager);
+	const oracle = sdk.marketRegister.findByCreditManager(creditManager).priceOracle;
+	const price = (from, to, amount) => oracle.safeConvert(from, to, amount).value;
 	const { creditFacade } = sdk.marketRegister.findCreditManager(creditManager);
 	let totalValue = 0n;
 	for (const t of creditAccount.tokens) totalValue += price(t.token, underlying, t.balance);
 	return {
 		underlying,
+		sdk,
 		rwaAsset: sdk.tokensMeta.rwaUnderlyings.get(underlying)?.asset,
-		debt: creditAccount.accountDebt,
-		collateral: totalValue - creditAccount.accountDebt,
+		debt: creditAccount.totalDebt,
+		collateral: totalValue - creditAccount.totalDebt,
 		band: {
 			minDebt: creditFacade.minDebt,
 			maxDebt: creditFacade.maxDebt