@talismn/balances-react 1.0.1 → 1.0.3

package/dist/declarations/src/atoms/chaindata.d.ts

@@ -83,12 +83,40 @@ export declare const chaindataAtom: import("jotai").Atom<{
             type: "scroll";
             l1GasPriceOracle: `0x${string}`;
         } | undefined;
-        contracts?: Partial<Record<"Erc20Aggregator" | "Multicall3", `0x${string}`>> | undefined;
+        contracts?: {
+            Erc20Aggregator?: `0x${string}` | undefined;
+            Multicall3?: `0x${string}` | undefined;
+        } | undefined;
         balancesConfig?: {
             "evm-native"?: undefined;
             "evm-erc20"?: undefined;
             "evm-uniswapv2"?: undefined;
         } | undefined;
+    } | {
+        id: string;
+        name: string;
+        nativeTokenId: string;
+        nativeCurrency: {
+            decimals: number;
+            symbol: string;
+            name: string;
+            coingeckoId?: string | undefined;
+            mirrorOf?: string | undefined;
+            logo?: string | undefined;
+        };
+        blockExplorerUrls: string[];
+        platform: "solana";
+        genesisHash: string;
+        rpcs: string[];
+        isTestnet?: boolean | undefined;
+        isDefault?: boolean | undefined;
+        forceScan?: boolean | undefined;
+        logo?: string | undefined;
+        themeColor?: string | undefined;
+        balancesConfig?: {
+            "sol-native"?: undefined;
+            "sol-spl"?: undefined;
+        } | undefined;
     })[];
     tokens: ({
         id: string;
@@ -234,6 +262,33 @@ export declare const chaindataAtom: import("jotai").Atom<{
         coingeckoId?: string | undefined;
         noDiscovery?: boolean | undefined;
         mirrorOf?: string | undefined;
+    } | {
+        id: string;
+        networkId: string;
+        decimals: number;
+        symbol: string;
+        type: "sol-native";
+        platform: "solana";
+        isDefault?: boolean | undefined;
+        name?: string | undefined;
+        logo?: string | undefined;
+        coingeckoId?: string | undefined;
+        noDiscovery?: boolean | undefined;
+        mirrorOf?: string | undefined;
+    } | {
+        id: string;
+        networkId: string;
+        decimals: number;
+        symbol: string;
+        type: "sol-spl";
+        platform: "solana";
+        mintAddress: string;
+        isDefault?: boolean | undefined;
+        name?: string | undefined;
+        logo?: string | undefined;
+        coingeckoId?: string | undefined;
+        noDiscovery?: boolean | undefined;
+        mirrorOf?: string | undefined;
     })[];
 } | Promise<{
     networks: ({
@@ -320,12 +375,40 @@ export declare const chaindataAtom: import("jotai").Atom<{
             type: "scroll";
             l1GasPriceOracle: `0x${string}`;
         } | undefined;
-        contracts?: Partial<Record<"Erc20Aggregator" | "Multicall3", `0x${string}`>> | undefined;
+        contracts?: {
+            Erc20Aggregator?: `0x${string}` | undefined;
+            Multicall3?: `0x${string}` | undefined;
+        } | undefined;
         balancesConfig?: {
             "evm-native"?: undefined;
             "evm-erc20"?: undefined;
             "evm-uniswapv2"?: undefined;
         } | undefined;
+    } | {
+        id: string;
+        name: string;
+        nativeTokenId: string;
+        nativeCurrency: {
+            decimals: number;
+            symbol: string;
+            name: string;
+            coingeckoId?: string | undefined;
+            mirrorOf?: string | undefined;
+            logo?: string | undefined;
+        };
+        blockExplorerUrls: string[];
+        platform: "solana";
+        genesisHash: string;
+        rpcs: string[];
+        isTestnet?: boolean | undefined;
+        isDefault?: boolean | undefined;
+        forceScan?: boolean | undefined;
+        logo?: string | undefined;
+        themeColor?: string | undefined;
+        balancesConfig?: {
+            "sol-native"?: undefined;
+            "sol-spl"?: undefined;
+        } | undefined;
     })[];
     tokens: ({
         id: string;
@@ -471,6 +554,33 @@ export declare const chaindataAtom: import("jotai").Atom<{
         coingeckoId?: string | undefined;
         noDiscovery?: boolean | undefined;
         mirrorOf?: string | undefined;
+    } | {
+        id: string;
+        networkId: string;
+        decimals: number;
+        symbol: string;
+        type: "sol-native";
+        platform: "solana";
+        isDefault?: boolean | undefined;
+        name?: string | undefined;
+        logo?: string | undefined;
+        coingeckoId?: string | undefined;
+        noDiscovery?: boolean | undefined;
+        mirrorOf?: string | undefined;
+    } | {
+        id: string;
+        networkId: string;
+        decimals: number;
+        symbol: string;
+        type: "sol-spl";
+        platform: "solana";
+        mintAddress: string;
+        isDefault?: boolean | undefined;
+        name?: string | undefined;
+        logo?: string | undefined;
+        coingeckoId?: string | undefined;
+        noDiscovery?: boolean | undefined;
+        mirrorOf?: string | undefined;
     })[];
 }>>;
 export declare const tokensAtom: import("jotai").Atom<Promise<({
@@ -617,6 +727,33 @@ export declare const tokensAtom: import("jotai").Atom<Promise<({
     coingeckoId?: string | undefined;
     noDiscovery?: boolean | undefined;
     mirrorOf?: string | undefined;
+} | {
+    id: string;
+    networkId: string;
+    decimals: number;
+    symbol: string;
+    type: "sol-native";
+    platform: "solana";
+    isDefault?: boolean | undefined;
+    name?: string | undefined;
+    logo?: string | undefined;
+    coingeckoId?: string | undefined;
+    noDiscovery?: boolean | undefined;
+    mirrorOf?: string | undefined;
+} | {
+    id: string;
+    networkId: string;
+    decimals: number;
+    symbol: string;
+    type: "sol-spl";
+    platform: "solana";
+    mintAddress: string;
+    isDefault?: boolean | undefined;
+    name?: string | undefined;
+    logo?: string | undefined;
+    coingeckoId?: string | undefined;
+    noDiscovery?: boolean | undefined;
+    mirrorOf?: string | undefined;
 })[]>>;
 export declare const networksAtom: import("jotai").Atom<Promise<({
     id: string;
@@ -702,10 +839,38 @@ export declare const networksAtom: import("jotai").Atom<Promise<({
         type: "scroll";
         l1GasPriceOracle: `0x${string}`;
     } | undefined;
-    contracts?: Partial<Record<"Erc20Aggregator" | "Multicall3", `0x${string}`>> | undefined;
+    contracts?: {
+        Erc20Aggregator?: `0x${string}` | undefined;
+        Multicall3?: `0x${string}` | undefined;
+    } | undefined;
     balancesConfig?: {
         "evm-native"?: undefined;
         "evm-erc20"?: undefined;
         "evm-uniswapv2"?: undefined;
     } | undefined;
+} | {
+    id: string;
+    name: string;
+    nativeTokenId: string;
+    nativeCurrency: {
+        decimals: number;
+        symbol: string;
+        name: string;
+        coingeckoId?: string | undefined;
+        mirrorOf?: string | undefined;
+        logo?: string | undefined;
+    };
+    blockExplorerUrls: string[];
+    platform: "solana";
+    genesisHash: string;
+    rpcs: string[];
+    isTestnet?: boolean | undefined;
+    isDefault?: boolean | undefined;
+    forceScan?: boolean | undefined;
+    logo?: string | undefined;
+    themeColor?: string | undefined;
+    balancesConfig?: {
+        "sol-native"?: undefined;
+        "sol-spl"?: undefined;
+    } | undefined;
 })[]>>;

package/dist/declarations/src/atoms/chaindataProvider.d.ts

@@ -1,2 +1,3 @@
 import { ChaindataProvider } from "@talismn/chaindata-provider";
 export declare const chaindataProviderAtom: import("jotai").Atom<ChaindataProvider>;
+export declare const useSyncSwapsChaindata: () => [void, never];

package/dist/declarations/src/atoms/tokenRates.d.ts

@@ -1,3 +1 @@
-export declare const tokenRatesAtom: import("jotai").Atom<Promise<{
-    [k: string]: import("@talismn/token-rates").TokenRates;
-}>>;
+export declare const tokenRatesAtom: import("jotai").Atom<Promise<import("@talismn/token-rates").TokenRatesList>>;

package/dist/declarations/src/hooks/useChaindata.d.ts

@@ -85,12 +85,40 @@ export declare const useChaindata: () => {
             type: "scroll";
             l1GasPriceOracle: `0x${string}`;
         } | undefined;
-        contracts?: Partial<Record<"Erc20Aggregator" | "Multicall3", `0x${string}`>> | undefined;
+        contracts?: {
+            Erc20Aggregator?: `0x${string}` | undefined;
+            Multicall3?: `0x${string}` | undefined;
+        } | undefined;
         balancesConfig?: {
             "evm-native"?: undefined;
             "evm-erc20"?: undefined;
             "evm-uniswapv2"?: undefined;
         } | undefined;
+    } | {
+        id: string;
+        name: string;
+        nativeTokenId: string;
+        nativeCurrency: {
+            decimals: number;
+            symbol: string;
+            name: string;
+            coingeckoId?: string | undefined;
+            mirrorOf?: string | undefined;
+            logo?: string | undefined;
+        };
+        blockExplorerUrls: string[];
+        platform: "solana";
+        genesisHash: string;
+        rpcs: string[];
+        isTestnet?: boolean | undefined;
+        isDefault?: boolean | undefined;
+        forceScan?: boolean | undefined;
+        logo?: string | undefined;
+        themeColor?: string | undefined;
+        balancesConfig?: {
+            "sol-native"?: undefined;
+            "sol-spl"?: undefined;
+        } | undefined;
     })[];
     tokens: ({
         id: string;
@@ -236,6 +264,33 @@ export declare const useChaindata: () => {
         coingeckoId?: string | undefined;
         noDiscovery?: boolean | undefined;
         mirrorOf?: string | undefined;
+    } | {
+        id: string;
+        networkId: string;
+        decimals: number;
+        symbol: string;
+        type: "sol-native";
+        platform: "solana";
+        isDefault?: boolean | undefined;
+        name?: string | undefined;
+        logo?: string | undefined;
+        coingeckoId?: string | undefined;
+        noDiscovery?: boolean | undefined;
+        mirrorOf?: string | undefined;
+    } | {
+        id: string;
+        networkId: string;
+        decimals: number;
+        symbol: string;
+        type: "sol-spl";
+        platform: "solana";
+        mintAddress: string;
+        isDefault?: boolean | undefined;
+        name?: string | undefined;
+        logo?: string | undefined;
+        coingeckoId?: string | undefined;
+        noDiscovery?: boolean | undefined;
+        mirrorOf?: string | undefined;
     })[];
 };
 export declare const useNetworks: () => ({
@@ -322,12 +377,40 @@ export declare const useNetworks: () => ({
         type: "scroll";
         l1GasPriceOracle: `0x${string}`;
     } | undefined;
-    contracts?: Partial<Record<"Erc20Aggregator" | "Multicall3", `0x${string}`>> | undefined;
+    contracts?: {
+        Erc20Aggregator?: `0x${string}` | undefined;
+        Multicall3?: `0x${string}` | undefined;
+    } | undefined;
     balancesConfig?: {
         "evm-native"?: undefined;
         "evm-erc20"?: undefined;
         "evm-uniswapv2"?: undefined;
     } | undefined;
+} | {
+    id: string;
+    name: string;
+    nativeTokenId: string;
+    nativeCurrency: {
+        decimals: number;
+        symbol: string;
+        name: string;
+        coingeckoId?: string | undefined;
+        mirrorOf?: string | undefined;
+        logo?: string | undefined;
+    };
+    blockExplorerUrls: string[];
+    platform: "solana";
+    genesisHash: string;
+    rpcs: string[];
+    isTestnet?: boolean | undefined;
+    isDefault?: boolean | undefined;
+    forceScan?: boolean | undefined;
+    logo?: string | undefined;
+    themeColor?: string | undefined;
+    balancesConfig?: {
+        "sol-native"?: undefined;
+        "sol-spl"?: undefined;
+    } | undefined;
 })[];
 export declare const useNetworksById: () => import("lodash").Dictionary<{
     id: string;
@@ -413,12 +496,40 @@ export declare const useNetworksById: () => import("lodash").Dictionary<{
         type: "scroll";
         l1GasPriceOracle: `0x${string}`;
     } | undefined;
-    contracts?: Partial<Record<"Erc20Aggregator" | "Multicall3", `0x${string}`>> | undefined;
+    contracts?: {
+        Erc20Aggregator?: `0x${string}` | undefined;
+        Multicall3?: `0x${string}` | undefined;
+    } | undefined;
     balancesConfig?: {
         "evm-native"?: undefined;
         "evm-erc20"?: undefined;
         "evm-uniswapv2"?: undefined;
     } | undefined;
+} | {
+    id: string;
+    name: string;
+    nativeTokenId: string;
+    nativeCurrency: {
+        decimals: number;
+        symbol: string;
+        name: string;
+        coingeckoId?: string | undefined;
+        mirrorOf?: string | undefined;
+        logo?: string | undefined;
+    };
+    blockExplorerUrls: string[];
+    platform: "solana";
+    genesisHash: string;
+    rpcs: string[];
+    isTestnet?: boolean | undefined;
+    isDefault?: boolean | undefined;
+    forceScan?: boolean | undefined;
+    logo?: string | undefined;
+    themeColor?: string | undefined;
+    balancesConfig?: {
+        "sol-native"?: undefined;
+        "sol-spl"?: undefined;
+    } | undefined;
 }>;
 export declare const useNetwork: (networkId?: NetworkId) => {
     id: string;
@@ -504,12 +615,40 @@ export declare const useNetwork: (networkId?: NetworkId) => {
         type: "scroll";
         l1GasPriceOracle: `0x${string}`;
     } | undefined;
-    contracts?: Partial<Record<"Erc20Aggregator" | "Multicall3", `0x${string}`>> | undefined;
+    contracts?: {
+        Erc20Aggregator?: `0x${string}` | undefined;
+        Multicall3?: `0x${string}` | undefined;
+    } | undefined;
     balancesConfig?: {
         "evm-native"?: undefined;
         "evm-erc20"?: undefined;
         "evm-uniswapv2"?: undefined;
     } | undefined;
+} | {
+    id: string;
+    name: string;
+    nativeTokenId: string;
+    nativeCurrency: {
+        decimals: number;
+        symbol: string;
+        name: string;
+        coingeckoId?: string | undefined;
+        mirrorOf?: string | undefined;
+        logo?: string | undefined;
+    };
+    blockExplorerUrls: string[];
+    platform: "solana";
+    genesisHash: string;
+    rpcs: string[];
+    isTestnet?: boolean | undefined;
+    isDefault?: boolean | undefined;
+    forceScan?: boolean | undefined;
+    logo?: string | undefined;
+    themeColor?: string | undefined;
+    balancesConfig?: {
+        "sol-native"?: undefined;
+        "sol-spl"?: undefined;
+    } | undefined;
 };
 export declare const useTokens: () => ({
     id: string;
@@ -655,6 +794,33 @@ export declare const useTokens: () => ({
     coingeckoId?: string | undefined;
     noDiscovery?: boolean | undefined;
     mirrorOf?: string | undefined;
+} | {
+    id: string;
+    networkId: string;
+    decimals: number;
+    symbol: string;
+    type: "sol-native";
+    platform: "solana";
+    isDefault?: boolean | undefined;
+    name?: string | undefined;
+    logo?: string | undefined;
+    coingeckoId?: string | undefined;
+    noDiscovery?: boolean | undefined;
+    mirrorOf?: string | undefined;
+} | {
+    id: string;
+    networkId: string;
+    decimals: number;
+    symbol: string;
+    type: "sol-spl";
+    platform: "solana";
+    mintAddress: string;
+    isDefault?: boolean | undefined;
+    name?: string | undefined;
+    logo?: string | undefined;
+    coingeckoId?: string | undefined;
+    noDiscovery?: boolean | undefined;
+    mirrorOf?: string | undefined;
 })[];
 export declare const useTokensById: () => import("lodash").Dictionary<{
     id: string;
@@ -800,6 +966,33 @@ export declare const useTokensById: () => import("lodash").Dictionary<{
     coingeckoId?: string | undefined;
     noDiscovery?: boolean | undefined;
     mirrorOf?: string | undefined;
+} | {
+    id: string;
+    networkId: string;
+    decimals: number;
+    symbol: string;
+    type: "sol-native";
+    platform: "solana";
+    isDefault?: boolean | undefined;
+    name?: string | undefined;
+    logo?: string | undefined;
+    coingeckoId?: string | undefined;
+    noDiscovery?: boolean | undefined;
+    mirrorOf?: string | undefined;
+} | {
+    id: string;
+    networkId: string;
+    decimals: number;
+    symbol: string;
+    type: "sol-spl";
+    platform: "solana";
+    mintAddress: string;
+    isDefault?: boolean | undefined;
+    name?: string | undefined;
+    logo?: string | undefined;
+    coingeckoId?: string | undefined;
+    noDiscovery?: boolean | undefined;
+    mirrorOf?: string | undefined;
 }>;
 export declare const useToken: (tokenId?: TokenId) => {
     id: string;
@@ -945,4 +1138,31 @@ export declare const useToken: (tokenId?: TokenId) => {
     coingeckoId?: string | undefined;
     noDiscovery?: boolean | undefined;
     mirrorOf?: string | undefined;
+} | {
+    id: string;
+    networkId: string;
+    decimals: number;
+    symbol: string;
+    type: "sol-native";
+    platform: "solana";
+    isDefault?: boolean | undefined;
+    name?: string | undefined;
+    logo?: string | undefined;
+    coingeckoId?: string | undefined;
+    noDiscovery?: boolean | undefined;
+    mirrorOf?: string | undefined;
+} | {
+    id: string;
+    networkId: string;
+    decimals: number;
+    symbol: string;
+    type: "sol-spl";
+    platform: "solana";
+    mintAddress: string;
+    isDefault?: boolean | undefined;
+    name?: string | undefined;
+    logo?: string | undefined;
+    coingeckoId?: string | undefined;
+    noDiscovery?: boolean | undefined;
+    mirrorOf?: string | undefined;
 };

package/dist/declarations/src/hooks/useTokenRates.d.ts

@@ -1,5 +1,3 @@
 import { TokenId } from "@talismn/chaindata-provider";
-export declare const useTokenRates: () => {
-    [k: string]: import("@talismn/token-rates").TokenRates;
-};
+export declare const useTokenRates: () => import("@talismn/token-rates").TokenRatesList;
 export declare const useTokenRate: (tokenId?: TokenId) => import("@talismn/token-rates").TokenRates;

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

@@ -8,13 +8,11 @@ var chaindataProvider = require('@talismn/chaindata-provider');
 var balances = require('@talismn/balances');
 var jotaiEffect = require('jotai-effect');
 var lodashEs = require('lodash-es');
-var chainConnector = require('@talismn/chain-connector');
-var chainConnectorEvm = require('@talismn/chain-connector-evm');
+var chainConnectors = require('@talismn/chain-connectors');
 var connectionMeta = require('@talismn/connection-meta');
 var util = require('@talismn/util');
 var utils = require('jotai/utils');
 var rxjs = require('rxjs');
-var dexie = require('dexie');
 var anylogger = require('anylogger');
 var utilCrypto = require('@polkadot/util-crypto');
 
@@ -34,16 +32,30 @@ const enabledTokensAtom = jotai.atom(undefined);
 const allAddressesAtom = jotai.atom([]);
 
 const chaindataProviderAtom = jotai.atom(() => {
-  return new chaindataProvider.ChaindataProvider({});
+  return new chaindataProvider.ChaindataProvider({
+    // TODO pass persistedStorage
+  });
+});
+const useSyncSwapsChaindata = () => jotai.useAtom(syncSwapsChaindataAtomEffect);
+const syncSwapsChaindataAtomEffect = jotaiEffect.atomEffect(get => {
+  const chaindataProvider = get(chaindataProviderAtom);
+
+  // keep subscription open when swaps modal is open
+  const subscription = chaindataProvider.networks$.subscribe();
+
+  // close susbcription when swaps modal closes
+  return () => subscription.unsubscribe();
 });
 
 const chainConnectorsAtom = jotai.atom(get => {
   const chaindataProvider = get(chaindataProviderAtom);
-  const substrate = new chainConnector.ChainConnector(chaindataProvider, connectionMeta.connectionMetaDb);
-  const evm = new chainConnectorEvm.ChainConnectorEvm(chaindataProvider);
+  const substrate = new chainConnectors.ChainConnectorDot(chaindataProvider, connectionMeta.connectionMetaDb);
+  const evm = new chainConnectors.ChainConnectorEth(chaindataProvider);
+  const solana = new chainConnectors.ChainConnectorSol(chaindataProvider);
   return {
     substrate,
-    evm
+    evm,
+    solana
   };
 });
 
@@ -85,32 +97,17 @@ var packageJson = {
 
 var log = anylogger__default.default(packageJson.name);
 
-/**
- * Converts a dexie Observable into an rxjs Observable.
- */
-function dexieToRxjs(o) {
-  return new rxjs.Observable(observer => {
-    const subscription = o.subscribe({
-      next: value => observer.next(value),
-      error: error => observer.error(error)
-    });
-    return () => subscription.unsubscribe();
-  });
-}
-
 const tokenRatesAtom = jotai.atom(async get => {
   // runs a timer to keep tokenRates up to date
   get(tokenRatesFetcherAtomEffect);
-  return await get(tokenRatesDbAtom);
+  return (await get(tokenRatesDbAtom)).tokenRates;
 });
-const tokenRatesDbAtom = utils.atomWithObservable(() => {
-  const dbRatesToMap = dbRates => Object.fromEntries(dbRates.map(({
-    tokenId,
-    rates
-  }) => [tokenId, rates]));
 
-  // retrieve fetched tokenRates from the db
-  return dexieToRxjs(dexie.liveQuery(() => tokenRates.db.tokenRates.toArray())).pipe(rxjs.map(dbRatesToMap));
+// TODO: Persist to storage
+const tokenRates$ = new rxjs.ReplaySubject(1);
+const tokenRatesDbAtom = utils.atomWithObservable(() => {
+  tokenRates.tryToDeleteOldTokenRatesDb();
+  return tokenRates$.asObservable();
 });
 const tokenRatesFetcherAtomEffect = jotaiEffect.atomEffect(get => {
   // lets us tear down the existing timer when the effect is restarted
@@ -121,7 +118,6 @@ const tokenRatesFetcherAtomEffect = jotaiEffect.atomEffect(get => {
   const tokensPromise = get(tokensAtom);
   (async () => {
     const tokensById = lodashEs.keyBy(await tokensPromise, "id");
-    const tokenIds = Object.keys(tokensById);
     const loopMs = 300_000; // 300_000ms = 300s = 5 minutes
     const retryTimeout = 5_000; // 5_000ms = 5 seconds
 
@@ -129,21 +125,11 @@ const tokenRatesFetcherAtomEffect = jotaiEffect.atomEffect(get => {
       try {
         if (abort.signal.aborted) return; // don't fetch if aborted
         const tokenRates$1 = await tokenRates.fetchTokenRates(tokensById, tokenRates.ALL_CURRENCY_IDS, coinsApiConfig);
-        const putTokenRates = Object.entries(tokenRates$1).map(([tokenId, rates]) => ({
-          tokenId,
-          rates
-        }));
+        const putTokenRates = {
+          tokenRates: tokenRates$1
+        };
         if (abort.signal.aborted) return; // don't insert into db if aborted
-        await tokenRates.db.transaction("rw", tokenRates.db.tokenRates, async () => {
-          // override all tokenRates
-          await tokenRates.db.tokenRates.bulkPut(putTokenRates);
-
-          // delete tokenRates for tokens which no longer exist
-          const validTokenIds = new Set(tokenIds);
-          const tokenRatesIds = await tokenRates.db.tokenRates.toCollection().primaryKeys();
-          const deleteIds = tokenRatesIds.filter(id => !validTokenIds.has(id));
-          if (deleteIds.length > 0) await tokenRates.db.tokenRates.bulkDelete(deleteIds);
-        });
+        tokenRates$.next(putTokenRates);
         if (abort.signal.aborted) return; // don't schedule next loop if aborted
         setTimeout(hydrate, loopMs);
       } catch (error) {
@@ -357,6 +343,7 @@ exports.useNetwork = useNetwork;
 exports.useNetworks = useNetworks;
 exports.useNetworksById = useNetworksById;
 exports.useSetBalancesAddresses = useSetBalancesAddresses;
+exports.useSyncSwapsChaindata = useSyncSwapsChaindata;
 exports.useToken = useToken;
 exports.useTokenRate = useTokenRate;
 exports.useTokenRates = useTokenRates;

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

@@ -8,13 +8,11 @@ var chaindataProvider = require('@talismn/chaindata-provider');
 var balances = require('@talismn/balances');
 var jotaiEffect = require('jotai-effect');
 var lodashEs = require('lodash-es');
-var chainConnector = require('@talismn/chain-connector');
-var chainConnectorEvm = require('@talismn/chain-connector-evm');
+var chainConnectors = require('@talismn/chain-connectors');
 var connectionMeta = require('@talismn/connection-meta');
 var util = require('@talismn/util');
 var utils = require('jotai/utils');
 var rxjs = require('rxjs');
-var dexie = require('dexie');
 var anylogger = require('anylogger');
 var utilCrypto = require('@polkadot/util-crypto');
 
@@ -34,16 +32,30 @@ const enabledTokensAtom = jotai.atom(undefined);
 const allAddressesAtom = jotai.atom([]);
 
 const chaindataProviderAtom = jotai.atom(() => {
-  return new chaindataProvider.ChaindataProvider({});
+  return new chaindataProvider.ChaindataProvider({
+    // TODO pass persistedStorage
+  });
+});
+const useSyncSwapsChaindata = () => jotai.useAtom(syncSwapsChaindataAtomEffect);
+const syncSwapsChaindataAtomEffect = jotaiEffect.atomEffect(get => {
+  const chaindataProvider = get(chaindataProviderAtom);
+
+  // keep subscription open when swaps modal is open
+  const subscription = chaindataProvider.networks$.subscribe();
+
+  // close susbcription when swaps modal closes
+  return () => subscription.unsubscribe();
 });
 
 const chainConnectorsAtom = jotai.atom(get => {
   const chaindataProvider = get(chaindataProviderAtom);
-  const substrate = new chainConnector.ChainConnector(chaindataProvider, connectionMeta.connectionMetaDb);
-  const evm = new chainConnectorEvm.ChainConnectorEvm(chaindataProvider);
+  const substrate = new chainConnectors.ChainConnectorDot(chaindataProvider, connectionMeta.connectionMetaDb);
+  const evm = new chainConnectors.ChainConnectorEth(chaindataProvider);
+  const solana = new chainConnectors.ChainConnectorSol(chaindataProvider);
   return {
     substrate,
-    evm
+    evm,
+    solana
   };
 });
 
@@ -85,32 +97,17 @@ var packageJson = {
 
 var log = anylogger__default.default(packageJson.name);
 
-/**
- * Converts a dexie Observable into an rxjs Observable.
- */
-function dexieToRxjs(o) {
-  return new rxjs.Observable(observer => {
-    const subscription = o.subscribe({
-      next: value => observer.next(value),
-      error: error => observer.error(error)
-    });
-    return () => subscription.unsubscribe();
-  });
-}
-
 const tokenRatesAtom = jotai.atom(async get => {
   // runs a timer to keep tokenRates up to date
   get(tokenRatesFetcherAtomEffect);
-  return await get(tokenRatesDbAtom);
+  return (await get(tokenRatesDbAtom)).tokenRates;
 });
-const tokenRatesDbAtom = utils.atomWithObservable(() => {
-  const dbRatesToMap = dbRates => Object.fromEntries(dbRates.map(({
-    tokenId,
-    rates
-  }) => [tokenId, rates]));
 
-  // retrieve fetched tokenRates from the db
-  return dexieToRxjs(dexie.liveQuery(() => tokenRates.db.tokenRates.toArray())).pipe(rxjs.map(dbRatesToMap));
+// TODO: Persist to storage
+const tokenRates$ = new rxjs.ReplaySubject(1);
+const tokenRatesDbAtom = utils.atomWithObservable(() => {
+  tokenRates.tryToDeleteOldTokenRatesDb();
+  return tokenRates$.asObservable();
 });
 const tokenRatesFetcherAtomEffect = jotaiEffect.atomEffect(get => {
   // lets us tear down the existing timer when the effect is restarted
@@ -121,7 +118,6 @@ const tokenRatesFetcherAtomEffect = jotaiEffect.atomEffect(get => {
   const tokensPromise = get(tokensAtom);
   (async () => {
     const tokensById = lodashEs.keyBy(await tokensPromise, "id");
-    const tokenIds = Object.keys(tokensById);
     const loopMs = 300_000; // 300_000ms = 300s = 5 minutes
     const retryTimeout = 5_000; // 5_000ms = 5 seconds
 
@@ -129,21 +125,11 @@ const tokenRatesFetcherAtomEffect = jotaiEffect.atomEffect(get => {
       try {
         if (abort.signal.aborted) return; // don't fetch if aborted
         const tokenRates$1 = await tokenRates.fetchTokenRates(tokensById, tokenRates.ALL_CURRENCY_IDS, coinsApiConfig);
-        const putTokenRates = Object.entries(tokenRates$1).map(([tokenId, rates]) => ({
-          tokenId,
-          rates
-        }));
+        const putTokenRates = {
+          tokenRates: tokenRates$1
+        };
         if (abort.signal.aborted) return; // don't insert into db if aborted
-        await tokenRates.db.transaction("rw", tokenRates.db.tokenRates, async () => {
-          // override all tokenRates
-          await tokenRates.db.tokenRates.bulkPut(putTokenRates);
-
-          // delete tokenRates for tokens which no longer exist
-          const validTokenIds = new Set(tokenIds);
-          const tokenRatesIds = await tokenRates.db.tokenRates.toCollection().primaryKeys();
-          const deleteIds = tokenRatesIds.filter(id => !validTokenIds.has(id));
-          if (deleteIds.length > 0) await tokenRates.db.tokenRates.bulkDelete(deleteIds);
-        });
+        tokenRates$.next(putTokenRates);
         if (abort.signal.aborted) return; // don't schedule next loop if aborted
         setTimeout(hydrate, loopMs);
       } catch (error) {
@@ -357,6 +343,7 @@ exports.useNetwork = useNetwork;
 exports.useNetworks = useNetworks;
 exports.useNetworksById = useNetworksById;
 exports.useSetBalancesAddresses = useSetBalancesAddresses;
+exports.useSyncSwapsChaindata = useSyncSwapsChaindata;
 exports.useToken = useToken;
 exports.useTokenRate = useTokenRate;
 exports.useTokenRates = useTokenRates;

package/dist/talismn-balances-react.esm.js

@@ -1,19 +1,17 @@
-import { atom, useSetAtom, useAtomValue } from 'jotai';
+import { atom, useAtom, useSetAtom, useAtomValue } from 'jotai';
 import { useMemo, useEffect } from 'react';
-import { DEFAULT_COINSAPI_CONFIG, db, fetchTokenRates, ALL_CURRENCY_IDS } from '@talismn/token-rates';
+import { DEFAULT_COINSAPI_CONFIG, tryToDeleteOldTokenRatesDb, fetchTokenRates, ALL_CURRENCY_IDS } from '@talismn/token-rates';
 import { jsx, Fragment } from 'react/jsx-runtime';
 import { ChaindataProvider } from '@talismn/chaindata-provider';
 export { evmErc20TokenId, evmNativeTokenId, subAssetTokenId, subNativeTokenId, subPsp22TokenId, subTokensTokenId } from '@talismn/chaindata-provider';
 import { BalancesProvider as BalancesProvider$1, Balances } from '@talismn/balances';
 import { atomEffect } from 'jotai-effect';
 import { keyBy, fromPairs } from 'lodash-es';
-import { ChainConnector } from '@talismn/chain-connector';
-import { ChainConnectorEvm } from '@talismn/chain-connector-evm';
+import { ChainConnectorDot, ChainConnectorEth, ChainConnectorSol } from '@talismn/chain-connectors';
 import { connectionMetaDb } from '@talismn/connection-meta';
 import { firstThenDebounce, isTruthy, isAbortError } from '@talismn/util';
 import { atomWithObservable } from 'jotai/utils';
-import { combineLatest, Observable, map } from 'rxjs';
-import { liveQuery } from 'dexie';
+import { combineLatest, ReplaySubject } from 'rxjs';
 import anylogger from 'anylogger';
 import { cryptoWaitReady } from '@polkadot/util-crypto';
 
@@ -29,16 +27,30 @@ const enabledTokensAtom = atom(undefined);
 const allAddressesAtom = atom([]);
 
 const chaindataProviderAtom = atom(() => {
-  return new ChaindataProvider({});
+  return new ChaindataProvider({
+    // TODO pass persistedStorage
+  });
+});
+const useSyncSwapsChaindata = () => useAtom(syncSwapsChaindataAtomEffect);
+const syncSwapsChaindataAtomEffect = atomEffect(get => {
+  const chaindataProvider = get(chaindataProviderAtom);
+
+  // keep subscription open when swaps modal is open
+  const subscription = chaindataProvider.networks$.subscribe();
+
+  // close susbcription when swaps modal closes
+  return () => subscription.unsubscribe();
 });
 
 const chainConnectorsAtom = atom(get => {
   const chaindataProvider = get(chaindataProviderAtom);
-  const substrate = new ChainConnector(chaindataProvider, connectionMetaDb);
-  const evm = new ChainConnectorEvm(chaindataProvider);
+  const substrate = new ChainConnectorDot(chaindataProvider, connectionMetaDb);
+  const evm = new ChainConnectorEth(chaindataProvider);
+  const solana = new ChainConnectorSol(chaindataProvider);
   return {
     substrate,
-    evm
+    evm,
+    solana
   };
 });
 
@@ -80,32 +92,17 @@ var packageJson = {
 
 var log = anylogger(packageJson.name);
 
-/**
- * Converts a dexie Observable into an rxjs Observable.
- */
-function dexieToRxjs(o) {
-  return new Observable(observer => {
-    const subscription = o.subscribe({
-      next: value => observer.next(value),
-      error: error => observer.error(error)
-    });
-    return () => subscription.unsubscribe();
-  });
-}
-
 const tokenRatesAtom = atom(async get => {
   // runs a timer to keep tokenRates up to date
   get(tokenRatesFetcherAtomEffect);
-  return await get(tokenRatesDbAtom);
+  return (await get(tokenRatesDbAtom)).tokenRates;
 });
-const tokenRatesDbAtom = atomWithObservable(() => {
-  const dbRatesToMap = dbRates => Object.fromEntries(dbRates.map(({
-    tokenId,
-    rates
-  }) => [tokenId, rates]));
 
-  // retrieve fetched tokenRates from the db
-  return dexieToRxjs(liveQuery(() => db.tokenRates.toArray())).pipe(map(dbRatesToMap));
+// TODO: Persist to storage
+const tokenRates$ = new ReplaySubject(1);
+const tokenRatesDbAtom = atomWithObservable(() => {
+  tryToDeleteOldTokenRatesDb();
+  return tokenRates$.asObservable();
 });
 const tokenRatesFetcherAtomEffect = atomEffect(get => {
   // lets us tear down the existing timer when the effect is restarted
@@ -116,7 +113,6 @@ const tokenRatesFetcherAtomEffect = atomEffect(get => {
   const tokensPromise = get(tokensAtom);
   (async () => {
     const tokensById = keyBy(await tokensPromise, "id");
-    const tokenIds = Object.keys(tokensById);
     const loopMs = 300_000; // 300_000ms = 300s = 5 minutes
     const retryTimeout = 5_000; // 5_000ms = 5 seconds
 
@@ -124,21 +120,11 @@ const tokenRatesFetcherAtomEffect = atomEffect(get => {
       try {
         if (abort.signal.aborted) return; // don't fetch if aborted
         const tokenRates = await fetchTokenRates(tokensById, ALL_CURRENCY_IDS, coinsApiConfig);
-        const putTokenRates = Object.entries(tokenRates).map(([tokenId, rates]) => ({
-          tokenId,
-          rates
-        }));
+        const putTokenRates = {
+          tokenRates
+        };
         if (abort.signal.aborted) return; // don't insert into db if aborted
-        await db.transaction("rw", db.tokenRates, async () => {
-          // override all tokenRates
-          await db.tokenRates.bulkPut(putTokenRates);
-
-          // delete tokenRates for tokens which no longer exist
-          const validTokenIds = new Set(tokenIds);
-          const tokenRatesIds = await db.tokenRates.toCollection().primaryKeys();
-          const deleteIds = tokenRatesIds.filter(id => !validTokenIds.has(id));
-          if (deleteIds.length > 0) await db.tokenRates.bulkDelete(deleteIds);
-        });
+        tokenRates$.next(putTokenRates);
         if (abort.signal.aborted) return; // don't schedule next loop if aborted
         setTimeout(hydrate, loopMs);
       } catch (error) {
@@ -304,4 +290,4 @@ const BalancesProvider = ({
   });
 };
 
-export { BalancesProvider, allAddressesAtom, balancesAtom, chainConnectorsAtom, chaindataAtom, chaindataProviderAtom, coinsApiConfigAtom, cryptoWaitReadyAtom, enableTestnetsAtom, enabledChainsAtom, enabledTokensAtom, getStaleChains, networksAtom, tokenRatesAtom, tokensAtom, useBalances, useBalancesStatus, useChainConnectors, useChaindata, useChaindataProvider, useNetwork, useNetworks, useNetworksById, useSetBalancesAddresses, useToken, useTokenRate, useTokenRates, useTokens, useTokensById };
+export { BalancesProvider, allAddressesAtom, balancesAtom, chainConnectorsAtom, chaindataAtom, chaindataProviderAtom, coinsApiConfigAtom, cryptoWaitReadyAtom, enableTestnetsAtom, enabledChainsAtom, enabledTokensAtom, getStaleChains, networksAtom, tokenRatesAtom, tokensAtom, useBalances, useBalancesStatus, useChainConnectors, useChaindata, useChaindataProvider, useNetwork, useNetworks, useNetworksById, useSetBalancesAddresses, useSyncSwapsChaindata, useToken, useTokenRate, useTokenRates, useTokens, useTokensById };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances-react",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -23,21 +23,18 @@
   "dependencies": {
     "anylogger": "^1.0.11",
     "blueimp-md5": "2.19.0",
-    "dexie": "^4.0.9",
-    "dexie-react-hooks": "^1.1.7",
     "jotai": "~2",
     "jotai-effect": "~1",
     "lodash-es": "4.17.21",
     "react-use": "^17.5.1",
     "rxjs": "^7.8.1",
-    "@talismn/balances": "1.0.1",
-    "@talismn/chain-connector": "1.0.1",
-    "@talismn/chaindata-provider": "1.0.1",
-    "@talismn/connection-meta": "0.2.19",
-    "@talismn/chain-connector-evm": "1.0.1",
+    "@talismn/chain-connectors": "0.0.1",
+    "@talismn/balances": "1.0.3",
+    "@talismn/chaindata-provider": "1.1.0",
     "@talismn/scale": "0.2.0",
-    "@talismn/token-rates": "3.0.1",
-    "@talismn/util": "0.5.0"
+    "@talismn/token-rates": "3.0.3",
+    "@talismn/util": "0.5.1",
+    "@talismn/connection-meta": "0.2.21"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",

package/dist/declarations/src/util/dexieToRxjs.d.ts

@@ -1,6 +0,0 @@
-import { Observable as DexieObservable } from "dexie";
-import { Observable as RxjsObservable } from "rxjs";
-/**
- * Converts a dexie Observable into an rxjs Observable.
- */
-export declare function dexieToRxjs<T>(o: DexieObservable<T>): RxjsObservable<T>;