@gearbox-protocol/sdk 14.12.0-next.74 → 14.12.0-next.75

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

@@ -0,0 +1,280 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_sdk_utils_AddressMap = require("../../utils/AddressMap.js");
+const require_sdk_utils_AddressSet = require("../../utils/AddressSet.js");
+const require_sdk_constants_address_provider = require("../../constants/address-provider.js");
+const require_sdk_constants_addresses = require("../../constants/addresses.js");
+const require_sdk_constants_math = require("../../constants/math.js");
+const require_sdk_constants_versions = require("../../constants/versions.js");
+require("../../constants/index.js");
+const require_sdk_utils_hex = require("../../utils/hex.js");
+require("../../utils/index.js");
+const require_sdk_base_SDKConstruct = require("../../base/SDKConstruct.js");
+require("../../base/index.js");
+const require_abi_rwa_iRWAFactory = require("../../../abi/rwa/iRWAFactory.js");
+const require_sdk_market_math = require("../../market/math.js");
+const require_sdk_market_credit_dominantCollateral = require("../../market/credit/dominantCollateral.js");
+const require_sdk_utils_viem_simulateWithPriceUpdates = require("../../utils/viem/simulateWithPriceUpdates.js");
+require("../../utils/viem/index.js");
+require("../../market/index.js");
+const require_sdk_accounts_credit_account_compressor_CreditAccountCompressorV310Contract = require("./CreditAccountCompressorV310Contract.js");
+//#region src/sdk/accounts/credit-account-compressor/CreditAccountCompressor.ts
+/**
+* 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.
+*
+* TODO: create and deploy new compressor contract onchain to avoid all this stitching
+**/
+var CreditAccountCompressor = class extends require_sdk_base_SDKConstruct.SDKConstruct {
+	/**
+	* Reads data of a single credit account.
+	*
+	* When the compressor cannot value the account with current prices, the read
+	* is retried with price feed updates applied.
+	*
+	* @param account - Credit account address.
+	* @param blockNumber - Block to read at, defaults to the latest block.
+	* @returns Account data, or `undefined` if the account does not exist.
+	**/
+	async getCreditAccountData(account, blockNumber) {
+		const contract = this.#contract;
+		const raw = await contract.getCreditAccountData(account, blockNumber);
+		if (!raw) return;
+		const marketSuite = this.sdk.marketRegister.findByCreditManager(raw.creditManager);
+		const factory = marketSuite.rwaFactory;
+		let ca;
+		let investor;
+		if (raw.success) {
+			ca = raw;
+			investor = await factory?.getInvestor(raw.creditAccount, false);
+		} else {
+			const { txs: priceUpdateTxs } = await marketSuite.priceOracle.priceUpdateTxsForAccount(raw);
+			[ca, investor] = await require_sdk_utils_viem_simulateWithPriceUpdates.simulateWithPriceUpdates(this.client, {
+				priceUpdates: priceUpdateTxs,
+				contracts: [contract.dataCall(account), ...factory ? [{
+					abi: require_abi_rwa_iRWAFactory.iRWAFactoryAbi,
+					address: factory.address,
+					functionName: "getInvestor",
+					args: [raw.creditAccount]
+				}] : []],
+				blockNumber,
+				gas: this.sdk.gasLimit
+			});
+		}
+		return {
+			...ca,
+			investor
+		};
+	}
+	/**
+	* Reads all credit accounts matching the options, sorted by health factor
+	* ascending.
+	*
+	* @param options - {@link GetCreditAccountsOptions}
+	* @param blockNumber - Block to read at, defaults to the latest block.
+	**/
+	async getCreditAccounts(options, blockNumber) {
+		const { creditManager, includeZeroDebt = false, maxHealthFactor = require_sdk_constants_math.MAX_UINT256, minHealthFactor = 0n, owner = require_sdk_constants_addresses.ADDRESS_0X0, ignoreReservePrices = false } = options ?? {};
+		const target = creditManager ?? {
+			configurators: this.#marketConfigurators,
+			creditManagers: [],
+			pools: [],
+			underlying: "0x0000000000000000000000000000000000000000"
+		};
+		const { txs: priceUpdateTxs } = await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(ignoreReservePrices ? { main: true } : void 0);
+		return (await this.#contract.getCreditAccounts(target, {
+			owner,
+			includeZeroDebt,
+			minHealthFactor,
+			maxHealthFactor
+		}, {
+			blockNumber,
+			priceUpdateTxs
+		})).sort((a, b) => Number(a.healthFactor - b.healthFactor));
+	}
+	/**
+	* Reads all credit accounts of a borrower, sorted by health factor
+	* ascending.
+	*
+	* Covers accounts the borrower owns directly and RWA accounts they own as an
+	* investor, which are owned on-chain by an RWA factory.
+	*
+	* @param borrower - Wallet address.
+	* @param options - {@link GetCreditAccountsOptions}
+	* @param blockNumber - Block to read at, defaults to the latest block.
+	**/
+	async getBorrowerCreditAccounts(borrower, options, blockNumber) {
+		const { creditManager, includeZeroDebt = false, maxHealthFactor = require_sdk_constants_math.MAX_UINT256, minHealthFactor = 0n, ignoreReservePrices = false } = options ?? {};
+		const { txs: priceUpdateTxs } = await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(ignoreReservePrices ? { main: true } : void 0);
+		const rwaAccountAddresses = (await this.sdk.rwa.getInvestorData(borrower)).flatMap((d) => d.creditAccounts.map((ca) => ca.creditAccount));
+		const cmFilter = creditManager ? {
+			configurators: [],
+			creditManagers: [creditManager],
+			pools: [],
+			underlying: require_sdk_constants_addresses.ADDRESS_0X0
+		} : {
+			configurators: this.#marketConfigurators,
+			creditManagers: [],
+			pools: [],
+			underlying: require_sdk_constants_addresses.ADDRESS_0X0
+		};
+		const permissiveFilter = {
+			owner: borrower,
+			includeZeroDebt: true,
+			minHealthFactor: 0n,
+			maxHealthFactor: require_sdk_constants_math.MAX_UINT256,
+			reverting: false
+		};
+		const contract = this.#contract;
+		const rwaContracts = rwaAccountAddresses.map((account) => contract.dataCall(account));
+		const getCreditAccountsContracts = [false, true].map((reverting) => contract.accountsCall([
+			cmFilter,
+			{
+				...permissiveFilter,
+				reverting
+			},
+			0n
+		]));
+		const allContracts = [...rwaContracts, ...getCreditAccountsContracts];
+		const results = await require_sdk_utils_viem_simulateWithPriceUpdates.simulateWithPriceUpdates(this.client, {
+			priceUpdates: priceUpdateTxs,
+			contracts: allContracts,
+			blockNumber,
+			gas: this.sdk.gasLimit
+		});
+		const rwaResults = results.slice(0, rwaAccountAddresses.length);
+		const normalResults = results.slice(rwaAccountAddresses.length);
+		const seen = new require_sdk_utils_AddressSet.AddressSet();
+		const allCAs = [];
+		for (const ca of rwaResults) if (!seen.has(ca.creditAccount)) {
+			seen.add(ca.creditAccount);
+			allCAs.push({
+				...ca,
+				investor: borrower
+			});
+		}
+		for (const [accounts] of normalResults) for (const ca of accounts) if (!seen.has(ca.creditAccount)) {
+			seen.add(ca.creditAccount);
+			allCAs.push({
+				...ca,
+				investor: void 0
+			});
+		}
+		const filtered = allCAs.filter((ca) => {
+			if (!includeZeroDebt && ca.debt === 0n) return false;
+			if (ca.healthFactor < minHealthFactor) return false;
+			if (ca.healthFactor > maxHealthFactor) return false;
+			if (creditManager && !require_sdk_utils_hex.hexEq(ca.creditManager, creditManager)) return false;
+			return true;
+		});
+		this.logger?.debug(`loaded ${allCAs.length} borrower credit accounts (${rwaResults.length} RWA, ${filtered.length} after filter)`);
+		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 } = props;
+		const [accounts] = await Promise.all([this.getBorrowerCreditAccounts(owner, { includeZeroDebt }), this.sdk.withdrawalCompressor?.loadWithdrawableAssets()]);
+		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)));
+		return describable.map((ca, i) => this.#toStrategyPosition(ca, withdrawals[i] ?? new require_sdk_utils_AddressMap.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 = require_sdk_market_credit_dominantCollateral.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: require_sdk_market_math.positionLeverage(totalDebtValue, ca.totalValue),
+			borrowApy: require_sdk_market_math.borrowApyBps(pool.baseInterestRate, suite.creditManager.feeInterest),
+			totalDebt: {
+				token,
+				value: totalDebtValue,
+				valueUsd: require_sdk_market_math.usdToNumber(ca.totalDebtUSD)
+			},
+			totalValue: {
+				token,
+				value: ca.totalValue,
+				valueUsd: require_sdk_market_math.usdToNumber(ca.totalValueUSD)
+			},
+			healthFactor: require_sdk_market_math.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) {
+		const compressor = this.sdk.withdrawalCompressor;
+		const byPhantomToken = new require_sdk_utils_AddressMap.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);
+		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
+	* once the SDK is attached or hydrated. The contracts register acts as the
+	* cache: instances register themselves there on construction, and a
+	* re-hydrated SDK with a different compressor address simply misses and
+	* builds a new wrapper.
+	**/
+	get #contract() {
+		const [address] = this.sdk.addressProvider.mustGetLatest(require_sdk_constants_address_provider.AP_CREDIT_ACCOUNT_COMPRESSOR, require_sdk_constants_versions.VERSION_RANGE_310);
+		return this.sdk.getContract(address) ?? new require_sdk_accounts_credit_account_compressor_CreditAccountCompressorV310Contract.CreditAccountCompressorV310Contract(this.sdk, address);
+	}
+	/**
+	* Addresses of market configurators the SDK is attached to.
+	**/
+	get #marketConfigurators() {
+		return this.sdk.marketRegister.marketConfigurators.map((mc) => mc.address);
+	}
+};
+//#endregion
+exports.CreditAccountCompressor = CreditAccountCompressor;

package/dist/cjs/sdk/accounts/credit-account-compressor/CreditAccountCompressorV310Contract.js

@@ -0,0 +1,141 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_sdk_base_BaseContract = require("../../base/BaseContract.js");
+require("../../base/index.js");
+const require_sdk_utils_viem_simulateWithPriceUpdates = require("../../utils/viem/simulateWithPriceUpdates.js");
+require("../../utils/viem/index.js");
+//#region src/sdk/accounts/credit-account-compressor/CreditAccountCompressorV310Contract.ts
+const abi = require("../../../abi/compressors/creditAccountCompressor.js").creditAccountCompressorAbi;
+/**
+* V3.10 credit account compressor.
+*
+* Wraps the compressor ABI and nothing else: single-account reads, paginated
+* multi-account reads, and call descriptors for callers that need to batch
+* these reads with calls to other contracts.
+**/
+var CreditAccountCompressorV310Contract = class extends require_sdk_base_BaseContract.BaseContract {
+	#sdk;
+	constructor(sdk, address) {
+		super(sdk, {
+			addr: address,
+			name: "CreditAccountCompressorV310",
+			abi,
+			version: 310
+		});
+		this.#sdk = sdk;
+	}
+	/**
+	* Reads data of a single credit account.
+	*
+	* @param account - Credit account address.
+	* @param blockNumber - Block to read at, defaults to the latest block.
+	* @returns Account data, or `undefined` if the compressor reverted, which it
+	* does when the account does not exist.
+	**/
+	async getCreditAccountData(account, blockNumber) {
+		try {
+			return await this.client.readContract({
+				abi,
+				address: this.address,
+				functionName: "getCreditAccountData",
+				args: [account],
+				blockNumber,
+				gas: this.#sdk.gasLimit
+			});
+		} catch (_e) {
+			return;
+		}
+	}
+	/**
+	* Reads all credit accounts matching the filters, in the order the
+	* compressor returns them.
+	*
+	* Two compressor quirks are handled here: results are paginated, and the
+	* `reverting` account filter is exclusive, so accounts whose collateral
+	* computation reverts are only returned by a second pass.
+	*
+	* @param target - Credit managers to query.
+	* @param query - Account-level filters, without `reverting`.
+	* @param options - Block, price updates and page size.
+	**/
+	async getCreditAccounts(target, query, options) {
+		const { batchSize, blockNumber, priceUpdateTxs } = options ?? {};
+		const allCAs = [];
+		let revertingOffset = 0;
+		for (const reverting of [false, true]) {
+			let offset = 0n;
+			revertingOffset = allCAs.length;
+			do {
+				const [accounts, newOffset] = await this.#getCreditAccounts(batchSize ? [
+					target,
+					{
+						...query,
+						reverting
+					},
+					offset,
+					batchSize
+				] : [
+					target,
+					{
+						...query,
+						reverting
+					},
+					offset
+				], priceUpdateTxs, blockNumber);
+				allCAs.push(...accounts);
+				offset = newOffset;
+			} while (offset !== 0n);
+		}
+		this.logger?.debug(`loaded ${allCAs.length} credit accounts (${allCAs.length - revertingOffset} reverting)`);
+		return allCAs;
+	}
+	/**
+	* Descriptor of a `getCreditAccountData` call on this compressor.
+	**/
+	dataCall(account) {
+		return {
+			abi,
+			address: this.address,
+			functionName: "getCreditAccountData",
+			args: [account]
+		};
+	}
+	/**
+	* Descriptor of a `getCreditAccounts` call on this compressor.
+	**/
+	accountsCall(args) {
+		return {
+			abi,
+			address: this.address,
+			functionName: "getCreditAccounts",
+			args
+		};
+	}
+	/**
+	* One page of `getCreditAccounts`, with price updates applied when the
+	* accounts hold tokens with on-demand price feeds.
+	**/
+	async #getCreditAccounts(args, priceUpdateTxs, blockNumber) {
+		let resp;
+		if (priceUpdateTxs?.length) [resp] = await require_sdk_utils_viem_simulateWithPriceUpdates.simulateWithPriceUpdates(this.client, {
+			priceUpdates: priceUpdateTxs,
+			contracts: [this.accountsCall(args)],
+			blockNumber,
+			gas: this.#sdk.gasLimit
+		});
+		else resp = await this.client.readContract({
+			abi,
+			address: this.address,
+			functionName: "getCreditAccounts",
+			args,
+			blockNumber,
+			gas: this.#sdk.gasLimit
+		});
+		this.logger?.debug({
+			accounts: resp[0]?.length ?? 0,
+			nextOffset: Number(resp[1])
+		}, "got credit accounts");
+		return resp;
+	}
+};
+//#endregion
+exports.CreditAccountCompressorV310Contract = CreditAccountCompressorV310Contract;

package/dist/cjs/sdk/accounts/credit-account-compressor/index.js

@@ -0,0 +1,6 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_sdk_accounts_credit_account_compressor_CreditAccountCompressorV310Contract = require("./CreditAccountCompressorV310Contract.js");
+const require_sdk_accounts_credit_account_compressor_CreditAccountCompressor = require("./CreditAccountCompressor.js");
+require("./types.js");
+exports.CreditAccountCompressor = require_sdk_accounts_credit_account_compressor_CreditAccountCompressor.CreditAccountCompressor;
+exports.CreditAccountCompressorV310Contract = require_sdk_accounts_credit_account_compressor_CreditAccountCompressorV310Contract.CreditAccountCompressorV310Contract;

package/dist/cjs/sdk/accounts/credit-account-compressor/types.js

@@ -0,0 +1 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });

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

@@ -1,4 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_sdk_accounts_credit_account_compressor_CreditAccountCompressorV310Contract = require("./credit-account-compressor/CreditAccountCompressorV310Contract.js");
+const require_sdk_accounts_credit_account_compressor_CreditAccountCompressor = require("./credit-account-compressor/CreditAccountCompressor.js");
+require("./credit-account-compressor/index.js");
 const require_sdk_accounts_CreditAccountsServiceV310 = require("./CreditAccountsServiceV310.js");
 const require_sdk_accounts_intents_operations_claim_delayed_index = require("./intents/operations/claim-delayed/index.js");
 const require_sdk_accounts_intents_index = require("./intents/index.js");
@@ -20,6 +23,8 @@ const require_sdk_accounts_withdrawal_compressor_WithdrawalCompressorV313Contrac
 const require_sdk_accounts_withdrawal_compressor_createWithdrawalCompressor = require("./withdrawal-compressor/createWithdrawalCompressor.js");
 require("./withdrawal-compressor/index.js");
 exports.AbstractWithdrawalCompressorContract = require_sdk_accounts_withdrawal_compressor_AbstractWithdrawalCompressorContract.AbstractWithdrawalCompressorContract;
+exports.CreditAccountCompressor = require_sdk_accounts_credit_account_compressor_CreditAccountCompressor.CreditAccountCompressor;
+exports.CreditAccountCompressorV310Contract = require_sdk_accounts_credit_account_compressor_CreditAccountCompressorV310Contract.CreditAccountCompressorV310Contract;
 exports.CreditAccountOperationsService = require_sdk_accounts_intents_index.CreditAccountOperationsService;
 exports.CreditAccountsServiceV310 = require_sdk_accounts_CreditAccountsServiceV310.CreditAccountsServiceV310;
 exports.DELAYED_INTENT_TYPES = require_sdk_accounts_withdrawal_compressor_intent_codec.DELAYED_INTENT_TYPES;

package/dist/cjs/sdk/index.js

@@ -104,6 +104,8 @@ const require_sdk_market_rwa_securitize_SecuritizeRWAFactory = require("./market
 const require_sdk_market_rwa_RWARegistry = require("./market/rwa/RWARegistry.js");
 const require_sdk_market_rwa_types = require("./market/rwa/types.js");
 require("./market/index.js");
+const require_sdk_accounts_credit_account_compressor_CreditAccountCompressorV310Contract = require("./accounts/credit-account-compressor/CreditAccountCompressorV310Contract.js");
+const require_sdk_accounts_credit_account_compressor_CreditAccountCompressor = require("./accounts/credit-account-compressor/CreditAccountCompressor.js");
 const require_sdk_accounts_CreditAccountsServiceV310 = require("./accounts/CreditAccountsServiceV310.js");
 const require_sdk_accounts_intents_operations_claim_delayed_index = require("./accounts/intents/operations/claim-delayed/index.js");
 const require_sdk_accounts_intents_index = require("./accounts/intents/index.js");
@@ -200,6 +202,8 @@ exports.ChainNotConfiguredError = require_sdk_core_errors.ChainNotConfiguredErro
 exports.CompositePriceFeedContract = require_sdk_market_pricefeeds_CompositePriceFeed.CompositePriceFeedContract;
 exports.Construct = require_sdk_base_Construct.Construct;
 exports.ContractParseError = require_sdk_base_BaseContract.ContractParseError;
+exports.CreditAccountCompressor = require_sdk_accounts_credit_account_compressor_CreditAccountCompressor.CreditAccountCompressor;
+exports.CreditAccountCompressorV310Contract = require_sdk_accounts_credit_account_compressor_CreditAccountCompressorV310Contract.CreditAccountCompressorV310Contract;
 exports.CreditAccountOperationsService = require_sdk_accounts_intents_index.CreditAccountOperationsService;
 exports.CreditAccountsServiceV310 = require_sdk_accounts_CreditAccountsServiceV310.CreditAccountsServiceV310;
 exports.CreditConfiguratorV310Contract = require_sdk_market_credit_CreditConfiguratorV310Contract.CreditConfiguratorV310Contract;

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

@@ -1,6 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_sdk_utils_AddressMap = require("../../utils/AddressMap.js");
+const require_sdk_utils_AddressSet = require("../../utils/AddressSet.js");
 const require_sdk_constants_address_provider = require("../../constants/address-provider.js");
+require("../../constants/math.js");
 const require_sdk_constants_versions = require("../../constants/versions.js");
 require("../../constants/index.js");
 const require_sdk_utils_formatter = require("../../utils/formatter.js");
@@ -8,8 +10,9 @@ require("../../utils/index.js");
 const require_sdk_base_BaseContract = require("../../base/BaseContract.js");
 require("../../base/index.js");
 const require_sdk_market_math = require("../math.js");
-const require_sdk_market_pricefeeds_PriceFeedRef = require("../pricefeeds/PriceFeedRef.js");
 const require_abi_compressors_priceFeedCompressor = require("../../../abi/compressors/priceFeedCompressor.js");
+const require_sdk_market_pricefeeds_PriceFeedRef = require("../pricefeeds/PriceFeedRef.js");
+const require_sdk_market_pricefeeds_getRawPriceUpdates = require("../pricefeeds/getRawPriceUpdates.js");
 require("../pricefeeds/index.js");
 const require_sdk_market_oracle_PriceFeedAnswerMap = require("./PriceFeedAnswerMap.js");
 let viem = require("viem");
@@ -59,6 +62,31 @@ var PriceOracleBaseContract = class extends require_sdk_base_BaseContract.BaseCo
 		return tokens.flatMap((t) => [main ? this.mainPriceFeeds.get(t)?.priceFeed : void 0, reserve ? this.reservePriceFeeds.get(t)?.priceFeed : void 0]).filter((f) => !!f);
 	}
 	/**
+	* {@inheritDoc IPriceOracleContract.priceUpdateTxsForAccount}
+	**/
+	async priceUpdateTxsForAccount(account, opts) {
+		return this.#priceUpdateTxsForTokens(getAccountTokens(account, opts?.extraTokens), opts);
+	}
+	/**
+	* {@inheritDoc IPriceOracleContract.priceUpdatesForAccount}
+	**/
+	async priceUpdatesForAccount(account, opts) {
+		return require_sdk_market_pricefeeds_getRawPriceUpdates.getRawPriceUpdates(await this.priceUpdateTxsForAccount(account, opts));
+	}
+	/**
+	* {@inheritDoc IPriceOracleContract.priceUpdatesForTokens}
+	**/
+	async priceUpdatesForTokens(tokens, opts) {
+		return require_sdk_market_pricefeeds_getRawPriceUpdates.getRawPriceUpdates(await this.#priceUpdateTxsForTokens(tokens, opts));
+	}
+	async #priceUpdateTxsForTokens(tokens, opts) {
+		const priceFeeds = this.priceFeedsForTokens(tokens, opts);
+		const tStr = tokens.map((t) => this.labelAddress(t)).join(", ");
+		const remark = opts?.reserve === false ? " main" : "";
+		this.logger?.debug(`generating price feed updates for ${tStr} from ${priceFeeds.length}${remark} price feeds`);
+		return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(priceFeeds);
+	}
+	/**
 	* {@inheritDoc IPriceOracleContract.mainPrice}
 	**/
 	mainPrice(token) {
@@ -262,6 +290,18 @@ var PriceOracleBaseContract = class extends require_sdk_base_BaseContract.BaseCo
 		}
 	}
 };
+/**
+* Tokens of an account that have to be priced: its underlying, every enabled
+* token it holds a non-dust balance of, and any extra tokens the caller adds.
+**/
+function getAccountTokens(account, extraTokens) {
+	const tokens = new require_sdk_utils_AddressSet.AddressSet([account.underlying, ...extraTokens ?? []]);
+	for (const t of account.tokens) {
+		const isEnabled = (t.mask & account.enabledTokensMask) !== 0n;
+		if (t.balance > 10n && isEnabled) tokens.add(t.token);
+	}
+	return tokens.asArray();
+}
 function formatAnswer({ price, success, updatedAt }, raw = true) {
 	if (!success) return "failed";
 	let priceS = require_sdk_utils_formatter.formatBN(price, 8);

package/dist/cjs/sdk/market/oracle/PriceOracleV310Contract.js

@@ -1,8 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_abi_310_generated = require("../../../abi/310/generated.js");
 const require_sdk_utils_viem_simulateWithPriceUpdates = require("../../utils/viem/simulateWithPriceUpdates.js");
-const require_sdk_market_pricefeeds_getRawPriceUpdates = require("../pricefeeds/getRawPriceUpdates.js");
-require("../pricefeeds/index.js");
 const require_sdk_market_oracle_PriceOracleBaseContract = require("./PriceOracleBaseContract.js");
 //#region src/sdk/market/oracle/PriceOracleV310Contract.ts
 const abi = require_abi_310_generated.iPriceOracleV310Abi;
@@ -15,27 +13,6 @@ var PriceOracleV310Contract = class extends require_sdk_market_oracle_PriceOracl
 		}, data);
 	}
 	/**
-	* Converts previously obtained price updates into CreditFacade multicall entry
-	* @param creditFacade
-	* @param updates
-	* @returns
-	* @throws If `creditFacade` does not belong to a loaded market.
-	*/
-	onDemandPriceUpdates(creditFacade, updates) {
-		if (!updates) {
-			this.logger?.debug("empty updates list");
-			return {
-				multicall: [],
-				raw: []
-			};
-		}
-		const raw = require_sdk_market_pricefeeds_getRawPriceUpdates.getRawPriceUpdates(updates);
-		return {
-			raw,
-			multicall: [this.sdk.marketRegister.findCreditFacade(creditFacade).prepareOnDemandPriceUpdates(raw)]
-		};
-	}
-	/**
 	* {@inheritDoc IPriceOracleContract.updateAndConvert}
 	**/
 	async updateAndConvert(from, to, amount) {

package/dist/cjs/sdk/market/pricefeeds/PriceFeedsRegister.js

@@ -9,6 +9,7 @@ require("../../constants/index.js");
 require("../../utils/index.js");
 const require_sdk_base_SDKConstruct = require("../../base/SDKConstruct.js");
 require("../../base/index.js");
+const require_abi_compressors_priceFeedCompressor = require("../../../abi/compressors/priceFeedCompressor.js");
 const require_sdk_market_pricefeeds_AbstractPriceFeed = require("./AbstractPriceFeed.js");
 const require_sdk_market_pricefeeds_BalancerStablePriceFeed = require("./BalancerStablePriceFeed.js");
 const require_sdk_market_pricefeeds_BalancerWeightedPriceFeed = require("./BalancerWeightedPriceFeed.js");
@@ -22,7 +23,6 @@ const require_sdk_market_pricefeeds_ExternalPriceFeed = require("./ExternalPrice
 const require_sdk_market_pricefeeds_getRawPriceUpdates = require("./getRawPriceUpdates.js");
 const require_sdk_market_pricefeeds_MellowLRTPriceFeed = require("./MellowLRTPriceFeed.js");
 const require_sdk_market_pricefeeds_PendleTWAPPTPriceFeed = require("./PendleTWAPPTPriceFeed.js");
-const require_abi_compressors_priceFeedCompressor = require("../../../abi/compressors/priceFeedCompressor.js");
 const require_sdk_utils_internal_Hooks = require("../../utils/internal/Hooks.js");
 require("../../utils/internal/index.js");
 const require_sdk_market_pricefeeds_ConstantPriceFeed = require("./ConstantPriceFeed.js");

package/dist/esm/plugins/accounts-counter/AccountsCounterPlugin.js

@@ -1,10 +1,10 @@
-import { creditAccountCompressorAbi } from "../../abi/compressors/creditAccountCompressor.js";
 import { AddressMap } from "../../sdk/utils/AddressMap.js";
 import { TypedObjectUtils } from "../../sdk/utils/mappers.js";
 import { AP_CREDIT_ACCOUNT_COMPRESSOR } from "../../sdk/constants/address-provider.js";
 import { ADDRESS_0X0 } from "../../sdk/constants/addresses.js";
 import { MAX_UINT256 } from "../../sdk/constants/math.js";
 import { VERSION_RANGE_310 } from "../../sdk/constants/versions.js";
+import { creditAccountCompressorAbi } from "../../abi/compressors/creditAccountCompressor.js";
 import { BasePlugin } from "../../sdk/plugins/BasePlugin.js";
 import "../../sdk/index.js";
 //#region src/plugins/accounts-counter/AccountsCounterPlugin.ts