@talismn/balances 0.0.0-pr2043-20250619165342 → 0.0.0-pr2043-20250620074243

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

@@ -16,17 +16,16 @@ var txwrapperCore = require('@substrate/txwrapper-core');
 var scale = require('@talismn/scale');
 var camelCase = require('lodash/camelCase');
 var PQueue = require('p-queue');
+var z = require('zod/v4');
 var sapi = require('@talismn/sapi');
 var types = require('@polkadot/types');
 var groupBy = require('lodash/groupBy');
 var utils = require('@polkadot-api/utils');
 var polkadotApi = require('polkadot-api');
-var PromisePool = require('@supercharge/promise-pool');
 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 }; }
@@ -37,10 +36,9 @@ var pako__default = /*#__PURE__*/_interopDefault(pako);
 var isEqual__default = /*#__PURE__*/_interopDefault(isEqual);
 var camelCase__default = /*#__PURE__*/_interopDefault(camelCase);
 var PQueue__default = /*#__PURE__*/_interopDefault(PQueue);
+var z__default = /*#__PURE__*/_interopDefault(z);
 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
 
@@ -128,7 +126,7 @@ class EvmTokenFetcher {
 
 var pkg = {
 	name: "@talismn/balances",
-	version: "0.0.0-pr2043-20250619165342"};
+	version: "0.0.0-pr2043-20250620074243"};
 
 var log = anylogger__default.default(pkg.name);
 
@@ -1032,6 +1030,10 @@ class TalismanBalancesDatabase extends dexie.Dexie {
 }
 const db = new TalismanBalancesDatabase();
 
+const TokenConfigBaseSchema = chaindataProvider.TokenBaseSchema.partial().omit({
+  id: true
+});
+
 const erc20Abi = [{
   constant: true,
   inputs: [],
@@ -1263,6 +1265,20 @@ const erc20Abi = [{
 const erc20BalancesAggregatorAbi = viem.parseAbi(["struct AccountToken {address account; address token;}", "function balances(AccountToken[] memory accountTokens) public view returns (uint256[] memory)"]);
 
 const moduleType$7 = "evm-erc20";
+// {
+//   tokens?: Array<
+//     {
+//       symbol?: string
+//       decimals?: number
+//       name?: string
+//       contractAddress?: `0x${string}`
+//     } & BalancesConfigTokenParams
+//   >
+// }
+
+const EvmErc20TokenConfigSchema = TokenConfigBaseSchema.extend({
+  contractAddress: chaindataProvider.EvmErc20TokenSchema.shape.contractAddress
+});
 const EvmErc20Module = hydrate => {
   const {
     chainConnectors,
@@ -1308,11 +1324,11 @@ const EvmErc20Module = hydrate => {
      * This method is currently executed on [a squid](https://github.com/TalismanSociety/chaindata-squid/blob/0ee02818bf5caa7362e3f3664e55ef05ec8df078/src/steps/updateEvmNetworksFromGithub.ts#L338-L343).
      * In a future version of the balance libraries, we may build some kind of async scheduling system which will keep the list of tokens for each chain up to date without relying on a squid.
      */
-    async fetchEvmChainTokens(chainId, _chainMeta, moduleConfig) {
+    async fetchEvmChainTokens(chainId, _chainMeta, moduleConfig, tokens) {
       //const { isTestnet } = chainMeta
 
       const chainTokens = {};
-      for (const tokenConfig of moduleConfig?.tokens ?? []) {
+      for (const tokenConfig of tokens ?? []) {
         const {
           contractAddress,
           symbol: contractSymbol,
@@ -1596,6 +1612,7 @@ 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";
+const EvmNativeTokenConfigSchema = TokenConfigBaseSchema;
 const EvmNativeModule = hydrate => {
   const {
     chainConnectors,
@@ -1623,29 +1640,34 @@ const EvmNativeModule = hydrate => {
      * This method is currently executed on [a squid](https://github.com/TalismanSociety/chaindata-squid/blob/0ee02818bf5caa7362e3f3664e55ef05ec8df078/src/steps/updateEvmNetworksFromGithub.ts#L338-L343).
      * In a future version of the balance libraries, we may build some kind of async scheduling system which will keep the list of tokens for each chain up to date without relying on a squid.
      */
-    async fetchEvmChainTokens(networkId, chainMeta, moduleConfig) {
-      const symbol = moduleConfig?.symbol ?? "ETH";
-      const decimals = typeof moduleConfig?.decimals === "number" ? moduleConfig.decimals : 18;
-      const name = moduleConfig?.name ?? symbol;
-      const id = chaindataProvider.evmNativeTokenId(networkId);
-      const nativeToken = {
-        platform: "ethereum",
-        id,
-        type: "evm-native",
-        isDefault: true,
-        symbol,
-        decimals,
-        name,
-        logo: moduleConfig?.logo,
-        networkId
-      };
-      if (moduleConfig?.symbol) nativeToken.symbol = moduleConfig?.symbol;
-      if (moduleConfig?.coingeckoId) nativeToken.coingeckoId = moduleConfig?.coingeckoId;
-      if (moduleConfig?.mirrorOf) nativeToken.mirrorOf = moduleConfig?.mirrorOf;
-      if (moduleConfig?.noDiscovery) nativeToken.noDiscovery = moduleConfig?.noDiscovery;
-      return {
-        [nativeToken.id]: nativeToken
-      };
+    async fetchEvmChainTokens() {
+      //  networkId, chainMeta, moduleConfig, tokens
+      // TODO ? seems unneeded, this info is set on the EthNetworkConfig["nativeCurrency"] field
+      return {};
+
+      // const symbol = moduleConfig?.symbol ?? "ETH"
+      // const decimals = typeof moduleConfig?.decimals === "number" ? moduleConfig.decimals : 18
+      // const name = moduleConfig?.name ?? symbol
+
+      // const id = evmNativeTokenId(networkId)
+      // const nativeToken: EvmNativeToken = {
+      //   platform: "ethereum",
+      //   id,
+      //   type: "evm-native",
+      //   isDefault: true,
+      //   symbol,
+      //   decimals,
+      //   name,
+      //   logo: moduleConfig?.logo,
+      //   networkId,
+      // }
+
+      // if (moduleConfig?.symbol) nativeToken.symbol = moduleConfig?.symbol
+      // if (moduleConfig?.coingeckoId) nativeToken.coingeckoId = moduleConfig?.coingeckoId
+      // if (moduleConfig?.mirrorOf) nativeToken.mirrorOf = moduleConfig?.mirrorOf
+      // if (moduleConfig?.noDiscovery) nativeToken.noDiscovery = moduleConfig?.noDiscovery
+
+      // return { [nativeToken.id]: nativeToken }
     },
     async subscribeBalances({
       addressesByToken,
@@ -2387,6 +2409,36 @@ const uniswapV2PairAbi = [{
 }];
 
 const moduleType$5 = "evm-uniswapv2";
+const EvmUniswapV2TokenConfigSchema = TokenConfigBaseSchema.extend({
+  contractAddress: chaindataProvider.EvmUniswapV2TokenSchema.shape.contractAddress,
+  // the ones below are unused and prone to error, feels better to always fetch these from chain
+  symbol0: chaindataProvider.EvmUniswapV2TokenSchema.shape.symbol0.optional(),
+  symbol1: chaindataProvider.EvmUniswapV2TokenSchema.shape.symbol1.optional(),
+  decimals0: chaindataProvider.EvmUniswapV2TokenSchema.shape.decimals0.optional(),
+  decimals1: chaindataProvider.EvmUniswapV2TokenSchema.shape.decimals1.optional(),
+  tokenAddress0: chaindataProvider.EvmUniswapV2TokenSchema.shape.tokenAddress0.optional(),
+  tokenAddress1: chaindataProvider.EvmUniswapV2TokenSchema.shape.tokenAddress1.optional(),
+  coingeckoId0: chaindataProvider.EvmUniswapV2TokenSchema.shape.coingeckoId0.optional(),
+  coingeckoId1: chaindataProvider.EvmUniswapV2TokenSchema.shape.coingeckoId1.optional()
+});
+
+//  {
+//   pools?: Array<
+//     {
+//       contractAddress?: `0x${string}`
+//       decimals?: number
+//       symbol0?: string
+//       symbol1?: string
+//       decimals0?: number
+//       decimals1?: number
+//       tokenAddress0?: `0x${string}`
+//       tokenAddress1?: `0x${string}`
+//       coingeckoId0?: string
+//       coingeckoId1?: string
+//     } & BalancesConfigTokenParams
+//   >
+// }
+
 const EvmUniswapV2Module = hydrate => {
   const {
     chainConnectors,
@@ -2402,9 +2454,9 @@ const EvmUniswapV2Module = hydrate => {
         extra: null
       };
     },
-    async fetchEvmChainTokens(chainId, _chainMeta, moduleConfig) {
+    async fetchEvmChainTokens(chainId, _chainMeta, moduleConfig, pools) {
       const tokens = {};
-      for (const tokenConfig of moduleConfig?.pools ?? []) {
+      for (const tokenConfig of pools ?? []) {
         const {
           contractAddress,
           decimals,
@@ -2694,12 +2746,15 @@ const getSpecVersion = async (chainConnector, networkId) => {
 const CACHE$1 = new Map();
 const getMetadataRpc = async (chainConnector, networkId) => {
   if (CACHE$1.has(networkId)) return CACHE$1.get(networkId);
-  const pResult = sapi.fetchBestMetadata((...args) => chainConnector.send(networkId, ...args), true // allow fallback to 14 as modules dont use any v15 or v16 specifics yet
+  const pResult = sapi.fetchBestMetadata((method, params, isCacheable) => chainConnector.send(networkId, method, params, isCacheable, {
+    expectErrors: true
+  }), true // allow fallback to 14 as modules dont use any v15 or v16 specifics yet
   );
   CACHE$1.set(networkId, pResult);
   try {
     return await pResult;
   } catch (cause) {
+    if (util.isAbortError(cause)) throw cause;
     throw new Error(`Failed to fetch metadataRpc for network ${networkId}`, {
       cause
     });
@@ -2717,6 +2772,8 @@ const POOL = new PQueue__default.default({
 });
 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
+  );
   const pResult = POOL.add(() => fetchMiniMetadatas(chainConnector, chaindataProvider, networkId, specVersion), {
     signal
   });
@@ -2724,6 +2781,7 @@ const getMiniMetadatas = async (chainConnector, chaindataProvider, networkId, sp
   try {
     return await pResult;
   } catch (cause) {
+    if (util.isAbortError(cause)) throw cause;
     throw new Error(`Failed to fetch metadataRpc for network ${networkId}`, {
       cause
     });
@@ -2731,9 +2789,10 @@ const getMiniMetadatas = async (chainConnector, chaindataProvider, networkId, sp
     CACHE.delete(networkId);
   }
 };
+const DotBalanceModuleTypeSchema = z__default.default.keyof(chaindataProvider.DotNetworkBalancesConfigSchema);
 const fetchMiniMetadatas = async (chainConnector, chaindataProvider, chainId, specVersion, signal) => {
   const start = performance.now();
-  log.debug("[miniMetadata] fetching minimetadatas for %s", chainId);
+  log.info("[miniMetadata] fetching minimetadatas for %s", chainId);
   try {
     const metadataRpc = await getMetadataRpc(chainConnector, chainId);
     signal?.throwIfAborted();
@@ -2744,10 +2803,14 @@ const fetchMiniMetadatas = async (chainConnector, chaindataProvider, chainId, sp
     const modules = defaultBalanceModules.map(mod => mod({
       chainConnectors,
       chaindataProvider
-    })).filter(mod => mod.type.startsWith("substrate-"));
+    })).filter(mod => DotBalanceModuleTypeSchema.safeParse(mod.type).success);
     return Promise.all(modules.map(async mod => {
       const source = mod.type;
-      const chainMeta = await mod.fetchSubstrateChainMeta(chainId, {}, metadataRpc);
+      const chain = await chaindataProvider.chainById(chainId);
+      const balancesConfig = chain?.balancesConfig?.[mod.type];
+      const chainMeta = await mod.fetchSubstrateChainMeta(chainId, balancesConfig,
+      // TODO fix typings
+      metadataRpc);
       return {
         id: deriveMiniMetadataId({
           source,
@@ -3073,10 +3136,23 @@ const decompress = data => {
 };
 
 const moduleType$4 = "substrate-assets";
+const SubAssetsTokenConfigSchema = TokenConfigBaseSchema.extend({
+  assetId: chaindataProvider.SubAssetsTokenSchema.shape.assetId,
+  existentialDeposit: chaindataProvider.SubAssetsTokenSchema.shape.existentialDeposit
+});
 const UNSUPPORTED_CHAIN_META$3 = {
   miniMetadata: null,
   extra: null
 };
+
+//  {
+//   tokens?: Array<
+//     {
+//       assetId: number | string
+//     } & BalancesConfigTokenParams
+//   >
+// }
+
 const SubAssetsModule = hydrate => {
   const {
     chainConnectors,
@@ -3100,8 +3176,8 @@ const SubAssetsModule = hydrate => {
         extra: null
       };
     },
-    async fetchSubstrateChainTokens(chainId, chainMeta, moduleConfig) {
-      if ((moduleConfig?.tokens ?? []).length < 1) return {};
+    async fetchSubstrateChainTokens(chainId, chainMeta, moduleConfig, tokens) {
+      if (!tokens?.length) return {};
       const {
         miniMetadata
       } = chainMeta;
@@ -3110,8 +3186,8 @@ const SubAssetsModule = hydrate => {
       const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
       const assetCoder = scaleBuilder.buildStorage("Assets", "Asset");
       const metadataCoder = scaleBuilder.buildStorage("Assets", "Metadata");
-      const tokens = {};
-      for (const tokenConfig of moduleConfig?.tokens ?? []) {
+      const tokenList = {};
+      for (const tokenConfig of tokens ?? []) {
         try {
           const assetId = String(tokenConfig.assetId);
           const assetStateKey = tryEncode(assetCoder, BigInt(assetId)) ?? tryEncode(assetCoder, assetId);
@@ -3143,13 +3219,13 @@ const SubAssetsModule = hydrate => {
           }
           if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
           if (tokenConfig?.mirrorOf) token.mirrorOf = tokenConfig?.mirrorOf;
-          tokens[token.id] = token;
+          tokenList[token.id] = token;
         } catch (error) {
           log.error(`Failed to build substrate-assets token ${tokenConfig.assetId} (${tokenConfig.symbol}) on ${chainId}`, error);
           continue;
         }
       }
-      return tokens;
+      return tokenList;
     },
     // TODO: Don't create empty subscriptions
     async subscribeBalances({
@@ -3179,10 +3255,10 @@ const SubAssetsModule = hydrate => {
         }
       }));
       return () => {
-        controller.abort();
         pUnsubs.then(unsubs => {
           unsubs.forEach(unsubscribe => unsubscribe());
         });
+        controller.abort();
       };
     },
     async fetchBalances(addressesByToken) {
@@ -3366,6 +3442,19 @@ const UNSUPPORTED_CHAIN_META$2 = {
   miniMetadata: null,
   extra: null
 };
+const SubForeignAssetsTokenConfigSchema = TokenConfigBaseSchema.extend({
+  onChainId: chaindataProvider.SubForeignAssetsTokenSchema.shape.onChainId,
+  existentialDeposit: chaindataProvider.SubForeignAssetsTokenSchema.shape.existentialDeposit
+});
+
+//  {
+//   tokens?: Array<
+//     {
+//       onChainId: string
+//     } & BalancesConfigTokenParams
+//   >
+// }
+
 const SubForeignAssetsModule = hydrate => {
   const {
     chainConnectors,
@@ -3390,8 +3479,8 @@ const SubForeignAssetsModule = hydrate => {
         extra: null
       };
     },
-    async fetchSubstrateChainTokens(chainId, chainMeta, moduleConfig) {
-      if ((moduleConfig?.tokens ?? []).length < 1) return {};
+    async fetchSubstrateChainTokens(chainId, chainMeta, moduleConfig, tokens) {
+      if (!tokens?.length) return {};
       const {
         miniMetadata
       } = chainMeta;
@@ -3401,8 +3490,8 @@ const SubForeignAssetsModule = hydrate => {
       const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(unifiedMetadata));
       const assetCoder = scaleBuilder.buildStorage("ForeignAssets", "Asset");
       const metadataCoder = scaleBuilder.buildStorage("ForeignAssets", "Metadata");
-      const tokens = {};
-      for (const tokenConfig of moduleConfig?.tokens ?? []) {
+      const tokenList = {};
+      for (const tokenConfig of tokens ?? []) {
         try {
           const onChainId = (() => {
             try {
@@ -3437,13 +3526,13 @@ const SubForeignAssetsModule = hydrate => {
           };
           if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
           if (tokenConfig?.mirrorOf) token.mirrorOf = tokenConfig?.mirrorOf;
-          tokens[token.id] = token;
+          tokenList[token.id] = token;
         } catch (error) {
           log.error(`Failed to build substrate-foreignassets token ${tokenConfig.onChainId} (${tokenConfig.symbol}) on ${chainId}`, error?.message ?? error);
           continue;
         }
       }
-      return tokens;
+      return tokenList;
     },
     // TODO: Don't create empty subscriptions
     async subscribeBalances({
@@ -3472,10 +3561,10 @@ const SubForeignAssetsModule = hydrate => {
         }
       }));
       return () => {
-        controller.abort();
         pUnsubs.then(unsubs => {
           unsubs.forEach(unsubscribe => unsubscribe());
         });
+        controller.abort();
       };
     },
     async fetchBalances(addressesByToken) {
@@ -3662,263 +3751,6 @@ const asObservable = handler => (...args) => new rxjs.Observable(subscriber => {
   return unsubscribe;
 });
 
-/**
- * Crowdloan contributions are stored in the `childstate` key returned by this function.
- */
-const crowdloanFundContributionsChildKey = fundIndex => util$1.u8aToHex(util$1.u8aConcat(":child_storage:default:", utilCrypto.blake2AsU8a(util$1.u8aConcat("crowdloan", scaleTs.u32.enc(fundIndex)))));
-
-// 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 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
-  const addressesByCrowdloanToken = Object.fromEntries(Object.entries(addressesByToken)
-  // remove ethereum addresses
-  .map(([tokenId, addresses]) => [tokenId, addresses.filter(address => !util.isEthereumAddress(address))])
-  // remove tokens which aren't crowdloan tokens
-  .filter(([tokenId]) => crowdloanTokenIds.includes(tokenId)));
-  const uniqueChainIds = getUniqueChainIds(addressesByCrowdloanToken, tokens);
-  const chains = Object.fromEntries(Object.entries(allChains).filter(([chainId]) => uniqueChainIds.includes(chainId)));
-  const chainStorageCoders = buildStorageCoders({
-    chainIds: uniqueChainIds,
-    chains,
-    miniMetadatas,
-    coders: {
-      parachains: ["Paras", "Parachains"],
-      funds: ["Crowdloan", "Funds"]
-    }
-  });
-  const tokenSubscriptions = [];
-  for (const [tokenId, addresses] of Object.entries(addressesByCrowdloanToken)) {
-    const token = tokens[tokenId];
-    if (!token) {
-      log.warn(`Token ${tokenId} not found`);
-      continue;
-    }
-    if (token.type !== "substrate-native") {
-      log.debug(`This module doesn't handle tokens of type ${token.type}`);
-      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 subscribeParaIds = callback => {
-      const scaleCoder = chainStorageCoders.get(chainId)?.parachains;
-      const queries = [0].flatMap(() => {
-        const stateKey = scale.encodeStateKey(scaleCoder);
-        if (!stateKey) return [];
-        const decodeResult = change => {
-          /** NOTE: This type is only a hint for typescript, the chain can actually return whatever it wants to */
-
-          const decoded = scale.decodeScale(scaleCoder, change, `Failed to decode parachains on chain ${chainId}`);
-          const paraIds = decoded ?? [];
-          return paraIds;
-        };
-        return {
-          chainId,
-          stateKey,
-          decodeResult
-        };
-      });
-      const subscription = new RpcStateQueryHelper(chainConnector, queries).subscribe(callback);
-      return () => subscription.then(unsubscribe => unsubscribe());
-    };
-    const subscribeParaFundIndexes = (paraIds, callback) => {
-      const scaleCoder = chainStorageCoders.get(chainId)?.funds;
-      const queries = paraIds.flatMap(paraId => {
-        const stateKey = scale.encodeStateKey(scaleCoder, `Invalid paraId in ${chainId} funds query ${paraId}`, paraId);
-        if (!stateKey) return [];
-        const decodeResult = change => {
-          /** NOTE: This type is only a hint for typescript, the chain can actually return whatever it wants to */
-
-          const decoded = scale.decodeScale(scaleCoder, change, `Failed to decode paras on chain ${chainId}`);
-          const firstPeriod = decoded?.first_period?.toString?.() ?? "";
-          const lastPeriod = decoded?.last_period?.toString?.() ?? "";
-          const fundPeriod = `${firstPeriod}-${lastPeriod}`;
-          const fundIndex = decoded?.fund_index ?? decoded?.trie_index;
-          return {
-            paraId,
-            fundPeriod,
-            fundIndex
-          };
-        };
-        return {
-          chainId,
-          stateKey,
-          decodeResult
-        };
-      });
-      const subscription = new RpcStateQueryHelper(chainConnector, queries).subscribe(callback);
-      return () => subscription.then(unsubscribe => unsubscribe());
-    };
-    const subscribeFundContributions = (funds, addresses, callback) => {
-      // TODO: Watch system_events in order to subscribe to changes, then redo the contributions query when changes are detected:
-      // https://github.com/polkadot-js/api/blob/8fe02a14345b57e6abb8f7f2c2b624cf70c51b23/packages/api-derive/src/crowdloan/ownContributions.ts#L32-L47
-      //
-      // For now we just re-fetch all contributions on a timer and then only send them to the subscription callback when they have changed
-
-      const queries = funds.map(({
-        paraId,
-        fundIndex
-      }) => ({
-        paraId,
-        fundIndex,
-        addresses,
-        childKey: crowdloanFundContributionsChildKey(fundIndex),
-        storageKeys: addresses.map(address => util$1.u8aToHex(util.decodeAnyAddress(address)))
-      }));
-
-      // track whether our caller is still subscribed
-      let subscriptionActive = true;
-      let previousContributions = null;
-      const fetchContributions = async () => {
-        try {
-          const results = await Promise.all(queries.map(async ({
-            paraId,
-            fundIndex,
-            addresses,
-            childKey,
-            storageKeys
-          }) => ({
-            paraId,
-            fundIndex,
-            addresses,
-            result: await chainConnector.send(chainId, "childstate_getStorageEntries", [childKey, storageKeys])
-          })));
-          const contributions = results.flatMap(queryResult => {
-            const {
-              paraId,
-              fundIndex,
-              addresses,
-              result
-            } = queryResult;
-            return (Array.isArray(result) ? result : []).flatMap((encoded, index) => {
-              const amount = (() => {
-                try {
-                  return typeof encoded === "string" ? scaleTs.u128.dec(encoded) ?? 0n : 0n;
-                } catch {
-                  return 0n;
-                }
-              })().toString();
-              return {
-                paraId,
-                fundIndex,
-                address: addresses[index],
-                amount
-              };
-            });
-          });
-
-          // ignore these results if our caller has tried to close this subscription
-          if (!subscriptionActive) return;
-
-          // ignore these results if they're the same as what we previously fetched
-          if (isEqual__default.default(previousContributions, contributions)) return;
-          previousContributions = contributions;
-          callback(null, contributions);
-        } catch (error) {
-          callback(error);
-        }
-      };
-
-      // set up polling for contributions
-      const crowdloanContributionsPollInterval = 60_000; // 60_000ms === 1 minute
-      const pollContributions = async () => {
-        if (!subscriptionActive) return;
-        try {
-          await fetchContributions();
-        } catch (error) {
-          // log any errors, but don't cancel the poll for contributions when one fetch fails
-          log.error(error);
-        }
-        if (!subscriptionActive) return;
-        setTimeout(pollContributions, crowdloanContributionsPollInterval);
-      };
-
-      // start polling
-      pollContributions();
-      return () => {
-        // stop polling
-        subscriptionActive = false;
-      };
-    };
-    const paraIds$ = asObservable(subscribeParaIds)().pipe(rxjs.scan((_, next) => Array.from(new Set(next.flatMap(paraIds => paraIds))), []), rxjs.share());
-    const fundIndexesByParaId$ = paraIds$.pipe(rxjs.map(paraIds => asObservable(subscribeParaFundIndexes)(paraIds)), rxjs.switchAll(), rxjs.scan((state, next) => {
-      for (const fund of next) {
-        const {
-          paraId,
-          fundIndex
-        } = fund;
-        if (typeof fundIndex === "number") {
-          state.set(paraId, (state.get(paraId) ?? new Set()).add(fundIndex));
-        }
-      }
-      return state;
-    }, new Map()));
-    const contributionsByAddress$ = fundIndexesByParaId$.pipe(rxjs.map(fundIndexesByParaId => Array.from(fundIndexesByParaId).flatMap(([paraId, fundIndexes]) => Array.from(fundIndexes).map(fundIndex => ({
-      paraId,
-      fundIndex
-    })))), rxjs.map(funds => asObservable(subscribeFundContributions)(funds, addresses)), rxjs.switchAll(), rxjs.scan((state, next) => {
-      for (const contribution of next) {
-        const {
-          address
-        } = contribution;
-        state.set(address, (state.get(address) ?? new Set()).add(contribution));
-      }
-      return state;
-    }, new Map()));
-    const subscription = contributionsByAddress$.subscribe({
-      next: contributionsByAddress => {
-        const balances = Array.from(contributionsByAddress).map(([address, contributions]) => {
-          return {
-            source: "substrate-native",
-            status: "live",
-            address,
-            networkId: chainId,
-            tokenId,
-            values: Array.from(contributions).map(({
-              amount,
-              paraId
-            }) => ({
-              type: "crowdloan",
-              label: "crowdloan",
-              source: "crowdloan",
-              amount: amount,
-              meta: {
-                paraId
-              }
-            }))
-          };
-        });
-        if (balances.length > 0) callback(null, balances);
-      },
-      error: error => callback(error)
-    });
-    tokenSubscriptions.push(() => subscription.unsubscribe());
-  }
-  return () => tokenSubscriptions.forEach(unsub => unsub());
-}
-
 /**
  * Each nominationPool in the nominationPools pallet has access to some accountIds which have no
  * associated private key. Instead, they are derived from this function.
@@ -3950,6 +3782,7 @@ async function subscribeNompoolStaking(chaindataProvider$1, chainConnector, addr
     const miniMetadata = await getMiniMetadata(chaindataProvider$1, chainConnector, networkId, "substrate-native");
     miniMetadatas.set(networkId, miniMetadata);
   }
+  signal?.throwIfAborted();
   const nomPoolTokenIds = Object.entries(tokens).filter(([, token]) => {
     // ignore non-native tokens
     if (token.type !== "substrate-native") return false;
@@ -4267,9 +4100,10 @@ async function subscribeSubtensorStaking(chaindataProvider$1, chainConnector, ad
   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");
+    const miniMetadata = await getMiniMetadata(chaindataProvider$1, chainConnector, networkId, "substrate-native", signal);
     miniMetadatas.set(networkId, miniMetadata);
   }
+  signal?.throwIfAborted();
   const subtensorTokenIds = Object.entries(tokens).filter(([, token]) => {
     // ignore non-native tokens
     if (token.type !== "substrate-native") return false;
@@ -4475,7 +4309,9 @@ async function subscribeSubtensorStaking(chaindataProvider$1, chainConnector, ad
     });
 
     // use the abortController to tear the subscription down when we don't need it anymore
-    abortController.signal.onabort = () => subscription.unsubscribe();
+    abortController.signal.addEventListener("abort", () => {
+      subscription.unsubscribe();
+    });
   }
   return () => abortController.abort();
 }
@@ -4561,6 +4397,10 @@ const getLockTitle = (lock, {
 
 const moduleType$2 = "substrate-native";
 
+//  {
+//   disable?: boolean
+// } & BalancesConfigTokenParams
+
 /**
  * Function to merge two 'sub sources' of the same balance together, or
  * two instances of the same balance with different values.
@@ -5038,6 +4878,7 @@ const UNSUPPORTED_CHAIN_META$1 = {
   miniMetadata: null,
   extra: null
 };
+const SubNativeTokenConfigSchema = TokenConfigBaseSchema;
 const SubNativeModule = hydrate => {
   const {
     chainConnectors,
@@ -5053,7 +4894,7 @@ const SubNativeModule = hydrate => {
   // subscribeBalances was split by network to prevent all subs to wait for all minimetadatas to be ready.
   // however the multichain logic in there is so deep in the function below that i had to keep it as-is, and call it by per-network chunks
   // TODO refactor this be actually network specific
-  const subscribeChainBalances = async (chainId, opts, callback) => {
+  const subscribeChainBalances = (chainId, opts, callback, signal) => {
     const {
       addressesByToken,
       initialBalances
@@ -5152,13 +4993,19 @@ const SubNativeModule = hydrate => {
       return rxjs.from(queryCache.getQueries(newAddressesByToken)).pipe(rxjs.switchMap(baseQueries => {
         return new rxjs.Observable(subscriber => {
           if (!chainConnectors.substrate) return;
-          const unsubSubtensorStaking = subscribeSubtensorStaking(chaindataProvider$1, chainConnectors.substrate, newAddressesByToken, handleUpdateForSource("subtensor-staking"));
-          const unsubNompoolStaking = subscribeNompoolStaking(chaindataProvider$1, chainConnectors.substrate, newAddressesByToken, handleUpdateForSource("nompools-staking"));
-          const unsubCrowdloans = subscribeCrowdloans(chaindataProvider$1, chainConnectors.substrate, newAddressesByToken, handleUpdateForSource("crowdloan"));
+          const unsubSubtensorStaking = subscribeSubtensorStaking(chaindataProvider$1, chainConnectors.substrate, newAddressesByToken, handleUpdateForSource("subtensor-staking"), signal);
+          const unsubNompoolStaking = subscribeNompoolStaking(chaindataProvider$1, chainConnectors.substrate, newAddressesByToken, handleUpdateForSource("nompools-staking"), signal);
+          // const unsubCrowdloans = subscribeCrowdloans(
+          //   chaindataProvider,
+          //   chainConnectors.substrate,
+          //   newAddressesByToken,
+          //   handleUpdateForSource("crowdloan"),
+          //   signal,
+          // )
           const unsubBase = subscribeBase(baseQueries, chainConnectors.substrate, handleUpdateForSource("base"));
           subscriber.add(async () => (await unsubSubtensorStaking)());
           subscriber.add(async () => (await unsubNompoolStaking)());
-          subscriber.add(async () => (await unsubCrowdloans)());
+          // subscriber.add(async () => (await unsubCrowdloans)())
           subscriber.add(async () => (await unsubBase)());
         });
       }));
@@ -5190,8 +5037,13 @@ const SubNativeModule = hydrate => {
     const nonCurrentTokens = Object.keys(addressesByToken).filter(tokenId => !currentTokens.has(tokenId)).sort(sortChains);
 
     // break nonCurrentTokens into chunks of POLLING_WINDOW_SIZE
-    await PromisePool__default.default.withConcurrency(POLLING_WINDOW_SIZE).for(nonCurrentTokens).process(async nonCurrentTokenId => await poll({
+    const pool = new PQueue__default.default({
+      concurrency: POLLING_WINDOW_SIZE
+    });
+    nonCurrentTokens.forEach(nonCurrentTokenId => pool.add(() => poll({
       [nonCurrentTokenId]: addressesByToken[nonCurrentTokenId]
+    }), {
+      signal
     }));
 
     // now poll every 30s on chains which are not subscriptionTokens
@@ -5204,7 +5056,9 @@ const SubNativeModule = hydrate => {
     Object.keys(addressesByToken).filter(tokenId => !subscribedTokenIds.includes(tokenId))), rxjs.exhaustMap(tokenIds => rxjs.from(util$1.arrayChunk(tokenIds, POLLING_WINDOW_SIZE)).pipe(rxjs.concatMap(async tokenChunk => {
       // tokenChunk is a chunk of tokenIds with size POLLING_WINDOW_SIZE
       const pollingTokenAddresses = Object.fromEntries(tokenChunk.map(tokenId => [tokenId, addressesByToken[tokenId]]));
-      await poll(pollingTokenAddresses);
+      await pool.add(() => poll(pollingTokenAddresses), {
+        signal
+      });
       return true;
     })))).subscribe();
     return () => {
@@ -5249,7 +5103,7 @@ const SubNativeModule = hydrate => {
       };
       const existentialDeposit = getConstantValue("Balances", "ExistentialDeposit")?.toString();
       const nominationPoolsPalletId = getConstantValue("NominationPools", "PalletId")?.asText();
-      const crowdloanPalletId = getConstantValue("Crowdloan", "PalletId")?.asText();
+      const crowdloanPalletId = getConstantValue("Crowdloan", "PalletId")?.asText(); // TODO yeet
       const hasSubtensorPallet = getConstantValue("SubtensorModule", "KeySwapCost") !== undefined;
 
       //
@@ -5272,10 +5126,13 @@ const SubNativeModule = hydrate => {
       }, {
         pallet: "Crowdloan",
         items: ["Funds"]
-      }, {
+      },
+      // TODO yeet
+      {
         pallet: "Paras",
         items: ["Parachains"]
       },
+      // TODO yeet
       // TotalColdkeyStake is used until v.2.2.1, then it is replaced by StakingHotkeys+Stake
       // Need to keep TotalColdkeyStake for a while so chaindata keeps including it in miniMetadatas, so it doesnt break old versions of the wallet
       {
@@ -5318,22 +5175,24 @@ const SubNativeModule = hydrate => {
       const {
         existentialDeposit
       } = chainMeta.extra ?? {};
+      if (existentialDeposit === undefined) log.warn("Substrate native module: existentialDeposit is undefined for %s, using 0", chainId);
       const id = chaindataProvider.subNativeTokenId(chainId);
       const nativeToken = {
         id,
         type: "substrate-native",
         platform: "polkadot",
-        isDefault: moduleConfig?.isDefault ?? true,
+        isDefault: true,
         symbol: symbol,
-        name: moduleConfig?.name ?? symbol,
+        name: symbol,
         decimals: decimals,
-        logo: moduleConfig?.logo,
         existentialDeposit: existentialDeposit ?? "0",
         networkId: chainId
       };
-      if (moduleConfig?.symbol) nativeToken.symbol = moduleConfig?.symbol;
-      if (moduleConfig?.coingeckoId) nativeToken.coingeckoId = moduleConfig?.coingeckoId;
-      if (moduleConfig?.mirrorOf) nativeToken.mirrorOf = moduleConfig?.mirrorOf;
+
+      // if (moduleConfig?.symbol) nativeToken.symbol = moduleConfig?.symbol
+      // if (moduleConfig?.coingeckoId) nativeToken.coingeckoId = moduleConfig?.coingeckoId
+      // if (moduleConfig?.mirrorOf) nativeToken.mirrorOf = moduleConfig?.mirrorOf
+
       return {
         [nativeToken.id]: nativeToken
       };
@@ -5365,11 +5224,11 @@ const SubNativeModule = hydrate => {
         return subscribeChainBalances(networkId, {
           addressesByToken: addressesByTokenByNetwork[networkId] ?? {},
           initialBalances: initialBalancesByNetwork[networkId] ?? []
-        }, safeCallback);
+        }, safeCallback, controller.signal);
       }));
       return () => {
-        controller.abort();
         unsubsribeFns.then(fns => fns.forEach(unsubscribe => unsubscribe()));
+        controller.abort();
       };
     },
     fetchBalances,
@@ -6587,6 +6446,22 @@ var psp22Abi = {
 };
 
 const moduleType$1 = "substrate-psp22";
+const SubPsp22TokenConfigSchema = TokenConfigBaseSchema.extend({
+  contractAddress: chaindataProvider.SubPsp22TokenSchema.shape.contractAddress,
+  existentialDeposit: chaindataProvider.SubPsp22TokenSchema.shape.existentialDeposit.optional()
+});
+
+// {
+//   tokens?: Array<
+//     {
+//       symbol?: string
+//       decimals?: number
+//       ed?: string
+//       contractAddress: string
+//     } & BalancesConfigTokenParams
+//   >
+// }
+
 const SubPsp22Module = hydrate => {
   const {
     chainConnectors,
@@ -6603,7 +6478,8 @@ const SubPsp22Module = hydrate => {
         extra: null
       };
     },
-    async fetchSubstrateChainTokens(chainId, _chainMeta, moduleConfig) {
+    async fetchSubstrateChainTokens(chainId, _chainMeta, moduleConfig, tokens) {
+      if (!tokens?.length) return {};
       // const { isTestnet } = chainMeta
 
       const registry = new types.TypeRegistry();
@@ -6615,12 +6491,12 @@ const SubPsp22Module = hydrate => {
         chainId,
         registry
       });
-      const tokens = {};
-      for (const tokenConfig of moduleConfig?.tokens ?? []) {
+      const tokenList = {};
+      for (const tokenConfig of tokens ?? []) {
         try {
           let symbol = tokenConfig?.symbol ?? "Unit";
           let decimals = tokenConfig?.decimals ?? 0;
-          const existentialDeposit = tokenConfig?.ed ?? "0";
+          const existentialDeposit = tokenConfig?.existentialDeposit ?? "0";
           const contractAddress = tokenConfig?.contractAddress ?? undefined;
           if (contractAddress === undefined) continue;
           await (async () => {
@@ -6653,13 +6529,13 @@ const SubPsp22Module = hydrate => {
           };
           if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
           if (tokenConfig?.mirrorOf) token.mirrorOf = tokenConfig?.mirrorOf;
-          tokens[token.id] = token;
+          tokenList[token.id] = token;
         } catch (error) {
           log.error(`Failed to build substrate-psp22 token ${tokenConfig.contractAddress} (${tokenConfig.symbol}) on ${chainId}`, error?.message ?? error);
           continue;
         }
       }
-      return tokens;
+      return tokenList;
     },
     // TODO: Don't create empty subscriptions
     async subscribeBalances({
@@ -6834,11 +6710,28 @@ const fetchBalances = async (chainConnector, tokens, addressesByToken) => {
 };
 
 const moduleType = "substrate-tokens";
+const SubTokensTokenConfigSchema = TokenConfigBaseSchema.extend({
+  onChainId: chaindataProvider.SubTokensTokenSchema.shape.onChainId,
+  existentialDeposit: chaindataProvider.SubTokensTokenSchema.shape.existentialDeposit
+});
 const defaultPalletId = "Tokens";
 const UNSUPPORTED_CHAIN_META = {
   miniMetadata: null,
   extra: {}
 };
+
+//  {
+//   palletId?: string // TODO unlikely it will ever be used - remove this ?
+//   tokens?: Array<
+//     {
+//       symbol?: string
+//       decimals?: number
+//       ed?: string
+//       onChainId?: string | number
+//     } & BalancesConfigTokenParams
+//   >
+// }
+
 const SubTokensModule = hydrate => {
   const {
     chainConnectors,
@@ -6864,13 +6757,14 @@ const SubTokensModule = hydrate => {
         }
       };
     },
-    async fetchSubstrateChainTokens(chainId, chainMeta, moduleConfig) {
-      const tokens = {};
-      for (const tokenConfig of moduleConfig?.tokens ?? []) {
+    async fetchSubstrateChainTokens(chainId, chainMeta, moduleConfig, tokens) {
+      const tokenList = {};
+      for (const tokenConfig of tokens ?? []) {
         try {
+          // TODO fetch metadata from chain, like we do for assets
           const symbol = tokenConfig?.symbol ?? "Unit";
           const decimals = tokenConfig?.decimals ?? 0;
-          const existentialDeposit = tokenConfig?.ed ?? "0";
+          const existentialDeposit = tokenConfig?.existentialDeposit ?? "0";
           const onChainId = tokenConfig?.onChainId ?? undefined;
           if (onChainId === undefined) continue;
           const id = chaindataProvider.subTokensTokenId(chainId, onChainId);
@@ -6889,13 +6783,13 @@ const SubTokensModule = hydrate => {
           };
           if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
           if (tokenConfig?.mirrorOf) token.mirrorOf = tokenConfig?.mirrorOf;
-          tokens[token.id] = token;
+          tokenList[token.id] = token;
         } catch (error) {
           log.error(`Failed to build substrate-tokens token ${tokenConfig.onChainId} (${tokenConfig.symbol}) on ${chainId}`, error?.message ?? error);
           continue;
         }
       }
-      return tokens;
+      return tokenList;
     },
     // TODO: Don't create empty subscriptions
     async subscribeBalances({
@@ -6925,10 +6819,10 @@ const SubTokensModule = hydrate => {
         }
       }));
       return () => {
-        controller.abort();
         pUnsubs.then(unsubs => {
           unsubs.forEach(unsubscribe => unsubscribe());
         });
+        controller.abort();
       };
     },
     async fetchBalances(addressesByToken) {
@@ -7144,9 +7038,12 @@ exports.Balances = Balances;
 exports.Change24hCurrencyFormatter = Change24hCurrencyFormatter;
 exports.DefaultBalanceModule = DefaultBalanceModule;
 exports.EvmErc20Module = EvmErc20Module;
+exports.EvmErc20TokenConfigSchema = EvmErc20TokenConfigSchema;
 exports.EvmNativeModule = EvmNativeModule;
+exports.EvmNativeTokenConfigSchema = EvmNativeTokenConfigSchema;
 exports.EvmTokenFetcher = EvmTokenFetcher;
 exports.EvmUniswapV2Module = EvmUniswapV2Module;
+exports.EvmUniswapV2TokenConfigSchema = EvmUniswapV2TokenConfigSchema;
 exports.FiatSumBalancesFormatter = FiatSumBalancesFormatter;
 exports.ONE_ALPHA_TOKEN = ONE_ALPHA_TOKEN;
 exports.PlanckSumBalancesFormatter = PlanckSumBalancesFormatter;
@@ -7155,10 +7052,15 @@ exports.SCALE_FACTOR = SCALE_FACTOR;
 exports.SUBTENSOR_MIN_STAKE_AMOUNT_PLANK = SUBTENSOR_MIN_STAKE_AMOUNT_PLANK;
 exports.SUBTENSOR_ROOT_NETUID = SUBTENSOR_ROOT_NETUID;
 exports.SubAssetsModule = SubAssetsModule;
+exports.SubAssetsTokenConfigSchema = SubAssetsTokenConfigSchema;
 exports.SubForeignAssetsModule = SubForeignAssetsModule;
+exports.SubForeignAssetsTokenConfigSchema = SubForeignAssetsTokenConfigSchema;
 exports.SubNativeModule = SubNativeModule;
+exports.SubNativeTokenConfigSchema = SubNativeTokenConfigSchema;
 exports.SubPsp22Module = SubPsp22Module;
+exports.SubPsp22TokenConfigSchema = SubPsp22TokenConfigSchema;
 exports.SubTokensModule = SubTokensModule;
+exports.SubTokensTokenConfigSchema = SubTokensTokenConfigSchema;
 exports.SumBalancesFormatter = SumBalancesFormatter;
 exports.TalismanBalancesDatabase = TalismanBalancesDatabase;
 exports.abiMulticall = abiMulticall;