@talismn/balances 0.9.1 → 0.9.3

package/dist/declarations/src/modules/SubstrateTokensModule.d.ts

@@ -7,7 +7,7 @@ type ModuleType = "substrate-tokens";
 export type SubTokensToken = Extract<Token, {
     type: ModuleType;
 }>;
-export declare const subTokensTokenId: (chainId: ChainId, tokenSymbol: string) => string;
+export declare const subTokensTokenId: (chainId: ChainId, onChainId: string | number) => string;
 export type SubTokensChainMeta = {
     isTestnet: boolean;
     palletId?: string;

package/dist/declarations/src/types/balances.d.ts

@@ -1,4 +1,4 @@
-import { ChainList, EvmNetworkList, TokenList } from "@talismn/chaindata-provider";
+import { ChainList, SimpleEvmNetworkList, TokenList } from "@talismn/chaindata-provider";
 import { TokenRateCurrency, TokenRates, TokenRatesList } from "@talismn/token-rates";
 import { NonFunctionProperties } from "@talismn/util";
 import { Amount, AmountWithLabel, BalanceJson, BalanceJsonList, BalanceStatusTypes, ExtraAmount, IBalance, LockedAmount } from "./balancetypes";
@@ -20,7 +20,7 @@ export type BalanceSource = BalanceJson["source"];
 /** TODO: Remove this in favour of a frontend-friendly `ChaindataProvider` */
 export type HydrateDb = Partial<{
     chains: ChainList;
-    evmNetworks: EvmNetworkList;
+    evmNetworks: SimpleEvmNetworkList;
     tokens: TokenList;
     tokenRates: TokenRatesList;
 }>;
@@ -131,7 +131,7 @@ export declare class Balance {
     get chainId(): string | undefined;
     get chain(): import("@talismn/chaindata-provider").Chain | null;
     get evmNetworkId(): string | undefined;
-    get evmNetwork(): import("@talismn/chaindata-provider").EvmNetwork | null;
+    get evmNetwork(): import("@talismn/chaindata-provider").SimpleEvmNetwork | null;
     get tokenId(): string;
     get token(): (import("@talismn/chaindata-provider/dist/declarations/src/types/Token/types").TokenBase & {
         type: "evm-erc20";

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

@@ -25,6 +25,7 @@ var chainConnector = require('@talismn/chain-connector');
 var sapi = require('@talismn/sapi');
 var upperFirst = require('lodash/upperFirst');
 var apiContract = require('@polkadot/api-contract');
+var lzString = require('lz-string');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -1624,7 +1625,10 @@ const EvmErc20Module = hydrate => {
               const {
                 errors,
                 results
-              } = await fetchBalances$3(chainConnectors.evm, fetchesPerNetwork, aggregators);
+              } = await fetchBalances$3(chainConnectors.evm, {
+                [evmNetworkId]: fetchesPerNetwork[evmNetworkId]
+              }, aggregators);
+
               // handle errors first
               errors.forEach(error => {
                 if (error instanceof EvmErc20BalanceError) {
@@ -7235,7 +7239,7 @@ const fetchBalances = async (chainConnector, tokens, addressesByToken) => {
 
 const moduleType = "substrate-tokens";
 const defaultPalletId = "Tokens";
-const subTokensTokenId = (chainId, tokenSymbol) => `${chainId}-substrate-tokens-${tokenSymbol}`.toLowerCase().replace(/ /g, "-");
+const subTokensTokenId = (chainId, onChainId) => `${chainId}-substrate-tokens-${lzString.compressToEncodedURIComponent(String(onChainId))}`;
 const SubTokensModule = hydrate => {
   const {
     chainConnectors,
@@ -7296,7 +7300,7 @@ const SubTokensModule = hydrate => {
           const existentialDeposit = tokenConfig?.ed ?? "0";
           const onChainId = tokenConfig?.onChainId ?? undefined;
           if (onChainId === undefined) continue;
-          const id = subTokensTokenId(chainId, symbol);
+          const id = subTokensTokenId(chainId, onChainId);
           const token = {
             id,
             type: "substrate-tokens",
@@ -7313,7 +7317,7 @@ const SubTokensModule = hydrate => {
           };
           if (tokenConfig?.symbol) {
             token.symbol = tokenConfig?.symbol;
-            token.id = subTokensTokenId(chainId, token.symbol);
+            token.id = subTokensTokenId(chainId, token.onChainId);
           }
           if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
           if (tokenConfig?.dcentName) token.dcentName = tokenConfig?.dcentName;

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

@@ -25,6 +25,7 @@ var chainConnector = require('@talismn/chain-connector');
 var sapi = require('@talismn/sapi');
 var upperFirst = require('lodash/upperFirst');
 var apiContract = require('@polkadot/api-contract');
+var lzString = require('lz-string');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -1624,7 +1625,10 @@ const EvmErc20Module = hydrate => {
               const {
                 errors,
                 results
-              } = await fetchBalances$3(chainConnectors.evm, fetchesPerNetwork, aggregators);
+              } = await fetchBalances$3(chainConnectors.evm, {
+                [evmNetworkId]: fetchesPerNetwork[evmNetworkId]
+              }, aggregators);
+
               // handle errors first
               errors.forEach(error => {
                 if (error instanceof EvmErc20BalanceError) {
@@ -7235,7 +7239,7 @@ const fetchBalances = async (chainConnector, tokens, addressesByToken) => {
 
 const moduleType = "substrate-tokens";
 const defaultPalletId = "Tokens";
-const subTokensTokenId = (chainId, tokenSymbol) => `${chainId}-substrate-tokens-${tokenSymbol}`.toLowerCase().replace(/ /g, "-");
+const subTokensTokenId = (chainId, onChainId) => `${chainId}-substrate-tokens-${lzString.compressToEncodedURIComponent(String(onChainId))}`;
 const SubTokensModule = hydrate => {
   const {
     chainConnectors,
@@ -7296,7 +7300,7 @@ const SubTokensModule = hydrate => {
           const existentialDeposit = tokenConfig?.ed ?? "0";
           const onChainId = tokenConfig?.onChainId ?? undefined;
           if (onChainId === undefined) continue;
-          const id = subTokensTokenId(chainId, symbol);
+          const id = subTokensTokenId(chainId, onChainId);
           const token = {
             id,
             type: "substrate-tokens",
@@ -7313,7 +7317,7 @@ const SubTokensModule = hydrate => {
           };
           if (tokenConfig?.symbol) {
             token.symbol = tokenConfig?.symbol;
-            token.id = subTokensTokenId(chainId, token.symbol);
+            token.id = subTokensTokenId(chainId, token.onChainId);
           }
           if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
           if (tokenConfig?.dcentName) token.dcentName = tokenConfig?.dcentName;

package/dist/talismn-balances.esm.js

@@ -23,6 +23,7 @@ import { ChainConnectionError } from '@talismn/chain-connector';
 import { getScaleApi } from '@talismn/sapi';
 import upperFirst from 'lodash/upperFirst';
 import { Abi } from '@polkadot/api-contract';
+import { compressToEncodedURIComponent } from 'lz-string';
 
 // TODO: Document default balances module purpose/usage
 const DefaultBalanceModule = type => ({
@@ -1611,7 +1612,10 @@ const EvmErc20Module = hydrate => {
               const {
                 errors,
                 results
-              } = await fetchBalances$3(chainConnectors.evm, fetchesPerNetwork, aggregators);
+              } = await fetchBalances$3(chainConnectors.evm, {
+                [evmNetworkId]: fetchesPerNetwork[evmNetworkId]
+              }, aggregators);
+
               // handle errors first
               errors.forEach(error => {
                 if (error instanceof EvmErc20BalanceError) {
@@ -7222,7 +7226,7 @@ const fetchBalances = async (chainConnector, tokens, addressesByToken) => {
 
 const moduleType = "substrate-tokens";
 const defaultPalletId = "Tokens";
-const subTokensTokenId = (chainId, tokenSymbol) => `${chainId}-substrate-tokens-${tokenSymbol}`.toLowerCase().replace(/ /g, "-");
+const subTokensTokenId = (chainId, onChainId) => `${chainId}-substrate-tokens-${compressToEncodedURIComponent(String(onChainId))}`;
 const SubTokensModule = hydrate => {
   const {
     chainConnectors,
@@ -7283,7 +7287,7 @@ const SubTokensModule = hydrate => {
           const existentialDeposit = tokenConfig?.ed ?? "0";
           const onChainId = tokenConfig?.onChainId ?? undefined;
           if (onChainId === undefined) continue;
-          const id = subTokensTokenId(chainId, symbol);
+          const id = subTokensTokenId(chainId, onChainId);
           const token = {
             id,
             type: "substrate-tokens",
@@ -7300,7 +7304,7 @@ const SubTokensModule = hydrate => {
           };
           if (tokenConfig?.symbol) {
             token.symbol = tokenConfig?.symbol;
-            token.id = subTokensTokenId(chainId, token.symbol);
+            token.id = subTokensTokenId(chainId, token.onChainId);
           }
           if (tokenConfig?.coingeckoId) token.coingeckoId = tokenConfig?.coingeckoId;
           if (tokenConfig?.dcentName) token.dcentName = tokenConfig?.dcentName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -28,18 +28,19 @@
     "bignumber.js": "^9.1.2",
     "dexie": "^4.0.9",
     "lodash": "4.17.21",
+    "lz-string": "1.5.0",
     "pako": "^2.1.0",
     "polkadot-api": "1.7.6",
     "rxjs": "^7.8.1",
     "scale-ts": "^1.6.1",
     "viem": "^2.27.3",
-    "@talismn/chain-connector": "0.10.0",
-    "@talismn/chaindata-provider": "0.10.0",
-    "@talismn/chain-connector-evm": "0.10.0",
+    "@talismn/chain-connector": "0.10.2",
+    "@talismn/chain-connector-evm": "0.10.2",
     "@talismn/sapi": "0.0.3",
     "@talismn/scale": "0.1.1",
-    "@talismn/token-rates": "2.0.1",
-    "@talismn/util": "0.4.0"
+    "@talismn/chaindata-provider": "0.10.2",
+    "@talismn/util": "0.4.1",
+    "@talismn/token-rates": "2.0.3"
   },
   "devDependencies": {
     "@polkadot/api-contract": "15.8.1",