@talismn/balances 0.0.0-pr2043-20250619003406 → 0.0.0-pr2043-20250619043542

package/dist/declarations/src/modules/SubstratePsp22Module.d.ts

@@ -10,7 +10,7 @@ export type SubPsp22ModuleConfig = {
         symbol?: string;
         decimals?: number;
         ed?: string;
-        contractAddress?: string;
+        contractAddress: string;
     } & BalancesConfigTokenParams>;
 };
 export type SubPsp22Balance = NewBalanceType<ModuleType, "simple">;

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

@@ -126,7 +126,7 @@ class EvmTokenFetcher {
 
 var pkg = {
 	name: "@talismn/balances",
-	version: "0.0.0-pr2043-20250619003406"};
+	version: "0.0.0-pr2043-20250619043542"};
 
 var log = anylogger__default.default(pkg.name);
 
@@ -406,28 +406,6 @@ class Balance {
   get address() {
     return this.#storage.address;
   }
-
-  // /** @deprecated */
-  // get chainId() {
-  //   return isBalanceEvm(this.#storage) ? undefined : this.#storage.chainId
-  // }
-  // /** @deprecated */
-  // get chain() {
-  //   return (this.#db?.networks && this.networkId && this.#db?.networks[this.networkId]) || null
-  // }
-
-  // /** @deprecated */
-  // get evmNetworkId() {
-  //   return isBalanceEvm(this.#storage) ? this.#storage.evmNetworkId : undefined
-  // }
-  // /** @deprecated */
-  // get evmNetwork() {
-  //   return (
-  //     (this.#db?.networks && this.networkId && this.#db?.networks[this.networkId]) ||
-  //     null
-  //   )
-  // }
-
   get networkId() {
     return this.#storage.networkId;
   }
@@ -3219,7 +3197,7 @@ const SubAssetsModule = hydrate => {
       const controller = new AbortController();
       const pUnsubs = Promise.all(lodash.toPairs(byNetwork).map(async ([networkId, addressesByToken]) => {
         try {
-          const queries = await buildNetworkQueries$1(networkId, chainConnector, chaindataProvider$1, addressesByToken, controller.signal);
+          const queries = await buildNetworkQueries$2(networkId, chainConnector, chaindataProvider$1, addressesByToken, controller.signal);
           if (controller.signal.aborted) return () => {};
           const stateHelper = new RpcStateQueryHelper(chainConnector, queries);
           return await stateHelper.subscribe((error, result) => {
@@ -3312,7 +3290,7 @@ const SubAssetsModule = hydrate => {
     }
   };
 };
-async function buildNetworkQueries$1(networkId, chainConnector, chaindataProvider, addressesByToken, signal) {
+async function buildNetworkQueries$2(networkId, chainConnector, chaindataProvider, addressesByToken, signal) {
   const miniMetadata = await getMiniMetadata(chaindataProvider, chainConnector, networkId, moduleType$4, signal);
   // console.log("Fetched miniMetadata for network", networkId, { miniMetadata })
   const chain = await chaindataProvider.chainById(networkId);
@@ -3401,7 +3379,7 @@ async function buildQueries$3(chainConnector, chaindataProvider$1, addressesByTo
     return acc;
   }, {});
   return (await Promise.all(lodash.toPairs(byNetwork).map(([networkId, addressesByToken]) => {
-    return buildNetworkQueries$1(networkId, chainConnector, chaindataProvider$1, addressesByToken, signal);
+    return buildNetworkQueries$2(networkId, chainConnector, chaindataProvider$1, addressesByToken, signal);
   }))).flat();
 }
 // NOTE: Different chains need different formats for assetId when encoding the stateKey
@@ -3427,10 +3405,7 @@ const SubForeignAssetsModule = hydrate => {
   return {
     ...DefaultBalanceModule(moduleType$3),
     async fetchSubstrateChainMeta(chainId, moduleConfig, metadataRpc) {
-      //   const isTestnet = (await chaindataProvider.chainById(chainId))?.isTestnet || false
       if (metadataRpc === undefined) return {};
-      // if ((moduleConfig?.tokens ?? []).length < 1) return { isTestnet }
-
       const metadataVersion = scale.getMetadataVersion(metadataRpc);
       if (metadataVersion < 14) return {};
       const metadata = scale.decAnyMetadata(metadataRpc);
@@ -3449,9 +3424,6 @@ const SubForeignAssetsModule = hydrate => {
         miniMetadata
       } = chainMeta;
       if (!miniMetadata) return {};
-      // if (miniMetadata === undefined || metadataVersion === undefined) return {}
-      // if (metadataVersion < 14) return {}
-
       const metadata = scale.decAnyMetadata(miniMetadata);
       const unifiedMetadata = scale.unifyMetadata(metadata);
       const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(unifiedMetadata));
@@ -3505,17 +3477,38 @@ const SubForeignAssetsModule = hydrate => {
     async subscribeBalances({
       addressesByToken
     }, callback) {
-      const queries = await buildQueries$2(chaindataProvider$1, addressesByToken);
-      const unsubscribe = await new RpcStateQueryHelper(chainConnector, queries).subscribe((error, result) => {
-        if (error) return callback(error);
-        const balances = result?.filter(b => b !== null) ?? [];
-        if (balances.length > 0) callback(null, new Balances(balances));
-      });
-      return unsubscribe;
+      const byNetwork = lodash.keys(addressesByToken).reduce((acc, tokenId) => {
+        const networkId = chaindataProvider.parseSubForeignAssetTokenId(tokenId).networkId;
+        if (!acc[networkId]) acc[networkId] = {};
+        acc[networkId][tokenId] = addressesByToken[tokenId];
+        return acc;
+      }, {});
+      const controller = new AbortController();
+      const pUnsubs = Promise.all(lodash.toPairs(byNetwork).map(async ([networkId, addressesByToken]) => {
+        try {
+          const queries = await buildNetworkQueries$1(networkId, chainConnector, chaindataProvider$1, addressesByToken, controller.signal);
+          if (controller.signal.aborted) return () => {};
+          const stateHelper = new RpcStateQueryHelper(chainConnector, queries);
+          return await stateHelper.subscribe((error, result) => {
+            if (error) return callback(error);
+            const balances = result?.filter(b => b !== null) ?? [];
+            if (balances.length > 0) callback(null, new Balances(balances));
+          });
+        } catch (err) {
+          if (!controller.signal.aborted) log.error(`Failed to subscribe ${moduleType$3} balances for network ${networkId}`, err);
+          return () => {};
+        }
+      }));
+      return () => {
+        controller.abort();
+        pUnsubs.then(unsubs => {
+          unsubs.forEach(unsubscribe => unsubscribe());
+        });
+      };
     },
     async fetchBalances(addressesByToken) {
       util$1.assert(chainConnectors.substrate, "This module requires a substrate chain connector");
-      const queries = await buildQueries$2(chaindataProvider$1, addressesByToken);
+      const queries = await buildQueries$2(chainConnector, chaindataProvider$1, addressesByToken);
       const result = await new RpcStateQueryHelper(chainConnectors.substrate, queries).fetch();
       const balances = result?.filter(b => b !== null) ?? [];
       return new Balances(balances);
@@ -3571,23 +3564,16 @@ const SubForeignAssetsModule = hydrate => {
     }
   };
 };
-async function buildQueries$2(chaindataProvider, addressesByToken) {
-  const allChains = await chaindataProvider.chainsById();
-  const tokens = await chaindataProvider.tokensById();
-  const miniMetadatas = new Map((await db.miniMetadatas.toArray()).map(miniMetadata => [miniMetadata.id, miniMetadata]));
-  const uniqueChainIds = getUniqueChainIds(addressesByToken, tokens);
-  const chains = Object.fromEntries(uniqueChainIds.map(chainId => [chainId, allChains[chainId]]));
-  const chainStorageCoders = buildStorageCoders({
-    chainIds: uniqueChainIds,
-    chains,
-    miniMetadatas,
-    moduleType: "substrate-foreignassets",
-    coders: {
-      storage: ["ForeignAssets", "Account"]
-    }
+async function buildNetworkQueries$1(networkId, chainConnector, chaindataProvider, addressesByToken, signal) {
+  const miniMetadata = await getMiniMetadata(chaindataProvider, chainConnector, networkId, moduleType$3, signal);
+  const chain = await chaindataProvider.chainById(networkId);
+  const tokensById = await chaindataProvider.tokensById();
+  signal?.throwIfAborted();
+  const networkStorageCoders = buildNetworkStorageCoders(networkId, miniMetadata, {
+    storage: ["ForeignAssets", "Account"]
   });
   return Object.entries(addressesByToken).flatMap(([tokenId, addresses]) => {
-    const token = tokens[tokenId];
+    const token = tokensById[tokenId];
     if (!token) {
       log.warn(`Token ${tokenId} not found`);
       return [];
@@ -3596,18 +3582,12 @@ async function buildQueries$2(chaindataProvider, addressesByToken) {
       log.debug(`This module doesn't handle tokens of type ${token.type}`);
       return [];
     }
-    const networkId = token.networkId;
-    if (!networkId) {
-      log.warn(`Token ${tokenId} has no chain`);
-      return [];
-    }
-    const chain = chains[networkId];
     if (!chain) {
       log.warn(`Chain ${networkId} for token ${tokenId} not found`);
       return [];
     }
     return addresses.flatMap(address => {
-      const scaleCoder = chainStorageCoders.get(networkId)?.storage;
+      const scaleCoder = networkStorageCoders?.storage;
       const onChainId = (() => {
         try {
           return scale.papiParse(token.onChainId);
@@ -3667,6 +3647,17 @@ async function buildQueries$2(chaindataProvider, addressesByToken) {
     });
   });
 }
+async function buildQueries$2(chainConnector, chaindataProvider$1, addressesByToken, signal) {
+  const byNetwork = lodash.keys(addressesByToken).reduce((acc, tokenId) => {
+    const networkId = chaindataProvider.parseSubForeignAssetTokenId(tokenId).networkId;
+    if (!acc[networkId]) acc[networkId] = {};
+    acc[networkId][tokenId] = addressesByToken[tokenId];
+    return acc;
+  }, {});
+  return (await Promise.all(lodash.toPairs(byNetwork).map(([networkId, addressesByToken]) => {
+    return buildNetworkQueries$1(networkId, chainConnector, chaindataProvider$1, addressesByToken, signal);
+  }))).flat();
+}
 
 async function subscribeBase(queries, chainConnector, callback) {
   const unsubscribe = await new RpcStateQueryHelper(chainConnector, queries).subscribe((error, result) => {
@@ -6664,8 +6655,6 @@ const SubPsp22Module = hydrate => {
   return {
     ...DefaultBalanceModule(moduleType$1),
     async fetchSubstrateChainMeta(_chainId) {
-      // const isTestnet = (await chaindataProvider.chainById(chainId))?.isTestnet || false
-      // return { isTestnet }
       return undefined;
     },
     async fetchSubstrateChainTokens(chainId, _chainMeta, moduleConfig) {

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

@@ -126,7 +126,7 @@ class EvmTokenFetcher {
 
 var pkg = {
 	name: "@talismn/balances",
-	version: "0.0.0-pr2043-20250619003406"};
+	version: "0.0.0-pr2043-20250619043542"};
 
 var log = anylogger__default.default(pkg.name);
 
@@ -406,28 +406,6 @@ class Balance {
   get address() {
     return this.#storage.address;
   }
-
-  // /** @deprecated */
-  // get chainId() {
-  //   return isBalanceEvm(this.#storage) ? undefined : this.#storage.chainId
-  // }
-  // /** @deprecated */
-  // get chain() {
-  //   return (this.#db?.networks && this.networkId && this.#db?.networks[this.networkId]) || null
-  // }
-
-  // /** @deprecated */
-  // get evmNetworkId() {
-  //   return isBalanceEvm(this.#storage) ? this.#storage.evmNetworkId : undefined
-  // }
-  // /** @deprecated */
-  // get evmNetwork() {
-  //   return (
-  //     (this.#db?.networks && this.networkId && this.#db?.networks[this.networkId]) ||
-  //     null
-  //   )
-  // }
-
   get networkId() {
     return this.#storage.networkId;
   }
@@ -3219,7 +3197,7 @@ const SubAssetsModule = hydrate => {
       const controller = new AbortController();
       const pUnsubs = Promise.all(lodash.toPairs(byNetwork).map(async ([networkId, addressesByToken]) => {
         try {
-          const queries = await buildNetworkQueries$1(networkId, chainConnector, chaindataProvider$1, addressesByToken, controller.signal);
+          const queries = await buildNetworkQueries$2(networkId, chainConnector, chaindataProvider$1, addressesByToken, controller.signal);
           if (controller.signal.aborted) return () => {};
           const stateHelper = new RpcStateQueryHelper(chainConnector, queries);
           return await stateHelper.subscribe((error, result) => {
@@ -3312,7 +3290,7 @@ const SubAssetsModule = hydrate => {
     }
   };
 };
-async function buildNetworkQueries$1(networkId, chainConnector, chaindataProvider, addressesByToken, signal) {
+async function buildNetworkQueries$2(networkId, chainConnector, chaindataProvider, addressesByToken, signal) {
   const miniMetadata = await getMiniMetadata(chaindataProvider, chainConnector, networkId, moduleType$4, signal);
   // console.log("Fetched miniMetadata for network", networkId, { miniMetadata })
   const chain = await chaindataProvider.chainById(networkId);
@@ -3401,7 +3379,7 @@ async function buildQueries$3(chainConnector, chaindataProvider$1, addressesByTo
     return acc;
   }, {});
   return (await Promise.all(lodash.toPairs(byNetwork).map(([networkId, addressesByToken]) => {
-    return buildNetworkQueries$1(networkId, chainConnector, chaindataProvider$1, addressesByToken, signal);
+    return buildNetworkQueries$2(networkId, chainConnector, chaindataProvider$1, addressesByToken, signal);
   }))).flat();
 }
 // NOTE: Different chains need different formats for assetId when encoding the stateKey
@@ -3427,10 +3405,7 @@ const SubForeignAssetsModule = hydrate => {
   return {
     ...DefaultBalanceModule(moduleType$3),
     async fetchSubstrateChainMeta(chainId, moduleConfig, metadataRpc) {
-      //   const isTestnet = (await chaindataProvider.chainById(chainId))?.isTestnet || false
       if (metadataRpc === undefined) return {};
-      // if ((moduleConfig?.tokens ?? []).length < 1) return { isTestnet }
-
       const metadataVersion = scale.getMetadataVersion(metadataRpc);
       if (metadataVersion < 14) return {};
       const metadata = scale.decAnyMetadata(metadataRpc);
@@ -3449,9 +3424,6 @@ const SubForeignAssetsModule = hydrate => {
         miniMetadata
       } = chainMeta;
       if (!miniMetadata) return {};
-      // if (miniMetadata === undefined || metadataVersion === undefined) return {}
-      // if (metadataVersion < 14) return {}
-
       const metadata = scale.decAnyMetadata(miniMetadata);
       const unifiedMetadata = scale.unifyMetadata(metadata);
       const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(unifiedMetadata));
@@ -3505,17 +3477,38 @@ const SubForeignAssetsModule = hydrate => {
     async subscribeBalances({
       addressesByToken
     }, callback) {
-      const queries = await buildQueries$2(chaindataProvider$1, addressesByToken);
-      const unsubscribe = await new RpcStateQueryHelper(chainConnector, queries).subscribe((error, result) => {
-        if (error) return callback(error);
-        const balances = result?.filter(b => b !== null) ?? [];
-        if (balances.length > 0) callback(null, new Balances(balances));
-      });
-      return unsubscribe;
+      const byNetwork = lodash.keys(addressesByToken).reduce((acc, tokenId) => {
+        const networkId = chaindataProvider.parseSubForeignAssetTokenId(tokenId).networkId;
+        if (!acc[networkId]) acc[networkId] = {};
+        acc[networkId][tokenId] = addressesByToken[tokenId];
+        return acc;
+      }, {});
+      const controller = new AbortController();
+      const pUnsubs = Promise.all(lodash.toPairs(byNetwork).map(async ([networkId, addressesByToken]) => {
+        try {
+          const queries = await buildNetworkQueries$1(networkId, chainConnector, chaindataProvider$1, addressesByToken, controller.signal);
+          if (controller.signal.aborted) return () => {};
+          const stateHelper = new RpcStateQueryHelper(chainConnector, queries);
+          return await stateHelper.subscribe((error, result) => {
+            if (error) return callback(error);
+            const balances = result?.filter(b => b !== null) ?? [];
+            if (balances.length > 0) callback(null, new Balances(balances));
+          });
+        } catch (err) {
+          if (!controller.signal.aborted) log.error(`Failed to subscribe ${moduleType$3} balances for network ${networkId}`, err);
+          return () => {};
+        }
+      }));
+      return () => {
+        controller.abort();
+        pUnsubs.then(unsubs => {
+          unsubs.forEach(unsubscribe => unsubscribe());
+        });
+      };
     },
     async fetchBalances(addressesByToken) {
       util$1.assert(chainConnectors.substrate, "This module requires a substrate chain connector");
-      const queries = await buildQueries$2(chaindataProvider$1, addressesByToken);
+      const queries = await buildQueries$2(chainConnector, chaindataProvider$1, addressesByToken);
       const result = await new RpcStateQueryHelper(chainConnectors.substrate, queries).fetch();
       const balances = result?.filter(b => b !== null) ?? [];
       return new Balances(balances);
@@ -3571,23 +3564,16 @@ const SubForeignAssetsModule = hydrate => {
     }
   };
 };
-async function buildQueries$2(chaindataProvider, addressesByToken) {
-  const allChains = await chaindataProvider.chainsById();
-  const tokens = await chaindataProvider.tokensById();
-  const miniMetadatas = new Map((await db.miniMetadatas.toArray()).map(miniMetadata => [miniMetadata.id, miniMetadata]));
-  const uniqueChainIds = getUniqueChainIds(addressesByToken, tokens);
-  const chains = Object.fromEntries(uniqueChainIds.map(chainId => [chainId, allChains[chainId]]));
-  const chainStorageCoders = buildStorageCoders({
-    chainIds: uniqueChainIds,
-    chains,
-    miniMetadatas,
-    moduleType: "substrate-foreignassets",
-    coders: {
-      storage: ["ForeignAssets", "Account"]
-    }
+async function buildNetworkQueries$1(networkId, chainConnector, chaindataProvider, addressesByToken, signal) {
+  const miniMetadata = await getMiniMetadata(chaindataProvider, chainConnector, networkId, moduleType$3, signal);
+  const chain = await chaindataProvider.chainById(networkId);
+  const tokensById = await chaindataProvider.tokensById();
+  signal?.throwIfAborted();
+  const networkStorageCoders = buildNetworkStorageCoders(networkId, miniMetadata, {
+    storage: ["ForeignAssets", "Account"]
   });
   return Object.entries(addressesByToken).flatMap(([tokenId, addresses]) => {
-    const token = tokens[tokenId];
+    const token = tokensById[tokenId];
     if (!token) {
       log.warn(`Token ${tokenId} not found`);
       return [];
@@ -3596,18 +3582,12 @@ async function buildQueries$2(chaindataProvider, addressesByToken) {
       log.debug(`This module doesn't handle tokens of type ${token.type}`);
       return [];
     }
-    const networkId = token.networkId;
-    if (!networkId) {
-      log.warn(`Token ${tokenId} has no chain`);
-      return [];
-    }
-    const chain = chains[networkId];
     if (!chain) {
       log.warn(`Chain ${networkId} for token ${tokenId} not found`);
       return [];
     }
     return addresses.flatMap(address => {
-      const scaleCoder = chainStorageCoders.get(networkId)?.storage;
+      const scaleCoder = networkStorageCoders?.storage;
       const onChainId = (() => {
         try {
           return scale.papiParse(token.onChainId);
@@ -3667,6 +3647,17 @@ async function buildQueries$2(chaindataProvider, addressesByToken) {
     });
   });
 }
+async function buildQueries$2(chainConnector, chaindataProvider$1, addressesByToken, signal) {
+  const byNetwork = lodash.keys(addressesByToken).reduce((acc, tokenId) => {
+    const networkId = chaindataProvider.parseSubForeignAssetTokenId(tokenId).networkId;
+    if (!acc[networkId]) acc[networkId] = {};
+    acc[networkId][tokenId] = addressesByToken[tokenId];
+    return acc;
+  }, {});
+  return (await Promise.all(lodash.toPairs(byNetwork).map(([networkId, addressesByToken]) => {
+    return buildNetworkQueries$1(networkId, chainConnector, chaindataProvider$1, addressesByToken, signal);
+  }))).flat();
+}
 
 async function subscribeBase(queries, chainConnector, callback) {
   const unsubscribe = await new RpcStateQueryHelper(chainConnector, queries).subscribe((error, result) => {
@@ -6664,8 +6655,6 @@ const SubPsp22Module = hydrate => {
   return {
     ...DefaultBalanceModule(moduleType$1),
     async fetchSubstrateChainMeta(_chainId) {
-      // const isTestnet = (await chaindataProvider.chainById(chainId))?.isTestnet || false
-      // return { isTestnet }
       return undefined;
     },
     async fetchSubstrateChainTokens(chainId, _chainMeta, moduleConfig) {

package/dist/talismn-balances.esm.js

@@ -6,7 +6,7 @@ import BigNumber from 'bignumber.js';
 import { u8aToHex, assert, stringCamelCase, u8aConcatStrict, u8aConcat, arrayChunk, u8aToString, hexToNumber, hexToU8a } from '@polkadot/util';
 import { xxhashAsU8a, blake2AsU8a } from '@polkadot/util-crypto';
 import pako from 'pako';
-import { evmErc20TokenId as evmErc20TokenId$1, EvmErc20TokenSchema, evmNativeTokenId, evmUniswapV2TokenId, githubTokenLogoUrl, parseSubAssetTokenId, subAssetTokenId, subForeignAssetTokenId, parseSubNativeTokenId, subNativeTokenId, subPsp22TokenId, parseSubTokensTokenId, subTokensTokenId } from '@talismn/chaindata-provider';
+import { evmErc20TokenId as evmErc20TokenId$1, EvmErc20TokenSchema, evmNativeTokenId, evmUniswapV2TokenId, githubTokenLogoUrl, parseSubAssetTokenId, subAssetTokenId, parseSubForeignAssetTokenId, subForeignAssetTokenId, parseSubNativeTokenId, subNativeTokenId, subPsp22TokenId, parseSubTokensTokenId, subTokensTokenId } from '@talismn/chaindata-provider';
 import { parseAbi, isHex, hexToBigInt } from 'viem';
 import isEqual from 'lodash/isEqual';
 import { defineMethod } from '@substrate/txwrapper-core';
@@ -111,7 +111,7 @@ class EvmTokenFetcher {
 
 var pkg = {
 	name: "@talismn/balances",
-	version: "0.0.0-pr2043-20250619003406"};
+	version: "0.0.0-pr2043-20250619043542"};
 
 var log = anylogger(pkg.name);
 
@@ -391,28 +391,6 @@ class Balance {
   get address() {
     return this.#storage.address;
   }
-
-  // /** @deprecated */
-  // get chainId() {
-  //   return isBalanceEvm(this.#storage) ? undefined : this.#storage.chainId
-  // }
-  // /** @deprecated */
-  // get chain() {
-  //   return (this.#db?.networks && this.networkId && this.#db?.networks[this.networkId]) || null
-  // }
-
-  // /** @deprecated */
-  // get evmNetworkId() {
-  //   return isBalanceEvm(this.#storage) ? this.#storage.evmNetworkId : undefined
-  // }
-  // /** @deprecated */
-  // get evmNetwork() {
-  //   return (
-  //     (this.#db?.networks && this.networkId && this.#db?.networks[this.networkId]) ||
-  //     null
-  //   )
-  // }
-
   get networkId() {
     return this.#storage.networkId;
   }
@@ -3204,7 +3182,7 @@ const SubAssetsModule = hydrate => {
       const controller = new AbortController();
       const pUnsubs = Promise.all(toPairs(byNetwork).map(async ([networkId, addressesByToken]) => {
         try {
-          const queries = await buildNetworkQueries$1(networkId, chainConnector, chaindataProvider, addressesByToken, controller.signal);
+          const queries = await buildNetworkQueries$2(networkId, chainConnector, chaindataProvider, addressesByToken, controller.signal);
           if (controller.signal.aborted) return () => {};
           const stateHelper = new RpcStateQueryHelper(chainConnector, queries);
           return await stateHelper.subscribe((error, result) => {
@@ -3297,7 +3275,7 @@ const SubAssetsModule = hydrate => {
     }
   };
 };
-async function buildNetworkQueries$1(networkId, chainConnector, chaindataProvider, addressesByToken, signal) {
+async function buildNetworkQueries$2(networkId, chainConnector, chaindataProvider, addressesByToken, signal) {
   const miniMetadata = await getMiniMetadata(chaindataProvider, chainConnector, networkId, moduleType$4, signal);
   // console.log("Fetched miniMetadata for network", networkId, { miniMetadata })
   const chain = await chaindataProvider.chainById(networkId);
@@ -3386,7 +3364,7 @@ async function buildQueries$3(chainConnector, chaindataProvider, addressesByToke
     return acc;
   }, {});
   return (await Promise.all(toPairs(byNetwork).map(([networkId, addressesByToken]) => {
-    return buildNetworkQueries$1(networkId, chainConnector, chaindataProvider, addressesByToken, signal);
+    return buildNetworkQueries$2(networkId, chainConnector, chaindataProvider, addressesByToken, signal);
   }))).flat();
 }
 // NOTE: Different chains need different formats for assetId when encoding the stateKey
@@ -3412,10 +3390,7 @@ const SubForeignAssetsModule = hydrate => {
   return {
     ...DefaultBalanceModule(moduleType$3),
     async fetchSubstrateChainMeta(chainId, moduleConfig, metadataRpc) {
-      //   const isTestnet = (await chaindataProvider.chainById(chainId))?.isTestnet || false
       if (metadataRpc === undefined) return {};
-      // if ((moduleConfig?.tokens ?? []).length < 1) return { isTestnet }
-
       const metadataVersion = getMetadataVersion(metadataRpc);
       if (metadataVersion < 14) return {};
       const metadata = decAnyMetadata(metadataRpc);
@@ -3434,9 +3409,6 @@ const SubForeignAssetsModule = hydrate => {
         miniMetadata
       } = chainMeta;
       if (!miniMetadata) return {};
-      // if (miniMetadata === undefined || metadataVersion === undefined) return {}
-      // if (metadataVersion < 14) return {}
-
       const metadata = decAnyMetadata(miniMetadata);
       const unifiedMetadata = unifyMetadata(metadata);
       const scaleBuilder = getDynamicBuilder(getLookupFn(unifiedMetadata));
@@ -3490,17 +3462,38 @@ const SubForeignAssetsModule = hydrate => {
     async subscribeBalances({
       addressesByToken
     }, callback) {
-      const queries = await buildQueries$2(chaindataProvider, addressesByToken);
-      const unsubscribe = await new RpcStateQueryHelper(chainConnector, queries).subscribe((error, result) => {
-        if (error) return callback(error);
-        const balances = result?.filter(b => b !== null) ?? [];
-        if (balances.length > 0) callback(null, new Balances(balances));
-      });
-      return unsubscribe;
+      const byNetwork = keys(addressesByToken).reduce((acc, tokenId) => {
+        const networkId = parseSubForeignAssetTokenId(tokenId).networkId;
+        if (!acc[networkId]) acc[networkId] = {};
+        acc[networkId][tokenId] = addressesByToken[tokenId];
+        return acc;
+      }, {});
+      const controller = new AbortController();
+      const pUnsubs = Promise.all(toPairs(byNetwork).map(async ([networkId, addressesByToken]) => {
+        try {
+          const queries = await buildNetworkQueries$1(networkId, chainConnector, chaindataProvider, addressesByToken, controller.signal);
+          if (controller.signal.aborted) return () => {};
+          const stateHelper = new RpcStateQueryHelper(chainConnector, queries);
+          return await stateHelper.subscribe((error, result) => {
+            if (error) return callback(error);
+            const balances = result?.filter(b => b !== null) ?? [];
+            if (balances.length > 0) callback(null, new Balances(balances));
+          });
+        } catch (err) {
+          if (!controller.signal.aborted) log.error(`Failed to subscribe ${moduleType$3} balances for network ${networkId}`, err);
+          return () => {};
+        }
+      }));
+      return () => {
+        controller.abort();
+        pUnsubs.then(unsubs => {
+          unsubs.forEach(unsubscribe => unsubscribe());
+        });
+      };
     },
     async fetchBalances(addressesByToken) {
       assert(chainConnectors.substrate, "This module requires a substrate chain connector");
-      const queries = await buildQueries$2(chaindataProvider, addressesByToken);
+      const queries = await buildQueries$2(chainConnector, chaindataProvider, addressesByToken);
       const result = await new RpcStateQueryHelper(chainConnectors.substrate, queries).fetch();
       const balances = result?.filter(b => b !== null) ?? [];
       return new Balances(balances);
@@ -3556,23 +3549,16 @@ const SubForeignAssetsModule = hydrate => {
     }
   };
 };
-async function buildQueries$2(chaindataProvider, addressesByToken) {
-  const allChains = await chaindataProvider.chainsById();
-  const tokens = await chaindataProvider.tokensById();
-  const miniMetadatas = new Map((await db.miniMetadatas.toArray()).map(miniMetadata => [miniMetadata.id, miniMetadata]));
-  const uniqueChainIds = getUniqueChainIds(addressesByToken, tokens);
-  const chains = Object.fromEntries(uniqueChainIds.map(chainId => [chainId, allChains[chainId]]));
-  const chainStorageCoders = buildStorageCoders({
-    chainIds: uniqueChainIds,
-    chains,
-    miniMetadatas,
-    moduleType: "substrate-foreignassets",
-    coders: {
-      storage: ["ForeignAssets", "Account"]
-    }
+async function buildNetworkQueries$1(networkId, chainConnector, chaindataProvider, addressesByToken, signal) {
+  const miniMetadata = await getMiniMetadata(chaindataProvider, chainConnector, networkId, moduleType$3, signal);
+  const chain = await chaindataProvider.chainById(networkId);
+  const tokensById = await chaindataProvider.tokensById();
+  signal?.throwIfAborted();
+  const networkStorageCoders = buildNetworkStorageCoders(networkId, miniMetadata, {
+    storage: ["ForeignAssets", "Account"]
   });
   return Object.entries(addressesByToken).flatMap(([tokenId, addresses]) => {
-    const token = tokens[tokenId];
+    const token = tokensById[tokenId];
     if (!token) {
       log.warn(`Token ${tokenId} not found`);
       return [];
@@ -3581,18 +3567,12 @@ async function buildQueries$2(chaindataProvider, addressesByToken) {
       log.debug(`This module doesn't handle tokens of type ${token.type}`);
       return [];
     }
-    const networkId = token.networkId;
-    if (!networkId) {
-      log.warn(`Token ${tokenId} has no chain`);
-      return [];
-    }
-    const chain = chains[networkId];
     if (!chain) {
       log.warn(`Chain ${networkId} for token ${tokenId} not found`);
       return [];
     }
     return addresses.flatMap(address => {
-      const scaleCoder = chainStorageCoders.get(networkId)?.storage;
+      const scaleCoder = networkStorageCoders?.storage;
       const onChainId = (() => {
         try {
           return papiParse(token.onChainId);
@@ -3652,6 +3632,17 @@ async function buildQueries$2(chaindataProvider, addressesByToken) {
     });
   });
 }
+async function buildQueries$2(chainConnector, chaindataProvider, addressesByToken, signal) {
+  const byNetwork = keys(addressesByToken).reduce((acc, tokenId) => {
+    const networkId = parseSubForeignAssetTokenId(tokenId).networkId;
+    if (!acc[networkId]) acc[networkId] = {};
+    acc[networkId][tokenId] = addressesByToken[tokenId];
+    return acc;
+  }, {});
+  return (await Promise.all(toPairs(byNetwork).map(([networkId, addressesByToken]) => {
+    return buildNetworkQueries$1(networkId, chainConnector, chaindataProvider, addressesByToken, signal);
+  }))).flat();
+}
 
 async function subscribeBase(queries, chainConnector, callback) {
   const unsubscribe = await new RpcStateQueryHelper(chainConnector, queries).subscribe((error, result) => {
@@ -6649,8 +6640,6 @@ const SubPsp22Module = hydrate => {
   return {
     ...DefaultBalanceModule(moduleType$1),
     async fetchSubstrateChainMeta(_chainId) {
-      // const isTestnet = (await chaindataProvider.chainById(chainId))?.isTestnet || false
-      // return { isTestnet }
       return undefined;
     },
     async fetchSubstrateChainTokens(chainId, _chainMeta, moduleConfig) {

package/package.json

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