-
Notifications
You must be signed in to change notification settings - Fork 189
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #886 from QuickSwap/dev2
merge dev to master
- Loading branch information
Showing
13 changed files
with
583 additions
and
296 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,200 @@ | ||
| import { | ||
| WalletConnect, | ||
| WalletConnectConstructorArgs, | ||
| } from '@web3-react/walletconnect'; | ||
| import { rpcMap } from 'constants/providers'; | ||
| import WalletConnectProvider from '@walletconnect/ethereum-provider'; | ||
| import { Actions, ProviderRpcError, Connector } from '@web3-react/types'; | ||
| import EventEmitter3 from 'eventemitter3'; | ||
|
|
||
| import { getBestUrlMap, getChainsWithDefault } from './utils'; | ||
|
|
||
| export const URI_AVAILABLE = 'URI_AVAILABLE'; | ||
| const DEFAULT_TIMEOUT = 5000; | ||
|
|
||
| /** | ||
| * Options to configure the WalletConnect provider. | ||
| * For the full list of options, see {@link https://docs.walletconnect.com/2.0/javascript/providers/ethereum#initialization WalletConnect documentation}. | ||
| */ | ||
| export type WalletConnectOptions = Omit< | ||
| Parameters<typeof WalletConnectProvider.init>[0], | ||
| 'rpcMap' | ||
| > & { | ||
| /** | ||
| * Map of chainIds to rpc url(s). If multiple urls are provided, the first one that responds | ||
| * within a given timeout will be used. Note that multiple urls are not supported by WalletConnect by default. | ||
| * That's why we extend its options with our own `rpcMap` (@see getBestUrlMap). | ||
| */ | ||
| rpcMap?: { [chainId: number]: string | string[] }; | ||
| }; | ||
|
|
||
| /** | ||
| * Options to configure the WalletConnect connector. | ||
| */ | ||
| export interface WalletConnectConstructorArgs { | ||
| actions: Actions; | ||
| /** Options to pass to `@walletconnect/ethereum-provider`. */ | ||
| options: WalletConnectOptions; | ||
| /** The chainId to connect to in activate if one is not provided. */ | ||
| defaultChainId?: number; | ||
| /** | ||
| * @param timeout - Timeout, in milliseconds, after which to treat network calls to urls as failed when selecting | ||
| * online urls. | ||
| */ | ||
| timeout?: number; | ||
| /** | ||
| * @param onError - Handler to report errors thrown from WalletConnect. | ||
| */ | ||
| onError?: (error: Error) => void; | ||
| } | ||
|
|
||
| export class WalletConnect extends Connector { | ||
| /** {@inheritdoc Connector.provider} */ | ||
| public provider?: WalletConnectProvider; | ||
| public readonly events = new EventEmitter3(); | ||
|
|
||
| private readonly options: Omit<WalletConnectOptions, 'rpcMap' | 'chains'>; | ||
|
|
||
| private readonly rpcMap?: Record<number, string | string[]>; | ||
| private readonly chains: number[]; | ||
| private readonly defaultChainId?: number; | ||
| private readonly timeout: number; | ||
|
|
||
| private eagerConnection?: Promise<WalletConnectProvider>; | ||
|
|
||
| export class WalletConnectPopup extends WalletConnect { | ||
| constructor({ | ||
| actions, | ||
| options, | ||
| defaultChainId, | ||
| timeout = DEFAULT_TIMEOUT, | ||
| onError, | ||
| qrcode = true, | ||
| qrcodeModalOptions, | ||
| }: Omit<WalletConnectConstructorArgs, 'options'> & { | ||
| qrcode?: boolean; | ||
| qrcodeModalOptions?: any; | ||
| }) { | ||
| super({ | ||
| actions, | ||
| options: { qrcode, rpc: rpcMap, qrcodeModalOptions }, | ||
| onError, | ||
| }); | ||
| }: WalletConnectConstructorArgs) { | ||
| super(actions, onError); | ||
|
|
||
| const { rpcMap, chains, ...rest } = options; | ||
|
|
||
| this.options = rest; | ||
| this.chains = chains; | ||
| this.defaultChainId = defaultChainId; | ||
| this.rpcMap = rpcMap; | ||
| this.timeout = timeout; | ||
| } | ||
|
|
||
| private disconnectListener = (error: ProviderRpcError) => { | ||
| this.actions.resetState(); | ||
| if (error) this.onError?.(error); | ||
| }; | ||
|
|
||
| private chainChangedListener = (chainId: string): void => { | ||
| this.actions.update({ chainId: Number.parseInt(chainId, 16) }); | ||
| }; | ||
|
|
||
| private accountsChangedListener = (accounts: string[]): void => { | ||
| this.actions.update({ accounts }); | ||
| }; | ||
|
|
||
| private URIListener = (uri: string): void => { | ||
| this.events.emit(URI_AVAILABLE, uri); | ||
| }; | ||
|
|
||
| private isomorphicInitialize( | ||
| desiredChainId: number | undefined = this.defaultChainId, | ||
| ): Promise<WalletConnectProvider> { | ||
| if (this.eagerConnection) return this.eagerConnection; | ||
|
|
||
| const rpcMap = this.rpcMap | ||
| ? getBestUrlMap(this.rpcMap, this.timeout) | ||
| : undefined; | ||
| const chains = desiredChainId | ||
| ? getChainsWithDefault(this.chains, desiredChainId) | ||
| : this.chains; | ||
|
|
||
| return (this.eagerConnection = import( | ||
| '@walletconnect/ethereum-provider' | ||
| ).then(async (ethProviderModule) => { | ||
| const provider = (this.provider = await ethProviderModule.default.init({ | ||
| ...this.options, | ||
| chains, | ||
| rpcMap: await rpcMap, | ||
| })); | ||
|
|
||
| return provider | ||
| .on('disconnect', this.disconnectListener) | ||
| .on('chainChanged', this.chainChangedListener) | ||
| .on('accountsChanged', this.accountsChangedListener) | ||
| .on('display_uri', this.URIListener); | ||
| })); | ||
| } | ||
|
|
||
| /** {@inheritdoc Connector.connectEagerly} */ | ||
| public async connectEagerly(): Promise<void> { | ||
| const cancelActivation = this.actions.startActivation(); | ||
|
|
||
| try { | ||
| const provider = await this.isomorphicInitialize(); | ||
| // WalletConnect automatically persists and restores active sessions | ||
| if (!provider.session) { | ||
| throw new Error('No active session found. Connect your wallet first.'); | ||
| } | ||
| this.actions.update({ | ||
| accounts: provider.accounts, | ||
| chainId: provider.chainId, | ||
| }); | ||
| } catch (error) { | ||
| await this.deactivate(); | ||
| cancelActivation(); | ||
| throw error; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @param desiredChainId - The desired chainId to connect to. | ||
| */ | ||
| public async activate(desiredChainId?: number): Promise<void> { | ||
| const provider = await this.isomorphicInitialize(desiredChainId); | ||
|
|
||
| if (provider.session) { | ||
| if (!desiredChainId || desiredChainId === provider.chainId) return; | ||
| // WalletConnect exposes connected accounts, not chains: `eip155:${chainId}:${address}` | ||
| const isConnectedToDesiredChain = provider.session.namespaces.eip155.accounts.some( | ||
| (account) => account.startsWith(`eip155:${desiredChainId}:`), | ||
| ); | ||
| if (!isConnectedToDesiredChain) { | ||
| if (this.options.optionalChains?.includes(desiredChainId)) { | ||
| throw new Error( | ||
| `Cannot activate an optional chain (${desiredChainId}), as the wallet is not connected to it.\n\tYou should handle this error in application code, as there is no guarantee that a wallet is connected to a chain configured in "optionalChains".`, | ||
| ); | ||
| } | ||
| throw new Error( | ||
| `Unknown chain (${desiredChainId}). Make sure to include any chains you might connect to in the "chains" or "optionalChains" parameters when initializing WalletConnect.`, | ||
| ); | ||
| } | ||
| return provider.request<void>({ | ||
| method: 'wallet_switchEthereumChain', | ||
| params: [{ chainId: `0x${desiredChainId.toString(16)}` }], | ||
| }); | ||
| } | ||
|
|
||
| const cancelActivation = this.actions.startActivation(); | ||
|
|
||
| try { | ||
| await provider.enable(); | ||
| this.actions.update({ | ||
| chainId: provider.chainId, | ||
| accounts: provider.accounts, | ||
| }); | ||
| } catch (error) { | ||
| await this.deactivate(); | ||
| cancelActivation(); | ||
| throw error; | ||
| } | ||
| } | ||
|
|
||
| activate(chainId?: number) { | ||
| return super.activate(chainId); | ||
| /** {@inheritdoc Connector.deactivate} */ | ||
| public async deactivate(): Promise<void> { | ||
| this.provider | ||
| ?.removeListener('disconnect', this.disconnectListener) | ||
| .removeListener('chainChanged', this.chainChangedListener) | ||
| .removeListener('accountsChanged', this.accountsChangedListener) | ||
| .removeListener('display_uri', this.URIListener) | ||
| .disconnect(); | ||
| this.provider = undefined; | ||
| this.eagerConnection = undefined; | ||
| this.actions.resetState(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| import { SUPPORTED_CHAINIDS } from 'constants/index'; | ||
| import { WalletConnect, WalletConnectConstructorArgs } from './WalletConnect'; | ||
| import { rpcMap } from 'constants/providers'; | ||
| import { QrModalOptions } from '@walletconnect/ethereum-provider/dist/types/EthereumProvider'; | ||
|
|
||
| export class WalletConnectPopup extends WalletConnect { | ||
| constructor({ | ||
| actions, | ||
| onError, | ||
| qrcode = true, | ||
| qrModalOptions, | ||
| }: Omit<WalletConnectConstructorArgs, 'options'> & { | ||
| qrcode?: boolean; | ||
| qrModalOptions?: QrModalOptions; | ||
| }) { | ||
| super({ | ||
| actions, | ||
| options: { | ||
| showQrModal: qrcode, | ||
| chains: [1], | ||
| optionalChains: SUPPORTED_CHAINIDS, | ||
| projectId: 'a6cc11517a10f6f12953fd67b1eb67e7', | ||
| qrModalOptions, | ||
| }, | ||
| onError, | ||
| }); | ||
| } | ||
|
|
||
| activate(chainId?: number) { | ||
| return super.activate(chainId); | ||
| } | ||
| } |
Oops, something went wrong.