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

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,

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

@@ -36,9 +36,9 @@ const case_increase = {
 		token: POS
 	},
 	tokens: [caToken(POS, TVL_2X, QUOTA_1000)],
-	accountDebt: DEBT_2X,
+	totalDebt: DEBT_2X,
 	totalValue: TVL_3X,
-	accountDebtAfter: DEBT_3X,
+	totalDebtAfter: DEBT_3X,
 	ops: [
 		{
 			type: "increaseDebt",
@@ -72,9 +72,9 @@ const case_increase_underlying = {
 		token: UND
 	},
 	tokens: [caToken(UND, TVL_2X)],
-	accountDebt: DEBT_2X,
+	totalDebt: DEBT_2X,
 	totalValue: TVL_3X,
-	accountDebtAfter: DEBT_3X,
+	totalDebtAfter: DEBT_3X,
 	ops: [{
 		type: "increaseDebt",
 		amount: STEP
@@ -88,9 +88,9 @@ const case_increase_rwa = {
 		token: RWA_ASSET
 	},
 	tokens: [caToken(RWA_ASSET, TVL_2X, QUOTA_1000)],
-	accountDebt: DEBT_2X,
+	totalDebt: DEBT_2X,
 	totalValue: TVL_3X,
-	accountDebtAfter: DEBT_3X,
+	totalDebtAfter: DEBT_3X,
 	ops: [
 		{
 			type: "increaseDebt",
@@ -123,9 +123,9 @@ const case_decrease = {
 		token: POS
 	},
 	tokens: [caToken(POS, TVL_3X, QUOTA_1500)],
-	accountDebt: DEBT_3X,
+	totalDebt: DEBT_3X,
 	totalValue: TVL_2X,
-	accountDebtAfter: DEBT_2X,
+	totalDebtAfter: DEBT_2X,
 	ops: [
 		{
 			type: "swap",
@@ -159,9 +159,9 @@ const case_decrease_from_idle_underlying = {
 		token: POS
 	},
 	tokens: [caToken(POS, TVL_2X, QUOTA_1000), caToken(UND, STEP)],
-	accountDebt: DEBT_3X,
+	totalDebt: DEBT_3X,
 	totalValue: TVL_2X,
-	accountDebtAfter: DEBT_2X,
+	totalDebtAfter: DEBT_2X,
 	ops: [{
 		type: "decreaseDebt",
 		amount: STEP
@@ -175,9 +175,9 @@ const case_decrease_rwa = {
 		token: RWA_ASSET
 	},
 	tokens: [caToken(RWA_ASSET, TVL_3X, QUOTA_1500)],
-	accountDebt: DEBT_3X,
+	totalDebt: DEBT_3X,
 	totalValue: TVL_2X,
-	accountDebtAfter: DEBT_2X,
+	totalDebtAfter: DEBT_2X,
 	ops: [
 		{
 			type: "wrapRwaCollateral",
@@ -210,9 +210,9 @@ const case_noop = {
 		token: POS
 	},
 	tokens: [caToken(POS, TVL_2X, QUOTA_1000)],
-	accountDebt: DEBT_2X,
+	totalDebt: DEBT_2X,
 	totalValue: TVL_2X,
-	accountDebtAfter: DEBT_2X,
+	totalDebtAfter: DEBT_2X,
 	ops: []
 };
 function buildAdjustLeverageSdk(c) {
@@ -222,7 +222,7 @@ function buildAdjustLeverageProps(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/deposit.fixtures.js

@@ -31,9 +31,9 @@ const case_fixed_leverage = {
 		positionToken: POS
 	},
 	tokens: [caToken(POS, P1000, QUOTA_1000)],
-	accountDebt: DEBT_START,
+	totalDebt: DEBT_START,
 	totalValue: P2000,
-	accountDebtAfter: P1000,
+	totalDebtAfter: P1000,
 	ops: [
 		{
 			type: "addCollateral",
@@ -75,9 +75,9 @@ const case_target_leverage = {
 		targetLeverage: LEV_3X
 	},
 	tokens: [caToken(POS, P1000, QUOTA_1000)],
-	accountDebt: DEBT_START,
+	totalDebt: DEBT_START,
 	totalValue: P3000,
-	accountDebtAfter: P2000,
+	totalDebtAfter: P2000,
 	ops: [
 		{
 			type: "addCollateral",
@@ -118,9 +118,9 @@ const case_position_is_underlying = {
 		positionToken: UND
 	},
 	tokens: [caToken(UND, P1000)],
-	accountDebt: DEBT_START,
+	totalDebt: DEBT_START,
 	totalValue: P2000,
-	accountDebtAfter: P1000,
+	totalDebtAfter: P1000,
 	ops: [{
 		type: "addCollateral",
 		token: UND,
@@ -140,9 +140,9 @@ const case_rwa_collateral = {
 		positionToken: POS
 	},
 	tokens: [caToken(POS, P1000, QUOTA_1000)],
-	accountDebt: DEBT_START,
+	totalDebt: DEBT_START,
 	totalValue: P2000,
-	accountDebtAfter: P1000,
+	totalDebtAfter: P1000,
 	ops: [
 		{
 			type: "addCollateral",
@@ -194,9 +194,9 @@ const case_rwa_position = {
 		positionToken: RWA_ASSET
 	},
 	tokens: [caToken(RWA_ASSET, P1000, QUOTA_1000)],
-	accountDebt: DEBT_START,
+	totalDebt: DEBT_START,
 	totalValue: P2000,
-	accountDebtAfter: P1000,
+	totalDebtAfter: P1000,
 	ops: [
 		{
 			type: "addCollateral",
@@ -249,9 +249,9 @@ const case_native_coin = {
 		value: NATIVE_VALUE
 	},
 	tokens: [caToken(POS, M32_BALANCE, quotaOf(M32_BALANCE))],
-	accountDebt: M32_DEBT,
+	totalDebt: M32_DEBT,
 	totalValue: 1500000000n,
-	accountDebtAfter: 1200000000n,
+	totalDebtAfter: 1200000000n,
 	ops: [
 		{
 			type: "addCollateral",
@@ -293,7 +293,7 @@ function buildDepositProps(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/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/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()

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

@@ -19,8 +19,8 @@ function accountView(creditAccount, sdk) {
 		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/market/MarketSuite.js

@@ -127,6 +127,21 @@ var MarketSuite = class extends SDKConstruct {
 		};
 	}
 	/**
+	* Prices a figure already denominated in this market's underlying — a debt,
+	* a TVL, a payout — as the read model reports one.
+	*
+	* The token it names is {@link underlyingToken}, so an amount coming out of a
+	* preview or a simulation carries the same identity as the one on a
+	* `StrategyPosition`: USDC on an RWA market, not the dcUSDC wrapper the pool
+	* actually holds. The two convert one-for-one, so the figure is exact either
+	* way; only the label differs, and a caller showing both side by side must
+	* not see two.
+	**/
+	toUnderlyingAmount = (value) => ({
+		token: this.underlyingToken,
+		...this.priceOracle.toAmount(this.underlying, value)
+	});
+	/**
 	* Display name of this market's pool, e.g. `"USDC Pool"`.
 	*/
 	get poolName() {

package/dist/esm/onchain/market/math.js

@@ -42,16 +42,20 @@ const USD_DUST_THRESHOLD = 1000n;
 /**
 * Converts a USD value in the oracle's 8-decimal fixed point to a float.
 *
-* Values below {@link USD_DUST_THRESHOLD} report as `0`.
+* Values whose magnitude is below {@link USD_DUST_THRESHOLD} report as `0`.
+* The threshold is weighed on the magnitude because the deltas the model
+* carries — a debt repaid, a balance sold — are negative, and dust is dust in
+* either direction.
 *
 * @example
 * ```ts
 * // usd: $1500.50 in 8-decimal fixed point
 * usdToNumber(150_050_000_000n) // 1500.5
+* usdToNumber(-150_050_000_000n) // -1500.5
 * ```
 **/
 function usdToNumber(usd) {
-	return usd < USD_DUST_THRESHOLD ? 0 : Number(usd) / Number(PRICE_DECIMALS);
+	return (usd < 0n ? -usd : usd) < USD_DUST_THRESHOLD ? 0 : Number(usd) / Number(PRICE_DECIMALS);
 }
 /**
 * Share of capital currently borrowed, in basis points. Returns `0` when there

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

@@ -20,6 +20,14 @@ import "../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 SDKConstruct {
 	/**
 	* {@inheritDoc IPoolsService.getDepositTokensIn}
@@ -125,7 +133,9 @@ var PoolService = class extends 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,
@@ -134,14 +144,8 @@ var PoolService = class extends 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
 		};
 	}
@@ -150,7 +154,9 @@ var PoolService = class extends 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,
@@ -159,16 +165,10 @@ var PoolService = class extends 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)
 		};
 	}
 	/**
@@ -176,7 +176,9 @@ var PoolService = class extends 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,
@@ -185,16 +187,10 @@ var PoolService = class extends 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/esm/preview/index.js

@@ -32,7 +32,7 @@ import { previewCloseOrRepayCreditAccount } from "./preview/previewCloseOrRepayC
 import { previewOperation } from "./preview/previewOperation.js";
 import "./preview/index.js";
 import "./types.js";
-import { checkOperation, collateralIssuesOf } from "./validate/checkOperation.js";
+import { checkOperation, collateralIssue, marketIssues, quotaCountIssue } from "./validate/checkOperation.js";
 import { checkSimulation } from "./validate/checkSimulation.js";
 import "./validate/index.js";
-export { AllowancePrerequisite, BalancePrerequisite, CreditAccountState, IntentPreviewError, Prerequisite, RWAOpenRequirementsPrerequisite, TransferAlignmentError, UnexpectedFacadeEventOrderError, UnknownAdapterError, UnknownFacadeCallError, UnsupportedOperationError, UnsupportedPoolFunctionError, UnsupportedTargetError, UnsupportedZapperFunctionError, WithdrawCollateralAlignmentError, buildDelayedPreview, checkOperation, checkPrerequisites, checkSimulation, classifyCloseOrRepay, classifyInnerOperations, collateralIssuesOf, detectDelayedClaim, detectDelayedOperation, extractAdapterCallTraces, extractTransfers, findFacadeCalls, isCloseOrRepay, isPoolOperation, isRWAOperation, makeReplayState, parseFacadeOperationCalldata, parseOperationCalldata, parsePoolOperationCalldata, parseRWAFactoryOperationCalldata, previewAdjustCreditAccount, previewCloseOrRepayCreditAccount, previewOperation, raise, refuse, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };
+export { AllowancePrerequisite, BalancePrerequisite, CreditAccountState, IntentPreviewError, Prerequisite, RWAOpenRequirementsPrerequisite, TransferAlignmentError, UnexpectedFacadeEventOrderError, UnknownAdapterError, UnknownFacadeCallError, UnsupportedOperationError, UnsupportedPoolFunctionError, UnsupportedTargetError, UnsupportedZapperFunctionError, WithdrawCollateralAlignmentError, buildDelayedPreview, checkOperation, checkPrerequisites, checkSimulation, classifyCloseOrRepay, classifyInnerOperations, collateralIssue, detectDelayedClaim, detectDelayedOperation, extractAdapterCallTraces, extractTransfers, findFacadeCalls, isCloseOrRepay, isPoolOperation, isRWAOperation, makeReplayState, marketIssues, parseFacadeOperationCalldata, parseOperationCalldata, parsePoolOperationCalldata, parseRWAFactoryOperationCalldata, previewAdjustCreditAccount, previewCloseOrRepayCreditAccount, previewOperation, quotaCountIssue, raise, refuse, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };

package/dist/esm/preview/preview/buildDelayedPreview.js

@@ -17,7 +17,7 @@ import { isAddressEqual } from "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
@@ -187,9 +187,10 @@ 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),
+		netValue: market.toUnderlyingAmount(totalValue - 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/esm/preview/preview/previewAdjustCreditAccount.js

@@ -45,9 +45,10 @@ 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),
+		netValue: market.toUnderlyingAmount(totalValue - 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/esm/preview/preview/previewCloseOrRepayCreditAccount.js

@@ -56,7 +56,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/esm/preview/preview/previewOpenCreditAccount.js

@@ -16,7 +16,7 @@ async function previewOpenCreditAccount(input, operation) {
 	let error = await 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 {
@@ -31,18 +31,18 @@ async function previewOpenCreditAccount(input, operation) {
 	error ??= unwrapError ?? priceError;
 	const assets = account.balances.toAssets(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)