@talismn/balances 0.0.0-pr2043-20250619072437 → 0.0.0-pr2043-20250619151012

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

@@ -8,12 +8,14 @@ var util = require('@talismn/util');
 var BigNumber = require('bignumber.js');
 var util$1 = require('@polkadot/util');
 var utilCrypto = require('@polkadot/util-crypto');
+var shared = require('@talismn/chaindata-provider/src/chaindata/shared');
+var z = require('zod/v4');
 var pako = require('pako');
 var viem = require('viem');
+var lodash = require('lodash');
 var isEqual = require('lodash/isEqual');
 var txwrapperCore = require('@substrate/txwrapper-core');
 var scale = require('@talismn/scale');
-var lodash = require('lodash');
 var camelCase = require('lodash/camelCase');
 var PQueue = require('p-queue');
 var sapi = require('@talismn/sapi');
@@ -26,13 +28,13 @@ var chainConnector = require('@talismn/chain-connector');
 var rxjs = require('rxjs');
 var scaleTs = require('scale-ts');
 var upperFirst = require('lodash/upperFirst');
-var z = require('zod/v4');
 var apiContract = require('@polkadot/api-contract');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var anylogger__default = /*#__PURE__*/_interopDefault(anylogger);
 var BigNumber__default = /*#__PURE__*/_interopDefault(BigNumber);
+var z__default = /*#__PURE__*/_interopDefault(z);
 var pako__default = /*#__PURE__*/_interopDefault(pako);
 var isEqual__default = /*#__PURE__*/_interopDefault(isEqual);
 var camelCase__default = /*#__PURE__*/_interopDefault(camelCase);
@@ -40,7 +42,8 @@ var PQueue__default = /*#__PURE__*/_interopDefault(PQueue);
 var groupBy__default = /*#__PURE__*/_interopDefault(groupBy);
 var PromisePool__default = /*#__PURE__*/_interopDefault(PromisePool);
 var upperFirst__default = /*#__PURE__*/_interopDefault(upperFirst);
-var z__default = /*#__PURE__*/_interopDefault(z);
+
+// Record<string, unknown> | undefined
 
 // TODO: Document default balances module purpose/usage
 const DefaultBalanceModule = type => ({
@@ -126,7 +129,7 @@ class EvmTokenFetcher {
 
 var pkg = {
 	name: "@talismn/balances",
-	version: "0.0.0-pr2043-20250619072437"};
+	version: "0.0.0-pr2043-20250619151012"};
 
 var log = anylogger__default.default(pkg.name);
 
@@ -410,13 +413,13 @@ class Balance {
     return this.#storage.networkId;
   }
   get network() {
-    return this.#db?.networks && this.networkId && this.#db?.networks[this.networkId] || null;
+    return this.#db?.networks?.[this.networkId] || null;
   }
   get tokenId() {
     return this.#storage.tokenId;
   }
   get token() {
-    return this.#db?.tokens && this.#db?.tokens[this.tokenId] || null;
+    return this.#db?.tokens?.[this.tokenId] || null;
   }
   get decimals() {
     return this.token?.decimals || null;
@@ -936,6 +939,23 @@ const deriveMiniMetadataId = ({
   specVersion,
   libVersion
 }) => util$1.u8aToHex(utilCrypto.xxhashAsU8a(new TextEncoder().encode(`${source}${chainId}${specVersion}${libVersion}`), 64), undefined, false);
+const MiniMetadataBaseSchema = z__default.default.strictObject({
+  /** The DB id for this metadata */
+  id: z__default.default.string().nonempty(),
+  /** The balance module which created this miniMetadata */
+  source: z__default.default.string().nonempty(),
+  // TODO make it an enum of balance module types
+  /** The chain this miniMetadata came from */
+  chainId: chaindataProvider.DotNetworkSchema.shape.id,
+  /** The chain specVersion which this miniMetadata is valid for */
+  specVersion: chaindataProvider.DotNetworkSchema.shape.specVersion,
+  /** the version of the balances library used to craft the mini metadata */
+  libVersion: z__default.default.string().nonempty(),
+  /** The miniMetadata encoded as a hex string */
+  data: shared.HexStringSchema.nullable(),
+  // /** module specific information about the chain, such as pallet ids for specific features */
+  extra: z__default.default.any().nullable()
+});
 
 // for DB version 3, Wallet version 1.21.0
 const upgradeRemoveSymbolFromNativeTokenId = async tx => {
@@ -1297,10 +1317,10 @@ const EvmErc20Module = hydrate => {
      * In a future version of the balance libraries, we may build some kind of async scheduling system which will keep the chainmeta for each chain up to date without relying on a squid.
      */
     async fetchEvmChainMeta(_chainId) {
-      return undefined;
-      // const isTestnet = (await chaindataProvider.evmNetworkById(chainId))?.isTestnet || false
-
-      // return { isTestnet }
+      return {
+        miniMetadata: null,
+        extra: null
+      };
     },
     /**
      * This method is currently executed on [a squid](https://github.com/TalismanSociety/chaindata-squid/blob/0ee02818bf5caa7362e3f3664e55ef05ec8df078/src/steps/updateEvmNetworksFromGithub.ts#L338-L343).
@@ -1509,7 +1529,6 @@ const fetchBalances$3 = async (evmChainConnector, tokenAddressesByNetwork, erc20
       source: "evm-erc20",
       status: "live",
       address: networkParams[i].address,
-      // multiChainId: { evmChainId: evmNetworkId },
       networkId,
       tokenId: networkParams[i].token.id,
       value: free
@@ -1595,15 +1614,6 @@ function groupAddressesByTokenByEvmNetwork$1(addressesByToken, tokens) {
 const abiMulticall = viem.parseAbi(["struct Call { address target; bytes callData; }", "struct Call3 { address target; bool allowFailure; bytes callData; }", "struct Call3Value { address target; bool allowFailure; uint256 value; bytes callData; }", "struct Result { bool success; bytes returnData; }", "function aggregate(Call[] calldata calls) public payable returns (uint256 blockNumber, bytes[] memory returnData)", "function aggregate3(Call3[] calldata calls) public payable returns (Result[] memory returnData)", "function aggregate3Value(Call3Value[] calldata calls) public payable returns (Result[] memory returnData)", "function blockAndAggregate(Call[] calldata calls) public payable returns (uint256 blockNumber, bytes32 blockHash, Result[] memory returnData)", "function getBasefee() view returns (uint256 basefee)", "function getBlockHash(uint256 blockNumber) view returns (bytes32 blockHash)", "function getBlockNumber() view returns (uint256 blockNumber)", "function getChainId() view returns (uint256 chainid)", "function getCurrentBlockCoinbase() view returns (address coinbase)", "function getCurrentBlockDifficulty() view returns (uint256 difficulty)", "function getCurrentBlockGasLimit() view returns (uint256 gaslimit)", "function getCurrentBlockTimestamp() view returns (uint256 timestamp)", "function getEthBalance(address addr) view returns (uint256 balance)", "function getLastBlockHash() view returns (bytes32 blockHash)", "function tryAggregate(bool requireSuccess, Call[] calldata calls) public payable returns (Result[] memory returnData)", "function tryBlockAndAggregate(bool requireSuccess, Call[] calldata calls) public payable returns (uint256 blockNumber, bytes32 blockHash, Result[] memory returnData)"]);
 
 const moduleType$6 = "evm-native";
-
-// export const evmNativeTokenId = (chainId: EvmNetworkId) =>
-//   `${chainId}-evm-native`.toLowerCase().replace(/ /g, "-")
-
-const getEvmNetworkIdFromTokenId = tokenId => {
-  const evmNetworkId = tokenId.split(":")[0];
-  if (!evmNetworkId) throw new Error(`Can't detect chainId for token ${tokenId}`);
-  return evmNetworkId;
-};
 const EvmNativeModule = hydrate => {
   const {
     chainConnectors,
@@ -1622,10 +1632,10 @@ const EvmNativeModule = hydrate => {
      * In a future version of the balance libraries, we may build some kind of async scheduling system which will keep the chainmeta for each chain up to date without relying on a squid.
      */
     async fetchEvmChainMeta(_chainId) {
-      // const isTestnet = (await chaindataProvider.evmNetworkById(chainId))?.isTestnet || false
-
-      // return { isTestnet }
-      return undefined;
+      return {
+        miniMetadata: null,
+        extra: null
+      };
     },
     /**
      * This method is currently executed on [a squid](https://github.com/TalismanSociety/chaindata-squid/blob/0ee02818bf5caa7362e3f3664e55ef05ec8df078/src/steps/updateEvmNetworksFromGithub.ts#L338-L343).
@@ -1664,7 +1674,7 @@ const EvmNativeModule = hydrate => {
       const initDelay = 500; // 500ms == 0.5 seconds
 
       const tokens = await getModuleTokens();
-      const ethAddressesByToken = Object.fromEntries(Object.entries(addressesByToken).map(([tokenId, addresses]) => {
+      const ethAddressesByToken = lodash.fromPairs(lodash.toPairs(addressesByToken).map(([tokenId, addresses]) => {
         const ethAddresses = addresses.filter(util.isEthereumAddress);
         if (ethAddresses.length === 0) return null;
         const token = tokens[tokenId];
@@ -1678,7 +1688,7 @@ const EvmNativeModule = hydrate => {
       let zeroBalanceSubscriptionIntervalCounter = 0;
 
       // setup initialising balances for all active evm networks
-      const activeEvmNetworkIds = Object.keys(ethAddressesByToken).map(getEvmNetworkIdFromTokenId);
+      const activeEvmNetworkIds = lodash.keys(ethAddressesByToken).map(chaindataProvider.networkIdFromTokenId);
       const initialisingBalances = new Set(activeEvmNetworkIds);
       const positiveBalanceNetworks = new Set(initialBalances?.map(b => b.networkId));
       const poll = async () => {
@@ -1687,7 +1697,7 @@ const EvmNativeModule = hydrate => {
         try {
           // fetch balance for each network sequentially to prevent creating a big queue of http requests (browser can only handle 2 at a time)
           for (const [tokenId, addresses] of Object.entries(ethAddressesByToken)) {
-            const evmNetworkId = getEvmNetworkIdFromTokenId(tokenId);
+            const evmNetworkId = chaindataProvider.networkIdFromTokenId(tokenId);
 
             // a zero balance network is one that has initialised and does not have a positive balance
             const isZeroBalanceNetwork = !initialisingBalances.has(evmNetworkId) && !positiveBalanceNetworks.has(evmNetworkId);
@@ -2405,14 +2415,12 @@ const EvmUniswapV2Module = hydrate => {
   return {
     ...DefaultBalanceModule(moduleType$5),
     async fetchEvmChainMeta(_chainId) {
-      // const isTestnet = (await chaindataProvider.evmNetworkById(chainId))?.isTestnet || false
-
-      // return { isTestnet }
-      return undefined;
+      return {
+        miniMetadata: null,
+        extra: null
+      };
     },
     async fetchEvmChainTokens(chainId, _chainMeta, moduleConfig) {
-      //const { isTestnet } = chainMeta
-
       const tokens = {};
       for (const tokenConfig of moduleConfig?.pools ?? []) {
         const {
@@ -2769,7 +2777,8 @@ const fetchMiniMetadatas = async (chainConnector, chaindataProvider, chainId, sp
         chainId,
         specVersion,
         libVersion,
-        data: chainMeta?.miniMetadata ?? null
+        data: chainMeta?.miniMetadata ?? null,
+        extra: chainMeta?.extra ?? null
       };
     }));
   } finally {
@@ -2838,40 +2847,15 @@ async function balances(balanceModule, addressesByToken, callback) {
   return await balanceModule.fetchBalances(addressesByToken);
 }
 
-/**
- * Given a `moduleType` and a `chain` from a chaindataProvider, this function will find the chainMeta
- * associated with the given balanceModule for the given chain.
- */
-const findChainMeta = (miniMetadatas, moduleType, chain) => {
-  if (!chain) return [undefined, undefined];
-  if (!chain.specVersion) return [undefined, undefined];
-
-  // TODO: This is spaghetti to import this here, it should be injected into each balance module or something.
-  const metadataId = deriveMiniMetadataId({
-    source: moduleType,
-    chainId: chain.id,
-    specVersion: chain.specVersion,
-    libVersion
-  });
-
-  // TODO: Fix this (needs to fetch miniMetadata without being async)
-  const miniMetadata = miniMetadatas.get(metadataId);
-  const chainMeta = miniMetadata ? {
-    miniMetadata: miniMetadata.data
-  } : undefined;
-  return [chainMeta, miniMetadata];
-};
-
 const buildStorageCoders = ({
   chainIds,
   chains,
   miniMetadatas,
-  moduleType,
   coders
 }) => new Map([...chainIds].flatMap(chainId => {
   const chain = chains[chainId];
   if (!chain) return [];
-  const [, miniMetadata] = findChainMeta(miniMetadatas, moduleType, chain);
+  const miniMetadata = miniMetadatas.get(chainId); // findMiniMetadata<TBalanceModule>(miniMetadatas, moduleType, chain)
   if (!miniMetadata) return [];
   if (!miniMetadata.data) return [];
   const metadata = scale.unifyMetadata(scale.decAnyMetadata(miniMetadata.data));
@@ -3107,6 +3091,10 @@ const decompress = data => {
 };
 
 const moduleType$4 = "substrate-assets";
+const UNSUPPORTED_CHAIN_META$3 = {
+  miniMetadata: null,
+  extra: null
+};
 const SubAssetsModule = hydrate => {
   const {
     chainConnectors,
@@ -3118,7 +3106,7 @@ const SubAssetsModule = hydrate => {
     ...DefaultBalanceModule(moduleType$4),
     // TODO make synchronous at the module definition level ?
     async fetchSubstrateChainMeta(chainId, moduleConfig, metadataRpc) {
-      if (!metadataRpc) return {};
+      if (!metadataRpc) return UNSUPPORTED_CHAIN_META$3;
       const metadata = scale.decAnyMetadata(metadataRpc);
       scale.compactMetadata(metadata, [{
         pallet: "Assets",
@@ -3126,7 +3114,8 @@ const SubAssetsModule = hydrate => {
       }]);
       const miniMetadata = scale.encodeMetadata(metadata);
       return {
-        miniMetadata
+        miniMetadata,
+        extra: null
       };
     },
     async fetchSubstrateChainTokens(chainId, chainMeta, moduleConfig) {
@@ -3391,6 +3380,10 @@ const tryEncode = (scaleCoder, ...args) => {
 };
 
 const moduleType$3 = "substrate-foreignassets";
+const UNSUPPORTED_CHAIN_META$2 = {
+  miniMetadata: null,
+  extra: null
+};
 const SubForeignAssetsModule = hydrate => {
   const {
     chainConnectors,
@@ -3401,9 +3394,9 @@ const SubForeignAssetsModule = hydrate => {
   return {
     ...DefaultBalanceModule(moduleType$3),
     async fetchSubstrateChainMeta(chainId, moduleConfig, metadataRpc) {
-      if (metadataRpc === undefined) return {};
+      if (metadataRpc === undefined) return UNSUPPORTED_CHAIN_META$2;
       const metadataVersion = scale.getMetadataVersion(metadataRpc);
-      if (metadataVersion < 14) return {};
+      if (metadataVersion < 14) return UNSUPPORTED_CHAIN_META$2;
       const metadata = scale.decAnyMetadata(metadataRpc);
       scale.compactMetadata(metadata, [{
         pallet: "ForeignAssets",
@@ -3411,7 +3404,8 @@ const SubForeignAssetsModule = hydrate => {
       }]);
       const miniMetadata = scale.encodeMetadata(metadata);
       return {
-        miniMetadata
+        miniMetadata,
+        extra: null
       };
     },
     async fetchSubstrateChainTokens(chainId, chainMeta, moduleConfig) {
@@ -3655,6 +3649,16 @@ async function buildQueries$2(chainConnector, chaindataProvider$1, addressesByTo
   }))).flat();
 }
 
+const getAddresssesByTokenByNetwork = addressesByToken => {
+  const addressesByTokenByNetwork = lodash.toPairs(addressesByToken).reduce((acc, [tokenId, addresses]) => {
+    const networkId = chaindataProvider.parseTokenId(tokenId).networkId;
+    if (!acc[networkId]) acc[networkId] = {};
+    acc[networkId][tokenId] = addresses;
+    return acc;
+  }, {});
+  return addressesByTokenByNetwork;
+};
+
 async function subscribeBase(queries, chainConnector, callback) {
   const unsubscribe = await new RpcStateQueryHelper(chainConnector, queries).subscribe((error, result) => {
     if (error) callback(error);
@@ -3681,16 +3685,21 @@ const asObservable = handler => (...args) => new rxjs.Observable(subscriber => {
  */
 const crowdloanFundContributionsChildKey = fundIndex => util$1.u8aToHex(util$1.u8aConcat(":child_storage:default:", utilCrypto.blake2AsU8a(util$1.u8aConcat("crowdloan", scaleTs.u32.enc(fundIndex)))));
 
-async function subscribeCrowdloans(chaindataProvider, chainConnector, addressesByToken, callback) {
-  const allChains = await chaindataProvider.chainsById();
-  const tokens = await chaindataProvider.tokensById();
-  const miniMetadatas = new Map((await db.miniMetadatas.toArray()).map(miniMetadata => [miniMetadata.id, miniMetadata]));
+// TODO make this method chain-specific
+async function subscribeCrowdloans(chaindataProvider$1, chainConnector, addressesByToken, callback, signal) {
+  const allChains = await chaindataProvider$1.chainsById();
+  const tokens = await chaindataProvider$1.tokensById();
+
+  // there should be only one network here when subscribing to balances, we've split it up by network at the top level
+  const networkIds = lodash.keys(addressesByToken).map(tokenId => chaindataProvider.parseTokenId(tokenId).networkId);
+  const miniMetadatas = new Map();
+  for (const networkId of networkIds) miniMetadatas.set(networkId, await getMiniMetadata(chaindataProvider$1, chainConnector, networkId, "substrate-native"));
   const crowdloanTokenIds = Object.entries(tokens).filter(([, token]) => {
     // ignore non-native tokens
     if (token.type !== "substrate-native") return;
     // ignore tokens on chains with no crowdloans pallet
-    const [chainMeta] = findChainMeta(miniMetadatas, "substrate-native", allChains[token.networkId]);
-    return typeof chainMeta?.crowdloanPalletId === "string";
+    const miniMetadata = miniMetadatas.get(token.networkId);
+    return typeof miniMetadata?.extra?.crowdloanPalletId === "string";
   }).map(([tokenId]) => tokenId);
 
   // crowdloan contributions can only be done by the native token on chains with the crowdloan pallet
@@ -3705,7 +3714,6 @@ async function subscribeCrowdloans(chaindataProvider, chainConnector, addressesB
     chainIds: uniqueChainIds,
     chains,
     miniMetadatas,
-    moduleType: "substrate-native",
     coders: {
       parachains: ["Paras", "Parachains"],
       funds: ["Crowdloan", "Funds"]
@@ -3948,16 +3956,25 @@ const nompoolAccountId = (palletId, poolId, index) => {
 /** The stash account for the nomination pool */
 const nompoolStashAccountId = (palletId, poolId) => nompoolAccountId(palletId, poolId, 0);
 
-async function subscribeNompoolStaking(chaindataProvider, chainConnector, addressesByToken, callback) {
-  const allChains = await chaindataProvider.chainsById();
-  const tokens = await chaindataProvider.tokensById();
-  const miniMetadatas = new Map((await db.miniMetadatas.toArray()).map(miniMetadata => [miniMetadata.id, miniMetadata]));
+// TODO make this method chain-specific
+async function subscribeNompoolStaking(chaindataProvider$1, chainConnector, addressesByToken, callback, signal) {
+  const allChains = await chaindataProvider$1.chainsById();
+  const tokens = await chaindataProvider$1.tokensById();
+
+  // there should be only one network here when subscribing to balances, we've split it up by network at the top level
+  const networkIds = lodash.keys(addressesByToken).map(tokenId => chaindataProvider.parseTokenId(tokenId).networkId);
+  const miniMetadatas = new Map();
+  for (const networkId of networkIds) {
+    const miniMetadata = await getMiniMetadata(chaindataProvider$1, chainConnector, networkId, "substrate-native");
+    miniMetadatas.set(networkId, miniMetadata);
+  }
   const nomPoolTokenIds = Object.entries(tokens).filter(([, token]) => {
     // ignore non-native tokens
     if (token.type !== "substrate-native") return false;
+
     // ignore tokens on chains with no nompools pallet
-    const [chainMeta] = findChainMeta(miniMetadatas, "substrate-native", allChains[token.networkId]);
-    return typeof chainMeta?.nominationPoolsPalletId === "string";
+    const miniMetadata = miniMetadatas.get(token.networkId);
+    return typeof miniMetadata?.extra?.nominationPoolsPalletId === "string";
   }).map(([tokenId]) => tokenId);
 
   // staking can only be done by the native token on chains with the staking pallet
@@ -3972,7 +3989,6 @@ async function subscribeNompoolStaking(chaindataProvider, chainConnector, addres
     chainIds: uniqueChainIds,
     chains,
     miniMetadatas,
-    moduleType: "substrate-native",
     coders: {
       poolMembers: ["NominationPools", "PoolMembers"],
       bondedPools: ["NominationPools", "BondedPools"],
@@ -4001,10 +4017,10 @@ async function subscribeNompoolStaking(chaindataProvider, chainConnector, addres
       log.warn(`Chain ${chainId} for token ${tokenId} not found`);
       continue;
     }
-    const [chainMeta] = findChainMeta(miniMetadatas, "substrate-native", chain);
+    const miniMetadata = miniMetadatas.get(chainId);
     const {
       nominationPoolsPalletId
-    } = chainMeta ?? {};
+    } = miniMetadata?.extra ?? {};
     const subscribePoolMembers = (addresses, callback) => {
       const scaleCoder = chainStorageCoders.get(chainId)?.poolMembers;
       const queries = addresses.flatMap(address => {
@@ -4260,16 +4276,24 @@ const calculateTaoFromDynamicInfo = ({
   });
 };
 
-async function subscribeSubtensorStaking(chaindataProvider, chainConnector, addressesByToken, callback) {
-  const allChains = await chaindataProvider.chainsById();
-  const tokens = await chaindataProvider.tokensById();
-  const miniMetadatas = new Map((await db.miniMetadatas.toArray()).map(miniMetadata => [miniMetadata.id, miniMetadata]));
+// TODO make this method chain-specific
+async function subscribeSubtensorStaking(chaindataProvider$1, chainConnector, addressesByToken, callback, signal) {
+  const allChains = await chaindataProvider$1.chainsById();
+  const tokens = await chaindataProvider$1.tokensById();
+
+  // there should be only one network here when subscribing to balances, we've split it up by network at the top level
+  const networkIds = lodash.keys(addressesByToken).map(tokenId => chaindataProvider.parseTokenId(tokenId).networkId);
+  const miniMetadatas = new Map();
+  for (const networkId of networkIds) {
+    const miniMetadata = await getMiniMetadata(chaindataProvider$1, chainConnector, networkId, "substrate-native");
+    miniMetadatas.set(networkId, miniMetadata);
+  }
   const subtensorTokenIds = Object.entries(tokens).filter(([, token]) => {
     // ignore non-native tokens
     if (token.type !== "substrate-native") return false;
     // ignore tokens on chains with no subtensor pallet
-    const [chainMeta] = findChainMeta(miniMetadatas, "substrate-native", allChains[token.networkId]);
-    return chainMeta?.hasSubtensorPallet === true;
+    const miniMetadata = miniMetadatas.get(token.networkId);
+    return miniMetadata?.extra?.hasSubtensorPallet === true;
   }).map(([tokenId]) => tokenId);
 
   // staking can only be done by the native token on chains with the subtensor pallet
@@ -4292,17 +4316,13 @@ async function subscribeSubtensorStaking(chaindataProvider, chainConnector, addr
       continue;
     }
     const chainId = token.networkId;
-    if (!chainId) {
-      log.warn(`Token ${tokenId} has no chain`);
-      continue;
-    }
     const chain = chains[chainId];
     if (!chain) {
       log.warn(`Chain ${chainId} for token ${tokenId} not found`);
       continue;
     }
-    const [chainMeta] = findChainMeta(miniMetadatas, "substrate-native", chain);
-    if (!chainMeta?.miniMetadata) {
+    const miniMetadata = miniMetadatas.get(token.networkId);
+    if (!miniMetadata?.data) {
       log.warn(`MiniMetadata for chain ${chainId} not found`);
       continue;
     }
@@ -4312,7 +4332,7 @@ async function subscribeSubtensorStaking(chaindataProvider, chainConnector, addr
         expectErrors: true
       } // don't pollute the wallet logs when this request fails
       )
-    }, chainMeta.miniMetadata, token, chain.hasCheckMetadataHash, chain.signedExtensions, chain.registryTypes);
+    }, miniMetadata.data, token, chain.hasCheckMetadataHash, chain.signedExtensions, chain.registryTypes);
 
     // sets the number of addresses to query in parallel (per chain, since each chain runs in parallel to the others)
     const concurrency = 4;
@@ -4559,9 +4579,6 @@ const getLockTitle = (lock, {
 
 const moduleType$2 = "substrate-native";
 
-// export const subNativeTokenId = (chainId: ChainId) =>
-//   `${chainId}-substrate-native`.toLowerCase().replace(/ /g, "-")
-
 /**
  * Function to merge two 'sub sources' of the same balance together, or
  * two instances of the same balance with different values.
@@ -4648,10 +4665,10 @@ async function buildQueries$1(chains, tokens, chainStorageCoders, miniMetadatas,
       log.warn(`Chain ${chainId} for token ${tokenId} not found`);
       return outerResult;
     }
-    const [chainMeta] = findChainMeta(miniMetadatas, "substrate-native", chain);
+    const miniMetadata = miniMetadatas.get(chainId);
     const {
       useLegacyTransferableCalculation
-    } = chainMeta ?? {};
+    } = miniMetadata?.extra ?? {};
     addresses.flat().forEach(address => {
       const queryKey = `${tokenId}-${address}`;
       // We share this balanceJson between the base and the lock query for this address
@@ -4931,73 +4948,19 @@ const updateStakingLocksUsingUnbondingLocks = values => {
   return [...otherValues, ...stakingLocks];
 };
 
-const detectMiniMetadataChanges = () => {
-  let previousMap = null;
-  return rxjs.pipe(rxjs.map(currMap => {
-    if (!currMap) return null;
-    const changes = new Set();
-    if (previousMap) {
-      // Check for added or changed keys/values
-      for (const [key, value] of currMap) {
-        if (!previousMap.has(key) || !isEqual__default.default(previousMap.get(key), value)) {
-          changes.add(value.chainId);
-        }
-      }
-
-      // Check for removed keys
-      for (const [key, value] of previousMap) {
-        if (!currMap.has(key)) {
-          changes.add(value.chainId);
-        }
-      }
-    }
-    previousMap = currMap;
-    return changes.size > 0 ? changes : null;
-  }),
-  // Filter out null emissions (no changes)
-  rxjs.filter(changes => changes !== null));
-};
-
-// NOTE: `liveQuery` is not initialized until commonMetadataObservable is subscribed to.
-const commonMetadataObservable = rxjs.from(dexie.liveQuery(() => db.miniMetadatas.where("source").equals("substrate-native").toArray())).pipe(rxjs.map(items => new Map(items.map(item => [item.id, item]))),
-// `refCount: true` will unsubscribe from the DB when commonMetadataObservable has no more subscribers
-rxjs.shareReplay({
-  bufferSize: 1,
-  refCount: true
-}));
 class QueryCache {
+  #chaindataProvider;
+  #chainConnector;
+  miniMetadatas = new Map();
   balanceQueryCache = new Map();
-  metadataSub = null;
-  constructor(chaindataProvider) {
+  // private metadataSub: Subscription | null = null
+
+  constructor(chaindataProvider, chainConnector) {
     this.chaindataProvider = chaindataProvider;
-  }
-  ensureSetup() {
-    if (this.metadataSub) return;
-    this.metadataSub = commonMetadataObservable.pipe(util.firstThenDebounce(500), detectMiniMetadataChanges(), rxjs.combineLatestWith(this.chaindataProvider.tokensObservable), rxjs.distinctUntilChanged()).subscribe(([miniMetadataChanges, tokens]) => {
-      // invalidate cache entries for any chains with new metadata
-      const tokensByChainId = tokens.filter(token => token.type === "substrate-native").reduce((result, token) => {
-        if (!token.networkId) return result;
-        result[token.networkId] ? result[token.networkId].push(token) : result[token.networkId] = [token];
-        return result;
-      }, {});
-      miniMetadataChanges.forEach(chainId => {
-        const chainTokens = tokensByChainId[chainId];
-        if (!chainTokens) return;
-        chainTokens.forEach(token => {
-          const tokenId = token.id;
-          const cacheKeys = this.balanceQueryCache.keys();
-          for (const key of cacheKeys) {
-            if (key.startsWith(`${tokenId}-`)) this.balanceQueryCache.delete(key);
-          }
-        });
-      });
-    });
-  }
-  destroy() {
-    this.metadataSub?.unsubscribe();
+    this.#chaindataProvider = chaindataProvider;
+    this.#chainConnector = chainConnector;
   }
   async getQueries(addressesByToken) {
-    this.ensureSetup();
     const chains = await this.chaindataProvider.chainsById();
     const tokens = await this.chaindataProvider.tokensById();
     const queryResults = Object.entries(addressesByToken).reduce((result, [tokenId, addresses]) => {
@@ -5015,15 +4978,20 @@ class QueryCache {
       existing: [],
       newAddressesByToken: {}
     });
+    const byNetwork = getAddresssesByTokenByNetwork(addressesByToken);
+    for (const networkId of lodash.keys(byNetwork)) {
+      if (this.miniMetadatas.has(networkId)) continue;
+      const miniMetadata = await getMiniMetadata(this.#chaindataProvider, this.#chainConnector, networkId, "substrate-native");
+      this.miniMetadatas.set(networkId, miniMetadata);
+    }
 
     // build queries for token/address pairs which have not been queried before
-    const miniMetadatas = await rxjs.firstValueFrom(commonMetadataObservable);
-    const uniqueChainIds = getUniqueChainIds(queryResults.newAddressesByToken, tokens);
+    // const miniMetadatas = await firstValueFrom(commonMetadataObservable)
+    const uniqueChainIds = lodash.keys(byNetwork); // getUniqueChainIds(queryResults.newAddressesByToken, tokens)
     const chainStorageCoders = buildStorageCoders({
       chainIds: uniqueChainIds,
       chains,
-      miniMetadatas,
-      moduleType: "substrate-native",
+      miniMetadatas: this.miniMetadatas,
       coders: {
         base: ["System", "Account"],
         stakingLedger: ["Staking", "Ledger"],
@@ -5033,7 +5001,7 @@ class QueryCache {
         freezes: ["Balances", "Freezes"]
       }
     });
-    const queries = await buildQueries$1(chains, tokens, chainStorageCoders, miniMetadatas, queryResults.newAddressesByToken);
+    const queries = await buildQueries$1(chains, tokens, chainStorageCoders, this.miniMetadatas, queryResults.newAddressesByToken);
     // now update the cache
     Object.entries(queries).forEach(([key, query]) => {
       this.balanceQueryCache.set(key, query);
@@ -5084,6 +5052,10 @@ const getChainProperties = async (chainConnector, networkId) => {
 
 const POLLING_WINDOW_SIZE = 20;
 const MAX_SUBSCRIPTION_SIZE = 40;
+const UNSUPPORTED_CHAIN_META$1 = {
+  miniMetadata: null,
+  extra: null
+};
 const SubNativeModule = hydrate => {
   const {
     chainConnectors,
@@ -5091,7 +5063,7 @@ const SubNativeModule = hydrate => {
   } = hydrate;
   const chainConnector$1 = chainConnectors.substrate;
   util$1.assert(chainConnector$1, "This module requires a substrate chain connector");
-  const queryCache = new QueryCache(chaindataProvider$1);
+  const queryCache = new QueryCache(chaindataProvider$1, chainConnector$1);
   const getModuleTokens = async () => {
     return await chaindataProvider$1.tokensByIdForType(moduleType$2);
   };
@@ -5269,13 +5241,13 @@ const SubNativeModule = hydrate => {
   return {
     ...DefaultBalanceModule(moduleType$2),
     async fetchSubstrateChainMeta(chainId, moduleConfig, metadataRpc) {
-      if (!metadataRpc) return {};
+      if (!metadataRpc) return UNSUPPORTED_CHAIN_META$1;
 
       //
       // process metadata into SCALE encoders/decoders
       //
       const metadataVersion = scale.getMetadataVersion(metadataRpc);
-      if (metadataVersion < 14) return {};
+      if (metadataVersion < 14) return UNSUPPORTED_CHAIN_META$1;
       const metadata = scale.decAnyMetadata(metadataRpc);
       const unifiedMetadata = scale.unifyMetadata(metadata);
 
@@ -5342,18 +5314,17 @@ const SubNativeModule = hydrate => {
       }) => name === "Freezes"));
       const useLegacyTransferableCalculation = !hasFreezesItem;
       const chainMeta = {
-        // isTestnet,
-        useLegacyTransferableCalculation,
-        // symbol,
-        // decimals,
-        existentialDeposit,
-        nominationPoolsPalletId,
-        crowdloanPalletId,
-        hasSubtensorPallet,
-        miniMetadata
+        miniMetadata,
+        extra: {
+          useLegacyTransferableCalculation,
+          existentialDeposit,
+          nominationPoolsPalletId,
+          crowdloanPalletId,
+          hasSubtensorPallet
+        }
       };
-      if (!useLegacyTransferableCalculation) delete chainMeta.useLegacyTransferableCalculation;
-      if (!hasSubtensorPallet) delete chainMeta.hasSubtensorPallet;
+      if (!useLegacyTransferableCalculation) delete chainMeta.extra?.useLegacyTransferableCalculation;
+      if (!hasSubtensorPallet) delete chainMeta.extra?.hasSubtensorPallet;
       return chainMeta;
     },
     async fetchSubstrateChainTokens(chainId, chainMeta, moduleConfig) {
@@ -5364,7 +5335,7 @@ const SubNativeModule = hydrate => {
       } = await getChainProperties(chainConnector$1, chainId);
       const {
         existentialDeposit
-      } = chainMeta;
+      } = chainMeta.extra ?? {};
       const id = chaindataProvider.subNativeTokenId(chainId);
       const nativeToken = {
         id,
@@ -5390,19 +5361,11 @@ const SubNativeModule = hydrate => {
       initialBalances
     }, callback) {
       util$1.assert(chainConnectors.substrate, "This module requires a substrate chain connector");
-      const addressesByTokenByNetwork = lodash.keys(addressesByToken).reduce((acc, tokenId) => {
-        const networkId = chaindataProvider.parseSubNativeTokenId(tokenId).networkId;
-        if (!acc[networkId]) acc[networkId] = {};
-        acc[networkId][tokenId] = addressesByToken[tokenId];
-        return acc;
-      }, {});
+      const addressesByTokenByNetwork = getAddresssesByTokenByNetwork(addressesByToken);
       const initialBalancesByNetwork = lodash.groupBy(initialBalances ?? [], "networkId");
-      const {
-        abort,
-        signal
-      } = new AbortController();
+      const controller = new AbortController();
       const safeCallback = (error, result) => {
-        if (signal.aborted) return;
+        if (controller.signal.aborted) return;
         // typescript isnt happy with fowarding parameters as is
         return error ? callback(error, undefined) : callback(error, result);
       };
@@ -5410,19 +5373,19 @@ const SubNativeModule = hydrate => {
         try {
           // this is what we want to be done separately for each network
           // this will update the DB so minimetadata will be available when it's used, veeeeery far down the tree of subscribeChainBalances
-          await getMiniMetadata(chaindataProvider$1, chainConnector$1, networkId, moduleType$2, signal);
+          await getMiniMetadata(chaindataProvider$1, chainConnector$1, networkId, moduleType$2, controller.signal);
         } catch (err) {
-          if (!signal.aborted) log.warn("Failed to get native token miniMetadata for network", networkId, err);
+          if (!controller.signal.aborted) log.warn("Failed to get native token miniMetadata for network", networkId, err);
           return () => {};
         }
-        if (signal.aborted) return () => {};
+        if (controller.signal.aborted) return () => {};
         return subscribeChainBalances(networkId, {
           addressesByToken: addressesByTokenByNetwork[networkId] ?? {},
           initialBalances: initialBalancesByNetwork[networkId] ?? []
         }, safeCallback);
       }));
       return () => {
-        abort();
+        controller.abort();
         unsubsribeFns.then(fns => fns.forEach(unsubscribe => unsubscribe()));
       };
     },
@@ -6651,7 +6614,11 @@ const SubPsp22Module = hydrate => {
   return {
     ...DefaultBalanceModule(moduleType$1),
     async fetchSubstrateChainMeta(_chainId) {
-      return undefined;
+      // we dont need anything
+      return {
+        miniMetadata: null,
+        extra: null
+      };
     },
     async fetchSubstrateChainTokens(chainId, _chainMeta, moduleConfig) {
       // const { isTestnet } = chainMeta
@@ -6885,6 +6852,10 @@ const fetchBalances = async (chainConnector, tokens, addressesByToken) => {
 
 const moduleType = "substrate-tokens";
 const defaultPalletId = "Tokens";
+const UNSUPPORTED_CHAIN_META = {
+  miniMetadata: null,
+  extra: {}
+};
 const SubTokensModule = hydrate => {
   const {
     chainConnectors,
@@ -6895,7 +6866,7 @@ const SubTokensModule = hydrate => {
   return {
     ...DefaultBalanceModule(moduleType),
     async fetchSubstrateChainMeta(chainId, moduleConfig, metadataRpc) {
-      if (metadataRpc === undefined) return {};
+      if (metadataRpc === undefined) return UNSUPPORTED_CHAIN_META;
       const metadata = scale.decAnyMetadata(metadataRpc);
       const palletId = moduleConfig?.palletId ?? defaultPalletId;
       scale.compactMetadata(metadata, [{
@@ -6903,11 +6874,11 @@ const SubTokensModule = hydrate => {
         items: ["Accounts"]
       }]);
       const miniMetadata = scale.encodeMetadata(metadata);
-      return palletId === defaultPalletId ? {
-        miniMetadata
-      } : {
-        palletId,
-        miniMetadata
+      return {
+        miniMetadata,
+        extra: {
+          palletId
+        }
       };
     },
     async fetchSubstrateChainTokens(chainId, chainMeta, moduleConfig) {
@@ -6997,9 +6968,8 @@ const SubTokensModule = hydrate => {
       const chainId = token.networkId;
       const chain = await chaindataProvider$1.chainById(chainId);
       util$1.assert(chain?.genesisHash, `Chain ${chainId} not found in store`);
-      const miniMetadatas = new Map((await db.miniMetadatas.toArray()).map(miniMetadata => [miniMetadata.id, miniMetadata]));
-      const [chainMeta] = findChainMeta(miniMetadatas, moduleType, chain);
-      const tokensPallet = chainMeta?.palletId ?? defaultPalletId;
+      const miniMetadata = await getMiniMetadata(chaindataProvider$1, chainConnector, chainId, moduleType);
+      const tokensPallet = miniMetadata?.extra?.palletId ?? defaultPalletId;
       const onChainId = (() => {
         try {
           return scale.papiParse(token.onChainId);
@@ -7104,8 +7074,7 @@ async function buildNetworkQueries(networkId, chainConnector, chaindataProvider,
   const tokens = await chaindataProvider.tokensById();
   if (!chain) return [];
   signal?.throwIfAborted();
-  const tokensMetadata = miniMetadata;
-  const palletId = tokensMetadata.palletId ?? defaultPalletId;
+  const palletId = miniMetadata.extra.palletId ?? defaultPalletId;
   const networkStorageCoders = buildNetworkStorageCoders(networkId, miniMetadata, {
     storage: [palletId, "Accounts"]
   });
@@ -7196,6 +7165,7 @@ exports.EvmNativeModule = EvmNativeModule;
 exports.EvmTokenFetcher = EvmTokenFetcher;
 exports.EvmUniswapV2Module = EvmUniswapV2Module;
 exports.FiatSumBalancesFormatter = FiatSumBalancesFormatter;
+exports.MiniMetadataBaseSchema = MiniMetadataBaseSchema;
 exports.ONE_ALPHA_TOKEN = ONE_ALPHA_TOKEN;
 exports.PlanckSumBalancesFormatter = PlanckSumBalancesFormatter;
 exports.RpcStateQueryHelper = RpcStateQueryHelper;
@@ -7230,7 +7200,6 @@ exports.excludeFromFeePayableLocks = excludeFromFeePayableLocks;
 exports.excludeFromTransferableAmount = excludeFromTransferableAmount;
 exports.filterBaseLocks = filterBaseLocks;
 exports.filterMirrorTokens = filterMirrorTokens;
-exports.findChainMeta = findChainMeta;
 exports.getBalanceId = getBalanceId;
 exports.getLockTitle = getLockTitle;
 exports.getUniqueChainIds = getUniqueChainIds;