@gearbox-protocol/sdk 15.1.0-next.6 → 15.1.0-next.7

package/dist/esm/sdk/market/credit/CreditFacadeV310BaseContract.js

@@ -1,7 +1,7 @@
-import { iPausableAbi } from "../../../abi/iPausable.js";
 import { iCreditFacadeMulticallV310Abi, iCreditFacadeV310Abi } from "../../../abi/310/generated.js";
 import { BaseContract } from "../../base/BaseContract.js";
 import "../../base/index.js";
+import { iPausableAbi } from "../../../abi/iPausable.js";
 //#region src/sdk/market/credit/CreditFacadeV310BaseContract.ts
 const abi = [
 	...iCreditFacadeV310Abi,

package/dist/esm/sdk/market/oracle/PriceOracleBaseContract.js

@@ -132,17 +132,24 @@ var PriceOracleBaseContract = class extends BaseContract {
 		return amount * 10n ** BigInt(this.tokensMeta.decimals(to)) / price;
 	}
 	/**
-	* {@inheritDoc IPriceOracleContract.safeUsdValue}
+	* {@inheritDoc IPriceOracleContract.safeConvertToUSD}
 	**/
-	safeUsdValue(token, amount) {
+	safeConvertToUSD(token, amount) {
 		try {
-			return usdToNumber(this.convertToUSD(token, amount));
+			return this.convertToUSD(token, amount);
 		} catch (e) {
 			this.logger?.debug(`cannot price ${this.labelAddress(token)}: ${e}`);
 			return null;
 		}
 	}
 	/**
+	* {@inheritDoc IPriceOracleContract.safeUsdValue}
+	**/
+	safeUsdValue(token, amount) {
+		const usd = this.safeConvertToUSD(token, amount);
+		return usd === null ? null : usdToNumber(usd);
+	}
+	/**
 	* {@inheritDoc IPriceOracleContract.toAmount}
 	**/
 	toAmount = (token, value) => {

package/dist/esm/sdk/market/pool/PoolV310Contract.js

@@ -1,4 +1,3 @@
-import { iPausableAbi } from "../../../abi/iPausable.js";
 import { iPoolV310Abi } from "../../../abi/310/generated.js";
 import { AddressMap } from "../../utils/AddressMap.js";
 import { RAY } from "../../constants/math.js";
@@ -7,6 +6,7 @@ import { formatBN, formatBNvalue, percentFmt } from "../../utils/formatter.js";
 import "../../utils/index.js";
 import { BaseContract } from "../../base/BaseContract.js";
 import "../../base/index.js";
+import { iPausableAbi } from "../../../abi/iPausable.js";
 import { calcUtilization } from "../math.js";
 //#region src/sdk/market/pool/PoolV310Contract.ts
 const abi = [...iPoolV310Abi, ...iPausableAbi];

package/dist/esm/sdk/market/zapper/IETHZapperContract.js

@@ -1,5 +1,5 @@
-import { iethZapperAbi } from "../../../abi/iETHZapper.js";
 import { ZapperContract } from "./ZapperContract.js";
+import { iethZapperAbi } from "../../../abi/iETHZapper.js";
 //#region src/sdk/market/zapper/IETHZapperContract.ts
 const abi = iethZapperAbi;
 var IETHZapperContract = class extends ZapperContract {

package/dist/esm/sdk/market/zapper/ZapperContract.js

@@ -1,6 +1,6 @@
-import { iZapperAbi } from "../../../abi/iZapper.js";
 import { BaseContract } from "../../base/BaseContract.js";
 import "../../base/index.js";
+import { iZapperAbi } from "../../../abi/iZapper.js";
 import { UnsupportedZapperFunctionError } from "./errors.js";
 //#region src/sdk/market/zapper/ZapperContract.ts
 /**

package/dist/esm/sdk/pools/PoolService.js

@@ -1,5 +1,5 @@
-import { ierc20Abi } from "../../abi/iERC20.js";
 import { AddressSet } from "../utils/AddressSet.js";
+import { ierc20Abi } from "../../abi/iERC20.js";
 import "../constants/addresses.js";
 import { RAY } from "../constants/math.js";
 import "../constants/index.js";

package/dist/esm/sdk/positions/PositionsService.js

@@ -1,8 +1,20 @@
+import { AddressMap } from "../utils/AddressMap.js";
+import "../constants/math.js";
+import "../constants/index.js";
+import "../utils/index.js";
 import { SDKConstruct } from "../base/SDKConstruct.js";
 import "../base/index.js";
+import { calcBorrowApy, calcPositionLeverage, healthFactorBps, usdToNumber } from "../market/math.js";
+import { dominantCollateral } from "../market/credit/dominantCollateral.js";
 import { isFilterSet } from "../../model/filters.js";
 import { matchesPositionFilter } from "../../model/positions.js";
 import "../../model/index.js";
+import "../market/index.js";
+import { calcBorrowRate } from "./calcBorrowRate.js";
+import { calcHealthFactor } from "./calcHealthFactor.js";
+import { calcLiquidationPrice } from "./calcLiquidationPrice.js";
+import { calcTimeToLiquidationMs } from "./calcTimeToLiquidationMs.js";
+import { accountSnapshotFromCreditAccountData } from "./types.js";
 //#region src/sdk/positions/PositionsService.ts
 /**
 * The `positions` read model of one chain: everything a wallet holds in the
@@ -27,7 +39,7 @@ var PositionsService = class extends SDKConstruct {
 				wallet,
 				blockNumber
 			}) : Promise.resolve([]),
-			wanted("strategy") ? this.sdk.accounts.listPositions({
+			wanted("strategy") ? this.listStrategyPositions({
 				owner: wallet,
 				includeZeroDebt: !isFilterSet(isZeroDebt) || isZeroDebt,
 				blockNumber
@@ -43,6 +55,199 @@ var PositionsService = class extends SDKConstruct {
 			...liquidation
 		].filter((row) => matchesPositionFilter(row, filter));
 	}
+	/**
+	* Describes all credit accounts of a wallet as strategy positions.
+	*
+	* @param props - {@link ListStrategyPositionsProps}
+	**/
+	async listStrategyPositions(props) {
+		const { owner, includeZeroDebt, blockNumber } = props;
+		const describable = (await this.sdk.accounts.getBorrowerCreditAccounts(owner, { includeZeroDebt }, blockNumber)).filter((ca) => {
+			if (!ca.success) this.logger?.warn(`cannot describe position of ${this.labelAddress(ca.creditAccount)}: collateral computation failed`);
+			return ca.success;
+		});
+		const withdrawals = await Promise.all(describable.map((ca) => this.#accountWithdrawals(ca, blockNumber)));
+		return describable.map((ca, i) => this.#toStrategyPosition(ca, withdrawals[i] ?? new AddressMap()));
+	}
+	/**
+	* Health factor of an account state, in basis points (`10000` = 1.0).
+	**/
+	healthFactor(snapshot) {
+		const data = this.#marketData(snapshot);
+		return calcHealthFactor({
+			snapshot,
+			underlying: data.underlying,
+			decimals: data.decimals,
+			prices: data.prices,
+			liquidationThresholds: data.liquidationThresholds,
+			activeQuotas: data.activeQuotas
+		});
+	}
+	/**
+	* Cost of an account state's debt, broken down into the pool's base rate
+	* and per-token quota rates.
+	**/
+	borrowRate(snapshot) {
+		const data = this.#marketData(snapshot);
+		return calcBorrowRate({
+			snapshot,
+			baseInterestRate: data.baseInterestRate,
+			feeInterest: data.feeInterest,
+			quotaRates: data.quotaRates
+		});
+	}
+	/**
+	* Estimated milliseconds until the account's health factor decays to
+	* `10000` under its current borrow rate, or `null` when the debt carries
+	* no rate (or the account is already liquidatable).
+	**/
+	timeToLiquidation(snapshot) {
+		const data = this.#marketData(snapshot);
+		return calcTimeToLiquidationMs(calcHealthFactor({
+			snapshot,
+			underlying: data.underlying,
+			decimals: data.decimals,
+			prices: data.prices,
+			liquidationThresholds: data.liquidationThresholds,
+			activeQuotas: data.activeQuotas
+		}), BigInt(calcBorrowRate({
+			snapshot,
+			baseInterestRate: data.baseInterestRate,
+			feeInterest: data.feeInterest,
+			quotaRates: data.quotaRates
+		}).totalOnDebt));
+	}
+	/**
+	* Price of the single non-underlying collateral at which the account
+	* becomes liquidatable, or `null` when the account holds zero or several
+	* non-underlying assets.
+	**/
+	liquidationPrice(snapshot) {
+		const data = this.#marketData(snapshot);
+		return calcLiquidationPrice({
+			snapshot,
+			underlying: data.underlying,
+			decimals: data.decimals,
+			liquidationThresholds: data.liquidationThresholds
+		});
+	}
+	/**
+	* Builds one strategy position from an account snapshot.
+	*
+	* @param withdrawals - Delayed withdrawals of the account, keyed by the
+	* phantom token that represents them on it.
+	**/
+	#toStrategyPosition(ca, withdrawals) {
+		const suite = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+		const { market } = suite;
+		const { priceOracle } = market;
+		const { pool } = market.pool;
+		const token = this.sdk.tokensMeta.mustGetToken(market.unwrappedUnderlying);
+		const totalDebtValue = ca.debt + ca.accruedInterest + ca.accruedFees;
+		const collateral = dominantCollateral(ca, market);
+		const snapshot = accountSnapshotFromCreditAccountData(ca);
+		const borrowRate = this.borrowRate(snapshot);
+		const timeToLiquidation = this.timeToLiquidation(snapshot);
+		const liquidationPrice = this.liquidationPrice(snapshot);
+		return {
+			kind: "strategy",
+			chainId: this.sdk.chainId,
+			creditManager: ca.creditManager,
+			creditAccount: ca.creditAccount,
+			name: collateral ? suite.strategyName(collateral) : token.symbol,
+			targetCollateral: collateral ? this.sdk.tokensMeta.mustGetToken(collateral) : null,
+			leverage: calcPositionLeverage(ca.totalValue, totalDebtValue),
+			borrowApy: calcBorrowApy(pool.baseInterestRate, suite.creditManager.feeInterest),
+			totalDebt: {
+				token,
+				value: totalDebtValue,
+				valueUsd: usdToNumber(ca.totalDebtUSD)
+			},
+			totalValue: {
+				token,
+				value: ca.totalValue,
+				valueUsd: usdToNumber(ca.totalValueUSD)
+			},
+			healthFactor: healthFactorBps(ca.healthFactor),
+			borrowRate,
+			timeToLiquidation,
+			liquidationPrice,
+			collaterals: ca.tokens.flatMap((t) => {
+				if ((t.mask & ca.enabledTokensMask) === 0n || t.balance <= 10n) return [];
+				return [{
+					collateral: priceOracle.toTokenAmount(t.token, t.balance),
+					quota: priceOracle.toTokenAmount(market.underlying, t.quota),
+					withdrawals: withdrawals.get(t.token) ?? []
+				}];
+			})
+		};
+	}
+	/**
+	* Delayed withdrawals of one account, keyed by the phantom token that
+	* represents them on it, so that each collateral row can pick up its own.
+	**/
+	async #accountWithdrawals(ca, blockNumber) {
+		const compressor = this.sdk.withdrawalCompressor;
+		const byPhantomToken = new AddressMap(void 0, "accountWithdrawals");
+		const holdsPhantomToken = ca.tokens.some((t) => t.balance > 10n && compressor?.getWithdrawalSourceToken(t.token) !== void 0);
+		if (!compressor || !holdsPhantomToken) return byPhantomToken;
+		const { priceOracle } = this.sdk.marketRegister.findByCreditManager(ca.creditManager);
+		const { claimable, pending } = await compressor.getCurrentWithdrawals(ca.creditAccount, blockNumber);
+		const add = (w, outputs, claimableAt) => {
+			const assets = outputs.map((o) => ({
+				isDelayed: true,
+				...priceOracle.toTokenAmount(o.token, o.amount),
+				redeemer: w.redeemer,
+				claimableAt: claimableAt === void 0 ? void 0 : Number(claimableAt)
+			}));
+			byPhantomToken.upsert(w.withdrawalPhantomToken, [...byPhantomToken.get(w.withdrawalPhantomToken) ?? [], ...assets]);
+		};
+		for (const w of claimable) add(w, w.outputs);
+		for (const w of pending) add(w, w.expectedOutputs, w.claimableAt);
+		return byPhantomToken;
+	}
+	/**
+	* Collects decimals, prices and thresholds for the snapshot's tokens plus
+	* the market underlying, even when the account holds no underlying balance.
+	**/
+	#marketData(snapshot) {
+		const market = this.sdk.marketRegister.findByCreditManager(snapshot.creditManager);
+		const cm = this.sdk.marketRegister.findCreditManager(snapshot.creditManager).creditManager;
+		const { priceOracle } = market;
+		const underlying = market.pool.underlying;
+		const { pqk, pool } = market.pool;
+		const tokens = [underlying];
+		for (const a of snapshot.assets) tokens.push(a.token);
+		for (const q of snapshot.quotas) tokens.push(q.token);
+		const decimals = {};
+		const prices = {};
+		const liquidationThresholds = {};
+		const activeQuotas = {};
+		const quotaRates = {};
+		for (const token of tokens) {
+			const meta = this.sdk.tokensMeta.get(token);
+			if (meta) decimals[token] = meta.decimals;
+			try {
+				prices[token] = priceOracle.mainPrice(token);
+			} catch {}
+			const lt = cm.liquidationThresholds.get(token);
+			if (lt !== void 0) liquidationThresholds[token] = lt;
+			if (pqk.hasActiveQuota(token)) {
+				activeQuotas[token] = true;
+				quotaRates[token] = pqk.quotaRate(token);
+			}
+		}
+		return {
+			underlying,
+			decimals,
+			prices,
+			liquidationThresholds,
+			activeQuotas,
+			quotaRates,
+			baseInterestRate: pool.baseInterestRate,
+			feeInterest: cm.feeInterest
+		};
+	}
 };
 //#endregion
 export { PositionsService };

package/dist/esm/sdk/positions/calcBorrowRate.js

@@ -0,0 +1,42 @@
+import { AddressMap } from "../utils/AddressMap.js";
+import { PERCENTAGE_FACTOR } from "../constants/math.js";
+import { calcBorrowApy } from "../market/math.js";
+//#region src/sdk/positions/calcBorrowRate.ts
+/**
+* Cost of an account state's debt, broken down into the pool's base rate and
+* per-token quota rates.
+*
+* The base rate is the market's current borrow APY (the pool's base rate plus
+* the credit manager's interest fee) — the same value `borrowApy` reports on
+* a position; it is not recomputed for the projected pool liquidity. Quota
+* contributions are `quotaBalance * quotaRate` with the interest fee on top,
+* normalized against the total value (`total`, `quotas`) and against the
+* debt (`totalOnDebt`, the rate the debt itself grows at). Formulas are in
+* parity with the frontend's `BorrowRateUtils`.
+**/
+function calcBorrowRate(props) {
+	const { snapshot, baseInterestRate, feeInterest, quotaRates } = props;
+	const { quotas, totalDebt, totalValue } = snapshot;
+	const rates = new AddressMap(Object.entries(quotaRates));
+	const base = calcBorrowApy(baseInterestRate, feeInterest);
+	const fee = PERCENTAGE_FACTOR + BigInt(feeInterest);
+	let quotaRateSum = 0n;
+	const perQuota = {};
+	for (const q of quotas) {
+		if (q.balance <= 10n) continue;
+		const rate = rates.get(q.token);
+		const rateBalance = rate === void 0 ? 0n : q.balance * BigInt(rate);
+		quotaRateSum += rateBalance;
+		const withFee = rateBalance * fee / PERCENTAGE_FACTOR;
+		perQuota[q.token] = totalValue > 0n ? Number(withFee / totalValue) : 0;
+	}
+	const quotaRateSumWithFee = quotaRateSum * fee / PERCENTAGE_FACTOR;
+	return {
+		total: totalValue > 0n ? Number(totalDebt * BigInt(base) / totalValue) + Number(quotaRateSumWithFee / totalValue) : 0,
+		totalOnDebt: totalDebt > 0n ? base + Number(quotaRateSumWithFee / totalDebt) : 0,
+		base,
+		quotas: perQuota
+	};
+}
+//#endregion
+export { calcBorrowRate };

package/dist/esm/sdk/positions/calcHealthFactor.js

@@ -0,0 +1,43 @@
+import { AddressMap } from "../utils/AddressMap.js";
+import { BigIntMath } from "../utils/bigint-math.js";
+import { MAX_UINT16, PERCENTAGE_FACTOR } from "../constants/math.js";
+import { isAddressEqual } from "viem";
+//#region src/sdk/positions/calcHealthFactor.ts
+/**
+* Health factor of an account state, in basis points (`10000` = 1.0).
+*
+* Collateral is valued under liquidation thresholds, with quoted tokens
+* capped by their quota, and compared against the debt's value. An account
+* with no debt reports `65535` (`MAX_UINT16`), the contract's own sentinel
+* scaled down. Formulas are in parity with the legacy `calcHealthFactor`.
+* Tokens with no price in {@link CalcHealthFactorProps.prices} contribute
+* nothing.
+**/
+function calcHealthFactor(props) {
+	const { snapshot, underlying, decimals, prices, liquidationThresholds, activeQuotas } = props;
+	if (snapshot.totalDebt === 0n) return Number(MAX_UINT16);
+	const decimalsByToken = new AddressMap(Object.entries(decimals));
+	const pricesByToken = new AddressMap(Object.entries(prices));
+	const lts = new AddressMap(Object.entries(liquidationThresholds));
+	const active = new AddressMap(Object.entries(activeQuotas));
+	const convertToUSD = (token, amount) => {
+		const price = pricesByToken.get(token);
+		if (price === void 0) return null;
+		const scale = 10n ** BigInt(decimalsByToken.get(token) ?? 18);
+		return amount * price / scale;
+	};
+	const assetMoney = snapshot.assets.reduce((acc, { token, balance }) => {
+		if (balance <= 10n) return acc;
+		const lt = BigInt(lts.get(token) ?? 0);
+		const tokenLtWeighted = (convertToUSD(token, balance) ?? 0n) * lt;
+		const quota = snapshot.quotas.find((q) => isAddressEqual(q.token, token));
+		const quotaBalance = quota && (active.get(token) ?? false) ? quota.balance : 0n;
+		const quotaWeighted = (convertToUSD(underlying, quotaBalance) ?? 0n) * PERCENTAGE_FACTOR;
+		return acc + (quota ? BigIntMath.min(quotaWeighted, tokenLtWeighted) : tokenLtWeighted);
+	}, 0n);
+	const borrowedMoney = convertToUSD(underlying, snapshot.totalDebt) ?? 0n;
+	const hf = borrowedMoney > 0n ? assetMoney / borrowedMoney : 0n;
+	return Number(hf);
+}
+//#endregion
+export { calcHealthFactor };

package/dist/esm/sdk/positions/calcLiquidationPrice.js

@@ -0,0 +1,22 @@
+import "../constants/math.js";
+import { calcLiquidationPriceForTarget } from "./calcLiquidationPriceForTarget.js";
+import { isAddressEqual } from "viem";
+//#region src/sdk/positions/calcLiquidationPrice.ts
+/**
+* Liquidation price of an account state's target collateral, in the oracle's
+* 8-decimal (`PRICE_DECIMALS`) fixed point.
+*
+* As the frontend does, a liquidation price only exists when the account
+* holds exactly one non-dust non-underlying asset; otherwise `null`.
+**/
+function calcLiquidationPrice(props) {
+	const { snapshot, underlying } = props;
+	const targets = snapshot.assets.filter((a) => a.balance > 10n && !isAddressEqual(a.token, underlying));
+	if (targets.length !== 1) return null;
+	return calcLiquidationPriceForTarget({
+		...props,
+		targetToken: targets[0].token
+	});
+}
+//#endregion
+export { calcLiquidationPrice };

package/dist/esm/sdk/positions/calcLiquidationPriceForTarget.js

@@ -0,0 +1,29 @@
+import { AddressMap } from "../utils/AddressMap.js";
+import { PERCENTAGE_FACTOR, PRICE_DECIMALS, WAD } from "../constants/math.js";
+import { isAddressEqual } from "viem";
+//#region src/sdk/positions/calcLiquidationPriceForTarget.ts
+/**
+* Liquidation price of an explicitly named collateral token, in
+* `PRICE_DECIMALS` fixed point; `0n` when the account holds none of it or the
+* token has no liquidation threshold. Formula is in parity with the legacy
+* `liquidationPrice`: the effective debt (debt less the underlying balance's
+* contribution under its threshold) over the threshold-weighted target
+* balance.
+**/
+function calcLiquidationPriceForTarget(props) {
+	const { snapshot, targetToken, underlying, decimals, liquidationThresholds } = props;
+	const decimalsByToken = new AddressMap(Object.entries(decimals));
+	const lts = new AddressMap(Object.entries(liquidationThresholds));
+	const underlyingDecimals = decimalsByToken.get(underlying) ?? 18;
+	const underlyingBalance = snapshot.assets.find((a) => isAddressEqual(a.token, underlying))?.balance ?? 0n;
+	const ltUnderlying = BigInt(lts.get(underlying) ?? 0);
+	const effectiveDebt = (snapshot.totalDebt - underlyingBalance * ltUnderlying / PERCENTAGE_FACTOR) * WAD / 10n ** BigInt(underlyingDecimals);
+	const targetDecimals = decimalsByToken.get(targetToken) ?? 18;
+	const targetBalance = snapshot.assets.find((a) => isAddressEqual(a.token, targetToken))?.balance ?? 0n;
+	const effectiveTargetBalance = targetBalance * WAD / 10n ** BigInt(targetDecimals);
+	const lpLT = BigInt(lts.get(targetToken) ?? 0);
+	if (targetBalance <= 10n || lpLT <= 0n) return 0n;
+	return effectiveDebt * PRICE_DECIMALS * PERCENTAGE_FACTOR / (effectiveTargetBalance * lpLT);
+}
+//#endregion
+export { calcLiquidationPriceForTarget };

package/dist/esm/sdk/positions/calcTimeToLiquidationMs.js

@@ -0,0 +1,17 @@
+import { PERCENTAGE_DECIMALS, PERCENTAGE_FACTOR, SECONDS_PER_YEAR } from "../constants/math.js";
+//#region src/sdk/positions/calcTimeToLiquidationMs.ts
+/**
+* Estimated milliseconds until `healthFactorBps` decays to `10000` (1.0)
+* while the debt grows at `totalBorrowRateOnDebt` (basis points relative to
+* the debt, as {@link BorrowRateBreakdown.totalOnDebt} reports it).
+*
+* `null` when the account is already at or under the liquidation threshold,
+* or when the debt carries no borrow rate at all. Formula is in parity with
+* the legacy `getTimeToLiquidation`.
+**/
+function calcTimeToLiquidationMs(healthFactorBps, totalBorrowRateOnDebt) {
+	if (BigInt(healthFactorBps) <= 10000n || totalBorrowRateOnDebt === 0n) return null;
+	return (BigInt(healthFactorBps) - PERCENTAGE_FACTOR) * (BigInt(SECONDS_PER_YEAR) * PERCENTAGE_FACTOR * PERCENTAGE_DECIMALS / totalBorrowRateOnDebt) * 1000n / PERCENTAGE_FACTOR;
+}
+//#endregion
+export { calcTimeToLiquidationMs };

package/dist/esm/sdk/positions/index.js

@@ -1,4 +1,9 @@
+import { calcBorrowRate } from "./calcBorrowRate.js";
+import { calcHealthFactor } from "./calcHealthFactor.js";
+import { calcLiquidationPriceForTarget } from "./calcLiquidationPriceForTarget.js";
+import { calcLiquidationPrice } from "./calcLiquidationPrice.js";
+import { calcTimeToLiquidationMs } from "./calcTimeToLiquidationMs.js";
 import { MultichainPositionsService } from "./MultichainPositionsService.js";
+import { accountSnapshotFromCreditAccountData } from "./types.js";
 import { PositionsService } from "./PositionsService.js";
-import "./types.js";
-export { MultichainPositionsService, PositionsService };
+export { MultichainPositionsService, PositionsService, accountSnapshotFromCreditAccountData, calcBorrowRate, calcHealthFactor, calcLiquidationPrice, calcLiquidationPriceForTarget, calcTimeToLiquidationMs };

package/dist/esm/sdk/positions/types.js

@@ -1 +1,31 @@
-export {};
+import "../constants/math.js";
+//#region src/sdk/positions/types.ts
+/**
+* Builds an {@link AccountSnapshot} from on-chain credit account data: the
+* enabled, above-dust tokens become assets and quotas, and `totalDebt` is
+* principal plus accrued interest and fees.
+**/
+function accountSnapshotFromCreditAccountData(ca) {
+	const assets = [];
+	const quotas = [];
+	for (const t of ca.tokens) {
+		if ((t.mask & ca.enabledTokensMask) === 0n || t.balance <= 10n) continue;
+		assets.push({
+			token: t.token,
+			balance: t.balance
+		});
+		quotas.push({
+			token: t.token,
+			balance: t.quota
+		});
+	}
+	return {
+		creditManager: ca.creditManager,
+		assets,
+		quotas,
+		totalDebt: ca.debt + ca.accruedInterest + ca.accruedFees,
+		totalValue: ca.totalValue
+	};
+}
+//#endregion
+export { accountSnapshotFromCreditAccountData };

package/dist/esm/sdk/utils/viem/simulateWithPriceUpdates.js

@@ -1,6 +1,6 @@
 import { errorAbis } from "../../../abi/errors.js";
-import { iUpdatablePriceFeedAbi } from "../../../abi/iUpdatablePriceFeed.js";
 import { generateCastTraceCall } from "./cast.js";
+import { iUpdatablePriceFeedAbi } from "../../../abi/iUpdatablePriceFeed.js";
 import { simulateMulticall } from "./simulateMulticall.js";
 import { BaseError, CallExecutionError, ContractFunctionRevertedError, decodeFunctionData, decodeFunctionResult, encodeFunctionData, parseAbi } from "viem";
 import { getAction, parseAccount } from "viem/utils";

package/dist/types/common-utils/utils/apy/get-single-quota-borrow-rate.d.ts

@@ -6,6 +6,8 @@ interface GetSingleQuotaBorrowRateRate extends CalcQuotaBorrowRateProps {
 /**
  * Under the hood sums up rates for all given quotas and then multiplies them by 1+feeInterest,
  * but it is expected that the ONLY quota will be passed
+ *
+ * @deprecated Use `calcBorrowRate` from `sdk/positions` instead.
  */
 declare function getSingleQuotaBorrowRate(props: GetSingleQuotaBorrowRateRate): bigint;
 //#endregion

package/dist/types/common-utils/utils/creditAccount/calc-health-factor.d.ts

@@ -23,6 +23,9 @@ interface CalcHealthFactorProps {
  * @param props Credit account balances, quotas, prices, thresholds, and debt context.
  * @returns Health factor as a number in `PERCENTAGE_FACTOR` scale,
  * or `65535` when debt is zero.
+ *
+ * @deprecated Use `calcHealthFactor` from `sdk/positions` instead; this
+ * wrapper only maps the legacy props onto an `AccountSnapshot`.
  */
 declare function calcHealthFactor({ assets, quotas, quotasInfo, liquidationThresholds, underlyingToken, debt, prices, tokensList }: CalcHealthFactorProps): number;
 //#endregion

package/dist/types/common-utils/utils/creditAccount/calc-quota-borrow-rate.d.ts

@@ -16,6 +16,8 @@ interface CalcQuotaBorrowRateProps {
  *
  * @param props Quota balances and per-token quota rates.
  * @returns Sum of `balance * rate` terms in percentage-factor scale.
+ *
+ * @deprecated Use `calcBorrowRate` from `sdk/positions` instead.
  */
 declare function calcQuotaBorrowRate({ quotas, quotaRates }: CalcQuotaBorrowRateProps): bigint;
 //#endregion

package/dist/types/common-utils/utils/creditAccount/get-time-to-liquidation.d.ts

@@ -13,6 +13,9 @@ interface TimeToLiquidationProps {
  * @param props Current health factor and `totalBorrowRate * debt` term.
  * @returns Milliseconds to liquidation as `bigint`, or `null` when already at/under
  * liquidation threshold or when borrow-rate exposure is zero.
+ *
+ * @deprecated Use `calcTimeToLiquidationMs` from `sdk/positions` instead;
+ * this wrapper only forwards to the new implementation.
  */
 declare function getTimeToLiquidation({ healthFactor, totalBorrowRate_debt }: TimeToLiquidationProps): bigint | null;
 //#endregion

package/dist/types/common-utils/utils/creditAccount/liquidation-price.d.ts

@@ -22,6 +22,9 @@ interface LiquidationPriceProps {
  * @param props Debt context, assets, thresholds, and token metadata.
  * @returns Target token price in `PRICE_DECIMALS` precision that corresponds
  * to liquidation boundary; returns `0n` when target balance or LT is non-positive.
+ *
+ * @deprecated Use `calcLiquidationPriceForTarget` from `sdk/positions`
+ * instead; this wrapper only maps the legacy props onto an `AccountSnapshot`.
  */
 declare function liquidationPrice({ liquidationThresholds, debt, underlyingToken, targetToken, assets, tokensList }: LiquidationPriceProps): bigint;
 //#endregion

package/dist/types/model/index.d.ts

@@ -5,13 +5,13 @@ import { ChainScopedFilter, FILTER_ALL, FilterAll, Filterable, isFilterSet } fro
 import { booleanParamSchema, encodeFlag, filterAllSchema, filterable } from "./filters.schema.js";
 import { ApyBreakdown, Opportunity, OpportunityBase, OpportunityDetail, OpportunityFilter, OpportunityId, OpportunityKey, OpportunityKind, PointRewards, PointsProgram, PoolOpportunity, PoolOpportunityDetail, PoolOpportunityKey, PoolOpportunityRef, PriceFeedData, PriceFeedSummary, QuotaAsset, RateCurve, RateCurvePoint, Rewards, StrategyOpportunity, StrategyOpportunityDetail, StrategyOpportunityKey, StrategyOpportunityRef, TokenRewards, matchesOpportunityFilter, opportunityId, poolOpportunityId, strategyOpportunityId } from "./opportunities.js";
 import { DelayedReceivedAsset, InstantReceivedAsset, LiquidatableAccount, LiquidatableAccountFilter, LiquidationApproval, LiquidationDetails, LiquidationPosition, ReceivedAsset, matchesLiquidatableAccountFilter } from "./liquidations.js";
-import { PnlBreakdown, PointsProgramPnL, PointsRewardsPnL, PoolPosition, PoolPositionKey, PoolPositionRef, Position, PositionCollateral, PositionFilter, PositionId, PositionKey, PositionKind, RewardsPnL, StrategyPosition, StrategyPositionKey, StrategyPositionRef, TokenRewardsPnL, liquidationPositionId, matchesPositionFilter, poolPositionId, positionId, strategyPositionId } from "./positions.js";
+import { BorrowRateBreakdown, PnlBreakdown, PointsProgramPnL, PointsRewardsPnL, PoolPosition, PoolPositionKey, PoolPositionRef, Position, PositionCollateral, PositionFilter, PositionId, PositionKey, PositionKind, PositionMetrics, RewardsPnL, StrategyPosition, StrategyPositionKey, StrategyPositionRef, TokenRewardsPnL, liquidationPositionId, matchesPositionFilter, poolPositionId, positionId, strategyPositionId } from "./positions.js";
 import { HistoryChartMetadata, HistoryMetric, HistoryPoint, HistoryRange, HistorySeries, OpportunityHistoryQuery, POOL_HISTORY_METRICS, POOL_POSITION_HISTORY_METRICS, PoolHistoryMetric, PoolPositionHistoryMetric, PositionHistoryMetric, PositionHistoryQuery, STRATEGY_HISTORY_METRICS, STRATEGY_POSITION_HISTORY_METRICS, StrategyHistoryMetric, StrategyPositionHistoryMetric } from "./history.js";
 import { historyChartMetadataSchema, historyMetricSchema, historyPointSchema, historyRangeSchema, historySeriesSchema, opportunityHistoryQuerySchema, poolHistoryMetricSchema, poolPositionHistoryMetricSchema, positionHistoryMetricSchema, positionHistoryQuerySchema, strategyHistoryMetricSchema, strategyPositionHistoryMetricSchema } from "./history.schema.js";
 import { delayedReceivedAssetSchema, instantReceivedAssetSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionSchema, receivedAssetSchema } from "./liquidations.schema.js";
 import { apyBreakdownSchema, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterQueryParamsSchema, opportunityFilterQuerySchema, opportunityFilterSchema, opportunityKeySchema, opportunityKindSchema, opportunitySchema, pointRewardsSchema, pointsProgramSchema, poolOpportunityDetailSchema, poolOpportunityKeySchema, poolOpportunitySchema, priceFeedDataSchema, priceFeedSummarySchema, quotaAssetSchema, rateCurvePointSchema, rateCurveSchema, rewardsSchema, strategyOpportunityDetailSchema, strategyOpportunityKeySchema, strategyOpportunitySchema, tokenRewardsSchema } from "./opportunities.schema.js";
-import { pnlBreakdownSchema, pointsProgramPnLSchema, pointsRewardsPnLSchema, poolPositionKeySchema, poolPositionSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionKeySchema, positionKindSchema, positionSchema, rewardsPnLSchema, strategyPositionKeySchema, strategyPositionSchema, tokenRewardsPnLSchema } from "./positions.schema.js";
+import { borrowRateBreakdownSchema, pnlBreakdownSchema, pointsProgramPnLSchema, pointsRewardsPnLSchema, poolPositionKeySchema, poolPositionSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionKeySchema, positionKindSchema, positionSchema, rewardsPnLSchema, strategyPositionKeySchema, strategyPositionSchema, tokenRewardsPnLSchema } from "./positions.schema.js";
 import { amountSchema, assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenAmountSchema, tokenSchema, txCallSchema } from "./primitives.schema.js";
 import { ChainFailed, ChainMetadata, ChainScoped, ChainSucceeded, DataResponse, DataSource, ResponseMetadata } from "./response.js";
 import { chainFailedSchema, chainMetadataSchema, chainSucceededSchema, dataSourceSchema, responseMetadataSchema, responseSchema } from "./response.schema.js";
-export { Amount, ApyBreakdown, AssetType, Bps, ChainFailed, ChainId, ChainMetadata, ChainScoped, ChainScopedFilter, ChainSucceeded, Curator, CuratorName, DataResponse, DataSource, DelayedReceivedAsset, FILTER_ALL, FilterAll, Filterable, HistoryChartMetadata, HistoryMetric, HistoryPoint, HistoryRange, HistorySeries, InstantReceivedAsset, Leverage, LiquidatableAccount, LiquidatableAccountFilter, LiquidationApproval, LiquidationDetails, LiquidationPosition, Opportunity, OpportunityBase, OpportunityDetail, OpportunityFilter, OpportunityHistoryQuery, OpportunityId, OpportunityKey, OpportunityKind, POOL_HISTORY_METRICS, POOL_POSITION_HISTORY_METRICS, PnlBreakdown, PointRewards, PointsProgram, PointsProgramPnL, PointsRewardsPnL, PoolHistoryMetric, PoolOpportunity, PoolOpportunityDetail, PoolOpportunityKey, PoolOpportunityRef, PoolPosition, PoolPositionHistoryMetric, PoolPositionKey, PoolPositionRef, Position, PositionCollateral, PositionFilter, PositionHistoryMetric, PositionHistoryQuery, PositionId, PositionKey, PositionKind, PriceFeedData, PriceFeedSummary, QuotaAsset, RateCurve, RateCurvePoint, ReceivedAsset, ResponseMetadata, Rewards, RewardsPnL, STRATEGY_HISTORY_METRICS, STRATEGY_POSITION_HISTORY_METRICS, StrategyHistoryMetric, StrategyOpportunity, StrategyOpportunityDetail, StrategyOpportunityKey, StrategyOpportunityRef, StrategyPosition, StrategyPositionHistoryMetric, StrategyPositionKey, StrategyPositionRef, Timestamp, Token, TokenAmount, TokenRewards, TokenRewardsPnL, TxCall, amountSchema, apyBreakdownSchema, assetTypeSchema, booleanParamSchema, bpsSchema, chainFailedSchema, chainIdSchema, chainMetadataSchema, chainSucceededSchema, curatorNameSchema, curatorSchema, dataSourceSchema, delayedReceivedAssetSchema, encodeFlag, filterAllSchema, filterable, historyChartMetadataSchema, historyMetricSchema, historyPointSchema, historyRangeSchema, historySeriesSchema, instantReceivedAssetSchema, isFilterSet, leverageSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionId, liquidationPositionSchema, matchesLiquidatableAccountFilter, matchesOpportunityFilter, matchesPositionFilter, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterQueryParamsSchema, opportunityFilterQuerySchema, opportunityFilterSchema, opportunityHistoryQuerySchema, opportunityId, opportunityKeySchema, opportunityKindSchema, opportunitySchema, pnlBreakdownSchema, pointRewardsSchema, pointsProgramPnLSchema, pointsProgramSchema, pointsRewardsPnLSchema, poolHistoryMetricSchema, poolOpportunityDetailSchema, poolOpportunityId, poolOpportunityKeySchema, poolOpportunitySchema, poolPositionHistoryMetricSchema, poolPositionId, poolPositionKeySchema, poolPositionSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionHistoryMetricSchema, positionHistoryQuerySchema, positionId, positionKeySchema, positionKindSchema, positionSchema, priceFeedDataSchema, priceFeedSummarySchema, quotaAssetSchema, rateCurvePointSchema, rateCurveSchema, receivedAssetSchema, responseMetadataSchema, responseSchema, rewardsPnLSchema, rewardsSchema, strategyHistoryMetricSchema, strategyOpportunityDetailSchema, strategyOpportunityId, strategyOpportunityKeySchema, strategyOpportunitySchema, strategyPositionHistoryMetricSchema, strategyPositionId, strategyPositionKeySchema, strategyPositionSchema, timestampSchema, tokenAmountSchema, tokenRewardsPnLSchema, tokenRewardsSchema, tokenSchema, txCallSchema };
+export { Amount, ApyBreakdown, AssetType, BorrowRateBreakdown, Bps, ChainFailed, ChainId, ChainMetadata, ChainScoped, ChainScopedFilter, ChainSucceeded, Curator, CuratorName, DataResponse, DataSource, DelayedReceivedAsset, FILTER_ALL, FilterAll, Filterable, HistoryChartMetadata, HistoryMetric, HistoryPoint, HistoryRange, HistorySeries, InstantReceivedAsset, Leverage, LiquidatableAccount, LiquidatableAccountFilter, LiquidationApproval, LiquidationDetails, LiquidationPosition, Opportunity, OpportunityBase, OpportunityDetail, OpportunityFilter, OpportunityHistoryQuery, OpportunityId, OpportunityKey, OpportunityKind, POOL_HISTORY_METRICS, POOL_POSITION_HISTORY_METRICS, PnlBreakdown, PointRewards, PointsProgram, PointsProgramPnL, PointsRewardsPnL, PoolHistoryMetric, PoolOpportunity, PoolOpportunityDetail, PoolOpportunityKey, PoolOpportunityRef, PoolPosition, PoolPositionHistoryMetric, PoolPositionKey, PoolPositionRef, Position, PositionCollateral, PositionFilter, PositionHistoryMetric, PositionHistoryQuery, PositionId, PositionKey, PositionKind, PositionMetrics, PriceFeedData, PriceFeedSummary, QuotaAsset, RateCurve, RateCurvePoint, ReceivedAsset, ResponseMetadata, Rewards, RewardsPnL, STRATEGY_HISTORY_METRICS, STRATEGY_POSITION_HISTORY_METRICS, StrategyHistoryMetric, StrategyOpportunity, StrategyOpportunityDetail, StrategyOpportunityKey, StrategyOpportunityRef, StrategyPosition, StrategyPositionHistoryMetric, StrategyPositionKey, StrategyPositionRef, Timestamp, Token, TokenAmount, TokenRewards, TokenRewardsPnL, TxCall, amountSchema, apyBreakdownSchema, assetTypeSchema, booleanParamSchema, borrowRateBreakdownSchema, bpsSchema, chainFailedSchema, chainIdSchema, chainMetadataSchema, chainSucceededSchema, curatorNameSchema, curatorSchema, dataSourceSchema, delayedReceivedAssetSchema, encodeFlag, filterAllSchema, filterable, historyChartMetadataSchema, historyMetricSchema, historyPointSchema, historyRangeSchema, historySeriesSchema, instantReceivedAssetSchema, isFilterSet, leverageSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionId, liquidationPositionSchema, matchesLiquidatableAccountFilter, matchesOpportunityFilter, matchesPositionFilter, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterQueryParamsSchema, opportunityFilterQuerySchema, opportunityFilterSchema, opportunityHistoryQuerySchema, opportunityId, opportunityKeySchema, opportunityKindSchema, opportunitySchema, pnlBreakdownSchema, pointRewardsSchema, pointsProgramPnLSchema, pointsProgramSchema, pointsRewardsPnLSchema, poolHistoryMetricSchema, poolOpportunityDetailSchema, poolOpportunityId, poolOpportunityKeySchema, poolOpportunitySchema, poolPositionHistoryMetricSchema, poolPositionId, poolPositionKeySchema, poolPositionSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionHistoryMetricSchema, positionHistoryQuerySchema, positionId, positionKeySchema, positionKindSchema, positionSchema, priceFeedDataSchema, priceFeedSummarySchema, quotaAssetSchema, rateCurvePointSchema, rateCurveSchema, receivedAssetSchema, responseMetadataSchema, responseSchema, rewardsPnLSchema, rewardsSchema, strategyHistoryMetricSchema, strategyOpportunityDetailSchema, strategyOpportunityId, strategyOpportunityKeySchema, strategyOpportunitySchema, strategyPositionHistoryMetricSchema, strategyPositionId, strategyPositionKeySchema, strategyPositionSchema, timestampSchema, tokenAmountSchema, tokenRewardsPnLSchema, tokenRewardsSchema, tokenSchema, txCallSchema };