@gearbox-protocol/sdk 15.1.0-next.2 → 15.1.0-next.21

package/dist/esm/preview/preview/buildDelayedPreview.js

@@ -1,9 +1,11 @@
 import { AssetsMap } from "../../sdk/utils/AssetsMap.js";
 import { BigIntMath } from "../../sdk/utils/bigint-math.js";
 import { DUST_THRESHOLD } from "../../sdk/constants/math.js";
+import { calcPositionLeverage } from "../../sdk/market/math.js";
+import { ERROR_UNPRICEABLE_TOKEN } from "../../model/previews.js";
+import "../../model/index.js";
 import "../../sdk/index.js";
 import "../../common-utils/index.js";
-import { ERROR_UNPRICEABLE_TOKEN } from "./types.js";
 import { isAddressEqual } from "viem";
 //#region src/preview/preview/buildDelayedPreview.ts
 /**
@@ -25,21 +27,23 @@ import { isAddressEqual } from "viem";
 * @param receivedToken - Token the `CLOSE_ACCOUNT` resume withdraws to the
 * user: the unwrapped underlying (vault asset) for RWA markets, the
 * underlying itself otherwise.
+* @param sdk - Market data source for the position metrics of the resulting
+* state; read synchronously, no network access.
 */
-function buildDelayedPreview(afterInstant, before, detected, convert, receivedToken) {
+function buildDelayedPreview(afterInstant, before, detected, convert, receivedToken, sdk) {
 	const { request, intent } = detected;
 	const post = afterInstant.clone();
 	const converter = makeSafeConverter(convert);
 	const claimed = applyClaim(post, request);
 	const collateralWithdrawn = new AssetsMap();
 	switch (intent?.type) {
-		case "CLOSE_ACCOUNT": return buildClosePreview(post, converter, receivedToken);
+		case "CLOSE_ACCOUNT": return buildClosePreview(post, converter, receivedToken, sdk);
 		case "DECREASE_LEVERAGE":
 			repayFromClaim(post, request.claimToken, converter.convert, claimed);
 			break;
 		case "WITHDRAW_COLLATERAL": applyWithdrawCollateral(post, request, intent, converter, collateralWithdrawn);
 	}
-	return buildAdjustPreview(post, before, collateralWithdrawn, converter);
+	return buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk);
 }
 function makeSafeConverter(convert) {
 	let error;
@@ -157,36 +161,53 @@ function totalValueInUnderlying(post, convert, dust) {
 * underlying, the debt is repaid in full and the remainder is withdrawn to
 * the user as `receivedToken`.
 */
-function buildClosePreview(post, converter, receivedToken) {
+function buildClosePreview(post, converter, receivedToken, sdk) {
 	const totalValue = totalValueInUnderlying(post, converter.convert, 0n);
+	const oracle = sdk.marketRegister.findByCreditManager(post.creditManager).priceOracle;
 	return {
 		operation: "CloseCreditAccount",
 		permanent: false,
 		creditManager: post.creditManager,
+		name: sdk.marketRegister.findCreditManager(post.creditManager).name,
 		creditAccount: post.creditAccount,
-		receivedAmount: {
-			token: receivedToken,
-			balance: BigIntMath.max(totalValue - post.totalDebt, 0n)
-		},
+		receivedAmount: oracle.toTokenAmount(receivedToken, BigIntMath.max(totalValue - post.totalDebt, 0n)),
 		error: converter.error
 	};
 }
-function buildAdjustPreview(post, before, collateralWithdrawn, converter) {
+function buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk) {
 	const totalValue = totalValueInUnderlying(post, converter.convert, DUST_THRESHOLD);
+	const assets = post.balances.toAssets(DUST_THRESHOLD);
+	const quotas = post.quotas.toAssets(0n);
+	const snap = post.toSnapshot(totalValue);
+	const market = sdk.marketRegister.findByCreditManager(post.creditManager);
+	const oracle = market.priceOracle;
 	return {
 		operation: "AdjustCreditAccount",
 		creditManager: post.creditManager,
+		name: sdk.marketRegister.findCreditManager(post.creditManager).name,
 		creditAccount: post.creditAccount,
 		collateralAdded: [],
-		collateralWithdrawn: collateralWithdrawn.toAssets(),
+		collateralWithdrawn: collateralWithdrawn.toAssets().map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		totalValue,
-		debt: post.debt,
-		debtChange: post.debt - before.debt,
-		quotas: post.quotas.toAssets(0n),
-		quotasChange: post.quotas.difference(before.quotas).toAssets(),
-		assets: post.balances.toAssets(DUST_THRESHOLD),
-		assetsChange: post.balances.difference(before.balances).toAssets(DUST_THRESHOLD),
-		error: converter.error
+		debt: post.totalDebt,
+		debtChange: post.totalDebt - before.totalDebt,
+		quotas: quotas.map((q) => ({
+			token: sdk.tokensMeta.mustGetToken(q.token),
+			...oracle.toAmount(market.underlying, q.balance)
+		})),
+		quotasChange: post.quotas.difference(before.quotas).toAssets().map((q) => ({
+			token: sdk.tokensMeta.mustGetToken(q.token),
+			...oracle.toAmount(market.underlying, q.balance)
+		})),
+		assets: assets.map((a) => oracle.toTokenAmount(a.token, a.balance)),
+		assetsChange: post.balances.difference(before.balances).toAssets(DUST_THRESHOLD).map((a) => oracle.toTokenAmount(a.token, a.balance)),
+		error: converter.error,
+		healthFactor: sdk.positions.healthFactor(snap),
+		overallApy: 0,
+		borrowRate: sdk.positions.borrowRate(snap),
+		timeToLiquidation: sdk.positions.timeToLiquidation(snap),
+		liquidationPrice: sdk.positions.liquidationPrice(snap),
+		leverage: calcPositionLeverage(totalValue, post.totalDebt)
 	};
 }
 //#endregion

package/dist/esm/preview/preview/detectDelayedClaim.js

@@ -1,10 +1,10 @@
-import { AbstractAdapterContract } from "../../plugins/adapters/contracts/AbstractAdapter.js";
-import "../../plugins/adapters/index.js";
+import { AbstractAdapterContract } from "../../sdk/market/adapters/contracts/AbstractAdapter.js";
+import "../../sdk/index.js";
 //#region src/preview/preview/detectDelayedClaim.ts
 /**
 * Scans a credit-facade multicall for a delayed-withdrawal claim call.
 *
-* @param sdk - SDK with the adapters plugin attached.
+* @param sdk - Attached SDK.
 * @param multicall - Parsed inner operations of the multicall.
 * @returns The detected claim, or `undefined` when the multicall contains no
 * delayed-withdrawal claim call.
@@ -26,7 +26,7 @@ function detectDelayedClaim(sdk, multicall) {
 * the claim call and reads the recorded intent of the claimed redeemer from
 * the `RedemptionLogger` contract.
 *
-* @param sdk - SDK with the adapters plugin attached.
+* @param sdk - Attached SDK.
 * @param multicall - Parsed inner operations of the multicall.
 * @param blockNumber - Optional block number to read the log at.
 * @returns The decoded intent, or `undefined` when the multicall claims

package/dist/esm/preview/preview/detectDelayedOperation.js

@@ -1,14 +1,13 @@
+import { AbstractAdapterContract } from "../../sdk/market/adapters/contracts/AbstractAdapter.js";
 import { decodeDelayedIntent } from "../../sdk/accounts/withdrawal-compressor/intent-codec.js";
 import { InvalidDelayedIntentError } from "../../sdk/accounts/withdrawal-compressor/errors.js";
 import "../../sdk/index.js";
-import { AbstractAdapterContract } from "../../plugins/adapters/contracts/AbstractAdapter.js";
-import "../../plugins/adapters/index.js";
 import { isAddressEqual } from "viem";
 //#region src/preview/preview/detectDelayedOperation.ts
 /**
 * Scans a credit-facade multicall for a delayed-withdrawal request.
 *
-* @param sdk - SDK with the adapters plugin attached.
+* @param sdk - Attached SDK.
 * @param multicall - Parsed inner operations of the multicall.
 * @returns The detected request, or `undefined` when
 * the multicall contains no delayed-withdrawal request.

package/dist/esm/preview/preview/index.js

@@ -1,4 +1,3 @@
-import { ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP, ERROR_UNPRICEABLE_TOKEN } from "./types.js";
 import { buildDelayedPreview } from "./buildDelayedPreview.js";
 import { CreditAccountState } from "./CreditAccountState.js";
 import { classifyCloseOrRepay, isCloseOrRepay } from "./detectCloseOrRepay.js";
@@ -10,4 +9,4 @@ import { replayMulticall } from "./replayMulticall.js";
 import { previewAdjustCreditAccount } from "./previewAdjustCreditAccount.js";
 import { previewCloseOrRepayCreditAccount } from "./previewCloseOrRepayCreditAccount.js";
 import { previewOperation } from "./previewOperation.js";
-export { CreditAccountState, ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP, ERROR_UNPRICEABLE_TOKEN, UnsupportedOperationError, buildDelayedPreview, classifyCloseOrRepay, detectDelayedClaim, detectDelayedOperation, isCloseOrRepay, makeReplayState, previewAdjustCreditAccount, previewCloseOrRepayCreditAccount, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };
+export { CreditAccountState, UnsupportedOperationError, buildDelayedPreview, classifyCloseOrRepay, detectDelayedClaim, detectDelayedOperation, isCloseOrRepay, makeReplayState, previewAdjustCreditAccount, previewCloseOrRepayCreditAccount, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };

package/dist/esm/preview/preview/previewAdjustCreditAccount.js

@@ -1,7 +1,9 @@
 import { AP_WETH_TOKEN } from "../../sdk/constants/address-provider.js";
 import { DUST_THRESHOLD } from "../../sdk/constants/math.js";
+import { calcPositionLeverage } from "../../sdk/market/math.js";
+import { ERROR_UNPRICEABLE_TOKEN } from "../../model/previews.js";
+import "../../model/index.js";
 import "../../sdk/index.js";
-import { ERROR_UNPRICEABLE_TOKEN } from "./types.js";
 import { replayMulticall } from "./replayMulticall.js";
 import { unwrapNativeCollateral } from "./unwrapNativeCollateral.js";
 //#region src/preview/preview/previewAdjustCreditAccount.ts
@@ -15,16 +17,18 @@ import { unwrapNativeCollateral } from "./unwrapNativeCollateral.js";
 async function previewAdjustCreditAccount(input, operation, options) {
 	const { sdk, value = 0n } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
+	const oracle = market.priceOracle;
 	const { before, after, error: replayError } = await replayMulticall(sdk, operation, options);
 	const account = after.account;
 	let error = replayError;
 	const { assets: collateralAdded, error: unwrapError } = unwrapNativeCollateral(after.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(AP_WETH_TOKEN, 0));
 	error ??= unwrapError;
 	const assets = account.balances.toAssets(DUST_THRESHOLD);
+	const quotas = account.quotas.toAssets(0n);
 	const assetsChange = account.balances.difference(before.balances).toAssets(DUST_THRESHOLD);
 	const totalValue = assets.reduce((acc, { token, balance }) => {
 		try {
-			return acc + market.priceOracle.convert(token, market.underlying, balance);
+			return acc + oracle.convert(token, market.underlying, balance);
 		} catch {
 			error ??= {
 				code: ERROR_UNPRICEABLE_TOKEN,
@@ -33,20 +37,34 @@ async function previewAdjustCreditAccount(input, operation, options) {
 			return acc;
 		}
 	}, 0n);
+	const snap = account.toSnapshot(totalValue);
 	return {
 		operation: "AdjustCreditAccount",
 		creditManager: operation.creditManager,
+		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
 		creditAccount: operation.creditAccount,
-		collateralAdded,
-		collateralWithdrawn: after.collateralWithdrawn.toAssets(),
+		collateralAdded: collateralAdded.map((a) => oracle.toTokenAmount(a.token, a.balance)),
+		collateralWithdrawn: after.collateralWithdrawn.toAssets().map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		totalValue,
-		debt: account.debt,
-		debtChange: account.debt - before.debt,
-		quotas: account.quotas.toAssets(0n),
-		quotasChange: account.quotas.difference(before.quotas).toAssets(),
-		assets,
-		assetsChange,
-		error
+		debt: account.totalDebt,
+		debtChange: account.totalDebt - before.totalDebt,
+		quotas: quotas.map((q) => ({
+			token: sdk.tokensMeta.mustGetToken(q.token),
+			...oracle.toAmount(market.underlying, q.balance)
+		})),
+		quotasChange: account.quotas.difference(before.quotas).toAssets().map((q) => ({
+			token: sdk.tokensMeta.mustGetToken(q.token),
+			...oracle.toAmount(market.underlying, q.balance)
+		})),
+		assets: assets.map((a) => oracle.toTokenAmount(a.token, a.balance)),
+		assetsChange: assetsChange.map((a) => oracle.toTokenAmount(a.token, a.balance)),
+		error,
+		healthFactor: sdk.positions.healthFactor(snap),
+		overallApy: 0,
+		borrowRate: sdk.positions.borrowRate(snap),
+		timeToLiquidation: sdk.positions.timeToLiquidation(snap),
+		liquidationPrice: sdk.positions.liquidationPrice(snap),
+		leverage: calcPositionLeverage(totalValue, account.totalDebt)
 	};
 }
 //#endregion

package/dist/esm/preview/preview/previewCloseOrRepayCreditAccount.js

@@ -32,11 +32,9 @@ function previewCloseCreditAccount(input, operation, permanent, replay) {
 		operation: "CloseCreditAccount",
 		permanent,
 		creditManager: operation.creditManager,
+		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
 		creditAccount: operation.creditAccount,
-		receivedAmount: {
-			token: receivedToken,
-			balance: after.collateralWithdrawn.getOrZero(receivedToken)
-		},
+		receivedAmount: market.priceOracle.toTokenAmount(receivedToken, after.collateralWithdrawn.getOrZero(receivedToken)),
 		error
 	};
 }
@@ -47,6 +45,7 @@ function previewCloseCreditAccount(input, operation, permanent, replay) {
 */
 function previewRepayCreditAccount(input, operation, permanent, replay) {
 	const { sdk, value = 0n } = input;
+	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
 	const { before, after, error: replayError } = replay;
 	const { assets: collateralAdded, error: unwrapError } = unwrapNativeCollateral(after.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(AP_WETH_TOKEN, 0));
 	const error = replayError ?? unwrapError;
@@ -54,10 +53,11 @@ function previewRepayCreditAccount(input, operation, permanent, replay) {
 		operation: "RepayCreditAccount",
 		permanent,
 		creditManager: operation.creditManager,
+		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
 		creditAccount: operation.creditAccount,
-		collateralAdded,
+		collateralAdded: collateralAdded.map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),
 		debtRepaid: before.totalDebt - after.account.totalDebt,
-		collateralWithdrawn: after.collateralWithdrawn.toAssets(),
+		collateralWithdrawn: after.collateralWithdrawn.toAssets().map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),
 		error
 	};
 }

package/dist/esm/preview/preview/previewOpenCreditAccount.js

@@ -1,6 +1,9 @@
 import { AP_WETH_TOKEN } from "../../sdk/constants/address-provider.js";
+import { DUST_THRESHOLD } from "../../sdk/constants/math.js";
+import { calcPositionLeverage } from "../../sdk/market/math.js";
+import { ERROR_UNPRICEABLE_TOKEN } from "../../model/previews.js";
+import "../../model/index.js";
 import "../../sdk/index.js";
-import { ERROR_UNPRICEABLE_TOKEN } from "./types.js";
 import { CreditAccountState } from "./CreditAccountState.js";
 import { makeReplayState, replayInnerOperations } from "./replayInnerOperations.js";
 import { unwrapNativeCollateral } from "./unwrapNativeCollateral.js";
@@ -8,13 +11,14 @@ import { unwrapNativeCollateral } from "./unwrapNativeCollateral.js";
 async function previewOpenCreditAccount(input, operation) {
 	const { sdk, value = 0n } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
+	const oracle = market.priceOracle;
 	const state = makeReplayState(CreditAccountState.beforeOpen(operation.creditManager, market.underlying));
 	let error = await replayInnerOperations(sdk, operation.multicall, state);
 	const account = state.account;
 	let priceError;
 	const collateralValue = state.collateralAdded.sum((token, balance) => {
 		try {
-			return market.priceOracle.convert(token, market.underlying, balance);
+			return oracle.convert(token, market.underlying, balance);
 		} catch {
 			priceError ??= {
 				code: ERROR_UNPRICEABLE_TOKEN,
@@ -25,17 +29,32 @@ async function previewOpenCreditAccount(input, operation) {
 	});
 	const { assets: collateral, error: unwrapError } = unwrapNativeCollateral(state.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(AP_WETH_TOKEN, 0));
 	error ??= unwrapError ?? priceError;
-	const assets = account.balances.toAssets(1n);
+	const assets = account.balances.toAssets(DUST_THRESHOLD);
+	const quotas = account.quotas.toAssets(0n);
+	const totalValue = collateralValue + account.totalDebt;
+	const snap = account.toSnapshot(totalValue);
+	const targetAsset = inferTargetAsset(operation.multicall, account.balances);
 	return {
 		operation: operation.operation,
 		creditManager: operation.creditManager,
-		target: inferTargetAsset(operation.multicall, account.balances),
-		collateral,
+		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
+		target: targetAsset ? oracle.toTokenAmount(targetAsset.token, targetAsset.balance) : void 0,
+		collateral: collateral.map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		collateralValue,
+		totalValue,
 		debt: account.debt,
-		quotas: account.quotas.toAssets(0n),
-		assets,
-		error
+		quotas: quotas.map((q) => ({
+			token: sdk.tokensMeta.mustGetToken(q.token),
+			...oracle.toAmount(market.underlying, q.balance)
+		})),
+		assets: assets.map((a) => oracle.toTokenAmount(a.token, a.balance)),
+		error,
+		healthFactor: sdk.positions.healthFactor(snap),
+		overallApy: 0,
+		borrowRate: sdk.positions.borrowRate(snap),
+		timeToLiquidation: sdk.positions.timeToLiquidation(snap),
+		liquidationPrice: sdk.positions.liquidationPrice(snap),
+		leverage: calcPositionLeverage(totalValue, account.totalDebt)
 	};
 }
 /**

package/dist/esm/preview/preview/previewOperation.js

@@ -67,9 +67,10 @@ async function previewMulticallOperation(input, operation, options) {
 		operation: "DelayedCreditAccountOperation",
 		creditAccount: operation.creditAccount,
 		creditManager: operation.creditManager,
+		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
 		intent: delayed.intent,
 		instantPreview,
-		delayedPreview: buildDelayedPreview(after.account, before, delayed, convert, receivedToken)
+		delayedPreview: buildDelayedPreview(after.account, before, delayed, convert, receivedToken, sdk)
 	};
 }
 //#endregion

package/dist/esm/preview/preview/previewPoolOperation.js

@@ -4,6 +4,7 @@ import "../simulate/index.js";
 async function previewPoolOperation(input, operation, options) {
 	const { sdk, to, calldata } = input;
 	const { tokenIn, tokenOut } = operation;
+	const market = sdk.marketRegister.findByPool(operation.pool);
 	const sim = await simulatePoolOperation({
 		sdk,
 		operation,
@@ -13,14 +14,10 @@ async function previewPoolOperation(input, operation, options) {
 	return {
 		operation: operation.operation,
 		pool: operation.pool,
-		tokenIn: {
-			token: tokenIn,
-			balance: sim.amountIn
-		},
-		tokenOut: {
-			token: tokenOut,
-			balance: sim.amountOut
-		}
+		name: sdk.tokensMeta.mustGetToken(operation.pool).name,
+		shareRate: market.pool.pool.dieselRate,
+		tokenIn: market.priceOracle.toTokenAmount(tokenIn, sim.amountIn),
+		tokenOut: market.priceOracle.toTokenAmount(tokenOut, sim.amountOut)
 	};
 }
 //#endregion

package/dist/esm/preview/preview/replayInnerOperations.js

@@ -1,10 +1,10 @@
 import { AssetsMap } from "../../sdk/utils/AssetsMap.js";
 import "../../sdk/constants/math.js";
+import { AbstractAdapterContract } from "../../sdk/market/adapters/contracts/AbstractAdapter.js";
+import { ERC4626AdapterContract } from "../../sdk/market/adapters/contracts/ERC4626AdapterContract.js";
+import { ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP } from "../../model/previews.js";
+import "../../model/index.js";
 import "../../sdk/index.js";
-import { AbstractAdapterContract } from "../../plugins/adapters/contracts/AbstractAdapter.js";
-import { ERC4626AdapterContract } from "../../plugins/adapters/contracts/ERC4626AdapterContract.js";
-import "../../plugins/adapters/index.js";
-import { ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP } from "./types.js";
 import { applyRWAWrapUnwrap } from "./applyRWAWrapUnwrap.js";
 //#region src/preview/preview/replayInnerOperations.ts
 /**

package/dist/esm/preview/preview/unwrapNativeCollateral.js

@@ -1,7 +1,8 @@
 import { AssetsMap } from "../../sdk/utils/AssetsMap.js";
 import { NATIVE_ADDRESS } from "../../sdk/constants/addresses.js";
+import { ERROR_INVALID_TRANSACTION_VALUE } from "../../model/previews.js";
+import "../../model/index.js";
 import "../../sdk/index.js";
-import { ERROR_INVALID_TRANSACTION_VALUE } from "./types.js";
 //#region src/preview/preview/unwrapNativeCollateral.ts
 /**
 * Represents the transaction's attached native value as a `NATIVE_ADDRESS`

package/dist/esm/sdk/OnchainSDK.js

@@ -1,7 +1,7 @@
-import { TypedObjectUtils } from "./utils/mappers.js";
 import { getChain } from "./chain/chains.js";
 import "./chain/index.js";
 import { ADDRESS_PROVIDER_V310, AP_GEAR_TOKEN, AP_ROUTER } from "./constants/address-provider.js";
+import { TypedObjectUtils } from "./utils/mappers.js";
 import { VERSION_RANGE_310, isV310 } from "./constants/versions.js";
 import "./constants/index.js";
 import { formatTimestamp } from "./utils/formatter.js";
@@ -152,7 +152,7 @@ var OnchainSDK = class extends ChainContractsRegister {
 	async attach(options) {
 		if (this.#attached) throw new SdkAlreadyAttachedError();
 		const { addressProvider = ADDRESS_PROVIDER_V310, blockNumber, ignoreUpdateablePrices, ignoreMarkets, marketConfigurators: mcs, redstone } = options ?? {};
-		const marketConfigurators = mcs ?? TypedObjectUtils.keys(this.client.chain.defaultMarketConfigurators);
+		const marketConfigurators = mcs ?? this.client.chain.defaultMarketConfigurators.keys();
 		const rwaFactories = options?.rwaFactories ?? this.client.chain.rwaFactories;
 		this.logger?.info({
 			networkType: this.networkType,

package/dist/esm/sdk/accounts/CreditAccountsServiceV310.js

@@ -15,6 +15,7 @@ import "../market/index.js";
 import { CreditAccountCompressor } from "./credit-account-compressor/CreditAccountCompressor.js";
 import "./credit-account-compressor/index.js";
 import { extractPriceUpdates, extractQuotaTokens, mergePriceUpdates } from "./multicall-utils.js";
+import { prependMidasReceiveGreenlist } from "./utils/midasUtils.js";
 import { encodeFunctionData } from "viem";
 //#region src/sdk/accounts/CreditAccountsServiceV310.ts
 /**
@@ -56,12 +57,6 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 		return this.#compressor.getBorrowerCreditAccounts(borrower, options, blockNumber);
 	}
 	/**
-	* {@inheritDoc ICreditAccountsService.listPositions}
-	**/
-	async listPositions(props) {
-		return this.#compressor.listPositions(props);
-	}
-	/**
 	* {@inheritDoc ICreditAccountsService.getRewards}
 	**/
 	async getRewards(creditAccount) {
@@ -218,7 +213,7 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 		if (withdrawToken === true) tokenToWithdraw = cm.underlying;
 		else if (typeof withdrawToken === "string") tokenToWithdraw = withdrawToken;
 		const { creditFacade } = cmSuite;
-		const operationCalls = [
+		let calls = [
 			creditFacade.prepareIncreaseDebt(debt),
 			...creditFacade.prepareAddCollateral(collateral, permits),
 			...openPathCalls,
@@ -229,7 +224,8 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 			}),
 			...callsAfter ?? []
 		];
-		const calls = await this.prependPriceUpdates(cm.address, operationCalls);
+		calls = await this.#prependMidasReceiveGreenlist(cm.address, calls);
+		calls = await this.prependPriceUpdates(cm.address, calls);
 		const tx = reopenCreditAccount ? cmSuite.multicallTx(reopenCreditAccount, calls) : cmSuite.openCreditAccountTx(to, calls, referralCode, rwaOptions);
 		tx.value = ethAmount.toString(10);
 		return tx;
@@ -382,7 +378,7 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 				calls.push(facade.prepareIncreaseDebt(op.amount));
 				break;
 			case "decreaseDebt":
-				calls.push(facade.prepareChangeDebt(op.amount, true));
+				calls.push(op.full ? facade.prepareDecreaseDebtFull() : facade.prepareChangeDebt(op.amount, true));
 				break;
 			case "addCollateral":
 				calls.push(...facade.prepareAddCollateral([{
@@ -391,7 +387,7 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 				}], {}));
 				break;
 			case "withdrawCollateral":
-				calls.push(facade.prepareWithdrawCollateral(op.token, op.amount, op.to));
+				calls.push(facade.prepareWithdrawCollateral(op.token, op.all ? MAX_UINT256 : op.amount, op.to));
 				break;
 			case "swap":
 			case "wrapRwaCollateral":
@@ -455,6 +451,18 @@ var CreditAccountsServiceV310 = class extends SDKConstruct {
 		return this.sdk.addressProvider.mustGetLatest(AP_REWARDS_COMPRESSOR, VERSION_RANGE_310)[0];
 	}
 	/**
+	* {@inheritDoc ICreditAccountsService.prependMidasReceiveGreenlist}
+	*/
+	async #prependMidasReceiveGreenlist(creditManager, calls) {
+		const cm = this.sdk.marketRegister.findCreditManager(creditManager);
+		return prependMidasReceiveGreenlist({
+			cm,
+			client: this.client,
+			calls,
+			logger: this.logger
+		});
+	}
+	/**
 	* Withdrawal compressor of the current chain.
 	* @throws If no withdrawal compressor is supported on the current chain.
 	**/

package/dist/esm/sdk/accounts/credit-account-compressor/CreditAccountCompressor.js

@@ -1,4 +1,3 @@
-import { AddressMap } from "../../utils/AddressMap.js";
 import { AddressSet } from "../../utils/AddressSet.js";
 import { AP_CREDIT_ACCOUNT_COMPRESSOR } from "../../constants/address-provider.js";
 import { ADDRESS_0X0 } from "../../constants/addresses.js";
@@ -9,11 +8,8 @@ import { hexEq } from "../../utils/hex.js";
 import "../../utils/index.js";
 import { SDKConstruct } from "../../base/SDKConstruct.js";
 import "../../base/index.js";
-import { borrowApyBps, healthFactorBps, positionLeverage, usdToNumber } from "../../market/math.js";
-import { dominantCollateral } from "../../market/credit/dominantCollateral.js";
 import { simulateWithPriceUpdates } from "../../utils/viem/simulateWithPriceUpdates.js";
 import "../../utils/viem/index.js";
-import "../../market/index.js";
 import { iRWAFactoryAbi } from "../../../abi/rwa/iRWAFactory.js";
 import { CreditAccountCompressorV310Contract } from "./CreditAccountCompressorV310Contract.js";
 //#region src/sdk/accounts/credit-account-compressor/CreditAccountCompressor.ts
@@ -21,9 +17,8 @@ import { CreditAccountCompressorV310Contract } from "./CreditAccountCompressorV3
 * Reads credit accounts of the current chain.
 *
 * Stitches the credit account compressor together with the RWA factories (for
-* accounts owned via an investor EOA) and with the withdrawal compressor (for
-* assets that are on their way out of an account), and describes the result
-* either as raw account data or as {@link StrategyPosition}s.
+* accounts owned via an investor EOA), and describes the result as raw
+* account data.
 *
 * TODO: create and deploy new compressor contract onchain to avoid all this stitching
 **/
@@ -173,89 +168,6 @@ var CreditAccountCompressor = class extends SDKConstruct {
 		return filtered.sort((a, b) => Number(a.healthFactor - b.healthFactor));
 	}
 	/**
-	* Describes all credit accounts of a wallet as strategy positions.
-	*
-	* @param props - {@link ListStrategyPositionsProps}
-	**/
-	async listPositions(props) {
-		const { owner, includeZeroDebt, blockNumber } = props;
-		const [accounts] = await Promise.all([this.getBorrowerCreditAccounts(owner, { includeZeroDebt }, blockNumber), this.sdk.withdrawalCompressor?.loadWithdrawableAssets(void 0, blockNumber)]);
-		const describable = accounts.filter((ca) => {
-			if (!ca.success) this.logger?.warn(`cannot describe position of ${this.labelAddress(ca.creditAccount)}: collateral computation failed`);
-			return ca.success;
-		});
-		const withdrawals = await Promise.all(describable.map((ca) => this.#accountWithdrawals(ca, blockNumber)));
-		return describable.map((ca, i) => this.#toStrategyPosition(ca, withdrawals[i] ?? new AddressMap()));
-	}
-	/**
-	* Builds one strategy position from an account snapshot.
-	*
-	* @param withdrawals - Delayed withdrawals of the account, keyed by the
-	* phantom token that represents them on it.
-	**/
-	#toStrategyPosition(ca, withdrawals) {
-		const suite = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-		const { market } = suite;
-		const { priceOracle } = market;
-		const { pool } = market.pool;
-		const token = this.sdk.tokensMeta.mustGetToken(market.unwrappedUnderlying);
-		const totalDebtValue = ca.debt + ca.accruedInterest + ca.accruedFees;
-		const collateral = dominantCollateral(ca, market);
-		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: positionLeverage(totalDebtValue, ca.totalValue),
-			borrowApy: borrowApyBps(pool.baseInterestRate, suite.creditManager.feeInterest),
-			totalDebt: {
-				token,
-				value: totalDebtValue,
-				valueUsd: usdToNumber(ca.totalDebtUSD)
-			},
-			totalValue: {
-				token,
-				value: ca.totalValue,
-				valueUsd: usdToNumber(ca.totalValueUSD)
-			},
-			healthFactor: healthFactorBps(ca.healthFactor),
-			collaterals: ca.tokens.flatMap((t) => {
-				if ((t.mask & ca.enabledTokensMask) === 0n || t.balance <= 10n) return [];
-				return [{
-					collateral: priceOracle.toTokenAmount(t.token, t.balance),
-					quota: priceOracle.toTokenAmount(market.underlying, t.quota),
-					withdrawals: withdrawals.get(t.token) ?? []
-				}];
-			})
-		};
-	}
-	/**
-	* Delayed withdrawals of one account, keyed by the phantom token that
-	* represents them on it, so that each collateral row can pick up its own.
-	**/
-	async #accountWithdrawals(ca, blockNumber) {
-		const compressor = this.sdk.withdrawalCompressor;
-		const byPhantomToken = new AddressMap(void 0, "accountWithdrawals");
-		const holdsPhantomToken = ca.tokens.some((t) => t.balance > 10n && compressor?.getWithdrawalSourceToken(t.token) !== void 0);
-		if (!compressor || !holdsPhantomToken) return byPhantomToken;
-		const { priceOracle } = this.sdk.marketRegister.findByCreditManager(ca.creditManager);
-		const { claimable, pending } = await compressor.getCurrentWithdrawals(ca.creditAccount, blockNumber);
-		const add = (w, outputs, claimableAt) => {
-			const assets = outputs.map((o) => ({
-				isDelayed: true,
-				...priceOracle.toTokenAmount(o.token, o.amount),
-				redeemer: w.redeemer,
-				claimableAt: claimableAt === void 0 ? void 0 : Number(claimableAt)
-			}));
-			byPhantomToken.upsert(w.withdrawalPhantomToken, [...byPhantomToken.get(w.withdrawalPhantomToken) ?? [], ...assets]);
-		};
-		for (const w of claimable) add(w, w.outputs);
-		for (const w of pending) add(w, w.expectedOutputs, w.claimableAt);
-		return byPhantomToken;
-	}
-	/**
 	* Credit account compressor contract of the current chain.
 	*
 	* Resolved on every access, because the address provider is only populated

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

@@ -5,7 +5,8 @@ import { CreditAccountCompressorV310Contract } from "./credit-account-compressor
 import { CreditAccountCompressor } from "./credit-account-compressor/CreditAccountCompressor.js";
 import "./credit-account-compressor/index.js";
 import { CreditAccountsServiceV310 } from "./CreditAccountsServiceV310.js";
-import { primaryInstantOutput } from "./intents/operations/claim-delayed/index.js";
+import { IntentPreviewError } from "./intents/types.js";
+import { fetchCreditAccountSlice, toCreditAccountSlice } from "./intents/utils/credit-account-slice.js";
 import { CreditAccountOperationsService } from "./intents/index.js";
 import { LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS } from "./liquidations/constants.js";
 import { LiquidationsService } from "./liquidations/LiquidationsService.js";
@@ -24,4 +25,4 @@ import { toWithdrawalStatus } from "./withdrawal-compressor/types.js";
 import { WithdrawalCompressorV313Contract } from "./withdrawal-compressor/WithdrawalCompressorV313Contract.js";
 import { createWithdrawalCompressor } from "./withdrawal-compressor/createWithdrawalCompressor.js";
 import "./withdrawal-compressor/index.js";
-export { AbstractWithdrawalCompressorContract, AccountBotsService, CreditAccountCompressor, CreditAccountCompressorV310Contract, CreditAccountOperationsService, CreditAccountsServiceV310, DELAYED_INTENT_TYPES, DELAYED_INTENT_VERSION, InvalidDelayedIntentError, LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS, LiquidationsService, MultichainLiquidationsService, PeripheryCompressorV310Contract, RedemptionLoggerV310Contract, WithdrawalCompressorV310Contract, WithdrawalCompressorV311Contract, WithdrawalCompressorV313Contract, createRedemptionLogger, createWithdrawalCompressor, decodeDelayedIntent, encodeDelayedIntent, getWithdrawalCompressorAddress, iCreditAccountAbi, primaryInstantOutput, toClaimableWithdrawal, toPendingWithdrawal, toRequestableWithdrawal, toWithdrawalStatus };
+export { AbstractWithdrawalCompressorContract, AccountBotsService, CreditAccountCompressor, CreditAccountCompressorV310Contract, CreditAccountOperationsService, CreditAccountsServiceV310, DELAYED_INTENT_TYPES, DELAYED_INTENT_VERSION, IntentPreviewError, InvalidDelayedIntentError, LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS, LiquidationsService, MultichainLiquidationsService, PeripheryCompressorV310Contract, RedemptionLoggerV310Contract, WithdrawalCompressorV310Contract, WithdrawalCompressorV311Contract, WithdrawalCompressorV313Contract, createRedemptionLogger, createWithdrawalCompressor, decodeDelayedIntent, encodeDelayedIntent, fetchCreditAccountSlice, getWithdrawalCompressorAddress, iCreditAccountAbi, toClaimableWithdrawal, toCreditAccountSlice, toPendingWithdrawal, toRequestableWithdrawal, toWithdrawalStatus };