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

package/dist/cjs/sdk/execute/ExecuteApi.js

@@ -25,21 +25,24 @@ function poolTx(sdk, request) {
 	const { pool, wallet, sim } = request;
 	const { tokenIn, tokenOut } = sim.preview;
 	if (request.op === "deposit") {
-		const meta = sdk.pools.getDepositMetadata(pool, tokenIn.token, tokenOut.token);
+		const meta = sdk.pools.getDepositMetadata(pool, tokenIn.token.address, tokenOut.token.address);
 		const result = sdk.pools.addLiquidity({
 			pool,
 			wallet,
-			collateral: tokenIn,
+			collateral: {
+				token: tokenIn.token.address,
+				balance: tokenIn.value
+			},
 			meta
 		});
-		if (!result) throw new Error(`pool ${pool} takes no deposit transaction for ${tokenIn.token} (${meta.type})`);
+		if (!result) throw new Error(`pool ${pool} takes no deposit transaction for ${tokenIn.token.address} (${meta.type})`);
 		return result.tx;
 	}
-	const meta = sdk.pools.getWithdrawalMetadata(pool, tokenIn.token, tokenOut.token);
+	const meta = sdk.pools.getWithdrawalMetadata(pool, tokenIn.token.address, tokenOut.token.address);
 	return sdk.pools.removeLiquidity({
 		pool,
 		wallet,
-		amount: request.op === "withdraw" ? tokenOut.balance : tokenIn.balance,
+		amount: request.op === "withdraw" ? tokenOut.value : tokenIn.value,
 		permit: void 0,
 		meta,
 		mode: request.op === "withdraw" ? "withdraw" : "redeem"
@@ -53,7 +56,7 @@ async function openTx(sdk, request) {
 		to: wallet,
 		collateral,
 		ethAmount,
-		debt: preview.debt,
+		debt: preview.totalDebt.value,
 		calls: preview.calls,
 		averageQuota: preview.averageQuota,
 		minQuota: preview.minQuota,

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

@@ -66,7 +66,10 @@ var PrepareApi = class extends require_onchain_base_MultichainConstruct.Multicha
 			tokenOut
 		});
 		const call = pools.addLiquidity({
-			collateral: preview.tokenIn,
+			collateral: {
+				token: preview.tokenIn.token.address,
+				balance: preview.tokenIn.value
+			},
 			pool: pool.pool,
 			wallet: params.wallet,
 			meta: pools.getDepositMetadata(pool.pool, tokenIn, tokenOut)

package/dist/esm/dev/AccountOpener.js

@@ -1,9 +1,9 @@
+import { ierc20Abi } from "../abi/iERC20.js";
 import { iCreditFacadeV310Abi } from "../abi/310/generated.js";
 import { AddressMap } from "../onchain/utils/AddressMap.js";
 import { AddressSet } from "../onchain/utils/AddressSet.js";
 import { AssetsMap } from "../onchain/utils/AssetsMap.js";
 import { childLogger } from "../onchain/utils/childLogger.js";
-import { ierc20Abi } from "../abi/iERC20.js";
 import "../onchain/constants/addresses.js";
 import { MAX_UINT256, PERCENTAGE_FACTOR } from "../onchain/constants/math.js";
 import { SDKConstruct } from "../onchain/base/SDKConstruct.js";

package/dist/esm/dev/withdrawalUtils.js

@@ -1,6 +1,6 @@
+import { iWithdrawalCompressorV313Abi } from "../abi/IWithdrawalCompressorV313.js";
 import { getNetworkType } from "../onchain/chain/chains.js";
 import { getWithdrawalCompressorAddress } from "../onchain/accounts/withdrawal-compressor/addresses.js";
-import { iWithdrawalCompressorV313Abi } from "../abi/IWithdrawalCompressorV313.js";
 import "../onchain/index.js";
 import { iMidasDataFeedAbi, iMidasRedemptionVaultAbi, midasGatewayAbi, midasRedeemerAbi, midasRedemptionVaultPhantomTokenAbi, securitizeRedeemerAbi, securitizeRedemptionGatewayAbi, securitizeRedemptionPhantomTokenAbi } from "./withdrawalAbi.js";
 import { erc20Abi, hexToString, parseAbi, parseEther } from "viem";

package/dist/esm/onchain/accounts/CreditAccountsServiceV310.js

@@ -1,3 +1,5 @@
+import { iBaseRewardPoolAbi } from "../../abi/iBaseRewardPool.js";
+import { ierc4626AdapterAbi } from "../../abi/ierc4626Adapter.js";
 import { AP_REWARDS_COMPRESSOR } from "../constants/address-provider.js";
 import { ADDRESS_0X0 } from "../constants/addresses.js";
 import { MAX_UINT256 } from "../constants/math.js";
@@ -8,8 +10,6 @@ import "../base/index.js";
 import { AccountBotsService } from "./bots/AccountBotsService.js";
 import "./bots/index.js";
 import { rewardsCompressorAbi } from "../../abi/compressors/rewardsCompressor.js";
-import { iBaseRewardPoolAbi } from "../../abi/iBaseRewardPool.js";
-import { ierc4626AdapterAbi } from "../../abi/ierc4626Adapter.js";
 import { expectedBalanceDeltas } from "../market/credit/expectedBalanceDeltas.js";
 import "../market/index.js";
 import { CreditAccountCompressor } from "./credit-account-compressor/CreditAccountCompressor.js";

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

@@ -7,6 +7,7 @@ import "./credit-account-compressor/index.js";
 import { CreditAccountsServiceV310 } from "./CreditAccountsServiceV310.js";
 import { borrowable } from "./intents/guards.js";
 import { fetchCreditAccountSlice, toCreditAccountSlice } from "./intents/utils/credit-account-slice.js";
+import { calcDefaultQuota, calcQuotaUpdate, calcRecommendedQuota, roundUpQuota } from "./quota-utils.js";
 import { CreditAccountOperationsService } from "./intents/index.js";
 import { LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS } from "./liquidations/constants.js";
 import { LiquidationsService } from "./liquidations/LiquidationsService.js";
@@ -25,4 +26,4 @@ import { toWithdrawalStatus } from "./withdrawal-compressor/types.js";
 import { WithdrawalCompressorV313Contract } from "./withdrawal-compressor/WithdrawalCompressorV313Contract.js";
 import { createWithdrawalCompressor } from "./withdrawal-compressor/createWithdrawalCompressor.js";
 import "./withdrawal-compressor/index.js";
-export { AbstractWithdrawalCompressorContract, AccountBotsService, CreditAccountCompressor, CreditAccountCompressorV310Contract, CreditAccountOperationsService, CreditAccountsServiceV310, DELAYED_INTENT_TYPES, DELAYED_INTENT_VERSION, InvalidDelayedIntentError, LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS, LiquidationsService, MultichainLiquidationsService, PeripheryCompressorV310Contract, RedemptionLoggerV310Contract, WithdrawalCompressorV310Contract, WithdrawalCompressorV311Contract, WithdrawalCompressorV313Contract, borrowable, createRedemptionLogger, createWithdrawalCompressor, decodeDelayedIntent, encodeDelayedIntent, fetchCreditAccountSlice, getWithdrawalCompressorAddress, iCreditAccountAbi, toClaimableWithdrawal, toCreditAccountSlice, toPendingWithdrawal, toRequestableWithdrawal, toWithdrawalStatus };
+export { AbstractWithdrawalCompressorContract, AccountBotsService, CreditAccountCompressor, CreditAccountCompressorV310Contract, CreditAccountOperationsService, CreditAccountsServiceV310, DELAYED_INTENT_TYPES, DELAYED_INTENT_VERSION, InvalidDelayedIntentError, LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS, LiquidationsService, MultichainLiquidationsService, PeripheryCompressorV310Contract, RedemptionLoggerV310Contract, WithdrawalCompressorV310Contract, WithdrawalCompressorV311Contract, WithdrawalCompressorV313Contract, borrowable, calcDefaultQuota, calcQuotaUpdate, calcRecommendedQuota, createRedemptionLogger, createWithdrawalCompressor, decodeDelayedIntent, encodeDelayedIntent, fetchCreditAccountSlice, getWithdrawalCompressorAddress, iCreditAccountAbi, roundUpQuota, toClaimableWithdrawal, toCreditAccountSlice, toPendingWithdrawal, toRequestableWithdrawal, toWithdrawalStatus };

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

@@ -30,7 +30,7 @@ function maxWithdrawCollateral(props) {
 	const underlying = market.pool.underlying;
 	const target = creditAccount.tokens.find((t) => 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. */
@@ -47,7 +47,7 @@ function maxWithdrawCollateral(props) {
 		if (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/esm/onchain/accounts/intents/open-strategy.js

@@ -1,3 +1,4 @@
+import { calcPositionLeverage } from "../../market/math.js";
 import { IntentPreviewError } from "../../validation/refusal.js";
 import { assertCanBorrow, assertCollateralised, assertGrowthAllowed, assertMarketOperable, assertQuotaHeadroom } from "./guards.js";
 import { assertDebtInBand, assertLeverageAtLeastOne, debtForLeverage } from "./math.js";
@@ -37,7 +38,7 @@ async function previewOpenStrategy(props) {
 		underlying,
 		enabledTokensMask: 0n,
 		totalDebtUSD: 0n,
-		accountDebt: 0n,
+		totalDebt: 0n,
 		tokens: []
 	};
 	assertDebtInBand(sdk, debt, suite.creditFacade, underlying);
@@ -87,6 +88,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)
@@ -98,9 +100,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: calcPositionLeverage(margin + debt, debt),
 		priceImpact,
 		averageAssets: averageAssets.map(priced),
 		minAssets: minAssets.map(priced),

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

@@ -35,7 +35,7 @@ async function realize(steps, props) {
 	const ledger = new OperationLedger({
 		initialAssets: creditAccount.tokens,
 		underlying,
-		debt: creditAccount.accountDebt,
+		debt: creditAccount.totalDebt,
 		convert: price
 	});
 	const operations = [];
@@ -271,7 +271,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,
@@ -285,12 +285,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: 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/esm/onchain/accounts/intents/tail.js

@@ -102,15 +102,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/esm/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/esm/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 : 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 : 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/esm/onchain/accounts/intents/tests/add-collateral.fixtures.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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