@talismn/balances-react 0.0.0-pr610-20230310075120 → 0.0.0-pr611-20230313203313

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @talismn/balances-react
 
-## 0.0.0-pr610-20230310075120
+## 0.0.0-pr611-20230313203313
 
 ### Minor Changes
 
@@ -12,8 +12,8 @@
 - 6643a4e: fix: ported useDbCache related perf fixes to @talismn/balances-react
 - Updated dependencies [6643a4e]
 - Updated dependencies [6643a4e]
-  - @talismn/token-rates@0.0.0-pr610-20230310075120
-  - @talismn/balances@0.0.0-pr610-20230310075120
+  - @talismn/token-rates@0.0.0-pr611-20230313203313
+  - @talismn/balances@0.0.0-pr611-20230313203313
 
 ## 0.3.3
 

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

@@ -6,6 +6,7 @@ var react = require('react');
 var jsxRuntime = require('react/jsx-runtime');
 var chainConnector = require('@talismn/chain-connector');
 var chainConnectorEvm = require('@talismn/chain-connector-evm');
+var connectionMeta = require('@talismn/connection-meta');
 var chaindataProviderExtension = require('@talismn/chaindata-provider-extension');
 var balances = require('@talismn/balances');
 var tokenRates = require('@talismn/token-rates');
@@ -73,7 +74,7 @@ function useChainConnectorsProvider(options) {
   const chaindata = useChaindata();
 
   // substrate connector
-  const substrate = react.useMemo(() => new chainConnector.ChainConnector(chaindata), [chaindata]);
+  const substrate = react.useMemo(() => new chainConnector.ChainConnector(chaindata, connectionMeta.connectionMetaDb), [chaindata]);
 
   // evm connector
   const evm = react.useMemo(() => new chainConnectorEvm.ChainConnectorEvm(chaindata, {
@@ -199,7 +200,7 @@ const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr610-20230310075120",
+	version: "0.0.0-pr611-20230313203313",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -230,6 +231,7 @@ var packageJson = {
 		"@talismn/chain-connector-evm": "workspace:^",
 		"@talismn/chaindata-provider": "workspace:^",
 		"@talismn/chaindata-provider-extension": "workspace:^",
+		"@talismn/connection-meta": "workspace:^",
 		"@talismn/token-rates": "workspace:^",
 		anylogger: "^1.0.11",
 		"blueimp-md5": "2.19.0",
@@ -442,8 +444,8 @@ function useDbCacheBalancesSubscription() {
   }, [allAddresses, balanceModules, chainConnectors, chaindataProvider, tokens]);
   const subscription = react.useCallback(() => {
     if (!Object.values(tokens ?? {}).length || !allAddresses.length) return () => {};
-    return subscribeBalances(tokens ?? {}, allAddresses, chainConnectors, chaindataProvider, balanceModules);
-  }, [allAddresses, balanceModules, chainConnectors, chaindataProvider, tokens]);
+    return subscribeBalances(tokens ?? {}, allAddresses, balanceModules);
+  }, [allAddresses, balanceModules, tokens]);
   useSharedSubscription(subscriptionKey, subscription);
 }
 const subscribeChainDataHydrate = (provider, type) => {
@@ -501,7 +503,7 @@ const subscribeTokenRates = tokens => {
     if (timeout) clearTimeout(timeout);
   };
 };
-const subscribeBalances = (tokens, addresses, chainConnectors, provider, balanceModules) => {
+const subscribeBalances = (tokens, addresses, balanceModules) => {
   const tokenIds = Object.values(tokens).map(({
     id
   }) => id);
@@ -525,28 +527,41 @@ const subscribeBalances = (tokens, addresses, chainConnectors, provider, balance
       id
     }) => id);
     const addressesByModuleToken = Object.fromEntries(Object.entries(addressesByToken).filter(([tokenId]) => moduleTokenIds.includes(tokenId)));
-    const unsub = balances.balances(balanceModule, addressesByModuleToken, (error, balances) => {
+    const unsub = balances.balances(balanceModule, addressesByModuleToken, (error, balances$1) => {
       // log errors
-      if (error) return log.error(`Failed to fetch ${balanceModule.type} balances`, error);
+      if (error) {
+        if ((error === null || error === void 0 ? void 0 : error.type) === "STALE_RPC_ERROR") return balances.db.balances.where({
+          source: balanceModule.type,
+          chainId: error.chainId
+        }).filter(balance => {
+          if (!Object.keys(addressesByModuleToken).includes(balance.tokenId)) return false;
+          if (!addressesByModuleToken[balance.tokenId].includes(balance.address)) return false;
+          return true;
+        }).modify({
+          status: "stale"
+        });
+        return log.error(`Failed to fetch ${balanceModule.type} balances`, error);
+      }
       // ignore empty balance responses
-      if (!balances) return;
+      if (!balances$1) return;
       // ignore balances from old subscriptions which are still in the process of unsubscribing
       if (unsubscribed) return;
-      updateDb(balances);
+      updateDb(balances$1);
     });
     return () => {
       // wait 2 seconds before actually unsubscribing, allowing for websocket to be reused
       unsub.then(unsubscribe => {
         setTimeout(unsubscribe, 2_000);
       });
-      balances.db.transaction("rw", balances.db.balances, async () => await balances.db.balances.filter(balance => {
-        if (balance.source !== balanceModule.type) return false;
+      balances.db.balances.where({
+        source: balanceModule.type
+      }).filter(balance => {
         if (!Object.keys(addressesByModuleToken).includes(balance.tokenId)) return false;
         if (!addressesByModuleToken[balance.tokenId].includes(balance.address)) return false;
         return true;
       }).modify({
         status: "cache"
-      }));
+      });
     };
   });
   const unsubscribeAll = () => {

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

@@ -6,6 +6,7 @@ var react = require('react');
 var jsxRuntime = require('react/jsx-runtime');
 var chainConnector = require('@talismn/chain-connector');
 var chainConnectorEvm = require('@talismn/chain-connector-evm');
+var connectionMeta = require('@talismn/connection-meta');
 var chaindataProviderExtension = require('@talismn/chaindata-provider-extension');
 var balances = require('@talismn/balances');
 var tokenRates = require('@talismn/token-rates');
@@ -73,7 +74,7 @@ function useChainConnectorsProvider(options) {
   const chaindata = useChaindata();
 
   // substrate connector
-  const substrate = react.useMemo(() => new chainConnector.ChainConnector(chaindata), [chaindata]);
+  const substrate = react.useMemo(() => new chainConnector.ChainConnector(chaindata, connectionMeta.connectionMetaDb), [chaindata]);
 
   // evm connector
   const evm = react.useMemo(() => new chainConnectorEvm.ChainConnectorEvm(chaindata, {
@@ -199,7 +200,7 @@ const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr610-20230310075120",
+	version: "0.0.0-pr611-20230313203313",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -230,6 +231,7 @@ var packageJson = {
 		"@talismn/chain-connector-evm": "workspace:^",
 		"@talismn/chaindata-provider": "workspace:^",
 		"@talismn/chaindata-provider-extension": "workspace:^",
+		"@talismn/connection-meta": "workspace:^",
 		"@talismn/token-rates": "workspace:^",
 		anylogger: "^1.0.11",
 		"blueimp-md5": "2.19.0",
@@ -442,8 +444,8 @@ function useDbCacheBalancesSubscription() {
   }, [allAddresses, balanceModules, chainConnectors, chaindataProvider, tokens]);
   const subscription = react.useCallback(() => {
     if (!Object.values(tokens ?? {}).length || !allAddresses.length) return () => {};
-    return subscribeBalances(tokens ?? {}, allAddresses, chainConnectors, chaindataProvider, balanceModules);
-  }, [allAddresses, balanceModules, chainConnectors, chaindataProvider, tokens]);
+    return subscribeBalances(tokens ?? {}, allAddresses, balanceModules);
+  }, [allAddresses, balanceModules, tokens]);
   useSharedSubscription(subscriptionKey, subscription);
 }
 const subscribeChainDataHydrate = (provider, type) => {
@@ -501,7 +503,7 @@ const subscribeTokenRates = tokens => {
     if (timeout) clearTimeout(timeout);
   };
 };
-const subscribeBalances = (tokens, addresses, chainConnectors, provider, balanceModules) => {
+const subscribeBalances = (tokens, addresses, balanceModules) => {
   const tokenIds = Object.values(tokens).map(({
     id
   }) => id);
@@ -525,28 +527,41 @@ const subscribeBalances = (tokens, addresses, chainConnectors, provider, balance
       id
     }) => id);
     const addressesByModuleToken = Object.fromEntries(Object.entries(addressesByToken).filter(([tokenId]) => moduleTokenIds.includes(tokenId)));
-    const unsub = balances.balances(balanceModule, addressesByModuleToken, (error, balances) => {
+    const unsub = balances.balances(balanceModule, addressesByModuleToken, (error, balances$1) => {
       // log errors
-      if (error) return log.error(`Failed to fetch ${balanceModule.type} balances`, error);
+      if (error) {
+        if ((error === null || error === void 0 ? void 0 : error.type) === "STALE_RPC_ERROR") return balances.db.balances.where({
+          source: balanceModule.type,
+          chainId: error.chainId
+        }).filter(balance => {
+          if (!Object.keys(addressesByModuleToken).includes(balance.tokenId)) return false;
+          if (!addressesByModuleToken[balance.tokenId].includes(balance.address)) return false;
+          return true;
+        }).modify({
+          status: "stale"
+        });
+        return log.error(`Failed to fetch ${balanceModule.type} balances`, error);
+      }
       // ignore empty balance responses
-      if (!balances) return;
+      if (!balances$1) return;
       // ignore balances from old subscriptions which are still in the process of unsubscribing
       if (unsubscribed) return;
-      updateDb(balances);
+      updateDb(balances$1);
     });
     return () => {
       // wait 2 seconds before actually unsubscribing, allowing for websocket to be reused
       unsub.then(unsubscribe => {
         setTimeout(unsubscribe, 2_000);
       });
-      balances.db.transaction("rw", balances.db.balances, async () => await balances.db.balances.filter(balance => {
-        if (balance.source !== balanceModule.type) return false;
+      balances.db.balances.where({
+        source: balanceModule.type
+      }).filter(balance => {
         if (!Object.keys(addressesByModuleToken).includes(balance.tokenId)) return false;
         if (!addressesByModuleToken[balance.tokenId].includes(balance.address)) return false;
         return true;
       }).modify({
         status: "cache"
-      }));
+      });
     };
   });
   const unsubscribeAll = () => {

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

@@ -2,6 +2,7 @@ import { useContext, createContext, useState, useEffect, useMemo, useRef, useCal
 import { jsx } from 'react/jsx-runtime';
 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, Balances } from '@talismn/balances';
 import { db, fetchTokenRates } from '@talismn/token-rates';
@@ -64,7 +65,7 @@ function useChainConnectorsProvider(options) {
   const chaindata = useChaindata();
 
   // substrate connector
-  const substrate = useMemo(() => new ChainConnector(chaindata), [chaindata]);
+  const substrate = useMemo(() => new ChainConnector(chaindata, connectionMetaDb), [chaindata]);
 
   // evm connector
   const evm = useMemo(() => new ChainConnectorEvm(chaindata, {
@@ -190,7 +191,7 @@ const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr610-20230310075120",
+	version: "0.0.0-pr611-20230313203313",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -221,6 +222,7 @@ var packageJson = {
 		"@talismn/chain-connector-evm": "workspace:^",
 		"@talismn/chaindata-provider": "workspace:^",
 		"@talismn/chaindata-provider-extension": "workspace:^",
+		"@talismn/connection-meta": "workspace:^",
 		"@talismn/token-rates": "workspace:^",
 		anylogger: "^1.0.11",
 		"blueimp-md5": "2.19.0",
@@ -433,8 +435,8 @@ function useDbCacheBalancesSubscription() {
   }, [allAddresses, balanceModules, chainConnectors, chaindataProvider, tokens]);
   const subscription = useCallback(() => {
     if (!Object.values(tokens ?? {}).length || !allAddresses.length) return () => {};
-    return subscribeBalances(tokens ?? {}, allAddresses, chainConnectors, chaindataProvider, balanceModules);
-  }, [allAddresses, balanceModules, chainConnectors, chaindataProvider, tokens]);
+    return subscribeBalances(tokens ?? {}, allAddresses, balanceModules);
+  }, [allAddresses, balanceModules, tokens]);
   useSharedSubscription(subscriptionKey, subscription);
 }
 const subscribeChainDataHydrate = (provider, type) => {
@@ -492,7 +494,7 @@ const subscribeTokenRates = tokens => {
     if (timeout) clearTimeout(timeout);
   };
 };
-const subscribeBalances = (tokens, addresses, chainConnectors, provider, balanceModules) => {
+const subscribeBalances = (tokens, addresses, balanceModules) => {
   const tokenIds = Object.values(tokens).map(({
     id
   }) => id);
@@ -518,7 +520,19 @@ const subscribeBalances = (tokens, addresses, chainConnectors, provider, balance
     const addressesByModuleToken = Object.fromEntries(Object.entries(addressesByToken).filter(([tokenId]) => moduleTokenIds.includes(tokenId)));
     const unsub = balances(balanceModule, addressesByModuleToken, (error, balances) => {
       // log errors
-      if (error) return log.error(`Failed to fetch ${balanceModule.type} balances`, error);
+      if (error) {
+        if ((error === null || error === void 0 ? void 0 : error.type) === "STALE_RPC_ERROR") return db$1.balances.where({
+          source: balanceModule.type,
+          chainId: error.chainId
+        }).filter(balance => {
+          if (!Object.keys(addressesByModuleToken).includes(balance.tokenId)) return false;
+          if (!addressesByModuleToken[balance.tokenId].includes(balance.address)) return false;
+          return true;
+        }).modify({
+          status: "stale"
+        });
+        return log.error(`Failed to fetch ${balanceModule.type} balances`, error);
+      }
       // ignore empty balance responses
       if (!balances) return;
       // ignore balances from old subscriptions which are still in the process of unsubscribing
@@ -530,14 +544,15 @@ const subscribeBalances = (tokens, addresses, chainConnectors, provider, balance
       unsub.then(unsubscribe => {
         setTimeout(unsubscribe, 2_000);
       });
-      db$1.transaction("rw", db$1.balances, async () => await db$1.balances.filter(balance => {
-        if (balance.source !== balanceModule.type) return false;
+      db$1.balances.where({
+        source: balanceModule.type
+      }).filter(balance => {
         if (!Object.keys(addressesByModuleToken).includes(balance.tokenId)) return false;
         if (!addressesByModuleToken[balance.tokenId].includes(balance.address)) return false;
         return true;
       }).modify({
         status: "cache"
-      }));
+      });
     };
   });
   const unsubscribeAll = () => {

package/package.json

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