@talismn/balances 0.0.0-pr2041-20250612085325 → 0.0.0-pr2043-20250612121753

package/dist/talismn-balances.esm.js

@@ -1,5 +1,5 @@
 import PromisePool$1, { PromisePool } from '@supercharge/promise-pool';
-import { fetchMiniMetadatas, fetchInitMiniMetadatas, availableTokenLogoFilenames, githubTokenLogoUrl } from '@talismn/chaindata-provider';
+import { fetchMiniMetadatas, fetchInitMiniMetadatas, availableTokenLogoFilenames, githubTokenLogoUrl, EvmErc20TokenDef } from '@talismn/chaindata-provider';
 import { fetchBestMetadata, getScaleApi } from '@talismn/sapi';
 import { Dexie, liveQuery } from 'dexie';
 import isEqual from 'lodash/isEqual';
@@ -13,7 +13,7 @@ import { xxhashAsU8a, blake2AsU8a } from '@polkadot/util-crypto';
 import pako from 'pako';
 import { parseAbi, isHex, hexToBigInt } from 'viem';
 import { defineMethod } from '@substrate/txwrapper-core';
-import { unifyMetadata, decAnyMetadata, getDynamicBuilder, getLookupFn, getMetadataVersion, compactMetadata, encodeMetadata, decodeScale, encodeStateKey, papiParse } from '@talismn/scale';
+import { unifyMetadata, decAnyMetadata, getDynamicBuilder, getLookupFn, getMetadataVersion, compactMetadata, encodeMetadata, decodeScale, papiParse, encodeStateKey } from '@talismn/scale';
 import camelCase from 'lodash/camelCase';
 import { Metadata, TypeRegistry } from '@polkadot/types';
 import groupBy from 'lodash/groupBy';
@@ -1454,7 +1454,7 @@ const erc20Abi = [{
 
 const erc20BalancesAggregatorAbi = parseAbi(["struct AccountToken {address account; address token;}", "function balances(AccountToken[] memory accountTokens) public view returns (uint256[] memory)"]);
 
-const moduleType$8 = "evm-erc20";
+const moduleType$7 = "evm-erc20";
 const evmErc20TokenId = (chainId, tokenContractAddress) => `${chainId}-evm-erc20-${tokenContractAddress}`.toLowerCase();
 const EvmErc20Module = hydrate => {
   const {
@@ -1479,14 +1479,14 @@ const EvmErc20Module = hydrate => {
     }, {});
   };
   const getModuleTokens = async () => {
-    return await chaindataProvider.tokensByIdForType(moduleType$8);
+    return await chaindataProvider.tokensByIdForType(moduleType$7);
   };
   const getErc20Aggregators = async () => {
     const evmNetworks = await chaindataProvider.evmNetworks();
     return Object.fromEntries(evmNetworks.filter(n => n.erc20aggregator).map(n => [n.id, n.erc20aggregator]));
   };
   return {
-    ...DefaultBalanceModule(moduleType$8),
+    ...DefaultBalanceModule(moduleType$7),
     /**
      * This method is currently executed on [a squid](https://github.com/TalismanSociety/chaindata-squid/blob/0ee02818bf5caa7362e3f3664e55ef05ec8df078/src/steps/updateEvmNetworksFromGithub.ts#L280-L284).
      * 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.
@@ -1510,13 +1510,16 @@ const EvmErc20Module = hydrate => {
         const {
           contractAddress,
           symbol: contractSymbol,
-          decimals: contractDecimals
+          decimals: contractDecimals,
+          name: contractName
         } = tokenConfig;
         // TODO : in chaindata's build, filter out all tokens that don't have any of these
         if (!contractAddress || !contractSymbol || contractDecimals === undefined) {
           log.warn("ignoring token on chain %s", chainId, tokenConfig);
           continue;
         }
+
+        // TODO zodify this
         const symbol = tokenConfig?.symbol ?? contractSymbol ?? "ETH";
         const decimals = typeof tokenConfig?.decimals === "number" ? tokenConfig.decimals : typeof contractDecimals === "number" ? contractDecimals : 18;
         if (!symbol || typeof decimals !== "number") continue;
@@ -1524,21 +1527,26 @@ const EvmErc20Module = hydrate => {
         const token = {
           id,
           type: "evm-erc20",
+          platform: "ethereum",
           isTestnet,
           isDefault: tokenConfig.isDefault ?? true,
           symbol,
           decimals,
+          name: contractName ?? symbol,
           logo: tokenConfig?.logo || githubTokenLogoUrl(id),
           contractAddress,
-          evmNetwork: {
-            id: chainId
-          }
+          networkId: chainId
         };
         if (tokenConfig?.symbol) token.symbol = tokenConfig?.symbol;
         if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
-        if (tokenConfig?.dcentName) token.dcentName = tokenConfig?.dcentName;
         if (tokenConfig?.mirrorOf) token.mirrorOf = tokenConfig?.mirrorOf;
         if (tokenConfig?.noDiscovery) token.noDiscovery = tokenConfig?.noDiscovery;
+        const validation = EvmErc20TokenDef.safeParse(token);
+        if (validation.success) {
+          chainTokens[token.id] = token;
+        } else {
+          log.warn("Ignoring invalid token", token.id, validation.error.message, validation.error.issues);
+        }
         chainTokens[token.id] = token;
       }
       return chainTokens;
@@ -1562,7 +1570,7 @@ const EvmErc20Module = hydrate => {
         const ethAddresses = addresses.filter(isEthereumAddress);
         if (ethAddresses.length === 0) return null;
         const token = tokens[tokenId];
-        const evmNetworkId = token.evmNetwork?.id;
+        const evmNetworkId = token.networkId;
         if (!evmNetworkId) return null;
         return [tokenId, ethAddresses];
       }).filter(x => Boolean(x)));
@@ -1772,7 +1780,7 @@ function groupAddressesByTokenByEvmNetwork$1(addressesByToken, tokens) {
       log.error(`Token ${tokenId} not found`);
       return byChain;
     }
-    const chainId = token.evmNetwork?.id;
+    const chainId = token.networkId;
     if (!chainId) {
       log.error(`Token ${tokenId} has no evm network`);
       return byChain;
@@ -1785,7 +1793,7 @@ function groupAddressesByTokenByEvmNetwork$1(addressesByToken, tokens) {
 
 const abiMulticall = 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$7 = "evm-native";
+const moduleType$6 = "evm-native";
 const evmNativeTokenId = chainId => `${chainId}-evm-native`.toLowerCase().replace(/ /g, "-");
 const getEvmNetworkIdFromTokenId = tokenId => {
   const evmNetworkId = tokenId.split("-")[0];
@@ -1798,12 +1806,12 @@ const EvmNativeModule = hydrate => {
     chaindataProvider
   } = hydrate;
   const getModuleTokens = async () => {
-    return await chaindataProvider.tokensByIdForType(moduleType$7);
+    return await chaindataProvider.tokensByIdForType(moduleType$6);
   };
   return {
-    ...DefaultBalanceModule(moduleType$7),
+    ...DefaultBalanceModule(moduleType$6),
     get tokens() {
-      return chaindataProvider.tokensByIdForType(moduleType$7);
+      return chaindataProvider.tokensByIdForType(moduleType$6);
     },
     /**
      * This method is currently executed on [a squid](https://github.com/TalismanSociety/chaindata-squid/blob/0ee02818bf5caa7362e3f3664e55ef05ec8df078/src/steps/updateEvmNetworksFromGithub.ts#L280-L284).
@@ -1825,22 +1833,22 @@ const EvmNativeModule = hydrate => {
       } = chainMeta;
       const symbol = moduleConfig?.symbol ?? "ETH";
       const decimals = typeof moduleConfig?.decimals === "number" ? moduleConfig.decimals : 18;
+      const name = moduleConfig?.name ?? symbol;
       const id = evmNativeTokenId(chainId);
       const nativeToken = {
+        platform: "ethereum",
         id,
         type: "evm-native",
         isTestnet,
         isDefault: true,
         symbol,
         decimals,
+        name,
         logo: moduleConfig?.logo || githubTokenLogoUrl(id),
-        evmNetwork: {
-          id: chainId
-        }
+        networkId: chainId
       };
       if (moduleConfig?.symbol) nativeToken.symbol = moduleConfig?.symbol;
       if (moduleConfig?.coingeckoId) nativeToken.coingeckoId = moduleConfig?.coingeckoId;
-      if (moduleConfig?.dcentName) nativeToken.dcentName = moduleConfig?.dcentName;
       if (moduleConfig?.mirrorOf) nativeToken.mirrorOf = moduleConfig?.mirrorOf;
       if (moduleConfig?.noDiscovery) nativeToken.noDiscovery = moduleConfig?.noDiscovery;
       return {
@@ -1860,7 +1868,7 @@ const EvmNativeModule = hydrate => {
         const ethAddresses = addresses.filter(isEthereumAddress);
         if (ethAddresses.length === 0) return null;
         const token = tokens[tokenId];
-        const evmNetworkId = token.evmNetwork?.id;
+        const evmNetworkId = token.networkId;
         if (!evmNetworkId) return null;
         return [tokenId, ethAddresses];
       }).filter(x => Boolean(x)));
@@ -1952,7 +1960,7 @@ const fetchBalances$2 = async (evmChainConnector, addressesByToken, tokens) => {
   if (!evmChainConnector) throw new Error(`This module requires an evm chain connector`);
   return Promise.all(Object.entries(addressesByToken).map(async ([tokenId, addresses]) => {
     const token = tokens[tokenId];
-    const evmNetworkId = token.evmNetwork?.id;
+    const evmNetworkId = token.networkId;
     if (!evmNetworkId) throw new Error(`Token ${token.id} has no evm network`);
     const publicClient = await evmChainConnector.getPublicClientForEvmNetwork(evmNetworkId);
     if (!publicClient) throw new Error(`Could not get rpc provider for evm network ${evmNetworkId}`);
@@ -2021,7 +2029,7 @@ async function getFreeBalances(publicClient, addresses) {
       });
     } catch (err) {
       const errorMessage = hasOwnProperty(err, "shortMessage") ? err.shortMessage : hasOwnProperty(err, "message") ? err.message : err;
-      log.warn(`Failed to get balance from chain ${publicClient.chain?.id} for ${ethAddresses.length} addresses: ${errorMessage}`);
+      log.warn(`Failed to get balance from chain ${publicClient.chain.id} for ${ethAddresses.length} addresses: ${errorMessage}`);
       return ethAddresses.map(() => "error");
     }
   }
@@ -2589,7 +2597,7 @@ const uniswapV2PairAbi = [{
   type: "function"
 }];
 
-const moduleType$6 = "evm-uniswapv2";
+const moduleType$5 = "evm-uniswapv2";
 const evmUniswapV2TokenId = (chainId, contractAddress) => `${chainId}-evm-uniswapv2-${contractAddress}`.toLowerCase();
 const EvmUniswapV2Module = hydrate => {
   const {
@@ -2599,7 +2607,7 @@ const EvmUniswapV2Module = hydrate => {
   const chainConnector = chainConnectors.evm;
   assert(chainConnector, "This module requires an evm chain connector");
   return {
-    ...DefaultBalanceModule(moduleType$6),
+    ...DefaultBalanceModule(moduleType$5),
     async fetchEvmChainMeta(chainId) {
       const isTestnet = (await chaindataProvider.evmNetworkById(chainId))?.isTestnet || false;
       return {
@@ -2622,7 +2630,8 @@ const EvmUniswapV2Module = hydrate => {
           tokenAddress0,
           tokenAddress1,
           coingeckoId0,
-          coingeckoId1
+          coingeckoId1,
+          name
         } = tokenConfig;
         if (!contractAddress || decimals === undefined || symbol0 === undefined || decimals0 === undefined || symbol1 === undefined || decimals1 === undefined || tokenAddress0 === undefined || tokenAddress1 === undefined) {
           log.warn("ignoring token on chain %s", chainId, tokenConfig);
@@ -2632,9 +2641,11 @@ const EvmUniswapV2Module = hydrate => {
         const token = {
           id,
           type: "evm-uniswapv2",
+          platform: "ethereum",
           isTestnet,
           isDefault: tokenConfig.isDefault ?? false,
           symbol: `${symbol0 ?? "UNKNOWN"}/${symbol1 ?? "UNKNOWN"}`,
+          name: name ?? `${symbol0 ?? "UNKNOWN"}/${symbol1 ?? "UNKNOWN"}`,
           decimals,
           logo: tokenConfig?.logo || githubTokenLogoUrl("uniswap"),
           symbol0,
@@ -2646,13 +2657,10 @@ const EvmUniswapV2Module = hydrate => {
           tokenAddress1,
           coingeckoId0,
           coingeckoId1,
-          evmNetwork: {
-            id: chainId
-          }
+          networkId: chainId
         };
         if (tokenConfig?.symbol) token.symbol = tokenConfig?.symbol;
         if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
-        if (tokenConfig?.dcentName) token.dcentName = tokenConfig?.dcentName;
         if (tokenConfig?.mirrorOf) token.mirrorOf = tokenConfig?.mirrorOf;
         if (tokenConfig?.noDiscovery) token.noDiscovery = tokenConfig?.noDiscovery;
         tokens[token.id] = token;
@@ -2796,7 +2804,7 @@ function groupAddressesByTokenByEvmNetwork(addressesByToken, tokens) {
       log.error(`Token ${tokenId} not found`);
       return byChain;
     }
-    const chainId = token.evmNetwork?.id;
+    const chainId = token.networkId;
     if (!chainId) {
       log.error(`Token ${tokenId} has no evm network`);
       return byChain;
@@ -3027,7 +3035,7 @@ const detectTransferMethod = metadataRpc => {
   return hasDeprecatedTransferCall ? "transfer" : "transfer_allow_death";
 };
 
-const getUniqueChainIds = (addressesByToken, tokens) => [...new Set(Object.keys(addressesByToken).map(tokenId => tokens[tokenId]?.chain?.id).flatMap(chainId => chainId ? [chainId] : []))];
+const getUniqueChainIds = (addressesByToken, tokens) => [...new Set(Object.keys(addressesByToken).map(tokenId => tokens[tokenId]?.networkId).flatMap(chainId => chainId ? [chainId] : []))];
 
 const makeContractCaller = ({
   chainConnector,
@@ -3136,7 +3144,7 @@ const decompress = data => {
   return JSON.parse(decompressed);
 };
 
-const moduleType$5 = "substrate-assets";
+const moduleType$4 = "substrate-assets";
 const subAssetTokenId = (chainId, assetId, tokenSymbol) => `${chainId}-substrate-assets-${assetId}-${tokenSymbol}`.toLowerCase().replace(/ /g, "-");
 const SubAssetsModule = hydrate => {
   const {
@@ -3146,7 +3154,7 @@ const SubAssetsModule = hydrate => {
   const chainConnector = chainConnectors.substrate;
   assert(chainConnector, "This module requires a substrate chain connector");
   return {
-    ...DefaultBalanceModule(moduleType$5),
+    ...DefaultBalanceModule(moduleType$4),
     async fetchSubstrateChainMeta(chainId, moduleConfig, metadataRpc) {
       const isTestnet = (await chaindataProvider.chainById(chainId))?.isTestnet || false;
       if (metadataRpc === undefined) return {
@@ -3197,24 +3205,23 @@ const SubAssetsModule = hydrate => {
           const token = {
             id,
             type: "substrate-assets",
+            platform: "polkadot",
             isTestnet,
             isDefault: tokenConfig?.isDefault ?? true,
             symbol,
+            name: tokenConfig?.name || symbol,
             decimals,
             logo: tokenConfig?.logo || githubTokenLogoUrl(id),
             existentialDeposit,
             assetId,
             isFrozen,
-            chain: {
-              id: chainId
-            }
+            networkId: chainId
           };
           if (tokenConfig?.symbol) {
             token.symbol = tokenConfig?.symbol;
             token.id = subAssetTokenId(chainId, assetId, token.symbol);
           }
           if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
-          if (tokenConfig?.dcentName) token.dcentName = tokenConfig?.dcentName;
           if (tokenConfig?.mirrorOf) token.mirrorOf = tokenConfig?.mirrorOf;
           tokens[token.id] = token;
         } catch (error) {
@@ -3228,7 +3235,7 @@ const SubAssetsModule = hydrate => {
     async subscribeBalances({
       addressesByToken
     }, callback) {
-      const queries = await buildQueries$4(chaindataProvider, addressesByToken);
+      const queries = await buildQueries$3(chaindataProvider, addressesByToken);
       const unsubscribe = await new RpcStateQueryHelper(chainConnector, queries).subscribe((error, result) => {
         if (error) return callback(error);
         const balances = result?.filter(b => b !== null) ?? [];
@@ -3238,7 +3245,7 @@ const SubAssetsModule = hydrate => {
     },
     async fetchBalances(addressesByToken) {
       assert(chainConnectors.substrate, "This module requires a substrate chain connector");
-      const queries = await buildQueries$4(chaindataProvider, addressesByToken);
+      const queries = await buildQueries$3(chaindataProvider, addressesByToken);
       const result = await new RpcStateQueryHelper(chainConnectors.substrate, queries).fetch();
       const balances = result?.filter(b => b !== null) ?? [];
       return new Balances(balances);
@@ -3262,7 +3269,7 @@ const SubAssetsModule = hydrate => {
       const token = await chaindataProvider.tokenById(tokenId);
       assert(token, `Token ${tokenId} not found in store`);
       if (token.type !== "substrate-assets") throw new Error(`This module doesn't handle tokens of type ${token.type}`);
-      const chainId = token.chain.id;
+      const chainId = token.networkId;
       const chain = await chaindataProvider.chainById(chainId);
       assert(chain?.genesisHash, `Chain ${chainId} not found in store`);
       const {
@@ -3308,7 +3315,7 @@ const SubAssetsModule = hydrate => {
     }
   };
 };
-async function buildQueries$4(chaindataProvider, addressesByToken) {
+async function buildQueries$3(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]));
@@ -3333,7 +3340,7 @@ async function buildQueries$4(chaindataProvider, addressesByToken) {
       log.debug(`This module doesn't handle tokens of type ${token.type}`);
       return [];
     }
-    const chainId = token.chain?.id;
+    const chainId = token.networkId;
     if (!chainId) {
       log.warn(`Token ${tokenId} has no chain`);
       return [];
@@ -3415,274 +3422,6 @@ const tryEncode = (scaleCoder, ...args) => {
   }
 };
 
-const moduleType$4 = "substrate-equilibrium";
-const subEquilibriumTokenId = (chainId, tokenSymbol) => `${chainId}-substrate-equilibrium-${tokenSymbol}`.toLowerCase().replace(/ /g, "-");
-const SubEquilibriumModule = hydrate => {
-  const {
-    chainConnectors,
-    chaindataProvider
-  } = hydrate;
-  const chainConnector = chainConnectors.substrate;
-  assert(chainConnector, "This module requires a substrate chain connector");
-  return {
-    ...DefaultBalanceModule(moduleType$4),
-    async fetchSubstrateChainMeta(chainId, moduleConfig, metadataRpc) {
-      const isTestnet = (await chaindataProvider.chainById(chainId))?.isTestnet || false;
-      if (metadataRpc === undefined) return {
-        isTestnet
-      };
-      if (moduleConfig?.disable !== false) return {
-        isTestnet
-      }; // default to disabled
-
-      const metadataVersion = getMetadataVersion(metadataRpc);
-      const metadata = decAnyMetadata(metadataRpc);
-      compactMetadata(metadata, [{
-        pallet: "EqAssets",
-        items: ["Assets"]
-      }, {
-        pallet: "System",
-        items: ["Account"]
-      }]);
-      const miniMetadata = encodeMetadata(metadata);
-      return {
-        isTestnet,
-        miniMetadata,
-        metadataVersion
-      };
-    },
-    async fetchSubstrateChainTokens(chainId, chainMeta, moduleConfig) {
-      // default to disabled
-      if (moduleConfig?.disable !== false) return {};
-      const {
-        isTestnet,
-        miniMetadata,
-        metadataVersion
-      } = chainMeta;
-      if (miniMetadata === undefined || metadataVersion === undefined) return {};
-      if (metadataVersion < 14) return {};
-      try {
-        const metadata = unifyMetadata(decAnyMetadata(miniMetadata));
-        const scaleBuilder = getDynamicBuilder(getLookupFn(metadata));
-        const assetsCoder = scaleBuilder.buildStorage("EqAssets", "Assets");
-        const stateKey = assetsCoder.keys.enc();
-
-        /** NOTE: Just a guideline, the RPC can return whatever it wants */
-
-        const assetsResult = await chainConnector.send(chainId, "state_getStorage", [stateKey]).then(result => assetsCoder.value.dec(result) ?? null);
-        const tokens = (Array.isArray(assetsResult) ? assetsResult : []).flatMap(asset => {
-          if (!asset) return [];
-          if (!asset?.id) return [];
-          const assetId = asset.id.toString(10);
-          const symbol = tokenSymbolFromU64Id(asset.id);
-          const id = subEquilibriumTokenId(chainId, symbol);
-          const decimals = DEFAULT_DECIMALS$1;
-          const tokenConfig = (moduleConfig?.tokens ?? []).find(token => token.assetId === assetId);
-          const token = {
-            id,
-            type: "substrate-equilibrium",
-            isTestnet,
-            isDefault: tokenConfig?.isDefault ?? true,
-            symbol,
-            decimals,
-            logo: tokenConfig?.logo || githubTokenLogoUrl(id),
-            // TODO: Fetch the ED
-            existentialDeposit: "0",
-            assetId,
-            chain: {
-              id: chainId
-            }
-          };
-          if (tokenConfig?.symbol) {
-            token.symbol = tokenConfig?.symbol;
-            token.id = subEquilibriumTokenId(chainId, token.symbol);
-          }
-          if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
-          if (tokenConfig?.dcentName) token.dcentName = tokenConfig?.dcentName;
-          if (tokenConfig?.mirrorOf) token.mirrorOf = tokenConfig?.mirrorOf;
-          return [[token.id, token]];
-        });
-        return Object.fromEntries(tokens);
-      } catch (error) {
-        log.error(`Failed to build substrate-equilibrium tokens on ${chainId}`, error?.message ?? error);
-        return {};
-      }
-    },
-    // TODO: Don't create empty subscriptions
-    async subscribeBalances({
-      addressesByToken
-    }, callback) {
-      const queries = await buildQueries$3(chaindataProvider, addressesByToken);
-      const unsubscribe = await new RpcStateQueryHelper(chainConnector, queries).subscribe((error, result) => {
-        if (error) return callback(error);
-        const balances = result?.flatMap(balances => balances) ?? [];
-        if (balances.length > 0) callback(null, new Balances(balances));
-      });
-      return unsubscribe;
-    },
-    async fetchBalances(addressesByToken) {
-      assert(chainConnectors.substrate, "This module requires a substrate chain connector");
-      const queries = await buildQueries$3(chaindataProvider, addressesByToken);
-      const result = await new RpcStateQueryHelper(chainConnectors.substrate, queries).fetch();
-      const balances = result?.flatMap(balances => balances) ?? [];
-      return new Balances(balances);
-    },
-    async transferToken({
-      tokenId,
-      from,
-      to,
-      amount,
-      registry,
-      metadataRpc,
-      blockHash,
-      blockNumber,
-      nonce,
-      specVersion,
-      transactionVersion,
-      tip,
-      transferMethod,
-      userExtensions
-    }) {
-      const token = await chaindataProvider.tokenById(tokenId);
-      assert(token, `Token ${tokenId} not found in store`);
-      if (token.type !== "substrate-equilibrium") throw new Error(`This module doesn't handle tokens of type ${token.type}`);
-      const chainId = token.chain.id;
-      const chain = await chaindataProvider.chainById(chainId);
-      assert(chain?.genesisHash, `Chain ${chainId} not found in store`);
-      const {
-        genesisHash
-      } = chain;
-      const {
-        assetId
-      } = token;
-      const pallet = "EqBalances";
-      const method = transferMethod === "transfer_all" ?
-      // the eqBalances pallet has no transfer_all method
-      "transfer" : transferMethod === "transfer_keep_alive" ?
-      // the eqBalances pallet has no transfer_keep_alive method
-      "transfer" : "transfer";
-      const args = {
-        asset: assetId,
-        to,
-        value: amount
-      };
-      const unsigned = defineMethod({
-        method: {
-          pallet: camelCase(pallet),
-          name: camelCase(method),
-          args
-        },
-        address: from,
-        blockHash,
-        blockNumber,
-        eraPeriod: 64,
-        genesisHash,
-        metadataRpc,
-        nonce,
-        specVersion,
-        tip: tip ? Number(tip) : 0,
-        transactionVersion
-      }, {
-        metadataRpc,
-        registry,
-        userExtensions
-      });
-      return {
-        type: "substrate",
-        callData: unsigned.method
-      };
-    }
-  };
-};
-async function buildQueries$3(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-equilibrium",
-    coders: {
-      storage: ["System", "Account"]
-    }
-  });
-
-  // equilibrium returns all chain tokens for each address in the one query
-  // so, we only need to make one query per address, rather than one query per token per address
-  const addressesByChain = new Map();
-  const tokensByAddress = new Map();
-  Object.entries(addressesByToken).map(([tokenId, addresses]) => {
-    const token = tokens[tokenId];
-    if (!token) return log.warn(`Token ${tokenId} not found`);
-    if (token.type !== "substrate-equilibrium") return log.debug(`This module doesn't handle tokens of type ${token.type}`);
-    const chainId = token?.chain?.id;
-    if (!chainId) return log.warn(`Token ${tokenId} has no chain`);
-    const byChain = addressesByChain.get(chainId) ?? new Set();
-    addresses.forEach(address => {
-      byChain?.add(address);
-      tokensByAddress.set(address, (tokensByAddress.get(address) ?? new Set()).add(token));
-    });
-    addressesByChain.set(chainId, byChain);
-  });
-  return Array.from(addressesByChain).flatMap(([chainId, addresses]) => {
-    const chain = chains[chainId];
-    if (!chain) {
-      log.warn(`Chain ${chainId} not found`);
-      return [];
-    }
-    return Array.from(addresses).flatMap(address => {
-      const scaleCoder = chainStorageCoders.get(chainId)?.storage;
-      const stateKey = encodeStateKey(scaleCoder, `Invalid address in ${chainId} storage query ${address}`, address);
-      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 = decodeScale(scaleCoder, change, `Failed to decode eqBalances on chain ${chainId}`);
-        const tokenBalances = Object.fromEntries((decoded?.data?.value?.balance ?? []).map(balance => ({
-          id: (balance?.[0] ?? 0n)?.toString?.(),
-          free: balance?.[1]?.type === "Positive" ? (balance?.[1]?.value ?? 0n).toString() : balance?.[1]?.type === "Negative" ? ((balance?.[1]?.value ?? 0n) * -1n).toString() : "0"
-        })).map(({
-          id,
-          free
-        }) => [id, free]).filter(([id, free]) => id !== undefined && free !== undefined));
-        const result = Array.from(tokensByAddress.get(address) ?? []).filter(t => t.chain.id === chainId).map(token => {
-          const value = tokenBalances[token.assetId];
-          return {
-            source: "substrate-equilibrium",
-            status: "live",
-            address,
-            multiChainId: {
-              subChainId: chainId
-            },
-            chainId,
-            tokenId: token.id,
-            value
-          };
-        }).filter(b => b !== undefined);
-        return result;
-      };
-      return {
-        chainId,
-        stateKey,
-        decodeResult
-      };
-    });
-  });
-}
-const DEFAULT_DECIMALS$1 = 9;
-const tokenSymbolFromU64Id = u64 => {
-  const bytes = [];
-  let num = typeof u64 === "number" ? BigInt(u64) : isBigInt(u64) ? u64 : u64.toBigInt();
-  do {
-    bytes.unshift(Number(num % 256n));
-    num = num / 256n;
-  } while (num > 0);
-  return new TextDecoder("utf-8").decode(new Uint8Array(bytes)).toUpperCase();
-};
-
 const moduleType$3 = "substrate-foreignassets";
 const subForeignAssetTokenId = (chainId, tokenSymbol) => `${chainId}-substrate-foreignassets-${tokenSymbol}`.toLowerCase().replace(/ /g, "-");
 const SubForeignAssetsModule = hydrate => {
@@ -3751,24 +3490,23 @@ const SubForeignAssetsModule = hydrate => {
           const token = {
             id,
             type: "substrate-foreignassets",
+            platform: "polkadot",
             isTestnet,
             isDefault: tokenConfig?.isDefault ?? true,
             symbol,
             decimals,
+            name: tokenConfig?.name || symbol,
             logo: tokenConfig?.logo || githubTokenLogoUrl(id),
             existentialDeposit,
             onChainId: tokenConfig.onChainId,
             isFrozen,
-            chain: {
-              id: chainId
-            }
+            networkId: chainId
           };
           if (tokenConfig?.symbol) {
             token.symbol = tokenConfig?.symbol;
             token.id = subForeignAssetTokenId(chainId, token.symbol);
           }
           if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
-          if (tokenConfig?.dcentName) token.dcentName = tokenConfig?.dcentName;
           if (tokenConfig?.mirrorOf) token.mirrorOf = tokenConfig?.mirrorOf;
           tokens[token.id] = token;
         } catch (error) {
@@ -3807,7 +3545,7 @@ const SubForeignAssetsModule = hydrate => {
       const token = await chaindataProvider.tokenById(tokenId);
       assert(token, `Token ${tokenId} not found in store`);
       if (token.type !== "substrate-foreignassets") throw new Error(`This module doesn't handle tokens of type ${token.type}`);
-      const chainId = token.chain.id;
+      const chainId = token.networkId;
       const chain = await chaindataProvider.chainById(chainId);
       assert(chain?.genesisHash, `Chain ${chainId} not found in store`);
       const onChainId = (() => {
@@ -3873,7 +3611,7 @@ async function buildQueries$2(chaindataProvider, addressesByToken) {
       log.debug(`This module doesn't handle tokens of type ${token.type}`);
       return [];
     }
-    const chainId = token.chain?.id;
+    const chainId = token.networkId;
     if (!chainId) {
       log.warn(`Token ${tokenId} has no chain`);
       return [];
@@ -3982,7 +3720,7 @@ async function subscribeCrowdloans(chaindataProvider, chainConnector, addressesB
     // 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.chain.id]);
+    const [chainMeta] = findChainMeta(miniMetadatas, "substrate-native", allChains[token.networkId]);
     return typeof chainMeta?.crowdloanPalletId === "string";
   }).map(([tokenId]) => tokenId);
 
@@ -4015,7 +3753,7 @@ async function subscribeCrowdloans(chaindataProvider, chainConnector, addressesB
       log.debug(`This module doesn't handle tokens of type ${token.type}`);
       continue;
     }
-    const chainId = token.chain?.id;
+    const chainId = token.networkId;
     if (!chainId) {
       log.warn(`Token ${tokenId} has no chain`);
       continue;
@@ -4252,7 +3990,7 @@ async function subscribeNompoolStaking(chaindataProvider, chainConnector, addres
     // 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.chain.id]);
+    const [chainMeta] = findChainMeta(miniMetadatas, "substrate-native", allChains[token.networkId]);
     return typeof chainMeta?.nominationPoolsPalletId === "string";
   }).map(([tokenId]) => tokenId);
 
@@ -4287,7 +4025,7 @@ async function subscribeNompoolStaking(chaindataProvider, chainConnector, addres
       log.debug(`This module doesn't handle tokens of type ${token.type}`);
       continue;
     }
-    const chainId = token.chain?.id;
+    const chainId = token.networkId;
     if (!chainId) {
       log.warn(`Token ${tokenId} has no chain`);
       continue;
@@ -4567,7 +4305,7 @@ async function subscribeSubtensorStaking(chaindataProvider, chainConnector, addr
     // 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.chain.id]);
+    const [chainMeta] = findChainMeta(miniMetadatas, "substrate-native", allChains[token.networkId]);
     return chainMeta?.hasSubtensorPallet === true;
   }).map(([tokenId]) => tokenId);
 
@@ -4590,7 +4328,7 @@ async function subscribeSubtensorStaking(chaindataProvider, chainConnector, addr
       log.debug(`This module doesn't handle tokens of type ${token.type}`);
       continue;
     }
-    const chainId = token.chain?.id;
+    const chainId = token.networkId;
     if (!chainId) {
       log.warn(`Token ${tokenId} has no chain`);
       continue;
@@ -4934,7 +4672,7 @@ async function buildQueries$1(chains, tokens, chainStorageCoders, miniMetadatas,
       log.debug(`This module doesn't handle tokens of type ${token.type}`);
       return outerResult;
     }
-    const chainId = token.chain?.id;
+    const chainId = token.networkId;
     if (!chainId) {
       log.warn(`Token ${tokenId} has no chain`);
       return outerResult;
@@ -5275,8 +5013,8 @@ class QueryCache {
     this.metadataSub = commonMetadataObservable.pipe(firstThenDebounce(500), detectMiniMetadataChanges(), combineLatestWith(this.chaindataProvider.tokensObservable), 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.chain?.id) return result;
-        result[token.chain.id] ? result[token.chain.id].push(token) : result[token.chain.id] = [token];
+        if (!token.networkId) return result;
+        result[token.networkId] ? result[token.networkId].push(token) : result[token.networkId] = [token];
         return result;
       }, {});
       miniMetadataChanges.forEach(chainId => {
@@ -5495,19 +5233,18 @@ const SubNativeModule = hydrate => {
       const nativeToken = {
         id,
         type: "substrate-native",
+        platform: "polkadot",
         isTestnet,
         isDefault: moduleConfig?.isDefault ?? true,
         symbol: symbol ?? DEFAULT_SYMBOL,
+        name: moduleConfig?.name ?? symbol ?? DEFAULT_SYMBOL,
         decimals: decimals ?? DEFAULT_DECIMALS,
         logo: moduleConfig?.logo || githubTokenLogoUrl(id),
         existentialDeposit: existentialDeposit ?? "0",
-        chain: {
-          id: chainId
-        }
+        networkId: chainId
       };
       if (moduleConfig?.symbol) nativeToken.symbol = moduleConfig?.symbol;
       if (moduleConfig?.coingeckoId) nativeToken.coingeckoId = moduleConfig?.coingeckoId;
-      if (moduleConfig?.dcentName) nativeToken.dcentName = moduleConfig?.dcentName;
       if (moduleConfig?.mirrorOf) nativeToken.mirrorOf = moduleConfig?.mirrorOf;
       return {
         [nativeToken.id]: nativeToken
@@ -5635,7 +5372,7 @@ const SubNativeModule = hydrate => {
           if (error instanceof ChainConnectionError) {
             // coerce ChainConnection errors into SubNativeBalance errors
             const errorChainId = error.chainId;
-            Object.entries(await getModuleTokens()).filter(([, token]) => token.chain?.id === errorChainId).forEach(([tokenId]) => {
+            Object.entries(await getModuleTokens()).filter(([, token]) => token.networkId === errorChainId).forEach(([tokenId]) => {
               const wrappedError = new SubNativeBalanceError(tokenId, error.message);
               handleUpdate(wrappedError);
             });
@@ -5700,7 +5437,7 @@ const SubNativeModule = hydrate => {
       const token = await chaindataProvider.tokenById(tokenId);
       assert(token, `Token ${tokenId} not found in store`);
       if (token.type !== "substrate-native") throw new Error(`This module doesn't handle tokens of type ${token.type}`);
-      const chainId = token.chain.id;
+      const chainId = token.networkId;
       const chain = await chaindataProvider.chainById(chainId);
       assert(chain?.genesisHash, `Chain ${chainId} not found in store`);
       const {
@@ -6949,23 +6686,22 @@ const SubPsp22Module = hydrate => {
           const token = {
             id,
             type: "substrate-psp22",
+            platform: "polkadot",
             isTestnet,
             isDefault: tokenConfig.isDefault ?? true,
             symbol,
             decimals,
+            name: tokenConfig?.name || symbol,
             logo: tokenConfig?.logo || githubTokenLogoUrl(id),
             existentialDeposit,
             contractAddress,
-            chain: {
-              id: chainId
-            }
+            networkId: chainId
           };
           if (tokenConfig?.symbol) {
             token.symbol = tokenConfig?.symbol;
             token.id = subPsp22TokenId(chainId, token.symbol);
           }
           if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
-          if (tokenConfig?.dcentName) token.dcentName = tokenConfig?.dcentName;
           if (tokenConfig?.mirrorOf) token.mirrorOf = tokenConfig?.mirrorOf;
           tokens[token.id] = token;
         } catch (error) {
@@ -7031,7 +6767,7 @@ const SubPsp22Module = hydrate => {
       const token = await chaindataProvider.tokenById(tokenId);
       assert(token, `Token ${tokenId} not found in store`);
       if (token.type !== "substrate-psp22") throw new Error(`This module doesn't handle tokens of type ${token.type}`);
-      const chainId = token.chain.id;
+      const chainId = token.networkId;
       const chain = await chaindataProvider.chainById(chainId);
       assert(chain?.genesisHash, `Chain ${chainId} not found in store`);
       const {
@@ -7108,7 +6844,7 @@ const fetchBalances = async (chainConnector, tokens, addressesByToken) => {
     // TODO: Use `decodeOutput` from `./util/decodeOutput`
     const contractCall = makeContractCaller({
       chainConnector,
-      chainId: token.chain.id,
+      chainId: token.networkId,
       registry
     });
     if (token.contractAddress === undefined) {
@@ -7126,9 +6862,9 @@ const fetchBalances = async (chainConnector, tokens, addressesByToken) => {
       status: "live",
       address,
       multiChainId: {
-        subChainId: token.chain.id
+        subChainId: token.networkId
       },
-      chainId: token.chain.id,
+      chainId: token.networkId,
       tokenId,
       value: balance
     };
@@ -7205,23 +6941,22 @@ const SubTokensModule = hydrate => {
           const token = {
             id,
             type: "substrate-tokens",
+            platform: "polkadot",
             isTestnet,
             isDefault: tokenConfig.isDefault ?? true,
             symbol,
             decimals,
+            name: tokenConfig?.name ?? symbol,
             logo: tokenConfig?.logo || githubTokenLogoUrl(id),
             existentialDeposit,
             onChainId,
-            chain: {
-              id: chainId
-            }
+            networkId: chainId
           };
           if (tokenConfig?.symbol) {
             token.symbol = tokenConfig?.symbol;
             token.id = subTokensTokenId(chainId, token.onChainId);
           }
           if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
-          if (tokenConfig?.dcentName) token.dcentName = tokenConfig?.dcentName;
           if (tokenConfig?.mirrorOf) token.mirrorOf = tokenConfig?.mirrorOf;
           tokens[token.id] = token;
         } catch (error) {
@@ -7260,7 +6995,7 @@ const SubTokensModule = hydrate => {
       const token = await chaindataProvider.tokenById(tokenId);
       assert(token, `Token ${tokenId} not found in store`);
       if (token.type !== "substrate-tokens") throw new Error(`This module doesn't handle tokens of type ${token.type}`);
-      const chainId = token.chain.id;
+      const chainId = token.networkId;
       const chain = await chaindataProvider.chainById(chainId);
       assert(chain?.genesisHash, `Chain ${chainId} not found in store`);
       const miniMetadatas = new Map((await db.miniMetadatas.toArray()).map(miniMetadata => [miniMetadata.id, miniMetadata]));
@@ -7392,7 +7127,7 @@ async function buildQueries(chaindataProvider, addressesByToken) {
       log.debug(`This module doesn't handle tokens of type ${token.type}`);
       return [];
     }
-    const chainId = token.chain?.id;
+    const chainId = token.networkId;
     if (!chainId) {
       log.warn(`Token ${tokenId} has no chain`);
       return [];
@@ -7458,7 +7193,7 @@ async function buildQueries(chaindataProvider, addressesByToken) {
   });
 }
 
-const defaultBalanceModules = [EvmErc20Module, EvmNativeModule, EvmUniswapV2Module, SubAssetsModule, SubEquilibriumModule, SubForeignAssetsModule, SubNativeModule, SubPsp22Module, SubTokensModule];
+const defaultBalanceModules = [EvmErc20Module, EvmNativeModule, EvmUniswapV2Module, SubAssetsModule, SubForeignAssetsModule, SubNativeModule, SubPsp22Module, SubTokensModule];
 
 /** Pulls the latest chaindata from https://github.com/TalismanSociety/chaindata */
 const hydrateChaindataAndMiniMetadata = async (chaindataProvider, miniMetadataUpdater) => {
@@ -7486,4 +7221,4 @@ const updateEvmTokens = async (chaindataProvider, evmTokenFetcher) => {
   await evmTokenFetcher.update(evmNetworkIds);
 };
 
-export { Balance, BalanceFormatter, BalanceValueGetter, Balances, Change24hCurrencyFormatter, DefaultBalanceModule, EvmErc20Module, EvmNativeModule, EvmTokenFetcher, EvmUniswapV2Module, FiatSumBalancesFormatter, MiniMetadataUpdater, ONE_ALPHA_TOKEN, PlanckSumBalancesFormatter, RpcStateQueryHelper, SCALE_FACTOR, SUBTENSOR_MIN_STAKE_AMOUNT_PLANK, SUBTENSOR_ROOT_NETUID, SubAssetsModule, SubEquilibriumModule, SubForeignAssetsModule, SubNativeModule, SubPsp22Module, SubTokensModule, SumBalancesFormatter, TalismanBalancesDatabase, abiMulticall, balances, buildStorageCoders, calculateAlphaPrice, calculateTaoAmountFromAlpha, calculateTaoFromDynamicInfo, compress, configureStore, db, decodeOutput, decompress, defaultBalanceModules, deriveMiniMetadataId, detectTransferMethod, erc20Abi, erc20BalancesAggregatorAbi, evmErc20TokenId, evmNativeTokenId, evmUniswapV2TokenId, excludeFromFeePayableLocks, excludeFromTransferableAmount, filterBaseLocks, filterMirrorTokens, findChainMeta, getBalanceId, getLockTitle, getUniqueChainIds, getValueId, hydrateChaindataAndMiniMetadata, includeInTotalExtraAmount, makeContractCaller, subAssetTokenId, subEquilibriumTokenId, subForeignAssetTokenId, subNativeTokenId, subPsp22TokenId, subTokensTokenId, uniswapV2PairAbi, updateCustomMiniMetadata, updateEvmTokens };
+export { Balance, BalanceFormatter, BalanceValueGetter, Balances, Change24hCurrencyFormatter, DefaultBalanceModule, EvmErc20Module, EvmNativeModule, EvmTokenFetcher, EvmUniswapV2Module, FiatSumBalancesFormatter, MiniMetadataUpdater, ONE_ALPHA_TOKEN, PlanckSumBalancesFormatter, RpcStateQueryHelper, SCALE_FACTOR, SUBTENSOR_MIN_STAKE_AMOUNT_PLANK, SUBTENSOR_ROOT_NETUID, SubAssetsModule, SubForeignAssetsModule, SubNativeModule, SubPsp22Module, SubTokensModule, SumBalancesFormatter, TalismanBalancesDatabase, abiMulticall, balances, buildStorageCoders, calculateAlphaPrice, calculateTaoAmountFromAlpha, calculateTaoFromDynamicInfo, compress, configureStore, db, decodeOutput, decompress, defaultBalanceModules, deriveMiniMetadataId, detectTransferMethod, erc20Abi, erc20BalancesAggregatorAbi, evmErc20TokenId, evmNativeTokenId, evmUniswapV2TokenId, excludeFromFeePayableLocks, excludeFromTransferableAmount, filterBaseLocks, filterMirrorTokens, findChainMeta, getBalanceId, getLockTitle, getUniqueChainIds, getValueId, hydrateChaindataAndMiniMetadata, includeInTotalExtraAmount, makeContractCaller, subAssetTokenId, subForeignAssetTokenId, subNativeTokenId, subPsp22TokenId, subTokensTokenId, uniswapV2PairAbi, updateCustomMiniMetadata, updateEvmTokens };