@talismn/balances-react 0.0.0-pr2120-20250805014446 → 0.0.0-pr2125-20250805020704

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

@@ -83,7 +83,10 @@ 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;
@@ -320,7 +323,10 @@ 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;
@@ -702,7 +708,10 @@ 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;

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

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

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

@@ -85,7 +85,10 @@ 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;
@@ -322,7 +325,10 @@ 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;
@@ -413,7 +419,10 @@ 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;
@@ -504,7 +513,10 @@ 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;

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

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

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

@@ -0,0 +1,6 @@
+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>;

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

@@ -14,6 +14,7 @@ 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');
 
@@ -33,9 +34,7 @@ const enabledTokensAtom = jotai.atom(undefined);
 const allAddressesAtom = jotai.atom([]);
 
 const chaindataProviderAtom = jotai.atom(() => {
-  return new chaindataProvider.ChaindataProvider({
-    // TODO pass persistedStorage
-  });
+  return new chaindataProvider.ChaindataProvider({});
 });
 
 const chainConnectorsAtom = jotai.atom(get => {
@@ -86,17 +85,32 @@ 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)).tokenRates;
+  return await get(tokenRatesDbAtom);
 });
-
-// TODO: Persist to storage
-const tokenRates$ = new rxjs.ReplaySubject(1);
 const tokenRatesDbAtom = utils.atomWithObservable(() => {
-  tokenRates.tryToDeleteOldTokenRatesDb();
-  return tokenRates$.asObservable();
+  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));
 });
 const tokenRatesFetcherAtomEffect = jotaiEffect.atomEffect(get => {
   // lets us tear down the existing timer when the effect is restarted
@@ -107,6 +121,7 @@ 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
 
@@ -114,11 +129,21 @@ 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 = {
-          tokenRates: tokenRates$1
-        };
+        const putTokenRates = Object.entries(tokenRates$1).map(([tokenId, rates]) => ({
+          tokenId,
+          rates
+        }));
         if (abort.signal.aborted) return; // don't insert into db if aborted
-        tokenRates$.next(putTokenRates);
+        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);
+        });
         if (abort.signal.aborted) return; // don't schedule next loop if aborted
         setTimeout(hydrate, loopMs);
       } catch (error) {

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

@@ -14,6 +14,7 @@ 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');
 
@@ -33,9 +34,7 @@ const enabledTokensAtom = jotai.atom(undefined);
 const allAddressesAtom = jotai.atom([]);
 
 const chaindataProviderAtom = jotai.atom(() => {
-  return new chaindataProvider.ChaindataProvider({
-    // TODO pass persistedStorage
-  });
+  return new chaindataProvider.ChaindataProvider({});
 });
 
 const chainConnectorsAtom = jotai.atom(get => {
@@ -86,17 +85,32 @@ 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)).tokenRates;
+  return await get(tokenRatesDbAtom);
 });
-
-// TODO: Persist to storage
-const tokenRates$ = new rxjs.ReplaySubject(1);
 const tokenRatesDbAtom = utils.atomWithObservable(() => {
-  tokenRates.tryToDeleteOldTokenRatesDb();
-  return tokenRates$.asObservable();
+  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));
 });
 const tokenRatesFetcherAtomEffect = jotaiEffect.atomEffect(get => {
   // lets us tear down the existing timer when the effect is restarted
@@ -107,6 +121,7 @@ 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
 
@@ -114,11 +129,21 @@ 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 = {
-          tokenRates: tokenRates$1
-        };
+        const putTokenRates = Object.entries(tokenRates$1).map(([tokenId, rates]) => ({
+          tokenId,
+          rates
+        }));
         if (abort.signal.aborted) return; // don't insert into db if aborted
-        tokenRates$.next(putTokenRates);
+        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);
+        });
         if (abort.signal.aborted) return; // don't schedule next loop if aborted
         setTimeout(hydrate, loopMs);
       } catch (error) {

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

@@ -1,6 +1,6 @@
 import { atom, useSetAtom, useAtomValue } from 'jotai';
 import { useMemo, useEffect } from 'react';
-import { DEFAULT_COINSAPI_CONFIG, tryToDeleteOldTokenRatesDb, fetchTokenRates, ALL_CURRENCY_IDS } from '@talismn/token-rates';
+import { DEFAULT_COINSAPI_CONFIG, db, 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';
@@ -12,7 +12,8 @@ import { ChainConnectorEvm } from '@talismn/chain-connector-evm';
 import { connectionMetaDb } from '@talismn/connection-meta';
 import { firstThenDebounce, isTruthy, isAbortError } from '@talismn/util';
 import { atomWithObservable } from 'jotai/utils';
-import { combineLatest, ReplaySubject } from 'rxjs';
+import { combineLatest, Observable, map } from 'rxjs';
+import { liveQuery } from 'dexie';
 import anylogger from 'anylogger';
 import { cryptoWaitReady } from '@polkadot/util-crypto';
 
@@ -28,9 +29,7 @@ const enabledTokensAtom = atom(undefined);
 const allAddressesAtom = atom([]);
 
 const chaindataProviderAtom = atom(() => {
-  return new ChaindataProvider({
-    // TODO pass persistedStorage
-  });
+  return new ChaindataProvider({});
 });
 
 const chainConnectorsAtom = atom(get => {
@@ -81,17 +80,32 @@ 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)).tokenRates;
+  return await get(tokenRatesDbAtom);
 });
-
-// TODO: Persist to storage
-const tokenRates$ = new ReplaySubject(1);
 const tokenRatesDbAtom = atomWithObservable(() => {
-  tryToDeleteOldTokenRatesDb();
-  return tokenRates$.asObservable();
+  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));
 });
 const tokenRatesFetcherAtomEffect = atomEffect(get => {
   // lets us tear down the existing timer when the effect is restarted
@@ -102,6 +116,7 @@ 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
 
@@ -109,11 +124,21 @@ 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 = {
-          tokenRates
-        };
+        const putTokenRates = Object.entries(tokenRates).map(([tokenId, rates]) => ({
+          tokenId,
+          rates
+        }));
         if (abort.signal.aborted) return; // don't insert into db if aborted
-        tokenRates$.next(putTokenRates);
+        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);
+        });
         if (abort.signal.aborted) return; // don't schedule next loop if aborted
         setTimeout(hydrate, loopMs);
       } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances-react",
-  "version": "0.0.0-pr2120-20250805014446",
+  "version": "0.0.0-pr2125-20250805020704",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -23,19 +23,21 @@
   "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/chain-connector": "0.0.0-pr2120-20250805014446",
-    "@talismn/chain-connector-evm": "0.0.0-pr2120-20250805014446",
-    "@talismn/balances": "0.0.0-pr2120-20250805014446",
-    "@talismn/chaindata-provider": "0.0.0-pr2120-20250805014446",
-    "@talismn/connection-meta": "0.0.0-pr2120-20250805014446",
+    "@talismn/chain-connector": "0.0.0-pr2125-20250805020704",
+    "@talismn/balances": "0.0.0-pr2125-20250805020704",
+    "@talismn/chain-connector-evm": "0.0.0-pr2125-20250805020704",
+    "@talismn/chaindata-provider": "0.0.0-pr2125-20250805020704",
+    "@talismn/token-rates": "0.0.0-pr2125-20250805020704",
     "@talismn/scale": "0.2.0",
-    "@talismn/token-rates": "0.0.0-pr2120-20250805014446",
-    "@talismn/util": "0.0.0-pr2120-20250805014446"
+    "@talismn/connection-meta": "0.0.0-pr2125-20250805020704",
+    "@talismn/util": "0.5.0"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",