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

package/dist/cjs/abi/iExpirable.js

@@ -0,0 +1,15 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region src/abi/iExpirable.ts
+const iExpirableAbi = [{
+	type: "function",
+	inputs: [],
+	name: "isExpired",
+	outputs: [{
+		name: "",
+		internalType: "bool",
+		type: "bool"
+	}],
+	stateMutability: "view"
+}];
+//#endregion
+exports.iExpirableAbi = iExpirableAbi;

package/dist/cjs/dev/AccountOpener.js

@@ -87,7 +87,6 @@ var AccountOpener = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 			depositIntoPools,
 			claimFromFaucet
 		}, "opening credit accounts");
-		await Promise.all([this.sdk.tokensMeta.loadTokenData(), this.sdk.marketRegister.loadZappers()]);
 		let deposits = [];
 		if (depositIntoPools) try {
 			deposits = await this.#depositIntoPools(targets);

package/dist/cjs/sdk/MultichainSDK.js

@@ -69,7 +69,6 @@ var MultichainSDK = class {
 			const perChainOpts = options?.perChain?.[network] ?? {};
 			return sdk.attach({
 				...perChainOpts,
-				loadZappers: perChainOpts.loadZappers ?? options?.loadZappers,
 				redstone: {
 					...options?.redstone,
 					cache: this.#redstoneCache,
@@ -89,7 +88,7 @@ var MultichainSDK = class {
 	*   state and `allowMissingChains` is not set.
 	*/
 	hydrate(state, options) {
-		if (state.version !== 1) throw new require_sdk_core_errors.SdkStateVersionMismatchError(1, state.version);
+		if (state.version !== 2) throw new require_sdk_core_errors.SdkStateVersionMismatchError(2, state.version);
 		if (options?.redstone) this.#redstoneCache = new require_sdk_market_pricefeeds_updates_PriceUpdatesCache.PriceUpdatesCache({
 			ttl: options.redstone.cacheTTL ?? 225e3,
 			historical: !!options.redstone.historicTimestamp
@@ -169,7 +168,7 @@ var MultichainSDK = class {
 	**/
 	get state() {
 		return {
-			version: 1,
+			version: 2,
 			chains: [...this.#chains.values()].map((sdk) => sdk.state)
 		};
 	}
@@ -179,7 +178,7 @@ var MultichainSDK = class {
 	*/
 	stateHuman(raw) {
 		return {
-			version: 1,
+			version: 2,
 			chains: [...this.#chains.values()].map((sdk) => sdk.stateHuman(raw))
 		};
 	}

package/dist/cjs/sdk/OnchainSDK.js

@@ -8,6 +8,7 @@ require("./constants/index.js");
 const require_sdk_utils_formatter = require("./utils/formatter.js");
 const require_sdk_utils_toAddress = require("./utils/toAddress.js");
 require("./utils/index.js");
+const require_sdk_utils_viem_executeMulticallBatches = require("./utils/viem/executeMulticallBatches.js");
 const require_sdk_base_ChainContractsRegister = require("./base/ChainContractsRegister.js");
 require("./base/index.js");
 const require_sdk_utils_viem_executeDelegatedMulticalls = require("./utils/viem/executeDelegatedMulticalls.js");
@@ -41,7 +42,7 @@ let viem = require("viem");
 * Serialised state format version, checked during hydration to detect
 * incompatible snapshots.
 **/
-const STATE_VERSION = 1;
+const STATE_VERSION = 2;
 /**
 * @internal
 * Creates a viem `PublicClient` from the given connection options.
@@ -151,7 +152,7 @@ var OnchainSDK = class extends require_sdk_base_ChainContractsRegister.ChainCont
 	*/
 	async attach(options) {
 		if (this.#attached) throw new require_sdk_core_errors.SdkAlreadyAttachedError();
-		const { addressProvider = require_sdk_constants_address_provider.ADDRESS_PROVIDER_V310, blockNumber, ignoreUpdateablePrices, ignoreMarkets, marketConfigurators: mcs, redstone, loadZappers } = options ?? {};
+		const { addressProvider = require_sdk_constants_address_provider.ADDRESS_PROVIDER_V310, blockNumber, ignoreUpdateablePrices, ignoreMarkets, marketConfigurators: mcs, redstone } = options ?? {};
 		const marketConfigurators = mcs ?? require_sdk_utils_mappers.TypedObjectUtils.keys(this.client.chain.defaultMarketConfigurators);
 		const rwaFactories = options?.rwaFactories ?? this.client.chain.rwaFactories;
 		this.logger?.info({
@@ -175,19 +176,15 @@ var OnchainSDK = class extends require_sdk_base_ChainContractsRegister.ChainCont
 		this.#marketRegister = new require_sdk_market_MarketRegister.MarketRegister(this, ignoreMarkets);
 		if (!marketConfigurators.length) this.logger?.warn("no market configurators provided, skipping market loading");
 		else {
+			const priceUpdates = await this.#getPriceUpdateTxs(marketConfigurators, ignoreUpdateablePrices);
+			this.logger?.debug({ configurators: marketConfigurators }, `calling getMarkets with ${priceUpdates.length} price updates in block ${this.currentBlock}`);
 			const delegated = [...this.#marketRegister.getLoadMulticalls(marketConfigurators), ...this.#rwa.getLoadMulticalls(marketConfigurators, rwaFactories)];
-			let txs = [];
-			if (!ignoreUpdateablePrices) {
-				const updatables = await this.#priceFeeds.getPartialUpdatablePriceFeeds(marketConfigurators);
-				txs = (await this.#priceFeeds.generatePriceFeedsUpdateTxs(updatables)).txs;
-			}
-			this.logger?.debug({ configurators: marketConfigurators }, `calling getMarkets with ${txs.length} price updates in block ${this.currentBlock}`);
 			await require_sdk_utils_viem_executeDelegatedMulticalls.executeDelegatedMulticalls(this.client, delegated, {
-				priceUpdates: txs,
+				priceUpdates,
 				blockNumber: this.currentBlock,
 				gas: this.gasLimit
 			});
-			if (loadZappers) await this.#marketRegister.loadZappers();
+			await this.#warmup();
 		}
 		const pluginsList = require_sdk_utils_mappers.TypedObjectUtils.entries(this.plugins);
 		(await Promise.allSettled(pluginsList.map(([name, plugin]) => {
@@ -204,6 +201,36 @@ var OnchainSDK = class extends require_sdk_base_ChainContractsRegister.ChainCont
 		this.#attached = true;
 	}
 	/**
+	* @internal
+	* Pass 0 of attach: resolves the price updates that the market reads of
+	* pass 1 are simulated with.
+	*
+	* @param configurators - Market configurators whose feeds are considered.
+	* @param ignoreUpdateablePrices - When `true`, no updates are fetched.
+	**/
+	async #getPriceUpdateTxs(configurators, ignoreUpdateablePrices) {
+		if (ignoreUpdateablePrices) return [];
+		const updatables = await this.priceFeeds.getPartialUpdatablePriceFeeds(configurators);
+		const { txs } = await this.priceFeeds.generatePriceFeedsUpdateTxs(updatables);
+		return txs;
+	}
+	/**
+	* @internal
+	* Pass 2 of attach: loads the data that is read synchronously afterwards
+	* (zappers, withdrawable assets, extended token data) in a single multicall.
+	*
+	* Also re-run after a sync that reloaded the markets these caches derive from.
+	*
+	* @param force - Reload caches that are already populated.
+	**/
+	async #warmup(force = false) {
+		await require_sdk_utils_viem_executeMulticallBatches.executeMulticallBatches(this.client, [
+			this.marketRegister.getLoadZappersMulticall(force),
+			...this.#withdrawalCompressor ? [this.#withdrawalCompressor.getLoadWithdrawableAssetsMulticall(force)] : [],
+			this.tokensMeta.getLoadTokenDataMulticall()
+		], { blockNumber: this.currentBlock });
+	}
+	/**
 	* Restores SDK state from a previously serialised {@link GearboxState}
 	* snapshot, without making any on-chain calls.
 	*
@@ -215,7 +242,7 @@ var OnchainSDK = class extends require_sdk_base_ChainContractsRegister.ChainCont
 	*/
 	hydrate(state, options) {
 		if (this.#attached) throw new require_sdk_core_errors.SdkAlreadyAttachedError();
-		if (state.version !== 1) throw new require_sdk_core_errors.SdkStateVersionMismatchError(1, state.version);
+		if (state.version !== 2) throw new require_sdk_core_errors.SdkStateVersionMismatchError(2, state.version);
 		if (state.network !== this.networkType) throw new require_sdk_core_errors.SdkChainMismatchError(this.networkType, state.network);
 		const { ignoreMarkets, redstone } = options ?? {};
 		this.logger?.info({ networkType: this.networkType }, "hydrating sdk state");
@@ -229,6 +256,7 @@ var OnchainSDK = class extends require_sdk_base_ChainContractsRegister.ChainCont
 		this.#rwa = new require_sdk_market_rwa_RWARegistry.RWARegistry(this);
 		this.#rwa.setState(state.rwa);
 		if (state.withdrawals) this.#withdrawalCompressor?.hydrate(state.withdrawals);
+		if (state.tokens) this.tokensMeta.hydrate(state.tokens);
 		for (const [name, plugin] of require_sdk_utils_mappers.TypedObjectUtils.entries(this.plugins)) {
 			const pluginState = state.plugins[name];
 			if (plugin.hydrate && pluginState) {
@@ -274,13 +302,14 @@ var OnchainSDK = class extends require_sdk_base_ChainContractsRegister.ChainCont
 	/** Serialisable snapshot of the current SDK state. */
 	get state() {
 		return {
-			version: 1,
+			version: 2,
 			network: this.networkType,
 			chainId: this.chainId,
 			currentBlock: this.currentBlock,
 			timestamp: this.timestamp,
 			addressProvider: this.addressProvider.state,
 			...this.marketRegister.state,
+			tokens: this.tokensMeta.state,
 			rwa: this.#rwa.state,
 			withdrawals: this.#withdrawalCompressor?.state,
 			plugins: Object.fromEntries(require_sdk_utils_mappers.TypedObjectUtils.entries(this.plugins).map(([name, plugin]) => [name, plugin.loaded ? {
@@ -339,7 +368,7 @@ var OnchainSDK = class extends require_sdk_base_ChainContractsRegister.ChainCont
 			}
 			this.#currentBlock = blockNumber;
 			this.#timestamp = timestamp;
-			await this.marketRegister.syncState(ignoreUpdateablePrices);
+			if (await this.marketRegister.syncState(ignoreUpdateablePrices, this.#rwa.getSyncMulticalls())) await this.#warmup(true);
 			const pluginsList = require_sdk_utils_mappers.TypedObjectUtils.entries(this.plugins);
 			(await Promise.allSettled(pluginsList.map(([name, plugin]) => {
 				if (plugin.syncState) {

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

@@ -4,8 +4,10 @@ require("../../constants/addresses.js");
 require("../../constants/index.js");
 const require_sdk_utils_hex = require("../../utils/hex.js");
 require("../../utils/index.js");
+const require_sdk_utils_viem_executeMulticallBatches = require("../../utils/viem/executeMulticallBatches.js");
 const require_sdk_base_BaseContract = require("../../base/BaseContract.js");
 require("../../base/index.js");
+require("../../utils/viem/index.js");
 const require_sdk_accounts_withdrawal_compressor_intent_codec = require("./intent-codec.js");
 let viem = require("viem");
 //#region src/sdk/accounts/withdrawal-compressor/AbstractWithdrawalCompressorContract.ts
@@ -58,37 +60,46 @@ var AbstractWithdrawalCompressorContract = class extends require_sdk_base_BaseCo
 	**/
 	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 require_sdk_utils_AddressMap.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 require_sdk_utils_AddressMap.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 require_sdk_utils_viem_executeMulticallBatches.executeMulticallBatches(this.client, [this.getLoadWithdrawableAssetsMulticall(force)], { blockNumber });
 		return this.getWithdrawableAssets();
 	}
 	/**

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

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_abi_iExpirable = require("../../abi/iExpirable.js");
 const require_abi_iStateSerializer = require("../../abi/iStateSerializer.js");
 const require_abi_iVersion = require("../../abi/iVersion.js");
 const require_sdk_utils_AddressMap = require("../utils/AddressMap.js");
@@ -7,6 +8,7 @@ const require_sdk_utils_bytes32ToString = require("../utils/bytes32ToString.js")
 const require_sdk_chain_chains = require("../chain/chains.js");
 const require_sdk_utils_formatter = require("../utils/formatter.js");
 require("../utils/index.js");
+const require_sdk_utils_viem_executeMulticallBatches = require("../utils/viem/executeMulticallBatches.js");
 //#region src/sdk/base/TokensMeta.ts
 /**
 * Registry of token metadata (symbol, decimals, phantom type) keyed by address.
@@ -63,7 +65,7 @@ var TokensMeta = class extends require_sdk_utils_AddressMap.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::");
 	}
 	/**
@@ -168,44 +170,93 @@ var TokensMeta = class extends require_sdk_utils_AddressMap.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 require_sdk_utils_AddressSet.AddressSet(tokens.length > 0 ? tokens : this.keys());
+		const tokensToLoad = Array.from(tokenz.difference(this.#tokenDataLoaded));
+		return {
+			contracts: tokensToLoad.flatMap((t) => [
+				{
+					address: t,
+					abi: require_abi_iVersion.iVersionAbi,
+					functionName: "contractType"
+				},
+				{
+					address: t,
+					abi: require_abi_iStateSerializer.iStateSerializerAbi,
+					functionName: "serialize"
+				},
+				{
+					address: t,
+					abi: require_abi_iExpirable.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 require_sdk_utils_AddressSet.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: require_abi_iVersion.iVersionAbi,
-				functionName: "contractType"
-			}, {
-				address: t,
-				abi: require_abi_iStateSerializer.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 require_sdk_utils_viem_executeMulticallBatches.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 = require_sdk_utils_bytes32ToString.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/cjs/sdk/index.js

@@ -31,6 +31,7 @@ const require_sdk_utils_zod = require("./utils/zod.js");
 require("./utils/index.js");
 const require_sdk_utils_viem_cast = require("./utils/viem/cast.js");
 const require_sdk_utils_viem_simulateCall = require("./utils/viem/simulateCall.js");
+const require_sdk_utils_viem_executeMulticallBatches = require("./utils/viem/executeMulticallBatches.js");
 const require_sdk_base_TokensMeta = require("./base/TokensMeta.js");
 const require_sdk_base_ChainContractsRegister = require("./base/ChainContractsRegister.js");
 const require_sdk_base_Construct = require("./base/Construct.js");
@@ -348,6 +349,7 @@ exports.estimateRawTxGas = require_sdk_utils_viem_sendRawTx.estimateRawTxGas;
 exports.etherscanApiUrl = require_sdk_utils_etherscan.etherscanApiUrl;
 exports.etherscanUrl = require_sdk_utils_etherscan.etherscanUrl;
 exports.executeDelegatedMulticalls = require_sdk_utils_viem_executeDelegatedMulticalls.executeDelegatedMulticalls;
+exports.executeMulticallBatches = require_sdk_utils_viem_executeMulticallBatches.executeMulticallBatches;
 exports.expectedBalanceDeltas = require_sdk_market_credit_expectedBalanceDeltas.expectedBalanceDeltas;
 exports.fetchRedstonePayloads = require_sdk_market_pricefeeds_updates_fetchRedstonePayloads.fetchRedstonePayloads;
 exports.filterDust = require_sdk_utils_filterDust.filterDust;

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

@@ -95,29 +95,38 @@ var MarketRegister = class extends require_sdk_market_ZapperRegister.ZapperRegis
 	* 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 require_sdk_utils_viem_executeDelegatedMulticalls.executeDelegatedMulticalls(this.client, multicalls, {
 			priceUpdates: txs,
 			blockNumber: this.sdk.currentBlock,
 			gas: this.sdk.gasLimit
 		});
+		return dirty;
 	}
 	#getOracleSyncMulticalls(oracles) {
 		const uniqOracles = new require_sdk_utils_AddressMap.AddressMap();

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

@@ -5,53 +5,84 @@ 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_utils_viem_executeMulticallBatches = require("../utils/viem/executeMulticallBatches.js");
 const require_sdk_base_SDKConstruct = require("../base/SDKConstruct.js");
 require("../base/index.js");
 const require_abi_compressors_peripheryCompressor = require("../../abi/compressors/peripheryCompressor.js");
+require("../utils/viem/index.js");
 const require_sdk_market_zapper_createZapper = require("./zapper/createZapper.js");
 require("./zapper/index.js");
 //#region src/sdk/market/ZapperRegister.ts
 var ZapperRegister = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	/**
 	* Mapping pool.address -> Zapper[]
-	* Needs to be loaded explicitly using loadZappers method
+	* Loaded during SDK attach, or restored by hydration
 	*/
 	#zappers;
 	/**
-	* Load zappers for all pools using periphery compressor, adds hardcoded zappers
-	*/
-	async loadZappers(force) {
-		if (!force && this.#zappers) return;
-		const [pcAddr] = this.sdk.addressProvider.mustGetLatest(require_sdk_constants_address_provider.AP_PERIPHERY_COMPRESSOR, require_sdk_constants_versions.VERSION_RANGE_310);
+	* @internal
+	*
+	* Returns the multicall batch that loads zappers of all pools from the
+	* periphery compressor. Used by the SDK to warm this cache together with
+	* other loaders in a single multicall.
+	*
+	* Returns an empty batch when zappers are already loaded and `force` is not set.
+	*
+	* @param force - reload zappers even when they are already loaded
+	**/
+	getLoadZappersMulticall(force) {
+		if (!force && this.#zappers) return {
+			contracts: [],
+			onResults: () => {}
+		};
+		this.#zappers = new require_sdk_utils_AddressMap.AddressMap(void 0, "zappers");
+		const compressor = this.sdk.addressProvider.getLatest(require_sdk_constants_address_provider.AP_PERIPHERY_COMPRESSOR, require_sdk_constants_versions.VERSION_RANGE_310);
+		if (!compressor) {
+			this.logger?.warn("no periphery compressor on this chain, skipping zappers");
+			return {
+				contracts: [],
+				onResults: () => {}
+			};
+		}
+		const [pcAddr] = compressor;
 		this.logger?.debug(`loading zappers with periphery compressor ${pcAddr}`);
 		const markets = this.sdk.marketRegister.markets;
-		const resp = await this.client.multicall({
+		return {
 			contracts: markets.map((m) => ({
 				abi: require_abi_compressors_peripheryCompressor.peripheryCompressorAbi,
 				address: pcAddr,
 				functionName: "getZappers",
 				args: [m.configurator.address, m.pool.pool.address]
 			})),
-			allowFailure: true,
-			batchSize: 0
-		});
-		this.#zappers = new require_sdk_utils_AddressMap.AddressMap(void 0, "zappers");
-		for (let i = 0; i < resp.length; i++) {
-			const { status, result, error } = resp[i];
-			const marketConfigurator = markets[i].configurator.address;
-			const pool = markets[i].pool.pool.address;
-			if (status === "success") for (const z of result) this.#addZapper({
-				...z,
-				pool,
-				type: "base"
-			});
-			else this.logger?.error(`failed to load zapper for market configurator ${this.labelAddress(marketConfigurator)} and pool ${this.labelAddress(pool)}: ${error}`);
-		}
+			onResults: (resps) => {
+				for (let i = 0; i < resps.length; i++) {
+					const { status, result, error } = resps[i];
+					const marketConfigurator = markets[i].configurator.address;
+					const pool = markets[i].pool.pool.address;
+					if (status === "success") for (const z of result) this.#addZapper({
+						...z,
+						pool,
+						type: "base"
+					});
+					else this.logger?.error(`failed to load zapper for market configurator ${this.labelAddress(marketConfigurator)} and pool ${this.labelAddress(pool)}: ${error}`);
+				}
+			}
+		};
+	}
+	/**
+	* Load zappers for all pools using periphery compressor, adds hardcoded zappers
+	*
+	* Zappers loaded during SDK attach or restored by hydration are kept unless
+	* `force` is set, so calling this after either is a no-op.
+	*/
+	async loadZappers(force) {
+		await require_sdk_utils_viem_executeMulticallBatches.executeMulticallBatches(this.client, [this.getLoadZappersMulticall(force)]);
 	}
 	/**
 	* Serializable snapshot of all loaded zappers, suitable for hydration.
-	* Returns `undefined` when zappers were never loaded (i.e. `loadZappers` was
-	* not called), so the not-loaded state round-trips cleanly.
+	* Returns `undefined` when zappers were never loaded (i.e. the SDK was
+	* attached without market configurators), so the not-loaded state round-trips
+	* cleanly.
 	**/
 	get zappersState() {
 		if (!this.#zappers) return;
@@ -103,7 +134,7 @@ var ZapperRegister = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 		}
 	}
 	get zappers() {
-		if (!this.#zappers) throw new Error("zappers not loaded, call loadZappers first");
+		if (!this.#zappers) throw new Error("zappers are not loaded, check if the sdk was properly attached or hydrated");
 		return this.#zappers;
 	}
 	poolZappers(pool) {

package/dist/cjs/sdk/market/rwa/RWARegistry.js

@@ -25,6 +25,11 @@ var RWARegistry = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	#state;
 	#factories = new require_sdk_utils_AddressMap.AddressMap();
 	/**
+	* Factories requested during attach; `undefined` when the registry was
+	* hydrated instead, in which case the request was never made on this instance.
+	**/
+	#requestedFactories;
+	/**
 	* @internal
 	*
 	* Returns delegated multicalls for loading all RWA underlying tokens from the on-chain RWA compressor.
@@ -34,6 +39,7 @@ var RWARegistry = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	* @param rwaFactories - RWA factory contracts to query.
 	*/
 	getLoadMulticalls(configurators, rwaFactories = []) {
+		this.#requestedFactories = rwaFactories;
 		if (!rwaFactories.length) return [];
 		const [rwaCompressorAddress] = this.sdk.addressProvider.mustGetLatest(require_sdk_constants_address_provider.AP_RWA_COMPRESSOR, require_sdk_constants_versions.VERSION_RANGE_310);
 		return [{
@@ -47,6 +53,22 @@ var RWARegistry = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 		}];
 	}
 	/**
+	* @internal
+	*
+	* Returns delegated multicalls that refresh the RWA state. Unlike the other
+	* warmed caches, RWA data carries values that change between blocks (e.g. the
+	* deposit allowance and claimable amount of an on-demand liquidity provider),
+	* so it is refreshed on every SDK sync.
+	*
+	* Factories are the ones requested during attach; after hydration the chain
+	* defaults are used, since the snapshot does not carry the requested list.
+	* An attach that explicitly requested no factories stays disabled.
+	**/
+	getSyncMulticalls() {
+		const factories = this.#requestedFactories ?? this.sdk.chain.rwaFactories;
+		return this.getLoadMulticalls([...this.sdk.marketRegister.marketFilter.configurators], factories);
+	}
+	/**
 	* Fetches decoded investor data from the on-chain RWA compressor.
 	*
 	* Each factory produces its own investor data (e.g. registered tokens,

package/dist/cjs/sdk/options.js

@@ -61,11 +61,7 @@ const attachOptionsSchema = zod_v4.z.object({
 	/**
 	* Options for Redstone price-feed updates.
 	**/
-	redstone: require_sdk_market_pricefeeds_updates_RedstoneUpdater.RedstoneOptions.optional(),
-	/**
-	* When `true`, automatically load zappers during attach.
-	**/
-	loadZappers: zod_v4.z.boolean().optional()
+	redstone: require_sdk_market_pricefeeds_updates_RedstoneUpdater.RedstoneOptions.optional()
 });
 //#endregion
 exports.attachOptionsSchema = attachOptionsSchema;