@talismn/balances-react 0.0.0-pr596-20230306035406 → 0.0.0-pr600-20230307002741

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @talismn/balances-react
 
-## 0.0.0-pr596-20230306035406
+## 0.0.0-pr600-20230307002741
 
 ### 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-pr596-20230306035406
-  - @talismn/balances@0.0.0-pr596-20230306035406
+  - @talismn/token-rates@0.0.0-pr600-20230307002741
+  - @talismn/balances@0.0.0-pr600-20230307002741
 
 ## 0.3.3
 

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

@@ -11,10 +11,10 @@ export * from "./useEvmNetworks";
 export * from "./useTokenRates";
 export * from "./useTokens";
 export * from "./useWithTestnets";
-import { BalanceModule } from "@talismn/balances";
+import { BalanceModule, Hydrate } from "@talismn/balances";
 import { ReactNode } from "react";
 export type BalancesProviderProps = {
-    balanceModules: Array<BalanceModule<any, any, any, any, any>>;
+    balanceModules: Array<(hydrate: Hydrate) => BalanceModule<any, any, any, any, any>>;
     onfinalityApiKey?: string;
     withTestnets?: boolean;
     children?: ReactNode;

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import { BalanceModule } from "@talismn/balances";
+import { BalanceModule, Hydrate } from "@talismn/balances";
 export type BalanceModulesProviderOptions = {
-    balanceModules: Array<BalanceModule<any, any, any, any, any>>;
+    balanceModules: Array<(hydrate: Hydrate) => BalanceModule<any, any, any, any, any>>;
 };
 export declare const BalanceModulesProvider: import("react").FC<BalanceModulesProviderOptions & {
     children?: import("react").ReactNode;

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

@@ -4,16 +4,16 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var react = require('react');
 var jsxRuntime = require('react/jsx-runtime');
+var chainConnector = require('@talismn/chain-connector');
+var chainConnectorEvm = require('@talismn/chain-connector-evm');
+var chaindataProviderExtension = require('@talismn/chaindata-provider-extension');
 var balances = require('@talismn/balances');
 var tokenRates = require('@talismn/token-rates');
 var dexieReactHooks = require('dexie-react-hooks');
 var reactUse = require('react-use');
-var chaindataProviderExtension = require('@talismn/chaindata-provider-extension');
 var md5 = require('blueimp-md5');
 var anylogger = require('anylogger');
 var rxjs = require('rxjs');
-var chainConnector = require('@talismn/chain-connector');
-var chainConnectorEvm = require('@talismn/chain-connector-evm');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -48,11 +48,6 @@ const provideContext = useProviderContext => {
 const useAllAddressesProvider = () => react.useState([]);
 const [AllAddressesProvider, useAllAddresses] = provideContext(useAllAddressesProvider);
 
-const useBalanceModulesProvider = ({
-  balanceModules
-}) => balanceModules;
-const [BalanceModulesProvider, useBalanceModules] = provideContext(useBalanceModulesProvider);
-
 function useChaindataProvider(options = {}) {
   const [onfinalityApiKey, setOnfinalityApiKey] = react.useState(options.onfinalityApiKey);
 
@@ -66,6 +61,44 @@ function useChaindataProvider(options = {}) {
 }
 const [ChaindataProvider, useChaindata] = provideContext(useChaindataProvider);
 
+function useChainConnectorsProvider(options) {
+  const [onfinalityApiKey, setOnfinalityApiKey] = react.useState(options.onfinalityApiKey);
+
+  // make sure we recreate provider only when the onfinalityApiKey changes
+  react.useEffect(() => {
+    if (options.onfinalityApiKey !== onfinalityApiKey) setOnfinalityApiKey(options.onfinalityApiKey);
+  }, [options.onfinalityApiKey, onfinalityApiKey]);
+
+  // chaindata dependency
+  const chaindata = useChaindata();
+
+  // substrate connector
+  const substrate = react.useMemo(() => new chainConnector.ChainConnector(chaindata), [chaindata]);
+
+  // evm connector
+  const evm = react.useMemo(() => new chainConnectorEvm.ChainConnectorEvm(chaindata, {
+    onfinalityApiKey
+  }), [chaindata, onfinalityApiKey]);
+  return react.useMemo(() => ({
+    substrate,
+    evm
+  }), [substrate, evm]);
+}
+const [ChainConnectorsProvider, useChainConnectors] = provideContext(useChainConnectorsProvider);
+
+const useBalanceModulesProvider = ({
+  balanceModules
+}) => {
+  const chainConnectors = useChainConnectors();
+  const chaindataProvider = useChaindata();
+  const hydrated = react.useMemo(() => chainConnectors.substrate && chainConnectors.evm && chaindataProvider ? balanceModules.map(mod => mod({
+    chainConnectors,
+    chaindataProvider
+  })) : [], [balanceModules, chainConnectors, chaindataProvider]);
+  return hydrated;
+};
+const [BalanceModulesProvider, useBalanceModules] = provideContext(useBalanceModulesProvider);
+
 const filterNoTestnet = ({
   isTestnet
 }) => isTestnet === false;
@@ -166,7 +199,7 @@ const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr596-20230306035406",
+	version: "0.0.0-pr600-20230307002741",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -280,31 +313,6 @@ const useSharedSubscription = (key, subscribe) => {
   }, [key, subscribe]);
 };
 
-function useChainConnectorsProvider(options) {
-  const [onfinalityApiKey, setOnfinalityApiKey] = react.useState(options.onfinalityApiKey);
-
-  // make sure we recreate provider only when the onfinalityApiKey changes
-  react.useEffect(() => {
-    if (options.onfinalityApiKey !== onfinalityApiKey) setOnfinalityApiKey(options.onfinalityApiKey);
-  }, [options.onfinalityApiKey, onfinalityApiKey]);
-
-  // chaindata dependency
-  const chaindata = useChaindata();
-
-  // substrate connector
-  const substrate = react.useMemo(() => new chainConnector.ChainConnector(chaindata), [chaindata]);
-
-  // evm connector
-  const evm = react.useMemo(() => new chainConnectorEvm.ChainConnectorEvm(chaindata, {
-    onfinalityApiKey
-  }), [chaindata, onfinalityApiKey]);
-  return react.useMemo(() => ({
-    substrate,
-    evm
-  }), [substrate, evm]);
-}
-const [ChainConnectorsProvider, useChainConnectors] = provideContext(useChainConnectorsProvider);
-
 function useTokens(withTestnets) {
   // keep db data up to date
   useDbCacheSubscription("tokens");
@@ -517,7 +525,7 @@ 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, chainConnectors, provider, addressesByModuleToken, (error, balances) => {
+    const unsub = balances.balances(balanceModule, addressesByModuleToken, (error, balances) => {
       // log errors
       if (error) return log.error(`Failed to fetch ${balanceModule.type} balances`, error);
       // ignore empty balance responses

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

@@ -4,16 +4,16 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var react = require('react');
 var jsxRuntime = require('react/jsx-runtime');
+var chainConnector = require('@talismn/chain-connector');
+var chainConnectorEvm = require('@talismn/chain-connector-evm');
+var chaindataProviderExtension = require('@talismn/chaindata-provider-extension');
 var balances = require('@talismn/balances');
 var tokenRates = require('@talismn/token-rates');
 var dexieReactHooks = require('dexie-react-hooks');
 var reactUse = require('react-use');
-var chaindataProviderExtension = require('@talismn/chaindata-provider-extension');
 var md5 = require('blueimp-md5');
 var anylogger = require('anylogger');
 var rxjs = require('rxjs');
-var chainConnector = require('@talismn/chain-connector');
-var chainConnectorEvm = require('@talismn/chain-connector-evm');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -48,11 +48,6 @@ const provideContext = useProviderContext => {
 const useAllAddressesProvider = () => react.useState([]);
 const [AllAddressesProvider, useAllAddresses] = provideContext(useAllAddressesProvider);
 
-const useBalanceModulesProvider = ({
-  balanceModules
-}) => balanceModules;
-const [BalanceModulesProvider, useBalanceModules] = provideContext(useBalanceModulesProvider);
-
 function useChaindataProvider(options = {}) {
   const [onfinalityApiKey, setOnfinalityApiKey] = react.useState(options.onfinalityApiKey);
 
@@ -66,6 +61,44 @@ function useChaindataProvider(options = {}) {
 }
 const [ChaindataProvider, useChaindata] = provideContext(useChaindataProvider);
 
+function useChainConnectorsProvider(options) {
+  const [onfinalityApiKey, setOnfinalityApiKey] = react.useState(options.onfinalityApiKey);
+
+  // make sure we recreate provider only when the onfinalityApiKey changes
+  react.useEffect(() => {
+    if (options.onfinalityApiKey !== onfinalityApiKey) setOnfinalityApiKey(options.onfinalityApiKey);
+  }, [options.onfinalityApiKey, onfinalityApiKey]);
+
+  // chaindata dependency
+  const chaindata = useChaindata();
+
+  // substrate connector
+  const substrate = react.useMemo(() => new chainConnector.ChainConnector(chaindata), [chaindata]);
+
+  // evm connector
+  const evm = react.useMemo(() => new chainConnectorEvm.ChainConnectorEvm(chaindata, {
+    onfinalityApiKey
+  }), [chaindata, onfinalityApiKey]);
+  return react.useMemo(() => ({
+    substrate,
+    evm
+  }), [substrate, evm]);
+}
+const [ChainConnectorsProvider, useChainConnectors] = provideContext(useChainConnectorsProvider);
+
+const useBalanceModulesProvider = ({
+  balanceModules
+}) => {
+  const chainConnectors = useChainConnectors();
+  const chaindataProvider = useChaindata();
+  const hydrated = react.useMemo(() => chainConnectors.substrate && chainConnectors.evm && chaindataProvider ? balanceModules.map(mod => mod({
+    chainConnectors,
+    chaindataProvider
+  })) : [], [balanceModules, chainConnectors, chaindataProvider]);
+  return hydrated;
+};
+const [BalanceModulesProvider, useBalanceModules] = provideContext(useBalanceModulesProvider);
+
 const filterNoTestnet = ({
   isTestnet
 }) => isTestnet === false;
@@ -166,7 +199,7 @@ const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr596-20230306035406",
+	version: "0.0.0-pr600-20230307002741",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -280,31 +313,6 @@ const useSharedSubscription = (key, subscribe) => {
   }, [key, subscribe]);
 };
 
-function useChainConnectorsProvider(options) {
-  const [onfinalityApiKey, setOnfinalityApiKey] = react.useState(options.onfinalityApiKey);
-
-  // make sure we recreate provider only when the onfinalityApiKey changes
-  react.useEffect(() => {
-    if (options.onfinalityApiKey !== onfinalityApiKey) setOnfinalityApiKey(options.onfinalityApiKey);
-  }, [options.onfinalityApiKey, onfinalityApiKey]);
-
-  // chaindata dependency
-  const chaindata = useChaindata();
-
-  // substrate connector
-  const substrate = react.useMemo(() => new chainConnector.ChainConnector(chaindata), [chaindata]);
-
-  // evm connector
-  const evm = react.useMemo(() => new chainConnectorEvm.ChainConnectorEvm(chaindata, {
-    onfinalityApiKey
-  }), [chaindata, onfinalityApiKey]);
-  return react.useMemo(() => ({
-    substrate,
-    evm
-  }), [substrate, evm]);
-}
-const [ChainConnectorsProvider, useChainConnectors] = provideContext(useChainConnectorsProvider);
-
 function useTokens(withTestnets) {
   // keep db data up to date
   useDbCacheSubscription("tokens");
@@ -517,7 +525,7 @@ 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, chainConnectors, provider, addressesByModuleToken, (error, balances) => {
+    const unsub = balances.balances(balanceModule, addressesByModuleToken, (error, balances) => {
       // log errors
       if (error) return log.error(`Failed to fetch ${balanceModule.type} balances`, error);
       // ignore empty balance responses

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

@@ -1,15 +1,15 @@
 import { useContext, createContext, useState, useEffect, useMemo, useRef, useCallback } from 'react';
 import { jsx } from 'react/jsx-runtime';
+import { ChainConnector } from '@talismn/chain-connector';
+import { ChainConnectorEvm } from '@talismn/chain-connector-evm';
+import { ChaindataProviderExtension } from '@talismn/chaindata-provider-extension';
 import { db as db$1, balances, Balances } from '@talismn/balances';
 import { db, fetchTokenRates } from '@talismn/token-rates';
 import { useLiveQuery } from 'dexie-react-hooks';
 import { useDebounce } from 'react-use';
-import { ChaindataProviderExtension } from '@talismn/chaindata-provider-extension';
 import md5 from 'blueimp-md5';
 import anylogger from 'anylogger';
 import { Subject, Observable, defer, shareReplay } from 'rxjs';
-import { ChainConnector } from '@talismn/chain-connector';
-import { ChainConnectorEvm } from '@talismn/chain-connector-evm';
 
 const provideContext = useProviderContext => {
   // automatic typing based on our hook's return type
@@ -39,11 +39,6 @@ const provideContext = useProviderContext => {
 const useAllAddressesProvider = () => useState([]);
 const [AllAddressesProvider, useAllAddresses] = provideContext(useAllAddressesProvider);
 
-const useBalanceModulesProvider = ({
-  balanceModules
-}) => balanceModules;
-const [BalanceModulesProvider, useBalanceModules] = provideContext(useBalanceModulesProvider);
-
 function useChaindataProvider(options = {}) {
   const [onfinalityApiKey, setOnfinalityApiKey] = useState(options.onfinalityApiKey);
 
@@ -57,6 +52,44 @@ function useChaindataProvider(options = {}) {
 }
 const [ChaindataProvider, useChaindata] = provideContext(useChaindataProvider);
 
+function useChainConnectorsProvider(options) {
+  const [onfinalityApiKey, setOnfinalityApiKey] = useState(options.onfinalityApiKey);
+
+  // make sure we recreate provider only when the onfinalityApiKey changes
+  useEffect(() => {
+    if (options.onfinalityApiKey !== onfinalityApiKey) setOnfinalityApiKey(options.onfinalityApiKey);
+  }, [options.onfinalityApiKey, onfinalityApiKey]);
+
+  // chaindata dependency
+  const chaindata = useChaindata();
+
+  // substrate connector
+  const substrate = useMemo(() => new ChainConnector(chaindata), [chaindata]);
+
+  // evm connector
+  const evm = useMemo(() => new ChainConnectorEvm(chaindata, {
+    onfinalityApiKey
+  }), [chaindata, onfinalityApiKey]);
+  return useMemo(() => ({
+    substrate,
+    evm
+  }), [substrate, evm]);
+}
+const [ChainConnectorsProvider, useChainConnectors] = provideContext(useChainConnectorsProvider);
+
+const useBalanceModulesProvider = ({
+  balanceModules
+}) => {
+  const chainConnectors = useChainConnectors();
+  const chaindataProvider = useChaindata();
+  const hydrated = useMemo(() => chainConnectors.substrate && chainConnectors.evm && chaindataProvider ? balanceModules.map(mod => mod({
+    chainConnectors,
+    chaindataProvider
+  })) : [], [balanceModules, chainConnectors, chaindataProvider]);
+  return hydrated;
+};
+const [BalanceModulesProvider, useBalanceModules] = provideContext(useBalanceModulesProvider);
+
 const filterNoTestnet = ({
   isTestnet
 }) => isTestnet === false;
@@ -157,7 +190,7 @@ const [DbCacheProvider, useDbCache] = provideContext(useDbCacheProvider);
 
 var packageJson = {
 	name: "@talismn/balances-react",
-	version: "0.0.0-pr596-20230306035406",
+	version: "0.0.0-pr600-20230307002741",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -271,31 +304,6 @@ const useSharedSubscription = (key, subscribe) => {
   }, [key, subscribe]);
 };
 
-function useChainConnectorsProvider(options) {
-  const [onfinalityApiKey, setOnfinalityApiKey] = useState(options.onfinalityApiKey);
-
-  // make sure we recreate provider only when the onfinalityApiKey changes
-  useEffect(() => {
-    if (options.onfinalityApiKey !== onfinalityApiKey) setOnfinalityApiKey(options.onfinalityApiKey);
-  }, [options.onfinalityApiKey, onfinalityApiKey]);
-
-  // chaindata dependency
-  const chaindata = useChaindata();
-
-  // substrate connector
-  const substrate = useMemo(() => new ChainConnector(chaindata), [chaindata]);
-
-  // evm connector
-  const evm = useMemo(() => new ChainConnectorEvm(chaindata, {
-    onfinalityApiKey
-  }), [chaindata, onfinalityApiKey]);
-  return useMemo(() => ({
-    substrate,
-    evm
-  }), [substrate, evm]);
-}
-const [ChainConnectorsProvider, useChainConnectors] = provideContext(useChainConnectorsProvider);
-
 function useTokens(withTestnets) {
   // keep db data up to date
   useDbCacheSubscription("tokens");
@@ -508,7 +516,7 @@ const subscribeBalances = (tokens, addresses, chainConnectors, provider, balance
       id
     }) => id);
     const addressesByModuleToken = Object.fromEntries(Object.entries(addressesByToken).filter(([tokenId]) => moduleTokenIds.includes(tokenId)));
-    const unsub = balances(balanceModule, chainConnectors, provider, addressesByModuleToken, (error, balances) => {
+    const unsub = balances(balanceModule, addressesByModuleToken, (error, balances) => {
       // log errors
       if (error) return log.error(`Failed to fetch ${balanceModule.type} balances`, error);
       // ignore empty balance responses

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances-react",
-  "version": "0.0.0-pr596-20230306035406",
+  "version": "0.0.0-pr600-20230307002741",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "UNLICENSED",
@@ -26,12 +26,12 @@
     "clean": "rm -rf dist && rm -rf .turbo rm -rf node_modules"
   },
   "dependencies": {
-    "@talismn/balances": "^0.0.0-pr596-20230306035406",
+    "@talismn/balances": "^0.0.0-pr600-20230307002741",
     "@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-pr596-20230306035406",
+    "@talismn/token-rates": "^0.0.0-pr600-20230307002741",
     "anylogger": "^1.0.11",
     "blueimp-md5": "2.19.0",
     "dexie": "^3.2.3",