Commit 4c966caa authored by Zach Pomerantz's avatar Zach Pomerantz Committed by GitHub

feat: accept {provider, signer} as ethers provider (#3314)

parent a60ea703
import { initializeConnector, Web3ReactHooks } from '@web3-react/core' import { initializeConnector, Web3ReactHooks } from '@web3-react/core'
import { EIP1193 } from '@web3-react/eip1193' import { EIP1193 } from '@web3-react/eip1193'
import { Actions, Connector, Provider as EthProvider } from '@web3-react/types' import { Actions, Connector, Provider as Eip1193Provider } from '@web3-react/types'
import { Url } from '@web3-react/url' import { Url } from '@web3-react/url'
import { SetStateAction } from 'jotai' import { SetStateAction } from 'jotai'
import { RESET, useUpdateAtom } from 'jotai/utils' import { RESET, useUpdateAtom } from 'jotai/utils'
...@@ -9,7 +9,7 @@ import { ReactNode, useEffect } from 'react' ...@@ -9,7 +9,7 @@ import { ReactNode, useEffect } from 'react'
interface Web3ProviderProps { interface Web3ProviderProps {
jsonRpcEndpoint?: string jsonRpcEndpoint?: string
provider?: EthProvider provider?: Eip1193Provider
children: ReactNode children: ReactNode
} }
......
import { Provider as EthProvider } from '@web3-react/types' import { Provider as EthersProvider } from '@ethersproject/abstract-provider'
import { Signer as EthersSigner } from '@ethersproject/abstract-signer'
import { Eip1193Bridge } from '@ethersproject/experimental'
import { ExternalProvider } from '@ethersproject/providers'
import { JsonRpcProvider } from '@ethersproject/providers'
import { Provider as Eip1193Provider } from '@web3-react/types'
import { DEFAULT_LOCALE, SupportedLocale } from 'constants/locales' import { DEFAULT_LOCALE, SupportedLocale } from 'constants/locales'
import { Provider as AtomProvider } from 'jotai' import { Provider as AtomProvider } from 'jotai'
import { TransactionsUpdater } from 'lib/hooks/transactions' import { TransactionsUpdater } from 'lib/hooks/transactions'
...@@ -91,7 +96,7 @@ function Updaters() { ...@@ -91,7 +96,7 @@ function Updaters() {
export type WidgetProps = { export type WidgetProps = {
theme?: Theme theme?: Theme
locale?: SupportedLocale locale?: SupportedLocale
provider?: EthProvider provider?: Eip1193Provider | ExternalProvider | JsonRpcProvider | { provider: EthersProvider; signer: EthersSigner }
jsonRpcEndpoint?: string jsonRpcEndpoint?: string
width?: string | number width?: string | number
dialog?: HTMLElement | null dialog?: HTMLElement | null
...@@ -112,6 +117,15 @@ export default function Widget(props: PropsWithChildren<WidgetProps>) { ...@@ -112,6 +117,15 @@ export default function Widget(props: PropsWithChildren<WidgetProps>) {
onError, onError,
} = props } = props
let eip1193: Eip1193Provider | undefined
if (provider && 'provider' in provider && 'signer' in provider) {
eip1193 = new Eip1193Bridge(provider.signer, provider.provider)
} else if (provider instanceof JsonRpcProvider) {
eip1193 = new Eip1193Bridge(provider.getSigner(), provider)
} else if (provider) {
eip1193 = provider as Eip1193Provider
}
const [dialog, setDialog] = useState<HTMLDivElement | null>(null) const [dialog, setDialog] = useState<HTMLDivElement | null>(null)
return ( return (
<StrictMode> <StrictMode>
...@@ -124,7 +138,7 @@ export default function Widget(props: PropsWithChildren<WidgetProps>) { ...@@ -124,7 +138,7 @@ export default function Widget(props: PropsWithChildren<WidgetProps>) {
<WidgetPropValidator {...props}> <WidgetPropValidator {...props}>
<ReduxProvider store={multicallStore}> <ReduxProvider store={multicallStore}>
<AtomProvider> <AtomProvider>
<Web3Provider provider={provider} jsonRpcEndpoint={jsonRpcEndpoint}> <Web3Provider provider={eip1193} jsonRpcEndpoint={jsonRpcEndpoint}>
<Updaters /> <Updaters />
{children} {children}
</Web3Provider> </Web3Provider>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment