@gearbox-protocol/sdk 16.0.0-next.46 → 16.0.0-next.48

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/index.js

@@ -704,8 +704,6 @@ exports.toCreditAccountSlice = require_onchain_accounts_intents_utils_credit_acc
 exports.toNetTransfers = require_onchain_market_adapters_transferHelpers.toNetTransfers;
 exports.toPendingWithdrawal = require_onchain_accounts_withdrawal_compressor_AbstractWithdrawalCompressorContract.toPendingWithdrawal;
 exports.toRequestableWithdrawal = require_onchain_accounts_withdrawal_compressor_AbstractWithdrawalCompressorContract.toRequestableWithdrawal;
-exports.toShares = require_onchain_pools_PoolService.toShares;
-exports.toSharesUp = require_onchain_pools_PoolService.toSharesUp;
 exports.toSignificant = require_onchain_utils_formatter.toSignificant;
 exports.toToken = require_onchain_validation_token.toToken;
 exports.toTokenAmount = require_onchain_validation_token.toTokenAmount;

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");
@@ -128,6 +130,14 @@ var MarketSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		};
 	}
 	/**
+	* Whether `token` is this market's pool underlying or the asset it wraps
+	* (dcUSDC or USDC on an RWA pool). Amounts in either unit are 1:1 with the
+	* figure {@link toUnderlyingAmount} reports.
+	*/
+	isUnderlyingLike(token) {
+		return (0, viem.isAddressEqual)(token, this.underlying) || (0, viem.isAddressEqual)(token, this.unwrappedUnderlying);
+	}
+	/**
 	* Prices a figure already denominated in this market's underlying — a debt,
 	* a TVL, a payout — as the read model reports one.
 	*
@@ -143,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() {
@@ -166,7 +202,7 @@ var MarketSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		seen.upsert(this.unwrappedUnderlying, this.underlyingToken);
 		for (const zapper of this.sdk.marketRegister.poolZappers(this.pool.pool.address)) {
 			const tokenIn = zapper.tokenIn.addr;
-			if ((0, viem.isAddressEqual)(tokenIn, this.pool.underlying) || (0, viem.isAddressEqual)(tokenIn, this.unwrappedUnderlying)) continue;
+			if (this.isUnderlyingLike(tokenIn)) continue;
 			seen.upsert(tokenIn, this.tokensMeta.mustGetToken(tokenIn));
 		}
 		return seen.values();

package/dist/cjs/onchain/market/credit/CreditSuite.js

@@ -392,8 +392,7 @@ var CreditSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 	*/
 	#allowedDepositTokens(targetCollateral) {
 		const unwrappedUnderlying = this.market.unwrappedUnderlying;
-		const contractUnderlying = this.underlying;
-		const skip = (token) => (0, viem.isAddressEqual)(token, unwrappedUnderlying) || (0, viem.isAddressEqual)(token, contractUnderlying) || (0, viem.isAddressEqual)(token, targetCollateral);
+		const skip = (token) => this.market.isUnderlyingLike(token) || (0, viem.isAddressEqual)(token, targetCollateral);
 		return [
 			unwrappedUnderlying,
 			targetCollateral,

package/dist/cjs/onchain/market/pool/PoolV310Contract.js

@@ -51,6 +51,31 @@ var PoolV310Contract = class extends require_onchain_base_BaseContract.BaseContr
 		return this.totalSupply * this.dieselRate / require_onchain_constants_math.RAY;
 	}
 	/**
+	* {@inheritDoc IPoolContract.getShareBalance}
+	*/
+	async getShareBalance(wallet, blockNumber) {
+		return this.client.readContract({
+			address: this.address,
+			abi: this.abi,
+			functionName: "balanceOf",
+			args: [wallet],
+			blockNumber
+		});
+	}
+	/**
+	* {@inheritDoc IPoolContract.sharesToUnderlying}
+	*/
+	sharesToUnderlying(shares) {
+		return this.dieselRate === 0n ? shares : shares * this.dieselRate / require_onchain_constants_math.RAY;
+	}
+	/**
+	* {@inheritDoc IPoolContract.underlyingToShares}
+	*/
+	underlyingToShares(underlying, roundUp = false) {
+		if (this.dieselRate === 0n) return underlying;
+		return roundUp ? (underlying * require_onchain_constants_math.RAY + this.dieselRate - 1n) / this.dieselRate : underlying * require_onchain_constants_math.RAY / this.dieselRate;
+	}
+	/**
 	* {@inheritDoc IPoolContract.unwrappedUnderlying}
 	*/
 	get unwrappedUnderlying() {

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

@@ -30,25 +30,6 @@ function payoutCeiling(market) {
 	return market.priceOracle.toAmount(pool.underlying, pool.pool.availableLiquidity * LIQUIDITY_SAFETY_NUM / LIQUIDITY_SAFETY_DENOM);
 }
 var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
-	/**
-	* {@inheritDoc IPoolsService.getShareBalance}
-	*/
-	async getShareBalance(props) {
-		return this.client.readContract({
-			address: this.sdk.marketRegister.findByPool(props.pool).pool.pool.address,
-			abi: require_abi_iERC20.ierc20Abi,
-			functionName: "balanceOf",
-			args: [props.wallet],
-			blockNumber: props.blockNumber
-		});
-	}
-	/**
-	* {@inheritDoc IPoolsService.sharesToUnderlying}
-	*/
-	sharesToUnderlying(pool, shares) {
-		const market = this.sdk.marketRegister.findByPool(pool);
-		return market.toUnderlyingAmount(shares * market.pool.pool.dieselRate / require_onchain_constants_math.RAY);
-	}
 	/**
 	* {@inheritDoc IPoolsService.getDepositTokensIn}
 	*/
@@ -165,7 +146,7 @@ var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		const { zapper } = this.getDepositMetadata(poolAddr, tokenIn, tokenOut);
 		return {
 			tokenIn: toTokenAmount(tokenIn, amount),
-			tokenOut: toTokenAmount(tokenOut, toShares(pool.pool, amount)),
+			tokenOut: toTokenAmount(tokenOut, pool.pool.underlyingToShares(amount)),
 			zapper: zapper?.baseParams.addr
 		};
 	}
@@ -185,7 +166,7 @@ var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		});
 		const { zapper } = this.getWithdrawalMetadata(poolAddr, tokenIn, tokenOut);
 		return {
-			tokenIn: toTokenAmount(tokenIn, toSharesUp(pool.pool, amount)),
+			tokenIn: toTokenAmount(tokenIn, pool.pool.underlyingToShares(amount * require_onchain_constants_math.PERCENTAGE_FACTOR / (require_onchain_constants_math.PERCENTAGE_FACTOR - pool.pool.withdrawFee), true)),
 			tokenOut: toTokenAmount(tokenOut, amount),
 			zapper: zapper?.baseParams.addr,
 			availableLiquidity: payoutCeiling(market)
@@ -208,7 +189,7 @@ var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		const { zapper } = this.getWithdrawalMetadata(poolAddr, tokenIn, tokenOut);
 		return {
 			tokenIn: toTokenAmount(tokenIn, amount),
-			tokenOut: toTokenAmount(tokenOut, toAssets(pool.pool, amount)),
+			tokenOut: toTokenAmount(tokenOut, pool.pool.sharesToUnderlying(amount) * (require_onchain_constants_math.PERCENTAGE_FACTOR - pool.pool.withdrawFee) / require_onchain_constants_math.PERCENTAGE_FACTOR),
 			zapper: zapper?.baseParams.addr,
 			availableLiquidity: payoutCeiling(market)
 		};
@@ -240,7 +221,7 @@ var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		}
 		const poolContract = this.sdk.marketRegister.findByPool(pool).pool.pool;
 		if (meta.zapper instanceof require_onchain_market_zapper_IETHZapperContract.IETHZapperContract || meta.zapper instanceof require_onchain_market_zapper_IERC20ZapperContract.IERC20ZapperContract) {
-			const shares = mode === "withdraw" ? toSharesUp(poolContract, amount) : amount;
+			const shares = mode === "withdraw" ? poolContract.underlyingToShares(amount * require_onchain_constants_math.PERCENTAGE_FACTOR / (require_onchain_constants_math.PERCENTAGE_FACTOR - poolContract.withdrawFee), true) : amount;
 			const tx = permit ? meta.zapper.redeemWithPermit(shares, wallet, permit.deadline, permit.v, permit.r, permit.s) : meta.zapper.redeem(shares, wallet);
 			return {
 				tx,
@@ -434,42 +415,10 @@ var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 			chainId: this.chainId,
 			pool: pool.address,
 			underlyingToken: market.underlyingToken,
-			netValue: this.sharesToUnderlying(pool.address, shares),
+			netValue: market.toUnderlyingAmount(pool.sharesToUnderlying(shares)),
 			apy: { organicApy: require_onchain_market_math.rayToBps(pool.supplyRate) }
 		};
 	}
 };
-/**
-* Shares minted for `assets`, as `previewDeposit` would report them.
-*
-* Both directions convert through the diesel rate — underlying per RAY of
-* shares — because that is the rate the pool itself divides by, and the only
-* exact one the SDK holds: `totalAssets` is this rate multiplied out, so
-* converting back through it costs a wei on large amounts. Rounds down, as
-* minting does.
-*/
-function toShares(pool, assets) {
-	const { dieselRate } = pool;
-	return dieselRate === 0n ? assets : assets * require_onchain_constants_math.RAY / dieselRate;
-}
-/**
-* Shares a withdrawal of `assets` burns, as `previewWithdraw` would report
-* them: {@link toShares} rounded the other way, since the burn has to cover
-* the payout the caller asked for.
-*/
-function toSharesUp(pool, assets) {
-	const { dieselRate } = pool;
-	return dieselRate === 0n ? assets : (assets * require_onchain_constants_math.RAY + dieselRate - 1n) / dieselRate;
-}
-/**
-* Underlying paid out for `shares`, as `previewRedeem` would report it:
-* {@link toShares} run backwards, less the pool's withdrawal fee.
-*/
-function toAssets(pool, shares) {
-	const { dieselRate, withdrawFee } = pool;
-	return (dieselRate === 0n ? shares : shares * dieselRate / require_onchain_constants_math.RAY) * (require_onchain_constants_math.PERCENTAGE_FACTOR - withdrawFee) / require_onchain_constants_math.PERCENTAGE_FACTOR;
-}
 //#endregion
 exports.PoolService = PoolService;
-exports.toShares = toShares;
-exports.toSharesUp = toSharesUp;

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

@@ -2,5 +2,3 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_pools_PoolService = require("./PoolService.js");
 require("./types.js");
 exports.PoolService = require_onchain_pools_PoolService.PoolService;
-exports.toShares = require_onchain_pools_PoolService.toShares;
-exports.toSharesUp = require_onchain_pools_PoolService.toSharesUp;

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/preview/preview/previewPoolPositionOperation.js

@@ -1,29 +1,48 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_abi_iERC20 = require("../../abi/iERC20.js");
 const require_model_result = require("../../model/result.js");
 require("../../model/index.js");
+const require_preview_simulate_errors = require("../simulate/errors.js");
 const require_preview_simulate_simulatePoolOperation = require("../simulate/simulatePoolOperation.js");
-require("../simulate/index.js");
 //#region src/preview/preview/previewPoolPositionOperation.ts
 async function previewPoolPositionOperation(input, operation, options) {
-	const { sdk, to, calldata } = input;
+	const { sdk } = input;
 	const { tokenIn, tokenOut } = operation;
 	const market = sdk.marketRegister.findByPool(operation.pool);
-	const answer = await require_preview_simulate_simulatePoolOperation.simulatePoolOperation({
-		sdk,
-		operation,
-		to,
-		calldata
-	}, options);
-	if (require_model_result.isSDKError(answer)) return answer;
-	const sim = answer.data;
+	const pool = market.pool.pool;
+	const holder = "owner" in operation ? operation.owner : operation.receiver;
+	let previewAmount;
+	let shares;
+	try {
+		[previewAmount, shares] = await sdk.client.multicall({
+			contracts: [require_preview_simulate_simulatePoolOperation.previewContract(operation), {
+				address: operation.pool,
+				abi: require_abi_iERC20.ierc20Abi,
+				functionName: "balanceOf",
+				args: [holder]
+			}],
+			allowFailure: false,
+			batchSize: 0,
+			blockNumber: options?.blockNumber
+		});
+	} catch (cause) {
+		const error = require_preview_simulate_errors.asPreviewSimulationError(cause, "multicall");
+		options?.logger?.error(error, "pool operation simulation failed");
+		return require_model_result.sdkErr(error);
+	}
+	const sim = require_preview_simulate_simulatePoolOperation.amountsInOut(operation, previewAmount);
+	const inflow = operation.operation === "Deposit" || operation.operation === "Mint";
+	const after = shares + (inflow ? sim.amountOut : -sim.amountIn);
 	return require_model_result.sdkOk({
 		operation: operation.operation,
 		pool: operation.pool,
 		name: sdk.tokensMeta.mustGetToken(operation.pool).name,
 		underlyingToken: market.underlyingToken,
-		shareRate: market.pool.pool.dieselRate,
+		shareRate: pool.dieselRate,
 		tokenIn: market.priceOracle.toTokenAmount(tokenIn, sim.amountIn),
-		tokenOut: market.priceOracle.toTokenAmount(tokenOut, sim.amountOut)
+		tokenOut: market.priceOracle.toTokenAmount(tokenOut, sim.amountOut),
+		curator: market.curator,
+		netValue: market.toUnderlyingAmount(pool.sharesToUnderlying(after > 0n ? after : 0n))
 	});
 }
 //#endregion

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

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_preview_simulate_errors = require("./errors.js");
-const require_preview_simulate_simulateFacadeOperation = require("./simulateFacadeOperation.js");
 const require_preview_simulate_simulatePoolOperation = require("./simulatePoolOperation.js");
+const require_preview_simulate_simulateFacadeOperation = require("./simulateFacadeOperation.js");
 const require_preview_simulate_simulateRWAOperation = require("./simulateRWAOperation.js");
 const require_preview_simulate_simulateOperation = require("./simulateOperation.js");
 exports.asPreviewSimulationError = require_preview_simulate_errors.asPreviewSimulationError;

package/dist/cjs/preview/simulate/simulateOperation.js

@@ -3,8 +3,8 @@ const require_model_result = require("../../model/result.js");
 require("../../model/index.js");
 const require_preview_parse_types = require("../parse/types.js");
 require("../parse/index.js");
-const require_preview_simulate_simulateFacadeOperation = require("./simulateFacadeOperation.js");
 const require_preview_simulate_simulatePoolOperation = require("./simulatePoolOperation.js");
+const require_preview_simulate_simulateFacadeOperation = require("./simulateFacadeOperation.js");
 const require_preview_simulate_simulateRWAOperation = require("./simulateRWAOperation.js");
 //#region src/preview/simulate/simulateOperation.ts
 /**

package/dist/cjs/preview/simulate/simulatePoolOperation.js

@@ -104,4 +104,6 @@ async function simulatePoolOperation(input, options = {}) {
 	}
 }
 //#endregion
+exports.amountsInOut = amountsInOut;
+exports.previewContract = previewContract;
 exports.simulatePoolOperation = simulatePoolOperation;

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

@@ -552,14 +552,13 @@ function routed(result, at) {
 * a screen can show.
 **/
 async function lpState(sdk, pool, wallet, simulation, moved) {
-	const after = await sdk.pools.getShareBalance({
-		pool,
-		wallet
-	}) + (moved.mints ?? -moved.burns);
+	const market = sdk.marketRegister.findByPool(pool);
+	const poolContract = market.pool.pool;
+	const after = await poolContract.getShareBalance(wallet) + (moved.mints ?? -moved.burns);
 	return {
 		...simulation,
-		curator: sdk.marketRegister.findByPool(pool).curator,
-		positionAfter: sdk.pools.sharesToUnderlying(pool, after > 0n ? after : 0n)
+		curator: market.curator,
+		netValue: market.toUnderlyingAmount(poolContract.sharesToUnderlying(after > 0n ? after : 0n))
 	};
 }
 /**

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);