@talismn/balances-react 0.0.0-pr660-20230328111733 → 0.0.0-pr660-20230329012844

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @talismn/balances-react
 
-## 0.0.0-pr660-20230328111733
+## 0.0.0-pr660-20230329012844
 
 ### Minor Changes
 
@@ -17,13 +17,13 @@
 - Updated dependencies [79f6ccf6]
 - Updated dependencies [6643a4e4]
 - Updated dependencies [c24dc1fb]
-  - @talismn/chain-connector@0.0.0-pr660-20230328111733
-  - @talismn/connection-meta@0.0.0-pr660-20230328111733
-  - @talismn/balances@0.0.0-pr660-20230328111733
-  - @talismn/token-rates@0.0.0-pr660-20230328111733
-  - @talismn/chaindata-provider-extension@0.0.0-pr660-20230328111733
-  - @talismn/chaindata-provider@0.0.0-pr660-20230328111733
-  - @talismn/chain-connector-evm@0.0.0-pr660-20230328111733
+  - @talismn/chain-connector@0.0.0-pr660-20230329012844
+  - @talismn/connection-meta@0.0.0-pr660-20230329012844
+  - @talismn/balances@0.0.0-pr660-20230329012844
+  - @talismn/token-rates@0.0.0-pr660-20230329012844
+  - @talismn/chaindata-provider-extension@0.0.0-pr660-20230329012844
+  - @talismn/chaindata-provider@0.0.0-pr660-20230329012844
+  - @talismn/chain-connector-evm@0.0.0-pr660-20230329012844
 
 ## 0.3.3
 

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

@@ -17,9 +17,6 @@ type DbCache = {
     tokensWithoutTestnetsMap: Record<TokenId, Token>;
     tokenRatesMap: Record<TokenId, TokenRates>;
     balances: BalanceJson[];
-    balancesMeta: {
-        subscriptionId: string | undefined;
-    };
 };
 export declare const DbCacheProvider: import("react").FC<{
     children?: import("react").ReactNode;

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

@@ -117,12 +117,9 @@ const DEFAULT_VALUE = {
   tokensWithTestnetsMap: {},
   tokensWithoutTestnetsMap: {},
   tokenRatesMap: {},
-  balances: [],
-  balancesMeta: {
-    subscriptionId: undefined
-  }
+  balances: []
 };
-const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, allBalances, meta) => {
+const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, allBalances) => {
   if (!chainsMap || !evmNetworksMap || !tokensMap || !tokenRates || !allBalances) return DEFAULT_VALUE;
 
   // BEGIN: temp hack to indicate that
@@ -158,11 +155,6 @@ const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, al
 
   // return only balances for which we have a token
   const balances = allBalances.filter(b => tokensWithTestnetsMap[b.tokenId]);
-  const balancesMeta = {
-    subscriptionId: meta?.find(({
-      id
-    }) => id === "subscriptionId")?.value
-  };
   return {
     chainsWithTestnets,
     chainsWithoutTestnets,
@@ -177,8 +169,7 @@ const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, al
     tokensWithTestnetsMap,
     tokensWithoutTestnetsMap,
     tokenRatesMap,
-    balances,
-    balancesMeta
+    balances
   };
 };
 const useDbCacheProvider = () => {
@@ -188,29 +179,28 @@ const useDbCacheProvider = () => {
   const tokenList = dexieReactHooks.useLiveQuery(() => chaindataProvider?.tokens(), [chaindataProvider]);
   const tokenRates$1 = dexieReactHooks.useLiveQuery(() => tokenRates.db.tokenRates.toArray(), []);
   const rawBalances = dexieReactHooks.useLiveQuery(() => balances.db.balances.toArray(), []);
-  const meta = dexieReactHooks.useLiveQuery(() => balances.db.meta.toArray(), []);
   const [dbData, setDbData] = react.useState(DEFAULT_VALUE);
 
   // debounce every 500ms to prevent hammering UI with updates
   reactUse.useDebounce(() => {
-    setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances, meta));
-  }, 500, [chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances, meta]);
+    setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances));
+  }, 500, [chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances]);
   const refInitialized = react.useRef(false);
 
   // force an update as soon as all datasources are fetched, so UI can display data ASAP
   react.useEffect(() => {
-    if (!refInitialized.current && chainList && evmNetworkList && tokenList && tokenRates$1 && rawBalances && meta) {
-      setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances, meta));
+    if (!refInitialized.current && chainList && evmNetworkList && tokenList && tokenRates$1 && rawBalances) {
+      setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances));
       refInitialized.current = true;
     }
-  }, [chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances, meta]);
+  }, [chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances]);
   return dbData;
 };
 const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr660-20230328111733",
+	version: "0.0.0-pr660-20230329012844",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -513,11 +503,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
     id
   }) => id);
   const addressesByToken = Object.fromEntries(tokenIds.map(tokenId => [tokenId, addresses]));
-  const subscriptionId = Date.now().toString();
-  balances.db.meta.put({
-    id: "subscriptionId",
-    value: subscriptionId
-  });
+  const subscriptionId = balances.createSubscriptionId();
 
   // TODO: Create subscriptions in a service worker, where we can detect page closes
   // and therefore reliably delete the subscriptionId when the user closes our dapp
@@ -529,7 +515,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
   //
   // For now, we'll just last-ditch remove the subscriptionId (it works surprisingly well!) in the beforeunload event
   window.onbeforeunload = () => {
-    balances.db.meta.delete("subscriptionId");
+    balances.deleteSubscriptionId();
   };
   const updateDb = balances$1 => {
     const putBalances = Object.entries(balances$1.toJSON()).map(([id, balance]) => ({
@@ -577,7 +563,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
       unsub.then(unsubscribe => {
         setTimeout(unsubscribe, 2_000);
       });
-      balances.db.meta.delete("subscriptionId");
+      balances.deleteSubscriptionId();
     };
   });
   const unsubscribeAll = () => {
@@ -663,11 +649,10 @@ function useBalances(addressesByToken) {
   useDbCacheBalancesSubscription();
   const balanceModules = useBalanceModules();
   const {
-    balances: balances$1,
-    balancesMeta
+    balances: balances$1
   } = useDbCache();
   const hydrate = useBalancesHydrate();
-  return react.useMemo(() => new balances.Balances(balances.deriveStatuses(balancesMeta.subscriptionId, balances$1.filter(balance => {
+  return react.useMemo(() => new balances.Balances(balances.deriveStatuses([...balances.getValidSubscriptionIds()], balances$1.filter(balance => {
     // check that this balance is included in our queried balance modules
     if (!balanceModules.map(({
       type
@@ -686,7 +671,7 @@ function useBalances(addressesByToken) {
     return true;
   })),
   // hydrate balance chains, evmNetworks, tokens and tokenRates
-  hydrate), [balancesMeta.subscriptionId, balances$1, hydrate, balanceModules, addressesByToken]);
+  hydrate), [balances$1, hydrate, balanceModules, addressesByToken]);
 }
 
 /**

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

@@ -117,12 +117,9 @@ const DEFAULT_VALUE = {
   tokensWithTestnetsMap: {},
   tokensWithoutTestnetsMap: {},
   tokenRatesMap: {},
-  balances: [],
-  balancesMeta: {
-    subscriptionId: undefined
-  }
+  balances: []
 };
-const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, allBalances, meta) => {
+const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, allBalances) => {
   if (!chainsMap || !evmNetworksMap || !tokensMap || !tokenRates || !allBalances) return DEFAULT_VALUE;
 
   // BEGIN: temp hack to indicate that
@@ -158,11 +155,6 @@ const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, al
 
   // return only balances for which we have a token
   const balances = allBalances.filter(b => tokensWithTestnetsMap[b.tokenId]);
-  const balancesMeta = {
-    subscriptionId: meta?.find(({
-      id
-    }) => id === "subscriptionId")?.value
-  };
   return {
     chainsWithTestnets,
     chainsWithoutTestnets,
@@ -177,8 +169,7 @@ const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, al
     tokensWithTestnetsMap,
     tokensWithoutTestnetsMap,
     tokenRatesMap,
-    balances,
-    balancesMeta
+    balances
   };
 };
 const useDbCacheProvider = () => {
@@ -188,29 +179,28 @@ const useDbCacheProvider = () => {
   const tokenList = dexieReactHooks.useLiveQuery(() => chaindataProvider?.tokens(), [chaindataProvider]);
   const tokenRates$1 = dexieReactHooks.useLiveQuery(() => tokenRates.db.tokenRates.toArray(), []);
   const rawBalances = dexieReactHooks.useLiveQuery(() => balances.db.balances.toArray(), []);
-  const meta = dexieReactHooks.useLiveQuery(() => balances.db.meta.toArray(), []);
   const [dbData, setDbData] = react.useState(DEFAULT_VALUE);
 
   // debounce every 500ms to prevent hammering UI with updates
   reactUse.useDebounce(() => {
-    setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances, meta));
-  }, 500, [chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances, meta]);
+    setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances));
+  }, 500, [chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances]);
   const refInitialized = react.useRef(false);
 
   // force an update as soon as all datasources are fetched, so UI can display data ASAP
   react.useEffect(() => {
-    if (!refInitialized.current && chainList && evmNetworkList && tokenList && tokenRates$1 && rawBalances && meta) {
-      setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances, meta));
+    if (!refInitialized.current && chainList && evmNetworkList && tokenList && tokenRates$1 && rawBalances) {
+      setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances));
       refInitialized.current = true;
     }
-  }, [chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances, meta]);
+  }, [chainList, evmNetworkList, tokenList, tokenRates$1, rawBalances]);
   return dbData;
 };
 const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr660-20230328111733",
+	version: "0.0.0-pr660-20230329012844",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -513,11 +503,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
     id
   }) => id);
   const addressesByToken = Object.fromEntries(tokenIds.map(tokenId => [tokenId, addresses]));
-  const subscriptionId = Date.now().toString();
-  balances.db.meta.put({
-    id: "subscriptionId",
-    value: subscriptionId
-  });
+  const subscriptionId = balances.createSubscriptionId();
 
   // TODO: Create subscriptions in a service worker, where we can detect page closes
   // and therefore reliably delete the subscriptionId when the user closes our dapp
@@ -529,7 +515,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
   //
   // For now, we'll just last-ditch remove the subscriptionId (it works surprisingly well!) in the beforeunload event
   window.onbeforeunload = () => {
-    balances.db.meta.delete("subscriptionId");
+    balances.deleteSubscriptionId();
   };
   const updateDb = balances$1 => {
     const putBalances = Object.entries(balances$1.toJSON()).map(([id, balance]) => ({
@@ -577,7 +563,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
       unsub.then(unsubscribe => {
         setTimeout(unsubscribe, 2_000);
       });
-      balances.db.meta.delete("subscriptionId");
+      balances.deleteSubscriptionId();
     };
   });
   const unsubscribeAll = () => {
@@ -663,11 +649,10 @@ function useBalances(addressesByToken) {
   useDbCacheBalancesSubscription();
   const balanceModules = useBalanceModules();
   const {
-    balances: balances$1,
-    balancesMeta
+    balances: balances$1
   } = useDbCache();
   const hydrate = useBalancesHydrate();
-  return react.useMemo(() => new balances.Balances(balances.deriveStatuses(balancesMeta.subscriptionId, balances$1.filter(balance => {
+  return react.useMemo(() => new balances.Balances(balances.deriveStatuses([...balances.getValidSubscriptionIds()], balances$1.filter(balance => {
     // check that this balance is included in our queried balance modules
     if (!balanceModules.map(({
       type
@@ -686,7 +671,7 @@ function useBalances(addressesByToken) {
     return true;
   })),
   // hydrate balance chains, evmNetworks, tokens and tokenRates
-  hydrate), [balancesMeta.subscriptionId, balances$1, hydrate, balanceModules, addressesByToken]);
+  hydrate), [balances$1, hydrate, balanceModules, addressesByToken]);
 }
 
 /**

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

@@ -4,7 +4,7 @@ import { ChainConnector } from '@talismn/chain-connector';
 import { ChainConnectorEvm } from '@talismn/chain-connector-evm';
 import { connectionMetaDb } from '@talismn/connection-meta';
 import { ChaindataProviderExtension } from '@talismn/chaindata-provider-extension';
-import { db as db$1, balances, BalanceStatusLive, Balances, deriveStatuses } from '@talismn/balances';
+import { db as db$1, createSubscriptionId, deleteSubscriptionId, balances, BalanceStatusLive, Balances, deriveStatuses, getValidSubscriptionIds } from '@talismn/balances';
 import { db, fetchTokenRates } from '@talismn/token-rates';
 import { useLiveQuery } from 'dexie-react-hooks';
 import { useDebounce } from 'react-use';
@@ -108,12 +108,9 @@ const DEFAULT_VALUE = {
   tokensWithTestnetsMap: {},
   tokensWithoutTestnetsMap: {},
   tokenRatesMap: {},
-  balances: [],
-  balancesMeta: {
-    subscriptionId: undefined
-  }
+  balances: []
 };
-const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, allBalances, meta) => {
+const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, allBalances) => {
   if (!chainsMap || !evmNetworksMap || !tokensMap || !tokenRates || !allBalances) return DEFAULT_VALUE;
 
   // BEGIN: temp hack to indicate that
@@ -149,11 +146,6 @@ const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, al
 
   // return only balances for which we have a token
   const balances = allBalances.filter(b => tokensWithTestnetsMap[b.tokenId]);
-  const balancesMeta = {
-    subscriptionId: meta?.find(({
-      id
-    }) => id === "subscriptionId")?.value
-  };
   return {
     chainsWithTestnets,
     chainsWithoutTestnets,
@@ -168,8 +160,7 @@ const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, al
     tokensWithTestnetsMap,
     tokensWithoutTestnetsMap,
     tokenRatesMap,
-    balances,
-    balancesMeta
+    balances
   };
 };
 const useDbCacheProvider = () => {
@@ -179,29 +170,28 @@ const useDbCacheProvider = () => {
   const tokenList = useLiveQuery(() => chaindataProvider?.tokens(), [chaindataProvider]);
   const tokenRates = useLiveQuery(() => db.tokenRates.toArray(), []);
   const rawBalances = useLiveQuery(() => db$1.balances.toArray(), []);
-  const meta = useLiveQuery(() => db$1.meta.toArray(), []);
   const [dbData, setDbData] = useState(DEFAULT_VALUE);
 
   // debounce every 500ms to prevent hammering UI with updates
   useDebounce(() => {
-    setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates, rawBalances, meta));
-  }, 500, [chainList, evmNetworkList, tokenList, tokenRates, rawBalances, meta]);
+    setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates, rawBalances));
+  }, 500, [chainList, evmNetworkList, tokenList, tokenRates, rawBalances]);
   const refInitialized = useRef(false);
 
   // force an update as soon as all datasources are fetched, so UI can display data ASAP
   useEffect(() => {
-    if (!refInitialized.current && chainList && evmNetworkList && tokenList && tokenRates && rawBalances && meta) {
-      setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates, rawBalances, meta));
+    if (!refInitialized.current && chainList && evmNetworkList && tokenList && tokenRates && rawBalances) {
+      setDbData(consolidateDbCache(chainList, evmNetworkList, tokenList, tokenRates, rawBalances));
       refInitialized.current = true;
     }
-  }, [chainList, evmNetworkList, tokenList, tokenRates, rawBalances, meta]);
+  }, [chainList, evmNetworkList, tokenList, tokenRates, rawBalances]);
   return dbData;
 };
 const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr660-20230328111733",
+	version: "0.0.0-pr660-20230329012844",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -504,11 +494,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
     id
   }) => id);
   const addressesByToken = Object.fromEntries(tokenIds.map(tokenId => [tokenId, addresses]));
-  const subscriptionId = Date.now().toString();
-  db$1.meta.put({
-    id: "subscriptionId",
-    value: subscriptionId
-  });
+  const subscriptionId = createSubscriptionId();
 
   // TODO: Create subscriptions in a service worker, where we can detect page closes
   // and therefore reliably delete the subscriptionId when the user closes our dapp
@@ -520,7 +506,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
   //
   // For now, we'll just last-ditch remove the subscriptionId (it works surprisingly well!) in the beforeunload event
   window.onbeforeunload = () => {
-    db$1.meta.delete("subscriptionId");
+    deleteSubscriptionId();
   };
   const updateDb = balances => {
     const putBalances = Object.entries(balances.toJSON()).map(([id, balance]) => ({
@@ -568,7 +554,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
       unsub.then(unsubscribe => {
         setTimeout(unsubscribe, 2_000);
       });
-      db$1.meta.delete("subscriptionId");
+      deleteSubscriptionId();
     };
   });
   const unsubscribeAll = () => {
@@ -654,11 +640,10 @@ function useBalances(addressesByToken) {
   useDbCacheBalancesSubscription();
   const balanceModules = useBalanceModules();
   const {
-    balances,
-    balancesMeta
+    balances
   } = useDbCache();
   const hydrate = useBalancesHydrate();
-  return useMemo(() => new Balances(deriveStatuses(balancesMeta.subscriptionId, balances.filter(balance => {
+  return useMemo(() => new Balances(deriveStatuses([...getValidSubscriptionIds()], balances.filter(balance => {
     // check that this balance is included in our queried balance modules
     if (!balanceModules.map(({
       type
@@ -677,7 +662,7 @@ function useBalances(addressesByToken) {
     return true;
   })),
   // hydrate balance chains, evmNetworks, tokens and tokenRates
-  hydrate), [balancesMeta.subscriptionId, balances, hydrate, balanceModules, addressesByToken]);
+  hydrate), [balances, hydrate, balanceModules, addressesByToken]);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances-react",
-  "version": "0.0.0-pr660-20230328111733",
+  "version": "0.0.0-pr660-20230329012844",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "UNLICENSED",
@@ -26,13 +26,13 @@
     "clean": "rm -rf dist && rm -rf .turbo rm -rf node_modules"
   },
   "dependencies": {
-    "@talismn/balances": "^0.0.0-pr660-20230328111733",
-    "@talismn/chain-connector": "^0.0.0-pr660-20230328111733",
-    "@talismn/chain-connector-evm": "^0.0.0-pr660-20230328111733",
-    "@talismn/chaindata-provider": "^0.0.0-pr660-20230328111733",
-    "@talismn/chaindata-provider-extension": "^0.0.0-pr660-20230328111733",
-    "@talismn/connection-meta": "^0.0.0-pr660-20230328111733",
-    "@talismn/token-rates": "^0.0.0-pr660-20230328111733",
+    "@talismn/balances": "^0.0.0-pr660-20230329012844",
+    "@talismn/chain-connector": "^0.0.0-pr660-20230329012844",
+    "@talismn/chain-connector-evm": "^0.0.0-pr660-20230329012844",
+    "@talismn/chaindata-provider": "^0.0.0-pr660-20230329012844",
+    "@talismn/chaindata-provider-extension": "^0.0.0-pr660-20230329012844",
+    "@talismn/connection-meta": "^0.0.0-pr660-20230329012844",
+    "@talismn/token-rates": "^0.0.0-pr660-20230329012844",
     "anylogger": "^1.0.11",
     "blueimp-md5": "2.19.0",
     "dexie": "^3.2.3",