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

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

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

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

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

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

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

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

@@ -26,9 +26,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 = {
@@ -290,9 +290,9 @@ const case_matrix_4_1 = {
 		sourceToken: POS
 	},
 	tokens: [caToken(POS, M4_BALANCE, quotaOf(M4_BALANCE))],
-	accountDebt: M4_DEBT,
+	totalDebt: M4_DEBT,
 	totalValue: M4_SPEND,
-	accountDebtAfter: M4_DD,
+	totalDebtAfter: M4_DD,
 	ops: [
 		{
 			type: "swap",
@@ -341,9 +341,9 @@ const case_matrix_4_2 = {
 		sourceToken: POS
 	},
 	tokens: [caToken(POS, M4_BALANCE, quotaOf(M4_BALANCE))],
-	accountDebt: M4_DEBT,
+	totalDebt: M4_DEBT,
 	totalValue: M4_SPEND,
-	accountDebtAfter: M4_DD,
+	totalDebtAfter: M4_DD,
 	ops: [
 		{
 			type: "swap",
@@ -390,7 +390,7 @@ function buildWithdrawProps(c, sdk) {
 	return {
 		intent: c.intent,
 		creditAccount: buildFixtureCreditAccount({
-			accountDebt: c.accountDebt,
+			totalDebt: c.totalDebt,
 			tokens: c.tokens
 		}),
 		sdk,

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

@@ -1,16 +1 @@
-//#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
-export { IntentPreviewError };
+export {};

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

@@ -1,8 +1,8 @@
 //#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 {
@@ -11,9 +11,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/esm/onchain/accounts/intents/utils/common.js

@@ -14,7 +14,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 AddressMap([]);
 	for (const asset of expectedBalances ?? []) expected.upsert(asset.token, (expected.get(asset.token) ?? 0n) + asset.balance);
 	const tokens = creditAccount.tokens.map((t) => {
@@ -32,7 +32,7 @@ function toRouterCaSlice(creditAccount, expectedBalances = []) {
 		creditAccount: creditAccountAddress.toLowerCase(),
 		creditFacade: creditFacade.toLowerCase(),
 		creditManager: creditManager.toLowerCase(),
-		debt: creditAccount.accountDebt,
+		debt: creditAccount.totalDebt,
 		tokens
 	};
 }

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

@@ -3,9 +3,9 @@ import { calcBorrowedAmountPlusInterestAndFees } from "./borrowed-amount-plus-in
 /**
 * 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.
@@ -18,7 +18,7 @@ function toCreditAccountSlice(ca) {
 		underlying: ca.underlying.toLowerCase(),
 		enabledTokensMask: ca.enabledTokensMask,
 		totalDebtUSD: ca.totalDebtUSD,
-		accountDebt: calcBorrowedAmountPlusInterestAndFees(ca),
+		totalDebt: calcBorrowedAmountPlusInterestAndFees(ca),
 		tokens: ca.tokens.map((t) => ({
 			...t,
 			token: t.token.toLowerCase()
@@ -29,7 +29,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/esm/onchain/accounts/intents/utils/index.js

@@ -1,11 +1,11 @@
 import { eq, toRouterCaSlice, toTargetDecimals } from "./common.js";
-import { convertAmount } from "./convert-amount.js";
 import { isPhantomToken, isRedemptionPhantomToken, pickFattestNonPhantomToken, rankAccountTokens } from "./pick-token.js";
 import { adjustStateToSnapshot } from "./adjust-state-to-snapshot.js";
 import { assembleOperationCalls } from "./assemble-operation-calls.js";
 import { calcBorrowedAmountPlusInterestAndFees } from "./borrowed-amount-plus-interest-and-fees.js";
 import { fetchCreditAccountSlice, toCreditAccountSlice } from "./credit-account-slice.js";
 import { OperationLedger } from "./ledger.js";
+import { collectPriceImpact, lossRate, startProbe } from "./price-impact.js";
 import { clearedQuotas, getQuotasForUpdate, quotasAfterUpdate } from "./quotas-for-update.js";
 import { createOraclePaths, createRouterPaths } from "./router-path.js";
-export { OperationLedger, adjustStateToSnapshot, assembleOperationCalls, calcBorrowedAmountPlusInterestAndFees, clearedQuotas, convertAmount, createOraclePaths, createRouterPaths, eq, fetchCreditAccountSlice, getQuotasForUpdate, isPhantomToken, isRedemptionPhantomToken, pickFattestNonPhantomToken, quotasAfterUpdate, rankAccountTokens, toCreditAccountSlice, toRouterCaSlice, toTargetDecimals };
+export { OperationLedger, adjustStateToSnapshot, assembleOperationCalls, calcBorrowedAmountPlusInterestAndFees, clearedQuotas, collectPriceImpact, createOraclePaths, createRouterPaths, eq, fetchCreditAccountSlice, getQuotasForUpdate, isPhantomToken, isRedemptionPhantomToken, lossRate, pickFattestNonPhantomToken, quotasAfterUpdate, rankAccountTokens, startProbe, toCreditAccountSlice, toRouterCaSlice, toTargetDecimals };

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

@@ -1,6 +1,5 @@
 import { NON_STRATEGY_PHANTOM_TOKEN_TYPES } from "../../../base/token-types.js";
 import { eq } from "./common.js";
-import { convertAmount } from "./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::";
@@ -36,7 +35,8 @@ function isRedemptionPhantomToken(sdk, token) {
 */
 function rankAccountTokens(args) {
 	const { creditAccount, sdk, exclude = [] } = args;
-	const convert = 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/esm/onchain/accounts/intents/utils/price-impact.js

@@ -0,0 +1,96 @@
+import { PERCENTAGE_FACTOR_1KK, PRICE_DECIMALS, WAD } from "../../../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 = 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 * WAD / 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) => -(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
+export { collectPriceImpact, lossRate, startProbe };

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

@@ -1,6 +1,6 @@
 import { MIN_INT96 } from "../../../constants/math.js";
 import { TypedObjectUtils } from "../../../utils/mappers.js";
-import { calcQuotaUpdate } from "../../../../common-utils/utils/creditAccount/quota-utils.js";
+import { calcQuotaUpdate } from "../../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();
@@ -123,7 +123,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/esm/onchain/accounts/intents/utils/router-path.js

@@ -1,5 +1,5 @@
 import { toRouterCaSlice } from "./common.js";
-import { convertAmount } from "./convert-amount.js";
+import { startProbe } from "./price-impact.js";
 //#region src/onchain/accounts/intents/utils/router-path.ts
 /**
 * The engine's only door to the pathfinder.
@@ -17,68 +17,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: toRouterCaSlice(creditAccount, spending),
+			creditManager: cmSlice,
+			expectedBalances: spending,
+			leftoverBalances: [{
+				token: input.tokenIn,
+				balance: input.keep
+			}],
+			target: input.tokenOut,
+			slippage
+		}) : router.findOneTokenPath({
+			creditAccount: toRouterCaSlice(creditAccount, spending),
+			creditManager: cmSlice,
+			tokenIn: input.tokenIn,
+			tokenOut: input.tokenOut,
+			amount: input.amount,
+			slippage
+		});
+	};
+	const quoteClose = (balances) => router.findBestClosePath({
+		creditAccount: 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: toRouterCaSlice(creditAccount, expectedBalances),
-					creditManager: cmSlice,
-					expectedBalances,
-					leftoverBalances: [{
-						token: tokenIn,
-						balance: keep
-					}],
-					target: tokenOut,
-					slippage
-				});
-			}
-			return router.findOneTokenPath({
-				creditAccount: toRouterCaSlice(creditAccount, [{
+			const probe = 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: toRouterCaSlice(creditAccount, balances),
-				creditManager: cmSlice,
-				balances: {
-					expectedBalances: balances,
-					leftoverBalances: [],
-					tokensToClaim: []
-				},
-				slippage
+			const probe = 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 = 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
+				}
+			};
 		}
 	};
 }
@@ -94,11 +150,13 @@ function createRouterPaths(args) {
 */
 function createOraclePaths(args) {
 	const { sdk, creditAccount } = args;
-	const price = 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/esm/onchain/accounts/intents/view.js

@@ -1,25 +1,26 @@
 import { eq } from "./utils/common.js";
-import { convertAmount } from "./utils/convert-amount.js";
 import { pickFattestNonPhantomToken } from "./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 = 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

package/dist/esm/onchain/accounts/liquidations/LiquidationsService.js

@@ -1,4 +1,3 @@
-import { iLiquidationCompressorV313Abi } from "../../../abi/ILiquidationCompressorV313.js";
 import { AddressSet } from "../../utils/AddressSet.js";
 import { bytes32ToString } from "../../utils/bytes32ToString.js";
 import { ADDRESS_0X0 } from "../../constants/addresses.js";
@@ -20,6 +19,8 @@ import { SecuritizeLiquidatorContract } from "../../market/rwa/securitize/Securi
 import "../../market/rwa/securitize/index.js";
 import "../../market/index.js";
 import { LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS } from "./constants.js";
+import { iLiquidationCompressorV313Abi } from "../../../abi/ILiquidationCompressorV313.js";
+import { skipLiquidatableAccount } from "./skipLiquidatableAccount.js";
 //#region src/onchain/accounts/liquidations/LiquidationsService.ts
 /**
 * Service for discovering liquidatable credit accounts and previewing manual
@@ -29,7 +30,6 @@ var LiquidationsService = class extends SDKConstruct {
 	/**
 	* Returns all liquidatable credit accounts: accounts with health factor
 	* below 1 plus accounts of expired credit managers with outstanding debt.
-	* Accounts whose collateral computation failed are excluded.
 	**/
 	async getLiquidatableAccounts(props) {
 		const unhealthy = await this.sdk.accounts.getCreditAccounts({
@@ -40,8 +40,8 @@ var LiquidationsService = class extends SDKConstruct {
 		let expired = await this.#getExpiredCreditAccounts(props?.blockNumber);
 		expired = expired.filter((ca) => !seen.has(ca.creditAccount));
 		return [...unhealthy, ...expired].flatMap((ca) => {
-			if (!ca.success) {
-				this.logger?.warn(`cannot compute liquidation details for ${ca.creditAccount}: collateral computation failed`);
+			if (skipLiquidatableAccount(ca, (token) => this.sdk.tokensMeta.get(token)?.contractType)) {
+				this.logger?.warn(`skipping liquidatable account ${ca.creditAccount}`);
 				return [];
 			}
 			return [this.#buildAccount(ca)];
@@ -148,11 +148,11 @@ var LiquidationsService = class extends SDKConstruct {
 	#anyMarketTokenAmount(token, value) {
 		const meta = this.sdk.tokensMeta.mustGetToken(token);
 		for (const market of this.sdk.marketRegister.markets) {
-			const valueUsd = market.priceOracle.safeUsdValue(token, value);
-			if (valueUsd !== null) return {
+			const priced = market.priceOracle.safeConvertToUSD(token, value);
+			if (!priced.error) return {
 				token: meta,
 				value,
-				valueUsd
+				valueUsd: usdToNumber(priced.value)
 			};
 		}
 		return {
@@ -253,15 +253,15 @@ var LiquidationsService = class extends SDKConstruct {
 	#buildAccount(ca, suite = this.sdk.marketRegister.findCreditManager(ca.creditManager)) {
 		const market = suite.market;
 		const unwrappedUnderlying = this.sdk.tokensMeta.unwrapRWA(suite.underlying);
-		const liquidationDiscount = suite.isExpired ? suite.creditManager.liquidationDiscountExpired : suite.creditManager.liquidationDiscount;
+		const { liquidationDiscount } = suite.liquidationFees();
 		const repaymentAmount = ca.totalValue * BigInt(liquidationDiscount) / PERCENTAGE_FACTOR;
 		const estimatedProfit = ca.totalValue - repaymentAmount;
 		const token = this.sdk.tokensMeta.mustGetToken(unwrappedUnderlying);
 		const usd = (part) => ca.totalValue > 0n ? usdToNumber(ca.totalValueUSD * part / ca.totalValue) : 0;
 		return {
+			...suite.creditOperationMarket(),
 			chainId: this.sdk.chainId,
 			creditAccount: ca.creditAccount,
-			creditManager: ca.creditManager,
 			asset: this.sdk.tokensMeta.mustGetToken(this.#mainAsset(ca, market, unwrappedUnderlying)),
 			totalValue: {
 				token,

package/dist/esm/onchain/accounts/liquidations/skipLiquidatableAccount.js

@@ -0,0 +1,11 @@
+//#region src/onchain/accounts/liquidations/skipLiquidatableAccount.ts
+/**
+* Whether a credit account should be dropped from the liquidatable list:
+* collateral computation failed, or it holds a Mellow withdrawal phantom
+* token above dust (no liquidation subcompressor for that type).
+**/
+function skipLiquidatableAccount(account, getContractType) {
+	return !account.success || account.tokens.some((t) => getContractType(t.token) === "PHANTOM_TOKEN::MELLOW_WITHDRAWAL");
+}
+//#endregion
+export { skipLiquidatableAccount };

package/dist/esm/{common-utils/utils/creditAccount → onchain/accounts}/quota-utils.js

@@ -1,6 +1,6 @@
-import { BigIntMath } from "../../../onchain/utils/bigint-math.js";
-import { MIN_INT96, PERCENTAGE_FACTOR } from "../../../onchain/constants/math.js";
-//#region src/common-utils/utils/creditAccount/quota-utils.ts
+import { BigIntMath } from "../utils/bigint-math.js";
+import { MIN_INT96, PERCENTAGE_FACTOR } from "../constants/math.js";
+//#region src/onchain/accounts/quota-utils.ts
 /**
 * Rounds quota deltas to protocol precision step (`PERCENTAGE_FACTOR`).
 *