@gearbox-protocol/sdk 14.12.0-next.67 → 14.12.0-next.69

package/dist/cjs/model/index.js

@@ -6,6 +6,8 @@ const require_model_history_schema = require("./history.schema.js");
 const require_model_liquidations = require("./liquidations.js");
 const require_model_liquidations_schema = require("./liquidations.schema.js");
 const require_model_opportunities = require("./opportunities.js");
+require("./positions.js");
+const require_model_positions_schema = require("./positions.schema.js");
 require("./primitives.js");
 exports.POOL_HISTORY_METRICS = require_model_history.POOL_HISTORY_METRICS;
 exports.STRATEGY_HISTORY_METRICS = require_model_history.STRATEGY_HISTORY_METRICS;
@@ -38,27 +40,38 @@ exports.opportunityId = require_model_opportunities.opportunityId;
 exports.opportunityKeySchema = require_model_opportunities_schema.opportunityKeySchema;
 exports.opportunityKindSchema = require_model_opportunities_schema.opportunityKindSchema;
 exports.opportunitySchema = require_model_opportunities_schema.opportunitySchema;
+exports.pnlBreakdownSchema = require_model_positions_schema.pnlBreakdownSchema;
 exports.pointRewardsSchema = require_model_opportunities_schema.pointRewardsSchema;
+exports.pointsProgramPnLSchema = require_model_positions_schema.pointsProgramPnLSchema;
 exports.pointsProgramSchema = require_model_opportunities_schema.pointsProgramSchema;
+exports.pointsRewardsPnLSchema = require_model_positions_schema.pointsRewardsPnLSchema;
 exports.poolHistoryMetricSchema = require_model_history_schema.poolHistoryMetricSchema;
 exports.poolOpportunityDetailSchema = require_model_opportunities_schema.poolOpportunityDetailSchema;
 exports.poolOpportunityId = require_model_opportunities.poolOpportunityId;
 exports.poolOpportunityKeySchema = require_model_opportunities_schema.poolOpportunityKeySchema;
 exports.poolOpportunitySchema = require_model_opportunities_schema.poolOpportunitySchema;
+exports.poolPositionSchema = require_model_positions_schema.poolPositionSchema;
+exports.positionCollateralSchema = require_model_positions_schema.positionCollateralSchema;
+exports.positionFilterSchema = require_model_positions_schema.positionFilterSchema;
+exports.positionKindSchema = require_model_positions_schema.positionKindSchema;
+exports.positionSchema = require_model_positions_schema.positionSchema;
 exports.priceFeedDataSchema = require_model_opportunities_schema.priceFeedDataSchema;
 exports.priceFeedSummarySchema = require_model_opportunities_schema.priceFeedSummarySchema;
 exports.quotaAssetSchema = require_model_opportunities_schema.quotaAssetSchema;
 exports.rateCurvePointSchema = require_model_opportunities_schema.rateCurvePointSchema;
 exports.rateCurveSchema = require_model_opportunities_schema.rateCurveSchema;
 exports.receivedAssetSchema = require_model_liquidations_schema.receivedAssetSchema;
+exports.rewardsPnLSchema = require_model_positions_schema.rewardsPnLSchema;
 exports.rewardsSchema = require_model_opportunities_schema.rewardsSchema;
 exports.strategyHistoryMetricSchema = require_model_history_schema.strategyHistoryMetricSchema;
 exports.strategyOpportunityDetailSchema = require_model_opportunities_schema.strategyOpportunityDetailSchema;
 exports.strategyOpportunityId = require_model_opportunities.strategyOpportunityId;
 exports.strategyOpportunityKeySchema = require_model_opportunities_schema.strategyOpportunityKeySchema;
 exports.strategyOpportunitySchema = require_model_opportunities_schema.strategyOpportunitySchema;
+exports.strategyPositionSchema = require_model_positions_schema.strategyPositionSchema;
 exports.timestampSchema = require_model_primitives_schema.timestampSchema;
 exports.tokenAmountSchema = require_model_primitives_schema.tokenAmountSchema;
+exports.tokenRewardsPnLSchema = require_model_positions_schema.tokenRewardsPnLSchema;
 exports.tokenRewardsSchema = require_model_opportunities_schema.tokenRewardsSchema;
 exports.tokenSchema = require_model_primitives_schema.tokenSchema;
 exports.txCallSchema = require_model_primitives_schema.txCallSchema;

package/dist/cjs/model/liquidations.schema.js

@@ -45,7 +45,7 @@ const instantReceivedAssetSchema = zod_v4.z.object({
 const delayedReceivedAssetSchema = zod_v4.z.object({
 	...require_model_primitives_schema.tokenAmountSchema.shape,
 	isDelayed: zod_v4.z.literal(true),
-	redeemerAddress: require_sdk_utils_zod.ZodAddress().optional(),
+	redeemer: require_sdk_utils_zod.ZodAddress().optional(),
 	claimableAt: require_model_primitives_schema.timestampSchema.optional()
 });
 /**
@@ -60,6 +60,8 @@ const liquidationApprovalSchema = require_model_primitives_schema.tokenAmountSch
 * {@link LiquidationPosition}
 **/
 const liquidationPositionSchema = zod_v4.z.object({
+	kind: zod_v4.z.literal("liquidation"),
+	name: zod_v4.z.string(),
 	chainId: require_model_primitives_schema.chainIdSchema,
 	sourceToken: require_model_primitives_schema.tokenSchema,
 	output: require_model_primitives_schema.tokenAmountSchema,

package/dist/cjs/model/opportunities.schema.js

@@ -43,22 +43,19 @@ const rewardsSchema = zod_v4.z.discriminatedUnion("kind", [tokenRewardsSchema, p
 * {@link ApyBreakdown}
 **/
 const apyBreakdownSchema = zod_v4.z.object({
-	totalApy: require_model_primitives_schema.bpsSchema,
+	totalApy: require_model_primitives_schema.bpsSchema.optional(),
 	organicApy: require_model_primitives_schema.bpsSchema,
-	rewards: zod_v4.z.array(rewardsSchema)
+	rewards: zod_v4.z.array(rewardsSchema).optional()
 });
 /**
 * {@link OpportunityBase}
 **/
 const opportunityBaseSchema = zod_v4.z.object({
 	chainId: require_model_primitives_schema.chainIdSchema,
-	title: zod_v4.z.string(),
+	name: zod_v4.z.string(),
 	curator: require_model_primitives_schema.curatorSchema,
 	underlyingToken: require_model_primitives_schema.tokenSchema,
-	totalSupply: require_model_primitives_schema.amountSchema,
 	totalBorrow: require_model_primitives_schema.amountSchema,
-	utilization: require_model_primitives_schema.bpsSchema,
-	supplyApy: apyBreakdownSchema.optional(),
 	collateralTokens: zod_v4.z.array(require_model_primitives_schema.tokenSchema),
 	paused: zod_v4.z.boolean(),
 	rwa: zod_v4.z.boolean(),
@@ -70,7 +67,10 @@ const opportunityBaseSchema = zod_v4.z.object({
 const poolOpportunitySchema = zod_v4.z.object({
 	...opportunityBaseSchema.shape,
 	kind: zod_v4.z.literal("pool"),
-	pool: require_sdk_utils_zod.ZodAddress()
+	pool: require_sdk_utils_zod.ZodAddress(),
+	totalSupply: require_model_primitives_schema.amountSchema,
+	utilization: require_model_primitives_schema.bpsSchema,
+	supplyApy: apyBreakdownSchema
 });
 /**
 * {@link StrategyOpportunity}
@@ -85,8 +85,11 @@ const strategyOpportunitySchema = zod_v4.z.object({
 	liquidationFee: require_model_primitives_schema.bpsSchema,
 	expirationDate: require_model_primitives_schema.timestampSchema.nullable(),
 	collateralApy: apyBreakdownSchema.optional(),
+	maxLeverageApy: apyBreakdownSchema.optional(),
 	borrowApy: require_model_primitives_schema.bpsSchema.optional(),
 	additionalBorrowApy: require_model_primitives_schema.bpsSchema.optional(),
+	totalValue: require_model_primitives_schema.amountSchema.optional(),
+	utilization: require_model_primitives_schema.bpsSchema.optional(),
 	maxBorrowAmount: require_model_primitives_schema.amountSchema,
 	maxLeverage: require_model_primitives_schema.leverageSchema
 });

package/dist/cjs/model/positions.schema.js

@@ -0,0 +1,120 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_sdk_utils_zod = require("../sdk/utils/zod.js");
+const require_model_primitives_schema = require("./primitives.schema.js");
+const require_model_opportunities_schema = require("./opportunities.schema.js");
+const require_model_liquidations_schema = require("./liquidations.schema.js");
+let zod_v4 = require("zod/v4");
+//#region src/model/positions.schema.ts
+/**
+* Runtime schemas for {@link ./positions.js}, see the note in
+* `primitives.schema.ts` on why they are written by hand.
+**/
+/**
+* {@link PositionKind}
+**/
+const positionKindSchema = zod_v4.z.union([
+	zod_v4.z.literal("pool"),
+	zod_v4.z.literal("strategy"),
+	zod_v4.z.literal("liquidation")
+]);
+/**
+* {@link TokenRewardsPnL}
+**/
+const tokenRewardsPnLSchema = zod_v4.z.object({
+	...require_model_primitives_schema.tokenAmountSchema.shape,
+	kind: zod_v4.z.literal("token")
+});
+/**
+* {@link PointsProgramPnL}
+**/
+const pointsProgramPnLSchema = zod_v4.z.object({
+	...require_model_opportunities_schema.pointsProgramSchema.shape,
+	value: zod_v4.z.number()
+});
+/**
+* {@link PointsRewardsPnL}
+**/
+const pointsRewardsPnLSchema = zod_v4.z.object({
+	kind: zod_v4.z.literal("point"),
+	points: zod_v4.z.array(pointsProgramPnLSchema)
+});
+/**
+* {@link RewardsPnL}
+**/
+const rewardsPnLSchema = zod_v4.z.discriminatedUnion("kind", [tokenRewardsPnLSchema, pointsRewardsPnLSchema]);
+/**
+* {@link PnlBreakdown}
+**/
+const pnlBreakdownSchema = zod_v4.z.object({
+	organic: require_model_primitives_schema.tokenAmountSchema,
+	total: require_model_primitives_schema.tokenAmountSchema,
+	rewards: zod_v4.z.array(rewardsPnLSchema)
+});
+/**
+* {@link PositionCollateral}
+**/
+const positionCollateralSchema = zod_v4.z.object({
+	collateral: require_model_primitives_schema.tokenAmountSchema,
+	quota: require_model_primitives_schema.tokenAmountSchema,
+	withdrawals: zod_v4.z.array(require_model_liquidations_schema.delayedReceivedAssetSchema)
+});
+/**
+* {@link PoolPosition}
+**/
+const poolPositionSchema = zod_v4.z.object({
+	kind: zod_v4.z.literal("pool"),
+	name: zod_v4.z.string(),
+	chainId: require_model_primitives_schema.chainIdSchema,
+	pool: require_sdk_utils_zod.ZodAddress(),
+	netValue: require_model_primitives_schema.tokenAmountSchema,
+	apy: require_model_opportunities_schema.apyBreakdownSchema,
+	pnl: pnlBreakdownSchema.optional()
+});
+/**
+* {@link StrategyPosition}
+**/
+const strategyPositionSchema = zod_v4.z.object({
+	kind: zod_v4.z.literal("strategy"),
+	name: zod_v4.z.string(),
+	chainId: require_model_primitives_schema.chainIdSchema,
+	creditManager: require_sdk_utils_zod.ZodAddress(),
+	creditAccount: require_sdk_utils_zod.ZodAddress(),
+	targetCollateral: require_model_primitives_schema.tokenSchema.nullable(),
+	leverage: require_model_primitives_schema.leverageSchema,
+	borrowApy: require_model_primitives_schema.bpsSchema,
+	netApy: require_model_opportunities_schema.apyBreakdownSchema.optional(),
+	totalDebt: require_model_primitives_schema.tokenAmountSchema,
+	totalValue: require_model_primitives_schema.tokenAmountSchema,
+	healthFactor: require_model_primitives_schema.bpsSchema,
+	pnl: pnlBreakdownSchema.optional(),
+	collaterals: zod_v4.z.array(positionCollateralSchema)
+});
+/**
+* {@link Position}
+**/
+const positionSchema = zod_v4.z.discriminatedUnion("kind", [
+	poolPositionSchema,
+	strategyPositionSchema,
+	require_model_liquidations_schema.liquidationPositionSchema
+]);
+/**
+* {@link PositionFilter}
+**/
+const positionFilterSchema = zod_v4.z.object({
+	kind: positionKindSchema.optional(),
+	isZeroDebt: zod_v4.z.boolean().optional(),
+	chainIds: zod_v4.z.array(require_model_primitives_schema.chainIdSchema).optional(),
+	underlyingType: require_model_primitives_schema.assetTypeSchema.optional()
+});
+//#endregion
+exports.pnlBreakdownSchema = pnlBreakdownSchema;
+exports.pointsProgramPnLSchema = pointsProgramPnLSchema;
+exports.pointsRewardsPnLSchema = pointsRewardsPnLSchema;
+exports.poolPositionSchema = poolPositionSchema;
+exports.positionCollateralSchema = positionCollateralSchema;
+exports.positionFilterSchema = positionFilterSchema;
+exports.positionKindSchema = positionKindSchema;
+exports.positionSchema = positionSchema;
+exports.rewardsPnLSchema = rewardsPnLSchema;
+exports.strategyPositionSchema = strategyPositionSchema;
+exports.tokenRewardsPnLSchema = tokenRewardsPnLSchema;

package/dist/cjs/sdk/accounts/liquidations/LiquidationsService.js

@@ -98,17 +98,12 @@ var LiquidationsService = class extends require_sdk_base_SDKConstruct.SDKConstru
 		await compressor.loadWithdrawableAssets();
 		const phantomTokens = new require_sdk_utils_AddressSet.AddressSet(compressor.getWithdrawableAssets().map((a) => a.withdrawalPhantomToken));
 		const { claimable, pending } = await compressor.getExternalAccountCurrentWithdrawals(props.liquidator, ...phantomTokens.asArray());
-		const chainId = this.sdk.chainId;
 		return [...claimable.map((w) => ({
-			chainId,
-			sourceToken: this.sdk.tokensMeta.mustGetToken(w.token),
-			output: this.#withdrawalOutput(w.outputs, w.token),
+			...this.#liquidationPosition(w.token, w.outputs),
 			claimTx: this.#claimTx(w.claimCalls, w.token),
 			redeemer: w.redeemer
 		})), ...pending.map((w) => ({
-			chainId,
-			sourceToken: this.sdk.tokensMeta.mustGetToken(w.token),
-			output: this.#withdrawalOutput(w.expectedOutputs, w.token),
+			...this.#liquidationPosition(w.token, w.expectedOutputs),
 			claimableAt: Number(w.claimableAt),
 			redeemer: w.redeemer
 		}))];
@@ -163,6 +158,22 @@ var LiquidationsService = class extends require_sdk_base_SDKConstruct.SDKConstru
 			valueUsd: null
 		};
 	}
+	/**
+	* The part a claimable and a pending withdrawal describe the same way. What
+	* separates them — the claim transaction and the moment it becomes
+	* available — is added by the caller.
+	**/
+	#liquidationPosition(token, outputs) {
+		const sourceToken = this.sdk.tokensMeta.mustGetToken(token);
+		const output = this.#withdrawalOutput(outputs, token);
+		return {
+			kind: "liquidation",
+			name: `${sourceToken.symbol} → ${output.token.symbol}`,
+			chainId: this.sdk.chainId,
+			sourceToken,
+			output
+		};
+	}
 	#withdrawalOutput(outputs, sourceToken) {
 		const [output] = outputs;
 		if (outputs.length !== 1 || !output) throw new Error(`expected exactly one output for withdrawal of ${sourceToken}, got ${outputs.length}`);
@@ -186,7 +197,7 @@ var LiquidationsService = class extends require_sdk_base_SDKConstruct.SDKConstru
 			return {
 				isDelayed: true,
 				...amount,
-				redeemerAddress: require_sdk_utils_hex.hexEq(o.redeemerAddress, "0x0000000000000000000000000000000000000000") ? void 0 : o.redeemerAddress,
+				redeemer: require_sdk_utils_hex.hexEq(o.redeemerAddress, "0x0000000000000000000000000000000000000000") ? void 0 : o.redeemerAddress,
 				claimableAt: o.claimableAt === 0n ? void 0 : Number(o.claimableAt)
 			};
 		});

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

@@ -4,6 +4,7 @@ const require_sdk_chain_chains = require("../chain/chains.js");
 require("../utils/index.js");
 const require_sdk_base_SDKConstruct = require("../base/SDKConstruct.js");
 require("../base/index.js");
+const require_sdk_market_math = require("./math.js");
 const require_sdk_market_credit_CreditSuite = require("./credit/CreditSuite.js");
 require("./credit/index.js");
 const require_sdk_market_MarketConfiguratorContract = require("./MarketConfiguratorContract.js");
@@ -190,17 +191,15 @@ var MarketSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	* Every opportunity this market offers: its pool, plus one row per
 	* `(credit manager, target collateral)` pair.
 	*
-	* @param totals - Resolves the summed worth of the credit accounts backing a
-	* strategy, which only a credit-account query can establish.
 	* @param filter - Optional narrowing. A filter naming a kind skips building
 	* the other kind entirely; every built row is then checked in full by
 	* {@link matchesOpportunityFilter}, so there is one definition of what each
 	* criterion means.
 	*/
-	opportunities(totals, filter) {
+	opportunities(filter) {
 		const rows = [];
 		if (filter?.kind !== "strategy") rows.push(this.poolOpportunity());
-		if (filter?.kind !== "pool") for (const { suite, collateral } of this.strategies) rows.push(suite.strategyOpportunity(collateral, totals(suite.creditManager.address, collateral)));
+		if (filter?.kind !== "pool") for (const { suite, collateral } of this.strategies) rows.push(suite.strategyOpportunity(collateral));
 		return rows.filter((row) => require_model_opportunities.matchesOpportunityFilter(row, filter));
 	}
 	/**
@@ -214,15 +213,13 @@ var MarketSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 			kind: "pool",
 			chainId: this.chainId,
 			pool: pool.address,
-			title: `${this.underlyingToken.symbol} Pool`,
+			name: `${this.underlyingToken.symbol} Pool`,
 			curator: this.curator,
 			underlyingToken: this.underlyingToken,
-			totalSupply: {
-				value: pool.totalSupply,
-				valueUsd: oracle.safeUsdValue(pool.underlying, pool.totalAssets)
-			},
+			totalSupply: oracle.toAmount(pool.underlying, pool.totalAssets),
 			totalBorrow: oracle.toAmount(pool.underlying, pool.totalBorrowed),
 			utilization: pool.utilization,
+			supplyApy: { organicApy: require_sdk_market_math.rayToBps(pool.supplyRate) },
 			collateralTokens: this.collateralTokens,
 			paused: pool.isPaused,
 			rwa: this.rwa,
@@ -257,11 +254,10 @@ var MarketSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	*
 	* @param creditManager - Credit manager the position is opened in.
 	* @param collateral - Target collateral of the position.
-	* @param totalSupply - Summed worth of the credit accounts backing it.
 	* @throws If this market has no such strategy, see {@link mustFindStrategy}.
 	*/
-	strategyOpportunityDetail(creditManager, collateral, totalSupply) {
-		return this.mustFindStrategy(creditManager, collateral).suite.strategyOpportunityDetail(collateral, totalSupply);
+	strategyOpportunityDetail(creditManager, collateral) {
+		return this.mustFindStrategy(creditManager, collateral).suite.strategyOpportunityDetail(collateral);
 	}
 	/**
 	* Whether any child contract wrapper has observed events that require a

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

@@ -146,16 +146,9 @@ var CreditSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	* read model does.
 	*
 	* @param collateral - Target collateral of the position.
-	* @param totalSupply - Summed worth of the credit accounts backing it, which
-	* only a credit-account query can establish. Defaults to zero, so a caller
-	* that does not care about size can omit it.
 	* @throws If the credit manager does not value the collateral.
 	*/
-	strategyOpportunity(collateral, totalSupply_) {
-		const totalSupply = totalSupply_ ?? {
-			value: 0n,
-			valueUsd: 0
-		};
+	strategyOpportunity(collateral) {
 		const { market, creditManager: cm } = this;
 		const { pool } = market.pool;
 		const oracle = market.priceOracle;
@@ -167,12 +160,10 @@ var CreditSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 			chainId: this.chainId,
 			creditManager: cm.address,
 			targetCollateral: this.tokensMeta.mustGetToken(collateral),
-			title: `${this.tokensMeta.symbol(collateral)} / ${market.underlyingToken.symbol}`,
+			name: `${this.tokensMeta.symbol(collateral)} / ${market.underlyingToken.symbol}`,
 			curator: market.curator,
 			underlyingToken: market.underlyingToken,
-			totalSupply,
 			totalBorrow: oracle.toAmount(pool.underlying, borrowed),
-			utilization: require_sdk_market_math.utilizationBps(borrowed, totalSupply.value),
 			collateralTokens: market.collateralTokens,
 			paused: this.isPaused,
 			rwa: market.rwa,
@@ -191,11 +182,10 @@ var CreditSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	* {@link strategyOpportunity} plus the data only its detail screen needs.
 	*
 	* @param collateral - Target collateral of the position.
-	* @param totalSupply - Summed worth of the credit accounts backing it.
 	*/
-	strategyOpportunityDetail(collateral, totalSupply) {
+	strategyOpportunityDetail(collateral) {
 		return {
-			...this.strategyOpportunity(collateral, totalSupply),
+			...this.strategyOpportunity(collateral),
 			rateCurve: this.market.pool.rateCurve,
 			priceFeeds: this.market.priceFeedSummary(collateral)
 		};

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

@@ -1,41 +1,29 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_sdk_base_SDKConstruct = require("../base/SDKConstruct.js");
 require("../base/index.js");
-const require_sdk_market_math = require("../market/math.js");
 //#region src/sdk/opportunities/OpportunitiesService.ts
 /**
-* A lookup that knows of no strategy, used when a filter rules strategies out
-* and the credit-account query is skipped altogether.
-**/
-const NO_TOTALS = () => void 0;
-/**
 * Builds the `opportunities` read model from the chain.
 *
-* Everything except the credit-account totals comes from the market state the
-* SDK already holds, so a list costs one RPC round-trip at most. Yield figures
-* that fold in incentives, points or history are deliberately absent: they are
-* the backend's job, and this service never guesses them.
+* Every value in a row is market state the SDK already holds, so a list costs
+* no RPC round-trip at all. Yield figures that fold in incentives, points or
+* history are deliberately absent: they are the backend's job, and this service
+* never guesses them. So is the size of a strategy — summing it takes a sweep
+* over every credit account of the chain, which is too expensive for a list.
 *
 * The rows themselves are assembled by the market wrappers — see
 * {@link MarketSuite.opportunities} — because every value in them is market
-* state. What is left here is the one thing no single market can answer: how
-* much the credit accounts of a strategy are worth.
+* state. This service only picks the markets and applies the filter.
 **/
 var OpportunitiesService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	/**
 	* Every pool and strategy of every loaded market on this chain.
 	*
-	* Strategies are measured by the value locked in their credit accounts, so
-	* the list issues one credit-account query unless the filter rules strategies
-	* out entirely.
-	*
 	* @param filter - Optional narrowing, applied to the built rows.
 	**/
 	async list(filter) {
 		if (filter?.chainIds && !filter.chainIds.includes(this.chainId)) return [];
-		const { markets } = this.sdk.marketRegister;
-		const totals = filter?.kind === "pool" ? NO_TOTALS : await this.#strategyTotals(markets);
-		return markets.flatMap((market) => market.opportunities(totals, filter));
+		return this.sdk.marketRegister.markets.flatMap((market) => market.opportunities(filter));
 	}
 	/**
 	* A single pool opportunity plus its interest rate curve and quotas.
@@ -53,51 +41,8 @@ var OpportunitiesService = class extends require_sdk_base_SDKConstruct.SDKConstr
 	* collateral as a strategy.
 	**/
 	async getStrategy(key) {
-		const market = this.sdk.marketRegister.findByCreditManager(key.creditManager);
-		const { suite } = market.mustFindStrategy(key.creditManager, key.targetCollateral);
-		const totals = await this.#strategyTotals([market]);
-		return suite.strategyOpportunityDetail(key.targetCollateral, totals(key.creditManager, key.targetCollateral));
-	}
-	/**
-	* Total value held by the credit accounts backing every strategy of the given
-	* markets.
-	*
-	* An account that holds several strategy collaterals counts in full towards
-	* each of them: the read model reports what a strategy's accounts are worth,
-	* not how that worth splits across the collaterals inside them.
-	**/
-	async #strategyTotals(markets) {
-		const wanted = /* @__PURE__ */ new Map();
-		for (const market of markets) for (const { suite, collateral } of market.strategies) {
-			const cm = suite.creditManager.address.toLowerCase();
-			const tokens = wanted.get(cm) ?? /* @__PURE__ */ new Set();
-			tokens.add(collateral.toLowerCase());
-			wanted.set(cm, tokens);
-		}
-		if (wanted.size === 0) return NO_TOTALS;
-		const accounts = await this.sdk.accounts.getCreditAccounts({ includeZeroDebt: true });
-		const totals = /* @__PURE__ */ new Map();
-		for (const account of accounts) {
-			const tokens = wanted.get(account.creditManager.toLowerCase());
-			if (!tokens) continue;
-			for (const token of account.tokens) {
-				if (token.balance <= 0n || !tokens.has(token.token.toLowerCase())) continue;
-				const key = strategyKey(account.creditManager, token.token);
-				const current = totals.get(key);
-				totals.set(key, {
-					value: (current?.value ?? 0n) + account.totalValue,
-					valueUsd: (current?.valueUsd ?? 0) + require_sdk_market_math.usdToNumber(account.totalValueUSD)
-				});
-			}
-		}
-		return (creditManager, collateral) => totals.get(strategyKey(creditManager, collateral));
+		return this.sdk.marketRegister.findByCreditManager(key.creditManager).strategyOpportunityDetail(key.creditManager, key.targetCollateral);
 	}
 };
-/**
-* Both halves of a strategy key folded into one map key.
-**/
-function strategyKey(creditManager, collateral) {
-	return `${creditManager.toLowerCase()}:${collateral.toLowerCase()}`;
-}
 //#endregion
 exports.OpportunitiesService = OpportunitiesService;

package/dist/cjs/sdk/router/RouterV310Contract.js

@@ -58,6 +58,40 @@ var RouterV310Contract = class extends require_sdk_router_AbstractRouterContract
 		};
 	}
 	/**
+	* {@inheritDoc IRouterContract.findManyToOnePath}
+	**/
+	async findManyToOnePath(props) {
+		const { creditAccount, creditManager, expectedBalances, leftoverBalances, target, slippage } = props;
+		const expectedMap = new require_sdk_utils_AssetsMap.AssetsMap(expectedBalances);
+		const leftoverMap = new require_sdk_utils_AssetsMap.AssetsMap(leftoverBalances);
+		const getNumSplits = this.#numSplitsGetter(creditManager, expectedBalances);
+		const tData = creditManager.collateralTokens.map((token) => ({
+			token,
+			balance: expectedMap.get(token) ?? 0n,
+			leftoverBalance: require_sdk_router_helpers.limitLeftover(leftoverMap.get(token), token) ?? 0n,
+			numSplits: getNumSplits(token),
+			claimRewards: false
+		}));
+		this.logger?.debug({
+			creditAccount: creditAccount.creditAccount,
+			creditManager: this.labelAddress(creditManager.address),
+			target: this.labelAddress(target),
+			slippage,
+			tData: this.#debugTokenData(tData)
+		}, "calling routeManyToOne");
+		const { result } = await this.contract.simulate.routeManyToOne([
+			creditAccount.creditAccount,
+			target,
+			BigInt(slippage),
+			tData
+		], { gas: this.sdk.gasLimit });
+		return {
+			amount: result.amount,
+			minAmount: result.minAmount,
+			calls: [...result.calls]
+		};
+	}
+	/**
 	* {@inheritDoc IRouterContract.findOpenStrategyPath}
 	**/
 	async findOpenStrategyPath(props) {

package/dist/esm/dev/AccountOpener.js

@@ -1,9 +1,9 @@
-import { ierc20Abi } from "../abi/iERC20.js";
 import { iCreditFacadeV310Abi } from "../abi/310/generated.js";
 import { AddressMap } from "../sdk/utils/AddressMap.js";
 import { AddressSet } from "../sdk/utils/AddressSet.js";
 import { AssetsMap } from "../sdk/utils/AssetsMap.js";
 import { childLogger } from "../sdk/utils/childLogger.js";
+import { ierc20Abi } from "../abi/iERC20.js";
 import "../sdk/constants/addresses.js";
 import { MAX_UINT256, PERCENTAGE_FACTOR } from "../sdk/constants/math.js";
 import { SDKConstruct } from "../sdk/base/SDKConstruct.js";

package/dist/esm/dev/withdrawalUtils.js

@@ -1,6 +1,6 @@
-import { iWithdrawalCompressorV313Abi } from "../abi/IWithdrawalCompressorV313.js";
 import { getNetworkType } from "../sdk/chain/chains.js";
 import { getWithdrawalCompressorAddress } from "../sdk/accounts/withdrawal-compressor/addresses.js";
+import { iWithdrawalCompressorV313Abi } from "../abi/IWithdrawalCompressorV313.js";
 import "../sdk/index.js";
 import { iMidasDataFeedAbi, iMidasRedemptionVaultAbi, midasGatewayAbi, midasRedeemerAbi, midasRedemptionVaultPhantomTokenAbi, securitizeRedeemerAbi, securitizeRedemptionGatewayAbi, securitizeRedemptionPhantomTokenAbi } from "./withdrawalAbi.js";
 import { erc20Abi, hexToString, parseAbi, parseEther } from "viem";

package/dist/esm/model/index.js

@@ -5,5 +5,7 @@ import { historyChartMetadataSchema, historyMetricSchema, historyPointSchema, hi
 import { matchesLiquidatableAccountFilter } from "./liquidations.js";
 import { delayedReceivedAssetSchema, instantReceivedAssetSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionSchema, receivedAssetSchema } from "./liquidations.schema.js";
 import { matchesOpportunityFilter, opportunityId, poolOpportunityId, strategyOpportunityId } from "./opportunities.js";
+import "./positions.js";
+import { pnlBreakdownSchema, pointsProgramPnLSchema, pointsRewardsPnLSchema, poolPositionSchema, positionCollateralSchema, positionFilterSchema, positionKindSchema, positionSchema, rewardsPnLSchema, strategyPositionSchema, tokenRewardsPnLSchema } from "./positions.schema.js";
 import "./primitives.js";
-export { POOL_HISTORY_METRICS, STRATEGY_HISTORY_METRICS, amountSchema, apyBreakdownSchema, assetTypeSchema, bpsSchema, chainIdSchema, curatorSchema, delayedReceivedAssetSchema, historyChartMetadataSchema, historyMetricSchema, historyPointSchema, historyRangeSchema, historySeriesSchema, instantReceivedAssetSchema, leverageSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionSchema, matchesLiquidatableAccountFilter, matchesOpportunityFilter, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterSchema, opportunityHistoryQuerySchema, opportunityId, opportunityKeySchema, opportunityKindSchema, opportunitySchema, pointRewardsSchema, pointsProgramSchema, poolHistoryMetricSchema, poolOpportunityDetailSchema, poolOpportunityId, poolOpportunityKeySchema, poolOpportunitySchema, priceFeedDataSchema, priceFeedSummarySchema, quotaAssetSchema, rateCurvePointSchema, rateCurveSchema, receivedAssetSchema, rewardsSchema, strategyHistoryMetricSchema, strategyOpportunityDetailSchema, strategyOpportunityId, strategyOpportunityKeySchema, strategyOpportunitySchema, timestampSchema, tokenAmountSchema, tokenRewardsSchema, tokenSchema, txCallSchema };
+export { POOL_HISTORY_METRICS, STRATEGY_HISTORY_METRICS, amountSchema, apyBreakdownSchema, assetTypeSchema, bpsSchema, chainIdSchema, curatorSchema, delayedReceivedAssetSchema, historyChartMetadataSchema, historyMetricSchema, historyPointSchema, historyRangeSchema, historySeriesSchema, instantReceivedAssetSchema, leverageSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionSchema, matchesLiquidatableAccountFilter, matchesOpportunityFilter, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterSchema, opportunityHistoryQuerySchema, opportunityId, opportunityKeySchema, opportunityKindSchema, opportunitySchema, pnlBreakdownSchema, pointRewardsSchema, pointsProgramPnLSchema, pointsProgramSchema, pointsRewardsPnLSchema, poolHistoryMetricSchema, poolOpportunityDetailSchema, poolOpportunityId, poolOpportunityKeySchema, poolOpportunitySchema, poolPositionSchema, positionCollateralSchema, positionFilterSchema, positionKindSchema, positionSchema, priceFeedDataSchema, priceFeedSummarySchema, quotaAssetSchema, rateCurvePointSchema, rateCurveSchema, receivedAssetSchema, rewardsPnLSchema, rewardsSchema, strategyHistoryMetricSchema, strategyOpportunityDetailSchema, strategyOpportunityId, strategyOpportunityKeySchema, strategyOpportunitySchema, strategyPositionSchema, timestampSchema, tokenAmountSchema, tokenRewardsPnLSchema, tokenRewardsSchema, tokenSchema, txCallSchema };

package/dist/esm/model/liquidations.schema.js

@@ -44,7 +44,7 @@ const instantReceivedAssetSchema = z.object({
 const delayedReceivedAssetSchema = z.object({
 	...tokenAmountSchema.shape,
 	isDelayed: z.literal(true),
-	redeemerAddress: ZodAddress().optional(),
+	redeemer: ZodAddress().optional(),
 	claimableAt: timestampSchema.optional()
 });
 /**
@@ -59,6 +59,8 @@ const liquidationApprovalSchema = tokenAmountSchema.extend({ spender: ZodAddress
 * {@link LiquidationPosition}
 **/
 const liquidationPositionSchema = z.object({
+	kind: z.literal("liquidation"),
+	name: z.string(),
 	chainId: chainIdSchema,
 	sourceToken: tokenSchema,
 	output: tokenAmountSchema,

package/dist/esm/model/opportunities.schema.js

@@ -42,22 +42,19 @@ const rewardsSchema = z.discriminatedUnion("kind", [tokenRewardsSchema, pointRew
 * {@link ApyBreakdown}
 **/
 const apyBreakdownSchema = z.object({
-	totalApy: bpsSchema,
+	totalApy: bpsSchema.optional(),
 	organicApy: bpsSchema,
-	rewards: z.array(rewardsSchema)
+	rewards: z.array(rewardsSchema).optional()
 });
 /**
 * {@link OpportunityBase}
 **/
 const opportunityBaseSchema = z.object({
 	chainId: chainIdSchema,
-	title: z.string(),
+	name: z.string(),
 	curator: curatorSchema,
 	underlyingToken: tokenSchema,
-	totalSupply: amountSchema,
 	totalBorrow: amountSchema,
-	utilization: bpsSchema,
-	supplyApy: apyBreakdownSchema.optional(),
 	collateralTokens: z.array(tokenSchema),
 	paused: z.boolean(),
 	rwa: z.boolean(),
@@ -69,7 +66,10 @@ const opportunityBaseSchema = z.object({
 const poolOpportunitySchema = z.object({
 	...opportunityBaseSchema.shape,
 	kind: z.literal("pool"),
-	pool: ZodAddress()
+	pool: ZodAddress(),
+	totalSupply: amountSchema,
+	utilization: bpsSchema,
+	supplyApy: apyBreakdownSchema
 });
 /**
 * {@link StrategyOpportunity}
@@ -84,8 +84,11 @@ const strategyOpportunitySchema = z.object({
 	liquidationFee: bpsSchema,
 	expirationDate: timestampSchema.nullable(),
 	collateralApy: apyBreakdownSchema.optional(),
+	maxLeverageApy: apyBreakdownSchema.optional(),
 	borrowApy: bpsSchema.optional(),
 	additionalBorrowApy: bpsSchema.optional(),
+	totalValue: amountSchema.optional(),
+	utilization: bpsSchema.optional(),
 	maxBorrowAmount: amountSchema,
 	maxLeverage: leverageSchema
 });