@talismn/balances 0.0.0-pr2091-20250715125148 → 0.0.0-pr2093-20250715143904

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

@@ -1,15 +1,13 @@
 'use strict';
 
 var chaindataProvider = require('@talismn/chaindata-provider');
-var crypto = require('@talismn/crypto');
+var util = require('@talismn/util');
 var viem = require('viem');
 var lodashEs = require('lodash-es');
 var z = require('zod/v4');
 var anylogger = require('anylogger');
 var rxjs = require('rxjs');
 var BigNumber = require('bignumber.js');
-var web3_js = require('@solana/web3.js');
-var util = require('@talismn/util');
 var scale = require('@talismn/scale');
 var tokenRates = require('@talismn/token-rates');
 var utils = require('@polkadot-api/utils');
@@ -30,8 +28,8 @@ var BigNumber__default = /*#__PURE__*/_interopDefault(BigNumber);
 var upperFirst__default = /*#__PURE__*/_interopDefault(upperFirst);
 var PQueue__default = /*#__PURE__*/_interopDefault(PQueue);
 
-const MODULE_TYPE$9 = chaindataProvider.EvmErc20TokenSchema.shape.type.value;
-const PLATFORM$9 = chaindataProvider.EvmErc20TokenSchema.shape.platform.value;
+const MODULE_TYPE$8 = chaindataProvider.EvmErc20TokenSchema.shape.type.value;
+const PLATFORM$8 = chaindataProvider.EvmErc20TokenSchema.shape.platform.value;
 
 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)"]);
 
@@ -627,7 +625,7 @@ const getBalanceDefs = addressesByToken => {
 // if there is at least one storage entry, the results will be an array with a single object
 // if the storage has no entries in it (ex: Assets on ewx or moonbeam), the response will be an empty array
 
-const fetchBalances$9 = async ({
+const fetchBalances$8 = async ({
   networkId,
   tokensWithAddresses,
   connector
@@ -639,8 +637,8 @@ const fetchBalances$9 = async ({
   const client = await connector.getPublicClientForEvmNetwork(networkId);
   if (!client) throw new Error(`Could not get rpc provider for evm network ${networkId}`);
   for (const [token, addresses] of tokensWithAddresses) {
-    if (token.type !== MODULE_TYPE$9 || token.networkId !== networkId) throw new Error(`Invalid token type or networkId for EVM ERC20 balance module: ${token.type} on ${token.networkId}`);
-    for (const address of addresses) if (!crypto.isEthereumAddress(address)) throw new Error(`Invalid ethereum address for EVM ERC20 balance module: ${address} for token ${token.id}`);
+    if (token.type !== MODULE_TYPE$8 || token.networkId !== networkId) throw new Error(`Invalid token type or networkId for EVM ERC20 balance module: ${token.type} on ${token.networkId}`);
+    for (const address of addresses) if (!util.isEthereumAddress(address)) throw new Error(`Invalid ethereum address for EVM ERC20 balance module: ${address} for token ${token.id}`);
   }
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (client.chain?.contracts?.erc20Aggregator && balanceDefs.length > 1) {
@@ -669,7 +667,7 @@ const fetchWithoutAggregator = async (client, balanceDefs) => {
         address,
         tokenId: token.id,
         value: result.toString(),
-        source: MODULE_TYPE$9,
+        source: MODULE_TYPE$8,
         networkId: chaindataProvider.parseEvmErc20TokenId(token.id).networkId,
         status: "live"
       };
@@ -712,7 +710,7 @@ const fetchWithAggregator = async (client, balanceDefs, erc20BalancesAggregatorA
       address: balanceDef.address,
       tokenId: balanceDef.token.id,
       value: erc20Balances[index].toString(),
-      source: MODULE_TYPE$9,
+      source: MODULE_TYPE$8,
       networkId: chaindataProvider.parseTokenId(balanceDef.token.id).networkId,
       status: "live"
     }));
@@ -781,7 +779,7 @@ const TokenCacheSchema$1 = z__default.default.discriminatedUnion("isValid", [z__
   id: chaindataProvider.EvmErc20TokenSchema.shape.id,
   isValid: z__default.default.literal(false)
 })]);
-const fetchTokens$9 = async ({
+const fetchTokens$8 = async ({
   networkId,
   tokens,
   connector,
@@ -821,8 +819,8 @@ const fetchTokens$9 = async ({
     }
     const base = {
       id: tokenId,
-      type: MODULE_TYPE$9,
-      platform: PLATFORM$9,
+      type: MODULE_TYPE$8,
+      platform: PLATFORM$8,
       networkId
     };
     const cached2 = cache[tokenId] && TokenCacheSchema$1.safeParse(cache[tokenId]).data;
@@ -840,19 +838,19 @@ const fetchTokens$9 = async ({
   return result;
 };
 
-const getMiniMetadata$9 = () => {
+const getMiniMetadata$8 = () => {
   throw new Error("MiniMetadata is not supported for ethereum tokens");
 };
 
-const getTransferCallData$9 = ({
+const getTransferCallData$8 = ({
   from,
   to,
   value,
   token
 }) => {
-  if (!chaindataProvider.isTokenOfType(token, MODULE_TYPE$9)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$9}.`);
-  if (!crypto.isEthereumAddress(from)) throw new Error("Invalid from address");
-  if (!crypto.isEthereumAddress(to)) throw new Error("Invalid to address");
+  if (!chaindataProvider.isTokenOfType(token, MODULE_TYPE$8)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$8}.`);
+  if (!util.isEthereumAddress(from)) throw new Error("Invalid from address");
+  if (!util.isEthereumAddress(to)) throw new Error("Invalid to address");
   const data = viem.encodeFunctionData({
     abi: viem.erc20Abi,
     functionName: "transfer",
@@ -865,8 +863,8 @@ const getTransferCallData$9 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$5 = 6_000;
-const subscribeBalances$9 = ({
+const SUBSCRIPTION_INTERVAL$4 = 6_000;
+const subscribeBalances$8 = ({
   networkId,
   tokensWithAddresses,
   connector
@@ -880,17 +878,17 @@ const subscribeBalances$9 = ({
     const poll = async () => {
       try {
         if (abortController.signal.aborted) return;
-        const balances = await fetchBalances$9({
+        const balances = await fetchBalances$8({
           networkId,
           tokensWithAddresses: tokensWithAddresses,
           connector
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$5);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$4);
       } catch (error) {
         log.error("Error", {
-          module: MODULE_TYPE$9,
+          module: MODULE_TYPE$8,
           networkId,
           addressesByToken: tokensWithAddresses,
           error
@@ -906,13 +904,13 @@ const subscribeBalances$9 = ({
 };
 
 const EvmErc20BalanceModule = {
-  type: MODULE_TYPE$9,
-  platform: PLATFORM$9,
-  getMiniMetadata: getMiniMetadata$9,
-  fetchTokens: fetchTokens$9,
-  fetchBalances: fetchBalances$9,
-  subscribeBalances: subscribeBalances$9,
-  getTransferCallData: getTransferCallData$9
+  type: MODULE_TYPE$8,
+  platform: PLATFORM$8,
+  getMiniMetadata: getMiniMetadata$8,
+  fetchTokens: fetchTokens$8,
+  fetchBalances: fetchBalances$8,
+  subscribeBalances: subscribeBalances$8,
+  getTransferCallData: getTransferCallData$8
 };
 
 const TokenConfigBaseSchema = chaindataProvider.TokenBaseSchema.partial().omit({
@@ -925,10 +923,10 @@ const EvmErc20TokenConfigSchema = z__default.default.strictObject({
   ...TokenConfigBaseSchema.shape
 });
 
-const MODULE_TYPE$8 = chaindataProvider.EvmNativeTokenSchema.shape.type.value;
-const PLATFORM$8 = chaindataProvider.EvmNativeTokenSchema.shape.platform.value;
+const MODULE_TYPE$7 = chaindataProvider.EvmNativeTokenSchema.shape.type.value;
+const PLATFORM$7 = chaindataProvider.EvmNativeTokenSchema.shape.platform.value;
 
-const fetchBalances$8 = async ({
+const fetchBalances$7 = async ({
   networkId,
   tokensWithAddresses,
   connector
@@ -940,8 +938,8 @@ const fetchBalances$8 = async ({
   const client = await connector.getPublicClientForEvmNetwork(networkId);
   if (!client) throw new Error(`Could not get rpc provider for evm network ${networkId}`);
   for (const [token, addresses] of tokensWithAddresses) {
-    if (token.type !== MODULE_TYPE$8 || token.networkId !== networkId) throw new Error(`Invalid token type or networkId for EVM ERC20 balance module: ${token.type} on ${token.networkId}`);
-    for (const address of addresses) if (!crypto.isEthereumAddress(address)) throw new Error(`Invalid ethereum address for EVM ERC20 balance module: ${address} for token ${token.id}`);
+    if (token.type !== MODULE_TYPE$7 || token.networkId !== networkId) throw new Error(`Invalid token type or networkId for EVM ERC20 balance module: ${token.type} on ${token.networkId}`);
+    for (const address of addresses) if (!util.isEthereumAddress(address)) throw new Error(`Invalid ethereum address for EVM ERC20 balance module: ${address} for token ${token.id}`);
   }
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (client.chain?.contracts?.multicall3 && balanceDefs.length > 1) {
@@ -967,7 +965,7 @@ const fetchWithoutMulticall = async (client, balanceDefs) => {
         address,
         tokenId: token.id,
         value: result.toString(),
-        source: MODULE_TYPE$8,
+        source: MODULE_TYPE$7,
         networkId: chaindataProvider.parseTokenId(token.id).networkId,
         status: "live"
       };
@@ -1013,7 +1011,7 @@ const fetchWithMulticall = async (client, balanceDefs, multicall3Address) => {
           address: balanceDefs[index].address,
           tokenId: balanceDefs[index].token.id,
           value: result.result.toString(),
-          source: MODULE_TYPE$8,
+          source: MODULE_TYPE$7,
           networkId: chaindataProvider.parseTokenId(balanceDefs[index].token.id).networkId,
           status: "live"
         });
@@ -1043,7 +1041,7 @@ const fetchWithMulticall = async (client, balanceDefs, multicall3Address) => {
   }
 };
 
-const fetchTokens$8 = async ({
+const fetchTokens$7 = async ({
   networkId,
   tokens
 }) => {
@@ -1051,8 +1049,8 @@ const fetchTokens$8 = async ({
   if (tokens.length !== 1) throw new Error("EVM Native module expects the nativeCurrency to be passed as a single token in the array");
   const token = lodashEs.assign({
     id: chaindataProvider.evmNativeTokenId(networkId),
-    type: MODULE_TYPE$8,
-    platform: PLATFORM$8,
+    type: MODULE_TYPE$7,
+    platform: PLATFORM$7,
     networkId,
     isDefault: true
   }, tokens[0]);
@@ -1064,19 +1062,19 @@ const fetchTokens$8 = async ({
   return [parsed.data];
 };
 
-const getMiniMetadata$8 = () => {
+const getMiniMetadata$7 = () => {
   throw new Error("MiniMetadata is not supported for ethereum tokens");
 };
 
-const getTransferCallData$8 = ({
+const getTransferCallData$7 = ({
   from,
   to,
   value,
   token
 }) => {
-  if (!chaindataProvider.isTokenOfType(token, MODULE_TYPE$8)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$8}.`);
-  if (!crypto.isEthereumAddress(from)) throw new Error("Invalid from address");
-  if (!crypto.isEthereumAddress(to)) throw new Error("Invalid to address");
+  if (!chaindataProvider.isTokenOfType(token, MODULE_TYPE$7)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$7}.`);
+  if (!util.isEthereumAddress(from)) throw new Error("Invalid from address");
+  if (!util.isEthereumAddress(to)) throw new Error("Invalid to address");
   return {
     from,
     to,
@@ -1085,8 +1083,8 @@ const getTransferCallData$8 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$4 = 6_000;
-const subscribeBalances$8 = ({
+const SUBSCRIPTION_INTERVAL$3 = 6_000;
+const subscribeBalances$7 = ({
   networkId,
   tokensWithAddresses,
   connector
@@ -1100,17 +1098,17 @@ const subscribeBalances$8 = ({
     const poll = async () => {
       try {
         if (abortController.signal.aborted) return;
-        const balances = await fetchBalances$8({
+        const balances = await fetchBalances$7({
           networkId,
           tokensWithAddresses: tokensWithAddresses,
           connector
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$4);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$3);
       } catch (error) {
         log.error("Error", {
-          module: MODULE_TYPE$8,
+          module: MODULE_TYPE$7,
           networkId,
           addressesByToken: tokensWithAddresses,
           error
@@ -1126,13 +1124,13 @@ const subscribeBalances$8 = ({
 };
 
 const EvmNativeBalanceModule = {
-  type: MODULE_TYPE$8,
-  platform: PLATFORM$8,
-  getMiniMetadata: getMiniMetadata$8,
-  fetchTokens: fetchTokens$8,
-  fetchBalances: fetchBalances$8,
-  subscribeBalances: subscribeBalances$8,
-  getTransferCallData: getTransferCallData$8
+  type: MODULE_TYPE$7,
+  platform: PLATFORM$7,
+  getMiniMetadata: getMiniMetadata$7,
+  fetchTokens: fetchTokens$7,
+  fetchBalances: fetchBalances$7,
+  subscribeBalances: subscribeBalances$7,
+  getTransferCallData: getTransferCallData$7
 };
 
 // to be used by chaindata too
@@ -1140,10 +1138,10 @@ const EvmNativeTokenConfigSchema = z__default.default.strictObject({
   ...TokenConfigBaseSchema.shape
 });
 
-const MODULE_TYPE$7 = chaindataProvider.EvmUniswapV2TokenSchema.shape.type.value;
-const PLATFORM$7 = chaindataProvider.EvmUniswapV2TokenSchema.shape.platform.value;
+const MODULE_TYPE$6 = chaindataProvider.EvmUniswapV2TokenSchema.shape.type.value;
+const PLATFORM$6 = chaindataProvider.EvmUniswapV2TokenSchema.shape.platform.value;
 
-const fetchBalances$7 = async ({
+const fetchBalances$6 = async ({
   networkId,
   tokensWithAddresses,
   connector
@@ -1155,8 +1153,8 @@ const fetchBalances$7 = async ({
   const client = await connector.getPublicClientForEvmNetwork(networkId);
   if (!client) throw new Error(`Could not get rpc provider for evm network ${networkId}`);
   for (const [token, addresses] of tokensWithAddresses) {
-    if (token.type !== MODULE_TYPE$7 || token.networkId !== networkId) throw new Error(`Invalid token type or networkId for EVM ERC20 balance module: ${token.type} on ${token.networkId}`);
-    for (const address of addresses) if (!crypto.isEthereumAddress(address)) throw new Error(`Invalid ethereum address for EVM ERC20 balance module: ${address} for token ${token.id}`);
+    if (token.type !== MODULE_TYPE$6 || token.networkId !== networkId) throw new Error(`Invalid token type or networkId for EVM ERC20 balance module: ${token.type} on ${token.networkId}`);
+    for (const address of addresses) if (!util.isEthereumAddress(address)) throw new Error(`Invalid ethereum address for EVM ERC20 balance module: ${address} for token ${token.id}`);
   }
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   return fetchPoolBalances(client, balanceDefs);
@@ -1242,7 +1240,7 @@ const fetchPoolBalances = async (client, balanceDefs) => {
     acc.success.push({
       address,
       tokenId: token.id,
-      source: MODULE_TYPE$7,
+      source: MODULE_TYPE$6,
       networkId: chaindataProvider.parseTokenId(token.id).networkId,
       status: "live",
       values: [{
@@ -1320,7 +1318,7 @@ const TokenCacheSchema = z__default.default.discriminatedUnion("isValid", [z__de
   id: chaindataProvider.EvmUniswapV2TokenSchema.shape.id,
   isValid: z__default.default.literal(false)
 })]);
-const fetchTokens$7 = async ({
+const fetchTokens$6 = async ({
   networkId,
   tokens,
   connector,
@@ -1379,8 +1377,8 @@ const fetchTokens$7 = async ({
     }
     const base = {
       id: tokenId,
-      type: MODULE_TYPE$7,
-      platform: PLATFORM$7,
+      type: MODULE_TYPE$6,
+      platform: PLATFORM$6,
       networkId
     };
     const cached2 = cache[tokenId] && TokenCacheSchema.safeParse(cache[tokenId]).data;
@@ -1396,19 +1394,19 @@ const fetchTokens$7 = async ({
   return result;
 };
 
-const getMiniMetadata$7 = () => {
+const getMiniMetadata$6 = () => {
   throw new Error("MiniMetadata is not supported for ethereum tokens");
 };
 
-const getTransferCallData$7 = ({
+const getTransferCallData$6 = ({
   from,
   to,
   value,
   token
 }) => {
-  if (!chaindataProvider.isTokenOfType(token, MODULE_TYPE$7)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$7}.`);
-  if (!crypto.isEthereumAddress(from)) throw new Error("Invalid from address");
-  if (!crypto.isEthereumAddress(to)) throw new Error("Invalid to address");
+  if (!chaindataProvider.isTokenOfType(token, MODULE_TYPE$6)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$6}.`);
+  if (!util.isEthereumAddress(from)) throw new Error("Invalid from address");
+  if (!util.isEthereumAddress(to)) throw new Error("Invalid to address");
   const data = viem.encodeFunctionData({
     abi: viem.erc20Abi,
     functionName: "transfer",
@@ -1421,151 +1419,6 @@ const getTransferCallData$7 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$3 = 6_000;
-const subscribeBalances$7 = ({
-  networkId,
-  tokensWithAddresses,
-  connector
-}) => {
-  if (!tokensWithAddresses.length) return rxjs.of({
-    success: [],
-    errors: []
-  });
-  return new rxjs.Observable(subscriber => {
-    const abortController = new AbortController();
-    const poll = async () => {
-      try {
-        if (abortController.signal.aborted) return;
-        const balances = await fetchBalances$7({
-          networkId,
-          tokensWithAddresses: tokensWithAddresses,
-          connector
-        });
-        if (abortController.signal.aborted) return;
-        subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$3);
-      } catch (error) {
-        log.error("Error", {
-          module: MODULE_TYPE$7,
-          networkId,
-          addressesByToken: tokensWithAddresses,
-          error
-        });
-        subscriber.error(error);
-      }
-    };
-    poll();
-    return () => {
-      abortController.abort();
-    };
-  }).pipe(rxjs.distinctUntilChanged(lodashEs.isEqual));
-};
-
-const EvmUniswapV2BalanceModule = {
-  type: MODULE_TYPE$7,
-  platform: PLATFORM$7,
-  getMiniMetadata: getMiniMetadata$7,
-  fetchTokens: fetchTokens$7,
-  fetchBalances: fetchBalances$7,
-  subscribeBalances: subscribeBalances$7,
-  getTransferCallData: getTransferCallData$7
-};
-
-// to be used by chaindata too
-const EvmUniswapV2TokenConfigSchema = z__default.default.strictObject({
-  contractAddress: chaindataProvider.EvmUniswapV2TokenSchema.shape.contractAddress,
-  ...TokenConfigBaseSchema.shape
-});
-
-const MODULE_TYPE$6 = chaindataProvider.SolNativeTokenSchema.shape.type.value;
-const PLATFORM$6 = chaindataProvider.SolNativeTokenSchema.shape.platform.value;
-
-const fetchBalances$6 = async ({
-  networkId,
-  tokensWithAddresses,
-  connector
-}) => {
-  if (!tokensWithAddresses.length) return {
-    success: [],
-    errors: []
-  };
-  const connection = await connector.getConnection(networkId);
-  if (!connection) throw new Error(`Could not get rpc provider for sol network ${networkId}`);
-  for (const [token, addresses] of tokensWithAddresses) {
-    if (token.type !== MODULE_TYPE$6 || token.networkId !== networkId) throw new Error(`Invalid token type or networkId for balance module: ${token.type} on ${token.networkId}`);
-    for (const address of addresses) if (!crypto.isSolanaAddress(address)) throw new Error(`Invalid solana address for balance module: ${address} for token ${token.id}`);
-  }
-  const balanceDefs = getBalanceDefs(tokensWithAddresses);
-  const results = await Promise.allSettled(balanceDefs.map(async ({
-    token,
-    address
-  }) => {
-    try {
-      const publicKey = new web3_js.PublicKey(address);
-      const lamports = await connection.getBalance(publicKey);
-      return {
-        address: address,
-        tokenId: token.id,
-        value: lamports.toString(),
-        source: MODULE_TYPE$6,
-        networkId: token.networkId,
-        status: "live"
-      };
-    } catch (err) {
-      throw new BalanceFetchError(`Failed to get balance for token ${token.id} and address ${address} on chain ${networkId}`, token.id, address, err);
-    }
-  }));
-  return results.reduce((acc, result) => {
-    if (result.status === "fulfilled") acc.success.push(result.value);else {
-      const error = result.reason;
-      acc.errors.push({
-        tokenId: error.tokenId,
-        address: error.address,
-        error
-      });
-    }
-    return acc;
-  }, {
-    success: [],
-    errors: []
-  });
-};
-
-const fetchTokens$6 = async ({
-  networkId,
-  tokens
-}) => {
-  // assume there is one and only one token in the array
-  if (tokens.length !== 1) throw new Error("EVM Native module expects the nativeCurrency to be passed as a single token in the array");
-  const token = lodashEs.assign({
-    id: chaindataProvider.solNativeTokenId(networkId),
-    type: MODULE_TYPE$6,
-    platform: PLATFORM$6,
-    networkId,
-    isDefault: true
-  }, tokens[0]);
-  const parsed = chaindataProvider.SolNativeTokenSchema.safeParse(token);
-  if (!parsed.success) {
-    log.warn("Ignoring token with invalid schema", token);
-    return [];
-  }
-  return [parsed.data];
-};
-
-const getMiniMetadata$6 = () => {
-  throw new Error("MiniMetadata is not supported for sol-native tokens");
-};
-
-const getTransferCallData$6 = ({
-  // from,
-  // to,
-  // value,
-  token
-}) => {
-  if (!chaindataProvider.isTokenOfType(token, MODULE_TYPE$6)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$6}.`);
-  throw new Error("Not implemented");
-};
-
 const SUBSCRIPTION_INTERVAL$2 = 6_000;
 const subscribeBalances$6 = ({
   networkId,
@@ -1583,7 +1436,7 @@ const subscribeBalances$6 = ({
         if (abortController.signal.aborted) return;
         const balances = await fetchBalances$6({
           networkId,
-          tokensWithAddresses,
+          tokensWithAddresses: tokensWithAddresses,
           connector
         });
         if (abortController.signal.aborted) return;
@@ -1593,7 +1446,7 @@ const subscribeBalances$6 = ({
         log.error("Error", {
           module: MODULE_TYPE$6,
           networkId,
-          tokensWithAddresses,
+          addressesByToken: tokensWithAddresses,
           error
         });
         subscriber.error(error);
@@ -1606,7 +1459,7 @@ const subscribeBalances$6 = ({
   }).pipe(rxjs.distinctUntilChanged(lodashEs.isEqual));
 };
 
-const SolNativeBalanceModule = {
+const EvmUniswapV2BalanceModule = {
   type: MODULE_TYPE$6,
   platform: PLATFORM$6,
   getMiniMetadata: getMiniMetadata$6,
@@ -1617,7 +1470,8 @@ const SolNativeBalanceModule = {
 };
 
 // to be used by chaindata too
-const SolNativeTokenConfigSchema = z__default.default.strictObject({
+const EvmUniswapV2TokenConfigSchema = z__default.default.strictObject({
+  contractAddress: chaindataProvider.EvmUniswapV2TokenSchema.shape.contractAddress,
   ...TokenConfigBaseSchema.shape
 });
 
@@ -6282,7 +6136,7 @@ const SubTokensMiniMetadataExtraSchema = z__default.default.strictObject({
   palletId: z__default.default.string()
 });
 
-const BALANCE_MODULES = [SubNativeBalanceModule, SubAssetsBalanceModule, SubHydrationBalanceModule, SubForeignAssetsBalanceModule, SubPsp22BalanceModule, SubTokensBalanceModule, EvmErc20BalanceModule, EvmUniswapV2BalanceModule, EvmNativeBalanceModule, SolNativeBalanceModule];
+const BALANCE_MODULES = [SubNativeBalanceModule, SubAssetsBalanceModule, SubHydrationBalanceModule, SubForeignAssetsBalanceModule, SubPsp22BalanceModule, SubTokensBalanceModule, EvmErc20BalanceModule, EvmUniswapV2BalanceModule, EvmNativeBalanceModule];
 
 // share requests as all modules will call this at once
 const CACHE$1 = new Map();
@@ -6384,6 +6238,10 @@ class BalancesProvider {
   #chaindataProvider;
   #chainConnectors;
   #storage;
+
+  // storage is updated at high frequency, use a queue to avoid race conditions
+  #updateStorageQueue = [];
+  #isProcessingStorageUpdates = false;
   constructor(chaindataProvider, chainConnectors, storage = DEFAULT_STORAGE) {
     this.#chaindataProvider = chaindataProvider;
     this.#chainConnectors = chainConnectors;
@@ -6460,25 +6318,10 @@ class BalancesProvider {
             {
               return this.getEthereumNetworkModuleBalances$(networkId, tokensWithAddresses, mod);
             }
-          case "solana":
-            {
-              return this.getSolanaNetworkModuleBalances$(networkId, tokensWithAddresses, mod);
-            }
           case "polkadot":
             {
               return this.getPolkadotNetworkModuleBalances$(networkId, tokensWithAddresses, mod);
             }
-          default:
-            {
-              log.warn("[balances] Unsupported network platform for module", {
-                networkId,
-                mod
-              });
-              return rxjs.of({
-                status: "live",
-                balances: []
-              }); // no solana modules yet
-            }
         }
       }));
     }), rxjs.map(results => {
@@ -6508,7 +6351,7 @@ class BalancesProvider {
         address
       })));
       if (!this.#chainConnectors.substrate) {
-        log.warn("[balances] no substrate connector or miniMetadata for module", mod.type);
+        log.debug("[balances] no substrate connector or miniMetadata for module", mod.type);
         return rxjs.defer(() => rxjs.of({
           status: "initialising",
           balances: this.getStoredBalances(moduleAddressesByTokenId)
@@ -6525,9 +6368,7 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), rxjs.tap(results => {
-        this.updateStorage$(balanceIds, results);
-      }),
+      })), rxjs.tap(results => this.updateStoredBalances(balanceIds, results)),
       // shareReplay + keepAlive(0) keep the subscription alive while root observable is being unsubscribed+resubscribed, in case any input change
       rxjs.shareReplay({
         refCount: true,
@@ -6559,7 +6400,7 @@ class BalancesProvider {
         address
       })));
       if (!this.#chainConnectors.evm) {
-        log.warn("[balances] no ethereum connector for module", mod.type);
+        log.debug("[balances] no ethereum connector for module", mod.type);
         return rxjs.defer(() => rxjs.of({
           status: "initialising",
           balances: this.getStoredBalances(moduleAddressesByTokenId)
@@ -6575,9 +6416,7 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), rxjs.tap(results => {
-        this.updateStorage$(balanceIds, results);
-      }),
+      })), rxjs.tap(results => this.updateStoredBalances(balanceIds, results)),
       // shareReplay + keepAlive(0) keep the subscription alive while root observable is being unsubscribed+resubscribed, in case any input change
       rxjs.shareReplay({
         refCount: true,
@@ -6591,70 +6430,72 @@ class BalancesProvider {
       })));
     });
   }
-  getSolanaNetworkModuleBalances$(networkId, tokensWithAddresses, mod) {
-    return util.getSharedObservable(`BalancesProvider.getSolanaNetworkModuleBalances$`, {
+  updateStoredBalances(balanceIds, balancesResult) {
+    if (balancesResult.status !== "live") return;
+    this.#updateStorageQueue.push({
+      type: "balances",
+      balanceIds,
+      balances: balancesResult.balances
+    });
+    this.processStorageUpdatesQueue();
+  }
+  updateStoredMiniMetadatas(networkId, miniMetadatas) {
+    this.#updateStorageQueue.push({
+      type: "miniMetadatas",
       networkId,
-      mod,
-      tokensWithAddresses
-    }, () => {
-      if (!tokensWithAddresses.length) return rxjs.of({
-        status: "live",
-        balances: []
-      });
-      const moduleAddressesByTokenId = lodashEs.fromPairs(tokensWithAddresses.map(([token, addresses]) => [token.id, addresses]));
-
-      // all balance ids expected in result set
-      const balanceIds = lodashEs.toPairs(moduleAddressesByTokenId).flatMap(([tokenId, addresses]) => addresses.map(address => getBalanceId({
-        tokenId,
-        address
-      })));
-      if (!this.#chainConnectors.solana) {
-        log.warn("[balances] no solana connector for module", mod.type);
-        return rxjs.defer(() => rxjs.of({
-          status: "initialising",
-          balances: this.getStoredBalances(moduleAddressesByTokenId)
-        }));
-      }
-      const moduleBalances$ = mod.subscribeBalances({
-        networkId,
-        tokensWithAddresses,
-        connector: this.#chainConnectors.solana
-      }).pipe(rxjs.catchError(() => rxjs.EMPTY),
-      // don't emit, let provider mark balances stale
-      rxjs.map(results => ({
-        status: "live",
-        // exclude zero balances
-        balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), rxjs.tap(results => {
-        this.updateStorage$(balanceIds, results);
-      }),
-      // shareReplay + keepAlive(0) keep the subscription alive while root observable is being unsubscribed+resubscribed, in case any input change
-      rxjs.shareReplay({
-        refCount: true,
-        bufferSize: 1
-      }), util.keepAlive(0));
-
-      // defer the startWith call to start with up to date balances each time the observable is re-subscribed to
-      return rxjs.defer(() => moduleBalances$.pipe(rxjs.startWith({
-        status: "initialising",
-        balances: this.getStoredBalances(moduleAddressesByTokenId)
-      })));
+      miniMetadatas
     });
+    this.processStorageUpdatesQueue();
   }
-  updateStorage$(balanceIds, balancesResult) {
-    if (balancesResult.status !== "live") return;
+  processStorageUpdatesQueue() {
+    if (this.#updateStorageQueue.length > 1) log.warn("[balances] this message is the proof that there are sometimes racing conditions, and that we avoided them :)");
+    if (this.#isProcessingStorageUpdates || !this.#updateStorageQueue.length) return;
+    this.#isProcessingStorageUpdates = true;
     const storage = this.#storage.getValue();
-    const balances = lodashEs.assign({}, storage.balances,
-    // delete all balances expected in the result set. because if they are not present it means they are empty.
-    lodashEs.fromPairs(balanceIds.map(balanceId => [balanceId, undefined])), lodashEs.keyBy(
-    // storage balances must have status "cache", because they are used as start value when initialising subsequent subscriptions
-    balancesResult.balances.map(b => ({
-      ...b,
-      status: "cache"
-    })), b => getBalanceId(b)));
-    this.#storage.next(lodashEs.assign({}, storage, {
-      balances
-    }));
+    const balances = {
+      ...storage.balances
+    };
+    const miniMetadatas = {
+      ...storage.miniMetadatas
+    };
+    while (this.#updateStorageQueue.length) {
+      const queueItem = this.#updateStorageQueue.shift();
+      switch (queueItem?.type) {
+        case "miniMetadatas":
+          {
+            const {
+              networkId,
+              miniMetadatas: newMiniMetadatas
+            } = queueItem;
+
+            // remove old miniMetadatas for the network
+            for (const miniMetadata of lodashEs.values(miniMetadatas)) if (miniMetadata.chainId === networkId) delete miniMetadatas[miniMetadata.id];
+
+            // add new ones
+            for (const miniMetadata of newMiniMetadatas) miniMetadatas[miniMetadata.id] = miniMetadata;
+            break;
+          }
+        case "balances":
+          {
+            const {
+              balanceIds,
+              balances: newBalances
+            } = queueItem;
+
+            // remove all balances expected in the result set
+            for (const balanceId of balanceIds) delete balances[balanceId];
+
+            // add new ones
+            for (const balance of newBalances) balances[getBalanceId(balance)] = balance;
+            break;
+          }
+      }
+      this.#storage.next({
+        balances,
+        miniMetadatas
+      });
+      this.#isProcessingStorageUpdates = false;
+    }
   }
   getNetworkMiniMetadatas$(networkId) {
     return util.getSharedObservable(`BalancesProvider.getNetworkMiniMetadatas$`, {
@@ -6706,15 +6547,7 @@ class BalancesProvider {
       // and persist in storage for later reuse
       rxjs.tap(newMiniMetadatas => {
         if (!newMiniMetadatas.length) return;
-        const storage = this.#storage.getValue();
-        const miniMetadatas = lodashEs.assign(
-        // keep minimetadatas of other networks
-        lodashEs.keyBy(lodashEs.values(storage.miniMetadatas).filter(m => m.chainId !== networkId), m => m.id),
-        // add the ones for our network
-        lodashEs.keyBy(newMiniMetadatas, m => m.id));
-        this.#storage.next(lodashEs.assign({}, storage, {
-          miniMetadatas
-        }));
+        this.updateStoredMiniMetadatas(networkId, newMiniMetadatas);
       }));
     }),
     // emit only when mini metadata changes, as a change here would restart all subscriptions for the network
@@ -6746,46 +6579,22 @@ class BalancesProvider {
       return lodashEs.fromPairs(lodashEs.toPairs(addressesByTokenId).map(([tokenId, addresses]) => {
         const networkId = chaindataProvider.parseTokenId(tokenId).networkId;
         const network = networksById[networkId];
-        return [tokenId, lodashEs.uniq(addresses.map(crypto.normalizeAddress)).filter(address => network && isAddressCompatibleWithNetwork(network, address))];
+        return [tokenId, lodashEs.uniq(addresses.map(util.normalizeAddress)).filter(address => network && isAddressCompatibleWithNetwork(network, address))];
       }).filter(([, addresses]) => addresses.length > 0));
     }));
   }
 }
-const isAccountPlatformCompatibleWithNetwork = (network, platform) => {
+const isAddressCompatibleWithNetwork = (network, address) => {
   switch (network.platform) {
     case "ethereum":
-      return platform === "ethereum";
-    case "solana":
-      return platform === "solana";
+      return util.isEthereumAddress(address);
     case "polkadot":
-      {
-        switch (network.account) {
-          case "secp256k1":
-            return platform === "ethereum";
-          case "*25519":
-            return platform === "polkadot";
-          default:
-            throw new Error(`Unsupported polkadot network account type ${network.account}`);
-        }
-      }
+      return util.isEthereumAddress(address) ? network.account === "secp256k1" : network.account !== "secp256k1";
     default:
       log.warn("Unsupported network platform", network);
       throw new Error("Unsupported network platform");
   }
 };
-
-/**
- * If this is the address of an account, use isAccountCompatibleWithChain instead.
- * Otherwise it could lead to a loss of funds
- * @param chain
- * @param address
- * @returns
- */
-const isAddressCompatibleWithNetwork = (network, address) => {
-  // TODO try with return true to check if wallet filters correctly upfront
-  const accountPlatform = crypto.getAccountPlatformFromAddress(address);
-  return isAccountPlatformCompatibleWithNetwork(network, accountPlatform);
-};
 const sortByBalanceId = (a, b) => getBalanceId(a).localeCompare(getBalanceId(b));
 const sortByMiniMetadataId = (a, b) => a.id.localeCompare(b.id);
 
@@ -6812,8 +6621,6 @@ exports.PlanckSumBalancesFormatter = PlanckSumBalancesFormatter;
 exports.SCALE_FACTOR = SCALE_FACTOR;
 exports.SUBTENSOR_MIN_STAKE_AMOUNT_PLANK = SUBTENSOR_MIN_STAKE_AMOUNT_PLANK;
 exports.SUBTENSOR_ROOT_NETUID = SUBTENSOR_ROOT_NETUID;
-exports.SolNativeBalanceModule = SolNativeBalanceModule;
-exports.SolNativeTokenConfigSchema = SolNativeTokenConfigSchema;
 exports.SubAssetsBalanceModule = SubAssetsBalanceModule;
 exports.SubAssetsTokenConfigSchema = SubAssetsTokenConfigSchema;
 exports.SubForeignAssetsBalanceModule = SubForeignAssetsBalanceModule;