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

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

@@ -8,6 +8,7 @@ require("./credit-account-compressor/index.js");
 const require_onchain_accounts_CreditAccountsServiceV310 = require("./CreditAccountsServiceV310.js");
 const require_onchain_accounts_intents_guards = require("./intents/guards.js");
 const require_onchain_accounts_intents_utils_credit_account_slice = require("./intents/utils/credit-account-slice.js");
+const require_onchain_accounts_quota_utils = require("./quota-utils.js");
 const require_onchain_accounts_intents_index = require("./intents/index.js");
 const require_onchain_accounts_liquidations_constants = require("./liquidations/constants.js");
 const require_onchain_accounts_liquidations_LiquidationsService = require("./liquidations/LiquidationsService.js");
@@ -45,6 +46,9 @@ exports.WithdrawalCompressorV310Contract = require_onchain_accounts_withdrawal_c
 exports.WithdrawalCompressorV311Contract = require_onchain_accounts_withdrawal_compressor_WithdrawalCompressorV311Contract.WithdrawalCompressorV311Contract;
 exports.WithdrawalCompressorV313Contract = require_onchain_accounts_withdrawal_compressor_WithdrawalCompressorV313Contract.WithdrawalCompressorV313Contract;
 exports.borrowable = require_onchain_accounts_intents_guards.borrowable;
+exports.calcDefaultQuota = require_onchain_accounts_quota_utils.calcDefaultQuota;
+exports.calcQuotaUpdate = require_onchain_accounts_quota_utils.calcQuotaUpdate;
+exports.calcRecommendedQuota = require_onchain_accounts_quota_utils.calcRecommendedQuota;
 exports.createRedemptionLogger = require_onchain_accounts_withdrawal_compressor_createRedemptionLogger.createRedemptionLogger;
 exports.createWithdrawalCompressor = require_onchain_accounts_withdrawal_compressor_createWithdrawalCompressor.createWithdrawalCompressor;
 exports.decodeDelayedIntent = require_onchain_accounts_withdrawal_compressor_intent_codec.decodeDelayedIntent;
@@ -52,6 +56,7 @@ exports.encodeDelayedIntent = require_onchain_accounts_withdrawal_compressor_int
 exports.fetchCreditAccountSlice = require_onchain_accounts_intents_utils_credit_account_slice.fetchCreditAccountSlice;
 exports.getWithdrawalCompressorAddress = require_onchain_accounts_withdrawal_compressor_addresses.getWithdrawalCompressorAddress;
 exports.iCreditAccountAbi = require_onchain_accounts_withdrawal_compressor_AbstractWithdrawalCompressorContract.iCreditAccountAbi;
+exports.roundUpQuota = require_onchain_accounts_quota_utils.roundUpQuota;
 exports.toClaimableWithdrawal = require_onchain_accounts_withdrawal_compressor_AbstractWithdrawalCompressorContract.toClaimableWithdrawal;
 exports.toCreditAccountSlice = require_onchain_accounts_intents_utils_credit_account_slice.toCreditAccountSlice;
 exports.toPendingWithdrawal = require_onchain_accounts_withdrawal_compressor_AbstractWithdrawalCompressorContract.toPendingWithdrawal;

package/dist/cjs/onchain/accounts/intents/maxWithdrawCollateral.js

@@ -31,7 +31,7 @@ function maxWithdrawCollateral(props) {
 	const underlying = market.pool.underlying;
 	const target = creditAccount.tokens.find((t) => require_onchain_accounts_intents_utils_common.eq(t.token, token));
 	if (!target || target.balance <= 10n) return 0n;
-	if (creditAccount.accountDebt === 0n) return target.balance;
+	if (creditAccount.totalDebt === 0n) return target.balance;
 	const masked = creditAccount.enabledTokensMask !== 0n;
 	const counts = (t) => t.balance > 10n && (!masked || (t.mask & creditAccount.enabledTokensMask) !== 0n);
 	/** What a holding backs, in the check's units: USD × PERCENTAGE_FACTOR. */
@@ -48,7 +48,7 @@ function maxWithdrawCollateral(props) {
 		if (require_onchain_accounts_intents_utils_common.eq(t.token, token) || !counts(t)) continue;
 		otherMoney += weigh(t);
 	}
-	const borrowed = usd(priceOracle, underlying, creditAccount.accountDebt);
+	const borrowed = usd(priceOracle, underlying, creditAccount.totalDebt);
 	if (borrowed === void 0 || borrowed <= 0n) return 0n;
 	const required = borrowed * targetHF;
 	if (required <= otherMoney) return target.balance;

package/dist/cjs/onchain/accounts/intents/open-strategy.js

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_onchain_market_math = require("../../market/math.js");
 const require_onchain_validation_refusal = require("../../validation/refusal.js");
 const require_onchain_accounts_intents_guards = require("./guards.js");
 const require_onchain_accounts_intents_math = require("./math.js");
@@ -38,7 +39,7 @@ async function previewOpenStrategy(props) {
 		underlying,
 		enabledTokensMask: 0n,
 		totalDebtUSD: 0n,
-		accountDebt: 0n,
+		totalDebt: 0n,
 		tokens: []
 	};
 	require_onchain_accounts_intents_math.assertDebtInBand(sdk, debt, suite.creditFacade, underlying);
@@ -88,6 +89,7 @@ async function previewOpenStrategy(props) {
 	const projectedPool = { availableLiquidityChange: -debt };
 	const metrics = {
 		healthFactor: sdk.positions.healthFactor(snapshot),
+		safeHealthFactor: sdk.positions.healthFactor(snapshot, { safePrices: true }),
 		borrowRate: sdk.positions.borrowRate(snapshot, projectedPool),
 		timeToLiquidation: sdk.positions.timeToLiquidation(snapshot, projectedPool),
 		liquidationPrice: sdk.positions.liquidationPrice(snapshot)
@@ -99,9 +101,10 @@ async function previewOpenStrategy(props) {
 		toUnderlying: (from, amount) => convert(from, underlying, amount)
 	});
 	return {
-		debt,
-		collateral: margin,
-		totalValue: margin + debt,
+		totalDebt: market.toUnderlyingAmount(debt),
+		netValue: market.toUnderlyingAmount(margin),
+		totalValue: market.toUnderlyingAmount(margin + debt),
+		leverage: require_onchain_market_math.calcPositionLeverage(margin + debt, debt),
 		priceImpact,
 		averageAssets: averageAssets.map(priced),
 		minAssets: minAssets.map(priced),

package/dist/cjs/onchain/accounts/intents/realize.js

@@ -36,7 +36,7 @@ async function realize(steps, props) {
 	const ledger = new require_onchain_accounts_intents_utils_ledger.OperationLedger({
 		initialAssets: creditAccount.tokens,
 		underlying,
-		debt: creditAccount.accountDebt,
+		debt: creditAccount.totalDebt,
 		convert: price
 	});
 	const operations = [];
@@ -272,7 +272,7 @@ async function realize(steps, props) {
 		totalDebt: debt,
 		totalValue
 	};
-	const projectedPool = { availableLiquidityChange: creditAccount.accountDebt - debt };
+	const projectedPool = { availableLiquidityChange: creditAccount.totalDebt - debt };
 	const metrics = {
 		healthFactor: sdk.positions.healthFactor(snapshot),
 		safeHealthFactor: paysOut ? sdk.positions.healthFactor(snapshot, { safePrices: true }) : void 0,
@@ -286,12 +286,16 @@ async function realize(steps, props) {
 		netValue: totalValue - debt,
 		toUnderlying: (from, amount) => price(from, underlying, amount)
 	});
+	const oracle = market.priceOracle;
 	const state = {
-		totalValue,
-		accountDebt: debt,
+		totalValue: market.toUnderlyingAmount(totalValue),
+		totalDebt: market.toUnderlyingAmount(debt),
 		leverage: require_onchain_market_math.calcPositionLeverage(totalValue, debt),
-		assets: assets.map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),
-		quotas: quotasAfter,
+		assets: assets.map((a) => oracle.toTokenAmount(a.token, a.balance)),
+		quotas: Object.values(quotasAfter).map((q) => ({
+			token: sdk.tokensMeta.mustGetToken(q.token),
+			...oracle.toAmount(underlying, q.balance)
+		})),
 		priceImpact,
 		...metrics
 	};

package/dist/cjs/onchain/accounts/intents/tail.js

@@ -103,15 +103,16 @@ function projectedClaimable(request, phantom, phantomAmount, claim) {
 */
 function sliceAfter(creditAccount, after) {
 	const masks = new Map(creditAccount.tokens.map((t) => [t.token.toLowerCase(), t.mask]));
+	const quotas = new Map(after.quotas.map((q) => [q.token.address.toLowerCase(), q.value]));
 	return {
 		...creditAccount,
-		accountDebt: after.accountDebt,
+		totalDebt: after.totalDebt.value,
 		tokens: after.assets.map((a) => {
 			const token = a.token.address.toLowerCase();
 			return {
 				token,
 				balance: a.value,
-				quota: after.quotas[token]?.balance ?? 0n,
+				quota: quotas.get(token) ?? 0n,
 				mask: masks.get(token) ?? 0n,
 				success: true
 			};

package/dist/cjs/onchain/accounts/intents/testing/market.js

@@ -142,7 +142,7 @@ function buildFixtureCreditAccount(args) {
 		underlying: UND,
 		enabledTokensMask: 0n,
 		totalDebtUSD: 0n,
-		accountDebt: args.accountDebt,
+		totalDebt: args.totalDebt,
 		tokens: args.tokens
 	};
 }

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

@@ -144,13 +144,30 @@ function buildMockSdk(args) {
 		return price;
 	};
 	const poolPaused = args.poolPaused ?? false;
+	/** {@inheritDoc MarketSuite.toUnderlyingAmount} */
+	const toUnderlyingAmount = (value) => {
+		const usd = safeUsd(args.underlying, value);
+		return {
+			token: tokenOf(args.rwaAssets?.[args.underlying.toLowerCase()] ?? args.underlying),
+			value,
+			valueUsd: usd === null ? null : require_onchain_market_math.usdToNumber(usd)
+		};
+	};
 	const market = {
+		toUnderlyingAmount,
 		priceOracle: {
 			convert,
 			safeConvert,
 			mainPrice: mainPriceOf,
 			reservePrice: reservePriceOf,
 			convertToUSD: _convertToUSD,
+			toAmount: (token, value) => {
+				const usd = safeUsd(token, value);
+				return {
+					value,
+					valueUsd: usd === null ? null : require_onchain_market_math.usdToNumber(usd)
+				};
+			},
 			toTokenAmount: (token, value) => {
 				const usd = safeUsd(token, value);
 				return {
@@ -349,7 +366,7 @@ function payloadOf(slice) {
 		owner: slice.creditAccount,
 		expirationDate: 0,
 		enabledTokensMask: slice.enabledTokensMask,
-		debt: slice.accountDebt,
+		debt: slice.totalDebt,
 		accruedInterest: 0n,
 		accruedFees: 0n,
 		totalDebtUSD: slice.totalDebtUSD,

package/dist/cjs/onchain/accounts/intents/tests/add-collateral.fixtures.js

@@ -32,7 +32,7 @@ const case_position_token = {
 		amount: ADD_ANY
 	},
 	tokens: [require_market.caToken(require_market.UND, BASE_UND)],
-	accountDebt: DEBT,
+	totalDebt: DEBT,
 	totalValue: BASE_UND + require_market.valueInUnd(ADD_ANY, require_market.ANY),
 	ops: [{
 		type: "addCollateral",
@@ -57,7 +57,7 @@ const case_underlying = {
 		amount: ADD_UND
 	},
 	tokens: [require_market.caToken(require_market.ANY, ADD_ANY, QUOTA_ANY)],
-	accountDebt: DEBT,
+	totalDebt: DEBT,
 	totalValue: require_market.valueInUnd(ADD_ANY, require_market.ANY) + ADD_UND,
 	ops: [{
 		type: "addCollateral",
@@ -74,7 +74,7 @@ const case_rwa_asset = {
 		amount: ADD_RWA
 	},
 	tokens: [require_market.caToken(require_market.UND, BASE_UND)],
-	accountDebt: DEBT,
+	totalDebt: DEBT,
 	totalValue: BASE_UND + require_market.valueInUnd(ADD_RWA, require_market.RWA_ASSET),
 	ops: [{
 		type: "addCollateral",
@@ -99,7 +99,7 @@ function buildAddCollateralProps(c, sdk) {
 	return {
 		intent: c.intent,
 		creditAccount: require_market.buildFixtureCreditAccount({
-			accountDebt: c.accountDebt,
+			totalDebt: c.totalDebt,
 			tokens: c.tokens
 		}),
 		sdk,

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

@@ -37,9 +37,9 @@ const case_increase = {
 		token: require_market.POS
 	},
 	tokens: [require_market.caToken(require_market.POS, TVL_2X, QUOTA_1000)],
-	accountDebt: DEBT_2X,
+	totalDebt: DEBT_2X,
 	totalValue: TVL_3X,
-	accountDebtAfter: DEBT_3X,
+	totalDebtAfter: DEBT_3X,
 	ops: [
 		{
 			type: "increaseDebt",
@@ -73,9 +73,9 @@ const case_increase_underlying = {
 		token: require_market.UND
 	},
 	tokens: [require_market.caToken(require_market.UND, TVL_2X)],
-	accountDebt: DEBT_2X,
+	totalDebt: DEBT_2X,
 	totalValue: TVL_3X,
-	accountDebtAfter: DEBT_3X,
+	totalDebtAfter: DEBT_3X,
 	ops: [{
 		type: "increaseDebt",
 		amount: STEP
@@ -89,9 +89,9 @@ const case_increase_rwa = {
 		token: require_market.RWA_ASSET
 	},
 	tokens: [require_market.caToken(require_market.RWA_ASSET, TVL_2X, QUOTA_1000)],
-	accountDebt: DEBT_2X,
+	totalDebt: DEBT_2X,
 	totalValue: TVL_3X,
-	accountDebtAfter: DEBT_3X,
+	totalDebtAfter: DEBT_3X,
 	ops: [
 		{
 			type: "increaseDebt",
@@ -124,9 +124,9 @@ const case_decrease = {
 		token: require_market.POS
 	},
 	tokens: [require_market.caToken(require_market.POS, TVL_3X, QUOTA_1500)],
-	accountDebt: DEBT_3X,
+	totalDebt: DEBT_3X,
 	totalValue: TVL_2X,
-	accountDebtAfter: DEBT_2X,
+	totalDebtAfter: DEBT_2X,
 	ops: [
 		{
 			type: "swap",
@@ -160,9 +160,9 @@ const case_decrease_from_idle_underlying = {
 		token: require_market.POS
 	},
 	tokens: [require_market.caToken(require_market.POS, TVL_2X, QUOTA_1000), require_market.caToken(require_market.UND, STEP)],
-	accountDebt: DEBT_3X,
+	totalDebt: DEBT_3X,
 	totalValue: TVL_2X,
-	accountDebtAfter: DEBT_2X,
+	totalDebtAfter: DEBT_2X,
 	ops: [{
 		type: "decreaseDebt",
 		amount: STEP
@@ -176,9 +176,9 @@ const case_decrease_rwa = {
 		token: require_market.RWA_ASSET
 	},
 	tokens: [require_market.caToken(require_market.RWA_ASSET, TVL_3X, QUOTA_1500)],
-	accountDebt: DEBT_3X,
+	totalDebt: DEBT_3X,
 	totalValue: TVL_2X,
-	accountDebtAfter: DEBT_2X,
+	totalDebtAfter: DEBT_2X,
 	ops: [
 		{
 			type: "wrapRwaCollateral",
@@ -211,9 +211,9 @@ const case_noop = {
 		token: require_market.POS
 	},
 	tokens: [require_market.caToken(require_market.POS, TVL_2X, QUOTA_1000)],
-	accountDebt: DEBT_2X,
+	totalDebt: DEBT_2X,
 	totalValue: TVL_2X,
-	accountDebtAfter: DEBT_2X,
+	totalDebtAfter: DEBT_2X,
 	ops: []
 };
 function buildAdjustLeverageSdk(c) {
@@ -223,7 +223,7 @@ function buildAdjustLeverageProps(c, sdk) {
 	return {
 		intent: c.intent,
 		creditAccount: require_market.buildFixtureCreditAccount({
-			accountDebt: c.accountDebt,
+			totalDebt: c.totalDebt,
 			tokens: c.tokens
 		}),
 		sdk,

package/dist/cjs/onchain/accounts/intents/tests/deposit.fixtures.js

@@ -32,9 +32,9 @@ const case_fixed_leverage = {
 		positionToken: require_market.POS
 	},
 	tokens: [require_market.caToken(require_market.POS, P1000, QUOTA_1000)],
-	accountDebt: DEBT_START,
+	totalDebt: DEBT_START,
 	totalValue: P2000,
-	accountDebtAfter: P1000,
+	totalDebtAfter: P1000,
 	ops: [
 		{
 			type: "addCollateral",
@@ -76,9 +76,9 @@ const case_target_leverage = {
 		targetLeverage: LEV_3X
 	},
 	tokens: [require_market.caToken(require_market.POS, P1000, QUOTA_1000)],
-	accountDebt: DEBT_START,
+	totalDebt: DEBT_START,
 	totalValue: P3000,
-	accountDebtAfter: P2000,
+	totalDebtAfter: P2000,
 	ops: [
 		{
 			type: "addCollateral",
@@ -119,9 +119,9 @@ const case_position_is_underlying = {
 		positionToken: require_market.UND
 	},
 	tokens: [require_market.caToken(require_market.UND, P1000)],
-	accountDebt: DEBT_START,
+	totalDebt: DEBT_START,
 	totalValue: P2000,
-	accountDebtAfter: P1000,
+	totalDebtAfter: P1000,
 	ops: [{
 		type: "addCollateral",
 		token: require_market.UND,
@@ -141,9 +141,9 @@ const case_rwa_collateral = {
 		positionToken: require_market.POS
 	},
 	tokens: [require_market.caToken(require_market.POS, P1000, QUOTA_1000)],
-	accountDebt: DEBT_START,
+	totalDebt: DEBT_START,
 	totalValue: P2000,
-	accountDebtAfter: P1000,
+	totalDebtAfter: P1000,
 	ops: [
 		{
 			type: "addCollateral",
@@ -195,9 +195,9 @@ const case_rwa_position = {
 		positionToken: require_market.RWA_ASSET
 	},
 	tokens: [require_market.caToken(require_market.RWA_ASSET, P1000, QUOTA_1000)],
-	accountDebt: DEBT_START,
+	totalDebt: DEBT_START,
 	totalValue: P2000,
-	accountDebtAfter: P1000,
+	totalDebtAfter: P1000,
 	ops: [
 		{
 			type: "addCollateral",
@@ -250,9 +250,9 @@ const case_native_coin = {
 		value: NATIVE_VALUE
 	},
 	tokens: [require_market.caToken(require_market.POS, M32_BALANCE, quotaOf(M32_BALANCE))],
-	accountDebt: M32_DEBT,
+	totalDebt: M32_DEBT,
 	totalValue: 1500000000n,
-	accountDebtAfter: 1200000000n,
+	totalDebtAfter: 1200000000n,
 	ops: [
 		{
 			type: "addCollateral",
@@ -294,7 +294,7 @@ function buildDepositProps(c, sdk) {
 	return {
 		intent: c.intent,
 		creditAccount: require_market.buildFixtureCreditAccount({
-			accountDebt: c.accountDebt,
+			totalDebt: c.totalDebt,
 			tokens: c.tokens
 		}),
 		sdk,

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

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

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

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

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

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

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

@@ -27,9 +27,9 @@ const QUOTA_AFTER = quotaOf(TVL_AFTER);
 /** Quota ops carry signed deltas. */
 const QUOTA_DELTA = QUOTA_AFTER - QUOTA_BEFORE;
 const base = {
-	accountDebt: DEBT_BEFORE,
+	totalDebt: DEBT_BEFORE,
 	totalValue: TVL_AFTER,
-	accountDebtAfter: DEBT_AFTER
+	totalDebtAfter: DEBT_AFTER
 };
 /** Row 1 — S = U, T = U: repay, then hand over the underlying. */
 const case_und_und = {
@@ -291,9 +291,9 @@ const case_matrix_4_1 = {
 		sourceToken: require_market.POS
 	},
 	tokens: [require_market.caToken(require_market.POS, M4_BALANCE, quotaOf(M4_BALANCE))],
-	accountDebt: M4_DEBT,
+	totalDebt: M4_DEBT,
 	totalValue: M4_SPEND,
-	accountDebtAfter: M4_DD,
+	totalDebtAfter: M4_DD,
 	ops: [
 		{
 			type: "swap",
@@ -342,9 +342,9 @@ const case_matrix_4_2 = {
 		sourceToken: require_market.POS
 	},
 	tokens: [require_market.caToken(require_market.POS, M4_BALANCE, quotaOf(M4_BALANCE))],
-	accountDebt: M4_DEBT,
+	totalDebt: M4_DEBT,
 	totalValue: M4_SPEND,
-	accountDebtAfter: M4_DD,
+	totalDebtAfter: M4_DD,
 	ops: [
 		{
 			type: "swap",
@@ -391,7 +391,7 @@ function buildWithdrawProps(c, sdk) {
 	return {
 		intent: c.intent,
 		creditAccount: require_market.buildFixtureCreditAccount({
-			accountDebt: c.accountDebt,
+			totalDebt: c.totalDebt,
 			tokens: c.tokens
 		}),
 		sdk,

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

@@ -2,8 +2,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 //#region src/onchain/accounts/intents/utils/adjust-state-to-snapshot.ts
 /**
 * Maps an intents {@link OperationState} onto the {@link AccountSnapshot} that
-* position-metric functions take. `accountDebt` is treated as total debt
-* (principal plus accrued interest and fees).
+* position-metric functions take: the state prices what it reports, a snapshot
+* only names it.
 **/
 function adjustStateToSnapshot(creditManager, state) {
 	return {
@@ -12,9 +12,12 @@ function adjustStateToSnapshot(creditManager, state) {
 			token: a.token.address,
 			balance: a.value
 		})),
-		quotas: Object.values(state.quotas),
-		totalDebt: state.accountDebt,
-		totalValue: state.totalValue
+		quotas: state.quotas.map((q) => ({
+			token: q.token.address,
+			balance: q.value
+		})),
+		totalDebt: state.totalDebt.value,
+		totalValue: state.totalValue.value
 	};
 }
 //#endregion

package/dist/cjs/onchain/accounts/intents/utils/common.js

@@ -15,7 +15,7 @@ function toTargetDecimals(fromAmount, fromToken, toToken, sdk) {
 * with balance from the projection (0n when absent), new tokens get quota 0n.
 */
 function toRouterCaSlice(creditAccount, expectedBalances = []) {
-	const { accountDebt, underlying, creditFacade, creditManager, creditAccount: creditAccountAddress, tokens: _, ...restCA } = creditAccount;
+	const { totalDebt, underlying, creditFacade, creditManager, creditAccount: creditAccountAddress, tokens: _, ...restCA } = creditAccount;
 	const expected = new require_onchain_utils_AddressMap.AddressMap([]);
 	for (const asset of expectedBalances ?? []) expected.upsert(asset.token, (expected.get(asset.token) ?? 0n) + asset.balance);
 	const tokens = creditAccount.tokens.map((t) => {
@@ -33,7 +33,7 @@ function toRouterCaSlice(creditAccount, expectedBalances = []) {
 		creditAccount: creditAccountAddress.toLowerCase(),
 		creditFacade: creditFacade.toLowerCase(),
 		creditManager: creditManager.toLowerCase(),
-		debt: creditAccount.accountDebt,
+		debt: creditAccount.totalDebt,
 		tokens
 	};
 }

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

@@ -4,9 +4,9 @@ const require_onchain_accounts_intents_utils_borrowed_amount_plus_interest_and_f
 /**
 * Narrows full account data down to the slice the intent engine operates on.
 *
-* `accountDebt` is the total repayable debt (principal + accrued interest +
-* accrued fees) rather than the principal, because every debt-touching intent
-* settles the full outstanding amount.
+* `totalDebt` is the total repayable debt (principal + accrued interest +
+* accrued fees) rather than `CreditAccountData.debt`'s principal, because every
+* debt-touching intent settles the full outstanding amount.
 *
 * Addresses are lowercased so that `eq` comparisons and `AddressMap` lookups
 * behave consistently everywhere downstream.
@@ -19,7 +19,7 @@ function toCreditAccountSlice(ca) {
 		underlying: ca.underlying.toLowerCase(),
 		enabledTokensMask: ca.enabledTokensMask,
 		totalDebtUSD: ca.totalDebtUSD,
-		accountDebt: require_onchain_accounts_intents_utils_borrowed_amount_plus_interest_and_fees.calcBorrowedAmountPlusInterestAndFees(ca),
+		totalDebt: require_onchain_accounts_intents_utils_borrowed_amount_plus_interest_and_fees.calcBorrowedAmountPlusInterestAndFees(ca),
 		tokens: ca.tokens.map((t) => ({
 			...t,
 			token: t.token.toLowerCase()

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

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_constants_math = require("../../../constants/math.js");
 const require_onchain_utils_mappers = require("../../../utils/mappers.js");
-const require_common_utils_utils_creditAccount_quota_utils = require("../../../../common-utils/utils/creditAccount/quota-utils.js");
+const require_onchain_accounts_quota_utils = require("../../quota-utils.js");
 //#region src/onchain/accounts/intents/utils/quotas-for-update.ts
 function getQuotasForUpdate({ assetsBefore, assetsAfter, initialQuotas, quotaReserve = 0, liquidationThresholds: liquidationThresholdsMap, quotas: quotasMap, maxDebt, underlyingToken, convert }) {
 	const underlyingTokenLc = underlyingToken.toLowerCase();
@@ -40,7 +40,7 @@ function getQuotasForUpdate({ assetsBefore, assetsAfter, initialQuotas, quotaRes
 			amountInTarget: convert(a.token, underlyingTokenLc, a.balance)
 		};
 	});
-	const quotaResult = require_common_utils_utils_creditAccount_quota_utils.calcQuotaUpdate({
+	const quotaResult = require_onchain_accounts_quota_utils.calcQuotaUpdate({
 		quotas,
 		initialQuotas: initialQuotasRecord,
 		assetsAfterUpdate: constructAssetRecord(assetsWithAmountInTarget),

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

@@ -20,8 +20,8 @@ function accountView(creditAccount, sdk) {
 		underlying,
 		sdk,
 		rwaAsset: sdk.tokensMeta.rwaUnderlyings.get(underlying)?.asset,
-		debt: creditAccount.accountDebt,
-		collateral: totalValue - creditAccount.accountDebt,
+		debt: creditAccount.totalDebt,
+		collateral: totalValue - creditAccount.totalDebt,
 		band: {
 			minDebt: creditFacade.minDebt,
 			maxDebt: creditFacade.maxDebt

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

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_onchain_utils_bigint_math = require("../../../onchain/utils/bigint-math.js");
-const require_onchain_constants_math = require("../../../onchain/constants/math.js");
-//#region src/common-utils/utils/creditAccount/quota-utils.ts
+const require_onchain_utils_bigint_math = require("../utils/bigint-math.js");
+const require_onchain_constants_math = require("../constants/math.js");
+//#region src/onchain/accounts/quota-utils.ts
 /**
 * Rounds quota deltas to protocol precision step (`PERCENTAGE_FACTOR`).
 *