@gearbox-protocol/sdk 16.0.0-next.8 → 16.0.0

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

@@ -1,5 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_onchain_accounts_intents_types = require("./types.js");
+const require_onchain_validation_refusal = require("../../validation/refusal.js");
+const require_onchain_validation_token = require("../../validation/token.js");
+const require_onchain_accounts_intents_utils_common = require("./utils/common.js");
 const require_onchain_accounts_intents_utils_router_path = require("./utils/router-path.js");
 const require_onchain_accounts_intents_plan = require("./plan.js");
 const require_onchain_accounts_intents_operations = require("./operations.js");
@@ -13,25 +15,130 @@ const require_onchain_accounts_intents_view = require("./view.js");
 * Shared by the two callers that need it and must not disagree — the tail as
 * it is previewed days later against the account that really exists, and the
 * tail as it is projected the moment the request is made.
+*
+* A claim that brought only part of what was queued is served in proportion,
+* see {@link partialTail}: the intent's payout and its repayment are cut to the
+* share that arrived, and the rest of both is handed to the next claim.
 */
 function planTail(args) {
 	const { intent, claimable, view } = args;
 	const claimed = () => {
 		const output = require_onchain_accounts_intents_operations.instantOutput(claimable.outputs);
-		if (!output) throw new require_onchain_accounts_intents_types.IntentPreviewError("insufficientSourceBalance", "finishIntent: the claim credits nothing to spend");
+		if (!output) throw new require_onchain_validation_refusal.IntentPreviewError("insufficientSourceBalance", void 0, "finishIntent: the claim credits nothing to spend");
 		return output;
 	};
+	const queued = claimable.outputs.find((o) => o.isDelayed && o.amount > 0n);
+	if (queued) return partialTail({
+		intent,
+		claimable,
+		queued,
+		view
+	});
 	switch (intent.type) {
-		case "WITHDRAW_COLLATERAL": return require_onchain_accounts_intents_plan.planFinishWithdraw(intent, claimable, claimed(), view);
-		case "DECREASE_LEVERAGE": return require_onchain_accounts_intents_plan.planFinishDecreaseLeverage(claimable, claimed(), view);
-		case "CLOSE_ACCOUNT": return require_onchain_accounts_intents_plan.planFinishCloseAccount(intent, claimable, claimed(), view);
+		case "WITHDRAW_COLLATERAL": return whole(require_onchain_accounts_intents_plan.planFinishWithdraw(intent, claimable, claimed(), view));
+		case "DECREASE_LEVERAGE": return whole(require_onchain_accounts_intents_plan.planFinishDecreaseLeverage(claimable, claimed(), view));
+		case "CLOSE_ACCOUNT": return whole(require_onchain_accounts_intents_plan.planFinishCloseAccount(intent, claimable, claimed(), view));
 		case "ADD_COLLATERAL":
 		case "INCREASE_LEVERAGE":
 		case "DEPOSIT":
-		case "DEPOSIT_AND_INCREASE_LEVERAGE": return require_onchain_accounts_intents_plan.planFinishClaimOnly(claimable);
+		case "DEPOSIT_AND_INCREASE_LEVERAGE": return whole(require_onchain_accounts_intents_plan.planFinishClaimOnly(claimable));
 		default: throw new Error(`${intent.type} - not implemented`);
 	}
 }
+const whole = (steps) => ({
+	steps,
+	remainder: void 0
+});
+/**
+* The tail of a claim that settled only part of the withdrawal it matured.
+*
+* Only a legacy Mellow multivault answers one this way — it pays out what its
+* subvaults hold liquid and queues the rest — and the engine cannot finish an
+* intent it has been given a fraction of the funds for. So the fraction is what
+* it serves: the payout and the repayment are cut in the proportion that
+* arrived, which keeps the withdrawal at the fixed leverage it was asked for
+* instead of paying the wallet out first and deleveraging a claim later, and
+* the untouched half of each is carried to the next claim by the remainder.
+*
+* Two intents cannot be served in part at all. An exit sells the account whole,
+* and it cannot while a withdrawal is in flight — the phantom is neither
+* sellable nor transferable — so a partial claim only repays what it brought
+* and the account is emptied by the claim that brings the last of it. A claim
+* that credited nothing at all leaves nothing to spend, so it is taken alone:
+* it is still worth sending, since it is what moves the queue.
+*/
+function partialTail(args) {
+	const { intent, claimable, queued, view } = args;
+	const inFlight = require_onchain_validation_token.toTokenAmount(view.sdk, queued.token, queued.amount);
+	const claimed = require_onchain_accounts_intents_operations.instantOutput(claimable.outputs);
+	if (!claimed) return {
+		steps: require_onchain_accounts_intents_plan.planFinishClaimOnly(claimable),
+		remainder: {
+			inFlight,
+			intent
+		}
+	};
+	switch (intent.type) {
+		case "WITHDRAW_COLLATERAL": {
+			const served = arrivedShare(claimed, queued, view.sdk);
+			const withdrawAmount = part(intent.withdrawAmount, served);
+			const debtRepaid = part(intent.debtRepaid, served);
+			return {
+				steps: require_onchain_accounts_intents_plan.planFinishWithdraw({
+					...intent,
+					withdrawAmount,
+					debtRepaid
+				}, claimable, claimed, view),
+				remainder: {
+					inFlight,
+					intent: {
+						...intent,
+						withdrawAmount: intent.withdrawAmount - withdrawAmount,
+						debtRepaid: intent.debtRepaid - debtRepaid
+					}
+				}
+			};
+		}
+		case "DECREASE_LEVERAGE":
+		case "CLOSE_ACCOUNT": return {
+			steps: require_onchain_accounts_intents_plan.planFinishDecreaseLeverage(claimable, claimed, view),
+			remainder: {
+				inFlight,
+				intent
+			}
+		};
+		case "ADD_COLLATERAL":
+		case "INCREASE_LEVERAGE":
+		case "DEPOSIT":
+		case "DEPOSIT_AND_INCREASE_LEVERAGE": return {
+			steps: require_onchain_accounts_intents_plan.planFinishClaimOnly(claimable),
+			remainder: {
+				inFlight,
+				intent
+			}
+		};
+		default: throw new Error(`${intent.type} - not implemented`);
+	}
+}
+/**
+* How much of the redemption this claim was: what it credited, over that plus
+* what it left queued.
+*
+* The phantom stands for its payout one for one — the same reading the request
+* side takes when it names the claim it expects — so only the decimals of the
+* two have to be reconciled before they can be added up.
+*/
+function arrivedShare(claimed, queued, sdk) {
+	const rest = require_onchain_accounts_intents_utils_common.toTargetDecimals(queued.amount, queued.token, claimed.token, sdk);
+	return {
+		got: claimed.amount,
+		of: claimed.amount + rest
+	};
+}
+/** A share of an amount, rounded down: a tail never promises more than it has. */
+function part(amount, share) {
+	return share.of > 0n ? amount * share.got / share.of : 0n;
+}
 /**
 * Where a delayed intent ends up, worked out at the moment it is started.
 *
@@ -54,9 +161,9 @@ async function projectTail(args) {
 	const { request, delayed, creditAccount, sdk, quotaReserve } = args;
 	const { claim } = delayed;
 	const queued = request.outputs.find((o) => o.isDelayed);
-	if (!queued || !claim) throw new Error("projectTail: the request queued nothing to claim");
+	if (!queued || !claim) throw new require_onchain_validation_refusal.IntentPreviewError("noRecordedIntent", void 0, "projectTail: the request queued nothing to claim");
 	const next = sliceAfter(creditAccount, delayed.afterRequest);
-	const steps = planTail({
+	const { steps } = planTail({
 		intent: delayed.record,
 		claimable: projectedClaimable(request, queued.token, queued.amount, claim),
 		view: require_onchain_accounts_intents_view.accountView(next, sdk)
@@ -103,15 +210,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

@@ -78,12 +78,13 @@ const LIQUIDATION_THRESHOLDS = {
 const MAX_DEBT = require_onchain_utils_formatter.toBN("200000", 8);
 /** Mock SDK on the shared fixture market. */
 function buildMarketSdk(extras) {
+	const prices = {
+		...PRICES,
+		...extras?.extraPrices
+	};
 	return require_sdk_mock.buildMockSdk({
-		prices: {
-			...PRICES,
-			...extras?.extraPrices
-		},
-		reservePrices: extras?.reservePrices,
+		prices,
+		reservePrices: extras?.reservePrices ?? prices,
 		decimals: {
 			...DECIMALS,
 			...extras?.extraDecimals
@@ -95,6 +96,8 @@ function buildMarketSdk(extras) {
 		creditManager: CREDIT_MANAGER,
 		creditFacade: CREDIT_FACADE,
 		underlying: UND,
+		routeQuote: extras?.routeQuote,
+		routeFloor: extras?.routeFloor,
 		rwaAssets: extras?.rwaAssets,
 		phantoms: extras?.phantoms,
 		creditAccounts: extras?.creditAccounts,
@@ -141,7 +144,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

@@ -1,7 +1,9 @@
 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_positions_PositionsService = require("../../../positions/PositionsService.js");
+const require_TestPriceOracle_mock = require("../../../market/oracle/TestPriceOracle.mock.js");
 let vitest = require("vitest");
 //#region src/onchain/accounts/intents/testing/sdk-mock.ts
 /**
@@ -13,6 +15,25 @@ let vitest = require("vitest");
 * from their inputs, so `result.calls` pins down which ops reached the
 * assembler and in which order.
 */
+/**
+* Curator of the mock market: an unknown market configurator, so it carries no
+* display name and no page — what the on-chain source answers for a
+* configurator outside the curated table.
+*/
+const MOCK_CURATOR = {
+	address: "0x00000000000000000000000000000000000c0f16",
+	name: void 0,
+	url: null
+};
+/**
+* Liquidation fees of the mock suite: a 3% premium (the manager reports its
+* complement) on top of a 1.5% protocol fee, so the discount a screen shows is
+* 450bps.
+*/
+const MOCK_LIQUIDATION_FEES = {
+	feeLiquidation: 150,
+	liquidationDiscount: 9700
+};
 /** Recognizable router call embedded in routed leg results. */
 const MOCK_ROUTER_CALL = {
 	target: "0x9999999999999999999999999999999999999999",
@@ -73,19 +94,25 @@ function echoEncodableOpCalls(op) {
 /**
 * Mock `OnchainSDK` covering exactly what the intent-service touches:
 * price conversion, quota params, CM/facade lookup and call assembly.
-* Conversion mirrors the legacy price-based math:
-* `amount * price[from] * 10^dec(to) / (price[to] * 10^dec(from))`.
+* Conversion is a real {@link TestPriceOracle} seeded from the fixture records.
 */
 function buildMockSdk(args) {
 	const decimalsOf = (token) => args.decimals[token.toLowerCase()] ?? 18;
-	const convert = (token, to, amount) => {
-		const from = token.toLowerCase();
-		const target = to.toLowerCase();
-		const fromPrice = args.prices[from];
-		const toPrice = args.prices[target];
-		if (fromPrice === void 0 || toPrice === void 0) throw new Error(`mock priceOracle: missing price for ${from} or ${target}`);
-		return amount * fromPrice * 10n ** BigInt(decimalsOf(target)) / (toPrice * 10n ** BigInt(decimalsOf(from)));
+	const lookup = (record, token) => record?.[token.toLowerCase()] ?? record?.[token];
+	const tokenCfgs = {};
+	for (const token of /* @__PURE__ */ new Set([
+		...Object.keys(args.decimals),
+		...Object.keys(args.prices),
+		...Object.keys(args.reservePrices ?? {})
+	])) tokenCfgs[token] = {
+		decimals: lookup(args.decimals, token) ?? 18,
+		symbol: "TOKEN",
+		name: "TOKEN",
+		price: lookup(args.prices, token),
+		reservePrice: lookup(args.reservePrices, token)
 	};
+	const priceOracle = new require_TestPriceOracle_mock.TestPriceOracle(tokenCfgs);
+	const convert = (from, to, amount) => priceOracle.convert(from, to, amount);
 	const fullQuota = (q) => ({
 		cumulativeIndexLU: 0n,
 		totalQuoted: 0n,
@@ -104,18 +131,6 @@ function buildMockSdk(args) {
 		entries: () => Object.entries(args.liquidationThresholds),
 		get: (token) => args.liquidationThresholds[token.toLowerCase()] ?? args.liquidationThresholds[token]
 	};
-	const _convertToUSD = (token, amount, reserve = false) => {
-		const key = token.toLowerCase();
-		const price = reserve ? args.reservePrices?.[key] : args.prices[key];
-		if (price === void 0) throw new Error(`mock priceOracle: missing ${reserve ? "reserve" : "main"} price for ${token}`);
-		return amount * price / 10n ** BigInt(decimalsOf(token));
-	};
-	const safeUsd = (token, amount) => {
-		const from = token.toLowerCase();
-		const price = args.prices[from] ?? args.prices[token];
-		if (price === void 0) return null;
-		return amount * price / 10n ** BigInt(decimalsOf(from));
-	};
 	const tokenOf = (token) => ({
 		chainId: 1,
 		address: token,
@@ -123,35 +138,19 @@ function buildMockSdk(args) {
 		name: "TOKEN",
 		decimals: decimalsOf(token)
 	});
-	const mainPriceOf = (token) => {
-		const key = token.toLowerCase();
-		const price = args.prices[key] ?? args.prices[token];
-		if (price === void 0) throw new Error(`mock priceOracle: missing main price for ${token}`);
-		return price;
-	};
-	const reservePriceOf = (token) => {
-		const key = token.toLowerCase();
-		const price = args.reservePrices?.[key] ?? args.reservePrices?.[token];
-		if (price === void 0) throw new Error(`mock priceOracle: missing reserve price for ${token}`);
-		return price;
-	};
 	const poolPaused = args.poolPaused ?? false;
+	/** {@inheritDoc MarketSuite.toUnderlyingAmount} */
+	const toUnderlyingAmount = (value) => ({
+		token: tokenOf(args.rwaAssets?.[args.underlying.toLowerCase()] ?? args.underlying),
+		...priceOracle.toAmount(args.underlying, value)
+	});
 	const market = {
-		priceOracle: {
-			convert,
-			mainPrice: mainPriceOf,
-			reservePrice: reservePriceOf,
-			convertToUSD: _convertToUSD,
-			toTokenAmount: (token, value) => {
-				const usd = safeUsd(token, value);
-				return {
-					token: tokenOf(token),
-					value,
-					valueUsd: usd === null ? null : require_onchain_market_math.usdToNumber(usd)
-				};
-			},
-			safeConvertToUSD: safeUsd
-		},
+		toUnderlyingAmount,
+		/** {@inheritDoc MarketSuite.curator} */
+		curator: MOCK_CURATOR,
+		/** {@inheritDoc MarketSuite.underlying} */
+		underlying: args.underlying,
+		priceOracle,
 		pool: {
 			pqk: {
 				quotas,
@@ -176,12 +175,28 @@ function buildMockSdk(args) {
 	const forbiddenTokensMask = collateralTokens.reduce((mask, token, i) => forbidden.has(token) ? mask | 1n << BigInt(i) : mask, 0n);
 	const facadePaused = args.facadePaused ?? false;
 	const expirationDate = args.expirationDate ?? 0;
+	const strategyTargetCollateral = args.strategyTargetCollateral ?? collateralTokens.find((t) => t !== args.underlying.toLowerCase());
+	const unwrappedUnderlying = args.rwaAssets?.[args.underlying.toLowerCase()] ?? args.underlying;
+	const underlyingToken = {
+		...tokenOf(unwrappedUnderlying),
+		wrappedAddress: unwrappedUnderlying.toLowerCase() === args.underlying.toLowerCase() ? null : args.underlying
+	};
+	const strategyName = strategyTargetCollateral ? `${tokenOf(strategyTargetCollateral).symbol} / ${underlyingToken.symbol}` : void 0;
 	const creditManagerSuite = {
+		name: "TestCreditManager",
+		strategyName,
+		underlyingToken,
+		accountTargetCollateral: () => strategyTargetCollateral ? tokenOf(strategyTargetCollateral) : null,
+		accountStrategyName: () => strategyName ?? underlyingToken.symbol,
+		liquidationFees: () => MOCK_LIQUIDATION_FEES,
+		totalLiquidationDiscount: require_onchain_market_credit_CreditSuite.CreditSuite.prototype.totalLiquidationDiscount,
+		creditOperationMarket: require_onchain_market_credit_CreditSuite.CreditSuite.prototype.creditOperationMarket,
 		creditManager: {
 			address: args.creditManager,
 			liquidationThresholds,
 			collateralTokens,
-			feeInterest: args.feeInterest ?? 0
+			feeInterest: args.feeInterest ?? 0,
+			maxLeverage: (collateral, targetHF) => require_onchain_market_math.calcMaxLeverage(liquidationThresholds.get(collateral) ?? 0, targetHF)
 		},
 		creditFacade: {
 			address: args.creditFacade,
@@ -196,7 +211,7 @@ function buildMockSdk(args) {
 		market,
 		isPaused: facadePaused || poolPaused,
 		forbiddenTokens: [...forbidden],
-		strategyTargetCollateral: args.strategyTargetCollateral ?? collateralTokens.find((t) => t !== args.underlying.toLowerCase()),
+		strategyTargetCollateral,
 		isExpired: expirationDate > 0 && expirationDate < (args.timestamp ?? 0)
 	};
 	const routeCalls = (tokenIn, tokenOut) => {
@@ -208,18 +223,22 @@ function buildMockSdk(args) {
 		if (asset && from === underlying && to === asset) return [MOCK_RWA_UNWRAP_CALL];
 		return [MOCK_ROUTER_CALL];
 	};
+	/** Linear unless the case says otherwise — see `routeQuote`. */
+	const quote = args.routeQuote ?? ((amount) => amount);
+	/** Slippage-free unless the case says otherwise — see `routeFloor`. */
+	const floor = args.routeFloor ?? ((amount) => amount);
 	const router = {
 		findOneTokenPath: vitest.vi.fn(async ({ amount, tokenIn, tokenOut }) => ({
-			amount,
-			minAmount: amount,
+			amount: quote(amount),
+			minAmount: floor(quote(amount)),
 			calls: routeCalls(tokenIn, tokenOut)
 		})),
 		findManyToOnePath: vitest.vi.fn(async ({ expectedBalances, leftoverBalances, target }) => {
 			const spent = expectedBalances.reduce((acc, a) => acc + a.balance, 0n) - leftoverBalances.reduce((acc, a) => acc + a.balance, 0n);
 			const tokenIn = expectedBalances[0]?.token ?? target;
 			return {
-				amount: spent,
-				minAmount: spent,
+				amount: quote(spent),
+				minAmount: floor(quote(spent)),
 				calls: routeCalls(tokenIn, target)
 			};
 		}),
@@ -240,11 +259,15 @@ function buildMockSdk(args) {
 				amount += convert(token, targetLc, spend);
 			}
 			balances[targetLc] = (balances[targetLc] ?? 0n) + amount;
+			const untouched = (balances[targetLc] ?? 0n) - amount;
 			return {
 				amount,
-				minAmount: amount,
+				minAmount: floor(amount),
 				balances,
-				minBalances: { ...balances },
+				minBalances: {
+					...balances,
+					[targetLc]: untouched + floor(amount)
+				},
 				calls: [MOCK_ROUTER_CALL]
 			};
 		}),
@@ -254,7 +277,7 @@ function buildMockSdk(args) {
 			const amount = sold.reduce((acc, a) => acc + convert(a.token, underlying, a.balance), 0n);
 			return {
 				amount,
-				minAmount: amount,
+				minAmount: floor(amount),
 				underlyingBalance: amount,
 				calls: sold.length === 0 ? [] : [MOCK_CLOSE_CALL]
 			};
@@ -294,6 +317,7 @@ function buildMockSdk(args) {
 				decimals: decimalsOf(token),
 				contractType: phantoms.has(token.toLowerCase()) ? "PHANTOM_TOKEN::SECURITIZE_RD" : void 0
 			}),
+			getToken: tokenOf,
 			mustGetToken: tokenOf,
 			rwaUnderlyings: { get: (token) => {
 				const asset = args.rwaAssets?.[token.toLowerCase()];
@@ -336,7 +360,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,
@@ -352,6 +376,8 @@ function payloadOf(slice) {
 exports.CA_OP_CALLS = CA_OP_CALLS;
 exports.MOCK_CLAIM_CALL = MOCK_CLAIM_CALL;
 exports.MOCK_CLOSE_CALL = MOCK_CLOSE_CALL;
+exports.MOCK_CURATOR = MOCK_CURATOR;
+exports.MOCK_LIQUIDATION_FEES = MOCK_LIQUIDATION_FEES;
 exports.MOCK_REQUEST_CALL = MOCK_REQUEST_CALL;
 exports.MOCK_ROUTER_CALL = MOCK_ROUTER_CALL;
 exports.MOCK_RWA_UNWRAP_CALL = MOCK_RWA_UNWRAP_CALL;

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",
@@ -284,14 +284,17 @@ const case_native_coin = {
 		}
 	]
 };
-function buildDepositSdk(c) {
-	return require_market.buildMarketSdk({ rwaAssets: c.rwaAssets });
+function buildDepositSdk(c, routeQuote) {
+	return require_market.buildMarketSdk({
+		rwaAssets: c.rwaAssets,
+		routeQuote
+	});
 }
 function buildDepositProps(c, sdk) {
 	return {
 		intent: c.intent,
 		creditAccount: require_market.buildFixtureCreditAccount({
-			accountDebt: c.accountDebt,
+			totalDebt: c.totalDebt,
 			tokens: c.tokens
 		}),
 		sdk,