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

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

@@ -2,13 +2,13 @@
 
 var dexie = require('dexie');
 var anylogger = require('anylogger');
+var chaindataProvider = require('@talismn/chaindata-provider');
 var tokenRates = require('@talismn/token-rates');
 var util = require('@talismn/util');
 var BigNumber = require('bignumber.js');
 var util$1 = require('@polkadot/util');
 var utilCrypto = require('@polkadot/util-crypto');
 var pako = require('pako');
-var chaindataProvider = require('@talismn/chaindata-provider');
 var viem = require('viem');
 var isEqual = require('lodash/isEqual');
 var txwrapperCore = require('@substrate/txwrapper-core');
@@ -126,7 +126,7 @@ class EvmTokenFetcher {
 
 var pkg = {
 	name: "@talismn/balances",
-	version: "0.0.0-pr2043-20250619052729"};
+	version: "0.0.0-pr2043-20250619072437"};
 
 var log = anylogger__default.default(pkg.name);
 
@@ -432,8 +432,8 @@ class Balance {
     if (this.isSource("evm-uniswapv2") && this.token?.type === "evm-uniswapv2" // &&
     //this.evmNetworkId
     ) {
-      const tokenId0 = evmErc20TokenId(this.networkId, this.token.tokenAddress0);
-      const tokenId1 = evmErc20TokenId(this.networkId, this.token.tokenAddress1);
+      const tokenId0 = chaindataProvider.evmErc20TokenId(this.networkId, this.token.tokenAddress0);
+      const tokenId1 = chaindataProvider.evmErc20TokenId(this.networkId, this.token.tokenAddress1);
       const decimals = this.token.decimals;
       const decimals0 = this.token.decimals0;
       const decimals1 = this.token.decimals1;
@@ -866,10 +866,6 @@ const filterMirrorTokens = (balance, i, balances) => {
   return !mirrorOf || !balances.find(b => b.tokenId === mirrorOf);
 };
 
-// TODO: Move this into a common module which can then be imported both here and into EvmErc20Module
-// We can't import this directly from EvmErc20Module because then we'd have a circular dependency
-const evmErc20TokenId = (chainId, tokenContractAddress) => `${chainId}-evm-erc20-${tokenContractAddress}`.toLowerCase();
-
 /**
  * `BalanceTypes` is an automatically determined sub-selection of `PluginBalanceTypes`.
  *

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

@@ -2,13 +2,13 @@
 
 var dexie = require('dexie');
 var anylogger = require('anylogger');
+var chaindataProvider = require('@talismn/chaindata-provider');
 var tokenRates = require('@talismn/token-rates');
 var util = require('@talismn/util');
 var BigNumber = require('bignumber.js');
 var util$1 = require('@polkadot/util');
 var utilCrypto = require('@polkadot/util-crypto');
 var pako = require('pako');
-var chaindataProvider = require('@talismn/chaindata-provider');
 var viem = require('viem');
 var isEqual = require('lodash/isEqual');
 var txwrapperCore = require('@substrate/txwrapper-core');
@@ -126,7 +126,7 @@ class EvmTokenFetcher {
 
 var pkg = {
 	name: "@talismn/balances",
-	version: "0.0.0-pr2043-20250619052729"};
+	version: "0.0.0-pr2043-20250619072437"};
 
 var log = anylogger__default.default(pkg.name);
 
@@ -432,8 +432,8 @@ class Balance {
     if (this.isSource("evm-uniswapv2") && this.token?.type === "evm-uniswapv2" // &&
     //this.evmNetworkId
     ) {
-      const tokenId0 = evmErc20TokenId(this.networkId, this.token.tokenAddress0);
-      const tokenId1 = evmErc20TokenId(this.networkId, this.token.tokenAddress1);
+      const tokenId0 = chaindataProvider.evmErc20TokenId(this.networkId, this.token.tokenAddress0);
+      const tokenId1 = chaindataProvider.evmErc20TokenId(this.networkId, this.token.tokenAddress1);
       const decimals = this.token.decimals;
       const decimals0 = this.token.decimals0;
       const decimals1 = this.token.decimals1;
@@ -866,10 +866,6 @@ const filterMirrorTokens = (balance, i, balances) => {
   return !mirrorOf || !balances.find(b => b.tokenId === mirrorOf);
 };
 
-// TODO: Move this into a common module which can then be imported both here and into EvmErc20Module
-// We can't import this directly from EvmErc20Module because then we'd have a circular dependency
-const evmErc20TokenId = (chainId, tokenContractAddress) => `${chainId}-evm-erc20-${tokenContractAddress}`.toLowerCase();
-
 /**
  * `BalanceTypes` is an automatically determined sub-selection of `PluginBalanceTypes`.
  *

package/dist/talismn-balances.esm.js

@@ -1,12 +1,12 @@
 import { Dexie, liveQuery } from 'dexie';
 import anylogger from 'anylogger';
+import { evmErc20TokenId, EvmErc20TokenSchema, evmNativeTokenId, evmUniswapV2TokenId, githubTokenLogoUrl, parseSubAssetTokenId, subAssetTokenId, parseSubForeignAssetTokenId, subForeignAssetTokenId, parseSubNativeTokenId, subNativeTokenId, subPsp22TokenId, parseSubTokensTokenId, subTokensTokenId } from '@talismn/chaindata-provider';
 import { newTokenRates } from '@talismn/token-rates';
 import { isBigInt, BigMath, planckToTokens, isArrayOf, isTruthy, isEthereumAddress, hasOwnProperty, decodeAnyAddress, isNotNil, blake2Concat, firstThenDebounce, Deferred } from '@talismn/util';
 import BigNumber from 'bignumber.js';
 import { u8aToHex, assert, stringCamelCase, u8aConcatStrict, u8aConcat, arrayChunk, u8aToString, hexToNumber, hexToU8a } from '@polkadot/util';
 import { xxhashAsU8a, blake2AsU8a } from '@polkadot/util-crypto';
 import pako from 'pako';
-import { evmErc20TokenId as evmErc20TokenId$1, EvmErc20TokenSchema, evmNativeTokenId, evmUniswapV2TokenId, githubTokenLogoUrl, parseSubAssetTokenId, subAssetTokenId, parseSubForeignAssetTokenId, subForeignAssetTokenId, parseSubNativeTokenId, subNativeTokenId, subPsp22TokenId, parseSubTokensTokenId, subTokensTokenId } from '@talismn/chaindata-provider';
 import { parseAbi, isHex, hexToBigInt } from 'viem';
 import isEqual from 'lodash/isEqual';
 import { defineMethod } from '@substrate/txwrapper-core';
@@ -111,7 +111,7 @@ class EvmTokenFetcher {
 
 var pkg = {
 	name: "@talismn/balances",
-	version: "0.0.0-pr2043-20250619052729"};
+	version: "0.0.0-pr2043-20250619072437"};
 
 var log = anylogger(pkg.name);
 
@@ -851,10 +851,6 @@ const filterMirrorTokens = (balance, i, balances) => {
   return !mirrorOf || !balances.find(b => b.tokenId === mirrorOf);
 };
 
-// TODO: Move this into a common module which can then be imported both here and into EvmErc20Module
-// We can't import this directly from EvmErc20Module because then we'd have a circular dependency
-const evmErc20TokenId = (chainId, tokenContractAddress) => `${chainId}-evm-erc20-${tokenContractAddress}`.toLowerCase();
-
 /**
  * `BalanceTypes` is an automatically determined sub-selection of `PluginBalanceTypes`.
  *
@@ -1316,7 +1312,7 @@ const EvmErc20Module = hydrate => {
         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;
-        const id = evmErc20TokenId$1(chainId, contractAddress);
+        const id = evmErc20TokenId(chainId, contractAddress);
         const token = {
           id,
           type: "evm-erc20",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances",
-  "version": "0.0.0-pr2043-20250619052729",
+  "version": "0.0.0-pr2043-20250619072437",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -35,13 +35,13 @@
     "scale-ts": "^1.6.1",
     "viem": "^2.27.3",
     "zod": "^3.25.62",
-    "@talismn/chain-connector": "0.0.0-pr2043-20250619052729",
-    "@talismn/chain-connector-evm": "0.0.0-pr2043-20250619052729",
-    "@talismn/chaindata-provider": "0.0.0-pr2043-20250619052729",
+    "@talismn/chain-connector": "0.0.0-pr2043-20250619072437",
+    "@talismn/chain-connector-evm": "0.0.0-pr2043-20250619072437",
+    "@talismn/chaindata-provider": "0.0.0-pr2043-20250619072437",
     "@talismn/scale": "0.1.2",
-    "@talismn/token-rates": "0.0.0-pr2043-20250619052729",
-    "@talismn/sapi": "0.0.0-pr2043-20250619052729",
-    "@talismn/util": "0.4.2"
+    "@talismn/token-rates": "0.0.0-pr2043-20250619072437",
+    "@talismn/util": "0.4.2",
+    "@talismn/sapi": "0.0.0-pr2043-20250619072437"
   },
   "devDependencies": {
     "@polkadot/api-contract": "16.1.2",