@gearbox-protocol/sdk 16.0.0-next.47 → 16.0.0-next.49

package/dist/cjs/model/positions.schema.js

@@ -208,7 +208,10 @@ const positionTransactionKindSchema = zod_v4.z.union([
 	zod_v4.z.literal("adjustLeverage"),
 	zod_v4.z.literal("addCollateral"),
 	zod_v4.z.literal("withdrawCollateral"),
-	zod_v4.z.literal("liquidation")
+	zod_v4.z.literal("liquidation"),
+	zod_v4.z.literal("repay"),
+	zod_v4.z.literal("rebalance"),
+	zod_v4.z.literal("other")
 ]);
 /**
 * {@link PositionTransaction}
@@ -217,7 +220,9 @@ const positionTransactionSchema = zod_v4.z.object({
 	txHash: require_onchain_utils_zod.ZodHex(),
 	timestamp: require_model_primitives_schema.timestampSchema,
 	kind: positionTransactionKindSchema,
-	assets: zod_v4.z.array(require_model_primitives_schema.tokenAmountSchema)
+	assets: zod_v4.z.array(require_model_primitives_schema.tokenAmountSchema),
+	balanceChanges: zod_v4.z.array(require_model_primitives_schema.tokenAmountSchema),
+	debtChange: require_model_primitives_schema.tokenAmountSchema
 });
 //#endregion
 exports.borrowRateBreakdownSchema = borrowRateBreakdownSchema;

package/dist/cjs/offchain/positions/OffchainPositions.js

@@ -39,6 +39,15 @@ var OffchainPositions = class extends require_offchain_AbstractOffchainNamespace
 	async getCharts(key, metrics, range) {
 		return this.readCharts(`${this.#chartRoot(key)}/charts`, metrics, range);
 	}
+	/**
+	* {@inheritDoc IOffchainPositions.getTransactions}
+	**/
+	async getTransactions(key) {
+		return this.get({
+			path: `${this.#strategyPath(key)}/transactions`,
+			schema: zod_v4.z.array(require_model_positions_schema.positionTransactionSchema)
+		});
+	}
 	#poolPath(key) {
 		return `${this.#root}/pool/${key.chainId}/${key.pool}/${key.wallet}`;
 	}

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

@@ -2,6 +2,7 @@ require("../../../constants/math.js");
 require("../../../constants/index.js");
 const require_onchain_market_math = require("../../../market/math.js");
 const require_onchain_market_credit_CreditSuite = require("../../../market/credit/CreditSuite.js");
+const require_onchain_market_MarketSuite = require("../../../market/MarketSuite.js");
 const require_onchain_positions_PositionsService = require("../../../positions/PositionsService.js");
 let vitest = require("vitest");
 //#region src/onchain/accounts/intents/testing/sdk-mock.ts
@@ -221,6 +222,7 @@ function buildMockSdk(args) {
 			underlying: args.underlying
 		}
 	};
+	Object.assign(market, { valueInUnderlying: require_onchain_market_MarketSuite.MarketSuite.prototype.valueInUnderlying });
 	const collateralTokens = [args.underlying.toLowerCase(), ...Object.keys(args.liquidationThresholds).map((t) => t.toLowerCase()).filter((t) => t !== args.underlying.toLowerCase())];
 	const forbidden = new Set((args.forbiddenTokens ?? []).map((t) => t.toLowerCase()));
 	const forbiddenTokensMask = collateralTokens.reduce((mask, token, i) => forbidden.has(token) ? mask | 1n << BigInt(i) : mask, 0n);

package/dist/cjs/onchain/market/MarketSuite.js

@@ -1,6 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_utils_AddressMap = require("../utils/AddressMap.js");
 const require_onchain_chain_chains = require("../chain/chains.js");
+const require_onchain_constants_math = require("../constants/math.js");
+require("../constants/index.js");
 require("../utils/index.js");
 const require_onchain_base_SDKConstruct = require("../base/SDKConstruct.js");
 require("../base/index.js");
@@ -151,6 +153,32 @@ var MarketSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		...this.priceOracle.toAmount(this.underlying, value)
 	});
 	/**
+	* Sums `assets` in this market's underlying at latest oracle prices.
+	*
+	* Balances at or below `minBalance` are ignored. A token the oracle cannot
+	* price contributes nothing; the first such token is {@link ValueInUnderlying.unpriceable}.
+	*
+	* The counterpart of {@link toUnderlyingAmount}: that method labels a figure
+	* already in underlying, this one produces the figure from mixed holdings.
+	**/
+	valueInUnderlying(assets, minBalance = require_onchain_constants_math.DUST_THRESHOLD) {
+		let unpriceable;
+		let value = 0n;
+		for (const { token, balance } of assets) {
+			if (balance <= minBalance) continue;
+			const converted = this.priceOracle.safeConvert(token, this.underlying, balance);
+			if (converted === null) {
+				unpriceable ??= token;
+				continue;
+			}
+			value += converted;
+		}
+		return unpriceable === void 0 ? { value } : {
+			value,
+			unpriceable
+		};
+	}
+	/**
 	* Display name of this market's pool, e.g. `"USDC Pool"`.
 	*/
 	get poolName() {

package/dist/cjs/onchain/positions/PositionsService.js

@@ -294,12 +294,14 @@ var PositionsService = class extends require_onchain_base_SDKConstruct.SDKConstr
 				withdrawals: withdrawals.get(t.token) ?? []
 			});
 			if (recomputeTotals) {
-				const value = priceOracle.safeConvert(t.token, market.underlying, t.balance) || 0n;
-				totalValue += value;
 				const usd = priceOracle.safeConvertToUSD(t.token, t.balance) || 0n;
 				totalValueUSD += usd;
 			}
 		}
+		if (recomputeTotals) totalValue = market.valueInUnderlying(ca.tokens.map((t) => ({
+			token: t.token,
+			balance: t.balance
+		}))).value;
 		const snapshot = {
 			...require_onchain_positions_types.accountSnapshotFromCreditAccountData(ca),
 			totalValue

package/dist/cjs/preview/index.js

@@ -18,6 +18,7 @@ const require_preview_prerequisites_BalancePrerequisite = require("./prerequisit
 const require_preview_prerequisites_RWAOpenRequirementsPrerequisite = require("./prerequisites/RWAOpenRequirementsPrerequisite.js");
 const require_preview_prerequisites_checkPrerequisites = require("./prerequisites/checkPrerequisites.js");
 require("./prerequisites/index.js");
+const require_preview_preview_errors = require("./preview/errors.js");
 const require_preview_preview_buildDelayedStrategyPositionOperationPreview = require("./preview/buildDelayedStrategyPositionOperationPreview.js");
 const require_preview_preview_CreditAccountState = require("./preview/CreditAccountState.js");
 const require_preview_preview_detectCloseOrRepay = require("./preview/detectCloseOrRepay.js");
@@ -77,3 +78,4 @@ exports.refuse = require_onchain_validation_refusal.refuse;
 exports.replayInnerOperations = require_preview_preview_replayInnerOperations.replayInnerOperations;
 exports.replayMulticall = require_preview_preview_replayMulticall.replayMulticall;
 exports.resolveDelayedClaimIntent = require_preview_preview_detectDelayedClaim.resolveDelayedClaimIntent;
+exports.unpriceableTokenError = require_preview_preview_errors.unpriceableTokenError;

package/dist/cjs/preview/preview/buildDelayedStrategyPositionOperationPreview.js

@@ -5,6 +5,7 @@ const require_onchain_constants_math = require("../../onchain/constants/math.js"
 const require_model_previews = require("../../model/previews.js");
 require("../../model/index.js");
 require("../../onchain/index.js");
+const require_preview_preview_errors = require("./errors.js");
 let viem = require("viem");
 //#region src/preview/preview/buildDelayedStrategyPositionOperationPreview.ts
 /**
@@ -13,8 +14,9 @@ let viem = require("viem");
 * the claim itself followed by the intent-specific tail
 *
 * Pure function: the input states are never mutated and no network access is performed.
-* Swaps are estimated with the injected conversion; tokens it cannot price contribute
-* nothing and set a non-fatal `ERROR_UNPRICEABLE_TOKEN` error on the
+* Swaps are estimated with the injected conversion; remaining holdings are
+* priced by `MarketSuite.valueInUnderlying`. Tokens that cannot be priced
+* contribute nothing and set a non-fatal `ERROR_UNPRICEABLE_TOKEN` error on the
 * preview.
 *
 * The changes (e.g. `totalDebtChange`) are reported relative to the account
@@ -51,10 +53,7 @@ function makeSafeConverter(convert) {
 			try {
 				return convert(token, to, amount);
 			} catch {
-				error ??= {
-					code: require_model_previews.ERROR_UNPRICEABLE_TOKEN,
-					message: `cannot price token ${token}`
-				};
+				error ??= require_preview_preview_errors.unpriceableTokenError(token);
 				return 0n;
 			}
 		},
@@ -149,35 +148,36 @@ function repayFromClaim(post, claimToken, convert, amount) {
 	post.repay(received);
 }
 /**
-* Oracle estimate of the account's total value in the underlying, ignoring
-* balances at or below `dust`.
-*/
-function totalValueInUnderlying(post, convert, dust) {
-	return post.balances.sum((token, balance) => balance > dust ? convert(token, post.underlying, balance) : 0n);
-}
-/**
 * `CLOSE_ACCOUNT` operation tail: everything is swapped into the
 * underlying, the debt is repaid in full and the remainder is withdrawn to
 * the user as `receivedToken`.
 */
 function buildClosePreview(post, converter, receivedToken, sdk) {
-	const totalValue = totalValueInUnderlying(post, converter.convert, 0n);
-	const oracle = sdk.marketRegister.findByCreditManager(post.creditManager).priceOracle;
+	const market = sdk.marketRegister.findByCreditManager(post.creditManager);
+	const priced = market.valueInUnderlying(post.balances.toAssets(), 0n);
+	const oracle = market.priceOracle;
 	const suite = sdk.marketRegister.findCreditManager(post.creditManager);
 	return {
 		operation: "CloseCreditAccount",
 		permanent: false,
-		...suite.creditOperationMarket(),
+		...require_model_previews.asEstimated(sdk.positions.projection({
+			creditManager: post.creditManager,
+			assets: [],
+			quotas: [],
+			totalDebt: 0n,
+			totalValue: 0n
+		}, { availableLiquidityChange: post.totalDebt })),
 		creditAccount: post.creditAccount,
 		name: suite.accountStrategyName(post.creditAccount),
 		targetCollateral: suite.accountTargetCollateral(post.creditAccount),
-		receivedAmount: oracle.toTokenAmount(receivedToken, require_onchain_utils_bigint_math.BigIntMath.max(totalValue - post.totalDebt, 0n)),
-		error: converter.error
+		receivedAmount: oracle.toTokenAmount(receivedToken, require_onchain_utils_bigint_math.BigIntMath.max(priced.value - post.totalDebt, 0n)),
+		error: converter.error ?? (priced.unpriceable ? require_preview_preview_errors.unpriceableTokenError(priced.unpriceable) : void 0)
 	};
 }
 function buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk) {
-	const snap = post.toSnapshot(totalValueInUnderlying(post, converter.convert, require_onchain_constants_math.DUST_THRESHOLD));
 	const market = sdk.marketRegister.findByCreditManager(post.creditManager);
+	const priced = market.valueInUnderlying(post.balances.toAssets());
+	const snap = post.toSnapshot(priced.value);
 	const suite = sdk.marketRegister.findCreditManager(post.creditManager);
 	const oracle = market.priceOracle;
 	return {
@@ -194,7 +194,7 @@ function buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk) {
 			...oracle.toAmount(market.underlying, q.balance)
 		})),
 		assetsChange: post.balances.difference(before.balances).toAssets(require_onchain_constants_math.DUST_THRESHOLD).map((a) => oracle.toTokenAmount(a.token, a.balance)),
-		error: converter.error
+		error: converter.error ?? (priced.unpriceable ? require_preview_preview_errors.unpriceableTokenError(priced.unpriceable) : void 0)
 	};
 }
 //#endregion

package/dist/cjs/preview/preview/errors.js

@@ -1 +1,17 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_model_previews = require("../../model/previews.js");
+require("../../model/index.js");
+//#region src/preview/preview/errors.ts
+/**
+* Preview limitation (2xxx): the oracle could not price `token`. Callers
+* attach this with `error ??=` so a malformed-transaction (1xxx) error
+* already recorded keeps precedence.
+**/
+function unpriceableTokenError(token) {
+	return {
+		code: require_model_previews.ERROR_UNPRICEABLE_TOKEN,
+		message: `cannot price token ${token}`
+	};
+}
+//#endregion
+exports.unpriceableTokenError = unpriceableTokenError;

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

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_preview_preview_errors = require("./errors.js");
 const require_preview_preview_buildDelayedStrategyPositionOperationPreview = require("./buildDelayedStrategyPositionOperationPreview.js");
 const require_preview_preview_CreditAccountState = require("./CreditAccountState.js");
 const require_preview_preview_detectCloseOrRepay = require("./detectCloseOrRepay.js");
 const require_preview_preview_detectDelayedClaim = require("./detectDelayedClaim.js");
 const require_preview_preview_detectDelayedOperation = require("./detectDelayedOperation.js");
-require("./errors.js");
 const require_preview_preview_estimateClaimableAt = require("./estimateClaimableAt.js");
 const require_preview_preview_replayInnerOperations = require("./replayInnerOperations.js");
 const require_preview_preview_replayMulticall = require("./replayMulticall.js");
@@ -25,3 +25,4 @@ exports.previewOperation = require_preview_preview_previewOperation.previewOpera
 exports.replayInnerOperations = require_preview_preview_replayInnerOperations.replayInnerOperations;
 exports.replayMulticall = require_preview_preview_replayMulticall.replayMulticall;
 exports.resolveDelayedClaimIntent = require_preview_preview_detectDelayedClaim.resolveDelayedClaimIntent;
+exports.unpriceableTokenError = require_preview_preview_errors.unpriceableTokenError;

package/dist/cjs/preview/preview/previewAdjustStrategyPosition.js

@@ -4,6 +4,7 @@ const require_onchain_constants_math = require("../../onchain/constants/math.js"
 const require_model_previews = require("../../model/previews.js");
 require("../../model/index.js");
 require("../../onchain/index.js");
+const require_preview_preview_errors = require("./errors.js");
 const require_preview_preview_replayMulticall = require("./replayMulticall.js");
 const require_preview_preview_unwrapNativeCollateral = require("./unwrapNativeCollateral.js");
 //#region src/preview/preview/previewAdjustStrategyPosition.ts
@@ -25,18 +26,9 @@ function previewAdjustStrategyPosition(input, operation, options) {
 	const { assets: collateralAdded, error: unwrapError } = require_preview_preview_unwrapNativeCollateral.unwrapNativeCollateral(after.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(require_onchain_constants_address_provider.AP_WETH_TOKEN, 0));
 	error ??= unwrapError;
 	const assetsChange = account.balances.difference(before.balances).toAssets(require_onchain_constants_math.DUST_THRESHOLD);
-	const totalValue = account.balances.toAssets(require_onchain_constants_math.DUST_THRESHOLD).reduce((acc, { token, balance }) => {
-		try {
-			return acc + oracle.convert(token, market.underlying, balance);
-		} catch {
-			error ??= {
-				code: require_model_previews.ERROR_UNPRICEABLE_TOKEN,
-				message: `cannot price token ${token}`
-			};
-			return acc;
-		}
-	}, 0n);
-	const snap = account.toSnapshot(totalValue);
+	const priced = market.valueInUnderlying(account.balances.toAssets());
+	if (priced.unpriceable) error ??= require_preview_preview_errors.unpriceableTokenError(priced.unpriceable);
+	const snap = account.toSnapshot(priced.value);
 	return {
 		operation: "AdjustCreditAccount",
 		...require_model_previews.asEstimated(sdk.positions.projection(snap, { availableLiquidityChange: before.totalDebt - account.totalDebt })),

package/dist/cjs/preview/preview/previewExitOrRepayStrategyPosition.js

@@ -1,7 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_constants_address_provider = require("../../onchain/constants/address-provider.js");
 require("../../onchain/constants/math.js");
+const require_model_previews = require("../../model/previews.js");
+require("../../model/index.js");
 require("../../onchain/index.js");
+const require_preview_preview_errors = require("./errors.js");
 const require_preview_preview_detectCloseOrRepay = require("./detectCloseOrRepay.js");
 const require_preview_preview_replayMulticall = require("./replayMulticall.js");
 const require_preview_preview_unwrapNativeCollateral = require("./unwrapNativeCollateral.js");
@@ -23,7 +26,11 @@ function previewExitOrRepayStrategyPosition(input, operation, permanent, options
 function previewCloseCreditAccount(input, operation, permanent, replay) {
 	const { sdk } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
-	const { after, error } = replay;
+	const { before, after, error: replayError } = replay;
+	const account = after.account;
+	let error = replayError;
+	const priced = market.valueInUnderlying(account.balances.toAssets());
+	if (priced.unpriceable) error ??= require_preview_preview_errors.unpriceableTokenError(priced.unpriceable);
 	const suite = sdk.marketRegister.findCreditManager(operation.creditManager);
 	let receivedToken = market.underlying;
 	for (const m of operation.multicall) if (m.operation === "WithdrawCollateral" && m.amount === 115792089237316195423570985008687907853269984665640564039457584007913129639935n) {
@@ -33,7 +40,7 @@ function previewCloseCreditAccount(input, operation, permanent, replay) {
 	return {
 		operation: "CloseCreditAccount",
 		permanent,
-		...suite.creditOperationMarket(),
+		...require_model_previews.asEstimated(sdk.positions.projection(account.toSnapshot(priced.value), { availableLiquidityChange: before.totalDebt - account.totalDebt })),
 		creditAccount: operation.creditAccount,
 		name: suite.accountStrategyName(operation.creditAccount),
 		targetCollateral: suite.accountTargetCollateral(operation.creditAccount),
@@ -50,18 +57,21 @@ function previewRepayCreditAccount(input, operation, permanent, replay) {
 	const { sdk, value = 0n } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
 	const { before, after, error: replayError } = replay;
+	const account = after.account;
 	const { assets: collateralAdded, error: unwrapError } = require_preview_preview_unwrapNativeCollateral.unwrapNativeCollateral(after.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(require_onchain_constants_address_provider.AP_WETH_TOKEN, 0));
-	const error = replayError ?? unwrapError;
+	let error = replayError ?? unwrapError;
+	const priced = market.valueInUnderlying(account.balances.toAssets());
+	if (priced.unpriceable) error ??= require_preview_preview_errors.unpriceableTokenError(priced.unpriceable);
 	const suite = sdk.marketRegister.findCreditManager(operation.creditManager);
 	return {
 		operation: "RepayCreditAccount",
 		permanent,
-		...suite.creditOperationMarket(),
+		...require_model_previews.asEstimated(sdk.positions.projection(account.toSnapshot(priced.value), { availableLiquidityChange: before.totalDebt - account.totalDebt })),
 		creditAccount: operation.creditAccount,
 		name: suite.accountStrategyName(operation.creditAccount),
 		targetCollateral: suite.accountTargetCollateral(operation.creditAccount),
 		collateralAdded: collateralAdded.map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),
-		debtRepaid: market.toUnderlyingAmount(before.totalDebt - after.account.totalDebt),
+		debtRepaid: market.toUnderlyingAmount(before.totalDebt - account.totalDebt),
 		collateralWithdrawn: after.collateralWithdrawn.toAssets().map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),
 		error
 	};

package/dist/cjs/sdk/positions/PositionsNamespace.js

@@ -51,6 +51,12 @@ var PositionsNamespace = class extends require_sdk_AbstractNamespace.AbstractNam
 		return this.offchain.getCharts(key, metrics, range);
 	}
 	/**
+	* {@inheritDoc IPositionsOffchainOnly.transactions}
+	**/
+	async transactions(key) {
+		return this.offchain.getTransactions(key);
+	}
+	/**
 	* {@inheritDoc IPositionsOnchainOnly.getCurrentWithdrawals}
 	**/
 	async getCurrentWithdrawals(props) {

package/dist/esm/model/positions.schema.js

@@ -207,7 +207,10 @@ const positionTransactionKindSchema = z.union([
 	z.literal("adjustLeverage"),
 	z.literal("addCollateral"),
 	z.literal("withdrawCollateral"),
-	z.literal("liquidation")
+	z.literal("liquidation"),
+	z.literal("repay"),
+	z.literal("rebalance"),
+	z.literal("other")
 ]);
 /**
 * {@link PositionTransaction}
@@ -216,7 +219,9 @@ const positionTransactionSchema = z.object({
 	txHash: ZodHex(),
 	timestamp: timestampSchema,
 	kind: positionTransactionKindSchema,
-	assets: z.array(tokenAmountSchema)
+	assets: z.array(tokenAmountSchema),
+	balanceChanges: z.array(tokenAmountSchema),
+	debtChange: tokenAmountSchema
 });
 //#endregion
 export { borrowRateBreakdownSchema, pnlBreakdownSchema, pointsProgramPnLSchema, pointsRewardsPnLSchema, poolPositionKeySchema, poolPositionSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionKeySchema, positionKindSchema, positionSchema, positionTransactionKindSchema, positionTransactionSchema, positionsTotalsSchema, rewardsPnLSchema, strategyPositionKeySchema, strategyPositionSchema, tokenQuotaRateSchema, tokenRewardsPnLSchema };

package/dist/esm/offchain/positions/OffchainPositions.js

@@ -1,4 +1,4 @@
-import { positionFilterQuerySchema, positionSchema, positionsTotalsSchema } from "../../model/positions.schema.js";
+import { positionFilterQuerySchema, positionSchema, positionTransactionSchema, positionsTotalsSchema } from "../../model/positions.schema.js";
 import { AbstractOffchainNamespace } from "../AbstractOffchainNamespace.js";
 import { z } from "zod/v4";
 //#region src/offchain/positions/OffchainPositions.ts
@@ -38,6 +38,15 @@ var OffchainPositions = class extends AbstractOffchainNamespace {
 	async getCharts(key, metrics, range) {
 		return this.readCharts(`${this.#chartRoot(key)}/charts`, metrics, range);
 	}
+	/**
+	* {@inheritDoc IOffchainPositions.getTransactions}
+	**/
+	async getTransactions(key) {
+		return this.get({
+			path: `${this.#strategyPath(key)}/transactions`,
+			schema: z.array(positionTransactionSchema)
+		});
+	}
 	#poolPath(key) {
 		return `${this.#root}/pool/${key.chainId}/${key.pool}/${key.wallet}`;
 	}

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

@@ -2,6 +2,7 @@ import "../../../constants/math.js";
 import "../../../constants/index.js";
 import { calcMaxLeverage, usdToNumber } from "../../../market/math.js";
 import { CreditSuite } from "../../../market/credit/CreditSuite.js";
+import { MarketSuite } from "../../../market/MarketSuite.js";
 import { PositionsService } from "../../../positions/PositionsService.js";
 import { vi } from "vitest";
 //#region src/onchain/accounts/intents/testing/sdk-mock.ts
@@ -221,6 +222,7 @@ function buildMockSdk(args) {
 			underlying: args.underlying
 		}
 	};
+	Object.assign(market, { valueInUnderlying: MarketSuite.prototype.valueInUnderlying });
 	const collateralTokens = [args.underlying.toLowerCase(), ...Object.keys(args.liquidationThresholds).map((t) => t.toLowerCase()).filter((t) => t !== args.underlying.toLowerCase())];
 	const forbidden = new Set((args.forbiddenTokens ?? []).map((t) => t.toLowerCase()));
 	const forbiddenTokensMask = collateralTokens.reduce((mask, token, i) => forbidden.has(token) ? mask | 1n << BigInt(i) : mask, 0n);

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

@@ -1,5 +1,7 @@
 import { AddressMap } from "../utils/AddressMap.js";
 import { isRWAToken, isSunsetPool } from "../chain/chains.js";
+import { DUST_THRESHOLD } from "../constants/math.js";
+import "../constants/index.js";
 import "../utils/index.js";
 import { SDKConstruct } from "../base/SDKConstruct.js";
 import "../base/index.js";
@@ -150,6 +152,32 @@ var MarketSuite = class extends SDKConstruct {
 		...this.priceOracle.toAmount(this.underlying, value)
 	});
 	/**
+	* Sums `assets` in this market's underlying at latest oracle prices.
+	*
+	* Balances at or below `minBalance` are ignored. A token the oracle cannot
+	* price contributes nothing; the first such token is {@link ValueInUnderlying.unpriceable}.
+	*
+	* The counterpart of {@link toUnderlyingAmount}: that method labels a figure
+	* already in underlying, this one produces the figure from mixed holdings.
+	**/
+	valueInUnderlying(assets, minBalance = DUST_THRESHOLD) {
+		let unpriceable;
+		let value = 0n;
+		for (const { token, balance } of assets) {
+			if (balance <= minBalance) continue;
+			const converted = this.priceOracle.safeConvert(token, this.underlying, balance);
+			if (converted === null) {
+				unpriceable ??= token;
+				continue;
+			}
+			value += converted;
+		}
+		return unpriceable === void 0 ? { value } : {
+			value,
+			unpriceable
+		};
+	}
+	/**
 	* Display name of this market's pool, e.g. `"USDC Pool"`.
 	*/
 	get poolName() {

package/dist/esm/onchain/positions/PositionsService.js

@@ -293,12 +293,14 @@ var PositionsService = class extends SDKConstruct {
 				withdrawals: withdrawals.get(t.token) ?? []
 			});
 			if (recomputeTotals) {
-				const value = priceOracle.safeConvert(t.token, market.underlying, t.balance) || 0n;
-				totalValue += value;
 				const usd = priceOracle.safeConvertToUSD(t.token, t.balance) || 0n;
 				totalValueUSD += usd;
 			}
 		}
+		if (recomputeTotals) totalValue = market.valueInUnderlying(ca.tokens.map((t) => ({
+			token: t.token,
+			balance: t.balance
+		}))).value;
 		const snapshot = {
 			...accountSnapshotFromCreditAccountData(ca),
 			totalValue

package/dist/esm/preview/index.js

@@ -17,6 +17,7 @@ import { BalancePrerequisite } from "./prerequisites/BalancePrerequisite.js";
 import { RWAOpenRequirementsPrerequisite } from "./prerequisites/RWAOpenRequirementsPrerequisite.js";
 import { checkPrerequisites } from "./prerequisites/checkPrerequisites.js";
 import "./prerequisites/index.js";
+import { unpriceableTokenError } from "./preview/errors.js";
 import { buildDelayedStrategyPositionOperationPreview } from "./preview/buildDelayedStrategyPositionOperationPreview.js";
 import { CreditAccountState } from "./preview/CreditAccountState.js";
 import { classifyCloseOrRepay, isCloseOrRepay } from "./preview/detectCloseOrRepay.js";
@@ -34,4 +35,4 @@ import "./types.js";
 import { checkOperation, collateralIssue, marketIssues, quotaCountIssue } from "./validate/checkOperation.js";
 import { checkSimulation } from "./validate/checkSimulation.js";
 import "./validate/index.js";
-export { AllowancePrerequisite, BalancePrerequisite, CreditAccountState, Prerequisite, RWAOpenRequirementsPrerequisite, TransferAlignmentError, UnexpectedFacadeEventOrderError, UnknownAdapterError, UnknownFacadeCallError, WithdrawCollateralAlignmentError, asPreviewSimulationError, buildDelayedStrategyPositionOperationPreview, checkOperation, checkPrerequisites, checkSimulation, classifyCloseOrRepay, classifyInnerOperations, collateralIssue, detectDelayedClaim, detectDelayedOperation, estimateClaimableAt, extractAdapterCallTraces, extractTransfers, findFacadeCalls, isCloseOrRepay, isPoolOperation, isRWAOperation, makeReplayState, marketIssues, parseFacadeOperationCalldata, parseOperationCalldata, parsePoolOperationCalldata, parseRWAFactoryOperationCalldata, previewAdjustStrategyPosition, previewExitOrRepayStrategyPosition, previewOperation, quotaCountIssue, raise, refuse, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };
+export { AllowancePrerequisite, BalancePrerequisite, CreditAccountState, Prerequisite, RWAOpenRequirementsPrerequisite, TransferAlignmentError, UnexpectedFacadeEventOrderError, UnknownAdapterError, UnknownFacadeCallError, WithdrawCollateralAlignmentError, asPreviewSimulationError, buildDelayedStrategyPositionOperationPreview, checkOperation, checkPrerequisites, checkSimulation, classifyCloseOrRepay, classifyInnerOperations, collateralIssue, detectDelayedClaim, detectDelayedOperation, estimateClaimableAt, extractAdapterCallTraces, extractTransfers, findFacadeCalls, isCloseOrRepay, isPoolOperation, isRWAOperation, makeReplayState, marketIssues, parseFacadeOperationCalldata, parseOperationCalldata, parsePoolOperationCalldata, parseRWAFactoryOperationCalldata, previewAdjustStrategyPosition, previewExitOrRepayStrategyPosition, previewOperation, quotaCountIssue, raise, refuse, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent, unpriceableTokenError };

package/dist/esm/preview/preview/buildDelayedStrategyPositionOperationPreview.js

@@ -1,9 +1,10 @@
 import { AssetsMap } from "../../onchain/utils/AssetsMap.js";
 import { BigIntMath } from "../../onchain/utils/bigint-math.js";
 import { DUST_THRESHOLD } from "../../onchain/constants/math.js";
-import { ERROR_UNPRICEABLE_TOKEN, asEstimated } from "../../model/previews.js";
+import { asEstimated } from "../../model/previews.js";
 import "../../model/index.js";
 import "../../onchain/index.js";
+import { unpriceableTokenError } from "./errors.js";
 import { isAddressEqual } from "viem";
 //#region src/preview/preview/buildDelayedStrategyPositionOperationPreview.ts
 /**
@@ -12,8 +13,9 @@ import { isAddressEqual } from "viem";
 * the claim itself followed by the intent-specific tail
 *
 * Pure function: the input states are never mutated and no network access is performed.
-* Swaps are estimated with the injected conversion; tokens it cannot price contribute
-* nothing and set a non-fatal `ERROR_UNPRICEABLE_TOKEN` error on the
+* Swaps are estimated with the injected conversion; remaining holdings are
+* priced by `MarketSuite.valueInUnderlying`. Tokens that cannot be priced
+* contribute nothing and set a non-fatal `ERROR_UNPRICEABLE_TOKEN` error on the
 * preview.
 *
 * The changes (e.g. `totalDebtChange`) are reported relative to the account
@@ -50,10 +52,7 @@ function makeSafeConverter(convert) {
 			try {
 				return convert(token, to, amount);
 			} catch {
-				error ??= {
-					code: ERROR_UNPRICEABLE_TOKEN,
-					message: `cannot price token ${token}`
-				};
+				error ??= unpriceableTokenError(token);
 				return 0n;
 			}
 		},
@@ -148,35 +147,36 @@ function repayFromClaim(post, claimToken, convert, amount) {
 	post.repay(received);
 }
 /**
-* Oracle estimate of the account's total value in the underlying, ignoring
-* balances at or below `dust`.
-*/
-function totalValueInUnderlying(post, convert, dust) {
-	return post.balances.sum((token, balance) => balance > dust ? convert(token, post.underlying, balance) : 0n);
-}
-/**
 * `CLOSE_ACCOUNT` operation tail: everything is swapped into the
 * underlying, the debt is repaid in full and the remainder is withdrawn to
 * the user as `receivedToken`.
 */
 function buildClosePreview(post, converter, receivedToken, sdk) {
-	const totalValue = totalValueInUnderlying(post, converter.convert, 0n);
-	const oracle = sdk.marketRegister.findByCreditManager(post.creditManager).priceOracle;
+	const market = sdk.marketRegister.findByCreditManager(post.creditManager);
+	const priced = market.valueInUnderlying(post.balances.toAssets(), 0n);
+	const oracle = market.priceOracle;
 	const suite = sdk.marketRegister.findCreditManager(post.creditManager);
 	return {
 		operation: "CloseCreditAccount",
 		permanent: false,
-		...suite.creditOperationMarket(),
+		...asEstimated(sdk.positions.projection({
+			creditManager: post.creditManager,
+			assets: [],
+			quotas: [],
+			totalDebt: 0n,
+			totalValue: 0n
+		}, { availableLiquidityChange: post.totalDebt })),
 		creditAccount: post.creditAccount,
 		name: suite.accountStrategyName(post.creditAccount),
 		targetCollateral: suite.accountTargetCollateral(post.creditAccount),
-		receivedAmount: oracle.toTokenAmount(receivedToken, BigIntMath.max(totalValue - post.totalDebt, 0n)),
-		error: converter.error
+		receivedAmount: oracle.toTokenAmount(receivedToken, BigIntMath.max(priced.value - post.totalDebt, 0n)),
+		error: converter.error ?? (priced.unpriceable ? unpriceableTokenError(priced.unpriceable) : void 0)
 	};
 }
 function buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk) {
-	const snap = post.toSnapshot(totalValueInUnderlying(post, converter.convert, DUST_THRESHOLD));
 	const market = sdk.marketRegister.findByCreditManager(post.creditManager);
+	const priced = market.valueInUnderlying(post.balances.toAssets());
+	const snap = post.toSnapshot(priced.value);
 	const suite = sdk.marketRegister.findCreditManager(post.creditManager);
 	const oracle = market.priceOracle;
 	return {
@@ -193,7 +193,7 @@ function buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk) {
 			...oracle.toAmount(market.underlying, q.balance)
 		})),
 		assetsChange: post.balances.difference(before.balances).toAssets(DUST_THRESHOLD).map((a) => oracle.toTokenAmount(a.token, a.balance)),
-		error: converter.error
+		error: converter.error ?? (priced.unpriceable ? unpriceableTokenError(priced.unpriceable) : void 0)
 	};
 }
 //#endregion

package/dist/esm/preview/preview/errors.js

@@ -1 +1,16 @@
-export {};
+import { ERROR_UNPRICEABLE_TOKEN } from "../../model/previews.js";
+import "../../model/index.js";
+//#region src/preview/preview/errors.ts
+/**
+* Preview limitation (2xxx): the oracle could not price `token`. Callers
+* attach this with `error ??=` so a malformed-transaction (1xxx) error
+* already recorded keeps precedence.
+**/
+function unpriceableTokenError(token) {
+	return {
+		code: ERROR_UNPRICEABLE_TOKEN,
+		message: `cannot price token ${token}`
+	};
+}
+//#endregion
+export { unpriceableTokenError };

package/dist/esm/preview/preview/index.js

@@ -1,13 +1,13 @@
+import { unpriceableTokenError } from "./errors.js";
 import { buildDelayedStrategyPositionOperationPreview } from "./buildDelayedStrategyPositionOperationPreview.js";
 import { CreditAccountState } from "./CreditAccountState.js";
 import { classifyCloseOrRepay, isCloseOrRepay } from "./detectCloseOrRepay.js";
 import { detectDelayedClaim, resolveDelayedClaimIntent } from "./detectDelayedClaim.js";
 import { detectDelayedOperation } from "./detectDelayedOperation.js";
-import "./errors.js";
 import { estimateClaimableAt } from "./estimateClaimableAt.js";
 import { makeReplayState, replayInnerOperations } from "./replayInnerOperations.js";
 import { replayMulticall } from "./replayMulticall.js";
 import { previewAdjustStrategyPosition } from "./previewAdjustStrategyPosition.js";
 import { previewExitOrRepayStrategyPosition } from "./previewExitOrRepayStrategyPosition.js";
 import { previewOperation } from "./previewOperation.js";
-export { CreditAccountState, buildDelayedStrategyPositionOperationPreview, classifyCloseOrRepay, detectDelayedClaim, detectDelayedOperation, estimateClaimableAt, isCloseOrRepay, makeReplayState, previewAdjustStrategyPosition, previewExitOrRepayStrategyPosition, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };
+export { CreditAccountState, buildDelayedStrategyPositionOperationPreview, classifyCloseOrRepay, detectDelayedClaim, detectDelayedOperation, estimateClaimableAt, isCloseOrRepay, makeReplayState, previewAdjustStrategyPosition, previewExitOrRepayStrategyPosition, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent, unpriceableTokenError };