@gearbox-protocol/sdk 16.0.0-next.21 → 16.0.0-next.23

package/dist/cjs/onchain/index.js

@@ -27,6 +27,7 @@ const require_onchain_utils_formatter = require("./utils/formatter.js");
 const require_onchain_utils_hex = require("./utils/hex.js");
 const require_onchain_utils_retry = require("./utils/retry.js");
 const require_onchain_utils_toAddress = require("./utils/toAddress.js");
+const require_onchain_utils_trace = require("./utils/trace.js");
 const require_onchain_utils_zod = require("./utils/zod.js");
 require("./utils/index.js");
 const require_onchain_utils_viem_cast = require("./utils/viem/cast.js");
@@ -198,6 +199,7 @@ const require_onchain_validation_refusal = require("./validation/refusal.js");
 const require_onchain_validation_token = require("./validation/token.js");
 const require_onchain_accounts_intents_guards = require("./accounts/intents/guards.js");
 const require_onchain_accounts_intents_utils_credit_account_slice = require("./accounts/intents/utils/credit-account-slice.js");
+const require_onchain_accounts_quota_utils = require("./accounts/quota-utils.js");
 const require_onchain_accounts_intents_index = require("./accounts/intents/index.js");
 const require_onchain_accounts_liquidations_constants = require("./accounts/liquidations/constants.js");
 const require_onchain_accounts_liquidations_LiquidationsService = require("./accounts/liquidations/LiquidationsService.js");
@@ -333,6 +335,7 @@ exports.DUST_THRESHOLD = require_onchain_constants_math.DUST_THRESHOLD;
 exports.DaiUsdsAdapterContract = require_onchain_market_adapters_contracts_DaiUsdsAdapterContract.DaiUsdsAdapterContract;
 exports.ERC4626AdapterContract = require_onchain_market_adapters_contracts_ERC4626AdapterContract.ERC4626AdapterContract;
 exports.ERC4626ReferralAdapterContract = require_onchain_market_adapters_contracts_ERC4626ReferralAdapterContract.ERC4626ReferralAdapterContract;
+exports.EXECUTE_BYTES_SELECTOR = require_onchain_utils_trace.EXECUTE_BYTES_SELECTOR;
 exports.Erc4626PriceFeedContract = require_onchain_market_pricefeeds_Erc4626PriceFeed.Erc4626PriceFeedContract;
 exports.ExternalPriceFeedContract = require_onchain_market_pricefeeds_ExternalPriceFeed.ExternalPriceFeedContract;
 exports.FluidDexAdapterContract = require_onchain_market_adapters_contracts_FluidDexAdapterContract.FluidDexAdapterContract;
@@ -484,6 +487,7 @@ exports.bpsToRay = require_onchain_market_math.bpsToRay;
 exports.bytes32ToString = require_onchain_utils_bytes32ToString.bytes32ToString;
 exports.calcBorrowApy = require_onchain_market_math.calcBorrowApy;
 exports.calcBorrowRate = require_onchain_positions_calcBorrowRate.calcBorrowRate;
+exports.calcDefaultQuota = require_onchain_accounts_quota_utils.calcDefaultQuota;
 exports.calcEffectiveBorrowApy = require_onchain_market_math.calcEffectiveBorrowApy;
 exports.calcHealthFactor = require_onchain_positions_calcHealthFactor.calcHealthFactor;
 exports.calcLiquidationPrice = require_onchain_positions_calcLiquidationPrice.calcLiquidationPrice;
@@ -492,6 +496,8 @@ exports.calcMaxLeverage = require_onchain_market_math.calcMaxLeverage;
 exports.calcNetStrategyApy = require_onchain_market_math.calcNetStrategyApy;
 exports.calcPositionLeverage = require_onchain_market_math.calcPositionLeverage;
 exports.calcQuotaRate = require_onchain_market_math.calcQuotaRate;
+exports.calcQuotaUpdate = require_onchain_accounts_quota_utils.calcQuotaUpdate;
+exports.calcRecommendedQuota = require_onchain_accounts_quota_utils.calcRecommendedQuota;
 exports.calcTimeToLiquidationMs = require_onchain_positions_calcTimeToLiquidationMs.calcTimeToLiquidationMs;
 exports.calcUtilization = require_onchain_market_math.calcUtilization;
 exports.calcUtilizationRaw = require_onchain_market_math.calcUtilizationRaw;
@@ -512,6 +518,7 @@ exports.checkQuotaCount = require_onchain_validation_checks.checkQuotaCount;
 exports.checkQuotaLimit = require_onchain_validation_checks.checkQuotaLimit;
 exports.childLogger = require_onchain_utils_childLogger.childLogger;
 exports.classifyCurveOperation = require_onchain_market_adapters_transferHelpers.classifyCurveOperation;
+exports.collectTraces = require_onchain_utils_trace.collectTraces;
 exports.createAdapter = require_onchain_market_adapters_createAdapter.createAdapter;
 exports.createAddressProvider = require_onchain_core_createAddressProvider.createAddressProvider;
 exports.createPriceOracle = require_onchain_market_oracle_createPriceOracle.createPriceOracle;
@@ -538,7 +545,10 @@ exports.fetchCreditAccountSlice = require_onchain_accounts_intents_utils_credit_
 exports.fetchRedstonePayloads = require_onchain_market_pricefeeds_updates_fetchRedstonePayloads.fetchRedstonePayloads;
 exports.filterDust = require_onchain_utils_filterDust.filterDust;
 exports.filterDustUSD = require_onchain_utils_filterDust.filterDustUSD;
+exports.findCallTo = require_onchain_utils_trace.findCallTo;
+exports.findCallWithInput = require_onchain_utils_trace.findCallWithInput;
 exports.findCuratorMarketConfigurator = require_onchain_chain_chains.findCuratorMarketConfigurator;
+exports.findExecuteBytes = require_onchain_utils_trace.findExecuteBytes;
 exports.fmtBinaryMask = require_onchain_utils_formatter.fmtBinaryMask;
 exports.fnSigToName = require_onchain_market_adapters_transferHelpers.fnSigToName;
 exports.formatBN = require_onchain_utils_formatter.formatBN;
@@ -673,8 +683,10 @@ exports.raise = require_onchain_validation_refusal.raise;
 exports.rayToBps = require_onchain_market_math.rayToBps;
 exports.rayToNumber = require_onchain_utils_formatter.rayToNumber;
 exports.refuse = require_onchain_validation_refusal.refuse;
+exports.resolveProtocolCall = require_onchain_utils_trace.resolveProtocolCall;
 exports.retry = require_onchain_utils_retry.retry;
 exports.rewardsFromTransfers = require_onchain_market_adapters_transferHelpers.rewardsFromTransfers;
+exports.roundUpQuota = require_onchain_accounts_quota_utils.roundUpQuota;
 exports.sendRawTx = require_onchain_utils_viem_sendRawTx.sendRawTx;
 exports.shortAddress = require_onchain_utils_formatter.shortAddress;
 exports.shortHash = require_onchain_utils_formatter.shortHash;

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

@@ -128,6 +128,21 @@ var MarketSuite = class extends require_onchain_base_SDKConstruct.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/cjs/onchain/market/adapters/contracts/AbstractAdapter.js

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_utils_abi_decode = require("../../../utils/abi-decode.js");
+const require_onchain_utils_trace = require("../../../utils/trace.js");
 require("../../../utils/index.js");
 const require_onchain_base_BaseContract = require("../../../base/BaseContract.js");
 const require_onchain_base_errors = require("../../../base/errors.js");
 require("../../../base/index.js");
-const require_common_utils_utils_trace = require("../../../../common-utils/utils/trace.js");
 const require_onchain_market_adapters_transferHelpers = require("../transferHelpers.js");
 let viem = require("viem");
 //#region src/onchain/market/adapters/contracts/AbstractAdapter.ts
@@ -65,7 +65,7 @@ var AbstractAdapterContract = class extends require_onchain_base_BaseContract.Ba
 	* @param strict When true, throws instead of returning `undefined`
 	*/
 	parseProtocolCall(trace, strict) {
-		const resolved = require_common_utils_utils_trace.resolveProtocolCall(trace);
+		const resolved = require_onchain_utils_trace.resolveProtocolCall(trace);
 		if (!resolved) {
 			if (strict) throw new Error("no external protocol call found in adapter trace");
 			return;

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

@@ -43,16 +43,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(require_onchain_constants_math.PRICE_DECIMALS);
+	return (usd < 0n ? -usd : usd) < USD_DUST_THRESHOLD ? 0 : Number(usd) / Number(require_onchain_constants_math.PRICE_DECIMALS);
 }
 /**
 * Share of capital currently borrowed, in basis points. Returns `0` when there

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

@@ -21,6 +21,14 @@ require("../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 require_onchain_base_SDKConstruct.SDKConstruct {
 	/**
 	* {@inheritDoc IPoolsService.getDepositTokensIn}
@@ -126,7 +134,9 @@ var PoolService = class extends require_onchain_base_SDKConstruct.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,
@@ -135,14 +145,8 @@ var PoolService = class extends require_onchain_base_SDKConstruct.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
 		};
 	}
@@ -151,7 +155,9 @@ var PoolService = class extends require_onchain_base_SDKConstruct.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,
@@ -160,16 +166,10 @@ var PoolService = class extends require_onchain_base_SDKConstruct.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)
 		};
 	}
 	/**
@@ -177,7 +177,9 @@ var PoolService = class extends require_onchain_base_SDKConstruct.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,
@@ -186,16 +188,10 @@ var PoolService = class extends require_onchain_base_SDKConstruct.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/cjs/onchain/utils/index.js

@@ -16,23 +16,29 @@ const require_onchain_utils_formatter = require("./formatter.js");
 const require_onchain_utils_hex = require("./hex.js");
 const require_onchain_utils_retry = require("./retry.js");
 const require_onchain_utils_toAddress = require("./toAddress.js");
+const require_onchain_utils_trace = require("./trace.js");
 require("./type-utils.js");
 const require_onchain_utils_zod = require("./zod.js");
 exports.AddressMap = require_onchain_utils_AddressMap.AddressMap;
 exports.AddressSet = require_onchain_utils_AddressSet.AddressSet;
 exports.AssetsMap = require_onchain_utils_AssetsMap.AssetsMap;
 exports.BigIntMath = require_onchain_utils_bigint_math.BigIntMath;
+exports.EXECUTE_BYTES_SELECTOR = require_onchain_utils_trace.EXECUTE_BYTES_SELECTOR;
 exports.TypedObjectUtils = require_onchain_utils_mappers.TypedObjectUtils;
 exports.ZodAddress = require_onchain_utils_zod.ZodAddress;
 exports.ZodBigInt = require_onchain_utils_zod.ZodBigInt;
 exports.ZodHex = require_onchain_utils_zod.ZodHex;
 exports.bytes32ToString = require_onchain_utils_bytes32ToString.bytes32ToString;
 exports.childLogger = require_onchain_utils_childLogger.childLogger;
+exports.collectTraces = require_onchain_utils_trace.collectTraces;
 exports.createRawTx = require_onchain_utils_createRawTx.createRawTx;
 exports.etherscanApiUrl = require_onchain_utils_etherscan.etherscanApiUrl;
 exports.etherscanUrl = require_onchain_utils_etherscan.etherscanUrl;
 exports.filterDust = require_onchain_utils_filterDust.filterDust;
 exports.filterDustUSD = require_onchain_utils_filterDust.filterDustUSD;
+exports.findCallTo = require_onchain_utils_trace.findCallTo;
+exports.findCallWithInput = require_onchain_utils_trace.findCallWithInput;
+exports.findExecuteBytes = require_onchain_utils_trace.findExecuteBytes;
 exports.fmtBinaryMask = require_onchain_utils_formatter.fmtBinaryMask;
 exports.formatBN = require_onchain_utils_formatter.formatBN;
 exports.formatBNvalue = require_onchain_utils_formatter.formatBNvalue;
@@ -51,6 +57,7 @@ exports.json_stringify = require_onchain_utils_json.json_stringify;
 exports.numberWithCommas = require_onchain_utils_formatter.numberWithCommas;
 exports.percentFmt = require_onchain_utils_formatter.percentFmt;
 exports.rayToNumber = require_onchain_utils_formatter.rayToNumber;
+exports.resolveProtocolCall = require_onchain_utils_trace.resolveProtocolCall;
 exports.retry = require_onchain_utils_retry.retry;
 exports.shortAddress = require_onchain_utils_formatter.shortAddress;
 exports.shortHash = require_onchain_utils_formatter.shortHash;

package/dist/cjs/{common-utils → onchain}/utils/trace.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 let viem = require("viem");
-//#region src/common-utils/utils/trace.ts
+//#region src/onchain/utils/trace.ts
 /**
 * Selector of `CreditManagerV3.execute(bytes)` (`0x09c5eabe`).
 *

package/dist/cjs/preview/index.js

@@ -57,7 +57,7 @@ exports.checkPrerequisites = require_preview_prerequisites_checkPrerequisites.ch
 exports.checkSimulation = require_preview_validate_checkSimulation.checkSimulation;
 exports.classifyCloseOrRepay = require_preview_preview_detectCloseOrRepay.classifyCloseOrRepay;
 exports.classifyInnerOperations = require_preview_parse_classifyInnerOperations.classifyInnerOperations;
-exports.collateralIssuesOf = require_preview_validate_checkOperation.collateralIssuesOf;
+exports.collateralIssue = require_preview_validate_checkOperation.collateralIssue;
 exports.detectDelayedClaim = require_preview_preview_detectDelayedClaim.detectDelayedClaim;
 exports.detectDelayedOperation = require_preview_preview_detectDelayedOperation.detectDelayedOperation;
 exports.extractAdapterCallTraces = require_preview_trace_extractAdapterCallTraces.extractAdapterCallTraces;
@@ -67,6 +67,7 @@ exports.isCloseOrRepay = require_preview_preview_detectCloseOrRepay.isCloseOrRep
 exports.isPoolOperation = require_preview_parse_types.isPoolOperation;
 exports.isRWAOperation = require_preview_parse_types.isRWAOperation;
 exports.makeReplayState = require_preview_preview_replayInnerOperations.makeReplayState;
+exports.marketIssues = require_preview_validate_checkOperation.marketIssues;
 exports.parseFacadeOperationCalldata = require_preview_parse_parseFacadeOperationCalldata.parseFacadeOperationCalldata;
 exports.parseOperationCalldata = require_preview_parse_parseOperationCalldata.parseOperationCalldata;
 exports.parsePoolOperationCalldata = require_preview_parse_parsePoolOperationCalldata.parsePoolOperationCalldata;
@@ -74,6 +75,7 @@ exports.parseRWAFactoryOperationCalldata = require_preview_parse_parseRWAFactory
 exports.previewAdjustCreditAccount = require_preview_preview_previewAdjustCreditAccount.previewAdjustCreditAccount;
 exports.previewCloseOrRepayCreditAccount = require_preview_preview_previewCloseOrRepayCreditAccount.previewCloseOrRepayCreditAccount;
 exports.previewOperation = require_preview_preview_previewOperation.previewOperation;
+exports.quotaCountIssue = require_preview_validate_checkOperation.quotaCountIssue;
 exports.raise = require_onchain_validation_refusal.raise;
 exports.refuse = require_onchain_validation_refusal.refuse;
 exports.replayInnerOperations = require_preview_preview_replayInnerOperations.replayInnerOperations;

package/dist/cjs/preview/preview/buildDelayedPreview.js

@@ -6,7 +6,6 @@ const require_onchain_market_math = require("../../onchain/market/math.js");
 const require_model_previews = require("../../model/previews.js");
 require("../../model/index.js");
 require("../../onchain/index.js");
-require("../../common-utils/index.js");
 let viem = require("viem");
 //#region src/preview/preview/buildDelayedPreview.ts
 /**
@@ -19,7 +18,7 @@ let viem = require("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
@@ -189,9 +188,9 @@ 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),
+		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/cjs/preview/preview/previewAdjustCreditAccount.js

@@ -46,9 +46,9 @@ 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),
+		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/cjs/preview/preview/previewCloseOrRepayCreditAccount.js

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

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

package/dist/cjs/preview/trace/extractAdapterCallTraces.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_common_utils_utils_trace = require("../../common-utils/utils/trace.js");
+const require_onchain_utils_trace = require("../../onchain/utils/trace.js");
 let viem = require("viem");
 //#region src/preview/trace/extractAdapterCallTraces.ts
 /**
@@ -67,7 +67,7 @@ function isSynthesizedPhantomWithdrawal(siblings, index) {
 */
 function extractAdapterCallTraces(facadeTrace) {
 	const subtraces = facadeTrace.calls ?? [];
-	return subtraces.filter((sub, index) => require_common_utils_utils_trace.resolveProtocolCall(sub) !== void 0 && !isSynthesizedPhantomWithdrawal(subtraces, index));
+	return subtraces.filter((sub, index) => require_onchain_utils_trace.resolveProtocolCall(sub) !== void 0 && !isSynthesizedPhantomWithdrawal(subtraces, index));
 }
 //#endregion
 exports.extractAdapterCallTraces = extractAdapterCallTraces;

package/dist/cjs/preview/trace/findFacadeCalls.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_abi_310_generated = require("../../abi/310/generated.js");
-const require_common_utils_utils_trace = require("../../common-utils/utils/trace.js");
+const require_onchain_utils_trace = require("../../onchain/utils/trace.js");
 const require_preview_trace_errors = require("./errors.js");
 let viem = require("viem");
 //#region src/preview/trace/findFacadeCalls.ts
@@ -33,7 +33,7 @@ function extractCreditAccount(operation, rawArgs, traceOutput) {
 * structured {@link FacadeParsedCall} entries for the given credit account.
 */
 function findFacadeCalls(trace, creditFacade, creditAccount, register, strict) {
-	const facadeTraces = require_common_utils_utils_trace.collectTraces(trace, creditFacade);
+	const facadeTraces = require_onchain_utils_trace.collectTraces(trace, creditFacade);
 	const results = [];
 	for (const trace of facadeTraces) {
 		const parsed = register.parseFunctionDataV2(creditFacade, trace.input, strict);

package/dist/cjs/preview/validate/checkOperation.js

@@ -31,7 +31,7 @@ function checkOperation(input, options = {}) {
 		case "RWAOpenCreditAccount":
 		case "AdjustCreditAccount": return creditIssues(sdk, preview, options);
 		case "CloseCreditAccount":
-		case "RepayCreditAccount": return marketIssues(sdk, preview.creditManager);
+		case "RepayCreditAccount": return marketIssues(sdk.marketRegister.findCreditManager(preview.creditManager));
 	}
 }
 function poolIssues(sdk, preview, options, isDeposit) {
@@ -50,8 +50,8 @@ function poolIssues(sdk, preview, options, isDeposit) {
 	})) || fundingIssue(options, [preview.tokenIn]);
 }
 /** What the market itself refuses, whatever the operation does. */
-function marketIssues(sdk, creditManager) {
-	const suite = sdk.marketRegister.findCreditManager(creditManager);
+function marketIssues(suite) {
+	const creditManager = suite.creditManager.address;
 	return require_onchain_validation_checks.checkCreditManagerPaused({
 		isPaused: suite.isPaused,
 		creditManager
@@ -66,29 +66,42 @@ function creditIssues(sdk, preview, options) {
 	const market = suite.market;
 	const underlying = require_onchain_validation_token.toToken(sdk, market.pool.underlying);
 	const isOpening = preview.operation === "OpenCreditAccount" || preview.operation === "RWAOpenCreditAccount";
-	return marketIssues(sdk, preview.creditManager) || require_onchain_validation_checks.checkDebtInBand({
-		debt: preview.debt,
+	return marketIssues(suite) || require_onchain_validation_checks.checkDebtInBand({
+		debt: preview.totalDebt.value,
 		minDebt: suite.creditFacade.minDebt,
 		maxDebt: suite.creditFacade.maxDebt,
 		underlying,
 		allowZero: !isOpening
-	}) || borrowIssue(suite, preview, underlying) || forbiddenIssue(suite, preview) || require_onchain_validation_checks.checkQuotaCount({
-		count: preview.quotas.filter((q) => q.value > 0n).length,
+	}) || borrowIssue(suite, preview, underlying) || forbiddenIssue(suite, preview) || quotaCountIssue(suite, preview) || quotaIssue(market, preview, underlying) || collateralIssue(preview, options) || fundingIssue(options, preview.collateralAdded);
+}
+/**
+* A bar that reads nothing but the projected account, so a parsed transaction
+* and a simulated one are held to it by the same code.
+*
+* These stay separate functions rather than one block because the order the
+* checks run in is the answer: `checkOperation` interleaves the checks that
+* need an operation's *delta* between them, and the caller acts on the first
+* issue reported.
+*/
+function quotaCountIssue(suite, projection) {
+	return require_onchain_validation_checks.checkQuotaCount({
+		count: projection.quotas.filter((q) => q.value > 0n).length,
 		max: suite.creditManager.maxEnabledTokens
-	}) || quotaIssue(market, preview, underlying) || (preview.debt === 0n ? null : collateralIssue(preview, options)) || fundingIssue(options, collateralOf(preview));
+	});
 }
 /**
 * What the transaction draws, against what the market can lend right now.
 *
 * Only a draw is weighed: repaying, or leaving the debt alone, can never exceed
-* a ceiling. Opening borrows the whole debt; adjusting borrows `debtChange`.
+* a ceiling. Opening borrows the whole debt; adjusting borrows
+* `totalDebtChange`.
 *
 * The engine holds every simulation to this already (`assertCanBorrow`), so
 * this is here for the transactions it never saw — a pasted calldata reaches
 * the confirm screen with nothing else standing between it and a revert.
 */
 function borrowIssue(suite, preview, underlying) {
-	const drawn = preview.operation === "AdjustCreditAccount" ? preview.debtChange : preview.debt;
+	const drawn = preview.operation === "AdjustCreditAccount" ? preview.totalDebtChange.value : preview.totalDebt.value;
 	if (drawn <= 0n) return null;
 	const { limit, binding } = require_onchain_accounts_intents_guards.borrowable(suite);
 	return require_onchain_validation_checks.checkBorrowLimit({
@@ -98,12 +111,27 @@ function borrowIssue(suite, preview, underlying) {
 		underlying
 	});
 }
-/** The account against whichever bars the caller holds it to. */
-function collateralIssue(preview, options) {
-	return collateralIssuesOf({
-		healthFactor: preview.healthFactor,
-		safeHealthFactor: preview.safeHealthFactor
-	}, options);
+/**
+* The account against whichever bars the caller holds it to.
+*
+* A loan-free account is nothing to weigh: the health factor reports its
+* zero-debt sentinel and no bar applies.
+*
+* {@inheritDoc quotaCountIssue}
+*/
+function collateralIssue(projection, options) {
+	const { minHealthFactor, minSafeHealthFactor, currentHealthFactor } = options;
+	if (projection.totalDebt.value === 0n) return null;
+	return (minHealthFactor === void 0 ? null : require_onchain_validation_checks.checkCollateralised({
+		healthFactor: projection.healthFactor,
+		required: minHealthFactor,
+		safePrices: false,
+		improvesFrom: currentHealthFactor
+	})) || (minSafeHealthFactor === void 0 || projection.safeHealthFactor === void 0 ? null : require_onchain_validation_checks.checkCollateralised({
+		healthFactor: projection.safeHealthFactor,
+		required: minSafeHealthFactor,
+		safePrices: true
+	}));
 }
 /** The wallet's side of the operation, against the balances it was given. */
 function fundingIssue(options, puts) {
@@ -119,12 +147,6 @@ function fundingIssue(options, puts) {
 	}
 	return null;
 }
-/** What the wallet puts in, which is what its balances have to cover. */
-function collateralOf(preview) {
-	if ("collateral" in preview) return preview.collateral;
-	if ("collateralAdded" in preview) return preview.collateralAdded;
-	return [];
-}
 function forbiddenIssue(suite, preview) {
 	const obtained = preview.operation === "AdjustCreditAccount" ? preview.assetsChange : preview.assets;
 	const forbidden = suite.forbiddenTokens;
@@ -154,20 +176,8 @@ function quotaIssue(market, preview, underlying) {
 	}
 	return null;
 }
-/** The two collateral bars, shared by the preview and the simulation paths. */
-function collateralIssuesOf(factors, options) {
-	const { minHealthFactor, minSafeHealthFactor, currentHealthFactor } = options;
-	return (minHealthFactor === void 0 ? null : require_onchain_validation_checks.checkCollateralised({
-		healthFactor: factors.healthFactor,
-		required: minHealthFactor,
-		safePrices: false,
-		improvesFrom: currentHealthFactor
-	})) || (minSafeHealthFactor === void 0 || factors.safeHealthFactor === void 0 ? null : require_onchain_validation_checks.checkCollateralised({
-		healthFactor: factors.safeHealthFactor,
-		required: minSafeHealthFactor,
-		safePrices: true
-	}));
-}
 //#endregion
 exports.checkOperation = checkOperation;
-exports.collateralIssuesOf = collateralIssuesOf;
+exports.collateralIssue = collateralIssue;
+exports.marketIssues = marketIssues;
+exports.quotaCountIssue = quotaCountIssue;

package/dist/cjs/preview/validate/checkSimulation.js

@@ -27,26 +27,13 @@ const require_preview_validate_checkOperation = require("./checkOperation.js");
 function checkSimulation(input, options = {}) {
 	const { sdk, state, creditManager } = input;
 	const suite = sdk.marketRegister.findCreditManager(creditManager);
-	return require_onchain_validation_checks.checkCreditManagerPaused({
-		isPaused: suite.isPaused,
-		creditManager
-	}) || require_onchain_validation_checks.checkMarketExpired({
-		isExpired: suite.isExpired,
-		creditManager,
-		expirationDate: suite.creditFacade.expirationDate
-	}) || require_onchain_validation_checks.checkDebtInBand({
-		debt: state.accountDebt,
+	return require_preview_validate_checkOperation.marketIssues(suite) || require_onchain_validation_checks.checkDebtInBand({
+		debt: state.totalDebt.value,
 		minDebt: suite.creditFacade.minDebt,
 		maxDebt: suite.creditFacade.maxDebt,
 		underlying: require_onchain_validation_token.toToken(sdk, suite.market.pool.underlying),
 		allowZero: true
-	}) || require_onchain_validation_checks.checkQuotaCount({
-		count: Object.values(state.quotas).filter((q) => q.balance > 0n).length,
-		max: suite.creditManager.maxEnabledTokens
-	}) || (state.accountDebt === 0n ? null : require_preview_validate_checkOperation.collateralIssuesOf({
-		healthFactor: state.healthFactor,
-		safeHealthFactor: state.safeHealthFactor
-	}, options));
+	}) || require_preview_validate_checkOperation.quotaCountIssue(suite, state) || require_preview_validate_checkOperation.collateralIssue(state, options);
 }
 //#endregion
 exports.checkSimulation = checkSimulation;

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

@@ -3,4 +3,6 @@ const require_preview_validate_checkOperation = require("./checkOperation.js");
 const require_preview_validate_checkSimulation = require("./checkSimulation.js");
 exports.checkOperation = require_preview_validate_checkOperation.checkOperation;
 exports.checkSimulation = require_preview_validate_checkSimulation.checkSimulation;
-exports.collateralIssuesOf = require_preview_validate_checkOperation.collateralIssuesOf;
+exports.collateralIssue = require_preview_validate_checkOperation.collateralIssue;
+exports.marketIssues = require_preview_validate_checkOperation.marketIssues;
+exports.quotaCountIssue = require_preview_validate_checkOperation.quotaCountIssue;

package/dist/cjs/rewards/rewards/api.js

@@ -3,7 +3,6 @@ const require_onchain_utils_AddressMap = require("../../onchain/utils/AddressMap
 const require_onchain_utils_bigint_math = require("../../onchain/utils/bigint-math.js");
 const require_onchain_utils_formatter = require("../../onchain/utils/formatter.js");
 require("../../onchain/index.js");
-require("../../common-utils/index.js");
 const require_rewards_rewards_merkl_api = require("./merkl-api.js");
 let viem = require("viem");
 //#region src/rewards/rewards/api.ts

package/dist/cjs/rewards/rewards/extra-apy.js

@@ -5,7 +5,6 @@ const require_onchain_chain_chains = require("../../onchain/chain/chains.js");
 const require_onchain_constants_math = require("../../onchain/constants/math.js");
 const require_onchain_utils_formatter = require("../../onchain/utils/formatter.js");
 require("../../onchain/index.js");
-require("../../common-utils/index.js");
 let axios = require("axios");
 axios = require_runtime.__toESM(axios);
 //#region src/rewards/rewards/extra-apy.ts