@gearbox-protocol/sdk 15.1.0-next.1 → 15.1.0-next.10

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

@@ -0,0 +1,85 @@
+import { toRouterCaSlice } from "./common.js";
+//#region src/sdk/accounts/intents/utils/router-path.ts
+/**
+* The engine's only door to the pathfinder.
+*
+* Deliberately not a quoter abstraction with an oracle-priced twin: paths are
+* always resolved on-chain, because a preview whose swap amounts came from
+* oracle prices could not produce the calldata that realises them.
+*/
+function createRouterPaths(args) {
+	const { sdk, creditAccount, slippage } = args;
+	const suite = sdk.marketRegister.findCreditManager(creditAccount.creditManager);
+	const cmSlice = {
+		address: suite.creditManager.address.toLowerCase(),
+		creditFacade: suite.creditFacade.address.toLowerCase(),
+		collateralTokens: suite.creditManager.collateralTokens.map((t) => t.toLowerCase())
+	};
+	const router = sdk.routerFor({ creditFacade: suite.creditFacade.address });
+	return {
+		async swap({ tokenIn, tokenOut, amount, keep = 0n }) {
+			if (amount <= 0n) return {
+				amount: 0n,
+				minAmount: 0n,
+				calls: []
+			};
+			if (keep < 0n) throw new Error(`swap: spending ${amount} of ${tokenIn} exceeds its balance`);
+			if (keep > 0n) {
+				const expectedBalances = [{
+					token: tokenIn,
+					balance: amount + keep
+				}];
+				return router.findManyToOnePath({
+					creditAccount: toRouterCaSlice(creditAccount, expectedBalances),
+					creditManager: cmSlice,
+					expectedBalances,
+					leftoverBalances: [{
+						token: tokenIn,
+						balance: keep
+					}],
+					target: tokenOut,
+					slippage
+				});
+			}
+			return router.findOneTokenPath({
+				creditAccount: toRouterCaSlice(creditAccount, [{
+					token: tokenIn,
+					balance: amount
+				}]),
+				creditManager: cmSlice,
+				tokenIn,
+				tokenOut,
+				amount,
+				slippage
+			});
+		},
+		async closeAll({ balances }) {
+			const { amount, minAmount, calls } = await router.findBestClosePath({
+				creditAccount: toRouterCaSlice(creditAccount, balances),
+				creditManager: cmSlice,
+				balances: {
+					expectedBalances: balances,
+					leftoverBalances: [],
+					tokensToClaim: []
+				},
+				slippage
+			});
+			return {
+				amount,
+				minAmount,
+				calls: [...calls]
+			};
+		},
+		async openStrategy({ expectedBalances, leftoverBalances, target }) {
+			return router.findOpenStrategyPath({
+				creditManager: cmSlice,
+				expectedBalances,
+				leftoverBalances,
+				target,
+				slippage
+			});
+		}
+	};
+}
+//#endregion
+export { createRouterPaths };

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

@@ -0,0 +1,37 @@
+import { eq } from "./utils/common.js";
+import { convertAmount } from "./utils/convert-amount.js";
+import { pickFattestNonPhantomToken } from "./utils/pick-token.js";
+//#region src/sdk/accounts/intents/view.ts
+/**
+* The account as the planners see it: a handful of numbers in underlying units
+* plus balance / price lookups. Read once per preview.
+*
+* TVL uses the RWA-aware conversion so an `rwa.asset` balance without a direct
+* pool price still counts at its wrapped value instead of throwing.
+*/
+function accountView(creditAccount, sdk) {
+	const { underlying, creditManager } = creditAccount;
+	const price = convertAmount(sdk, creditManager);
+	const { creditFacade } = sdk.marketRegister.findCreditManager(creditManager);
+	let totalValue = 0n;
+	for (const t of creditAccount.tokens) totalValue += price(t.token, underlying, t.balance);
+	return {
+		underlying,
+		rwaAsset: sdk.tokensMeta.rwaUnderlyings.get(underlying)?.asset,
+		debt: creditAccount.accountDebt,
+		collateral: totalValue - creditAccount.accountDebt,
+		band: {
+			minDebt: creditFacade.minDebt,
+			maxDebt: creditFacade.maxDebt
+		},
+		balanceOf: (token) => creditAccount.tokens.find((t) => eq(t.token, token))?.balance ?? 0n,
+		price,
+		fattest: (exclude) => pickFattestNonPhantomToken({
+			creditAccount,
+			sdk,
+			exclude
+		})?.token
+	};
+}
+//#endregion
+export { accountView };

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

@@ -1,3 +1,4 @@
+import { iLiquidationCompressorV313Abi } from "../../../abi/ILiquidationCompressorV313.js";
 import { AddressSet } from "../../utils/AddressSet.js";
 import { bytes32ToString } from "../../utils/bytes32ToString.js";
 import { ADDRESS_0X0 } from "../../constants/addresses.js";
@@ -19,7 +20,6 @@ import { SecuritizeLiquidatorContract } from "../../market/rwa/securitize/Securi
 import "../../market/rwa/securitize/index.js";
 import "../../market/index.js";
 import { LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS } from "./constants.js";
-import { iLiquidationCompressorV313Abi } from "../../../abi/ILiquidationCompressorV313.js";
 //#region src/sdk/accounts/liquidations/LiquidationsService.ts
 /**
 * Service for discovering liquidatable credit accounts and previewing manual
@@ -32,7 +32,6 @@ var LiquidationsService = class extends SDKConstruct {
 	* Accounts whose collateral computation failed are excluded.
 	**/
 	async getLiquidatableAccounts(props) {
-		await this.sdk.withdrawalCompressor?.loadWithdrawableAssets(void 0, props?.blockNumber);
 		const unhealthy = await this.sdk.accounts.getCreditAccounts({
 			maxHealthFactor: WAD - 1n,
 			includeZeroDebt: false
@@ -59,7 +58,6 @@ var LiquidationsService = class extends SDKConstruct {
 		const ca = await this.#getCreditAccountData(creditAccount, blockNumber);
 		const suite = this.sdk.marketRegister.findCreditManager(ca.creditManager);
 		const { priceOracle } = suite.market;
-		await this.sdk.withdrawalCompressor?.loadWithdrawableAssets(void 0, blockNumber);
 		const account = this.#buildAccount(ca, suite);
 		const data = await this.#getLiquidationData(ca, liquidator, ignoreReservePrices, blockNumber);
 		return {
@@ -96,7 +94,6 @@ var LiquidationsService = class extends SDKConstruct {
 	async getLiquidationPositions(props) {
 		const compressor = this.sdk.withdrawalCompressor;
 		if (!compressor) return [];
-		await compressor.loadWithdrawableAssets(void 0, props.blockNumber);
 		const phantomTokens = new AddressSet(compressor.getWithdrawableAssets().map((a) => a.withdrawalPhantomToken));
 		const { claimable, pending } = await compressor.getExternalAccountCurrentWithdrawals({
 			account: props.liquidator,

package/dist/esm/sdk/accounts/withdrawal-compressor/AbstractWithdrawalCompressorContract.js

@@ -3,8 +3,10 @@ import "../../constants/addresses.js";
 import "../../constants/index.js";
 import { hexEq } from "../../utils/hex.js";
 import "../../utils/index.js";
+import { executeMulticallBatches } from "../../utils/viem/executeMulticallBatches.js";
 import { BaseContract } from "../../base/BaseContract.js";
 import "../../base/index.js";
+import "../../utils/viem/index.js";
 import { decodeDelayedIntent } from "./intent-codec.js";
 import { isAddressEqual } from "viem";
 //#region src/sdk/accounts/withdrawal-compressor/AbstractWithdrawalCompressorContract.ts
@@ -57,37 +59,46 @@ var AbstractWithdrawalCompressorContract = class extends BaseContract {
 	**/
 	getWithdrawableAssets(...creditManagers) {
 		const cache = this.#withdrawableAssets;
-		if (!cache) throw new Error("withdrawable assets are not loaded, call loadWithdrawableAssets first");
+		if (!cache) throw new Error("withdrawable assets are not loaded, check if the sdk was properly attached or hydrated");
 		if (creditManagers.length === 0) return cache.values().flat();
 		return creditManagers.flatMap((cm) => cache.get(cm) ?? []);
 	}
 	/**
-	* {@inheritDoc IWithdrawalCompressorContract.loadWithdrawableAssets}
+	* {@inheritDoc IWithdrawalCompressorContract.getLoadWithdrawableAssetsMulticall}
 	**/
-	async loadWithdrawableAssets(force, blockNumber) {
-		if (this.#withdrawableAssets && !force) return this.getWithdrawableAssets();
+	getLoadWithdrawableAssetsMulticall(force) {
+		if (this.#withdrawableAssets && !force) return {
+			contracts: [],
+			onResults: () => {}
+		};
 		const cms = this.#sdk.marketRegister.creditManagers.map((cm) => cm.creditManager.address);
-		const resp = await this.client.multicall({
+		return {
 			contracts: cms.map((cm) => ({
 				address: this.address,
 				abi: this.abi,
 				functionName: "getWithdrawableAssets",
 				args: [cm]
 			})),
-			allowFailure: true,
-			batchSize: 0,
-			blockNumber
-		});
-		const cache = new AddressMap(void 0, MAP_LABEL);
-		for (let i = 0; i < resp.length; i++) {
-			const r = resp[i];
-			if (r.status !== "success") {
-				this.logger?.warn(`failed to get withdrawable assets of credit manager ${cms[i]}: ${r.error}`);
-				continue;
+			onResults: (resps) => {
+				const cache = new AddressMap(void 0, MAP_LABEL);
+				for (let i = 0; i < resps.length; i++) {
+					const r = resps[i];
+					if (r.status !== "success") {
+						this.logger?.warn(`failed to get withdrawable assets of credit manager ${cms[i]}: ${r.error}`);
+						continue;
+					}
+					const assets = r.result;
+					if (assets.length > 0) cache.upsert(cms[i], assets.map((a) => toWithdrawableAsset(a, cms[i])));
+				}
+				this.#withdrawableAssets = cache;
 			}
-			if (r.result.length > 0) cache.upsert(cms[i], r.result.map((a) => toWithdrawableAsset(a, cms[i])));
-		}
-		this.#withdrawableAssets = cache;
+		};
+	}
+	/**
+	* {@inheritDoc IWithdrawalCompressorContract.loadWithdrawableAssets}
+	**/
+	async loadWithdrawableAssets(force, blockNumber) {
+		await executeMulticallBatches(this.client, [this.getLoadWithdrawableAssetsMulticall(force)], { blockNumber });
 		return this.getWithdrawableAssets();
 	}
 	/**

package/dist/esm/sdk/accounts/withdrawal-compressor/RedemptionLoggerV310Contract.js

@@ -1,7 +1,7 @@
+import { iRedemptionLoggerV310Abi } from "../../../abi/iRedemptionLoggerV310.js";
 import { BaseContract } from "../../base/BaseContract.js";
 import "../../base/index.js";
 import { decodeDelayedIntent } from "./intent-codec.js";
-import { iRedemptionLoggerV310Abi } from "../../../abi/iRedemptionLoggerV310.js";
 import { InvalidDelayedIntentError } from "./errors.js";
 //#region src/sdk/accounts/withdrawal-compressor/RedemptionLoggerV310Contract.ts
 const abi = iRedemptionLoggerV310Abi;

package/dist/esm/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV310Contract.js

@@ -1,5 +1,5 @@
-import { AbstractWithdrawalCompressorContract } from "./AbstractWithdrawalCompressorContract.js";
 import { iWithdrawalCompressorV310Abi } from "../../../abi/IWithdrawalCompressorV310.js";
+import { AbstractWithdrawalCompressorContract } from "./AbstractWithdrawalCompressorContract.js";
 //#region src/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV310Contract.ts
 const abi = iWithdrawalCompressorV310Abi;
 /**

package/dist/esm/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV311Contract.js

@@ -1,5 +1,5 @@
-import { AbstractWithdrawalCompressorContract } from "./AbstractWithdrawalCompressorContract.js";
 import { iWithdrawalCompressorV311Abi } from "../../../abi/IWithdrawalCompressorV311.js";
+import { AbstractWithdrawalCompressorContract } from "./AbstractWithdrawalCompressorContract.js";
 //#region src/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV311Contract.ts
 const abi = iWithdrawalCompressorV311Abi;
 /**

package/dist/esm/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV313Contract.js

@@ -1,6 +1,6 @@
+import { iWithdrawalCompressorV313Abi } from "../../../abi/IWithdrawalCompressorV313.js";
 import { encodeDelayedIntent } from "./intent-codec.js";
 import { AbstractWithdrawalCompressorContract, iCreditAccountAbi, toClaimableWithdrawal, toPendingWithdrawal, toRequestableWithdrawal } from "./AbstractWithdrawalCompressorContract.js";
-import { iWithdrawalCompressorV313Abi } from "../../../abi/IWithdrawalCompressorV313.js";
 import { toWithdrawalStatus } from "./types.js";
 //#region src/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV313Contract.ts
 const abi = iWithdrawalCompressorV313Abi;

package/dist/esm/sdk/base/BaseContract.js

@@ -170,7 +170,7 @@ var BaseContract = class extends Construct {
 			name: decoded.functionName,
 			args: decoded.args
 		});
-		if (!abiItem || abiItem.type !== "function") return `Unknown function: ${decoded.functionName}`;
+		if (abiItem?.type !== "function") return `Unknown function: ${decoded.functionName}`;
 		const params = this.stringifyFunctionParams(decoded).map((v, i) => `${abiItem.inputs[i].name}: ${v}`);
 		return `${this.name}.${decoded.functionName}({${params.join(", ")}})`;
 	}

package/dist/esm/sdk/base/TokensMeta.js

@@ -1,11 +1,13 @@
+import { iExpirableAbi } from "../../abi/iExpirable.js";
+import { iStateSerializerAbi } from "../../abi/iStateSerializer.js";
+import { iVersionAbi } from "../../abi/iVersion.js";
 import { AddressMap } from "../utils/AddressMap.js";
 import { AddressSet } from "../utils/AddressSet.js";
 import { bytes32ToString } from "../utils/bytes32ToString.js";
 import { getAssetType } from "../chain/chains.js";
 import { formatBN } from "../utils/formatter.js";
 import "../utils/index.js";
-import { iStateSerializerAbi } from "../../abi/iStateSerializer.js";
-import { iVersionAbi } from "../../abi/iVersion.js";
+import { executeMulticallBatches } from "../utils/viem/executeMulticallBatches.js";
 //#region src/sdk/base/TokensMeta.ts
 /**
 * Registry of token metadata (symbol, decimals, phantom type) keyed by address.
@@ -62,7 +64,7 @@ var TokensMeta = class extends AddressMap {
 	* @returns
 	*/
 	isPhantomToken(t) {
-		if (!this.#tokenDataLoaded.has(t.addr)) throw new Error(`extended token data not loaded for ${t.symbol} (${t.addr})`);
+		if (!this.#tokenDataLoaded.has(t.addr)) throw new Error(`extended token data not loaded for ${t.symbol} (${t.addr}), check if the sdk was properly attached or hydrated`);
 		return !!t.contractType?.startsWith("PHANTOM_TOKEN::");
 	}
 	/**
@@ -167,44 +169,93 @@ var TokensMeta = class extends AddressMap {
 		return meta;
 	}
 	/**
+	* @internal
+	*
+	* Returns the multicall batch that loads extended token data (`contractType`
+	* and `serialize()`) for the tokens that do not have it yet. Used by the SDK
+	* to warm this cache together with other loaders in a single multicall.
+	*
+	* @param tokens - tokens to load data for, defaults to all tokens
+	**/
+	getLoadTokenDataMulticall(...tokens) {
+		const tokenz = new AddressSet(tokens.length > 0 ? tokens : this.keys());
+		const tokensToLoad = Array.from(tokenz.difference(this.#tokenDataLoaded));
+		return {
+			contracts: tokensToLoad.flatMap((t) => [
+				{
+					address: t,
+					abi: iVersionAbi,
+					functionName: "contractType"
+				},
+				{
+					address: t,
+					abi: iStateSerializerAbi,
+					functionName: "serialize"
+				},
+				{
+					address: t,
+					abi: iExpirableAbi,
+					functionName: "isExpired"
+				}
+			]),
+			onResults: (resps) => {
+				this.#logger?.debug(`loaded data of ${tokensToLoad.length} tokens`);
+				for (let i = 0; i < tokensToLoad.length; i++) {
+					this.#overrideTokenMeta(tokensToLoad[i], resps[3 * i], resps[3 * i + 1], resps[3 * i + 2]);
+					this.#tokenDataLoaded.add(tokensToLoad[i]);
+				}
+			}
+		};
+	}
+	/**
 	* Loads token information about phantom tokens
 	* In future other custom tokens types that do not have compressors might be handled here
 	*
+	* Tokens loaded during SDK attach or restored by {@link hydrate} are skipped,
+	* so calling this after either is a no-op.
+	*
 	* @param tokens - tokens to load data for, defaults to all tokens
 	*/
 	async loadTokenData(...tokens) {
-		const tokenz = new AddressSet(tokens.length > 0 ? tokens : this.keys());
-		const tokensToLoad = Array.from(tokenz.difference(this.#tokenDataLoaded));
-		if (tokensToLoad.length === 0) return;
-		const resp = await this.#client.multicall({
-			contracts: tokensToLoad.flatMap((t) => [{
-				address: t,
-				abi: iVersionAbi,
-				functionName: "contractType"
-			}, {
-				address: t,
-				abi: iStateSerializerAbi,
-				functionName: "serialize"
-			}]),
-			allowFailure: true,
-			batchSize: 0
-		});
-		this.#logger?.debug(`loaded ${resp.length} contract types`);
-		for (let i = 0; i < tokensToLoad.length; i++) {
-			this.#overrideTokenMeta(tokensToLoad[i], resp[2 * i], resp[2 * i + 1]);
-			this.#tokenDataLoaded.add(tokensToLoad[i]);
-		}
+		await executeMulticallBatches(this.#client, [this.getLoadTokenDataMulticall(...tokens)]);
+	}
+	/**
+	* Serializable snapshot of all token metadata, suitable for hydration.
+	**/
+	get state() {
+		return {
+			tokens: this.values(),
+			extendedLoaded: this.#tokenDataLoaded.asArray()
+		};
 	}
-	#overrideTokenMeta(token, contractTypeResp, _serializeResp) {
+	/**
+	* Restores token metadata from a previously serialized snapshot,
+	* bypassing on-chain reads.
+	*
+	* Entries are merged into the ones already registered by markets, zappers and
+	* the RWA registry (see {@link upsert}), so the snapshot must be applied last
+	* for its augmented fields to win.
+	*
+	* @param state - Token metadata snapshot.
+	**/
+	hydrate(state) {
+		for (const token of state.tokens) this.upsert(token.addr, token);
+		for (const token of state.extendedLoaded) this.#tokenDataLoaded.add(token);
+	}
+	#overrideTokenMeta(token, contractTypeResp, serializeResp, isExpiredResp) {
 		const meta = this.mustGet(token);
+		const update = { ...meta };
 		if (contractTypeResp.status === "success") {
 			const contractType = bytes32ToString(contractTypeResp.result);
-			this.upsert(token, {
-				...meta,
-				contractType
-			});
+			update.contractType = contractType;
+			update.serializedParams = serializeResp.status === "success" ? serializeResp.result : void 0;
 			this.#logger?.debug(`token ${meta.symbol} is ${contractType}`);
 		}
+		if (isExpiredResp.status === "success") {
+			update.isExpired = isExpiredResp.result;
+			this.#logger?.debug(`token ${meta.symbol} is expirable, expired: ${isExpiredResp.result}`);
+		}
+		if (contractTypeResp.status === "success" || isExpiredResp.status === "success") this.upsert(token, update);
 		return this.mustGet(token);
 	}
 };

package/dist/esm/sdk/chain/detectNetwork.js

@@ -1,5 +1,5 @@
-import { chains } from "./chains.js";
 import { ierc20Abi } from "../../abi/iERC20.js";
+import { chains } from "./chains.js";
 //#region src/sdk/chain/detectNetwork.ts
 /**
 * Detects the network type from the given client.

package/dist/esm/sdk/core/createAddressProvider.js

@@ -1,8 +1,8 @@
+import { iVersionAbi } from "../../abi/iVersion.js";
 import { AP_MARKET_COMPRESSOR, AP_PRICE_FEED_COMPRESSOR } from "../constants/address-provider.js";
 import { isV310 } from "../constants/versions.js";
 import "../constants/index.js";
 import { hexEq } from "../utils/hex.js";
-import { iVersionAbi } from "../../abi/iVersion.js";
 import { AddressProviderV310Contract } from "./AddressProviderV310Contract.js";
 //#region src/sdk/core/createAddressProvider.ts
 const OVERRIDE_ADDRESSES = { Mainnet: {

package/dist/esm/sdk/index.js

@@ -30,6 +30,7 @@ import { ZodAddress, ZodBigInt, ZodHex } from "./utils/zod.js";
 import "./utils/index.js";
 import { generateCastTraceCall, getCastTraceArgs } from "./utils/viem/cast.js";
 import { SimulationError, simulateCall } from "./utils/viem/simulateCall.js";
+import { executeMulticallBatches } from "./utils/viem/executeMulticallBatches.js";
 import { TokensMeta } from "./base/TokensMeta.js";
 import { ChainContractsRegister } from "./base/ChainContractsRegister.js";
 import { Construct } from "./base/Construct.js";
@@ -48,9 +49,10 @@ import { createAdapter } from "./market/adapters/createAdapter.js";
 import { CreditConfiguratorV310Contract } from "./market/credit/CreditConfiguratorV310Contract.js";
 import { CreditFacadeV310BaseContract, creditFacadeV310Abi as abi } from "./market/credit/CreditFacadeV310BaseContract.js";
 import { CreditFacadeV310Contract } from "./market/credit/CreditFacadeV310Contract.js";
-import { PARTIAL_LIQUIDATION_BUFFER_BPS, additionalBorrowApyBps, borrowApyBps, healthFactorBps, maxLeverage, minSeizedAmount, optimalHFForPartialLiquidation, optimalRepaidAmount, positionLeverage, rayToBps, usdToNumber, utilizationBps } from "./market/math.js";
+import { MAX_LEVERAGE_BUFFER_BPS, PARTIAL_LIQUIDATION_BUFFER_BPS, calcAdditionalBorrowApy, calcBorrowApy, calcMaxLeverage, calcPositionLeverage, calcUtilization, healthFactorBps, minSeizedAmount, optimalHFForPartialLiquidation, optimalRepaidAmount, rayToBps, usdToNumber } from "./market/math.js";
 import { CreditManagerV310Contract } from "./market/credit/CreditManagerV310Contract.js";
 import { dominantCollateral, mustGetDominantCollateral } from "./market/credit/dominantCollateral.js";
+import { NON_STRATEGY_PHANTOM_TOKEN_TYPES, isStrategyCollateral } from "./market/credit/isStrategyCollateral.js";
 import { CreditSuite } from "./market/credit/CreditSuite.js";
 import { expectedBalanceDeltas } from "./market/credit/expectedBalanceDeltas.js";
 import { simulateMulticall } from "./utils/viem/simulateMulticall.js";
@@ -107,7 +109,8 @@ import "./market/index.js";
 import { CreditAccountCompressorV310Contract } from "./accounts/credit-account-compressor/CreditAccountCompressorV310Contract.js";
 import { CreditAccountCompressor } from "./accounts/credit-account-compressor/CreditAccountCompressor.js";
 import { CreditAccountsServiceV310 } from "./accounts/CreditAccountsServiceV310.js";
-import { primaryInstantOutput } from "./accounts/intents/operations/claim-delayed/index.js";
+import { IntentPreviewError } from "./accounts/intents/types.js";
+import { fetchCreditAccountSlice, toCreditAccountSlice } from "./accounts/intents/utils/credit-account-slice.js";
 import { CreditAccountOperationsService } from "./accounts/intents/index.js";
 import { LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS } from "./accounts/liquidations/constants.js";
 import { LiquidationsService } from "./accounts/liquidations/LiquidationsService.js";
@@ -134,9 +137,15 @@ import "./opportunities/index.js";
 import { BasePlugin } from "./plugins/BasePlugin.js";
 import { PluginStateVersionError } from "./plugins/errors.js";
 import "./plugins/index.js";
-import { PoolService } from "./pools/PoolService.js";
+import { PoolService, toShares, toSharesUp } from "./pools/PoolService.js";
 import "./pools/index.js";
+import { calcBorrowRate } from "./positions/calcBorrowRate.js";
+import { calcHealthFactor } from "./positions/calcHealthFactor.js";
+import { calcLiquidationPriceForTarget } from "./positions/calcLiquidationPriceForTarget.js";
+import { calcLiquidationPrice } from "./positions/calcLiquidationPrice.js";
+import { calcTimeToLiquidationMs } from "./positions/calcTimeToLiquidationMs.js";
 import { MultichainPositionsService } from "./positions/MultichainPositionsService.js";
+import { accountSnapshotFromCreditAccountData } from "./positions/types.js";
 import { PositionsService } from "./positions/PositionsService.js";
 import "./positions/index.js";
 import { assetsMap } from "./router/helpers.js";
@@ -147,4 +156,4 @@ import { OnchainSDK, STATE_VERSION } from "./OnchainSDK.js";
 import { MultichainSDK } from "./MultichainSDK.js";
 import { attachOptionsSchema, onchainSDKOptionsSchema } from "./options.js";
 import "./types/index.js";
-export { ADDRESS_0X0, ADDRESS_PROVIDER_V310, AP_ACCOUNT_FACTORY, AP_ACL, AP_BOT_LIST, AP_BYTECODE_REPOSITORY, AP_CONTRACTS_REGISTER, AP_CONTROLLER_TIMELOCK, AP_CREDIT_ACCOUNT_COMPRESSOR, AP_CREDIT_SUITE_COMPRESSOR, AP_DATA_COMPRESSOR, AP_DELEVERAGE_BOT_HV, AP_DELEVERAGE_BOT_LV, AP_DELEVERAGE_BOT_PEGGED, AP_GAUGE_COMPRESSOR, AP_GEAR_STAKING, AP_GEAR_TOKEN, AP_INFLATION_ATTACK_BLOCKER, AP_INSOLVENCY_CHECKER, AP_MARKET_COMPRESSOR, AP_MARKET_CONFIGURATOR, AP_PARTIAL_LIQUIDATION_BOT, AP_PERIPHERY_COMPRESSOR, AP_PRICE_FEED_COMPRESSOR, AP_PRICE_FEED_STORE, AP_PRICE_ORACLE, AP_REDEMPTION_LOGGER, AP_REWARDS_COMPRESSOR, AP_ROUTER, AP_RWA_COMPRESSOR, AP_TOKEN_COMPRESSOR, AP_TREASURY, AP_WETH_GATEWAY, AP_WETH_TOKEN, AP_ZAPPER_REGISTER, AP_ZERO_PRICE_FEED, AbstractLPPriceFeedContract, AbstractPriceFeedContract, AbstractWithdrawalCompressorContract, AccountBotsService, AddressMap, AddressProviderV310Contract, AddressSet, AssetsMap, BLOCKS_PER_WEEK_BY_NETWORK, BalancerStablePriceFeedContract, BalancerWeightedPriceFeedContract, BaseContract, BasePlugin, BigIntMath, BotPermissions, BoundedPriceFeedContract, ChainContractsRegister, ChainNotConfiguredError, CompositePriceFeedContract, Construct, ContractParseError, CreditAccountCompressor, CreditAccountCompressorV310Contract, CreditAccountOperationsService, CreditAccountsServiceV310, CreditConfiguratorV310Contract, CreditFacadeV310BaseContract, CreditFacadeV310Contract, CreditManagerV310Contract, CreditSuite, CurveCryptoPriceFeedContract, CurveStablePriceFeedContract, CurveUSDPriceFeedContract, DELAYED_INTENT_TYPES, DELAYED_INTENT_VERSION, DUST_THRESHOLD, Erc4626PriceFeedContract, ExternalPriceFeedContract, GaugeContract, IERC20ZapperContract, IETHZapperContract, InvalidDelayedIntentError, LEVERAGE_DECIMALS, LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS, LinearInterestRateModelContract, LiquidationsService, MAX_INT, MAX_UINT16, MAX_UINT256, MIN_INT96, MULTICALL_ADDRESS, MarketRegister, MarketSuite, MellowLRTPriceFeedContract, MidasLiquidatorContract, MissingSerializedParamsError, MultichainConstruct, MultichainLiquidationsService, MultichainOpportunitiesService, MultichainPositionsService, MultichainSDK, NATIVE_ADDRESS, NOT_DEPLOYED, NO_VERSION, NetworkType, OnchainSDK, OpportunitiesService, PARTIAL_LIQUIDATION_BUFFER_BPS, PERCENTAGE_DECIMALS, PERCENTAGE_FACTOR, PERCENTAGE_FACTOR_1KK, PERIPHERY_CONTRACTS, PHANTOM_TOKEN_CONTRACT_TYPES, PHANTOM_TOKEN_MIDAS_REDEMPTION, PHANTOM_TOKEN_SECURITIZE_REDEMPTION, PRICE_DECIMALS, PRICE_DECIMALS_POW, PartialPriceFeedInitError, PendleTWAPPTPriceFeed, PeripheryCompressorV310Contract, PlaceholderAdapterContract, PlaceholderContract, PluginStateVersionError, PoolService, PoolSuite, PoolV310Contract, PositionsService, PriceFeedRef, PriceFeedRegister, PriceOracleV310Contract, PythPriceFeed, RAMP_DURATION_BY_NETWORK, RAY, RAY_DECIMALS_POW, RWARegistry, RWA_FACTORY_SECURITIZE, RWA_FACTORY_TYPES, RWA_LIQUIDATOR_MIDAS, RWA_LIQUIDATOR_SECURITIZE, RWA_ON_DEMAND_LP_MONOPOLIZED, RWA_UNDERLYING_DEFAULT, RWA_UNDERLYING_ON_DEMAND, RedemptionLoggerV310Contract, RedstonePriceFeedContract, RouterV310Contract, SDKConstruct, SECONDS_PER_YEAR, SECURITIZE_REGISTER_VAULT_TYPES, SLIPPAGE_DECIMALS, STATE_VERSION, SUPPORTED_NETWORKS, SdkAlreadyAttachedError, SdkChainMismatchError, SdkMissingChainStateError, SdkNotAttachedError, SdkStateVersionMismatchError, SdkSyncFailedError, SecuritizeLiquidatorContract, SecuritizeRWAFactory, SimulateWithPriceUpdatesError, SimulationError, TokensMeta, TypedObjectUtils, UnsupportedZapperFunctionError, VERSION_RANGE_310, VotingContractStatus, WAD, WAD_DECIMALS_POW, WithdrawalCompressorV310Contract, WithdrawalCompressorV311Contract, WithdrawalCompressorV313Contract, WstETHPriceFeedContract, YearnPriceFeedContract, ZapperContract, ZeroPriceFeedContract, ZodAddress, ZodBigInt, ZodHex, additionalBorrowApyBps, assetsMap, attachOptionsSchema, borrowApyBps, botPermissionsToString, bytes32ToString, chains, childLogger, createAdapter, createAddressProvider, createPriceOracle, createRawTx, createRedemptionLogger, createRouter, createWithdrawalCompressor, createZapper, abi as creditFacadeV310Abi, decodeDelayedIntent, detectNetwork, dominantCollateral, encodeDelayedIntent, estimateRawTxGas, etherscanApiUrl, etherscanUrl, executeDelegatedMulticalls, expectedBalanceDeltas, fetchRedstonePayloads, filterDust, filterDustUSD, findCuratorMarketConfigurator, fmtBinaryMask, formatBN, formatBNvalue, formatDuration, formatLeverage, formatNumberToString_, formatPercentage, formatTimestamp, functionArgsToMap, functionArgsToRecord, generateCastTraceCall, getAssetType, getCastTraceArgs, getChain, getCuratorName, getFunctionSignature, getNetworkType, getRawPriceUpdates, getSimulateWithPriceUpdatesError, getWithdrawalCompressorAddress, halfRAY, healthFactorBps, hexEq, hydrateAddressProvider, iCreditAccountAbi, isDust, isLPPriceFeed, isPublicNetwork, isRWAFactory, isRWAToken, isSunsetPool, isSunsetStrategy, isSupportedNetwork, isUpdatablePriceFeed, isV310, isVersionRange, json_parse, json_stringify, maxLeverage, minSeizedAmount, mustGetDominantCollateral, numberWithCommas, onchainSDKOptionsSchema, optimalHFForPartialLiquidation, optimalRepaidAmount, percentFmt, positionLeverage, primaryInstantOutput, rayToBps, rayToNumber, retry, sendRawTx, shortAddress, shortHash, simulateCall, simulateMulticall, simulateWithPriceUpdates, toAddress, toBN, toBigInt, toChainIds, toClaimableWithdrawal, toPendingWithdrawal, toRequestableWithdrawal, toSignificant, toWithdrawalStatus, usdToNumber, utilizationBps, watchBlocksAsync };
+export { ADDRESS_0X0, ADDRESS_PROVIDER_V310, AP_ACCOUNT_FACTORY, AP_ACL, AP_BOT_LIST, AP_BYTECODE_REPOSITORY, AP_CONTRACTS_REGISTER, AP_CONTROLLER_TIMELOCK, AP_CREDIT_ACCOUNT_COMPRESSOR, AP_CREDIT_SUITE_COMPRESSOR, AP_DATA_COMPRESSOR, AP_DELEVERAGE_BOT_HV, AP_DELEVERAGE_BOT_LV, AP_DELEVERAGE_BOT_PEGGED, AP_GAUGE_COMPRESSOR, AP_GEAR_STAKING, AP_GEAR_TOKEN, AP_INFLATION_ATTACK_BLOCKER, AP_INSOLVENCY_CHECKER, AP_MARKET_COMPRESSOR, AP_MARKET_CONFIGURATOR, AP_PARTIAL_LIQUIDATION_BOT, AP_PERIPHERY_COMPRESSOR, AP_PRICE_FEED_COMPRESSOR, AP_PRICE_FEED_STORE, AP_PRICE_ORACLE, AP_REDEMPTION_LOGGER, AP_REWARDS_COMPRESSOR, AP_ROUTER, AP_RWA_COMPRESSOR, AP_TOKEN_COMPRESSOR, AP_TREASURY, AP_WETH_GATEWAY, AP_WETH_TOKEN, AP_ZAPPER_REGISTER, AP_ZERO_PRICE_FEED, AbstractLPPriceFeedContract, AbstractPriceFeedContract, AbstractWithdrawalCompressorContract, AccountBotsService, AddressMap, AddressProviderV310Contract, AddressSet, AssetsMap, BLOCKS_PER_WEEK_BY_NETWORK, BalancerStablePriceFeedContract, BalancerWeightedPriceFeedContract, BaseContract, BasePlugin, BigIntMath, BotPermissions, BoundedPriceFeedContract, ChainContractsRegister, ChainNotConfiguredError, CompositePriceFeedContract, Construct, ContractParseError, CreditAccountCompressor, CreditAccountCompressorV310Contract, CreditAccountOperationsService, CreditAccountsServiceV310, CreditConfiguratorV310Contract, CreditFacadeV310BaseContract, CreditFacadeV310Contract, CreditManagerV310Contract, CreditSuite, CurveCryptoPriceFeedContract, CurveStablePriceFeedContract, CurveUSDPriceFeedContract, DELAYED_INTENT_TYPES, DELAYED_INTENT_VERSION, DUST_THRESHOLD, Erc4626PriceFeedContract, ExternalPriceFeedContract, GaugeContract, IERC20ZapperContract, IETHZapperContract, IntentPreviewError, InvalidDelayedIntentError, LEVERAGE_DECIMALS, LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS, LinearInterestRateModelContract, LiquidationsService, MAX_INT, MAX_LEVERAGE_BUFFER_BPS, MAX_UINT16, MAX_UINT256, MIN_INT96, MULTICALL_ADDRESS, MarketRegister, MarketSuite, MellowLRTPriceFeedContract, MidasLiquidatorContract, MissingSerializedParamsError, MultichainConstruct, MultichainLiquidationsService, MultichainOpportunitiesService, MultichainPositionsService, MultichainSDK, NATIVE_ADDRESS, NON_STRATEGY_PHANTOM_TOKEN_TYPES, NOT_DEPLOYED, NO_VERSION, NetworkType, OnchainSDK, OpportunitiesService, PARTIAL_LIQUIDATION_BUFFER_BPS, PERCENTAGE_DECIMALS, PERCENTAGE_FACTOR, PERCENTAGE_FACTOR_1KK, PERIPHERY_CONTRACTS, PHANTOM_TOKEN_CONTRACT_TYPES, PHANTOM_TOKEN_MIDAS_REDEMPTION, PHANTOM_TOKEN_SECURITIZE_REDEMPTION, PRICE_DECIMALS, PRICE_DECIMALS_POW, PartialPriceFeedInitError, PendleTWAPPTPriceFeed, PeripheryCompressorV310Contract, PlaceholderAdapterContract, PlaceholderContract, PluginStateVersionError, PoolService, PoolSuite, PoolV310Contract, PositionsService, PriceFeedRef, PriceFeedRegister, PriceOracleV310Contract, PythPriceFeed, RAMP_DURATION_BY_NETWORK, RAY, RAY_DECIMALS_POW, RWARegistry, RWA_FACTORY_SECURITIZE, RWA_FACTORY_TYPES, RWA_LIQUIDATOR_MIDAS, RWA_LIQUIDATOR_SECURITIZE, RWA_ON_DEMAND_LP_MONOPOLIZED, RWA_UNDERLYING_DEFAULT, RWA_UNDERLYING_ON_DEMAND, RedemptionLoggerV310Contract, RedstonePriceFeedContract, RouterV310Contract, SDKConstruct, SECONDS_PER_YEAR, SECURITIZE_REGISTER_VAULT_TYPES, SLIPPAGE_DECIMALS, STATE_VERSION, SUPPORTED_NETWORKS, SdkAlreadyAttachedError, SdkChainMismatchError, SdkMissingChainStateError, SdkNotAttachedError, SdkStateVersionMismatchError, SdkSyncFailedError, SecuritizeLiquidatorContract, SecuritizeRWAFactory, SimulateWithPriceUpdatesError, SimulationError, TokensMeta, TypedObjectUtils, UnsupportedZapperFunctionError, VERSION_RANGE_310, VotingContractStatus, WAD, WAD_DECIMALS_POW, WithdrawalCompressorV310Contract, WithdrawalCompressorV311Contract, WithdrawalCompressorV313Contract, WstETHPriceFeedContract, YearnPriceFeedContract, ZapperContract, ZeroPriceFeedContract, ZodAddress, ZodBigInt, ZodHex, accountSnapshotFromCreditAccountData, assetsMap, attachOptionsSchema, botPermissionsToString, bytes32ToString, calcAdditionalBorrowApy, calcBorrowApy, calcBorrowRate, calcHealthFactor, calcLiquidationPrice, calcLiquidationPriceForTarget, calcMaxLeverage, calcPositionLeverage, calcTimeToLiquidationMs, calcUtilization, chains, childLogger, createAdapter, createAddressProvider, createPriceOracle, createRawTx, createRedemptionLogger, createRouter, createWithdrawalCompressor, createZapper, abi as creditFacadeV310Abi, decodeDelayedIntent, detectNetwork, dominantCollateral, encodeDelayedIntent, estimateRawTxGas, etherscanApiUrl, etherscanUrl, executeDelegatedMulticalls, executeMulticallBatches, expectedBalanceDeltas, fetchCreditAccountSlice, fetchRedstonePayloads, filterDust, filterDustUSD, findCuratorMarketConfigurator, fmtBinaryMask, formatBN, formatBNvalue, formatDuration, formatLeverage, formatNumberToString_, formatPercentage, formatTimestamp, functionArgsToMap, functionArgsToRecord, generateCastTraceCall, getAssetType, getCastTraceArgs, getChain, getCuratorName, getFunctionSignature, getNetworkType, getRawPriceUpdates, getSimulateWithPriceUpdatesError, getWithdrawalCompressorAddress, halfRAY, healthFactorBps, hexEq, hydrateAddressProvider, iCreditAccountAbi, isDust, isLPPriceFeed, isPublicNetwork, isRWAFactory, isRWAToken, isStrategyCollateral, isSunsetPool, isSunsetStrategy, isSupportedNetwork, isUpdatablePriceFeed, isV310, isVersionRange, json_parse, json_stringify, minSeizedAmount, mustGetDominantCollateral, numberWithCommas, onchainSDKOptionsSchema, optimalHFForPartialLiquidation, optimalRepaidAmount, percentFmt, rayToBps, rayToNumber, retry, sendRawTx, shortAddress, shortHash, simulateCall, simulateMulticall, simulateWithPriceUpdates, toAddress, toBN, toBigInt, toChainIds, toClaimableWithdrawal, toCreditAccountSlice, toPendingWithdrawal, toRequestableWithdrawal, toShares, toSharesUp, toSignificant, toWithdrawalStatus, usdToNumber, watchBlocksAsync };

package/dist/esm/sdk/market/MarketRegister.js

@@ -94,29 +94,38 @@ var MarketRegister = class extends ZapperRegister {
 	* Otherwise only prices are refreshed.
 	*
 	* @param ignoreUpdateablePrices - When `true`, skips off-chain price updates.
+	* @param extra - Additional multicalls to execute in the same batch, so that
+	*   other registries can be synced without an extra request.
+	* @returns `true` when markets were fully reloaded, so that callers can
+	*   refresh the caches derived from the market set.
 	**/
-	async syncState(ignoreUpdateablePrices) {
+	async syncState(ignoreUpdateablePrices, extra = []) {
 		const dirty = this.markets.some((m) => m.dirty) || this.marketConfigurators.some((c) => c.dirty);
 		let multicalls;
 		let txs = [];
 		if (dirty) {
 			this.logger?.debug("some markets or market configurators are dirty, reloading everything");
-			multicalls = this.getLoadMulticalls([...this.marketFilter.configurators]);
+			multicalls = [...this.getLoadMulticalls([...this.marketFilter.configurators]), ...extra];
 			if (!ignoreUpdateablePrices) {
 				const updatables = await this.sdk.priceFeeds.getPartialUpdatablePriceFeeds([...this.marketFilter.configurators]);
 				txs = (await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(updatables)).txs;
 			}
 		} else if (!ignoreUpdateablePrices) {
-			multicalls = this.#getOracleSyncMulticalls();
-			if (!multicalls.length) return;
-			this.logger?.debug(`syncing prices on ${multicalls.length} oracles`);
-			txs = (await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs()).txs;
-		} else return;
+			const oracles = this.#getOracleSyncMulticalls();
+			multicalls = [...oracles, ...extra];
+			if (!multicalls.length) return false;
+			if (oracles.length) {
+				this.logger?.debug(`syncing prices on ${oracles.length} oracles`);
+				txs = (await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs()).txs;
+			}
+		} else if (extra.length) multicalls = extra;
+		else return false;
 		await executeDelegatedMulticalls(this.client, multicalls, {
 			priceUpdates: txs,
 			blockNumber: this.sdk.currentBlock,
 			gas: this.sdk.gasLimit
 		});
+		return dirty;
 	}
 	#getOracleSyncMulticalls(oracles) {
 		const uniqOracles = new AddressMap();