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

package/dist/cjs/onchain/market/credit/CreditSuite.js

@@ -86,6 +86,16 @@ var CreditSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		return this.creditManager.underlying;
 	}
 	/**
+	* Pool underlying token as the shared read model describes it.
+	*
+	* For RWA markets this is the unwrapped asset, e.g. USDC rather than
+	* dcUSDC (the pool's on-chain underlying). Same as
+	* {@link MarketSuite.underlyingToken}.
+	*/
+	get underlyingToken() {
+		return this.market.underlyingToken;
+	}
+	/**
 	* Parent market that contains this credit manager
 	*/
 	get market() {
@@ -172,6 +182,37 @@ var CreditSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		};
 	}
 	/**
+	* What a liquidation takes off an account, in basis points: the premium the
+	* liquidator keeps plus the protocol's own fee, with the suite's expiration
+	* already resolved.
+	*
+	* Not {@link LiquidationFees.liquidationDiscount}, which is the complement of
+	* the premium alone (`100% - liquidationPremium`) and says what share of the
+	* seized collateral repays the debt.
+	*/
+	totalLiquidationDiscount() {
+		const { feeLiquidation, liquidationDiscount } = this.liquidationFees();
+		return Number(require_onchain_constants_math.PERCENTAGE_FACTOR) - liquidationDiscount + feeLiquidation;
+	}
+	/**
+	* The market half of every credit operation result, read off this suite: a
+	* preview, a projection, the open-strategy walk and a liquidatable-account
+	* row all spread it, so the five fields are filled in one place and cannot
+	* drift apart between the halves of the SDK.
+	*
+	* The curator comes from the same getter {@link strategyOpportunity} reads, so
+	* a result and the opportunity beside it name one entity.
+	*/
+	creditOperationMarket() {
+		return {
+			creditManager: this.creditManager.address,
+			name: this.strategyName ?? this.underlyingToken.symbol,
+			underlyingToken: this.underlyingToken,
+			curator: this.market.curator,
+			liquidationDiscount: this.totalLiquidationDiscount()
+		};
+	}
+	/**
 	* Whether this suite can be used right now. A paused pool blocks borrowing,
 	* so the suite is unusable even when its own facade is live.
 	*/
@@ -222,17 +263,41 @@ var CreditSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 	get strategyName() {
 		const collateral = this.strategyTargetCollateral;
 		if (!collateral) return;
-		return require_onchain_market_strategyName.strategyName(this.tokensMeta.mustGetToken(collateral), this.market.underlyingToken);
+		return require_onchain_market_strategyName.strategyName(this.tokensMeta.mustGetToken(collateral), this.underlyingToken);
+	}
+	/**
+	* Collateral token an existing credit account in this suite is a strategy
+	* in. Same as {@link StrategyPosition.targetCollateral}.
+	*
+	* Resolution, in order:
+	* 1. a hardcoded per-account override, when present;
+	* 2. {@link strategyTargetCollateral};
+	* 3. `null` when neither can be resolved.
+	*/
+	accountTargetCollateral(creditAccount) {
+		const addr = require_onchain_chain_chains.getAccountTargetCollateral(creditAccount, this.chainId) ?? this.strategyTargetCollateral;
+		return addr ? this.tokensMeta.mustGetToken(addr) : null;
+	}
+	/**
+	* Display name of an existing credit account in this suite, e.g.
+	* `"wstETH / WETH"`. Same as {@link StrategyPosition.name}.
+	*
+	* {@link accountTargetCollateral} over the underlying, or the underlying
+	* symbol when no target can be resolved.
+	*/
+	accountStrategyName(creditAccount) {
+		const target = this.accountTargetCollateral(creditAccount);
+		return target ? require_onchain_market_strategyName.strategyName(target, this.underlyingToken) : this.underlyingToken.symbol;
 	}
 	/**
 	* Describes this suite's leveraged strategy as the shared read model does,
-	* or `undefined` when {@link strategyTargetCollateral} cannot be resolved or
-	* {@link maxBorrowAmount} is at or below {@link MIN_STRATEGY_BORROW_AMOUNT}.
+	* or `undefined` when credit suite does not offer a strategy opportunity.
 	*/
 	strategyOpportunity() {
 		if (this.maxBorrowAmount <= MIN_STRATEGY_BORROW_AMOUNT) return;
 		const collateral = this.strategyTargetCollateral;
 		if (!collateral) return;
+		if (!require_onchain_market_credit_collateralUtils.isStrategyCollateral(this.#strategyCollateralProps(collateral), true)) return;
 		const { market, creditManager: cm } = this;
 		const { pool } = market.pool;
 		const oracle = market.priceOracle;
@@ -245,9 +310,9 @@ var CreditSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 			chainId: this.chainId,
 			creditManager: cm.address,
 			targetCollateral: this.tokensMeta.mustGetToken(collateral),
-			name: this.strategyName ?? this.market.underlyingToken.symbol,
+			name: this.strategyName ?? this.underlyingToken.symbol,
 			curator: market.curator,
-			underlyingToken: market.underlyingToken,
+			underlyingToken: this.underlyingToken,
 			totalBorrowed: oracle.toAmount(pool.underlying, borrowed),
 			allowedDepositTokens: this.#allowedDepositTokens(collateral),
 			paused: this.isPaused,
@@ -327,8 +392,7 @@ var CreditSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 	*/
 	#allowedDepositTokens(targetCollateral) {
 		const unwrappedUnderlying = this.market.unwrappedUnderlying;
-		const contractUnderlying = this.underlying;
-		const skip = (token) => (0, viem.isAddressEqual)(token, unwrappedUnderlying) || (0, viem.isAddressEqual)(token, contractUnderlying) || (0, viem.isAddressEqual)(token, targetCollateral);
+		const skip = (token) => this.market.isUnderlyingLike(token) || (0, viem.isAddressEqual)(token, targetCollateral);
 		return [
 			unwrappedUnderlying,
 			targetCollateral,

package/dist/cjs/onchain/market/credit/collateralUtils.js

@@ -67,11 +67,11 @@ function pickStrategyTargetCollateral(tokens) {
 * nothing but its underlying, or nothing the oracle can price.
 **/
 function dominantCollateral(account, market) {
-	let bestValue = 0;
+	let bestValue = 0n;
 	let dominant;
 	for (const t of account.tokens) {
 		if ((0, viem.isAddressEqual)(t.token, account.underlying) || (t.mask & account.enabledTokensMask) === 0n || t.balance <= 10n) continue;
-		const value = market.priceOracle.safeUsdValue(t.token, t.balance) ?? 0;
+		const value = market.priceOracle.safeConvertToUSD(t.token, t.balance).value;
 		if (value > bestValue) {
 			bestValue = value;
 			dominant = t.token;

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

@@ -95,6 +95,7 @@ const require_onchain_market_credit_collateralUtils = require("./credit/collater
 const require_onchain_market_credit_CreditSuite = require("./credit/CreditSuite.js");
 const require_onchain_market_credit_expectedBalanceDeltas = require("./credit/expectedBalanceDeltas.js");
 require("./credit/index.js");
+const require_onchain_market_oracle_collateralPriceInUnderlying = require("./oracle/collateralPriceInUnderlying.js");
 const require_onchain_market_pricefeeds_isUpdatablePriceFeed = require("./pricefeeds/isUpdatablePriceFeed.js");
 const require_onchain_market_pricefeeds_PriceFeedRef = require("./pricefeeds/PriceFeedRef.js");
 const require_onchain_market_pricefeeds_AbstractPriceFeed = require("./pricefeeds/AbstractPriceFeed.js");
@@ -119,6 +120,7 @@ const require_onchain_market_pricefeeds_YearnPriceFeed = require("./pricefeeds/Y
 const require_onchain_market_pricefeeds_ZeroPriceFeed = require("./pricefeeds/ZeroPriceFeed.js");
 const require_onchain_market_pricefeeds_PriceFeedsRegister = require("./pricefeeds/PriceFeedsRegister.js");
 require("./pricefeeds/index.js");
+const require_onchain_market_oracle_errors = require("./oracle/errors.js");
 const require_onchain_market_oracle_PriceOracleV310Contract = require("./oracle/PriceOracleV310Contract.js");
 const require_onchain_market_oracle_createPriceOracle = require("./oracle/createPriceOracle.js");
 require("./oracle/index.js");
@@ -128,7 +130,6 @@ const require_onchain_market_pool_PoolV310Contract = require("./pool/PoolV310Con
 const require_onchain_market_pool_PoolSuite = require("./pool/PoolSuite.js");
 require("./pool/index.js");
 const require_onchain_market_MarketSuite = require("./MarketSuite.js");
-const require_onchain_market_zapper_errors = require("./zapper/errors.js");
 const require_onchain_market_zapper_ZapperContract = require("./zapper/ZapperContract.js");
 const require_onchain_market_zapper_IERC20ZapperContract = require("./zapper/IERC20ZapperContract.js");
 const require_onchain_market_zapper_IETHZapperContract = require("./zapper/IETHZapperContract.js");
@@ -232,7 +233,6 @@ exports.TraderJoeRouterAdapterContract = require_onchain_market_adapters_contrac
 exports.UniswapV2AdapterContract = require_onchain_market_adapters_contracts_UniswapV2AdapterContract.UniswapV2AdapterContract;
 exports.UniswapV3AdapterContract = require_onchain_market_adapters_contracts_UniswapV3AdapterContract.UniswapV3AdapterContract;
 exports.UniswapV4AdapterContract = require_onchain_market_adapters_contracts_UniswapV4AdapterContract.UniswapV4AdapterContract;
-exports.UnsupportedZapperFunctionError = require_onchain_market_zapper_errors.UnsupportedZapperFunctionError;
 exports.UpshiftVaultAdapterContract = require_onchain_market_adapters_contracts_UpshiftVaultAdapterContract.UpshiftVaultAdapterContract;
 exports.VelodromeV2RouterAdapterContract = require_onchain_market_adapters_contracts_VelodromeV2AdapterContract.VelodromeV2RouterAdapterContract;
 exports.WstETHPriceFeedContract = require_onchain_market_pricefeeds_WstETHPriceFeed.WstETHPriceFeedContract;
@@ -255,6 +255,7 @@ exports.calcQuotaRate = require_onchain_market_math.calcQuotaRate;
 exports.calcUtilization = require_onchain_market_math.calcUtilization;
 exports.calcUtilizationRaw = require_onchain_market_math.calcUtilizationRaw;
 exports.classifyCurveOperation = require_onchain_market_adapters_transferHelpers.classifyCurveOperation;
+exports.collateralPriceInUnderlying = require_onchain_market_oracle_collateralPriceInUnderlying.collateralPriceInUnderlying;
 exports.createAdapter = require_onchain_market_adapters_createAdapter.createAdapter;
 exports.createPriceOracle = require_onchain_market_oracle_createPriceOracle.createPriceOracle;
 exports.createZapper = require_onchain_market_zapper_createZapper.createZapper;
@@ -360,4 +361,5 @@ exports.rewardsFromTransfers = require_onchain_market_adapters_transferHelpers.r
 exports.strategyName = require_onchain_market_strategyName.strategyName;
 exports.swapFromTransfers = require_onchain_market_adapters_transferHelpers.swapFromTransfers;
 exports.toNetTransfers = require_onchain_market_adapters_transferHelpers.toNetTransfers;
+exports.unpriceableTokenError = require_onchain_market_oracle_errors.unpriceableTokenError;
 exports.usdToNumber = require_onchain_market_math.usdToNumber;

package/dist/cjs/onchain/market/math.js

@@ -43,16 +43,20 @@ const USD_DUST_THRESHOLD = 1000n;
 /**
 * Converts a USD value in the oracle's 8-decimal fixed point to a float.
 *
-* Values below {@link USD_DUST_THRESHOLD} report as `0`.
+* Values whose magnitude is below {@link USD_DUST_THRESHOLD} report as `0`.
+* The threshold is weighed on the magnitude because the deltas the model
+* carries — a debt repaid, a balance sold — are negative, and dust is dust in
+* either direction.
 *
 * @example
 * ```ts
 * // usd: $1500.50 in 8-decimal fixed point
 * usdToNumber(150_050_000_000n) // 1500.5
+* usdToNumber(-150_050_000_000n) // -1500.5
 * ```
 **/
 function usdToNumber(usd) {
-	return usd < USD_DUST_THRESHOLD ? 0 : Number(usd) / Number(require_onchain_constants_math.PRICE_DECIMALS);
+	return (usd < 0n ? -usd : usd) < USD_DUST_THRESHOLD ? 0 : Number(usd) / Number(require_onchain_constants_math.PRICE_DECIMALS);
 }
 /**
 * Share of capital currently borrowed, in basis points. Returns `0` when there
@@ -163,24 +167,36 @@ function calcNetStrategyApy(opportunity, totalCollateralApy, leverage, mode = "s
 **/
 const MAX_LEVERAGE_BUFFER_BPS = 500;
 /**
-* Highest total-value leverage a liquidation threshold allows, floored:
-* `floor((100% − buffer) / (100% − liquidationThreshold))`. At HF = 1, debt is
-* `liquidationThreshold × totalValue`, leaving `1 − liquidationThreshold` of
-* equity per unit of exposure; the {@link MAX_LEVERAGE_BUFFER_BPS} buffer
-* keeps the maxed position slightly away from that boundary.
+* Highest total-value leverage a liquidation threshold allows, floored.
+*
+* At HF = 1, debt is `liquidationThreshold × totalValue`, leaving
+* `1 − liquidationThreshold` of equity per unit of exposure; a maxed position
+* has to stay some way off that boundary. Given a `targetHF`, that distance is
+* solved for — `HF = liquidationThreshold × L / (L − 1)` inverts to
+* `L = targetHF / (targetHF − liquidationThreshold)`.
+*
+* Without one it falls back on a flat {@link MAX_LEVERAGE_BUFFER_BPS}, which
+* under-buffers as the threshold rises — at 95% it allows 19x, or HF ≈ 1.0028.
+* That branch is scaffolding, kept so this parameter moves no number before
+* the callers name a target, and goes away with the constant.
+*
+* @param targetHF - Health factor the maxed position should leave, in basis
+* points. Omitted keeps the legacy buffer.
 *
 * @example
 * ```ts
 * // liquidationThreshold: 9000 bps = 90%
-* calcMaxLeverage(9000) // floor((1 − 0.05) / (1 − 0.9)) = 9x total exposure
+* calcMaxLeverage(9000)        // floor((1 − 0.05) / (1 − 0.9)) = 9x
+* calcMaxLeverage(9000, 10100) // floor(1.01 / (1.01 − 0.9))    = 9x
 * ```
-* @throws If `liquidationThreshold` is 100% or more, which would make
-* leverage unbounded.
+* @throws If `liquidationThreshold` is 100% or more, or reaches a named
+* `targetHF` — either way no leverage clears the bar.
 **/
-function calcMaxLeverage(liquidationThreshold) {
+function calcMaxLeverage(liquidationThreshold, targetHF) {
 	if (liquidationThreshold >= FULL) throw new Error("cannot compute max leverage: liquidation threshold is 100% or more");
-	const leverage = Math.floor((FULL - 500) / (FULL - liquidationThreshold));
-	return Math.max(leverage, 1);
+	if (targetHF === void 0) return Math.max(Math.floor((FULL - 500) / (FULL - liquidationThreshold)), 1);
+	if (liquidationThreshold >= targetHF) throw new Error("cannot compute max leverage: liquidation threshold reaches the target health factor");
+	return Math.max(Math.floor(targetHF / (targetHF - liquidationThreshold)), 1);
 }
 /**
 * Converts a credit account's health factor from the 18-decimal fixed point the

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

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_utils_AddressMap = require("../../utils/AddressMap.js");
 const require_onchain_utils_AddressSet = require("../../utils/AddressSet.js");
+const require_onchain_utils_bigint_math = require("../../utils/bigint-math.js");
 const require_onchain_constants_address_provider = require("../../constants/address-provider.js");
 const require_onchain_constants_addresses = require("../../constants/addresses.js");
 require("../../constants/math.js");
@@ -11,10 +12,13 @@ require("../../utils/index.js");
 const require_onchain_base_BaseContract = require("../../base/BaseContract.js");
 require("../../base/index.js");
 const require_onchain_market_math = require("../math.js");
+const require_model_result = require("../../../model/result.js");
+require("../../../model/index.js");
 const require_abi_compressors_priceFeedCompressor = require("../../../abi/compressors/priceFeedCompressor.js");
 const require_onchain_market_pricefeeds_PriceFeedRef = require("../pricefeeds/PriceFeedRef.js");
 const require_onchain_market_pricefeeds_getRawPriceUpdates = require("../pricefeeds/getRawPriceUpdates.js");
 require("../pricefeeds/index.js");
+const require_onchain_market_oracle_errors = require("./errors.js");
 const require_onchain_market_oracle_PriceFeedAnswerMap = require("./PriceFeedAnswerMap.js");
 let viem = require("viem");
 let date_fns = require("date-fns");
@@ -109,7 +113,7 @@ var PriceOracleBaseContract = class extends require_onchain_base_BaseContract.Ba
 	* {@inheritDoc IPriceOracleContract.convert}
 	**/
 	convert(from, to, amount, reserve = false) {
-		if (from === to) return amount;
+		if ((0, viem.isAddressEqual)(from, to)) return amount;
 		const fromToken = this.#priceableToken(from);
 		const toToken = this.#priceableToken(to);
 		const fromPrice = reserve ? this.reservePrice(fromToken) : this.mainPrice(fromToken);
@@ -142,10 +146,13 @@ var PriceOracleBaseContract = class extends require_onchain_base_BaseContract.Ba
 	**/
 	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;
+			return { value: this.convert(from, to, amount) };
+		} catch {
+			try {
+				return { value: this.convert(from, to, amount, true) };
+			} catch {
+				return require_model_result.safeValue(0n, require_onchain_market_oracle_errors.unpriceableTokenError(from));
+			}
 		}
 	}
 	/**
@@ -153,26 +160,72 @@ var PriceOracleBaseContract = class extends require_onchain_base_BaseContract.Ba
 	**/
 	safeConvertToUSD(token, amount) {
 		try {
-			return this.convertToUSD(token, amount);
-		} catch (e) {
-			this.logger?.debug(`cannot price ${this.labelAddress(token)}: ${e}`);
-			return null;
+			return { value: this.convertToUSD(token, amount) };
+		} catch {
+			try {
+				return { value: this.convertToUSD(token, amount, true) };
+			} catch {
+				return require_model_result.safeValue(0n, require_onchain_market_oracle_errors.unpriceableTokenError(token));
+			}
+		}
+	}
+	/**
+	* {@inheritDoc IPriceOracleContract.safeConvertMinUSD}
+	**/
+	safeConvertMinUSD(token, amount) {
+		let main;
+		try {
+			main = this.convertToUSD(token, amount);
+		} catch {
+			return require_model_result.safeValue(0n, require_onchain_market_oracle_errors.unpriceableTokenError(token));
+		}
+		let feedToken = token;
+		if ((0, viem.isAddressEqual)(token, "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE")) try {
+			feedToken = this.sdk.addressProvider.getAddress(require_onchain_constants_address_provider.AP_WETH_TOKEN, 0);
+		} catch {}
+		if (!this.reservePriceFeeds.has(feedToken)) return { value: 0n };
+		try {
+			return { value: require_onchain_utils_bigint_math.BigIntMath.min(main, this.convertToUSD(token, amount, true)) };
+		} catch {
+			return require_model_result.safeValue(0n, require_onchain_market_oracle_errors.unpriceableTokenError(token));
+		}
+	}
+	/**
+	* {@inheritDoc IPriceOracleContract.safeConvertFromUSD}
+	**/
+	safeConvertFromUSD(token, amount) {
+		try {
+			return { value: this.convertFromUSD(token, amount) };
+		} catch {
+			try {
+				return { value: this.convertFromUSD(token, amount, true) };
+			} catch {
+				return require_model_result.safeValue(0n, require_onchain_market_oracle_errors.unpriceableTokenError(token));
+			}
 		}
 	}
 	/**
-	* {@inheritDoc IPriceOracleContract.safeUsdValue}
+	* {@inheritDoc IPriceOracleContract.safeConvertAssets}
 	**/
-	safeUsdValue(token, amount) {
-		const usd = this.safeConvertToUSD(token, amount);
-		return usd === null ? null : require_onchain_market_math.usdToNumber(usd);
+	safeConvertAssets(assets, to) {
+		let value = 0n;
+		let error;
+		for (const { token, balance } of assets) {
+			if (balance <= 10n) continue;
+			const converted = this.safeConvert(token, to, balance);
+			value += converted.value;
+			error ??= converted.error;
+		}
+		return require_model_result.safeValue(value, error);
 	}
 	/**
 	* {@inheritDoc IPriceOracleContract.toAmount}
 	**/
 	toAmount = (token, value) => {
+		const priced = this.safeConvertToUSD(token, value);
 		return {
 			value,
-			valueUsd: this.safeUsdValue(token, value)
+			valueUsd: priced.error ? null : require_onchain_market_math.usdToNumber(priced.value)
 		};
 	};
 	/**

package/dist/cjs/onchain/market/oracle/TestPriceOracle.mock.js

@@ -0,0 +1,215 @@
+const require_abi_310_generated = require("../../../abi/310/generated.js");
+const require_onchain_chain_chains = require("../../chain/chains.js");
+require("../../chain/index.js");
+require("../../constants/address-provider.js");
+require("../../constants/math.js");
+require("../../constants/index.js");
+const require_onchain_utils_formatter = require("../../utils/formatter.js");
+require("../../utils/index.js");
+const require_onchain_base_ChainContractsRegister = require("../../base/ChainContractsRegister.js");
+require("../../base/index.js");
+const require_onchain_market_pricefeeds_PriceFeedRef = require("../pricefeeds/PriceFeedRef.js");
+require("../pricefeeds/index.js");
+const require_onchain_market_oracle_PriceOracleBaseContract = require("./PriceOracleBaseContract.js");
+let viem = require("viem");
+//#region src/onchain/market/oracle/TestPriceOracle.mock.ts
+/**
+* Well-known mainnet tokens for tests. The oracle prefills their metadata;
+* a seed can then be as small as `{ price: 2000 }`.
+**/
+const MockTokens = {
+	WETH: (0, viem.getAddress)("0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"),
+	USDC: (0, viem.getAddress)("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"),
+	DAI: (0, viem.getAddress)("0x6B175474E89094C44Da98b954EedeAC495271d0F"),
+	cbETH: (0, viem.getAddress)("0xBe9895146f7AF43049ca1c1AE358B0541Ea49704"),
+	dcUSDC: (0, viem.getAddress)("0x50A9C808cd114E8fEA72f03aE2B1A8825677D56D"),
+	ACRED: (0, viem.getAddress)("0x17418038ecF73BA4026c4f428547BF099706F27B"),
+	srpACRED_USDC: (0, viem.getAddress)("0xe4a38b653B2580C9D72a50F190Ddd6E2d2D2a412")
+};
+const MOCK_TOKEN_META = {
+	[MockTokens.WETH]: {
+		decimals: 18,
+		symbol: "WETH",
+		name: "Wrapped Ether"
+	},
+	[MockTokens.USDC]: {
+		decimals: 6,
+		symbol: "USDC",
+		name: "USD Coin"
+	},
+	[MockTokens.DAI]: {
+		decimals: 18,
+		symbol: "DAI",
+		name: "Dai Stablecoin"
+	},
+	[MockTokens.cbETH]: {
+		decimals: 18,
+		symbol: "cbETH",
+		name: "Coinbase Wrapped Staked ETH"
+	},
+	[MockTokens.dcUSDC]: {
+		decimals: 6,
+		symbol: "dcUSDC",
+		name: "Default compliant USD Coin"
+	},
+	[MockTokens.ACRED]: {
+		decimals: 6,
+		symbol: "ACRED",
+		name: "Apollo Diversified Credit Securitize Fund"
+	},
+	[MockTokens.srpACRED_USDC]: {
+		decimals: 6,
+		symbol: "srpACRED_USDC",
+		name: "Securitize pending redemption Apollo Diversified Credit Securitize Fund to USD Coin"
+	}
+};
+const TEST_ORACLE_ADDRESS = (0, viem.getAddress)("0x040ac1e000000000000000000000000000000310");
+const FAILED_ANSWER = {
+	price: 0n,
+	success: false,
+	updatedAt: 0n
+};
+/**
+* Register whose client rejects any RPC request: the oracle never talks to a
+* node. `addressProvider.getAddress` answers `AP_WETH_TOKEN` with mainnet WETH
+* so `#priceableToken` and `safeConvertMinUSD` exercise their real native
+* branches.
+**/
+var TestOracleSdk = class extends require_onchain_base_ChainContractsRegister.ChainContractsRegister {
+	addressProvider = { getAddress: (contract, version) => {
+		if (contract === "WETH_TOKEN") return MockTokens.WETH;
+		throw new Error(`Address ${contract}, version: ${version} not found`);
+	} };
+	priceFeeds = { generatePriceFeedsUpdateTxs: () => {
+		throw new Error("TestPriceOracle: no priceFeeds");
+	} };
+};
+/**
+* A real {@link PriceOracleBaseContract} seeded from plain records, for tests.
+*
+* Conversion, safe-price fallback, and native-through-WETH all run the
+* production code. Feed-tree methods (`priceFeedData`, `priceUpdatesFor*`, …)
+* are not wired and throw if touched.
+**/
+var TestPriceOracle = class extends require_onchain_market_oracle_PriceOracleBaseContract.PriceOracleBaseContract {
+	constructor(tokens = {}) {
+		const register = new TestOracleSdk((0, viem.createPublicClient)({
+			chain: require_onchain_chain_chains.getChain("Mainnet"),
+			transport: (0, viem.custom)({ request: async () => {
+				throw new Error("not implemented");
+			} })
+		}));
+		super(register, {
+			abi: require_abi_310_generated.iPriceOracleV310Abi,
+			addr: TEST_ORACLE_ADDRESS,
+			name: "TestPriceOracle"
+		}, {
+			priceFeedMap: [],
+			priceFeedTree: []
+		});
+		for (const [token, meta] of Object.entries(MOCK_TOKEN_META)) {
+			const addr = (0, viem.getAddress)(token);
+			this.register.tokensMeta.upsert(addr, {
+				addr,
+				...meta
+			});
+		}
+		for (const [token, cfg] of Object.entries(tokens)) this.addToken(token, cfg);
+	}
+	/**
+	* Registers token meta and optional feed answers. Chainable, like all
+	* modifiers.
+	**/
+	addToken(token, cfg) {
+		const addr = (0, viem.getAddress)(token);
+		const known = MOCK_TOKEN_META[addr];
+		const symbol = cfg.symbol ?? known?.symbol ?? `T_${addr.slice(2, 8)}`;
+		this.register.tokensMeta.upsert(addr, {
+			addr,
+			symbol,
+			name: cfg.name ?? known?.name ?? symbol,
+			decimals: cfg.decimals ?? known?.decimals ?? 18
+		});
+		if (cfg.price !== void 0) this.setMainPrice(addr, cfg.price);
+		if (cfg.reservePrice !== void 0) this.setReservePrice(addr, cfg.reservePrice);
+		return this;
+	}
+	setMainPrice(token, price) {
+		this.#setAnswer(token, "main", rawPrice(price));
+		return this;
+	}
+	setReservePrice(token, price) {
+		this.#setAnswer(token, "reserve", rawPrice(price));
+		return this;
+	}
+	/**
+	* Feed stays configured, its answer failed — {@link PriceFeedAnswerMap.price}
+	* throws. Distinct from {@link removeMainFeed}.
+	**/
+	failMainAnswer(token) {
+		this.#failAnswer(token, "main");
+		return this;
+	}
+	/**
+	* Feed stays configured, its answer failed. Distinct from
+	* {@link removeReserveFeed}: `safeConvertMinUSD` treats a present-but-failed
+	* reserve feed as an error, and a missing one as an untrusted 0.
+	**/
+	failReserveAnswer(token) {
+		this.#failAnswer(token, "reserve");
+		return this;
+	}
+	/**
+	* No main feed at all: distinct from a failed answer.
+	**/
+	removeMainFeed(token) {
+		this.mainPriceFeeds.delete(token);
+		this.mainPrices.delete(token);
+		return this;
+	}
+	/**
+	* No reserve feed at all: distinct from a failed answer, and what
+	* `safeConvertMinUSD` treats as an untrusted token (value 0, no error).
+	**/
+	removeReserveFeed(token) {
+		this.reservePriceFeeds.delete(token);
+		this.reservePrices.delete(token);
+		return this;
+	}
+	async updateAndConvert(_from, _to, _amount) {
+		throw new Error("TestPriceOracle: updateAndConvert needs a node");
+	}
+	#setAnswer(token, kind, price) {
+		this.#ensureFeed(token, kind);
+		this.#answers(kind).upsert(token, {
+			price,
+			success: true,
+			updatedAt: 0n
+		});
+	}
+	#failAnswer(token, kind) {
+		this.#ensureFeed(token, kind);
+		this.#answers(kind).upsert(token, FAILED_ANSWER);
+	}
+	#ensureFeed(token, kind) {
+		const feeds = kind === "main" ? this.mainPriceFeeds : this.reservePriceFeeds;
+		if (!feeds.has(token)) feeds.upsert(token, new require_onchain_market_pricefeeds_PriceFeedRef.PriceFeedRef(this.register, feedAddr(token, kind), 0));
+	}
+	#answers(kind) {
+		return kind === "main" ? this.mainPrices : this.reservePrices;
+	}
+};
+/** Human USD → 8-decimal fixed point; bigint passes through. */
+function rawPrice(price) {
+	return typeof price === "bigint" ? price : require_onchain_utils_formatter.toBN(String(price), 8);
+}
+/** Deterministic unused address per token feed; never resolved. */
+function feedAddr(token, kind) {
+	const bytes = (0, viem.hexToBytes)((0, viem.getAddress)(token));
+	bytes[0] = kind === "main" ? 254 : 253;
+	return (0, viem.getAddress)((0, viem.bytesToHex)(bytes));
+}
+//#endregion
+exports.MockTokens = MockTokens;
+exports.TEST_ORACLE_ADDRESS = TEST_ORACLE_ADDRESS;
+exports.TestPriceOracle = TestPriceOracle;

package/dist/cjs/onchain/market/oracle/collateralPriceInUnderlying.js

@@ -0,0 +1,27 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_onchain_constants_math = require("../../constants/math.js");
+//#region src/onchain/market/oracle/collateralPriceInUnderlying.ts
+/**
+* What one unit of `collateral` costs in `underlying` right now, in the
+* oracle's 8-decimal (`PRICE_DECIMALS`) fixed point — the scale and the
+* denomination `calcLiquidationPrice` answers in, so the two figures are read
+* as a pair.
+*
+* Both sides come from the oracle's **main** feeds: this is the price the
+* market quotes, not the conservative one a hand-over is weighed at.
+*
+* `null` when the oracle cannot answer for either token, or prices the
+* underlying at zero — a screen shows a gap rather than a number derived from
+* a missing feed.
+**/
+function collateralPriceInUnderlying(oracle, collateral, underlying) {
+	try {
+		const underlyingPrice = oracle.mainPrice(underlying);
+		if (underlyingPrice <= 0n) return null;
+		return oracle.mainPrice(collateral) * require_onchain_constants_math.PRICE_DECIMALS / underlyingPrice;
+	} catch {
+		return null;
+	}
+}
+//#endregion
+exports.collateralPriceInUnderlying = collateralPriceInUnderlying;

package/dist/cjs/onchain/market/oracle/errors.js

@@ -0,0 +1,14 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region src/onchain/market/oracle/errors.ts
+/**
+* Builds an {@link UnpriceableTokenError} for `token`.
+**/
+function unpriceableTokenError(token) {
+	return {
+		code: "unpriceableToken",
+		message: `cannot price token ${token}`,
+		token
+	};
+}
+//#endregion
+exports.unpriceableTokenError = unpriceableTokenError;

package/dist/cjs/onchain/market/oracle/index.js

@@ -1,6 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_onchain_market_oracle_collateralPriceInUnderlying = require("./collateralPriceInUnderlying.js");
+const require_onchain_market_oracle_errors = require("./errors.js");
 const require_onchain_market_oracle_PriceOracleV310Contract = require("./PriceOracleV310Contract.js");
 const require_onchain_market_oracle_createPriceOracle = require("./createPriceOracle.js");
 require("./types.js");
 exports.PriceOracleV310Contract = require_onchain_market_oracle_PriceOracleV310Contract.PriceOracleV310Contract;
+exports.collateralPriceInUnderlying = require_onchain_market_oracle_collateralPriceInUnderlying.collateralPriceInUnderlying;
 exports.createPriceOracle = require_onchain_market_oracle_createPriceOracle.createPriceOracle;
+exports.unpriceableTokenError = require_onchain_market_oracle_errors.unpriceableTokenError;