@gearbox-protocol/sdk 15.1.0-next.9 → 16.0.0-next.1

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

@@ -2,6 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_sdk_utils_AddressMap = require("../../utils/AddressMap.js");
 const require_sdk_utils_AddressSet = require("../../utils/AddressSet.js");
 const require_sdk_constants_address_provider = require("../../constants/address-provider.js");
+const require_sdk_constants_addresses = require("../../constants/addresses.js");
 require("../../constants/math.js");
 const require_sdk_constants_versions = require("../../constants/versions.js");
 require("../../constants/index.js");
@@ -109,10 +110,12 @@ var PriceOracleBaseContract = class extends require_sdk_base_BaseContract.BaseCo
 	**/
 	convert(from, to, amount, reserve = false) {
 		if (from === to) return amount;
-		const fromPrice = reserve ? this.reservePrice(from) : this.mainPrice(from);
-		const fromScale = 10n ** BigInt(this.tokensMeta.decimals(from));
-		const toPrice = reserve ? this.reservePrice(to) : this.mainPrice(to);
-		const toScale = 10n ** BigInt(this.tokensMeta.decimals(to));
+		const fromToken = this.#priceableToken(from);
+		const toToken = this.#priceableToken(to);
+		const fromPrice = reserve ? this.reservePrice(fromToken) : this.mainPrice(fromToken);
+		const fromScale = 10n ** BigInt(this.tokensMeta.decimals(fromToken));
+		const toPrice = reserve ? this.reservePrice(toToken) : this.mainPrice(toToken);
+		const toScale = 10n ** BigInt(this.tokensMeta.decimals(toToken));
 		return amount * fromPrice * toScale / (toPrice * fromScale);
 	}
 	/**
@@ -120,8 +123,9 @@ var PriceOracleBaseContract = class extends require_sdk_base_BaseContract.BaseCo
 	**/
 	convertToUSD(from, amount, reserve = false) {
 		if (amount === 0n) return 0n;
-		const price = reserve ? this.reservePrice(from) : this.mainPrice(from);
-		const scale = 10n ** BigInt(this.tokensMeta.decimals(from));
+		const token = this.#priceableToken(from);
+		const price = reserve ? this.reservePrice(token) : this.mainPrice(token);
+		const scale = 10n ** BigInt(this.tokensMeta.decimals(token));
 		return amount * price / scale;
 	}
 	/**
@@ -129,8 +133,20 @@ var PriceOracleBaseContract = class extends require_sdk_base_BaseContract.BaseCo
 	**/
 	convertFromUSD(to, amount, reserve = false) {
 		if (amount === 0n) return 0n;
-		const price = reserve ? this.reservePrice(to) : this.mainPrice(to);
-		return amount * 10n ** BigInt(this.tokensMeta.decimals(to)) / price;
+		const token = this.#priceableToken(to);
+		const price = reserve ? this.reservePrice(token) : this.mainPrice(token);
+		return amount * 10n ** BigInt(this.tokensMeta.decimals(token)) / price;
+	}
+	/**
+	* {@inheritDoc IPriceOracleContract.safeConvert}
+	**/
+	safeConvert(from, to, amount) {
+		try {
+			return this.convert(from, to, amount);
+		} catch (e) {
+			this.logger?.debug(`cannot convert ${this.labelAddress(from)} to ${this.labelAddress(to)}: ${e}`);
+			return null;
+		}
 	}
 	/**
 	* {@inheritDoc IPriceOracleContract.safeConvertToUSD}
@@ -163,12 +179,32 @@ var PriceOracleBaseContract = class extends require_sdk_base_BaseContract.BaseCo
 	* {@inheritDoc IPriceOracleContract.toTokenAmount}
 	**/
 	toTokenAmount = (token, value) => {
+		if ((0, viem.isAddressEqual)(token, "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE")) {
+			const { symbol, name, decimals } = this.sdk.chain.nativeCurrency;
+			return {
+				token: {
+					chainId: this.sdk.chainId,
+					address: require_sdk_constants_addresses.NATIVE_ADDRESS,
+					symbol,
+					name,
+					decimals
+				},
+				...this.toAmount(token, value)
+			};
+		}
 		return {
 			token: this.tokensMeta.mustGetToken(token),
 			...this.toAmount(token, value)
 		};
 	};
 	/**
+	* The native pseudo-address has no feed of its own; it is priced through
+	* WETH. All other tokens price as themselves.
+	**/
+	#priceableToken(token) {
+		return (0, viem.isAddressEqual)(token, "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE") ? this.sdk.addressProvider.getAddress(require_sdk_constants_address_provider.AP_WETH_TOKEN, 0) : token;
+	}
+	/**
 	* {@inheritDoc IPriceOracleContract.priceFeedData}
 	**/
 	priceFeedData(token) {

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

@@ -137,6 +137,20 @@ var PoolV310Contract = class extends require_sdk_base_BaseContract.BaseContract
 			]
 		});
 	}
+	/**
+	* Burns as many of the owner's shares as it takes to send `assets` of the
+	* underlying to the receiver.
+	*/
+	withdraw(assets, receiver, owner) {
+		return this.createRawTx({
+			functionName: "withdraw",
+			args: [
+				assets,
+				receiver,
+				owner
+			]
+		});
+	}
 	stringifyFunctionParams(params) {
 		switch (params.functionName) {
 			case "deposit": {

package/dist/cjs/sdk/market/pool/math.js

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_sdk_constants_math = require("../../constants/math.js");
+const require_sdk_market_math = require("../math.js");
 //#region src/sdk/market/pool/math.ts
 const FULL = Number(require_sdk_constants_math.PERCENTAGE_FACTOR);
 /**
@@ -18,6 +19,19 @@ function borrowRateAtUtilization(utilization, params) {
 	return Math.round(Rbase + Rslope1 + Rslope2 + Rslope3 * (u - U2) / Math.max(FULL - U2, 1));
 }
 /**
+* Pool utilization after a change in available liquidity, in basis points.
+*
+* Borrowing takes liquidity out (`availableLiquidityChange < 0`, utilization
+* rises), repaying puts it back (`> 0`, utilization falls). Expected liquidity
+* is treated as unchanged, which is what a borrow does to it; a repayment
+* settles accrued interest the pool had already counted, so the same holds
+* there to within the fees.
+**/
+function utilizationAfterLiquidityChange(expectedLiquidity, availableLiquidity, availableLiquidityChange) {
+	const borrowed = expectedLiquidity - (availableLiquidity + availableLiquidityChange);
+	return require_sdk_market_math.calcUtilization(borrowed, expectedLiquidity);
+}
+/**
 * Rate depositors earn at a given utilization, in basis points: the interest
 * borrowers pay, spread over the pool's whole liquidity.
 **/
@@ -42,3 +56,4 @@ function rateCurveUtilizations(params) {
 exports.borrowRateAtUtilization = borrowRateAtUtilization;
 exports.rateCurveUtilizations = rateCurveUtilizations;
 exports.supplyRateAtUtilization = supplyRateAtUtilization;
+exports.utilizationAfterLiquidityChange = utilizationAfterLiquidityChange;

package/dist/cjs/sdk/market/strategyName.js

@@ -0,0 +1,17 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region src/sdk/market/strategyName.ts
+/**
+* Display name of a leveraged strategy: the target collateral over the
+* borrowed underlying, e.g. `"wstETH / WETH"`.
+*
+* Uses each token's display {@link Token.symbol}, which may already be a
+* curated pretty name or a `"source -> target"` redemption rewrite.
+*
+* @param target - Collateral the position is built around.
+* @param underlying - Token the position borrows.
+**/
+function strategyName(target, underlying) {
+	return `${target.symbol} / ${underlying.symbol}`;
+}
+//#endregion
+exports.strategyName = strategyName;

package/dist/cjs/sdk/opportunities/OpportunitiesService.js

@@ -37,11 +37,13 @@ var OpportunitiesService = class extends require_sdk_base_SDKConstruct.SDKConstr
 	* A single strategy opportunity plus the rate curve of the pool it borrows
 	* from and the price feeds its liquidation price depends on.
 	*
-	* @throws If the credit manager is unknown, or does not accept the requested
-	* collateral as a strategy.
+	* @throws If the credit manager is unknown, or does not currently offer a
+	* strategy.
 	**/
 	async getStrategy(key) {
-		return this.sdk.marketRegister.findByCreditManager(key.creditManager).strategyOpportunityDetail(key.creditManager, key.targetCollateral);
+		const detail = this.sdk.marketRegister.findCreditManager(key.creditManager).strategyOpportunityDetail();
+		if (!detail) throw new Error(`credit manager ${key.creditManager} does not currently offer a strategy`);
+		return detail;
 	}
 };
 //#endregion

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

@@ -15,6 +15,12 @@ const require_sdk_market_zapper_IERC20ZapperContract = require("../market/zapper
 const require_sdk_market_zapper_IETHZapperContract = require("../market/zapper/IETHZapperContract.js");
 require("../market/index.js");
 //#region src/sdk/pools/PoolService.ts
+/**
+* Haircut on reported pool liquidity, so a withdrawal sized against the reported
+* figure is not defeated by rounding in the share conversion.
+*/
+const LIQUIDITY_SAFETY_NUM = 99999n;
+const LIQUIDITY_SAFETY_DENOM = 100000n;
 var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	/**
 	* {@inheritDoc IPoolsService.getDepositTokensIn}
@@ -116,10 +122,87 @@ var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 		return this.#withdrawalTokensOut(pool, tokenIn, true);
 	}
 	/**
+	* {@inheritDoc IPoolsService.simulateDeposit}
+	*/
+	simulateDeposit(props) {
+		const { pool: poolAddr, amount } = props;
+		const { pool } = this.sdk.marketRegister.findByPool(poolAddr);
+		const tokenIn = props.tokenIn ?? pool.underlying;
+		const tokenOut = this.#resolveTokenOut(props.tokenOut, () => this.getDepositTokensOut(poolAddr, tokenIn), {
+			poolAddr,
+			tokenIn,
+			operation: "deposit"
+		});
+		const { zapper } = this.getDepositMetadata(poolAddr, tokenIn, tokenOut);
+		return {
+			tokenIn: {
+				token: tokenIn,
+				balance: amount
+			},
+			tokenOut: {
+				token: tokenOut,
+				balance: toShares(pool.pool, amount)
+			},
+			zapper: zapper?.baseParams.addr
+		};
+	}
+	/**
+	* {@inheritDoc IPoolsService.simulateWithdraw}
+	*/
+	simulateWithdraw(props) {
+		const { pool: poolAddr, amount } = props;
+		const { pool } = this.sdk.marketRegister.findByPool(poolAddr);
+		const tokenIn = props.tokenIn ?? poolAddr;
+		const tokenOut = this.#resolveTokenOut(props.tokenOut, () => this.getWithdrawalTokensOut(poolAddr, tokenIn), {
+			poolAddr,
+			tokenIn,
+			operation: "withdrawal"
+		});
+		const { zapper } = this.getWithdrawalMetadata(poolAddr, tokenIn, tokenOut);
+		return {
+			tokenIn: {
+				token: tokenIn,
+				balance: toSharesUp(pool.pool, amount)
+			},
+			tokenOut: {
+				token: tokenOut,
+				balance: amount
+			},
+			zapper: zapper?.baseParams.addr,
+			availableLiquidity: pool.pool.availableLiquidity * LIQUIDITY_SAFETY_NUM / LIQUIDITY_SAFETY_DENOM
+		};
+	}
+	/**
+	* {@inheritDoc IPoolsService.simulateRedeem}
+	*/
+	simulateRedeem(props) {
+		const { pool: poolAddr, amount } = props;
+		const { pool } = this.sdk.marketRegister.findByPool(poolAddr);
+		const tokenIn = props.tokenIn ?? poolAddr;
+		const tokenOut = this.#resolveTokenOut(props.tokenOut, () => this.getWithdrawalTokensOut(poolAddr, tokenIn), {
+			poolAddr,
+			tokenIn,
+			operation: "withdrawal"
+		});
+		const { zapper } = this.getWithdrawalMetadata(poolAddr, tokenIn, tokenOut);
+		return {
+			tokenIn: {
+				token: tokenIn,
+				balance: amount
+			},
+			tokenOut: {
+				token: tokenOut,
+				balance: toAssets(pool.pool, amount)
+			},
+			zapper: zapper?.baseParams.addr,
+			availableLiquidity: pool.pool.availableLiquidity * LIQUIDITY_SAFETY_NUM / LIQUIDITY_SAFETY_DENOM
+		};
+	}
+	/**
 	* {@inheritDoc IPoolsService.removeLiquidity}
 	*/
 	removeLiquidity(props) {
-		const { pool, amount, meta, wallet, permit } = props;
+		const { pool, amount, meta, wallet, permit, mode = "withdraw" } = props;
 		const underlying = this.#describeUnderlying(pool);
 		if (this.sdk.tokensMeta.isRWAUnderlying(underlying)) {
 			if (underlying.contractType === "RWA_UNDERLYING::ON_DEMAND") {
@@ -140,8 +223,10 @@ var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 				};
 			}
 		}
+		const poolContract = this.sdk.marketRegister.findByPool(pool).pool.pool;
 		if (meta.zapper instanceof require_sdk_market_zapper_IETHZapperContract.IETHZapperContract || meta.zapper instanceof require_sdk_market_zapper_IERC20ZapperContract.IERC20ZapperContract) {
-			const tx = permit ? meta.zapper.redeemWithPermit(amount, wallet, permit.deadline, permit.v, permit.r, permit.s) : meta.zapper.redeem(amount, wallet);
+			const shares = mode === "withdraw" ? toSharesUp(poolContract, amount) : amount;
+			const tx = permit ? meta.zapper.redeemWithPermit(shares, wallet, permit.deadline, permit.v, permit.r, permit.s) : meta.zapper.redeem(shares, wallet);
 			return {
 				tx,
 				calls: [{
@@ -150,7 +235,7 @@ var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 				}]
 			};
 		}
-		const tx = this.sdk.marketRegister.findByPool(pool).pool.pool.redeem(amount, wallet, wallet);
+		const tx = mode === "withdraw" ? poolContract.withdraw(amount, wallet, wallet) : poolContract.redeem(amount, wallet, wallet);
 		return {
 			tx,
 			calls: [{
@@ -310,6 +395,18 @@ var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 			type
 		};
 	}
+	/**
+	* Picks the route output when the caller left it open.
+	*
+	* Only an unambiguous single route can be defaulted: with several outputs the
+	* choice is the caller's, and with none there is no route to preview.
+	*/
+	#resolveTokenOut(requested, candidates, ctx) {
+		if (requested) return requested;
+		const options = candidates();
+		if (options.length !== 1) throw new Error(`tokenOut is required: ${options.length} ${ctx.operation} routes from ${this.labelAddress(ctx.tokenIn)} on pool ${this.labelAddress(ctx.poolAddr)}`);
+		return options[0];
+	}
 	#describeUnderlying(pool) {
 		const market = this.sdk.marketRegister.findByPool(pool);
 		return this.sdk.tokensMeta.mustGet(market.underlying);
@@ -318,7 +415,7 @@ var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 		const { pool } = market.pool;
 		return {
 			kind: "pool",
-			name: market.poolName,
+			name: this.sdk.tokensMeta.mustGetToken(pool.address).name,
 			chainId: this.chainId,
 			pool: pool.address,
 			netValue: {
@@ -329,5 +426,37 @@ var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 		};
 	}
 };
+/**
+* Shares minted for `assets`, as `previewDeposit` would report them.
+*
+* Both directions convert through the diesel rate — underlying per RAY of
+* shares — because that is the rate the pool itself divides by, and the only
+* exact one the SDK holds: `totalAssets` is this rate multiplied out, so
+* converting back through it costs a wei on large amounts. Rounds down, as
+* minting does.
+*/
+function toShares(pool, assets) {
+	const { dieselRate } = pool;
+	return dieselRate === 0n ? assets : assets * require_sdk_constants_math.RAY / dieselRate;
+}
+/**
+* Shares a withdrawal of `assets` burns, as `previewWithdraw` would report
+* them: {@link toShares} rounded the other way, since the burn has to cover
+* the payout the caller asked for.
+*/
+function toSharesUp(pool, assets) {
+	const { dieselRate } = pool;
+	return dieselRate === 0n ? assets : (assets * require_sdk_constants_math.RAY + dieselRate - 1n) / dieselRate;
+}
+/**
+* Underlying paid out for `shares`, as `previewRedeem` would report it:
+* {@link toShares} run backwards, less the pool's withdrawal fee.
+*/
+function toAssets(pool, shares) {
+	const { dieselRate, withdrawFee } = pool;
+	return (dieselRate === 0n ? shares : shares * dieselRate / require_sdk_constants_math.RAY) * (require_sdk_constants_math.PERCENTAGE_FACTOR - withdrawFee) / require_sdk_constants_math.PERCENTAGE_FACTOR;
+}
 //#endregion
 exports.PoolService = PoolService;
+exports.toShares = toShares;
+exports.toSharesUp = toSharesUp;

package/dist/cjs/sdk/pools/index.js

@@ -2,3 +2,5 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_sdk_pools_PoolService = require("./PoolService.js");
 require("./types.js");
 exports.PoolService = require_sdk_pools_PoolService.PoolService;
+exports.toShares = require_sdk_pools_PoolService.toShares;
+exports.toSharesUp = require_sdk_pools_PoolService.toSharesUp;

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

@@ -1,16 +1,17 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_sdk_utils_AddressMap = require("../utils/AddressMap.js");
+const require_sdk_chain_chains = require("../chain/chains.js");
 require("../constants/math.js");
 require("../constants/index.js");
 require("../utils/index.js");
 const require_sdk_base_SDKConstruct = require("../base/SDKConstruct.js");
 require("../base/index.js");
 const require_sdk_market_math = require("../market/math.js");
-const require_sdk_market_credit_dominantCollateral = require("../market/credit/dominantCollateral.js");
+const require_sdk_market_strategyName = require("../market/strategyName.js");
 const require_model_filters = require("../../model/filters.js");
 const require_model_positions = require("../../model/positions.js");
 require("../../model/index.js");
-require("../market/index.js");
+const require_sdk_market_pool_math = require("../market/pool/math.js");
 const require_sdk_positions_calcBorrowRate = require("./calcBorrowRate.js");
 const require_sdk_positions_calcHealthFactor = require("./calcHealthFactor.js");
 const require_sdk_positions_calcLiquidationPrice = require("./calcLiquidationPrice.js");
@@ -73,36 +74,43 @@ var PositionsService = class extends require_sdk_base_SDKConstruct.SDKConstruct
 	/**
 	* Health factor of an account state, in basis points (`10000` = 1.0).
 	**/
-	healthFactor(snapshot) {
+	healthFactor(snapshot, options) {
 		const data = this.#marketData(snapshot);
 		return require_sdk_positions_calcHealthFactor.calcHealthFactor({
 			snapshot,
 			underlying: data.underlying,
 			decimals: data.decimals,
 			prices: data.prices,
+			reservePrices: data.reservePrices,
+			safePrices: options?.safePrices,
 			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.
+	* and per-token quota rates. A projection passes the operation's liquidity
+	* delta via {@link ProjectedPoolOptions} to have the base rate re-quoted at
+	* the post-operation pool utilization.
 	**/
-	borrowRate(snapshot) {
+	borrowRate(snapshot, options) {
 		const data = this.#marketData(snapshot);
 		return require_sdk_positions_calcBorrowRate.calcBorrowRate({
 			snapshot,
-			baseInterestRate: data.baseInterestRate,
+			baseInterestRate: this.#baseInterestRate(snapshot, data, options),
 			feeInterest: data.feeInterest,
-			quotaRates: data.quotaRates
+			quotaRates: data.quotaRates,
+			resolveToken: (address) => this.sdk.tokensMeta.mustGetToken(address)
 		});
 	}
 	/**
 	* 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).
+	* no rate (or the account is already liquidatable). Takes the same
+	* projection options as {@link PositionsService.borrowRate}, so a projected
+	* state decays at the projected rate.
 	**/
-	timeToLiquidation(snapshot) {
+	timeToLiquidation(snapshot, options) {
 		const data = this.#marketData(snapshot);
 		return require_sdk_positions_calcTimeToLiquidationMs.calcTimeToLiquidationMs(require_sdk_positions_calcHealthFactor.calcHealthFactor({
 			snapshot,
@@ -113,12 +121,38 @@ var PositionsService = class extends require_sdk_base_SDKConstruct.SDKConstruct
 			activeQuotas: data.activeQuotas
 		}), BigInt(require_sdk_positions_calcBorrowRate.calcBorrowRate({
 			snapshot,
-			baseInterestRate: data.baseInterestRate,
+			baseInterestRate: this.#baseInterestRate(snapshot, data, options),
 			feeInterest: data.feeInterest,
-			quotaRates: data.quotaRates
+			quotaRates: data.quotaRates,
+			resolveToken: (address) => this.sdk.tokensMeta.mustGetToken(address)
 		}).totalOnDebt));
 	}
 	/**
+	* The base rate a metric is computed at, in ray: the pool's own, or — for a
+	* projection carrying a liquidity delta — the rate the interest model quotes
+	* at the utilization that delta leaves behind. A market whose rate model is
+	* not the linear one has nothing to re-quote from, and keeps the current
+	* rate.
+	*
+	* Callers pass the operation's total-debt change. On a borrow that is the
+	* principal leaving the pool; on a repayment it is the whole transfer back,
+	* interest and fees included. Either way it is the pool's own liquidity
+	* move, to within the share of a repayment the fees take.
+	**/
+	#baseInterestRate(snapshot, data, options) {
+		const delta = options?.availableLiquidityChange;
+		if (!delta) return data.baseInterestRate;
+		const suite = this.sdk.marketRegister.findByCreditManager(snapshot.creditManager).pool;
+		let params;
+		try {
+			params = suite.linearModel.params;
+		} catch {
+			return data.baseInterestRate;
+		}
+		const { pool } = suite;
+		return require_sdk_market_math.bpsToRay(require_sdk_market_pool_math.borrowRateAtUtilization(require_sdk_market_pool_math.utilizationAfterLiquidityChange(pool.expectedLiquidity, pool.availableLiquidity, delta), params));
+	}
+	/**
 	* 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.
@@ -145,19 +179,37 @@ var PositionsService = class extends require_sdk_base_SDKConstruct.SDKConstruct
 		const { pool } = market.pool;
 		const token = this.sdk.tokensMeta.mustGetToken(market.unwrappedUnderlying);
 		const totalDebtValue = ca.debt + ca.accruedInterest + ca.accruedFees;
-		const collateral = require_sdk_market_credit_dominantCollateral.dominantCollateral(ca, market);
+		const target = require_sdk_chain_chains.getAccountTargetCollateral(ca.creditAccount, this.sdk.chainId) ?? suite.strategyTargetCollateral;
 		const snapshot = require_sdk_positions_types.accountSnapshotFromCreditAccountData(ca);
 		const borrowRate = this.borrowRate(snapshot);
 		const timeToLiquidation = this.timeToLiquidation(snapshot);
 		const liquidationPrice = this.liquidationPrice(snapshot);
+		const zeroDebt = ca.debt === 0n;
+		const collaterals = [];
+		let totalValue = zeroDebt ? 0n : ca.totalValue;
+		let totalValueUSD = zeroDebt ? 0n : ca.totalValueUSD;
+		for (const t of ca.tokens) {
+			if (t.balance <= 10n) continue;
+			collaterals.push({
+				collateral: priceOracle.toTokenAmount(t.token, t.balance),
+				quota: priceOracle.toTokenAmount(market.underlying, t.quota),
+				withdrawals: withdrawals.get(t.token) ?? []
+			});
+			if (zeroDebt) {
+				const value = priceOracle.safeConvert(t.token, market.underlying, t.balance) || 0n;
+				totalValue += value;
+				const usd = priceOracle.safeConvertToUSD(t.token, t.balance) || 0n;
+				totalValueUSD += usd;
+			}
+		}
 		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: require_sdk_market_math.calcPositionLeverage(ca.totalValue, totalDebtValue),
+			name: target ? require_sdk_market_strategyName.strategyName(this.sdk.tokensMeta.mustGetToken(target), token) : token.symbol,
+			targetCollateral: target ? this.sdk.tokensMeta.mustGetToken(target) : null,
+			leverage: require_sdk_market_math.calcPositionLeverage(totalValue, totalDebtValue),
 			borrowApy: require_sdk_market_math.calcBorrowApy(pool.baseInterestRate, suite.creditManager.feeInterest),
 			totalDebt: {
 				token,
@@ -166,21 +218,14 @@ var PositionsService = class extends require_sdk_base_SDKConstruct.SDKConstruct
 			},
 			totalValue: {
 				token,
-				value: ca.totalValue,
-				valueUsd: require_sdk_market_math.usdToNumber(ca.totalValueUSD)
+				value: totalValue,
+				valueUsd: require_sdk_market_math.usdToNumber(totalValueUSD)
 			},
 			healthFactor: require_sdk_market_math.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) ?? []
-				}];
-			})
+			collaterals
 		};
 	}
 	/**
@@ -222,6 +267,7 @@ var PositionsService = class extends require_sdk_base_SDKConstruct.SDKConstruct
 		for (const q of snapshot.quotas) tokens.push(q.token);
 		const decimals = {};
 		const prices = {};
+		const reservePrices = {};
 		const liquidationThresholds = {};
 		const activeQuotas = {};
 		const quotaRates = {};
@@ -231,6 +277,9 @@ var PositionsService = class extends require_sdk_base_SDKConstruct.SDKConstruct
 			try {
 				prices[token] = priceOracle.mainPrice(token);
 			} catch {}
+			try {
+				reservePrices[token] = priceOracle.reservePrice(token);
+			} catch {}
 			const lt = cm.liquidationThresholds.get(token);
 			if (lt !== void 0) liquidationThresholds[token] = lt;
 			if (pqk.hasActiveQuota(token)) {
@@ -242,6 +291,7 @@ var PositionsService = class extends require_sdk_base_SDKConstruct.SDKConstruct
 			underlying,
 			decimals,
 			prices,
+			reservePrices,
 			liquidationThresholds,
 			activeQuotas,
 			quotaRates,

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

@@ -7,29 +7,33 @@ const require_sdk_market_math = require("../market/math.js");
 * 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
+* The base rate is the market's borrow APY: whatever `baseInterestRate` the
+* caller hands over, plus the credit manager's interest fee — the same value
+* `borrowApy` reports on a position, and the same arithmetic when a projection
+* hands over the rate its post-operation utilization implies. 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 { snapshot, baseInterestRate, feeInterest, quotaRates, resolveToken } = props;
 	const { quotas, totalDebt, totalValue } = snapshot;
 	const rates = new require_sdk_utils_AddressMap.AddressMap(Object.entries(quotaRates));
 	const base = require_sdk_market_math.calcBorrowApy(baseInterestRate, feeInterest);
 	const fee = require_sdk_constants_math.PERCENTAGE_FACTOR + BigInt(feeInterest);
 	let quotaRateSum = 0n;
-	const perQuota = {};
+	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 / require_sdk_constants_math.PERCENTAGE_FACTOR;
-		perQuota[q.token] = totalValue > 0n ? Number(withFee / totalValue) : 0;
+		perQuota.push({
+			token: resolveToken(q.token),
+			rate: totalValue > 0n ? Number(withFee / totalValue) : 0
+		});
 	}
 	const quotaRateSumWithFee = quotaRateSum * fee / require_sdk_constants_math.PERCENTAGE_FACTOR;
 	return {

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

@@ -15,14 +15,22 @@ let viem = require("viem");
 * nothing.
 **/
 function calcHealthFactor(props) {
-	const { snapshot, underlying, decimals, prices, liquidationThresholds, activeQuotas } = props;
+	const { snapshot, underlying, decimals, prices, reservePrices = {}, safePrices = false, liquidationThresholds, activeQuotas } = props;
 	if (snapshot.totalDebt === 0n) return Number(require_sdk_constants_math.MAX_UINT16);
 	const decimalsByToken = new require_sdk_utils_AddressMap.AddressMap(Object.entries(decimals));
 	const pricesByToken = new require_sdk_utils_AddressMap.AddressMap(Object.entries(prices));
+	const reservePricesByToken = new require_sdk_utils_AddressMap.AddressMap(Object.entries(reservePrices));
 	const lts = new require_sdk_utils_AddressMap.AddressMap(Object.entries(liquidationThresholds));
 	const active = new require_sdk_utils_AddressMap.AddressMap(Object.entries(activeQuotas));
-	const convertToUSD = (token, amount) => {
-		const price = pricesByToken.get(token);
+	const priceOf = (token, forCollateral) => {
+		const main = pricesByToken.get(token);
+		if (!safePrices || !forCollateral) return main;
+		const reserve = reservePricesByToken.get(token);
+		if (main !== void 0 && reserve !== void 0) return require_sdk_utils_bigint_math.BigIntMath.min(main, reserve);
+		return main ?? reserve;
+	};
+	const convertToUSD = (token, amount, forCollateral = false) => {
+		const price = priceOf(token, forCollateral);
 		if (price === void 0) return null;
 		const scale = 10n ** BigInt(decimalsByToken.get(token) ?? 18);
 		return amount * price / scale;
@@ -30,7 +38,7 @@ function calcHealthFactor(props) {
 	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 tokenLtWeighted = (convertToUSD(token, balance, true) ?? 0n) * lt;
 		const quota = snapshot.quotas.find((q) => (0, viem.isAddressEqual)(q.token, token));
 		const quotaBalance = quota && (active.get(token) ?? false) ? quota.balance : 0n;
 		const quotaWeighted = (convertToUSD(underlying, quotaBalance) ?? 0n) * require_sdk_constants_math.PERCENTAGE_FACTOR;