@talismn/balances-react 0.0.0-pr643-20230322031130 → 0.0.0-pr645-20230322061321

package/CHANGELOG.md

@@ -1,27 +1,28 @@
 # @talismn/balances-react
 
-## 0.0.0-pr643-20230322031130
+## 0.0.0-pr645-20230322061321
 
 ### Minor Changes
 
-- a696909: refactor: tweaks to trigger less balance subscription resets
+- a6969098: refactor: tweaks to trigger less balance subscription resets
 
 ### Patch Changes
 
-- 3068bd6: feat: stale balances and exponential rpc backoff
-- 6643a4e: fix: tokenRates in @talismn/balances-react
-- 6643a4e: fix: ported useDbCache related perf fixes to @talismn/balances-react
-- Updated dependencies [3068bd6]
-- Updated dependencies [6643a4e]
-- Updated dependencies [79f6ccf]
-- Updated dependencies [6643a4e]
-  - @talismn/chain-connector@0.0.0-pr643-20230322031130
-  - @talismn/connection-meta@0.0.0-pr643-20230322031130
-  - @talismn/balances@0.0.0-pr643-20230322031130
-  - @talismn/token-rates@0.0.0-pr643-20230322031130
-  - @talismn/chaindata-provider-extension@0.0.0-pr643-20230322031130
-  - @talismn/chaindata-provider@0.0.0-pr643-20230322031130
-  - @talismn/chain-connector-evm@0.0.0-pr643-20230322031130
+- 3068bd60: feat: stale balances and exponential rpc backoff
+- 6643a4e4: fix: tokenRates in @talismn/balances-react
+- 6643a4e4: fix: ported useDbCache related perf fixes to @talismn/balances-react
+- Updated dependencies [3068bd60]
+- Updated dependencies [6643a4e4]
+- Updated dependencies [79f6ccf6]
+- Updated dependencies [6643a4e4]
+- Updated dependencies [c24dc1fb]
+  - @talismn/chain-connector@0.0.0-pr645-20230322061321
+  - @talismn/connection-meta@0.0.0-pr645-20230322061321
+  - @talismn/balances@0.0.0-pr645-20230322061321
+  - @talismn/token-rates@0.0.0-pr645-20230322061321
+  - @talismn/chaindata-provider-extension@0.0.0-pr645-20230322061321
+  - @talismn/chaindata-provider@0.0.0-pr645-20230322061321
+  - @talismn/chain-connector-evm@0.0.0-pr645-20230322061321
 
 ## 0.3.3
 

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

@@ -174,9 +174,9 @@ const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, al
 };
 const useDbCacheProvider = () => {
   const chaindataProvider = useChaindata();
-  const chainList = dexieReactHooks.useLiveQuery(() => chaindataProvider === null || chaindataProvider === void 0 ? void 0 : chaindataProvider.chains(), [chaindataProvider]);
-  const evmNetworkList = dexieReactHooks.useLiveQuery(() => chaindataProvider === null || chaindataProvider === void 0 ? void 0 : chaindataProvider.evmNetworks(), [chaindataProvider]);
-  const tokenList = dexieReactHooks.useLiveQuery(() => chaindataProvider === null || chaindataProvider === void 0 ? void 0 : chaindataProvider.tokens(), [chaindataProvider]);
+  const chainList = dexieReactHooks.useLiveQuery(() => chaindataProvider?.chains(), [chaindataProvider]);
+  const evmNetworkList = dexieReactHooks.useLiveQuery(() => chaindataProvider?.evmNetworks(), [chaindataProvider]);
+  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 [dbData, setDbData] = react.useState(DEFAULT_VALUE);
@@ -200,7 +200,7 @@ const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr643-20230322031130",
+	version: "0.0.0-pr645-20230322061321",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -218,7 +218,7 @@ var packageJson = {
 		"/dist"
 	],
 	engines: {
-		node: ">=14"
+		node: ">=18"
 	},
 	scripts: {
 		test: "jest",
@@ -236,7 +236,7 @@ var packageJson = {
 		anylogger: "^1.0.11",
 		"blueimp-md5": "2.19.0",
 		dexie: "^3.2.3",
-		"dexie-react-hooks": "^1.1.1",
+		"dexie-react-hooks": "^1.1.3",
 		"react-use": "^17.4.0",
 		rxjs: "^7.8.0"
 	},
@@ -315,20 +315,6 @@ const useSharedSubscription = (key, subscribe) => {
   }, [key, subscribe]);
 };
 
-function useTokens(withTestnets) {
-  // keep db data up to date
-  useDbCacheSubscription("tokens");
-  const {
-    tokensWithTestnetsMap,
-    tokensWithoutTestnetsMap
-  } = useDbCache();
-  return withTestnets ? tokensWithTestnetsMap : tokensWithoutTestnetsMap;
-}
-function useToken(tokenId, withTestnets) {
-  const tokens = useTokens(withTestnets);
-  return tokenId ? tokens[tokenId] : undefined;
-}
-
 /**
  * Creates a subscription function that can be used to subscribe to a multicast observable created from an upstream source.
  *
@@ -406,7 +392,7 @@ function useDbCacheTokenRatesSubscription() {
   const {
     withTestnets
   } = useWithTestnets();
-  const tokens = useTokens(withTestnets);
+  const tokens = useTokens$1(withTestnets);
   const subscriptionKey = react.useMemo(
   // not super sexy but we need key to change based on this stuff
   () => {
@@ -433,7 +419,7 @@ function useDbCacheBalancesSubscription() {
   const chaindataProvider = useChaindata();
   const chainConnectors = useChainConnectors();
   const [allAddresses] = useAllAddresses();
-  const tokens = useTokens(withTestnets);
+  const tokens = useTokens$1(withTestnets);
   const subscriptionKey = react.useMemo(
   // not super sexy but we need key to change based on this stuff
   () => {
@@ -448,6 +434,15 @@ function useDbCacheBalancesSubscription() {
   }, [allAddresses, balanceModules, tokens]);
   useSharedSubscription(subscriptionKey, subscription);
 }
+
+// subscriptionless version of useTokens, prevents circular dependency
+const useTokens$1 = withTestnets => {
+  const {
+    tokensWithTestnetsMap,
+    tokensWithoutTestnetsMap
+  } = useDbCache();
+  return withTestnets ? tokensWithTestnetsMap : tokensWithoutTestnetsMap;
+};
 const subscribeChainDataHydrate = (provider, type) => {
   const chaindata = provider;
   const delay = 300_000; // 300_000ms = 300s = 5 minutes
@@ -530,7 +525,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
     const unsub = balances.balances(balanceModule, addressesByModuleToken, (error, balances$1) => {
       // log errors
       if (error) {
-        if ((error === null || error === void 0 ? void 0 : error.type) === "STALE_RPC_ERROR") return balances.db.balances.where({
+        if (error?.type === "STALE_RPC_ERROR") return balances.db.balances.where({
           source: balanceModule.type,
           chainId: error.chainId
         }).filter(balance => {
@@ -612,6 +607,20 @@ function useTokenRate(tokenId) {
   return tokenId ? tokenRates[tokenId] : undefined;
 }
 
+function useTokens(withTestnets) {
+  // keep db data up to date
+  useDbCacheSubscription("tokens");
+  const {
+    tokensWithTestnetsMap,
+    tokensWithoutTestnetsMap
+  } = useDbCache();
+  return withTestnets ? tokensWithTestnetsMap : tokensWithoutTestnetsMap;
+}
+function useToken(tokenId, withTestnets) {
+  const tokens = useTokens(withTestnets);
+  return tokenId ? tokens[tokenId] : undefined;
+}
+
 const useBalancesHydrate = () => {
   const {
     withTestnets
@@ -685,10 +694,7 @@ const useBalancesStatus = (balances, isLoadingLocks) => react.useMemo(() => {
     status: "live"
   };
 }, [balances, isLoadingLocks]);
-const getStaleChains = balances => [...new Set(balances.sorted.filter(b => b.status === "stale").map(b => {
-  var _b$chain;
-  return ((_b$chain = b.chain) === null || _b$chain === void 0 ? void 0 : _b$chain.name) ?? b.chainId ?? "Unknown";
-}))];
+const getStaleChains = balances => [...new Set(balances.sorted.filter(b => b.status === "stale").map(b => b.chain?.name ?? b.chainId ?? "Unknown"))];
 
 const BalancesProvider = ({
   balanceModules,

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

@@ -174,9 +174,9 @@ const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, al
 };
 const useDbCacheProvider = () => {
   const chaindataProvider = useChaindata();
-  const chainList = dexieReactHooks.useLiveQuery(() => chaindataProvider === null || chaindataProvider === void 0 ? void 0 : chaindataProvider.chains(), [chaindataProvider]);
-  const evmNetworkList = dexieReactHooks.useLiveQuery(() => chaindataProvider === null || chaindataProvider === void 0 ? void 0 : chaindataProvider.evmNetworks(), [chaindataProvider]);
-  const tokenList = dexieReactHooks.useLiveQuery(() => chaindataProvider === null || chaindataProvider === void 0 ? void 0 : chaindataProvider.tokens(), [chaindataProvider]);
+  const chainList = dexieReactHooks.useLiveQuery(() => chaindataProvider?.chains(), [chaindataProvider]);
+  const evmNetworkList = dexieReactHooks.useLiveQuery(() => chaindataProvider?.evmNetworks(), [chaindataProvider]);
+  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 [dbData, setDbData] = react.useState(DEFAULT_VALUE);
@@ -200,7 +200,7 @@ const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr643-20230322031130",
+	version: "0.0.0-pr645-20230322061321",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -218,7 +218,7 @@ var packageJson = {
 		"/dist"
 	],
 	engines: {
-		node: ">=14"
+		node: ">=18"
 	},
 	scripts: {
 		test: "jest",
@@ -236,7 +236,7 @@ var packageJson = {
 		anylogger: "^1.0.11",
 		"blueimp-md5": "2.19.0",
 		dexie: "^3.2.3",
-		"dexie-react-hooks": "^1.1.1",
+		"dexie-react-hooks": "^1.1.3",
 		"react-use": "^17.4.0",
 		rxjs: "^7.8.0"
 	},
@@ -315,20 +315,6 @@ const useSharedSubscription = (key, subscribe) => {
   }, [key, subscribe]);
 };
 
-function useTokens(withTestnets) {
-  // keep db data up to date
-  useDbCacheSubscription("tokens");
-  const {
-    tokensWithTestnetsMap,
-    tokensWithoutTestnetsMap
-  } = useDbCache();
-  return withTestnets ? tokensWithTestnetsMap : tokensWithoutTestnetsMap;
-}
-function useToken(tokenId, withTestnets) {
-  const tokens = useTokens(withTestnets);
-  return tokenId ? tokens[tokenId] : undefined;
-}
-
 /**
  * Creates a subscription function that can be used to subscribe to a multicast observable created from an upstream source.
  *
@@ -406,7 +392,7 @@ function useDbCacheTokenRatesSubscription() {
   const {
     withTestnets
   } = useWithTestnets();
-  const tokens = useTokens(withTestnets);
+  const tokens = useTokens$1(withTestnets);
   const subscriptionKey = react.useMemo(
   // not super sexy but we need key to change based on this stuff
   () => {
@@ -433,7 +419,7 @@ function useDbCacheBalancesSubscription() {
   const chaindataProvider = useChaindata();
   const chainConnectors = useChainConnectors();
   const [allAddresses] = useAllAddresses();
-  const tokens = useTokens(withTestnets);
+  const tokens = useTokens$1(withTestnets);
   const subscriptionKey = react.useMemo(
   // not super sexy but we need key to change based on this stuff
   () => {
@@ -448,6 +434,15 @@ function useDbCacheBalancesSubscription() {
   }, [allAddresses, balanceModules, tokens]);
   useSharedSubscription(subscriptionKey, subscription);
 }
+
+// subscriptionless version of useTokens, prevents circular dependency
+const useTokens$1 = withTestnets => {
+  const {
+    tokensWithTestnetsMap,
+    tokensWithoutTestnetsMap
+  } = useDbCache();
+  return withTestnets ? tokensWithTestnetsMap : tokensWithoutTestnetsMap;
+};
 const subscribeChainDataHydrate = (provider, type) => {
   const chaindata = provider;
   const delay = 300_000; // 300_000ms = 300s = 5 minutes
@@ -530,7 +525,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
     const unsub = balances.balances(balanceModule, addressesByModuleToken, (error, balances$1) => {
       // log errors
       if (error) {
-        if ((error === null || error === void 0 ? void 0 : error.type) === "STALE_RPC_ERROR") return balances.db.balances.where({
+        if (error?.type === "STALE_RPC_ERROR") return balances.db.balances.where({
           source: balanceModule.type,
           chainId: error.chainId
         }).filter(balance => {
@@ -612,6 +607,20 @@ function useTokenRate(tokenId) {
   return tokenId ? tokenRates[tokenId] : undefined;
 }
 
+function useTokens(withTestnets) {
+  // keep db data up to date
+  useDbCacheSubscription("tokens");
+  const {
+    tokensWithTestnetsMap,
+    tokensWithoutTestnetsMap
+  } = useDbCache();
+  return withTestnets ? tokensWithTestnetsMap : tokensWithoutTestnetsMap;
+}
+function useToken(tokenId, withTestnets) {
+  const tokens = useTokens(withTestnets);
+  return tokenId ? tokens[tokenId] : undefined;
+}
+
 const useBalancesHydrate = () => {
   const {
     withTestnets
@@ -685,10 +694,7 @@ const useBalancesStatus = (balances, isLoadingLocks) => react.useMemo(() => {
     status: "live"
   };
 }, [balances, isLoadingLocks]);
-const getStaleChains = balances => [...new Set(balances.sorted.filter(b => b.status === "stale").map(b => {
-  var _b$chain;
-  return ((_b$chain = b.chain) === null || _b$chain === void 0 ? void 0 : _b$chain.name) ?? b.chainId ?? "Unknown";
-}))];
+const getStaleChains = balances => [...new Set(balances.sorted.filter(b => b.status === "stale").map(b => b.chain?.name ?? b.chainId ?? "Unknown"))];
 
 const BalancesProvider = ({
   balanceModules,

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

@@ -165,9 +165,9 @@ const consolidateDbCache = (chainsMap, evmNetworksMap, tokensMap, tokenRates, al
 };
 const useDbCacheProvider = () => {
   const chaindataProvider = useChaindata();
-  const chainList = useLiveQuery(() => chaindataProvider === null || chaindataProvider === void 0 ? void 0 : chaindataProvider.chains(), [chaindataProvider]);
-  const evmNetworkList = useLiveQuery(() => chaindataProvider === null || chaindataProvider === void 0 ? void 0 : chaindataProvider.evmNetworks(), [chaindataProvider]);
-  const tokenList = useLiveQuery(() => chaindataProvider === null || chaindataProvider === void 0 ? void 0 : chaindataProvider.tokens(), [chaindataProvider]);
+  const chainList = useLiveQuery(() => chaindataProvider?.chains(), [chaindataProvider]);
+  const evmNetworkList = useLiveQuery(() => chaindataProvider?.evmNetworks(), [chaindataProvider]);
+  const tokenList = useLiveQuery(() => chaindataProvider?.tokens(), [chaindataProvider]);
   const tokenRates = useLiveQuery(() => db.tokenRates.toArray(), []);
   const rawBalances = useLiveQuery(() => db$1.balances.toArray(), []);
   const [dbData, setDbData] = useState(DEFAULT_VALUE);
@@ -191,7 +191,7 @@ const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr643-20230322031130",
+	version: "0.0.0-pr645-20230322061321",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -209,7 +209,7 @@ var packageJson = {
 		"/dist"
 	],
 	engines: {
-		node: ">=14"
+		node: ">=18"
 	},
 	scripts: {
 		test: "jest",
@@ -227,7 +227,7 @@ var packageJson = {
 		anylogger: "^1.0.11",
 		"blueimp-md5": "2.19.0",
 		dexie: "^3.2.3",
-		"dexie-react-hooks": "^1.1.1",
+		"dexie-react-hooks": "^1.1.3",
 		"react-use": "^17.4.0",
 		rxjs: "^7.8.0"
 	},
@@ -306,20 +306,6 @@ const useSharedSubscription = (key, subscribe) => {
   }, [key, subscribe]);
 };
 
-function useTokens(withTestnets) {
-  // keep db data up to date
-  useDbCacheSubscription("tokens");
-  const {
-    tokensWithTestnetsMap,
-    tokensWithoutTestnetsMap
-  } = useDbCache();
-  return withTestnets ? tokensWithTestnetsMap : tokensWithoutTestnetsMap;
-}
-function useToken(tokenId, withTestnets) {
-  const tokens = useTokens(withTestnets);
-  return tokenId ? tokens[tokenId] : undefined;
-}
-
 /**
  * Creates a subscription function that can be used to subscribe to a multicast observable created from an upstream source.
  *
@@ -397,7 +383,7 @@ function useDbCacheTokenRatesSubscription() {
   const {
     withTestnets
   } = useWithTestnets();
-  const tokens = useTokens(withTestnets);
+  const tokens = useTokens$1(withTestnets);
   const subscriptionKey = useMemo(
   // not super sexy but we need key to change based on this stuff
   () => {
@@ -424,7 +410,7 @@ function useDbCacheBalancesSubscription() {
   const chaindataProvider = useChaindata();
   const chainConnectors = useChainConnectors();
   const [allAddresses] = useAllAddresses();
-  const tokens = useTokens(withTestnets);
+  const tokens = useTokens$1(withTestnets);
   const subscriptionKey = useMemo(
   // not super sexy but we need key to change based on this stuff
   () => {
@@ -439,6 +425,15 @@ function useDbCacheBalancesSubscription() {
   }, [allAddresses, balanceModules, tokens]);
   useSharedSubscription(subscriptionKey, subscription);
 }
+
+// subscriptionless version of useTokens, prevents circular dependency
+const useTokens$1 = withTestnets => {
+  const {
+    tokensWithTestnetsMap,
+    tokensWithoutTestnetsMap
+  } = useDbCache();
+  return withTestnets ? tokensWithTestnetsMap : tokensWithoutTestnetsMap;
+};
 const subscribeChainDataHydrate = (provider, type) => {
   const chaindata = provider;
   const delay = 300_000; // 300_000ms = 300s = 5 minutes
@@ -521,7 +516,7 @@ const subscribeBalances = (tokens, addresses, balanceModules) => {
     const unsub = balances(balanceModule, addressesByModuleToken, (error, balances) => {
       // log errors
       if (error) {
-        if ((error === null || error === void 0 ? void 0 : error.type) === "STALE_RPC_ERROR") return db$1.balances.where({
+        if (error?.type === "STALE_RPC_ERROR") return db$1.balances.where({
           source: balanceModule.type,
           chainId: error.chainId
         }).filter(balance => {
@@ -603,6 +598,20 @@ function useTokenRate(tokenId) {
   return tokenId ? tokenRates[tokenId] : undefined;
 }
 
+function useTokens(withTestnets) {
+  // keep db data up to date
+  useDbCacheSubscription("tokens");
+  const {
+    tokensWithTestnetsMap,
+    tokensWithoutTestnetsMap
+  } = useDbCache();
+  return withTestnets ? tokensWithTestnetsMap : tokensWithoutTestnetsMap;
+}
+function useToken(tokenId, withTestnets) {
+  const tokens = useTokens(withTestnets);
+  return tokenId ? tokens[tokenId] : undefined;
+}
+
 const useBalancesHydrate = () => {
   const {
     withTestnets
@@ -676,10 +685,7 @@ const useBalancesStatus = (balances, isLoadingLocks) => useMemo(() => {
     status: "live"
   };
 }, [balances, isLoadingLocks]);
-const getStaleChains = balances => [...new Set(balances.sorted.filter(b => b.status === "stale").map(b => {
-  var _b$chain;
-  return ((_b$chain = b.chain) === null || _b$chain === void 0 ? void 0 : _b$chain.name) ?? b.chainId ?? "Unknown";
-}))];
+const getStaleChains = balances => [...new Set(balances.sorted.filter(b => b.status === "stale").map(b => b.chain?.name ?? b.chainId ?? "Unknown"))];
 
 const BalancesProvider = ({
   balanceModules,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances-react",
-  "version": "0.0.0-pr643-20230322031130",
+  "version": "0.0.0-pr645-20230322061321",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "UNLICENSED",
@@ -18,7 +18,7 @@
     "/dist"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "scripts": {
     "test": "jest",
@@ -26,17 +26,17 @@
     "clean": "rm -rf dist && rm -rf .turbo rm -rf node_modules"
   },
   "dependencies": {
-    "@talismn/balances": "^0.0.0-pr643-20230322031130",
-    "@talismn/chain-connector": "^0.0.0-pr643-20230322031130",
-    "@talismn/chain-connector-evm": "^0.0.0-pr643-20230322031130",
-    "@talismn/chaindata-provider": "^0.0.0-pr643-20230322031130",
-    "@talismn/chaindata-provider-extension": "^0.0.0-pr643-20230322031130",
-    "@talismn/connection-meta": "^0.0.0-pr643-20230322031130",
-    "@talismn/token-rates": "^0.0.0-pr643-20230322031130",
+    "@talismn/balances": "^0.0.0-pr645-20230322061321",
+    "@talismn/chain-connector": "^0.0.0-pr645-20230322061321",
+    "@talismn/chain-connector-evm": "^0.0.0-pr645-20230322061321",
+    "@talismn/chaindata-provider": "^0.0.0-pr645-20230322061321",
+    "@talismn/chaindata-provider-extension": "^0.0.0-pr645-20230322061321",
+    "@talismn/connection-meta": "^0.0.0-pr645-20230322061321",
+    "@talismn/token-rates": "^0.0.0-pr645-20230322061321",
     "anylogger": "^1.0.11",
     "blueimp-md5": "2.19.0",
     "dexie": "^3.2.3",
-    "dexie-react-hooks": "^1.1.1",
+    "dexie-react-hooks": "^1.1.3",
     "react-use": "^17.4.0",
     "rxjs": "^7.8.0"
   },