@reef-knot/web3-react 1.0.0 → 1.0.2

package/dist/context/connectors.d.ts

@@ -1,4 +1,4 @@
-import { FC } from 'react';
+import React from 'react';
 import { InjectedConnector } from '@web3-react/injected-connector';
 import { WalletLinkConnector } from '@web3-react/walletlink-connector';
 import { SafeAppConnector } from '@gnosis.pm/safe-apps-web3-react';
@@ -20,7 +20,7 @@ export type ConnectorsContextValue = {
     gnosis?: SafeAppConnector;
 };
 export type Connector = keyof ConnectorsContextValue;
-export declare const ConnectorsContext: import("react").Context<ConnectorsContextValue>;
-declare const _default: import("react").MemoExoticComponent<FC<ConnectorsContextProps>>;
+export declare const ConnectorsContext: React.Context<ConnectorsContextValue>;
+declare const _default: React.MemoExoticComponent<React.FC<ConnectorsContextProps>>;
 export default _default;
 //# sourceMappingURL=connectors.d.ts.map

package/dist/context/connectors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connectors.d.ts","sourceRoot":"","sources":["../../src/context/connectors.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAiB,EAAE,EAAiB,MAAM,OAAO,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAK5D,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,UAAU,EAAE,mBAAmB,CAAC;IAChC,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,UAAU,EAAE,sBAAsB,CAAC;IACnC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,MAAM,CAAC,EAAE,gBAAgB,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC;AAErD,eAAO,MAAM,iBAAiB,iDAA8C,CAAC;;AA+E7E,wBAAoE"}
+{"version":3,"file":"connectors.d.ts","sourceRoot":"","sources":["../../src/context/connectors.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAK5D,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,UAAU,EAAE,mBAAmB,CAAC;IAChC,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,UAAU,EAAE,sBAAsB,CAAC;IACnC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,MAAM,CAAC,EAAE,gBAAgB,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC;AAErD,eAAO,MAAM,iBAAiB,uCAA8C,CAAC;;AA+E7E,wBAAoE"}

package/dist/context/connectors.js

@@ -1,5 +1,4 @@
-import { jsx } from 'react/jsx-runtime';
-import { memo, createContext, useMemo } from 'react';
+import React, { memo, createContext, useMemo } from 'react';
 import { InjectedConnector } from '@web3-react/injected-connector';
 import { WalletLinkConnector } from '@web3-react/walletlink-connector';
 import { SafeAppConnector } from '@gnosis.pm/safe-apps-web3-react';
@@ -68,11 +67,9 @@ var ProviderConnectors = props => {
     })
   }), [appLogoUrl, appName, rpc, defaultChainId, supportedChainIds]);
   useAutoConnect(connectors);
-  return jsx(ConnectorsContext.Provider, Object.assign({
+  return /*#__PURE__*/React.createElement(ConnectorsContext.Provider, {
     value: connectors
-  }, {
-    children: children
-  }));
+  }, children);
 };
 const ProviderConnectors$1 = /*#__PURE__*/memo(ProviderConnectors);
 

package/dist/context/web3.d.ts

@@ -1,4 +1,4 @@
-import { FC } from 'react';
+import React from 'react';
 import { CHAINS } from '@lido-sdk/constants';
 import { SWRConfiguration } from 'swr';
 import { ConnectorsContextProps } from './connectors';
@@ -9,6 +9,6 @@ export interface ProviderWeb3Props extends ConnectorsContextProps {
     pollingInterval?: number;
     onError?: (error: unknown) => void;
 }
-declare const _default: import("react").MemoExoticComponent<FC<ProviderWeb3Props>>;
+declare const _default: React.MemoExoticComponent<React.FC<ProviderWeb3Props>>;
 export default _default;
 //# sourceMappingURL=web3.d.ts.map

package/dist/context/web3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web3.d.ts","sourceRoot":"","sources":["../../src/context/web3.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAQ,EAAE,EAAE,MAAM,OAAO,CAAC;AAOjC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAI7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAEvC,OAA2B,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAE1E,MAAM,WAAW,iBAAkB,SAAQ,sBAAsB;IAC/D,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC;;AAiED,wBAAyD"}
+{"version":3,"file":"web3.d.ts","sourceRoot":"","sources":["../../src/context/web3.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAOxC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAI7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAEvC,OAA2B,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAE1E,MAAM,WAAW,iBAAkB,SAAQ,sBAAsB;IAC/D,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC;;AAiED,wBAAyD"}

package/dist/context/web3.js

@@ -1,6 +1,5 @@
 import { __rest } from '../_virtual/_tslib.js';
-import { jsx } from 'react/jsx-runtime';
-import { memo } from 'react';
+import React, { memo } from 'react';
 import invariant from 'tiny-invariant';
 import { Web3Provider } from '@ethersproject/providers';
 import { CHAINS } from '@lido-sdk/constants';
@@ -34,16 +33,14 @@ var ProviderSDK = props => {
   invariant(rpc[CHAINS.Mainnet], 'RPC url for mainnet is not provided');
   var providerRpc = getStaticRpcBatchProvider(chainId, rpc[chainId], 0, pollingInterval);
   var providerMainnetRpc = getStaticRpcBatchProvider(CHAINS.Mainnet, rpc[CHAINS.Mainnet], 0, pollingInterval);
-  return jsx(ProviderSDK$1, Object.assign({
+  return /*#__PURE__*/React.createElement(ProviderSDK$1, Object.assign({
     chainId: chainId,
     supportedChainIds: supportedChainIds,
     providerWeb3: library,
     providerRpc: providerRpc,
     providerMainnetRpc: providerMainnetRpc,
     account: account !== null && account !== void 0 ? account : undefined
-  }, rest, {
-    children: children
-  }));
+  }, rest), children);
 };
 var ProviderWeb3 = props => {
   var {
@@ -62,17 +59,11 @@ var ProviderWeb3 = props => {
     appLogoUrl,
     defaultChainId
   };
-  return jsx(Web3ReactProvider, Object.assign({
+  return /*#__PURE__*/React.createElement(Web3ReactProvider, {
     getLibrary: getLibrary
-  }, {
-    children: jsx(ProviderSDK, Object.assign({
-      rpc: rpc
-    }, sdkProps, {
-      children: jsx(ProviderConnectors, Object.assign({}, connectorsProps, {
-        children: children
-      }))
-    }))
-  }));
+  }, /*#__PURE__*/React.createElement(ProviderSDK, Object.assign({
+    rpc: rpc
+  }, sdkProps), /*#__PURE__*/React.createElement(ProviderConnectors, Object.assign({}, connectorsProps), children)));
 };
 const web3 = /*#__PURE__*/memo(ProviderWeb3);
 

package/dist/hooks/useConnectors.js

@@ -1,5 +1,4 @@
 import { useContext } from 'react';
-import 'react/jsx-runtime';
 import 'tiny-invariant';
 import '@ethersproject/providers';
 import '@lido-sdk/constants';

package/dist/hooks/useSupportedChains.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSupportedChains.d.ts","sourceRoot":"","sources":["../../src/hooks/useSupportedChains.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAK/D,eAAO,MAAM,kBAAkB;mBACd,OAAO;qBACL,OAAO,EAAE;CAe3B,CAAC"}
+{"version":3,"file":"useSupportedChains.d.ts","sourceRoot":"","sources":["../../src/hooks/useSupportedChains.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAM/D,eAAO,MAAM,kBAAkB;mBACd,OAAO;qBACL,OAAO,EAAE;CAsC3B,CAAC"}

package/dist/hooks/useSupportedChains.js

@@ -1,20 +1,41 @@
 import { useMemo } from 'react';
 import { getNetwork } from '@ethersproject/providers';
+import { useNetwork } from 'wagmi';
 import { useWeb3 } from './useWeb3.js';
 import { UnsupportedChainIdError } from '@web3-react/core';
 
 var STABLE_ARRAY = [];
 var useSupportedChains = () => {
-  var _a;
+  var supportedIds = STABLE_ARRAY;
+  var isUnsupported;
+  // legacy web3-react data
   var {
     error,
     connector
   } = useWeb3();
-  var supportedIds = (_a = connector === null || connector === void 0 ? void 0 : connector.supportedChainIds) !== null && _a !== void 0 ? _a : STABLE_ARRAY;
+  // wagmi data
+  var {
+    chain,
+    chains
+  } = useNetwork();
+  var wagmiSupportedChainIds = useMemo(() => chains.map(c => c.id), [chains]);
+  // add chain ids from legacy web3-react connector
+  if (connector === null || connector === void 0 ? void 0 : connector.supportedChainIds) {
+    supportedIds = connector.supportedChainIds;
+  }
+  // add wagmi chain ids too
+  if (wagmiSupportedChainIds.length > 0) {
+    supportedIds = [...supportedIds, ...wagmiSupportedChainIds];
+    supportedIds = [...new Set(supportedIds)]; // deduplicate ids
+  }
+
   var supportedChains = useMemo(() => {
     return supportedIds.map(chainId => getNetwork(chainId));
   }, [supportedIds]);
-  var isUnsupported = error instanceof UnsupportedChainIdError;
+  // legacy web3-react check
+  isUnsupported = error instanceof UnsupportedChainIdError;
+  // wagmi check
+  isUnsupported = isUnsupported || !!(chain === null || chain === void 0 ? void 0 : chain.unsupported);
   return {
     isUnsupported,
     supportedChains

package/dist/hooks/useWeb3.d.ts

@@ -1,4 +1,4 @@
-import { useWeb3React } from '@web3-react/core';
+import { Web3ReactContextInterface } from '@web3-react/core/dist/types';
 export { UnsupportedChainIdError } from '@web3-react/core';
-export declare const useWeb3: typeof useWeb3React;
+export declare function useWeb3<T = any>(key?: string): Web3ReactContextInterface<T>;
 //# sourceMappingURL=useWeb3.d.ts.map

package/dist/hooks/useWeb3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useWeb3.d.ts","sourceRoot":"","sources":["../../src/hooks/useWeb3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,eAAO,MAAM,OAAO,qBAAe,CAAC"}
+{"version":3,"file":"useWeb3.d.ts","sourceRoot":"","sources":["../../src/hooks/useWeb3.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAGxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAG3D,wBAAgB,OAAO,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAAC,CAAC,CAAC,CA6B3E"}

package/dist/hooks/useWeb3.js

@@ -1,6 +1,28 @@
 import { useWeb3React } from '@web3-react/core';
 export { UnsupportedChainIdError } from '@web3-react/core';
+import { useAccount, useNetwork, useConnect } from 'wagmi';
 
-var useWeb3 = useWeb3React;
+// Shimming useWeb3React hook to also use data returned from wagmi
+function useWeb3(key) {
+  var _a;
+  var web3ReactData = useWeb3React();
+  var wagmiAccount = useAccount();
+  var wagmiNetwork = useNetwork();
+  var {
+    error: wagmiError
+  } = useConnect();
+  var account = web3ReactData.account || (wagmiAccount === null || wagmiAccount === void 0 ? void 0 : wagmiAccount.address);
+  var active = web3ReactData.active || (wagmiAccount === null || wagmiAccount === void 0 ? void 0 : wagmiAccount.isConnected);
+  var chainId = web3ReactData.chainId || ((_a = wagmiNetwork === null || wagmiNetwork === void 0 ? void 0 : wagmiNetwork.chain) === null || _a === void 0 ? void 0 : _a.id);
+  // wagmi and web3-react use the same Error type
+  // wagmi is first here because it can be null, but we need Error | undefined
+  var error = wagmiError || web3ReactData.error;
+  return Object.assign(Object.assign({}, web3ReactData), {
+    chainId,
+    account,
+    active,
+    error
+  });
+}
 
 export { useWeb3 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/web3-react",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {