[walletConnect v2.2.0-alpha.1]: Fix - walletConnect support for wallet_switchEthereumChain method (#1363)

* Working as expected

* Bump version for release

* Cleanup

* Revert demo app changes, bump version for release

* version bump mminor instead of patch

* Refactor

Author: Adamj1232

packages/demo/package.json

@@ -38,7 +38,7 @@
     "@web3-onboard/torus": "^2.1.3",
     "@web3-onboard/trezor": "^2.3.2",
     "@web3-onboard/tallyho": "^2.0.1",
-    "@web3-onboard/walletconnect": "^2.1.3",
+    "@web3-onboard/walletconnect": "^2.2.0-alpha.1",
     "@web3-onboard/web3auth": "^2.1.3",
     "vconsole": "^3.9.5"
   },

packages/walletconnect/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/walletconnect",
-  "version": "2.1.3",
+  "version": "2.2.0-alpha.1",
   "description": "WalletConnect SDK module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",

packages/walletconnect/src/index.ts

@@ -15,6 +15,14 @@ interface WalletConnectOptions {
   connectFirstChainId?: boolean
 }
 
+const isHexString = (value: string | number) => {
+  if (typeof value !== 'string' || !value.match(/^0x[0-9A-Fa-f]*$/)) {
+    return false
+  }
+
+  return true
+}
+
 function walletConnect(options?: WalletConnectOptions): WalletInit {
   const {
     bridge = 'https://bridge.walletconnect.org',
@@ -97,7 +105,10 @@ function walletConnect(options?: WalletConnectOptions): WalletInit {
                 next: ({ params }) => {
                   const [{ accounts, chainId }] = params
                   this.emit('accountsChanged', accounts)
-                  this.emit('chainChanged', `0x${chainId.toString(16)}`)
+                  const hexChainId = isHexString(chainId)
+                    ? chainId
+                    : `0x${chainId.toString(16)}`
+                  this.emit('chainChanged', hexChainId)
                 },
                 error: console.warn
               })
@@ -125,7 +136,9 @@ function walletConnect(options?: WalletConnectOptions): WalletInit {
 
             this.request = async ({ method, params }) => {
               if (method === 'eth_chainId') {
-                return `0x${this.connector.chainId.toString(16)}`
+                return isHexString(this.connector.chainId)
+                  ? this.connector.chainId
+                  : `0x${this.connector.chainId.toString(16)}`
               }
 
               if (method === 'eth_requestAccounts') {
@@ -154,7 +167,10 @@ function walletConnect(options?: WalletConnectOptions): WalletInit {
                       })
                   } else {
                     const { accounts, chainId } = this.connector.session
-                    this.emit('chainChanged', `0x${chainId.toString(16)}`)
+                    const hexChainId = isHexString(chainId)
+                      ? chainId
+                      : `0x${chainId.toString(16)}`
+                    this.emit('chainChanged', hexChainId)
                     return resolve(accounts)
                   }
 
@@ -171,7 +187,10 @@ function walletConnect(options?: WalletConnectOptions): WalletInit {
                       next: ({ params }) => {
                         const [{ accounts, chainId }] = params
                         this.emit('accountsChanged', accounts)
-                        this.emit('chainChanged', `0x${chainId.toString(16)}`)
+                        const hexChainId = isHexString(chainId)
+                          ? chainId
+                          : `0x${chainId.toString(16)}`
+                        this.emit('chainChanged', hexChainId)
                         QRCodeModal.close()
                         resolve(accounts)
                       },
@@ -180,16 +199,36 @@ function walletConnect(options?: WalletConnectOptions): WalletInit {
                 })
               }
 
-              if (
-                method === 'wallet_switchEthereumChain' ||
-                method === 'eth_selectAccounts'
-              ) {
+              if (method === 'eth_selectAccounts') {
                 throw new ProviderRpcError({
                   code: ProviderRpcErrorCode.UNSUPPORTED_METHOD,
                   message: `The Provider does not support the requested method: ${method}`
                 })
               }
 
+              if (method == 'wallet_switchEthereumChain') {
+                if (!params) {
+                  throw new ProviderRpcError({
+                    code: ProviderRpcErrorCode.INVALID_PARAMS,
+                    message: `The Provider requires a chainId to be passed in as an argument`
+                  })
+                }
+                const chainIdObj = params[0] as { chainId?: number }
+                if (
+                  !chainIdObj.hasOwnProperty('chainId') ||
+                  typeof chainIdObj['chainId'] === 'undefined'
+                ) {
+                  throw new ProviderRpcError({
+                    code: ProviderRpcErrorCode.INVALID_PARAMS,
+                    message: `The Provider requires a chainId to be passed in as an argument`
+                  })
+                }
+                return this.connector.updateSession({
+                  chainId: chainIdObj.chainId,
+                  accounts: this.connector.accounts
+                })
+              }
+
               // @ts-ignore
               if (method === 'eth_sendTransaction') {
                 // @ts-ignore

yarn.lock

@@ -2953,6 +2953,15 @@
   dependencies:
     "@walletconnect/window-getters" "^1.0.0"
 
+"@web3-onboard/gnosis@^2.1.3":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@web3-onboard/gnosis/-/gnosis-2.1.4.tgz#8f0bfa50bf662084091c61cc7c9248bb44e0ea6d"
+  integrity sha512-lTAnfc3FEy6zmc/SIOI9dW0oVH23WM+Nqo8pAfjKOUrGq+ChyyA7ghhP1dUoKfJgAtblUC5MKHzPLdL+K+PYNw==
+  dependencies:
+    "@gnosis.pm/safe-apps-provider" "^0.9.2"
+    "@gnosis.pm/safe-apps-sdk" "^6.1.1"
+    "@web3-onboard/common" "^2.2.3"
+
 "@web3auth/base-plugin@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@web3auth/base-plugin/-/base-plugin-1.0.1.tgz#1e2a87acf745299fdff6f92e6c46ee9bc38aa670"