Feature/sync main

package.json

@@ -31,7 +31,7 @@
     "prei18n:compile": "lingui extract --locale en-US",
     "i18n:compile": "lingui compile",
     "ajv:compile": "node scripts/compileAjvValidators.js",
-    "prepare": "yarn contracts:compile && yarn i18n:compile && yarn ajv:compile",
+    "prepare": "yarn concurrently \"npm:contracts:compile\" \"npm:i18n:compile\" \"npm:ajv:compile\"",
     "prepublishOnly": "yarn build",
     "start": "cosmos",
     "typecheck": "tsc -p tsconfig.json",
@@ -79,7 +79,7 @@
     "@web3-react/network": "^8.2.0",
     "@web3-react/types": "^8.2.0",
     "@web3-react/url": "^8.2.0",
-    "@web3-react/walletconnect": "^8.2.0",
+    "@web3-react/walletconnect-v2": "^8.3.6",
     "ajv": "^8.11.0",
     "ajv-formats": "^2.1.1",
     "cids": "^1.0.0",
@@ -170,12 +170,12 @@
     "@uniswap/v2-core": "1.0.0",
     "@uniswap/v3-core": "1.0.0",
     "@uniswap/v3-periphery": "^1.1.1",
-    "@walletconnect/ethereum-provider": "^1.7.8",
     "babel-jest": "^27.5.1",
     "babel-loader": "^8.2.5",
     "babel-plugin-macros": "^3.1.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-runtime": "^6.26.0",
+    "concurrently": "^8.2.0",
     "dotenv": "^16.0.1",
     "eslint": "^7.11.0",
     "eslint-config-prettier": "^6.11.0",
@@ -215,4 +215,4 @@
   "resolutions": {
     "decode-uri-component": "^0.2.2"
   }
-}
+}

src/cosmos/useProvider.ts

@@ -1,7 +1,8 @@
 import { initializeConnector } from '@web3-react/core'
 import { MetaMask } from '@web3-react/metamask'
 import { Connector } from '@web3-react/types'
-import { WalletConnect } from '@web3-react/walletconnect'
+import { WalletConnect } from '@web3-react/walletconnect-v2'
+import { L1_CHAIN_IDS, L2_CHAIN_IDS, SupportedChainId } from 'constants/chains'
 import { JSON_RPC_FALLBACK_ENDPOINTS } from 'constants/jsonRpcEndpoints'
 import { useEffect, useState } from 'react'
 
@@ -12,15 +13,23 @@ enum Wallet {
   WalletConnect = 'WalletConnect',
 }
 const [metaMask] = initializeConnector<MetaMask>((actions) => new MetaMask({ actions }))
+
+const WALLET_CONNECT_PROJECT_ID = 'c6c9bacd35afa3eb9e6cccf6d8464395'
 const [walletConnect] = initializeConnector<WalletConnect>(
   (actions) =>
     new WalletConnect({
       actions,
       options: {
-        rpc: Object.entries(JSON_RPC_FALLBACK_ENDPOINTS).reduce((rpcMap, [chainId, rpcUrls]) => ({
+        rpcMap: Object.entries(JSON_RPC_FALLBACK_ENDPOINTS).reduce((rpcMap, [chainId, rpcUrls]) => ({
           ...rpcMap,
           [chainId]: rpcUrls.slice(0, 1),
         })),
+        showQrModal: true,
+        projectId: WALLET_CONNECT_PROJECT_ID,
+        // this requires the connecting wallet to support eth mainnet
+        chains: [SupportedChainId.MAINNET],
+        optionalChains: [...L1_CHAIN_IDS, ...L2_CHAIN_IDS],
+        optionalMethods: ['eth_signTypedData', 'eth_signTypedData_v4', 'eth_sign'],
       },
     })
 )

src/hooks/web3/index.tsx

@@ -1,16 +1,20 @@
+import './polyfills' // must be imported first
+
 import { JsonRpcProvider } from '@ethersproject/providers'
 import { initializeConnector, Web3ReactHooks, Web3ReactProvider } from '@web3-react/core'
 import { EIP1193 } from '@web3-react/eip1193'
 import { MetaMask } from '@web3-react/metamask'
 import { Network } from '@web3-react/network'
 import { Connector, Provider as Eip1193Provider } from '@web3-react/types'
+import { WalletConnect } from '@web3-react/walletconnect-v2'
 import { useAsyncError } from 'components/Error/ErrorBoundary'
-import { SupportedChainId } from 'constants/chains'
+import { L1_CHAIN_IDS, L2_CHAIN_IDS, SupportedChainId } from 'constants/chains'
 import { MetaMaskConnectionError } from 'errors'
 import { PropsWithChildren, useEffect, useMemo, useRef } from 'react'
+import { Layer } from 'theme'
 import JsonRpcConnector from 'utils/JsonRpcConnector'
 import { supportedChainId } from 'utils/supportedChainId'
-import { WalletConnectPopup, WalletConnectQR } from 'utils/WalletConnect'
+import { WalletConnectQR } from 'utils/WalletConnect'
 
 import { Provider as ConnectorsProvider } from './useConnectors'
 import {
@@ -27,7 +31,7 @@ type Web3ReactConnector<T extends Connector = Connector> = [T, Web3ReactHooks]
 interface Web3ReactConnectors {
   user: Web3ReactConnector<EIP1193 | JsonRpcConnector> | undefined
   metaMask: Web3ReactConnector<MetaMask>
-  walletConnect: Web3ReactConnector<WalletConnectPopup>
+  walletConnect: Web3ReactConnector<WalletConnect>
   walletConnectQR: Web3ReactConnector<WalletConnectQR>
   network: Web3ReactConnector<Network>
 }
@@ -159,23 +163,47 @@ function useWeb3ReactConnectors({ defaultChainId, provider, jsonRpcUrlMap }: Pro
       }),
     [throwAsync]
   )
+
+  const walletConnectDefaultOptions = useMemo(
+    () => ({
+      rpcMap: urlMap,
+      projectId: 'c6c9bacd35afa3eb9e6cccf6d8464395',
+      // this requires the connecting wallet to support eth mainnet
+      chains: [SupportedChainId.MAINNET],
+      optionalChains: [...L1_CHAIN_IDS, ...L2_CHAIN_IDS],
+      optionalMethods: ['eth_signTypedData', 'eth_signTypedData_v4', 'eth_sign'],
+      qrModalOptions: {
+        themeVariables: {
+          '--wcm-z-index': Layer.DIALOG.toString(),
+        },
+      },
+    }),
+    [urlMap]
+  )
+
   const walletConnect = useMemo(
     () =>
-      initializeWeb3ReactConnector(WalletConnectPopup, {
-        options: { rpc: urlMap },
+      initializeWeb3ReactConnector(WalletConnect, {
+        options: {
+          ...walletConnectDefaultOptions,
+          showQrModal: true,
+        },
         defaultChainId,
         onError: console.error,
       }),
-    [defaultChainId, urlMap]
+    [defaultChainId, walletConnectDefaultOptions]
   )
   const walletConnectQR = useMemo(
     () =>
       initializeWeb3ReactConnector(WalletConnectQR, {
-        options: { rpc: urlMap },
+        options: {
+          ...walletConnectDefaultOptions,
+          showQrModal: false,
+        },
         defaultChainId,
         onError: console.error,
       }),
-    [defaultChainId, urlMap]
+    [defaultChainId, walletConnectDefaultOptions]
   )
   const network = useMemo(
     () => initializeWeb3ReactConnector(Network, { urlMap: connectionMap, defaultChainId }),

src/hooks/web3/polyfills.ts

@@ -0,0 +1,7 @@
+if (typeof global.process !== 'object') {
+  // WCv2 alters global.process, and other libs (eg jotai) depend on a static object.
+  // Avoid breaking jotai by setting it statically before it is first seen.
+  global.process = { env: {} } as any
+}
+
+export {}

src/hooks/web3/useConnectors.tsx

@@ -2,15 +2,16 @@ import { useWeb3React } from '@web3-react/core'
 import { EIP1193 } from '@web3-react/eip1193'
 import { MetaMask } from '@web3-react/metamask'
 import { Network } from '@web3-react/network'
+import { WalletConnect } from '@web3-react/walletconnect-v2'
 import { createContext, PropsWithChildren, useContext, useEffect } from 'react'
 import invariant from 'tiny-invariant'
 import JsonRpcConnector from 'utils/JsonRpcConnector'
-import { WalletConnectPopup, WalletConnectQR } from 'utils/WalletConnect'
+import { WalletConnectQR } from 'utils/WalletConnect'
 
 export interface Connectors {
   user: EIP1193 | JsonRpcConnector | undefined
   metaMask: MetaMask
-  walletConnect: WalletConnectPopup
+  walletConnect: WalletConnect
   walletConnectQR: WalletConnectQR
   network: Network
 }

src/utils/WalletConnect.ts

@@ -1,26 +1,18 @@
 import 'setimmediate'
 
-import { URI_AVAILABLE, WalletConnect, WalletConnectConstructorArgs } from '@web3-react/walletconnect'
+import { URI_AVAILABLE, WalletConnect, WalletConnectConstructorArgs } from '@web3-react/walletconnect-v2'
 import QRCode from 'qrcode'
 
-export class WalletConnectPopup extends WalletConnect {
-  constructor({ actions, options, defaultChainId, timeout, onError }: WalletConnectConstructorArgs) {
-    super({ actions, options: { ...options, qrcode: true }, defaultChainId, timeout, onError })
-  }
-}
-
 export class WalletConnectQR extends WalletConnect {
   static SVG_AVAILABLE = 'svg_available'
 
   svg?: string
 
   constructor({ actions, options, defaultChainId, timeout, onError }: WalletConnectConstructorArgs) {
-    super({ actions, options: { ...options, qrcode: false }, defaultChainId, timeout, onError })
+    super({ actions, options: { ...options, showQrModal: false }, defaultChainId, timeout, onError })
 
     this.events.once(URI_AVAILABLE, () => {
-      this.provider?.connector.on('disconnect', () => {
-        this.deactivate()
-      })
+      this.provider?.events.on('disconnect', this.deactivate)
     })
 
     this.events.on(URI_AVAILABLE, async (uri) => {