@talismn/balances 0.0.0-pr2091-20250715125148 → 0.0.0-pr2092-20250715131755

package/dist/talismn-balances.esm.js

@@ -1,14 +1,12 @@
-import { EvmErc20TokenSchema, parseTokenId, parseEvmErc20TokenId, evmErc20TokenId, isTokenOfType, TokenBaseSchema, EvmNativeTokenSchema, evmNativeTokenId, EvmUniswapV2TokenSchema, evmUniswapV2TokenId, SolNativeTokenSchema, solNativeTokenId, SubAssetsTokenSchema, subAssetTokenId, MINIMETADATA_VERSION, SubForeignAssetsTokenSchema, subForeignAssetTokenId, SubHydrationTokenSchema, subHydrationTokenId, SubNativeTokenSchema, subNativeTokenId, SubPsp22TokenSchema, subPsp22TokenId, SubTokensTokenSchema, subTokensTokenId, isNetworkDot } from '@talismn/chaindata-provider';
+import { EvmErc20TokenSchema, parseTokenId, parseEvmErc20TokenId, evmErc20TokenId, isTokenOfType, TokenBaseSchema, EvmNativeTokenSchema, evmNativeTokenId, EvmUniswapV2TokenSchema, evmUniswapV2TokenId, SubAssetsTokenSchema, subAssetTokenId, MINIMETADATA_VERSION, SubForeignAssetsTokenSchema, subForeignAssetTokenId, SubHydrationTokenSchema, subHydrationTokenId, SubNativeTokenSchema, subNativeTokenId, SubPsp22TokenSchema, subPsp22TokenId, SubTokensTokenSchema, subTokensTokenId, isNetworkDot } from '@talismn/chaindata-provider';
 export { MINIMETADATA_VERSION } from '@talismn/chaindata-provider';
-import { isEthereumAddress, isSolanaAddress, normalizeAddress, getAccountPlatformFromAddress } from '@talismn/crypto';
+import { isEthereumAddress, isNotNil, BigMath, isArrayOf, isBigInt, planckToTokens, isAbortError, getSharedObservable, keepAlive, isTruthy, normalizeAddress } from '@talismn/util';
 import { parseAbi, erc20Abi, getContract, ContractFunctionExecutionError, hexToString, erc20Abi_bytes32, encodeFunctionData, withRetry } from 'viem';
 import { assign, omit, isEqual, uniq, keyBy, keys, fromPairs, values, toPairs } from 'lodash-es';
 import z from 'zod/v4';
 import anylogger from 'anylogger';
 import { of, Observable, distinctUntilChanged, map, timer, switchMap, from, firstValueFrom, combineLatest, BehaviorSubject, shareReplay, startWith, filter, defer, catchError, EMPTY, tap } from 'rxjs';
 import BigNumber from 'bignumber.js';
-import { PublicKey } from '@solana/web3.js';
-import { isNotNil, BigMath, isArrayOf, isBigInt, planckToTokens, isAbortError, getSharedObservable, keepAlive, isTruthy } from '@talismn/util';
 import { parseMetadataRpc, toHex, unifyMetadata, decAnyMetadata, getDynamicBuilder, getLookupFn, decodeScale, getStorageKeyPrefix, Twox128, compactMetadata, encodeMetadata, papiParse, papiStringify } from '@talismn/scale';
 import { newTokenRates } from '@talismn/token-rates';
 import { mergeUint8 } from '@polkadot-api/utils';
@@ -21,8 +19,8 @@ import { u8aToHex, u8aConcatStrict, u8aToString, hexToNumber } from '@polkadot/u
 import PQueue from 'p-queue';
 import { fetchBestMetadata } from '@talismn/sapi';
 
-const MODULE_TYPE$9 = EvmErc20TokenSchema.shape.type.value;
-const PLATFORM$9 = EvmErc20TokenSchema.shape.platform.value;
+const MODULE_TYPE$8 = EvmErc20TokenSchema.shape.type.value;
+const PLATFORM$8 = EvmErc20TokenSchema.shape.platform.value;
 
 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)"]);
 
@@ -618,7 +616,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
@@ -630,7 +628,7 @@ 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}`);
+    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 (!isEthereumAddress(address)) throw new Error(`Invalid ethereum address for EVM ERC20 balance module: ${address} for token ${token.id}`);
   }
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
@@ -660,7 +658,7 @@ const fetchWithoutAggregator = async (client, balanceDefs) => {
         address,
         tokenId: token.id,
         value: result.toString(),
-        source: MODULE_TYPE$9,
+        source: MODULE_TYPE$8,
         networkId: parseEvmErc20TokenId(token.id).networkId,
         status: "live"
       };
@@ -703,7 +701,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: parseTokenId(balanceDef.token.id).networkId,
       status: "live"
     }));
@@ -772,7 +770,7 @@ const TokenCacheSchema$1 = z.discriminatedUnion("isValid", [z.strictObject({
   id: EvmErc20TokenSchema.shape.id,
   isValid: z.literal(false)
 })]);
-const fetchTokens$9 = async ({
+const fetchTokens$8 = async ({
   networkId,
   tokens,
   connector,
@@ -812,8 +810,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;
@@ -831,17 +829,17 @@ 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 (!isTokenOfType(token, MODULE_TYPE$9)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$9}.`);
+  if (!isTokenOfType(token, MODULE_TYPE$8)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$8}.`);
   if (!isEthereumAddress(from)) throw new Error("Invalid from address");
   if (!isEthereumAddress(to)) throw new Error("Invalid to address");
   const data = encodeFunctionData({
@@ -856,8 +854,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
@@ -871,17 +869,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
@@ -897,13 +895,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 = TokenBaseSchema.partial().omit({
@@ -916,10 +914,10 @@ const EvmErc20TokenConfigSchema = z.strictObject({
   ...TokenConfigBaseSchema.shape
 });
 
-const MODULE_TYPE$8 = EvmNativeTokenSchema.shape.type.value;
-const PLATFORM$8 = EvmNativeTokenSchema.shape.platform.value;
+const MODULE_TYPE$7 = EvmNativeTokenSchema.shape.type.value;
+const PLATFORM$7 = EvmNativeTokenSchema.shape.platform.value;
 
-const fetchBalances$8 = async ({
+const fetchBalances$7 = async ({
   networkId,
   tokensWithAddresses,
   connector
@@ -931,7 +929,7 @@ 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}`);
+    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 (!isEthereumAddress(address)) throw new Error(`Invalid ethereum address for EVM ERC20 balance module: ${address} for token ${token.id}`);
   }
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
@@ -958,7 +956,7 @@ const fetchWithoutMulticall = async (client, balanceDefs) => {
         address,
         tokenId: token.id,
         value: result.toString(),
-        source: MODULE_TYPE$8,
+        source: MODULE_TYPE$7,
         networkId: parseTokenId(token.id).networkId,
         status: "live"
       };
@@ -1004,7 +1002,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: parseTokenId(balanceDefs[index].token.id).networkId,
           status: "live"
         });
@@ -1034,7 +1032,7 @@ const fetchWithMulticall = async (client, balanceDefs, multicall3Address) => {
   }
 };
 
-const fetchTokens$8 = async ({
+const fetchTokens$7 = async ({
   networkId,
   tokens
 }) => {
@@ -1042,8 +1040,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 = assign({
     id: evmNativeTokenId(networkId),
-    type: MODULE_TYPE$8,
-    platform: PLATFORM$8,
+    type: MODULE_TYPE$7,
+    platform: PLATFORM$7,
     networkId,
     isDefault: true
   }, tokens[0]);
@@ -1055,17 +1053,17 @@ 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 (!isTokenOfType(token, MODULE_TYPE$8)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$8}.`);
+  if (!isTokenOfType(token, MODULE_TYPE$7)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$7}.`);
   if (!isEthereumAddress(from)) throw new Error("Invalid from address");
   if (!isEthereumAddress(to)) throw new Error("Invalid to address");
   return {
@@ -1076,8 +1074,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
@@ -1091,17 +1089,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
@@ -1117,13 +1115,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
@@ -1131,10 +1129,10 @@ const EvmNativeTokenConfigSchema = z.strictObject({
   ...TokenConfigBaseSchema.shape
 });
 
-const MODULE_TYPE$7 = EvmUniswapV2TokenSchema.shape.type.value;
-const PLATFORM$7 = EvmUniswapV2TokenSchema.shape.platform.value;
+const MODULE_TYPE$6 = EvmUniswapV2TokenSchema.shape.type.value;
+const PLATFORM$6 = EvmUniswapV2TokenSchema.shape.platform.value;
 
-const fetchBalances$7 = async ({
+const fetchBalances$6 = async ({
   networkId,
   tokensWithAddresses,
   connector
@@ -1146,7 +1144,7 @@ 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}`);
+    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 (!isEthereumAddress(address)) throw new Error(`Invalid ethereum address for EVM ERC20 balance module: ${address} for token ${token.id}`);
   }
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
@@ -1233,7 +1231,7 @@ const fetchPoolBalances = async (client, balanceDefs) => {
     acc.success.push({
       address,
       tokenId: token.id,
-      source: MODULE_TYPE$7,
+      source: MODULE_TYPE$6,
       networkId: parseTokenId(token.id).networkId,
       status: "live",
       values: [{
@@ -1311,7 +1309,7 @@ const TokenCacheSchema = z.discriminatedUnion("isValid", [z.strictObject({
   id: EvmUniswapV2TokenSchema.shape.id,
   isValid: z.literal(false)
 })]);
-const fetchTokens$7 = async ({
+const fetchTokens$6 = async ({
   networkId,
   tokens,
   connector,
@@ -1370,8 +1368,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;
@@ -1387,17 +1385,17 @@ 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 (!isTokenOfType(token, MODULE_TYPE$7)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$7}.`);
+  if (!isTokenOfType(token, MODULE_TYPE$6)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$6}.`);
   if (!isEthereumAddress(from)) throw new Error("Invalid from address");
   if (!isEthereumAddress(to)) throw new Error("Invalid to address");
   const data = encodeFunctionData({
@@ -1412,151 +1410,6 @@ const getTransferCallData$7 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$3 = 6_000;
-const subscribeBalances$7 = ({
-  networkId,
-  tokensWithAddresses,
-  connector
-}) => {
-  if (!tokensWithAddresses.length) return of({
-    success: [],
-    errors: []
-  });
-  return new 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(distinctUntilChanged(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.strictObject({
-  contractAddress: EvmUniswapV2TokenSchema.shape.contractAddress,
-  ...TokenConfigBaseSchema.shape
-});
-
-const MODULE_TYPE$6 = SolNativeTokenSchema.shape.type.value;
-const PLATFORM$6 = 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 (!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 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 = assign({
-    id: solNativeTokenId(networkId),
-    type: MODULE_TYPE$6,
-    platform: PLATFORM$6,
-    networkId,
-    isDefault: true
-  }, tokens[0]);
-  const parsed = 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 (!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,
@@ -1574,7 +1427,7 @@ const subscribeBalances$6 = ({
         if (abortController.signal.aborted) return;
         const balances = await fetchBalances$6({
           networkId,
-          tokensWithAddresses,
+          tokensWithAddresses: tokensWithAddresses,
           connector
         });
         if (abortController.signal.aborted) return;
@@ -1584,7 +1437,7 @@ const subscribeBalances$6 = ({
         log.error("Error", {
           module: MODULE_TYPE$6,
           networkId,
-          tokensWithAddresses,
+          addressesByToken: tokensWithAddresses,
           error
         });
         subscriber.error(error);
@@ -1597,7 +1450,7 @@ const subscribeBalances$6 = ({
   }).pipe(distinctUntilChanged(isEqual));
 };
 
-const SolNativeBalanceModule = {
+const EvmUniswapV2BalanceModule = {
   type: MODULE_TYPE$6,
   platform: PLATFORM$6,
   getMiniMetadata: getMiniMetadata$6,
@@ -1608,7 +1461,8 @@ const SolNativeBalanceModule = {
 };
 
 // to be used by chaindata too
-const SolNativeTokenConfigSchema = z.strictObject({
+const EvmUniswapV2TokenConfigSchema = z.strictObject({
+  contractAddress: EvmUniswapV2TokenSchema.shape.contractAddress,
   ...TokenConfigBaseSchema.shape
 });
 
@@ -6273,7 +6127,7 @@ const SubTokensMiniMetadataExtraSchema = z.strictObject({
   palletId: z.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();
@@ -6451,25 +6305,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 of({
-                status: "live",
-                balances: []
-              }); // no solana modules yet
-            }
         }
       }));
     }), map(results => {
@@ -6499,7 +6338,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 defer(() => of({
           status: "initialising",
           balances: this.getStoredBalances(moduleAddressesByTokenId)
@@ -6550,7 +6389,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 defer(() => of({
           status: "initialising",
           balances: this.getStoredBalances(moduleAddressesByTokenId)
@@ -6582,56 +6421,6 @@ class BalancesProvider {
       })));
     });
   }
-  getSolanaNetworkModuleBalances$(networkId, tokensWithAddresses, mod) {
-    return getSharedObservable(`BalancesProvider.getSolanaNetworkModuleBalances$`, {
-      networkId,
-      mod,
-      tokensWithAddresses
-    }, () => {
-      if (!tokensWithAddresses.length) return of({
-        status: "live",
-        balances: []
-      });
-      const moduleAddressesByTokenId = fromPairs(tokensWithAddresses.map(([token, addresses]) => [token.id, addresses]));
-
-      // all balance ids expected in result set
-      const balanceIds = 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 defer(() => of({
-          status: "initialising",
-          balances: this.getStoredBalances(moduleAddressesByTokenId)
-        }));
-      }
-      const moduleBalances$ = mod.subscribeBalances({
-        networkId,
-        tokensWithAddresses,
-        connector: this.#chainConnectors.solana
-      }).pipe(catchError(() => EMPTY),
-      // don't emit, let provider mark balances stale
-      map(results => ({
-        status: "live",
-        // exclude zero balances
-        balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), 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
-      shareReplay({
-        refCount: true,
-        bufferSize: 1
-      }), keepAlive(0));
-
-      // defer the startWith call to start with up to date balances each time the observable is re-subscribed to
-      return defer(() => moduleBalances$.pipe(startWith({
-        status: "initialising",
-        balances: this.getStoredBalances(moduleAddressesByTokenId)
-      })));
-    });
-  }
   updateStorage$(balanceIds, balancesResult) {
     if (balancesResult.status !== "live") return;
     const storage = this.#storage.getValue();
@@ -6742,42 +6531,18 @@ class BalancesProvider {
     }));
   }
 }
-const isAccountPlatformCompatibleWithNetwork = (network, platform) => {
+const isAddressCompatibleWithNetwork = (network, address) => {
   switch (network.platform) {
     case "ethereum":
-      return platform === "ethereum";
-    case "solana":
-      return platform === "solana";
+      return 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 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 = getAccountPlatformFromAddress(address);
-  return isAccountPlatformCompatibleWithNetwork(network, accountPlatform);
-};
 const sortByBalanceId = (a, b) => getBalanceId(a).localeCompare(getBalanceId(b));
 const sortByMiniMetadataId = (a, b) => a.id.localeCompare(b.id);
 
-export { BALANCE_MODULES, Balance, BalanceFormatter, BalanceValueGetter, Balances, BalancesProvider, Change24hCurrencyFormatter, EvmErc20BalanceModule, EvmErc20TokenConfigSchema, EvmNativeBalanceModule, EvmNativeTokenConfigSchema, EvmUniswapV2BalanceModule, EvmUniswapV2TokenConfigSchema, FiatSumBalancesFormatter, ONE_ALPHA_TOKEN, PlanckSumBalancesFormatter, SCALE_FACTOR, SUBTENSOR_MIN_STAKE_AMOUNT_PLANK, SUBTENSOR_ROOT_NETUID, SolNativeBalanceModule, SolNativeTokenConfigSchema, SubAssetsBalanceModule, SubAssetsTokenConfigSchema, SubForeignAssetsBalanceModule, SubForeignAssetsTokenConfigSchema, SubHydrationBalanceModule, SubHydrationTokenConfigSchema, SubNativeBalanceModule, SubNativeMiniMetadataExtraSchema, SubNativeModuleConfigSchema, SubNativeTokenConfigSchema, SubPsp22BalanceModule, SubPsp22TokenConfigSchema, SubTokensBalanceModule, SubTokensMiniMetadataExtraSchema, SubTokensModuleConfigSchema, SubTokensTokenConfigSchema, SumBalancesFormatter, abiMulticall, calculateAlphaPrice, calculateTaoAmountFromAlpha, calculateTaoFromDynamicInfo, deriveMiniMetadataId, erc20BalancesAggregatorAbi, excludeFromFeePayableLocks, excludeFromTransferableAmount, filterBaseLocks, filterMirrorTokens, getBalanceId, getLockTitle, getLockedType, getValueId, includeInTotalExtraAmount, uniswapV2PairAbi };
+export { BALANCE_MODULES, Balance, BalanceFormatter, BalanceValueGetter, Balances, BalancesProvider, Change24hCurrencyFormatter, EvmErc20BalanceModule, EvmErc20TokenConfigSchema, EvmNativeBalanceModule, EvmNativeTokenConfigSchema, EvmUniswapV2BalanceModule, EvmUniswapV2TokenConfigSchema, FiatSumBalancesFormatter, ONE_ALPHA_TOKEN, PlanckSumBalancesFormatter, SCALE_FACTOR, SUBTENSOR_MIN_STAKE_AMOUNT_PLANK, SUBTENSOR_ROOT_NETUID, SubAssetsBalanceModule, SubAssetsTokenConfigSchema, SubForeignAssetsBalanceModule, SubForeignAssetsTokenConfigSchema, SubHydrationBalanceModule, SubHydrationTokenConfigSchema, SubNativeBalanceModule, SubNativeMiniMetadataExtraSchema, SubNativeModuleConfigSchema, SubNativeTokenConfigSchema, SubPsp22BalanceModule, SubPsp22TokenConfigSchema, SubTokensBalanceModule, SubTokensMiniMetadataExtraSchema, SubTokensModuleConfigSchema, SubTokensTokenConfigSchema, SumBalancesFormatter, abiMulticall, calculateAlphaPrice, calculateTaoAmountFromAlpha, calculateTaoFromDynamicInfo, deriveMiniMetadataId, erc20BalancesAggregatorAbi, excludeFromFeePayableLocks, excludeFromTransferableAmount, filterBaseLocks, filterMirrorTokens, getBalanceId, getLockTitle, getLockedType, getValueId, includeInTotalExtraAmount, uniswapV2PairAbi };