@talismn/balances 0.0.0-pr2075-20250710071608 → 0.0.0-pr2075-20250710094113

package/dist/talismn-balances.cjs.dev.js

@@ -2570,7 +2570,7 @@ const deriveMiniMetadataId = ({
   source,
   chainId,
   specVersion
-}) => scale.toHex(scale.Twox64Concat(new TextEncoder().encode(`${source}${chainId}${specVersion}${chaindataProvider.MINIMETADATA_VERSION}`))).slice(-64);
+}) => scale.toHex(scale.Twox128(new TextEncoder().encode(`${source}${chainId}${specVersion}${chaindataProvider.MINIMETADATA_VERSION}`))).slice(-32);
 
 const getMiniMetadata$5 = ({
   networkId,
@@ -3572,11 +3572,11 @@ const fetchStakeInfoByAddress = async (connector, networkId, miniMetadata, addre
 
 // assume dynamic info doesnt change over the course of a browser session
 const dynamicInfoCache = new Map();
-const getCacheKey = (networkId, netuid) => `${networkId}:${netuid}`;
+const getCacheKey$1 = (networkId, netuid) => `${networkId}:${netuid}`;
 const fetchDynamicInfoByNetuid = async (connector, networkId, miniMetadata, uniqueNetuids) => {
   const fetchInfo = async netuid => {
     if (netuid === SUBTENSOR_ROOT_NETUID) return null;
-    const cacheKey = getCacheKey(networkId, netuid);
+    const cacheKey = getCacheKey$1(networkId, netuid);
     if (!dynamicInfoCache.has(cacheKey)) {
       await viem.withRetry(async () => {
         const result = await fetchRuntimeCallResult(connector, networkId, miniMetadata.data, "SubnetInfoRuntimeApi", "get_dynamic_info", [netuid]);
@@ -6192,42 +6192,37 @@ const getSpecVersion = async (chainConnector, networkId) => {
   }
 };
 
-// share requests as all modules will call this at once
+const getCacheKey = (networkId, specVersion) => `${networkId}:${specVersion}`;
 const CACHE = new Map();
 
 // ensures we dont fetch miniMetadatas on more than 4 chains at once
 const POOL = new PQueue__default.default({
   concurrency: 4
 });
-const getMiniMetadatas = async (chainConnector, chaindataProvider, networkId, specVersion, signal) => {
-  if (CACHE.has(networkId)) return CACHE.get(networkId);
-  if (!signal) log.warn("[miniMetadata] getMiniMetadatas called without signal, this may hang the updates", new Error("No signal provided") // this will show the stack trace so the culprit can fix it
-  );
+const getMiniMetadatas = async (chainConnector, chaindataProvider, networkId, specVersion) => {
   if (specVersion === undefined) specVersion = await getSpecVersion(chainConnector, networkId);
-  const pResult = POOL.add(() => fetchMiniMetadatas(chainConnector, chaindataProvider, networkId, specVersion), {
-    signal
-  });
-  CACHE.set(networkId, pResult);
+  const cacheKey = getCacheKey(networkId, specVersion);
+  if (CACHE.has(cacheKey)) return CACHE.get(cacheKey);
+  const pResult = POOL.add(() => fetchMiniMetadatas(chainConnector, chaindataProvider, networkId, specVersion));
+
+  // keep the results in cache (unless call fails) as observables call this function a lot of times
+  CACHE.set(cacheKey, pResult);
   try {
     return await pResult;
   } catch (cause) {
-    if (util.isAbortError(cause)) throw cause;
+    CACHE.delete(cacheKey);
     throw new Error(`Failed to fetch metadataRpc for network ${networkId}`, {
       cause
     });
-  } finally {
-    CACHE.delete(networkId);
   }
 };
-const fetchMiniMetadatas = async (chainConnector, chaindataProvider, chainId, specVersion, signal) => {
+const fetchMiniMetadatas = async (chainConnector, chaindataProvider, chainId, specVersion) => {
   const start = performance.now();
   log.info("[miniMetadata] fetching minimetadatas for %s", chainId);
   try {
     const network = await chaindataProvider.getNetworkById(chainId, "polkadot");
     if (!network) throw new Error(`Network ${chainId} not found in chaindataProvider`);
-    signal?.throwIfAborted();
     const metadataRpc = await getMetadataRpc(chainConnector, chainId);
-    signal?.throwIfAborted();
     return Promise.all(BALANCE_MODULES.filter(m => m.platform === "polkadot").map(mod => mod.getMiniMetadata({
       networkId: chainId,
       metadataRpc,
@@ -6264,6 +6259,9 @@ class BalancesProvider {
       miniMetadatas: lodashEs.values(miniMetadatas).filter(util.isNotNil)
     })));
   }
+  get storedMiniMetadataMapById$() {
+    return this.#storage.pipe(rxjs.map(storage => lodashEs.keyBy(storage.miniMetadatas, m => m.id)), rxjs.distinctUntilChanged(lodashEs.isEqual), rxjs.shareReplay(1));
+  }
 
   // this is the only public method
   getBalances$(addressesByTokenId) {
@@ -6393,46 +6391,52 @@ class BalancesProvider {
     return this.#chaindataProvider.getNetworkById$(networkId).pipe(rxjs.switchMap(network => chaindataProvider.isNetworkDot(network) && this.#chainConnectors.substrate ? rxjs.from(getSpecVersion(this.#chainConnectors.substrate, networkId)).pipe(rxjs.switchMap(specVersion => this.getMiniMetadatas$(networkId, specVersion))) : rxjs.of([])));
   }
   getMiniMetadatas$(networkId, specVersion) {
-    return new rxjs.Observable(subscriber => {
-      const controller = new AbortController();
-      const subscription = rxjs.combineLatest({
-        defaultMiniMetadatas: this.getDefaultMiniMetadatas$(networkId, specVersion),
-        storedMiniMetadatas: this.getStoredMiniMetadatas$(networkId, specVersion)
-      }).pipe(rxjs.switchMap(({
-        storedMiniMetadatas,
-        defaultMiniMetadatas
-      }) => {
-        if (defaultMiniMetadatas.length) return rxjs.of(defaultMiniMetadatas);
-        if (storedMiniMetadatas.length) return rxjs.of(storedMiniMetadatas);
-        if (!this.#chainConnectors.substrate) return rxjs.of([]);
-        return rxjs.from(
-        // fetch them from the chain
-        getMiniMetadatas(this.#chainConnectors.substrate, this.#chaindataProvider, networkId, specVersion, controller.signal)).pipe(
-        // and persist in storage for later reuse
-        rxjs.tap(newMiniMetadatas => {
-          if (!newMiniMetadatas.length) return;
-          const storage = this.#storage.getValue();
-          const miniMetadatas = lodashEs.assign(
-          // keep minimetadatas of other networks
-          lodashEs.keyBy(lodashEs.values(storage.miniMetadatas).filter(m => m.chainId !== networkId), m => m.id),
-          // add the ones for our network
-          lodashEs.keyBy(newMiniMetadatas, m => m.id));
-          this.#storage.next(lodashEs.assign({}, storage, {
-            miniMetadatas
-          }));
+    const miniMetadataIds = BALANCE_MODULES.filter(mod => mod.platform === "polkadot").map(mod => deriveMiniMetadataId({
+      chainId: networkId,
+      specVersion,
+      source: mod.type
+    }));
+    return rxjs.combineLatest({
+      defaultMiniMetadatas: this.getDefaultMiniMetadatas$(miniMetadataIds),
+      storedMiniMetadatas: this.getStoredMiniMetadatas$(miniMetadataIds)
+    }).pipe(rxjs.switchMap(({
+      storedMiniMetadatas,
+      defaultMiniMetadatas
+    }) => {
+      if (defaultMiniMetadatas) return rxjs.of(defaultMiniMetadatas);
+      if (storedMiniMetadatas) return rxjs.of(storedMiniMetadatas);
+      if (!this.#chainConnectors.substrate) return rxjs.of([]);
+      return rxjs.from(getMiniMetadatas(this.#chainConnectors.substrate, this.#chaindataProvider, networkId, specVersion)).pipe(
+      // and persist in storage for later reuse
+      rxjs.tap(newMiniMetadatas => {
+        if (!newMiniMetadatas.length) return;
+        const storage = this.#storage.getValue();
+        const miniMetadatas = lodashEs.assign(
+        // keep minimetadatas of other networks
+        lodashEs.keyBy(lodashEs.values(storage.miniMetadatas).filter(m => m.chainId !== networkId), m => m.id),
+        // add the ones for our network
+        lodashEs.keyBy(newMiniMetadatas, m => m.id));
+        this.#storage.next(lodashEs.assign({}, storage, {
+          miniMetadatas
         }));
-      })).subscribe(subscriber);
-      return () => {
-        subscription.unsubscribe();
-        controller.abort();
-      };
-    });
-  }
-  getStoredMiniMetadatas$(networkId, specVersion) {
-    return this.storage$.pipe(rxjs.map(storage => storage.miniMetadatas.filter(m => m.chainId === networkId && m.specVersion === specVersion && m.version === chaindataProvider.MINIMETADATA_VERSION)), rxjs.distinctUntilChanged(lodashEs.isEqual));
-  }
-  getDefaultMiniMetadatas$(networkId, specVersion) {
-    return this.#chaindataProvider.miniMetadatas$.pipe(rxjs.map(miniMetadatas => miniMetadatas.filter(m => m.chainId === networkId && m.specVersion === specVersion && m.version === chaindataProvider.MINIMETADATA_VERSION)), rxjs.distinctUntilChanged(lodashEs.isEqual));
+      }));
+    }),
+    // emit only when mini metadata changes, as a change here would restart all subscriptions for the network
+    rxjs.distinctUntilChanged(lodashEs.isEqual));
+  }
+  getStoredMiniMetadatas$(miniMetadataIds) {
+    return this.storedMiniMetadataMapById$.pipe(rxjs.map(mapById => {
+      const miniMetadatas = miniMetadataIds.map(id => mapById[id]);
+      return miniMetadatas.length && miniMetadatas.every(util.isTruthy) ? miniMetadatas : null;
+    }),
+    // source changes very often
+    rxjs.distinctUntilChanged(lodashEs.isEqual));
+  }
+  getDefaultMiniMetadatas$(miniMetadataIds) {
+    return this.#chaindataProvider.miniMetadatasMapById$.pipe(rxjs.map(mapById => {
+      const miniMetadatas = miniMetadataIds.map(id => mapById[id]);
+      return miniMetadatas.length && miniMetadatas.every(util.isTruthy) ? miniMetadatas : null;
+    }));
   }
   getStoredBalances(addressesByToken) {
     const balanceDefs = lodashEs.toPairs(addressesByToken).flatMap(([tokenId, addresses]) => addresses.map(address => [tokenId, address]));

package/dist/talismn-balances.cjs.prod.js

@@ -2570,7 +2570,7 @@ const deriveMiniMetadataId = ({
   source,
   chainId,
   specVersion
-}) => scale.toHex(scale.Twox64Concat(new TextEncoder().encode(`${source}${chainId}${specVersion}${chaindataProvider.MINIMETADATA_VERSION}`))).slice(-64);
+}) => scale.toHex(scale.Twox128(new TextEncoder().encode(`${source}${chainId}${specVersion}${chaindataProvider.MINIMETADATA_VERSION}`))).slice(-32);
 
 const getMiniMetadata$5 = ({
   networkId,
@@ -3572,11 +3572,11 @@ const fetchStakeInfoByAddress = async (connector, networkId, miniMetadata, addre
 
 // assume dynamic info doesnt change over the course of a browser session
 const dynamicInfoCache = new Map();
-const getCacheKey = (networkId, netuid) => `${networkId}:${netuid}`;
+const getCacheKey$1 = (networkId, netuid) => `${networkId}:${netuid}`;
 const fetchDynamicInfoByNetuid = async (connector, networkId, miniMetadata, uniqueNetuids) => {
   const fetchInfo = async netuid => {
     if (netuid === SUBTENSOR_ROOT_NETUID) return null;
-    const cacheKey = getCacheKey(networkId, netuid);
+    const cacheKey = getCacheKey$1(networkId, netuid);
     if (!dynamicInfoCache.has(cacheKey)) {
       await viem.withRetry(async () => {
         const result = await fetchRuntimeCallResult(connector, networkId, miniMetadata.data, "SubnetInfoRuntimeApi", "get_dynamic_info", [netuid]);
@@ -6192,42 +6192,37 @@ const getSpecVersion = async (chainConnector, networkId) => {
   }
 };
 
-// share requests as all modules will call this at once
+const getCacheKey = (networkId, specVersion) => `${networkId}:${specVersion}`;
 const CACHE = new Map();
 
 // ensures we dont fetch miniMetadatas on more than 4 chains at once
 const POOL = new PQueue__default.default({
   concurrency: 4
 });
-const getMiniMetadatas = async (chainConnector, chaindataProvider, networkId, specVersion, signal) => {
-  if (CACHE.has(networkId)) return CACHE.get(networkId);
-  if (!signal) log.warn("[miniMetadata] getMiniMetadatas called without signal, this may hang the updates", new Error("No signal provided") // this will show the stack trace so the culprit can fix it
-  );
+const getMiniMetadatas = async (chainConnector, chaindataProvider, networkId, specVersion) => {
   if (specVersion === undefined) specVersion = await getSpecVersion(chainConnector, networkId);
-  const pResult = POOL.add(() => fetchMiniMetadatas(chainConnector, chaindataProvider, networkId, specVersion), {
-    signal
-  });
-  CACHE.set(networkId, pResult);
+  const cacheKey = getCacheKey(networkId, specVersion);
+  if (CACHE.has(cacheKey)) return CACHE.get(cacheKey);
+  const pResult = POOL.add(() => fetchMiniMetadatas(chainConnector, chaindataProvider, networkId, specVersion));
+
+  // keep the results in cache (unless call fails) as observables call this function a lot of times
+  CACHE.set(cacheKey, pResult);
   try {
     return await pResult;
   } catch (cause) {
-    if (util.isAbortError(cause)) throw cause;
+    CACHE.delete(cacheKey);
     throw new Error(`Failed to fetch metadataRpc for network ${networkId}`, {
       cause
     });
-  } finally {
-    CACHE.delete(networkId);
   }
 };
-const fetchMiniMetadatas = async (chainConnector, chaindataProvider, chainId, specVersion, signal) => {
+const fetchMiniMetadatas = async (chainConnector, chaindataProvider, chainId, specVersion) => {
   const start = performance.now();
   log.info("[miniMetadata] fetching minimetadatas for %s", chainId);
   try {
     const network = await chaindataProvider.getNetworkById(chainId, "polkadot");
     if (!network) throw new Error(`Network ${chainId} not found in chaindataProvider`);
-    signal?.throwIfAborted();
     const metadataRpc = await getMetadataRpc(chainConnector, chainId);
-    signal?.throwIfAborted();
     return Promise.all(BALANCE_MODULES.filter(m => m.platform === "polkadot").map(mod => mod.getMiniMetadata({
       networkId: chainId,
       metadataRpc,
@@ -6264,6 +6259,9 @@ class BalancesProvider {
       miniMetadatas: lodashEs.values(miniMetadatas).filter(util.isNotNil)
     })));
   }
+  get storedMiniMetadataMapById$() {
+    return this.#storage.pipe(rxjs.map(storage => lodashEs.keyBy(storage.miniMetadatas, m => m.id)), rxjs.distinctUntilChanged(lodashEs.isEqual), rxjs.shareReplay(1));
+  }
 
   // this is the only public method
   getBalances$(addressesByTokenId) {
@@ -6393,46 +6391,52 @@ class BalancesProvider {
     return this.#chaindataProvider.getNetworkById$(networkId).pipe(rxjs.switchMap(network => chaindataProvider.isNetworkDot(network) && this.#chainConnectors.substrate ? rxjs.from(getSpecVersion(this.#chainConnectors.substrate, networkId)).pipe(rxjs.switchMap(specVersion => this.getMiniMetadatas$(networkId, specVersion))) : rxjs.of([])));
   }
   getMiniMetadatas$(networkId, specVersion) {
-    return new rxjs.Observable(subscriber => {
-      const controller = new AbortController();
-      const subscription = rxjs.combineLatest({
-        defaultMiniMetadatas: this.getDefaultMiniMetadatas$(networkId, specVersion),
-        storedMiniMetadatas: this.getStoredMiniMetadatas$(networkId, specVersion)
-      }).pipe(rxjs.switchMap(({
-        storedMiniMetadatas,
-        defaultMiniMetadatas
-      }) => {
-        if (defaultMiniMetadatas.length) return rxjs.of(defaultMiniMetadatas);
-        if (storedMiniMetadatas.length) return rxjs.of(storedMiniMetadatas);
-        if (!this.#chainConnectors.substrate) return rxjs.of([]);
-        return rxjs.from(
-        // fetch them from the chain
-        getMiniMetadatas(this.#chainConnectors.substrate, this.#chaindataProvider, networkId, specVersion, controller.signal)).pipe(
-        // and persist in storage for later reuse
-        rxjs.tap(newMiniMetadatas => {
-          if (!newMiniMetadatas.length) return;
-          const storage = this.#storage.getValue();
-          const miniMetadatas = lodashEs.assign(
-          // keep minimetadatas of other networks
-          lodashEs.keyBy(lodashEs.values(storage.miniMetadatas).filter(m => m.chainId !== networkId), m => m.id),
-          // add the ones for our network
-          lodashEs.keyBy(newMiniMetadatas, m => m.id));
-          this.#storage.next(lodashEs.assign({}, storage, {
-            miniMetadatas
-          }));
+    const miniMetadataIds = BALANCE_MODULES.filter(mod => mod.platform === "polkadot").map(mod => deriveMiniMetadataId({
+      chainId: networkId,
+      specVersion,
+      source: mod.type
+    }));
+    return rxjs.combineLatest({
+      defaultMiniMetadatas: this.getDefaultMiniMetadatas$(miniMetadataIds),
+      storedMiniMetadatas: this.getStoredMiniMetadatas$(miniMetadataIds)
+    }).pipe(rxjs.switchMap(({
+      storedMiniMetadatas,
+      defaultMiniMetadatas
+    }) => {
+      if (defaultMiniMetadatas) return rxjs.of(defaultMiniMetadatas);
+      if (storedMiniMetadatas) return rxjs.of(storedMiniMetadatas);
+      if (!this.#chainConnectors.substrate) return rxjs.of([]);
+      return rxjs.from(getMiniMetadatas(this.#chainConnectors.substrate, this.#chaindataProvider, networkId, specVersion)).pipe(
+      // and persist in storage for later reuse
+      rxjs.tap(newMiniMetadatas => {
+        if (!newMiniMetadatas.length) return;
+        const storage = this.#storage.getValue();
+        const miniMetadatas = lodashEs.assign(
+        // keep minimetadatas of other networks
+        lodashEs.keyBy(lodashEs.values(storage.miniMetadatas).filter(m => m.chainId !== networkId), m => m.id),
+        // add the ones for our network
+        lodashEs.keyBy(newMiniMetadatas, m => m.id));
+        this.#storage.next(lodashEs.assign({}, storage, {
+          miniMetadatas
         }));
-      })).subscribe(subscriber);
-      return () => {
-        subscription.unsubscribe();
-        controller.abort();
-      };
-    });
-  }
-  getStoredMiniMetadatas$(networkId, specVersion) {
-    return this.storage$.pipe(rxjs.map(storage => storage.miniMetadatas.filter(m => m.chainId === networkId && m.specVersion === specVersion && m.version === chaindataProvider.MINIMETADATA_VERSION)), rxjs.distinctUntilChanged(lodashEs.isEqual));
-  }
-  getDefaultMiniMetadatas$(networkId, specVersion) {
-    return this.#chaindataProvider.miniMetadatas$.pipe(rxjs.map(miniMetadatas => miniMetadatas.filter(m => m.chainId === networkId && m.specVersion === specVersion && m.version === chaindataProvider.MINIMETADATA_VERSION)), rxjs.distinctUntilChanged(lodashEs.isEqual));
+      }));
+    }),
+    // emit only when mini metadata changes, as a change here would restart all subscriptions for the network
+    rxjs.distinctUntilChanged(lodashEs.isEqual));
+  }
+  getStoredMiniMetadatas$(miniMetadataIds) {
+    return this.storedMiniMetadataMapById$.pipe(rxjs.map(mapById => {
+      const miniMetadatas = miniMetadataIds.map(id => mapById[id]);
+      return miniMetadatas.length && miniMetadatas.every(util.isTruthy) ? miniMetadatas : null;
+    }),
+    // source changes very often
+    rxjs.distinctUntilChanged(lodashEs.isEqual));
+  }
+  getDefaultMiniMetadatas$(miniMetadataIds) {
+    return this.#chaindataProvider.miniMetadatasMapById$.pipe(rxjs.map(mapById => {
+      const miniMetadatas = miniMetadataIds.map(id => mapById[id]);
+      return miniMetadatas.length && miniMetadatas.every(util.isTruthy) ? miniMetadatas : null;
+    }));
   }
   getStoredBalances(addressesByToken) {
     const balanceDefs = lodashEs.toPairs(addressesByToken).flatMap(([tokenId, addresses]) => addresses.map(address => [tokenId, address]));

package/dist/talismn-balances.esm.js

@@ -1,12 +1,12 @@
 import { EvmErc20TokenSchema, parseTokenId, parseEvmErc20TokenId, evmErc20TokenId, isTokenOfType, TokenBaseSchema, EvmNativeTokenSchema, evmNativeTokenId, EvmUniswapV2TokenSchema, evmUniswapV2TokenId, SubAssetsTokenSchema, subAssetTokenId, MINIMETADATA_VERSION, SubForeignAssetsTokenSchema, subForeignAssetTokenId, SubHydrationTokenSchema, subHydrationTokenId, SubNativeTokenSchema, subNativeTokenId, SubPsp22TokenSchema, subPsp22TokenId, SubTokensTokenSchema, subTokensTokenId, isNetworkDot } from '@talismn/chaindata-provider';
 export { MINIMETADATA_VERSION } from '@talismn/chaindata-provider';
-import { isEthereumAddress, isNotNil, BigMath, isArrayOf, isBigInt, planckToTokens, isAbortError, getSharedObservable } from '@talismn/util';
+import { isEthereumAddress, isNotNil, BigMath, isArrayOf, isBigInt, planckToTokens, isAbortError, getSharedObservable, isTruthy } from '@talismn/util';
 import { parseAbi, erc20Abi, getContract, ContractFunctionExecutionError, hexToString, erc20Abi_bytes32, encodeFunctionData, withRetry } from 'viem';
 import { assign, omit, isEqual, keyBy, keys, uniq, fromPairs, values, toPairs } from 'lodash-es';
 import z from 'zod/v4';
 import anylogger from 'anylogger';
-import { of, Observable, distinctUntilChanged, map, timer, switchMap, from, firstValueFrom, combineLatest, BehaviorSubject, startWith, filter, tap } from 'rxjs';
-import { parseMetadataRpc, toHex, unifyMetadata, decAnyMetadata, getDynamicBuilder, getLookupFn, decodeScale, getStorageKeyPrefix, Twox64Concat, compactMetadata, encodeMetadata, papiParse, papiStringify } from '@talismn/scale';
+import { of, Observable, distinctUntilChanged, map, timer, switchMap, from, firstValueFrom, combineLatest, BehaviorSubject, shareReplay, startWith, filter, tap } from 'rxjs';
+import { parseMetadataRpc, toHex, unifyMetadata, decAnyMetadata, getDynamicBuilder, getLookupFn, decodeScale, getStorageKeyPrefix, Twox128, compactMetadata, encodeMetadata, papiParse, papiStringify } from '@talismn/scale';
 import { newTokenRates } from '@talismn/token-rates';
 import BigNumber from 'bignumber.js';
 import { mergeUint8 } from '@polkadot-api/utils';
@@ -2561,7 +2561,7 @@ const deriveMiniMetadataId = ({
   source,
   chainId,
   specVersion
-}) => toHex(Twox64Concat(new TextEncoder().encode(`${source}${chainId}${specVersion}${MINIMETADATA_VERSION}`))).slice(-64);
+}) => toHex(Twox128(new TextEncoder().encode(`${source}${chainId}${specVersion}${MINIMETADATA_VERSION}`))).slice(-32);
 
 const getMiniMetadata$5 = ({
   networkId,
@@ -3563,11 +3563,11 @@ const fetchStakeInfoByAddress = async (connector, networkId, miniMetadata, addre
 
 // assume dynamic info doesnt change over the course of a browser session
 const dynamicInfoCache = new Map();
-const getCacheKey = (networkId, netuid) => `${networkId}:${netuid}`;
+const getCacheKey$1 = (networkId, netuid) => `${networkId}:${netuid}`;
 const fetchDynamicInfoByNetuid = async (connector, networkId, miniMetadata, uniqueNetuids) => {
   const fetchInfo = async netuid => {
     if (netuid === SUBTENSOR_ROOT_NETUID) return null;
-    const cacheKey = getCacheKey(networkId, netuid);
+    const cacheKey = getCacheKey$1(networkId, netuid);
     if (!dynamicInfoCache.has(cacheKey)) {
       await withRetry(async () => {
         const result = await fetchRuntimeCallResult(connector, networkId, miniMetadata.data, "SubnetInfoRuntimeApi", "get_dynamic_info", [netuid]);
@@ -6183,42 +6183,37 @@ const getSpecVersion = async (chainConnector, networkId) => {
   }
 };
 
-// share requests as all modules will call this at once
+const getCacheKey = (networkId, specVersion) => `${networkId}:${specVersion}`;
 const CACHE = new Map();
 
 // ensures we dont fetch miniMetadatas on more than 4 chains at once
 const POOL = new PQueue({
   concurrency: 4
 });
-const getMiniMetadatas = async (chainConnector, chaindataProvider, networkId, specVersion, signal) => {
-  if (CACHE.has(networkId)) return CACHE.get(networkId);
-  if (!signal) log.warn("[miniMetadata] getMiniMetadatas called without signal, this may hang the updates", new Error("No signal provided") // this will show the stack trace so the culprit can fix it
-  );
+const getMiniMetadatas = async (chainConnector, chaindataProvider, networkId, specVersion) => {
   if (specVersion === undefined) specVersion = await getSpecVersion(chainConnector, networkId);
-  const pResult = POOL.add(() => fetchMiniMetadatas(chainConnector, chaindataProvider, networkId, specVersion), {
-    signal
-  });
-  CACHE.set(networkId, pResult);
+  const cacheKey = getCacheKey(networkId, specVersion);
+  if (CACHE.has(cacheKey)) return CACHE.get(cacheKey);
+  const pResult = POOL.add(() => fetchMiniMetadatas(chainConnector, chaindataProvider, networkId, specVersion));
+
+  // keep the results in cache (unless call fails) as observables call this function a lot of times
+  CACHE.set(cacheKey, pResult);
   try {
     return await pResult;
   } catch (cause) {
-    if (isAbortError(cause)) throw cause;
+    CACHE.delete(cacheKey);
     throw new Error(`Failed to fetch metadataRpc for network ${networkId}`, {
       cause
     });
-  } finally {
-    CACHE.delete(networkId);
   }
 };
-const fetchMiniMetadatas = async (chainConnector, chaindataProvider, chainId, specVersion, signal) => {
+const fetchMiniMetadatas = async (chainConnector, chaindataProvider, chainId, specVersion) => {
   const start = performance.now();
   log.info("[miniMetadata] fetching minimetadatas for %s", chainId);
   try {
     const network = await chaindataProvider.getNetworkById(chainId, "polkadot");
     if (!network) throw new Error(`Network ${chainId} not found in chaindataProvider`);
-    signal?.throwIfAborted();
     const metadataRpc = await getMetadataRpc(chainConnector, chainId);
-    signal?.throwIfAborted();
     return Promise.all(BALANCE_MODULES.filter(m => m.platform === "polkadot").map(mod => mod.getMiniMetadata({
       networkId: chainId,
       metadataRpc,
@@ -6255,6 +6250,9 @@ class BalancesProvider {
       miniMetadatas: values(miniMetadatas).filter(isNotNil)
     })));
   }
+  get storedMiniMetadataMapById$() {
+    return this.#storage.pipe(map(storage => keyBy(storage.miniMetadatas, m => m.id)), distinctUntilChanged(isEqual), shareReplay(1));
+  }
 
   // this is the only public method
   getBalances$(addressesByTokenId) {
@@ -6384,46 +6382,52 @@ class BalancesProvider {
     return this.#chaindataProvider.getNetworkById$(networkId).pipe(switchMap(network => isNetworkDot(network) && this.#chainConnectors.substrate ? from(getSpecVersion(this.#chainConnectors.substrate, networkId)).pipe(switchMap(specVersion => this.getMiniMetadatas$(networkId, specVersion))) : of([])));
   }
   getMiniMetadatas$(networkId, specVersion) {
-    return new Observable(subscriber => {
-      const controller = new AbortController();
-      const subscription = combineLatest({
-        defaultMiniMetadatas: this.getDefaultMiniMetadatas$(networkId, specVersion),
-        storedMiniMetadatas: this.getStoredMiniMetadatas$(networkId, specVersion)
-      }).pipe(switchMap(({
-        storedMiniMetadatas,
-        defaultMiniMetadatas
-      }) => {
-        if (defaultMiniMetadatas.length) return of(defaultMiniMetadatas);
-        if (storedMiniMetadatas.length) return of(storedMiniMetadatas);
-        if (!this.#chainConnectors.substrate) return of([]);
-        return from(
-        // fetch them from the chain
-        getMiniMetadatas(this.#chainConnectors.substrate, this.#chaindataProvider, networkId, specVersion, controller.signal)).pipe(
-        // and persist in storage for later reuse
-        tap(newMiniMetadatas => {
-          if (!newMiniMetadatas.length) return;
-          const storage = this.#storage.getValue();
-          const miniMetadatas = assign(
-          // keep minimetadatas of other networks
-          keyBy(values(storage.miniMetadatas).filter(m => m.chainId !== networkId), m => m.id),
-          // add the ones for our network
-          keyBy(newMiniMetadatas, m => m.id));
-          this.#storage.next(assign({}, storage, {
-            miniMetadatas
-          }));
+    const miniMetadataIds = BALANCE_MODULES.filter(mod => mod.platform === "polkadot").map(mod => deriveMiniMetadataId({
+      chainId: networkId,
+      specVersion,
+      source: mod.type
+    }));
+    return combineLatest({
+      defaultMiniMetadatas: this.getDefaultMiniMetadatas$(miniMetadataIds),
+      storedMiniMetadatas: this.getStoredMiniMetadatas$(miniMetadataIds)
+    }).pipe(switchMap(({
+      storedMiniMetadatas,
+      defaultMiniMetadatas
+    }) => {
+      if (defaultMiniMetadatas) return of(defaultMiniMetadatas);
+      if (storedMiniMetadatas) return of(storedMiniMetadatas);
+      if (!this.#chainConnectors.substrate) return of([]);
+      return from(getMiniMetadatas(this.#chainConnectors.substrate, this.#chaindataProvider, networkId, specVersion)).pipe(
+      // and persist in storage for later reuse
+      tap(newMiniMetadatas => {
+        if (!newMiniMetadatas.length) return;
+        const storage = this.#storage.getValue();
+        const miniMetadatas = assign(
+        // keep minimetadatas of other networks
+        keyBy(values(storage.miniMetadatas).filter(m => m.chainId !== networkId), m => m.id),
+        // add the ones for our network
+        keyBy(newMiniMetadatas, m => m.id));
+        this.#storage.next(assign({}, storage, {
+          miniMetadatas
         }));
-      })).subscribe(subscriber);
-      return () => {
-        subscription.unsubscribe();
-        controller.abort();
-      };
-    });
-  }
-  getStoredMiniMetadatas$(networkId, specVersion) {
-    return this.storage$.pipe(map(storage => storage.miniMetadatas.filter(m => m.chainId === networkId && m.specVersion === specVersion && m.version === MINIMETADATA_VERSION)), distinctUntilChanged(isEqual));
-  }
-  getDefaultMiniMetadatas$(networkId, specVersion) {
-    return this.#chaindataProvider.miniMetadatas$.pipe(map(miniMetadatas => miniMetadatas.filter(m => m.chainId === networkId && m.specVersion === specVersion && m.version === MINIMETADATA_VERSION)), distinctUntilChanged(isEqual));
+      }));
+    }),
+    // emit only when mini metadata changes, as a change here would restart all subscriptions for the network
+    distinctUntilChanged(isEqual));
+  }
+  getStoredMiniMetadatas$(miniMetadataIds) {
+    return this.storedMiniMetadataMapById$.pipe(map(mapById => {
+      const miniMetadatas = miniMetadataIds.map(id => mapById[id]);
+      return miniMetadatas.length && miniMetadatas.every(isTruthy) ? miniMetadatas : null;
+    }),
+    // source changes very often
+    distinctUntilChanged(isEqual));
+  }
+  getDefaultMiniMetadatas$(miniMetadataIds) {
+    return this.#chaindataProvider.miniMetadatasMapById$.pipe(map(mapById => {
+      const miniMetadatas = miniMetadataIds.map(id => mapById[id]);
+      return miniMetadatas.length && miniMetadatas.every(isTruthy) ? miniMetadatas : null;
+    }));
   }
   getStoredBalances(addressesByToken) {
     const balanceDefs = toPairs(addressesByToken).flatMap(([tokenId, addresses]) => addresses.map(address => [tokenId, address]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances",
-  "version": "0.0.0-pr2075-20250710071608",
+  "version": "0.0.0-pr2075-20250710094113",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -34,13 +34,13 @@
     "scale-ts": "^1.6.1",
     "viem": "^2.27.3",
     "zod": "^3.25.62",
-    "@talismn/chain-connector-evm": "0.0.0-pr2075-20250710071608",
-    "@talismn/chaindata-provider": "0.0.0-pr2075-20250710071608",
-    "@talismn/chain-connector": "0.0.0-pr2075-20250710071608",
-    "@talismn/sapi": "0.0.0-pr2075-20250710071608",
-    "@talismn/scale": "0.0.0-pr2075-20250710071608",
-    "@talismn/token-rates": "0.0.0-pr2075-20250710071608",
-    "@talismn/util": "0.0.0-pr2075-20250710071608"
+    "@talismn/chain-connector-evm": "0.0.0-pr2075-20250710094113",
+    "@talismn/chain-connector": "0.0.0-pr2075-20250710094113",
+    "@talismn/chaindata-provider": "0.0.0-pr2075-20250710094113",
+    "@talismn/sapi": "0.0.0-pr2075-20250710094113",
+    "@talismn/scale": "0.0.0-pr2075-20250710094113",
+    "@talismn/util": "0.0.0-pr2075-20250710094113",
+    "@talismn/token-rates": "0.0.0-pr2075-20250710094113"
   },
   "devDependencies": {
     "@polkadot/api-contract": "16.1.2",