@gearbox-protocol/sdk 16.0.0-next.51 → 16.0.0-next.52

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

@@ -11,9 +11,11 @@ import { eq } from "./utils/common.js";
 * check counts: a holding backed by a quota contributes the lesser of the
 * quota and its threshold-weighted value, an unquoted one — the underlying —
 * its weighted value alone, and dust or a disabled balance nothing at all.
-* Collateral is valued at the lower of its two feeds, the way the facade
-* values a call that hands funds over; the debt is valued at the main feed,
-* as the check does. Zero debt frees the whole balance.
+* Collateral is valued at the protocol safe price (`min` of the two feeds,
+* 0 when there is no reserve), the way the facade values a call that hands
+* funds over; the underlying is exempt and is valued at the main feed, as
+* `CreditManagerV3._safeConvertToUSD` does. The debt is valued at the main
+* feed, as the check does. Zero debt frees the whole balance.
 *
 * Rounding always favours the account, so the answer clears the check rather
 * than landing a wei short of it.
@@ -36,7 +38,7 @@ function maxWithdrawCollateral(props) {
 	/** What a holding backs, in the check's units: USD × PERCENTAGE_FACTOR. */
 	const weigh = (t) => {
 		const lt = BigInt(creditManager.liquidationThresholds.get(t.token) ?? 0);
-		const weighted = (safeUsd(priceOracle, t.token, t.balance) ?? 0n) * lt;
+		const weighted = (eq(t.token, underlying) ? usd(priceOracle, t.token, t.balance) ?? 0n : priceOracle.safeConvertMinUSD(t.token, t.balance).value) * lt;
 		if (t.quota === 0n) return weighted;
 		return BigIntMath.min(quotaUsd(t) * PERCENTAGE_FACTOR, weighted);
 	};
@@ -54,8 +56,8 @@ function maxWithdrawCollateral(props) {
 	const shortfall = required - otherMoney;
 	if (target.quota > 0n && quotaUsd(target) * 10000n < shortfall) return 0n;
 	const targetLt = BigInt(creditManager.liquidationThresholds.get(target.token) ?? 0);
-	const targetUsd = safeUsd(priceOracle, target.token, target.balance);
-	if (targetLt === 0n || !targetUsd) return 0n;
+	const targetUsd = eq(target.token, underlying) ? usd(priceOracle, target.token, target.balance) ?? 0n : priceOracle.safeConvertMinUSD(target.token, target.balance).value;
+	if (targetLt === 0n || targetUsd === 0n) return 0n;
 	const keptUsd = BigIntMath.ceilDiv(shortfall, targetLt);
 	const kept = BigIntMath.ceilDiv(target.balance * keptUsd, targetUsd);
 	return kept >= target.balance ? 0n : target.balance - kept;
@@ -68,18 +70,5 @@ function usd(oracle, token, amount) {
 		return;
 	}
 }
-/**
-* USD value at the lower of the token's two feeds — what a call handing funds
-* over is judged at. Falls back to the main feed where there is no second one.
-**/
-function safeUsd(oracle, token, amount) {
-	const main = usd(oracle, token, amount);
-	if (main === void 0) return;
-	try {
-		return BigIntMath.min(main, oracle.convertToUSD(token, amount, true));
-	} catch {
-		return main;
-	}
-}
 //#endregion
 export { maxWithdrawCollateral };

package/dist/esm/onchain/accounts/intents/open-strategy.js

@@ -27,7 +27,7 @@ async function buildOpenStrategyState(props) {
 	const market = sdk.marketRegister.findByCreditManager(creditManager);
 	assertMarketOperable(suite);
 	const underlying = market.pool.underlying.toLowerCase();
-	const convert = (from, to, amount) => market.priceOracle.safeConvert(from, to, amount) ?? 0n;
+	const convert = (from, to, amount) => market.priceOracle.safeConvert(from, to, amount).value;
 	const margin = collateral.reduce((acc, a) => acc + convert(a.token, underlying, a.balance), 0n);
 	if (margin <= 0n) throw new IntentPreviewError("insufficientSourceBalance", void 0, "openStrategy: collateral is worth nothing in underlying");
 	const debt = debtForLeverage(margin, leverage);

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

@@ -29,7 +29,7 @@ async function realize(steps, props) {
 		slippage
 	});
 	const market = sdk.marketRegister.findByCreditManager(creditAccount.creditManager);
-	const price = (from, to, amount) => market.priceOracle.safeConvert(from, to, amount) ?? 0n;
+	const price = (from, to, amount) => market.priceOracle.safeConvert(from, to, amount).value;
 	const suite = sdk.marketRegister.findCreditManager(creditAccount.creditManager);
 	const start = {
 		initialAssets: creditAccount.tokens,

package/dist/esm/onchain/accounts/intents/testing/market.js

@@ -78,12 +78,13 @@ const LIQUIDATION_THRESHOLDS = {
 const MAX_DEBT = toBN("200000", 8);
 /** Mock SDK on the shared fixture market. */
 function buildMarketSdk(extras) {
+	const prices = {
+		...PRICES,
+		...extras?.extraPrices
+	};
 	return buildMockSdk({
-		prices: {
-			...PRICES,
-			...extras?.extraPrices
-		},
-		reservePrices: extras?.reservePrices,
+		prices,
+		reservePrices: extras?.reservePrices ?? prices,
 		decimals: {
 			...DECIMALS,
 			...extras?.extraDecimals

package/dist/esm/onchain/accounts/intents/testing/sdk-mock.js

@@ -1,9 +1,9 @@
 import "../../../constants/math.js";
 import "../../../constants/index.js";
-import { calcMaxLeverage, usdToNumber } from "../../../market/math.js";
+import { calcMaxLeverage } from "../../../market/math.js";
 import { CreditSuite } from "../../../market/credit/CreditSuite.js";
-import { MarketSuite } from "../../../market/MarketSuite.js";
 import { PositionsService } from "../../../positions/PositionsService.js";
+import { TestPriceOracle } from "../../../market/oracle/TestPriceOracle.mock.js";
 import { vi } from "vitest";
 //#region src/onchain/accounts/intents/testing/sdk-mock.ts
 /**
@@ -94,27 +94,25 @@ function echoEncodableOpCalls(op) {
 /**
 * Mock `OnchainSDK` covering exactly what the intent-service touches:
 * price conversion, quota params, CM/facade lookup and call assembly.
-* Conversion mirrors the legacy price-based math:
-* `amount * price[from] * 10^dec(to) / (price[to] * 10^dec(from))`.
+* Conversion is a real {@link TestPriceOracle} seeded from the fixture records.
 */
 function buildMockSdk(args) {
 	const decimalsOf = (token) => args.decimals[token.toLowerCase()] ?? 18;
-	const convert = (token, to, amount) => {
-		const from = token.toLowerCase();
-		const target = to.toLowerCase();
-		if (from === target) return amount;
-		const fromPrice = args.prices[from];
-		const toPrice = args.prices[target];
-		if (fromPrice === void 0 || toPrice === void 0) throw new Error(`mock priceOracle: missing price for ${from} or ${target}`);
-		return amount * fromPrice * 10n ** BigInt(decimalsOf(target)) / (toPrice * 10n ** BigInt(decimalsOf(from)));
-	};
-	const safeConvert = (token, to, amount) => {
-		try {
-			return convert(token, to, amount);
-		} catch {
-			return null;
-		}
+	const lookup = (record, token) => record?.[token.toLowerCase()] ?? record?.[token];
+	const tokenCfgs = {};
+	for (const token of /* @__PURE__ */ new Set([
+		...Object.keys(args.decimals),
+		...Object.keys(args.prices),
+		...Object.keys(args.reservePrices ?? {})
+	])) tokenCfgs[token] = {
+		decimals: lookup(args.decimals, token) ?? 18,
+		symbol: "TOKEN",
+		name: "TOKEN",
+		price: lookup(args.prices, token),
+		reservePrice: lookup(args.reservePrices, token)
 	};
+	const priceOracle = new TestPriceOracle(tokenCfgs);
+	const convert = (from, to, amount) => priceOracle.convert(from, to, amount);
 	const fullQuota = (q) => ({
 		cumulativeIndexLU: 0n,
 		totalQuoted: 0n,
@@ -133,18 +131,6 @@ function buildMockSdk(args) {
 		entries: () => Object.entries(args.liquidationThresholds),
 		get: (token) => args.liquidationThresholds[token.toLowerCase()] ?? args.liquidationThresholds[token]
 	};
-	const _convertToUSD = (token, amount, reserve = false) => {
-		const key = token.toLowerCase();
-		const price = reserve ? args.reservePrices?.[key] : args.prices[key];
-		if (price === void 0) throw new Error(`mock priceOracle: missing ${reserve ? "reserve" : "main"} price for ${token}`);
-		return amount * price / 10n ** BigInt(decimalsOf(token));
-	};
-	const safeUsd = (token, amount) => {
-		const from = token.toLowerCase();
-		const price = args.prices[from] ?? args.prices[token];
-		if (price === void 0) return null;
-		return amount * price / 10n ** BigInt(decimalsOf(from));
-	};
 	const tokenOf = (token) => ({
 		chainId: 1,
 		address: token,
@@ -152,57 +138,19 @@ function buildMockSdk(args) {
 		name: "TOKEN",
 		decimals: decimalsOf(token)
 	});
-	const mainPriceOf = (token) => {
-		const key = token.toLowerCase();
-		const price = args.prices[key] ?? args.prices[token];
-		if (price === void 0) throw new Error(`mock priceOracle: missing main price for ${token}`);
-		return price;
-	};
-	const reservePriceOf = (token) => {
-		const key = token.toLowerCase();
-		const price = args.reservePrices?.[key] ?? args.reservePrices?.[token];
-		if (price === void 0) throw new Error(`mock priceOracle: missing reserve price for ${token}`);
-		return price;
-	};
 	const poolPaused = args.poolPaused ?? false;
 	/** {@inheritDoc MarketSuite.toUnderlyingAmount} */
-	const toUnderlyingAmount = (value) => {
-		const usd = safeUsd(args.underlying, value);
-		return {
-			token: tokenOf(args.rwaAssets?.[args.underlying.toLowerCase()] ?? args.underlying),
-			value,
-			valueUsd: usd === null ? null : usdToNumber(usd)
-		};
-	};
+	const toUnderlyingAmount = (value) => ({
+		token: tokenOf(args.rwaAssets?.[args.underlying.toLowerCase()] ?? args.underlying),
+		...priceOracle.toAmount(args.underlying, value)
+	});
 	const market = {
 		toUnderlyingAmount,
 		/** {@inheritDoc MarketSuite.curator} */
 		curator: MOCK_CURATOR,
 		/** {@inheritDoc MarketSuite.underlying} */
 		underlying: args.underlying,
-		priceOracle: {
-			convert,
-			safeConvert,
-			mainPrice: mainPriceOf,
-			reservePrice: reservePriceOf,
-			convertToUSD: _convertToUSD,
-			toAmount: (token, value) => {
-				const usd = safeUsd(token, value);
-				return {
-					value,
-					valueUsd: usd === null ? null : usdToNumber(usd)
-				};
-			},
-			toTokenAmount: (token, value) => {
-				const usd = safeUsd(token, value);
-				return {
-					token: tokenOf(token),
-					value,
-					valueUsd: usd === null ? null : usdToNumber(usd)
-				};
-			},
-			safeConvertToUSD: safeUsd
-		},
+		priceOracle,
 		pool: {
 			pqk: {
 				quotas,
@@ -222,7 +170,6 @@ function buildMockSdk(args) {
 			underlying: args.underlying
 		}
 	};
-	Object.assign(market, { valueInUnderlying: MarketSuite.prototype.valueInUnderlying });
 	const collateralTokens = [args.underlying.toLowerCase(), ...Object.keys(args.liquidationThresholds).map((t) => t.toLowerCase()).filter((t) => t !== args.underlying.toLowerCase())];
 	const forbidden = new Set((args.forbiddenTokens ?? []).map((t) => t.toLowerCase()));
 	const forbiddenTokensMask = collateralTokens.reduce((mask, token, i) => forbidden.has(token) ? mask | 1n << BigInt(i) : mask, 0n);

package/dist/esm/onchain/accounts/intents/utils/pick-token.js

@@ -36,7 +36,7 @@ function isRedemptionPhantomToken(sdk, token) {
 function rankAccountTokens(args) {
 	const { creditAccount, sdk, exclude = [] } = args;
 	const oracle = sdk.marketRegister.findByCreditManager(creditAccount.creditManager).priceOracle;
-	const convert = (from, to, amount) => oracle.safeConvert(from, to, amount) ?? 0n;
+	const convert = (from, to, amount) => oracle.safeConvert(from, to, amount).value;
 	const candidates = [];
 	for (const t of creditAccount.tokens) {
 		if (t.balance <= 0n) continue;

package/dist/esm/onchain/accounts/intents/utils/price-impact.js

@@ -14,8 +14,8 @@ function probeBasket(balances, oracle) {
 	let basketWad = 0n;
 	for (const asset of balances) {
 		if (asset.balance <= 0n) continue;
-		const usd = oracle.safeConvertToUSD(asset.token, asset.balance);
-		if (usd !== null && usd > 0n) basketWad += usd * WAD / PRICE_DECIMALS;
+		const usd = oracle.safeConvertToUSD(asset.token, asset.balance).value;
+		if (usd > 0n) basketWad += usd * WAD / PRICE_DECIMALS;
 	}
 	if (basketWad <= 0n) return;
 	const probeWad = PROBE_UNIT_USD_WAD;

package/dist/esm/onchain/accounts/intents/utils/router-path.js

@@ -151,7 +151,7 @@ function createRouterPaths(args) {
 function createOraclePaths(args) {
 	const { sdk, creditAccount } = args;
 	const oracle = sdk.marketRegister.findByCreditManager(creditAccount.creditManager).priceOracle;
-	const price = (from, to, amount) => oracle.safeConvert(from, to, amount) ?? 0n;
+	const price = (from, to, amount) => oracle.safeConvert(from, to, amount).value;
 	const estimate = (amount) => ({
 		amount,
 		minAmount: amount,

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

@@ -11,7 +11,7 @@ import { pickFattestNonPhantomToken } from "./utils/pick-token.js";
 function accountView(creditAccount, sdk) {
 	const { underlying, creditManager } = creditAccount;
 	const oracle = sdk.marketRegister.findByCreditManager(creditManager).priceOracle;
-	const price = (from, to, amount) => oracle.safeConvert(from, to, amount) ?? 0n;
+	const price = (from, to, amount) => oracle.safeConvert(from, to, amount).value;
 	const { creditFacade } = sdk.marketRegister.findCreditManager(creditManager);
 	let totalValue = 0n;
 	for (const t of creditAccount.tokens) totalValue += price(t.token, underlying, t.balance);

package/dist/esm/onchain/accounts/liquidations/LiquidationsService.js

@@ -148,11 +148,11 @@ var LiquidationsService = class extends SDKConstruct {
 	#anyMarketTokenAmount(token, value) {
 		const meta = this.sdk.tokensMeta.mustGetToken(token);
 		for (const market of this.sdk.marketRegister.markets) {
-			const valueUsd = market.priceOracle.safeUsdValue(token, value);
-			if (valueUsd !== null) return {
+			const priced = market.priceOracle.safeConvertToUSD(token, value);
+			if (!priced.error) return {
 				token: meta,
 				value,
-				valueUsd
+				valueUsd: usdToNumber(priced.value)
 			};
 		}
 		return {

package/dist/esm/onchain/index.js

@@ -169,9 +169,9 @@ import { WstETHPriceFeedContract } from "./market/pricefeeds/WstETHPriceFeed.js"
 import { YearnPriceFeedContract } from "./market/pricefeeds/YearnPriceFeed.js";
 import { ZeroPriceFeedContract } from "./market/pricefeeds/ZeroPriceFeed.js";
 import { PriceFeedRegister } from "./market/pricefeeds/PriceFeedsRegister.js";
+import { unpriceableTokenError } from "./market/oracle/errors.js";
 import { PriceOracleV310Contract } from "./market/oracle/PriceOracleV310Contract.js";
 import { createPriceOracle } from "./market/oracle/createPriceOracle.js";
-import { unpriceableTokenError } from "./market/oracle/errors.js";
 import { GaugeContract } from "./market/pool/GaugeContract.js";
 import { LinearInterestRateModelContract } from "./market/pool/LinearInterestRateModelContract.js";
 import { PoolV310Contract } from "./market/pool/PoolV310Contract.js";

package/dist/esm/onchain/market/MarketSuite.js

@@ -1,7 +1,5 @@
 import { AddressMap } from "../utils/AddressMap.js";
 import { isRWAToken, isSunsetPool } from "../chain/chains.js";
-import { DUST_THRESHOLD } from "../constants/math.js";
-import "../constants/index.js";
 import "../utils/index.js";
 import { SDKConstruct } from "../base/SDKConstruct.js";
 import "../base/index.js";
@@ -152,32 +150,6 @@ var MarketSuite = class extends SDKConstruct {
 		...this.priceOracle.toAmount(this.underlying, value)
 	});
 	/**
-	* Sums `assets` in this market's underlying at latest oracle prices.
-	*
-	* Balances at or below `minBalance` are ignored. A token the oracle cannot
-	* price contributes nothing; the first such token is {@link ValueInUnderlying.unpriceable}.
-	*
-	* The counterpart of {@link toUnderlyingAmount}: that method labels a figure
-	* already in underlying, this one produces the figure from mixed holdings.
-	**/
-	valueInUnderlying(assets, minBalance = DUST_THRESHOLD) {
-		let unpriceable;
-		let value = 0n;
-		for (const { token, balance } of assets) {
-			if (balance <= minBalance) continue;
-			const converted = this.priceOracle.safeConvert(token, this.underlying, balance);
-			if (converted === null) {
-				unpriceable ??= token;
-				continue;
-			}
-			value += converted;
-		}
-		return unpriceable === void 0 ? { value } : {
-			value,
-			unpriceable
-		};
-	}
-	/**
 	* Display name of this market's pool, e.g. `"USDC Pool"`.
 	*/
 	get poolName() {

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

@@ -66,11 +66,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 (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/esm/onchain/market/index.js

@@ -119,9 +119,9 @@ import { YearnPriceFeedContract } from "./pricefeeds/YearnPriceFeed.js";
 import { ZeroPriceFeedContract } from "./pricefeeds/ZeroPriceFeed.js";
 import { PriceFeedRegister } from "./pricefeeds/PriceFeedsRegister.js";
 import "./pricefeeds/index.js";
+import { unpriceableTokenError } from "./oracle/errors.js";
 import { PriceOracleV310Contract } from "./oracle/PriceOracleV310Contract.js";
 import { createPriceOracle } from "./oracle/createPriceOracle.js";
-import { unpriceableTokenError } from "./oracle/errors.js";
 import "./oracle/index.js";
 import { GaugeContract } from "./pool/GaugeContract.js";
 import { LinearInterestRateModelContract } from "./pool/LinearInterestRateModelContract.js";

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

@@ -1,5 +1,6 @@
 import { AddressMap } from "../../utils/AddressMap.js";
 import { AddressSet } from "../../utils/AddressSet.js";
+import { BigIntMath } from "../../utils/bigint-math.js";
 import { AP_PRICE_FEED_COMPRESSOR, AP_WETH_TOKEN } from "../../constants/address-provider.js";
 import { NATIVE_ADDRESS } from "../../constants/addresses.js";
 import "../../constants/math.js";
@@ -10,10 +11,13 @@ import "../../utils/index.js";
 import { BaseContract } from "../../base/BaseContract.js";
 import "../../base/index.js";
 import { usdToNumber } from "../math.js";
+import { safeValue } from "../../../model/result.js";
+import "../../../model/index.js";
 import { priceFeedCompressorAbi } from "../../../abi/compressors/priceFeedCompressor.js";
 import { PriceFeedRef } from "../pricefeeds/PriceFeedRef.js";
 import { getRawPriceUpdates } from "../pricefeeds/getRawPriceUpdates.js";
 import "../pricefeeds/index.js";
+import { unpriceableTokenError } from "./errors.js";
 import PriceFeedAnswerMap from "./PriceFeedAnswerMap.js";
 import { isAddressEqual, stringToHex } from "viem";
 import { format, formatDistanceToNow } from "date-fns";
@@ -141,10 +145,13 @@ var PriceOracleBaseContract = class extends BaseContract {
 	**/
 	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 safeValue(0n, unpriceableTokenError(from));
+			}
 		}
 	}
 	/**
@@ -152,26 +159,72 @@ var PriceOracleBaseContract = class extends BaseContract {
 	**/
 	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 safeValue(0n, unpriceableTokenError(token));
+			}
+		}
+	}
+	/**
+	* {@inheritDoc IPriceOracleContract.safeConvertMinUSD}
+	**/
+	safeConvertMinUSD(token, amount) {
+		let main;
+		try {
+			main = this.convertToUSD(token, amount);
+		} catch {
+			return safeValue(0n, unpriceableTokenError(token));
+		}
+		let feedToken = token;
+		if (isAddressEqual(token, "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE")) try {
+			feedToken = this.sdk.addressProvider.getAddress(AP_WETH_TOKEN, 0);
+		} catch {}
+		if (!this.reservePriceFeeds.has(feedToken)) return { value: 0n };
+		try {
+			return { value: BigIntMath.min(main, this.convertToUSD(token, amount, true)) };
+		} catch {
+			return safeValue(0n, 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 safeValue(0n, unpriceableTokenError(token));
+			}
 		}
 	}
 	/**
-	* {@inheritDoc IPriceOracleContract.safeUsdValue}
+	* {@inheritDoc IPriceOracleContract.safeConvertAssets}
 	**/
-	safeUsdValue(token, amount) {
-		const usd = this.safeConvertToUSD(token, amount);
-		return usd === null ? null : 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 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 : usdToNumber(priced.value)
 		};
 	};
 	/**