From acbc8b3f98d975073cab9a6ec9ce3793bb2c270d Mon Sep 17 00:00:00 2001
From: RetricSu <inneverland2013@gmail.com>
Date: Sat, 8 Oct 2022 21:27:41 +0800
Subject: [PATCH 1/4] feat: support multi wallet connector

---
 apps/godwoken-bridge/package.json             |  7 ++
 .../components/WalletConnect/connector.tsx    | 99 +++++++++++++++++++
 .../WalletConnect/connectors/index.ts         | 22 +++++
 .../WalletConnect/connectors/metamask.ts      |  4 +
 .../WalletConnect/connectors/walletConnect.ts | 36 +++++++
 .../src/components/WalletConnect/index.tsx    | 35 ++++++-
 .../src/contexts/LightGodwokenContext.tsx     | 58 +++++------
 apps/godwoken-bridge/src/index.tsx            |  6 +-
 .../src/config/predefined/mainnet.ts          |  2 +
 .../src/config/predefined/testnet.ts          |  2 +
 packages/light-godwoken/src/config/types.ts   |  1 +
 11 files changed, 233 insertions(+), 39 deletions(-)
 create mode 100644 apps/godwoken-bridge/src/components/WalletConnect/connector.tsx
 create mode 100644 apps/godwoken-bridge/src/components/WalletConnect/connectors/index.ts
 create mode 100644 apps/godwoken-bridge/src/components/WalletConnect/connectors/metamask.ts
 create mode 100644 apps/godwoken-bridge/src/components/WalletConnect/connectors/walletConnect.ts

diff --git a/apps/godwoken-bridge/package.json b/apps/godwoken-bridge/package.json
index 1c7f8921..ca43d02e 100644
--- a/apps/godwoken-bridge/package.json
+++ b/apps/godwoken-bridge/package.json
@@ -46,6 +46,13 @@
     "@types/react-dom": "^17.0.14",
     "@types/react-router-dom": "^5.3.2",
     "@types/styled-components": "^5.1.18",
+    "@walletconnect/ethereum-provider": "^1.7.5",
+    "@web3-react/core": "8.0.35-beta.0",
+    "@web3-react/eip1193": "8.0.26-beta.0",
+    "@web3-react/metamask": "8.0.28-beta.0",
+    "@web3-react/types": "8.0.20-beta.0",
+    "@web3-react/url": "8.0.25-beta.0",
+    "@web3-react/walletconnect": "8.0.35-beta.0",
     "ahooks": "^3.7.0",
     "antd": "^4.17.3",
     "axios": "^0.27.2",
diff --git a/apps/godwoken-bridge/src/components/WalletConnect/connector.tsx b/apps/godwoken-bridge/src/components/WalletConnect/connector.tsx
new file mode 100644
index 00000000..592bf652
--- /dev/null
+++ b/apps/godwoken-bridge/src/components/WalletConnect/connector.tsx
@@ -0,0 +1,99 @@
+import React, { useEffect } from "react";
+import styled from "styled-components";
+import { COLOR } from "../../style/variables";
+import { SecondeButton } from "../../style/common";
+import { URI_AVAILABLE } from '@web3-react/walletconnect'
+import { Popover } from "antd";
+import { connectors } from "./connectors";
+
+const StyleWrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+  > a,
+  > button {
+    color: ${COLOR.primary};
+    text-decoration: none;
+    cursor: pointer;
+    height: 33px;
+    padding: 0 10px;
+    border-radius: 8px;
+    margin: 4px 0px;
+    text-align: center;
+    line-height: 33px;
+    font-size: 14px;
+    font-weight: bold;
+    &:hover {
+      background: rgba(0, 0, 0, 0.1);
+      color: ${COLOR.primary};
+    }
+  }
+`;
+
+type SelectMenuProps = {
+  handleClick: () => void;
+};
+export const SelectMenu: React.FC<SelectMenuProps> = ({ handleClick }) => {
+  const connectMetamask = () => {
+    connectors.injectedConnect.instance.activate().catch(err => {
+      console.error(err)
+    })
+  };
+
+  const connectImToken = () => {
+    connectors.injectedConnect.instance.activate().catch(err => {
+      console.error(err)
+    })
+  };
+
+  const connectSafePal = () => {
+    connectors.injectedConnect.instance.activate().catch(err => {
+      console.error(err)
+    })
+  };
+
+  const connectWalletConnect = () => {
+    connectors.walletConnect.instance.activate().catch(err => {
+      console.error(err)
+    })
+  };
+
+  return (
+    <StyleWrapper>
+      <SecondeButton onClick={connectMetamask}>Metamask</SecondeButton>
+      <SecondeButton onClick={connectImToken}>ImToken</SecondeButton>
+      <SecondeButton onClick={connectSafePal}>SafePal</SecondeButton>
+      <SecondeButton onClick={connectWalletConnect}>WalletConnect</SecondeButton>
+    </StyleWrapper>
+  );
+};
+
+type ConnectorPopoverProps = {
+  connectBtnQuerySelector: string;
+  popoverVisible: boolean;
+  setPopoverVisible: (v: boolean) => void;
+};
+export const ConnectorPopover: React.FC<ConnectorPopoverProps> = ({ connectBtnQuerySelector, popoverVisible, setPopoverVisible }) => {
+  const closeSelectMenu = () => {
+    setPopoverVisible(false);
+  };
+
+  useEffect(() => {
+    document.addEventListener("click", (e) => {
+      const target = document.querySelector(connectBtnQuerySelector);
+      if (!(e.target && e.target instanceof Element && (e.target === target || target?.contains(e.target)))) {
+        closeSelectMenu();
+      }
+    });
+  });
+
+  return (
+    <Popover
+      content={() => <SelectMenu handleClick={closeSelectMenu}></SelectMenu>}
+      trigger="click"
+      overlayClassName="popover-menu"
+      visible={popoverVisible}
+      placement="top"
+    ></Popover>
+  );
+};
+
diff --git a/apps/godwoken-bridge/src/components/WalletConnect/connectors/index.ts b/apps/godwoken-bridge/src/components/WalletConnect/connectors/index.ts
new file mode 100644
index 00000000..a5fc1e67
--- /dev/null
+++ b/apps/godwoken-bridge/src/components/WalletConnect/connectors/index.ts
@@ -0,0 +1,22 @@
+import { Web3ReactHooks } from "@web3-react/core";
+import { MetaMask } from "@web3-react/metamask";
+import { WalletConnect } from "@web3-react/walletconnect";
+import { metaMask, hooks as metaMaskHooks } from "./metamask";
+import { walletConnect, hooks as walletConnectHooks } from "./walletConnect";
+
+export const connectors = {
+  walletConnect: {
+    instance: walletConnect,
+    hooks: walletConnectHooks,
+  },
+  injectedConnect: {
+    instance: metaMask,
+    hooks: metaMaskHooks,
+  },
+};
+
+// use for Web3ReactProvider in App.tsx
+export const connectorArray: [MetaMask | WalletConnect, Web3ReactHooks][] = [
+  [metaMask, metaMaskHooks],
+  [walletConnect, walletConnectHooks],
+];
diff --git a/apps/godwoken-bridge/src/components/WalletConnect/connectors/metamask.ts b/apps/godwoken-bridge/src/components/WalletConnect/connectors/metamask.ts
new file mode 100644
index 00000000..6da4840e
--- /dev/null
+++ b/apps/godwoken-bridge/src/components/WalletConnect/connectors/metamask.ts
@@ -0,0 +1,4 @@
+import { initializeConnector } from "@web3-react/core";
+import { MetaMask } from "@web3-react/metamask";
+
+export const [metaMask, hooks] = initializeConnector<MetaMask>((actions) => new MetaMask({ actions }))
diff --git a/apps/godwoken-bridge/src/components/WalletConnect/connectors/walletConnect.ts b/apps/godwoken-bridge/src/components/WalletConnect/connectors/walletConnect.ts
new file mode 100644
index 00000000..82f5e3ad
--- /dev/null
+++ b/apps/godwoken-bridge/src/components/WalletConnect/connectors/walletConnect.ts
@@ -0,0 +1,36 @@
+import { initializeConnector } from "@web3-react/core";
+import { WalletConnect } from "@web3-react/walletconnect";
+import { GodwokenNetwork, GodwokenVersion, initConfig } from "light-godwoken";
+import { isMainnet } from "../../../utils/environment";
+
+type Rpc = {
+  [key: string]: string;
+};
+
+// get rpc info
+const rpc: Rpc = {};
+const getRpcInfo = (version: GodwokenVersion) => {
+  const network = isMainnet ? GodwokenNetwork.Mainnet : GodwokenNetwork.Testnet;
+  const config = initConfig(network, version);
+  const chainId = config.layer2Config.GW_POLYJUICE_CHAIN_ID;
+  const url = config.layer2Config.GW_POLYJUICE_RPC_URL;
+  return { chainId, url };
+};
+
+const { chainId: chainIdV0, url: urlV0 } = getRpcInfo(GodwokenVersion.V0);
+const { chainId: chainIdV1, url: urlV1 } = getRpcInfo(GodwokenVersion.V1);
+
+rpc[chainIdV1.toString()] = urlV1;
+rpc[chainIdV0.toString()] = urlV0;
+
+export const [walletConnect, hooks] = initializeConnector<WalletConnect>(
+  (actions) =>
+    new WalletConnect({
+      actions,
+      options: {
+        rpc,
+        bridge: "https://bridge.walletconnect.org",
+        qrcode: true,
+      },
+    }),
+);;
diff --git a/apps/godwoken-bridge/src/components/WalletConnect/index.tsx b/apps/godwoken-bridge/src/components/WalletConnect/index.tsx
index c6ef49b6..85b2cdd6 100644
--- a/apps/godwoken-bridge/src/components/WalletConnect/index.tsx
+++ b/apps/godwoken-bridge/src/components/WalletConnect/index.tsx
@@ -3,9 +3,12 @@ import styled from "styled-components";
 import { SecondeButton } from "../../style/common";
 import { useLightGodwoken } from "../../hooks/useLightGodwoken";
 import React, { useEffect, useState } from "react";
-import detectEthereumProvider from "@metamask/detect-provider";
 import { useNavigate, useParams } from "react-router-dom";
 import { availableVersions } from "../../utils/environment";
+import { ConnectorPopover } from "./connector";
+import { connectors } from "./connectors";
+import { URI_AVAILABLE } from "@web3-react/walletconnect";
+
 const { Option } = Select;
 const StyleWrapper = styled.div`
   display: flex;
@@ -25,6 +28,7 @@ export const WalletConnect: React.FC = () => {
   const params = useParams();
   const navigate = useNavigate();
 
+  const [openWalletSelector, setOpenWalletSelector] = useState<boolean>(false);
   const [version, setVersion] = useState<string>();
   const lightGodwoken = useLightGodwoken();
 
@@ -34,6 +38,22 @@ export const WalletConnect: React.FC = () => {
     }
   }, [params.version]);
 
+  // log URI when available
+  useEffect(() => {
+    connectors.walletConnect.instance.events.on(URI_AVAILABLE, (uri: string) => {
+      console.log(`uri: ${uri}`)
+    })
+  }, [])
+  // attempt to connect eagerly on mount
+  useEffect(() => {
+    connectors.injectedConnect.instance.connectEagerly().catch(() => {
+      console.debug('Failed to connect eagerly to injectedConnect')
+    })
+    connectors.walletConnect.instance.connectEagerly().catch(() => {
+      console.debug('Failed to connect eagerly to walletconnect')
+    })
+  }, [])
+
   const handleChange = (value: string) => {
     setVersion(value);
     navigate(`/${value}`);
@@ -42,11 +62,11 @@ export const WalletConnect: React.FC = () => {
   const connect = () => {
     if (lightGodwoken) return;
 
-    detectEthereumProvider().then((ethereum: any) => {
-      return ethereum.request({ method: "eth_requestAccounts" });
-    });
+    setOpenWalletSelector(!openWalletSelector);
   };
+
   if (lightGodwoken) return null;
+
   return (
     <StyleWrapper>
       <Select className="network-select" value={version} onChange={handleChange}>
@@ -56,7 +76,12 @@ export const WalletConnect: React.FC = () => {
           </Option>
         ))}
       </Select>
-      <SecondeButton onClick={connect}>Connect</SecondeButton>
+      <SecondeButton className="connect-wallet" onClick={connect}>Connect</SecondeButton>
+      <ConnectorPopover
+        connectBtnQuerySelector=".connect-wallet"
+        popoverVisible={openWalletSelector}
+        setPopoverVisible={setOpenWalletSelector}
+      ></ConnectorPopover>
     </StyleWrapper>
   );
 };
diff --git a/apps/godwoken-bridge/src/contexts/LightGodwokenContext.tsx b/apps/godwoken-bridge/src/contexts/LightGodwokenContext.tsx
index 60296730..b11684ad 100644
--- a/apps/godwoken-bridge/src/contexts/LightGodwokenContext.tsx
+++ b/apps/godwoken-bridge/src/contexts/LightGodwokenContext.tsx
@@ -1,9 +1,9 @@
 import { isMainnet } from "../utils/environment";
 import { useLocation } from "react-router-dom";
-import detectEthereumProvider from "@metamask/detect-provider";
 import React, { createContext, useEffect, useState } from "react";
 import { GodwokenVersion, GodwokenNetwork, LightGodwoken } from "light-godwoken";
 import { createLightGodwokenV0, createLightGodwokenV1 } from "../utils/lightGodwoken";
+import { useWeb3React } from "@web3-react/core";
 
 export const LightGodwokenContext = createContext<LightGodwoken | undefined>(undefined);
 LightGodwokenContext.displayName = "LightGodwokenContext";
@@ -14,40 +14,32 @@ export const Provider: React.FC = (props) => {
 
   const network = isMainnet ? GodwokenNetwork.Mainnet : GodwokenNetwork.Testnet;
 
-  useEffect(() => {
-    detectEthereumProvider().then((ethereum: any) => {
-      if (ethereum) {
-        ethereum.request({ method: "eth_accounts" }).then((accounts: string[]) => {
-          if (accounts.length === 0) {
-            return setLightGodwoken(void 0);
-          }
-
-          if (location.pathname.startsWith("/v0") && lightGodwoken?.getVersion() !== GodwokenVersion.V0) {
-            setLightGodwoken(createLightGodwokenV0(accounts[0], network, ethereum));
-          } else if (location.pathname.startsWith("/v1") && lightGodwoken?.getVersion() !== GodwokenVersion.V1) {
-            setLightGodwoken(createLightGodwokenV1(accounts[0], network, ethereum));
-          }
-        });
-
-        ethereum.on("accountsChanged", (accounts: string[] | undefined) => {
-          if (!accounts || accounts.length === 0) {
-            return setLightGodwoken(void 0);
-          }
+  const { connector, account } = useWeb3React();
 
-          let instance: LightGodwoken;
-          if (location.pathname.startsWith("/v0")) {
-            instance = createLightGodwokenV0(accounts[0], network, ethereum);
-          } else {
-            instance = createLightGodwokenV1(accounts[0], network, ethereum);
-          }
-
-          setLightGodwoken(instance);
-        });
-      } else {
-        alert("Please install MetaMask to use Godwoken Bridge!");
+  useEffect(() => {
+    if (account && connector.provider) {
+      if (location.pathname.startsWith("/v0") && lightGodwoken?.getVersion() !== GodwokenVersion.V0) {
+        setLightGodwoken(createLightGodwokenV0(account, network, connector.provider));
+      } else if (location.pathname.startsWith("/v1") && lightGodwoken?.getVersion() !== GodwokenVersion.V1) {
+        setLightGodwoken(createLightGodwokenV1(account, network, connector.provider));
       }
-    });
-  }, [lightGodwoken, location.pathname, network]);
+      
+      connector.provider.on("accountsChanged", (accounts: string[] | undefined) => {
+        if (!accounts || accounts.length === 0) {
+          return setLightGodwoken(void 0);
+        }
+  
+        let instance: LightGodwoken;
+        if (location.pathname.startsWith("/v0")) {
+          instance = createLightGodwokenV0(accounts[0], network, connector.provider!);
+        } else {
+          instance = createLightGodwokenV1(accounts[0], network, connector.provider!);
+        }
+  
+        setLightGodwoken(instance);
+      });
+    }
+  }, [lightGodwoken, location.pathname, network, account, connector]);
 
   return (
     <LightGodwokenContext.Provider value={lightGodwoken || undefined}>{props.children}</LightGodwokenContext.Provider>
diff --git a/apps/godwoken-bridge/src/index.tsx b/apps/godwoken-bridge/src/index.tsx
index d7a28db9..3e229ffc 100644
--- a/apps/godwoken-bridge/src/index.tsx
+++ b/apps/godwoken-bridge/src/index.tsx
@@ -11,6 +11,8 @@ import * as Sentry from "@sentry/react";
 import { BrowserTracing } from "@sentry/tracing";
 import { LightGodwokenError } from "light-godwoken";
 import { isMainnet } from "./utils/environment";
+import { Web3ReactProvider } from '@web3-react/core'
+import { connectorArray } from "./components/WalletConnect/connectors";
 
 if (process.env.NODE_ENV === "production") {
   Sentry.init({
@@ -46,7 +48,9 @@ config.initializeConfig(isMainnet ? config.predefined.LINA : config.predefined.A
 
 ReactDOM.render(
   <React.StrictMode>
-    <App />
+    <Web3ReactProvider connectors={connectorArray}>
+      <App />
+    </Web3ReactProvider>
   </React.StrictMode>,
   document.getElementById("root"),
 );
diff --git a/packages/light-godwoken/src/config/predefined/mainnet.ts b/packages/light-godwoken/src/config/predefined/mainnet.ts
index fe911ba0..ce649b16 100644
--- a/packages/light-godwoken/src/config/predefined/mainnet.ts
+++ b/packages/light-godwoken/src/config/predefined/mainnet.ts
@@ -70,6 +70,7 @@ export const MainnetLayer2ConfigV0: LightGodwokenConfig = {
       },
     },
     GW_POLYJUICE_RPC_URL: "https://mainnet.godwoken.io/rpc",
+    GW_POLYJUICE_CHAIN_ID: 71394,
     SCANNER_URL: "https://v0.gwscan.com",
     SCANNER_API: "https://api.gwscan.com/api/",
     CHAIN_NAME: "Godwoken mainnet v0",
@@ -121,6 +122,7 @@ export const MainnetLayer2ConfigV1: LightGodwokenConfig = {
       },
     },
     GW_POLYJUICE_RPC_URL: "https://v1.mainnet.godwoken.io/rpc",
+    GW_POLYJUICE_CHAIN_ID: 71402,
     SCANNER_URL: "https://v1.gwscan.com/",
     SCANNER_API: "https://api.v1.gwscan.com/api/",
     CHAIN_NAME: "Godwoken Mainnet v1",
diff --git a/packages/light-godwoken/src/config/predefined/testnet.ts b/packages/light-godwoken/src/config/predefined/testnet.ts
index 55b5abe7..d5bd20f4 100644
--- a/packages/light-godwoken/src/config/predefined/testnet.ts
+++ b/packages/light-godwoken/src/config/predefined/testnet.ts
@@ -70,6 +70,7 @@ export const TestnetLayer2ConfigV0: LightGodwokenConfig = {
       },
     },
     GW_POLYJUICE_RPC_URL: "https://godwoken-testnet-web3-rpc.ckbapp.dev",
+    GW_POLYJUICE_CHAIN_ID: 71393,
     SCANNER_URL: "https://aggron.gwscan.com",
     SCANNER_API: "https://api.aggron.gwscan.com/api/",
     CHAIN_NAME: "Godwoken Testnet v0",
@@ -120,6 +121,7 @@ export const TestnetLayer2ConfigV1: LightGodwokenConfig = {
       },
     },
     GW_POLYJUICE_RPC_URL: "https://godwoken-testnet-v1.ckbapp.dev",
+    GW_POLYJUICE_CHAIN_ID: 71394,
     SCANNER_URL: "https://v1.betanet.gwscan.com/",
     SCANNER_API: "https://api.v1.betanet.gwscan.com/api/",
     CHAIN_NAME: "Godwoken Testnet v1",
diff --git a/packages/light-godwoken/src/config/types.ts b/packages/light-godwoken/src/config/types.ts
index a08ffd25..5bf0d601 100644
--- a/packages/light-godwoken/src/config/types.ts
+++ b/packages/light-godwoken/src/config/types.ts
@@ -31,6 +31,7 @@ export type Layer2Config = {
     rollup_type_script: Script;
   };
   GW_POLYJUICE_RPC_URL: string;
+  GW_POLYJUICE_CHAIN_ID: number;
   SCANNER_URL: string;
   SCANNER_API: string;
   CHAIN_NAME: string;

From 9d137a8b7060419df43da4e57a30a9d6392daf0a Mon Sep 17 00:00:00 2001
From: RetricSu <inneverland2013@gmail.com>
Date: Sat, 8 Oct 2022 21:41:42 +0800
Subject: [PATCH 2/4] chore: yarn lock and lint

---
 .../components/WalletConnect/connector.tsx    |  33 +-
 .../WalletConnect/connectors/metamask.ts      |   2 +-
 .../WalletConnect/connectors/walletConnect.ts |   2 +-
 .../src/components/WalletConnect/index.tsx    |  20 +-
 .../src/contexts/LightGodwokenContext.tsx     |   6 +-
 apps/godwoken-bridge/src/index.tsx            |   2 +-
 yarn.lock                                     | 643 +++++++++++++++++-
 7 files changed, 673 insertions(+), 35 deletions(-)

diff --git a/apps/godwoken-bridge/src/components/WalletConnect/connector.tsx b/apps/godwoken-bridge/src/components/WalletConnect/connector.tsx
index 592bf652..479e8940 100644
--- a/apps/godwoken-bridge/src/components/WalletConnect/connector.tsx
+++ b/apps/godwoken-bridge/src/components/WalletConnect/connector.tsx
@@ -2,7 +2,7 @@ import React, { useEffect } from "react";
 import styled from "styled-components";
 import { COLOR } from "../../style/variables";
 import { SecondeButton } from "../../style/common";
-import { URI_AVAILABLE } from '@web3-react/walletconnect'
+import { URI_AVAILABLE } from "@web3-react/walletconnect";
 import { Popover } from "antd";
 import { connectors } from "./connectors";
 
@@ -34,27 +34,27 @@ type SelectMenuProps = {
 };
 export const SelectMenu: React.FC<SelectMenuProps> = ({ handleClick }) => {
   const connectMetamask = () => {
-    connectors.injectedConnect.instance.activate().catch(err => {
-      console.error(err)
-    })
+    connectors.injectedConnect.instance.activate().catch((err) => {
+      console.error(err);
+    });
   };
 
   const connectImToken = () => {
-    connectors.injectedConnect.instance.activate().catch(err => {
-      console.error(err)
-    })
+    connectors.injectedConnect.instance.activate().catch((err) => {
+      console.error(err);
+    });
   };
 
   const connectSafePal = () => {
-    connectors.injectedConnect.instance.activate().catch(err => {
-      console.error(err)
-    })
+    connectors.injectedConnect.instance.activate().catch((err) => {
+      console.error(err);
+    });
   };
 
   const connectWalletConnect = () => {
-    connectors.walletConnect.instance.activate().catch(err => {
-      console.error(err)
-    })
+    connectors.walletConnect.instance.activate().catch((err) => {
+      console.error(err);
+    });
   };
 
   return (
@@ -72,7 +72,11 @@ type ConnectorPopoverProps = {
   popoverVisible: boolean;
   setPopoverVisible: (v: boolean) => void;
 };
-export const ConnectorPopover: React.FC<ConnectorPopoverProps> = ({ connectBtnQuerySelector, popoverVisible, setPopoverVisible }) => {
+export const ConnectorPopover: React.FC<ConnectorPopoverProps> = ({
+  connectBtnQuerySelector,
+  popoverVisible,
+  setPopoverVisible,
+}) => {
   const closeSelectMenu = () => {
     setPopoverVisible(false);
   };
@@ -96,4 +100,3 @@ export const ConnectorPopover: React.FC<ConnectorPopoverProps> = ({ connectBtnQu
     ></Popover>
   );
 };
-
diff --git a/apps/godwoken-bridge/src/components/WalletConnect/connectors/metamask.ts b/apps/godwoken-bridge/src/components/WalletConnect/connectors/metamask.ts
index 6da4840e..048a7fbb 100644
--- a/apps/godwoken-bridge/src/components/WalletConnect/connectors/metamask.ts
+++ b/apps/godwoken-bridge/src/components/WalletConnect/connectors/metamask.ts
@@ -1,4 +1,4 @@
 import { initializeConnector } from "@web3-react/core";
 import { MetaMask } from "@web3-react/metamask";
 
-export const [metaMask, hooks] = initializeConnector<MetaMask>((actions) => new MetaMask({ actions }))
+export const [metaMask, hooks] = initializeConnector<MetaMask>((actions) => new MetaMask({ actions }));
diff --git a/apps/godwoken-bridge/src/components/WalletConnect/connectors/walletConnect.ts b/apps/godwoken-bridge/src/components/WalletConnect/connectors/walletConnect.ts
index 82f5e3ad..a08a0295 100644
--- a/apps/godwoken-bridge/src/components/WalletConnect/connectors/walletConnect.ts
+++ b/apps/godwoken-bridge/src/components/WalletConnect/connectors/walletConnect.ts
@@ -33,4 +33,4 @@ export const [walletConnect, hooks] = initializeConnector<WalletConnect>(
         qrcode: true,
       },
     }),
-);;
+);
diff --git a/apps/godwoken-bridge/src/components/WalletConnect/index.tsx b/apps/godwoken-bridge/src/components/WalletConnect/index.tsx
index 85b2cdd6..41bda2b1 100644
--- a/apps/godwoken-bridge/src/components/WalletConnect/index.tsx
+++ b/apps/godwoken-bridge/src/components/WalletConnect/index.tsx
@@ -41,18 +41,18 @@ export const WalletConnect: React.FC = () => {
   // log URI when available
   useEffect(() => {
     connectors.walletConnect.instance.events.on(URI_AVAILABLE, (uri: string) => {
-      console.log(`uri: ${uri}`)
-    })
-  }, [])
+      console.log(`uri: ${uri}`);
+    });
+  }, []);
   // attempt to connect eagerly on mount
   useEffect(() => {
     connectors.injectedConnect.instance.connectEagerly().catch(() => {
-      console.debug('Failed to connect eagerly to injectedConnect')
-    })
+      console.debug("Failed to connect eagerly to injectedConnect");
+    });
     connectors.walletConnect.instance.connectEagerly().catch(() => {
-      console.debug('Failed to connect eagerly to walletconnect')
-    })
-  }, [])
+      console.debug("Failed to connect eagerly to walletconnect");
+    });
+  }, []);
 
   const handleChange = (value: string) => {
     setVersion(value);
@@ -76,7 +76,9 @@ export const WalletConnect: React.FC = () => {
           </Option>
         ))}
       </Select>
-      <SecondeButton className="connect-wallet" onClick={connect}>Connect</SecondeButton>
+      <SecondeButton className="connect-wallet" onClick={connect}>
+        Connect
+      </SecondeButton>
       <ConnectorPopover
         connectBtnQuerySelector=".connect-wallet"
         popoverVisible={openWalletSelector}
diff --git a/apps/godwoken-bridge/src/contexts/LightGodwokenContext.tsx b/apps/godwoken-bridge/src/contexts/LightGodwokenContext.tsx
index b11684ad..f4cf125c 100644
--- a/apps/godwoken-bridge/src/contexts/LightGodwokenContext.tsx
+++ b/apps/godwoken-bridge/src/contexts/LightGodwokenContext.tsx
@@ -23,19 +23,19 @@ export const Provider: React.FC = (props) => {
       } else if (location.pathname.startsWith("/v1") && lightGodwoken?.getVersion() !== GodwokenVersion.V1) {
         setLightGodwoken(createLightGodwokenV1(account, network, connector.provider));
       }
-      
+
       connector.provider.on("accountsChanged", (accounts: string[] | undefined) => {
         if (!accounts || accounts.length === 0) {
           return setLightGodwoken(void 0);
         }
-  
+
         let instance: LightGodwoken;
         if (location.pathname.startsWith("/v0")) {
           instance = createLightGodwokenV0(accounts[0], network, connector.provider!);
         } else {
           instance = createLightGodwokenV1(accounts[0], network, connector.provider!);
         }
-  
+
         setLightGodwoken(instance);
       });
     }
diff --git a/apps/godwoken-bridge/src/index.tsx b/apps/godwoken-bridge/src/index.tsx
index 3e229ffc..860235e5 100644
--- a/apps/godwoken-bridge/src/index.tsx
+++ b/apps/godwoken-bridge/src/index.tsx
@@ -11,7 +11,7 @@ import * as Sentry from "@sentry/react";
 import { BrowserTracing } from "@sentry/tracing";
 import { LightGodwokenError } from "light-godwoken";
 import { isMainnet } from "./utils/environment";
-import { Web3ReactProvider } from '@web3-react/core'
+import { Web3ReactProvider } from "@web3-react/core";
 import { connectorArray } from "./components/WalletConnect/connectors";
 
 if (process.env.NODE_ENV === "production") {
diff --git a/yarn.lock b/yarn.lock
index 72753796..b845da62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1712,6 +1712,19 @@
     "@ethersproject/transactions" "^5.6.2"
     "@ethersproject/web" "^5.6.1"
 
+"@ethersproject/abstract-provider@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz#b0a8550f88b6bf9d51f90e4795d48294630cb9ef"
+  integrity sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==
+  dependencies:
+    "@ethersproject/bignumber" "^5.7.0"
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/logger" "^5.7.0"
+    "@ethersproject/networks" "^5.7.0"
+    "@ethersproject/properties" "^5.7.0"
+    "@ethersproject/transactions" "^5.7.0"
+    "@ethersproject/web" "^5.7.0"
+
 "@ethersproject/abstract-signer@5.6.2", "@ethersproject/abstract-signer@^5.6.2":
   version "5.6.2"
   resolved "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.6.2.tgz"
@@ -1723,6 +1736,17 @@
     "@ethersproject/logger" "^5.6.0"
     "@ethersproject/properties" "^5.6.0"
 
+"@ethersproject/abstract-signer@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz#13f4f32117868452191a4649723cb086d2b596b2"
+  integrity sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==
+  dependencies:
+    "@ethersproject/abstract-provider" "^5.7.0"
+    "@ethersproject/bignumber" "^5.7.0"
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/logger" "^5.7.0"
+    "@ethersproject/properties" "^5.7.0"
+
 "@ethersproject/address@5.6.1", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.6.1":
   version "5.6.1"
   resolved "https://registry.npmjs.org/@ethersproject/address/-/address-5.6.1.tgz"
@@ -1734,6 +1758,17 @@
     "@ethersproject/logger" "^5.6.0"
     "@ethersproject/rlp" "^5.6.1"
 
+"@ethersproject/address@^5", "@ethersproject/address@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.7.0.tgz#19b56c4d74a3b0a46bfdbb6cfcc0a153fc697f37"
+  integrity sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==
+  dependencies:
+    "@ethersproject/bignumber" "^5.7.0"
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/keccak256" "^5.7.0"
+    "@ethersproject/logger" "^5.7.0"
+    "@ethersproject/rlp" "^5.7.0"
+
 "@ethersproject/base64@5.6.1", "@ethersproject/base64@^5.6.1":
   version "5.6.1"
   resolved "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.6.1.tgz"
@@ -1741,6 +1776,13 @@
   dependencies:
     "@ethersproject/bytes" "^5.6.1"
 
+"@ethersproject/base64@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.7.0.tgz#ac4ee92aa36c1628173e221d0d01f53692059e1c"
+  integrity sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==
+  dependencies:
+    "@ethersproject/bytes" "^5.7.0"
+
 "@ethersproject/basex@5.6.1", "@ethersproject/basex@^5.6.1":
   version "5.6.1"
   resolved "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.6.1.tgz"
@@ -1749,6 +1791,14 @@
     "@ethersproject/bytes" "^5.6.1"
     "@ethersproject/properties" "^5.6.0"
 
+"@ethersproject/basex@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.7.0.tgz#97034dc7e8938a8ca943ab20f8a5e492ece4020b"
+  integrity sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==
+  dependencies:
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/properties" "^5.7.0"
+
 "@ethersproject/bignumber@5.6.2", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.6.2":
   version "5.6.2"
   resolved "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.6.2.tgz"
@@ -1758,6 +1808,15 @@
     "@ethersproject/logger" "^5.6.0"
     bn.js "^5.2.1"
 
+"@ethersproject/bignumber@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.7.0.tgz#e2f03837f268ba655ffba03a57853e18a18dc9c2"
+  integrity sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw==
+  dependencies:
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/logger" "^5.7.0"
+    bn.js "^5.2.1"
+
 "@ethersproject/bytes@5.6.1", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.6.1":
   version "5.6.1"
   resolved "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.6.1.tgz"
@@ -1765,6 +1824,13 @@
   dependencies:
     "@ethersproject/logger" "^5.6.0"
 
+"@ethersproject/bytes@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.7.0.tgz#a00f6ea8d7e7534d6d87f47188af1148d71f155d"
+  integrity sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A==
+  dependencies:
+    "@ethersproject/logger" "^5.7.0"
+
 "@ethersproject/constants@5.6.1", "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.6.1":
   version "5.6.1"
   resolved "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.6.1.tgz"
@@ -1772,6 +1838,13 @@
   dependencies:
     "@ethersproject/bignumber" "^5.6.2"
 
+"@ethersproject/constants@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.7.0.tgz#df80a9705a7e08984161f09014ea012d1c75295e"
+  integrity sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA==
+  dependencies:
+    "@ethersproject/bignumber" "^5.7.0"
+
 "@ethersproject/contracts@5.6.2":
   version "5.6.2"
   resolved "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.6.2.tgz"
@@ -1802,6 +1875,21 @@
     "@ethersproject/properties" "^5.6.0"
     "@ethersproject/strings" "^5.6.1"
 
+"@ethersproject/hash@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.7.0.tgz#eb7aca84a588508369562e16e514b539ba5240a7"
+  integrity sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==
+  dependencies:
+    "@ethersproject/abstract-signer" "^5.7.0"
+    "@ethersproject/address" "^5.7.0"
+    "@ethersproject/base64" "^5.7.0"
+    "@ethersproject/bignumber" "^5.7.0"
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/keccak256" "^5.7.0"
+    "@ethersproject/logger" "^5.7.0"
+    "@ethersproject/properties" "^5.7.0"
+    "@ethersproject/strings" "^5.7.0"
+
 "@ethersproject/hdnode@5.6.2", "@ethersproject/hdnode@^5.6.2":
   version "5.6.2"
   resolved "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.6.2.tgz"
@@ -1847,11 +1935,24 @@
     "@ethersproject/bytes" "^5.6.1"
     js-sha3 "0.8.0"
 
+"@ethersproject/keccak256@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.7.0.tgz#3186350c6e1cd6aba7940384ec7d6d9db01f335a"
+  integrity sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg==
+  dependencies:
+    "@ethersproject/bytes" "^5.7.0"
+    js-sha3 "0.8.0"
+
 "@ethersproject/logger@5.6.0", "@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.6.0":
   version "5.6.0"
   resolved "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.6.0.tgz"
   integrity sha512-BiBWllUROH9w+P21RzoxJKzqoqpkyM1pRnEKG69bulE9TSQD8SAIvTQqIMZmmCO8pUNkgLP1wndX1gKghSpBmg==
 
+"@ethersproject/logger@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.7.0.tgz#6ce9ae168e74fecf287be17062b590852c311892"
+  integrity sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig==
+
 "@ethersproject/networks@5.6.4", "@ethersproject/networks@^5.6.3":
   version "5.6.4"
   resolved "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.6.4.tgz"
@@ -1859,6 +1960,13 @@
   dependencies:
     "@ethersproject/logger" "^5.6.0"
 
+"@ethersproject/networks@^5.7.0":
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.1.tgz#118e1a981d757d45ccea6bb58d9fd3d9db14ead6"
+  integrity sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==
+  dependencies:
+    "@ethersproject/logger" "^5.7.0"
+
 "@ethersproject/pbkdf2@5.6.1", "@ethersproject/pbkdf2@^5.6.1":
   version "5.6.1"
   resolved "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.6.1.tgz"
@@ -1874,6 +1982,13 @@
   dependencies:
     "@ethersproject/logger" "^5.6.0"
 
+"@ethersproject/properties@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.7.0.tgz#a6e12cb0439b878aaf470f1902a176033067ed30"
+  integrity sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==
+  dependencies:
+    "@ethersproject/logger" "^5.7.0"
+
 "@ethersproject/providers@5.6.8":
   version "5.6.8"
   resolved "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.6.8.tgz"
@@ -1900,6 +2015,32 @@
     bech32 "1.1.4"
     ws "7.4.6"
 
+"@ethersproject/providers@^5":
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.1.tgz#b0799b616d5579cd1067a8ebf1fc1ec74c1e122c"
+  integrity sha512-vZveG/DLyo+wk4Ga1yx6jSEHrLPgmTt+dFv0dv8URpVCRf0jVhalps1jq/emN/oXnMRsC7cQgAF32DcXLL7BPQ==
+  dependencies:
+    "@ethersproject/abstract-provider" "^5.7.0"
+    "@ethersproject/abstract-signer" "^5.7.0"
+    "@ethersproject/address" "^5.7.0"
+    "@ethersproject/base64" "^5.7.0"
+    "@ethersproject/basex" "^5.7.0"
+    "@ethersproject/bignumber" "^5.7.0"
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/constants" "^5.7.0"
+    "@ethersproject/hash" "^5.7.0"
+    "@ethersproject/logger" "^5.7.0"
+    "@ethersproject/networks" "^5.7.0"
+    "@ethersproject/properties" "^5.7.0"
+    "@ethersproject/random" "^5.7.0"
+    "@ethersproject/rlp" "^5.7.0"
+    "@ethersproject/sha2" "^5.7.0"
+    "@ethersproject/strings" "^5.7.0"
+    "@ethersproject/transactions" "^5.7.0"
+    "@ethersproject/web" "^5.7.0"
+    bech32 "1.1.4"
+    ws "7.4.6"
+
 "@ethersproject/random@5.6.1", "@ethersproject/random@^5.6.1":
   version "5.6.1"
   resolved "https://registry.npmjs.org/@ethersproject/random/-/random-5.6.1.tgz"
@@ -1908,6 +2049,14 @@
     "@ethersproject/bytes" "^5.6.1"
     "@ethersproject/logger" "^5.6.0"
 
+"@ethersproject/random@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.7.0.tgz#af19dcbc2484aae078bb03656ec05df66253280c"
+  integrity sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==
+  dependencies:
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/logger" "^5.7.0"
+
 "@ethersproject/rlp@5.6.1", "@ethersproject/rlp@^5.6.1":
   version "5.6.1"
   resolved "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.6.1.tgz"
@@ -1916,6 +2065,14 @@
     "@ethersproject/bytes" "^5.6.1"
     "@ethersproject/logger" "^5.6.0"
 
+"@ethersproject/rlp@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.7.0.tgz#de39e4d5918b9d74d46de93af80b7685a9c21304"
+  integrity sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==
+  dependencies:
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/logger" "^5.7.0"
+
 "@ethersproject/sha2@5.6.1", "@ethersproject/sha2@^5.6.1":
   version "5.6.1"
   resolved "https://registry.npmjs.org/@ethersproject/sha2/-/sha2-5.6.1.tgz"
@@ -1925,6 +2082,15 @@
     "@ethersproject/logger" "^5.6.0"
     hash.js "1.1.7"
 
+"@ethersproject/sha2@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.7.0.tgz#9a5f7a7824ef784f7f7680984e593a800480c9fb"
+  integrity sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw==
+  dependencies:
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/logger" "^5.7.0"
+    hash.js "1.1.7"
+
 "@ethersproject/signing-key@5.6.2", "@ethersproject/signing-key@^5.6.2":
   version "5.6.2"
   resolved "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.6.2.tgz"
@@ -1937,6 +2103,18 @@
     elliptic "6.5.4"
     hash.js "1.1.7"
 
+"@ethersproject/signing-key@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.7.0.tgz#06b2df39411b00bc57c7c09b01d1e41cf1b16ab3"
+  integrity sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==
+  dependencies:
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/logger" "^5.7.0"
+    "@ethersproject/properties" "^5.7.0"
+    bn.js "^5.2.1"
+    elliptic "6.5.4"
+    hash.js "1.1.7"
+
 "@ethersproject/solidity@5.6.1":
   version "5.6.1"
   resolved "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.6.1.tgz"
@@ -1958,6 +2136,15 @@
     "@ethersproject/constants" "^5.6.1"
     "@ethersproject/logger" "^5.6.0"
 
+"@ethersproject/strings@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.7.0.tgz#54c9d2a7c57ae8f1205c88a9d3a56471e14d5ed2"
+  integrity sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg==
+  dependencies:
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/constants" "^5.7.0"
+    "@ethersproject/logger" "^5.7.0"
+
 "@ethersproject/transactions@5.6.2", "@ethersproject/transactions@^5.6.2":
   version "5.6.2"
   resolved "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.6.2.tgz"
@@ -1973,6 +2160,21 @@
     "@ethersproject/rlp" "^5.6.1"
     "@ethersproject/signing-key" "^5.6.2"
 
+"@ethersproject/transactions@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b"
+  integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==
+  dependencies:
+    "@ethersproject/address" "^5.7.0"
+    "@ethersproject/bignumber" "^5.7.0"
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/constants" "^5.7.0"
+    "@ethersproject/keccak256" "^5.7.0"
+    "@ethersproject/logger" "^5.7.0"
+    "@ethersproject/properties" "^5.7.0"
+    "@ethersproject/rlp" "^5.7.0"
+    "@ethersproject/signing-key" "^5.7.0"
+
 "@ethersproject/units@5.6.1":
   version "5.6.1"
   resolved "https://registry.npmjs.org/@ethersproject/units/-/units-5.6.1.tgz"
@@ -2014,6 +2216,17 @@
     "@ethersproject/properties" "^5.6.0"
     "@ethersproject/strings" "^5.6.1"
 
+"@ethersproject/web@^5.7.0":
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.7.1.tgz#de1f285b373149bee5928f4eb7bcb87ee5fbb4ae"
+  integrity sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==
+  dependencies:
+    "@ethersproject/base64" "^5.7.0"
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/logger" "^5.7.0"
+    "@ethersproject/properties" "^5.7.0"
+    "@ethersproject/strings" "^5.7.0"
+
 "@ethersproject/wordlists@5.6.1", "@ethersproject/wordlists@^5.6.1":
   version "5.6.1"
   resolved "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.6.1.tgz"
@@ -2484,6 +2697,31 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@json-rpc-tools/provider@^1.5.5":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@json-rpc-tools/provider/-/provider-1.7.6.tgz#8a17c34c493fa892632e278fd9331104e8491ec6"
+  integrity sha512-z7D3xvJ33UfCGv77n40lbzOYjZKVM3k2+5cV7xS8G6SCvKTzMkhkUYuD/qzQUNT4cG/lv0e9mRToweEEVLVVmA==
+  dependencies:
+    "@json-rpc-tools/utils" "^1.7.6"
+    axios "^0.21.0"
+    safe-json-utils "^1.1.1"
+    ws "^7.4.0"
+
+"@json-rpc-tools/types@^1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@json-rpc-tools/types/-/types-1.7.6.tgz#5abd5fde01364a130c46093b501715bcce5bdc0e"
+  integrity sha512-nDSqmyRNEqEK9TZHtM15uNnDljczhCUdBmRhpNZ95bIPKEDQ+nTDmGMFd2lLin3upc5h2VVVd9tkTDdbXUhDIQ==
+  dependencies:
+    keyvaluestorage-interface "^1.0.0"
+
+"@json-rpc-tools/utils@^1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@json-rpc-tools/utils/-/utils-1.7.6.tgz#67f04987dbaa2e7adb6adff1575367b75a9a9ba1"
+  integrity sha512-HjA8x/U/Q78HRRe19yh8HVKoZ+Iaoo3YZjakJYxR+rw52NHo6jM+VE9b8+7ygkCFXl/EHID5wh/MkXaE/jGyYw==
+  dependencies:
+    "@json-rpc-tools/types" "^1.7.6"
+    "@pedrouid/environment" "^1.0.1"
+
 "@lerna/add@5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@lerna/add/-/add-5.3.0.tgz#2e6cd5ff3d8bad2b0b36cdeaa300fc39fbae215e"
@@ -3503,6 +3741,11 @@
     node-addon-api "^3.2.1"
     node-gyp-build "^4.3.0"
 
+"@pedrouid/environment@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@pedrouid/environment/-/environment-1.0.1.tgz#858f0f8a057340e0b250398b75ead77d6f4342ec"
+  integrity sha512-HaW78NszGzRZd9SeoI3JD11JqY+lubnaOx7Pewj5pfjqWXOEATpeKIFb9Z4t2WBUK2iryiXX3lzWwmYWgUL0Ug==
+
 "@pmmmwh/react-refresh-webpack-plugin@0.4.3":
   version "0.4.3"
   resolved "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz"
@@ -4553,6 +4796,255 @@
     "@typescript-eslint/types" "4.33.0"
     eslint-visitor-keys "^2.0.0"
 
+"@walletconnect/browser-utils@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/browser-utils/-/browser-utils-1.8.0.tgz#33c10e777aa6be86c713095b5206d63d32df0951"
+  integrity sha512-Wcqqx+wjxIo9fv6eBUFHPsW1y/bGWWRboni5dfD8PtOmrihrEpOCmvRJe4rfl7xgJW8Ea9UqKEaq0bIRLHlK4A==
+  dependencies:
+    "@walletconnect/safe-json" "1.0.0"
+    "@walletconnect/types" "^1.8.0"
+    "@walletconnect/window-getters" "1.0.0"
+    "@walletconnect/window-metadata" "1.0.0"
+    detect-browser "5.2.0"
+
+"@walletconnect/client@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/client/-/client-1.8.0.tgz#6f46b5499c7c861c651ff1ebe5da5b66225ca696"
+  integrity sha512-svyBQ14NHx6Cs2j4TpkQaBI/2AF4+LXz64FojTjMtV4VMMhl81jSO1vNeg+yYhQzvjcGH/GpSwixjyCW0xFBOQ==
+  dependencies:
+    "@walletconnect/core" "^1.8.0"
+    "@walletconnect/iso-crypto" "^1.8.0"
+    "@walletconnect/types" "^1.8.0"
+    "@walletconnect/utils" "^1.8.0"
+
+"@walletconnect/core@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-1.8.0.tgz#6b2748b90c999d9d6a70e52e26a8d5e8bfeaa81e"
+  integrity sha512-aFTHvEEbXcZ8XdWBw6rpQDte41Rxwnuk3SgTD8/iKGSRTni50gI9S3YEzMj05jozSiOBxQci4pJDMVhIUMtarw==
+  dependencies:
+    "@walletconnect/socket-transport" "^1.8.0"
+    "@walletconnect/types" "^1.8.0"
+    "@walletconnect/utils" "^1.8.0"
+
+"@walletconnect/crypto@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@walletconnect/crypto/-/crypto-1.0.2.tgz#3fcc2b2cde6f529a19eadd883dc555cd0e861992"
+  integrity sha512-+OlNtwieUqVcOpFTvLBvH+9J9pntEqH5evpINHfVxff1XIgwV55PpbdvkHu6r9Ib4WQDOFiD8OeeXs1vHw7xKQ==
+  dependencies:
+    "@walletconnect/encoding" "^1.0.1"
+    "@walletconnect/environment" "^1.0.0"
+    "@walletconnect/randombytes" "^1.0.2"
+    aes-js "^3.1.2"
+    hash.js "^1.1.7"
+
+"@walletconnect/encoding@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/encoding/-/encoding-1.0.1.tgz#93c18ce9478c3d5283dbb88c41eb2864b575269a"
+  integrity sha512-8opL2rs6N6E3tJfsqwS82aZQDL3gmupWUgmvuZ3CGU7z/InZs3R9jkzH8wmYtpbq0sFK3WkJkQRZFFk4BkrmFA==
+  dependencies:
+    is-typedarray "1.0.0"
+    typedarray-to-buffer "3.1.5"
+
+"@walletconnect/environment@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/environment/-/environment-1.0.0.tgz#c4545869fa9c389ec88c364e1a5f8178e8ab5034"
+  integrity sha512-4BwqyWy6KpSvkocSaV7WR3BlZfrxLbJSLkg+j7Gl6pTDE+U55lLhJvQaMuDVazXYxcjBsG09k7UlH7cGiUI5vQ==
+
+"@walletconnect/ethereum-provider@^1.7.5":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-1.8.0.tgz#ed1dbf9cecc3b818758a060d2f9017c50bde1d32"
+  integrity sha512-Nq9m+oo5P0F+njsROHw9KMWdoc/8iGHYzQdkjJN/1C7DtsqFRg5k5a3hd9rzCLpbPsOC1q8Z5lRs6JQgDvPm6Q==
+  dependencies:
+    "@walletconnect/client" "^1.8.0"
+    "@walletconnect/jsonrpc-http-connection" "^1.0.2"
+    "@walletconnect/jsonrpc-provider" "^1.0.5"
+    "@walletconnect/signer-connection" "^1.8.0"
+    "@walletconnect/types" "^1.8.0"
+    "@walletconnect/utils" "^1.8.0"
+    eip1193-provider "1.0.1"
+    eventemitter3 "4.0.7"
+
+"@walletconnect/iso-crypto@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/iso-crypto/-/iso-crypto-1.8.0.tgz#44ddf337c4f02837c062dbe33fa7ab36789df451"
+  integrity sha512-pWy19KCyitpfXb70hA73r9FcvklS+FvO9QUIttp3c2mfW8frxgYeRXfxLRCIQTkaYueRKvdqPjbyhPLam508XQ==
+  dependencies:
+    "@walletconnect/crypto" "^1.0.2"
+    "@walletconnect/types" "^1.8.0"
+    "@walletconnect/utils" "^1.8.0"
+
+"@walletconnect/jsonrpc-http-connection@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-http-connection/-/jsonrpc-http-connection-1.0.3.tgz#0343811bb33fb8a3823cb3306b306cf2ed61e99a"
+  integrity sha512-npPvDG2JxyxoqOphDiyjp5pPeASRBrlfQS39wHESPHlFIjBuvNt9lV9teh53MK9Ncbyxh4y2qEKMfPgcUulTRg==
+  dependencies:
+    "@walletconnect/jsonrpc-utils" "^1.0.3"
+    "@walletconnect/safe-json" "^1.0.0"
+    cross-fetch "^3.1.4"
+
+"@walletconnect/jsonrpc-provider@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-provider/-/jsonrpc-provider-1.0.5.tgz#1a66053b6f083a9885a32b7c2c8f6a376f1a4458"
+  integrity sha512-v61u4ZIV8+p9uIHS2Kl2YRj/2idrQiHcrbrJXw3McQkEJtj9mkCofr1Hu/n419wSRM5uiNK8Z4WRS9zGTTAhWQ==
+  dependencies:
+    "@walletconnect/jsonrpc-utils" "^1.0.3"
+    "@walletconnect/safe-json" "^1.0.0"
+
+"@walletconnect/jsonrpc-types@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.1.tgz#a96b4bb2bcc8838a70e06f15c1b5ab11c47d8e95"
+  integrity sha512-+6coTtOuChCqM+AoYyi4Q83p9l/laI6NvuM2/AHaZFuf0gT0NjW7IX2+86qGyizn7Ptq4AYZmfxurAxTnhefuw==
+  dependencies:
+    keyvaluestorage-interface "^1.0.0"
+
+"@walletconnect/jsonrpc-utils@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-utils/-/jsonrpc-utils-1.0.3.tgz#5bd49865eef0eae48e8b45a06731dc18691cf8c7"
+  integrity sha512-3yb49bPk16MNLk6uIIHPSHQCpD6UAo1OMOx1rM8cW/MPEAYAzrSW5hkhG7NEUwX9SokRIgnZK3QuQkiyNzBMhQ==
+  dependencies:
+    "@walletconnect/environment" "^1.0.0"
+    "@walletconnect/jsonrpc-types" "^1.0.1"
+
+"@walletconnect/mobile-registry@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/mobile-registry/-/mobile-registry-1.4.0.tgz#502cf8ab87330841d794819081e748ebdef7aee5"
+  integrity sha512-ZtKRio4uCZ1JUF7LIdecmZt7FOLnX72RPSY7aUVu7mj7CSfxDwUn6gBuK6WGtH+NZCldBqDl5DenI5fFSvkKYw==
+
+"@walletconnect/qrcode-modal@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.8.0.tgz#ddd6f5c9b7ee52c16adf9aacec2a3eac4994caea"
+  integrity sha512-BueaFefaAi8mawE45eUtztg3ZFbsAH4DDXh1UNwdUlsvFMjqcYzLUG0xZvDd6z2eOpbgDg2N3bl6gF0KONj1dg==
+  dependencies:
+    "@walletconnect/browser-utils" "^1.8.0"
+    "@walletconnect/mobile-registry" "^1.4.0"
+    "@walletconnect/types" "^1.8.0"
+    copy-to-clipboard "^3.3.1"
+    preact "10.4.1"
+    qrcode "1.4.4"
+
+"@walletconnect/randombytes@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@walletconnect/randombytes/-/randombytes-1.0.2.tgz#95c644251a15e6675f58fbffc9513a01486da49c"
+  integrity sha512-ivgOtAyqQnN0rLQmOFPemsgYGysd/ooLfaDA/ACQ3cyqlca56t3rZc7pXfqJOIETx/wSyoF5XbwL+BqYodw27A==
+  dependencies:
+    "@walletconnect/encoding" "^1.0.1"
+    "@walletconnect/environment" "^1.0.0"
+    randombytes "^2.1.0"
+
+"@walletconnect/safe-json@1.0.0", "@walletconnect/safe-json@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/safe-json/-/safe-json-1.0.0.tgz#12eeb11d43795199c045fafde97e3c91646683b2"
+  integrity sha512-QJzp/S/86sUAgWY6eh5MKYmSfZaRpIlmCJdi5uG4DJlKkZrHEF7ye7gA+VtbVzvTtpM/gRwO2plQuiooIeXjfg==
+
+"@walletconnect/signer-connection@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/signer-connection/-/signer-connection-1.8.0.tgz#6cdf490df770e504cc1a550bdb5bac7696b130bc"
+  integrity sha512-+YAaTAP52MWZJ2wWnqKClKCPlPHBo6reURFe0cWidLADh9mi/kPWGALZ5AENK22zpem1bbKV466rF5Rzvu0ehA==
+  dependencies:
+    "@walletconnect/client" "^1.8.0"
+    "@walletconnect/jsonrpc-types" "^1.0.1"
+    "@walletconnect/jsonrpc-utils" "^1.0.3"
+    "@walletconnect/qrcode-modal" "^1.8.0"
+    "@walletconnect/types" "^1.8.0"
+    eventemitter3 "4.0.7"
+
+"@walletconnect/socket-transport@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/socket-transport/-/socket-transport-1.8.0.tgz#9a1128a249628a0be11a0979b522fe82b44afa1b"
+  integrity sha512-5DyIyWrzHXTcVp0Vd93zJ5XMW61iDM6bcWT4p8DTRfFsOtW46JquruMhxOLeCOieM4D73kcr3U7WtyR4JUsGuQ==
+  dependencies:
+    "@walletconnect/types" "^1.8.0"
+    "@walletconnect/utils" "^1.8.0"
+    ws "7.5.3"
+
+"@walletconnect/types@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.8.0.tgz#3f5e85b2d6b149337f727ab8a71b8471d8d9a195"
+  integrity sha512-Cn+3I0V0vT9ghMuzh1KzZvCkiAxTq+1TR2eSqw5E5AVWfmCtECFkVZBP6uUJZ8YjwLqXheI+rnjqPy7sVM4Fyg==
+
+"@walletconnect/utils@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-1.8.0.tgz#2591a197c1fa7429941fe428876088fda6632060"
+  integrity sha512-zExzp8Mj1YiAIBfKNm5u622oNw44WOESzo6hj+Q3apSMIb0Jph9X3GDIdbZmvVZsNPxWDL7uodKgZcCInZv2vA==
+  dependencies:
+    "@walletconnect/browser-utils" "^1.8.0"
+    "@walletconnect/encoding" "^1.0.1"
+    "@walletconnect/jsonrpc-utils" "^1.0.3"
+    "@walletconnect/types" "^1.8.0"
+    bn.js "4.11.8"
+    js-sha3 "0.8.0"
+    query-string "6.13.5"
+
+"@walletconnect/window-getters@1.0.0", "@walletconnect/window-getters@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/window-getters/-/window-getters-1.0.0.tgz#1053224f77e725dfd611c83931b5f6c98c32bfc8"
+  integrity sha512-xB0SQsLaleIYIkSsl43vm8EwETpBzJ2gnzk7e0wMF3ktqiTGS6TFHxcprMl5R44KKh4tCcHCJwolMCaDSwtAaA==
+
+"@walletconnect/window-metadata@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@walletconnect/window-metadata/-/window-metadata-1.0.0.tgz#93b1cc685e6b9b202f29c26be550fde97800c4e5"
+  integrity sha512-9eFvmJxIKCC3YWOL97SgRkKhlyGXkrHwamfechmqszbypFspaSk+t2jQXAEU7YClHF6Qjw5eYOmy1//zFi9/GA==
+  dependencies:
+    "@walletconnect/window-getters" "^1.0.0"
+
+"@web3-react/core@8.0.35-beta.0":
+  version "8.0.35-beta.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/core/-/core-8.0.35-beta.0.tgz#8667483bdbc283fc8377d7f56faba1ec2fcdb095"
+  integrity sha512-vkEL2Vafu57lTA9T/cd3DNkZoDZ3G/JDUgxgjHqKLQVF4bPucrkeErqIHutAJ4suIi4bLOD0dFPMpFs+Bq7RgA==
+  dependencies:
+    "@web3-react/store" "^8.0.25-beta.0"
+    "@web3-react/types" "^8.0.20-beta.0"
+    zustand "^4.0.0-rc.0"
+  optionalDependencies:
+    "@ethersproject/providers" "^5"
+
+"@web3-react/eip1193@8.0.26-beta.0":
+  version "8.0.26-beta.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/eip1193/-/eip1193-8.0.26-beta.0.tgz#2e36423bab637a1fbc57b36d4f0f38ac531fd541"
+  integrity sha512-n/2ajjABcP8DktZfXxSHrxtPIxeSRJ9tsgfmd9XPEIW9FO7xLzLrF+nloTSghtZ8H+ZKKcswlKjYq4rbX/oqHg==
+  dependencies:
+    "@web3-react/types" "^8.0.20-beta.0"
+
+"@web3-react/metamask@8.0.28-beta.0":
+  version "8.0.28-beta.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/metamask/-/metamask-8.0.28-beta.0.tgz#f7e9e0de446727a961745cbec75c8cbf6c961388"
+  integrity sha512-IXuVyj6vhRAhfGQ/sN4qgET8EEdqX844pB4kCDG9kjPD3LLm5kq47ykBosgTr9YCUtdHAXN0UaUimD0TbLMRFg==
+  dependencies:
+    "@metamask/detect-provider" "^1.2.0"
+    "@web3-react/types" "^8.0.20-beta.0"
+
+"@web3-react/store@^8.0.25-beta.0":
+  version "8.0.25-beta.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/store/-/store-8.0.25-beta.0.tgz#853a029a9f82d8950e306adb455ba308f908c8f4"
+  integrity sha512-YHrZ42EHiQ9UAJq8Y/pHsyXu6GhzbCSHaQJ9U0wCDhbPoQ9QjOj0Pwcaa/VLXljuynK/7ERP942nI1IzArt9Sg==
+  dependencies:
+    "@ethersproject/address" "^5"
+    "@web3-react/types" "^8.0.20-beta.0"
+    zustand "^4.0.0-rc.0"
+
+"@web3-react/types@8.0.20-beta.0", "@web3-react/types@^8.0.20-beta.0":
+  version "8.0.20-beta.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/types/-/types-8.0.20-beta.0.tgz#6b4509bef8c5c7eb866e49295880c865c20fb565"
+  integrity sha512-qOZYMyUmsm3Um6t6Pg3OgnE86ufhWZpB5/VxsooB8cdpXc/C/f8KMyYSeM63GoKSMScOKwfqV6yODFL7g/Qc8g==
+  dependencies:
+    zustand "^4.0.0-rc.0"
+
+"@web3-react/url@8.0.25-beta.0":
+  version "8.0.25-beta.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/url/-/url-8.0.25-beta.0.tgz#68e464d2e78b89496e50e9e4a28e91281c4d53d6"
+  integrity sha512-cjFfAFjsWF5vqJ7TG79HT72jNNWlcS9bqbNK2jvu25zej62zMpPvy4iyYiV7zy2SLbAQTdsgvIMYAdxRbnzlWg==
+  dependencies:
+    "@ethersproject/providers" "^5"
+    "@web3-react/types" "^8.0.20-beta.0"
+
+"@web3-react/walletconnect@8.0.35-beta.0":
+  version "8.0.35-beta.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/walletconnect/-/walletconnect-8.0.35-beta.0.tgz#49c6c77447d58bfb295f28fa87c8fbfeec95cff5"
+  integrity sha512-fUrqcnwAr5oecZ6VUE/7+RSVURrohbAgWMLKYxd8Zo47AtTPzgJ1t5Lydh/EX4xJPLhfK1LqX5YgMwiys3DvhQ==
+  dependencies:
+    "@web3-react/types" "^8.0.20-beta.0"
+    eventemitter3 "^4.0.7"
+
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz"
@@ -4820,6 +5312,11 @@ aes-js@3.0.0:
   resolved "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz"
   integrity sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==
 
+aes-js@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.2.tgz#db9aabde85d5caabbfc0d4f2a4446960f627146a"
+  integrity sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ==
+
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"
@@ -5306,6 +5803,13 @@ axe-core@^4.3.5:
   resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.3.5.tgz"
   integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==
 
+axios@^0.21.0:
+  version "0.21.4"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
+  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
+  dependencies:
+    follow-redirects "^1.14.0"
+
 axios@^0.27.2:
   version "0.27.2"
   resolved "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"
@@ -5711,6 +6215,11 @@ bn.js@4.11.6:
   resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz"
   integrity sha1-UzRK2xRhehP26N0s4okF0cC6MhU=
 
+bn.js@4.11.8:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
   version "4.11.9"
   resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz"
@@ -5961,11 +6470,34 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==
+
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
+buffer-from@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+
 buffer-indexof@^1.0.0:
   version "1.1.1"
   resolved "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"
@@ -5998,7 +6530,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-buffer@^5.0.5, buffer@^5.5.0, buffer@^5.6.0:
+buffer@^5.0.5, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -7660,6 +8192,11 @@ destroy@~1.0.4:
   resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
+detect-browser@5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.2.0.tgz#c9cd5afa96a6a19fda0bbe9e9be48a6b6e1e9c97"
+  integrity sha512-tr7XntDAu50BVENgQfajMLzacmSe34D+qZc4zjnniz0ZVuw/TZcLcyxHQjYpJTM36sGEkZZlYLnIM1hH7alTMA==
+
 detect-browser@^5.2.0:
   version "5.3.0"
   resolved "https://registry.npmjs.org/detect-browser/-/detect-browser-5.3.0.tgz"
@@ -7735,6 +8272,11 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+dijkstrajs@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz#2e48c0d3b825462afe75ab4ad5e829c8ece36257"
+  integrity sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg==
+
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
@@ -7931,6 +8473,13 @@ ee-first@1.1.1:
   resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
+eip1193-provider@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/eip1193-provider/-/eip1193-provider-1.0.1.tgz#420d29cf4f6c443e3f32e718fb16fafb250637c3"
+  integrity sha512-kSuqwQ26d7CzuS/t3yRXo2Su2cVH0QfvyKbr2H7Be7O5YDyIq4hQGCNTo5wRdP07bt+E2R/8nPCzey4ojBHf7g==
+  dependencies:
+    "@json-rpc-tools/provider" "^1.5.5"
+
 ejs@^2.6.1:
   version "2.7.4"
   resolved "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz"
@@ -8667,7 +9216,7 @@ eventemitter3@4.0.4:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
   integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
 
-eventemitter3@^4.0.0, eventemitter3@^4.0.4:
+eventemitter3@4.0.7, eventemitter3@^4.0.0, eventemitter3@^4.0.4, eventemitter3@^4.0.7:
   version "4.0.7"
   resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
@@ -9190,6 +9739,11 @@ follow-redirects@^1.0.0, follow-redirects@^1.14.9:
   resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz"
   integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
 
+follow-redirects@^1.14.0:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+
 for-each@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
@@ -10953,7 +11507,7 @@ is-typed-array@^1.1.3, is-typed-array@^1.1.9:
     for-each "^0.3.3"
     has-tostringtag "^1.0.0"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+is-typedarray@1.0.0, is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -10997,6 +11551,11 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
+isarray@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
@@ -12266,6 +12825,11 @@ keyv@^4.0.0:
     compress-brotli "^1.3.8"
     json-buffer "3.0.1"
 
+keyvaluestorage-interface@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/keyvaluestorage-interface/-/keyvaluestorage-interface-1.0.0.tgz#13ebdf71f5284ad54be94bd1ad9ed79adad515ff"
+  integrity sha512-8t6Q3TclQ4uZynJY9IGr2+SsIGwK9JHcO6ootkHCGA0CrQCRy+VkouYNO2xicET6b9al7QKzpebNow+gkpCL8g==
+
 killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz"
@@ -14432,6 +14996,11 @@ pkg-up@3.1.0:
   dependencies:
     find-up "^3.0.0"
 
+pngjs@^3.3.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
+  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
+
 pnp-webpack-plugin@1.6.4:
   version "1.6.4"
   resolved "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz"
@@ -15124,6 +15693,11 @@ postcss@^8.1.0:
     picocolors "^1.0.0"
     source-map-js "^1.0.1"
 
+preact@10.4.1:
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/preact/-/preact-10.4.1.tgz#9b3ba020547673a231c6cf16f0fbaef0e8863431"
+  integrity sha512-WKrRpCSwL2t3tpOOGhf2WfTpcmbpxaWtDbdJdKdjd0aEiTkvOmS4NBkG6kzlaAHI9AkQ3iVqbFWM3Ei7mZ4o1Q==
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
@@ -15373,6 +15947,19 @@ qr.js@0.0.0:
   resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
   integrity sha512-c4iYnWb+k2E+vYpRimHqSu575b1/wKl4XFeJGpFmrJQz5I88v9aY2czh7s0w36srfCM1sXgC/xpoJz5dJfq+OQ==
 
+qrcode@1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.4.4.tgz#f0c43568a7e7510a55efc3b88d9602f71963ea83"
+  integrity sha512-oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q==
+  dependencies:
+    buffer "^5.4.3"
+    buffer-alloc "^1.2.0"
+    buffer-from "^1.1.1"
+    dijkstrajs "^1.0.1"
+    isarray "^2.0.1"
+    pngjs "^3.3.0"
+    yargs "^13.2.4"
+
 qs@6.10.3:
   version "6.10.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
@@ -15390,6 +15977,15 @@ qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
   integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
 
+query-string@6.13.5:
+  version "6.13.5"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.5.tgz#99e95e2fb7021db90a6f373f990c0c814b3812d8"
+  integrity sha512-svk3xg9qHR39P3JlHuD7g3nRnyay5mHbrPctEBDUxUkHRifPHXJDhBUycdCC0NBjXoDf44Gb+IsOZL1Uwn8M/Q==
+  dependencies:
+    decode-uri-component "^0.2.0"
+    split-on-first "^1.0.0"
+    strict-uri-encode "^2.0.0"
+
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz"
@@ -16563,6 +17159,11 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0,
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-json-utils@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/safe-json-utils/-/safe-json-utils-1.1.1.tgz#0e883874467d95ab914c3f511096b89bfb3e63b1"
+  integrity sha512-SAJWGKDs50tAbiDXLf89PDwt9XYkWyANFWVzn4dTXl5QyI8t2o/bW5/OJl3lvc2WVU4MEpTo9Yz5NVFNsp+OJQ==
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"
@@ -17200,6 +17801,11 @@ spdy@^4.0.2:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
+split-on-first@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
+  integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
+
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"
@@ -17334,6 +17940,11 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"
   integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
+strict-uri-encode@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
+  integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==
+
 string-convert@^0.2.0:
   version "0.2.1"
   resolved "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz"
@@ -18177,7 +18788,7 @@ type@^2.0.0:
   resolved "https://registry.npmjs.org/type/-/type-2.3.0.tgz"
   integrity sha512-rgPIqOdfK/4J9FhiVrZ3cveAjRRo5rsQBAIhnylX874y1DX/kEKSVdLsnuHB6l1KTjHyU01VjiMBHgU2adejyg==
 
-typedarray-to-buffer@^3.1.5:
+typedarray-to-buffer@3.1.5, typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"
   integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
@@ -18393,6 +19004,11 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
+use-sync-external-store@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
+  integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
+
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.npmjs.org/use/-/use-3.1.1.tgz"
@@ -19438,6 +20054,11 @@ ws@7.4.6:
   resolved "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz"
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
 
+ws@7.5.3:
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
+  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
+
 ws@^3.0.0:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
@@ -19454,6 +20075,11 @@ ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
+ws@^7.4.0:
+  version "7.5.9"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+
 ws@^7.4.5, ws@^7.4.6:
   version "7.5.6"
   resolved "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz"
@@ -19572,7 +20198,7 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs@^13.3.2:
+yargs@^13.2.4, yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"
   integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
@@ -19640,3 +20266,10 @@ yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+zustand@^4.0.0-rc.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.1.1.tgz#5a61cc755a002df5f041840a414ae6e9a99ee22b"
+  integrity sha512-h4F3WMqsZgvvaE0n3lThx4MM81Ls9xebjvrABNzf5+jb3/03YjNTSgZXeyrvXDArMeV9untvWXRw1tY+ntPYbA==
+  dependencies:
+    use-sync-external-store "1.2.0"

From cb815bf90f0716e55455fa4755ab702ec2510e17 Mon Sep 17 00:00:00 2001
From: RetricSu <inneverland2013@gmail.com>
Date: Sat, 8 Oct 2022 22:41:28 +0800
Subject: [PATCH 3/4] fix(test): update clientConfig with chainId

---
 packages/light-godwoken/src/__tests__/clientConfig.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/light-godwoken/src/__tests__/clientConfig.ts b/packages/light-godwoken/src/__tests__/clientConfig.ts
index 5af74f77..818e0249 100644
--- a/packages/light-godwoken/src/__tests__/clientConfig.ts
+++ b/packages/light-godwoken/src/__tests__/clientConfig.ts
@@ -70,6 +70,7 @@ export const testConfig: LightGodwokenConfigMap = {
         },
       },
       GW_POLYJUICE_RPC_URL: "https://godwoken-testnet-web3-rpc.ckbapp.dev",
+      GW_POLYJUICE_CHAIN_ID: 71393,
       SCANNER_URL: "",
       CHAIN_NAME: "",
       SCANNER_API: "",
@@ -117,6 +118,7 @@ export const testConfig: LightGodwokenConfigMap = {
         },
       },
       GW_POLYJUICE_RPC_URL: "https://godwoken-testnet-v1.ckbapp.dev",
+      GW_POLYJUICE_CHAIN_ID: 71394,
       CHAIN_NAME: "https://testnet.ckb.dev",
       SCANNER_URL: "",
       SCANNER_API: "",

From 26131230015312db21fa574cd1ef1f63bc1bd68e Mon Sep 17 00:00:00 2001
From: RetricSu <inneverland2013@gmail.com>
Date: Sun, 9 Oct 2022 09:28:42 +0800
Subject: [PATCH 4/4] chore: add wallect icon for connector

---
 .../src/assets/wallets/imtoken.svg            |  9 ++
 .../src/assets/wallets/metamask.svg           | 19 ++++
 .../src/assets/wallets/safepal.svg            |  4 +
 .../src/assets/wallets/wallet-connect.svg     |  1 +
 .../components/WalletConnect/connector.tsx    | 94 +++++++++++++------
 .../src/components/WalletConnect/index.tsx    |  6 +-
 6 files changed, 99 insertions(+), 34 deletions(-)
 create mode 100644 apps/godwoken-bridge/src/assets/wallets/imtoken.svg
 create mode 100644 apps/godwoken-bridge/src/assets/wallets/metamask.svg
 create mode 100644 apps/godwoken-bridge/src/assets/wallets/safepal.svg
 create mode 100644 apps/godwoken-bridge/src/assets/wallets/wallet-connect.svg

diff --git a/apps/godwoken-bridge/src/assets/wallets/imtoken.svg b/apps/godwoken-bridge/src/assets/wallets/imtoken.svg
new file mode 100644
index 00000000..d6561000
--- /dev/null
+++ b/apps/godwoken-bridge/src/assets/wallets/imtoken.svg
@@ -0,0 +1,9 @@
+<svg width="513" height="362" viewBox="0 0 513 362" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M508.501 14.2778C525.228 240.849 379.587 347.939 249.024 359.359C127.639 369.975 13.3804 295.388 3.3566 180.791C-4.91197 86.115 53.6025 45.8083 99.5766 41.7904C146.862 37.6455 186.598 70.2546 190.045 109.736C193.365 147.696 169.68 164.973 153.206 166.411C140.179 167.553 123.79 159.644 122.31 142.663C121.041 128.071 126.582 126.083 125.228 110.582C122.817 82.9852 98.7518 79.7708 85.5771 80.9128C69.6321 82.3085 40.7026 100.918 44.7629 147.273C48.8443 194.029 93.6765 230.974 152.445 225.835C215.865 220.294 260.021 170.915 263.341 101.658C263.311 97.99 264.083 94.3596 265.604 91.0212L265.625 90.9366C266.308 89.486 267.107 88.0928 268.014 86.7706C269.368 84.7404 271.102 82.4988 273.344 80.0457C273.365 79.9823 273.365 79.9823 273.407 79.9823C275.035 78.1425 277.002 76.1546 279.222 74.0188C306.925 47.8808 406.698 -13.7635 501.057 5.75544C503.051 6.18293 504.854 7.24383 506.195 8.77978C507.537 10.3157 508.346 12.2444 508.501 14.2778" fill="url(#paint0_linear_88_1633)"/>
+<defs>
+<linearGradient id="paint0_linear_88_1633" x1="495.636" y1="12.0198" x2="167.313" y2="476.751" gradientUnits="userSpaceOnUse">
+<stop stop-color="#11C4D1"/>
+<stop offset="1" stop-color="#0062AD"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/apps/godwoken-bridge/src/assets/wallets/metamask.svg b/apps/godwoken-bridge/src/assets/wallets/metamask.svg
new file mode 100644
index 00000000..162f8a2f
--- /dev/null
+++ b/apps/godwoken-bridge/src/assets/wallets/metamask.svg
@@ -0,0 +1,19 @@
+
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 318.6 318.6">
+  <style>
+    .st1,.st6{fill:#e4761b;stroke:#e4761b;stroke-linecap:round;stroke-linejoin:round}.st6{fill:#f6851b;stroke:#f6851b}
+  </style>
+  <path fill="#e2761b" stroke="#e2761b" stroke-linecap="round" stroke-linejoin="round" d="m274.1 35.5-99.5 73.9L193 65.8z"/>
+  <path d="m44.4 35.5 98.7 74.6-17.5-44.3zm193.9 171.3-26.5 40.6 56.7 15.6 16.3-55.3zm-204.4.9L50.1 263l56.7-15.6-26.5-40.6z" class="st1"/>
+  <path d="m103.6 138.2-15.8 23.9 56.3 2.5-2-60.5zm111.3 0-39-34.8-1.3 61.2 56.2-2.5zM106.8 247.4l33.8-16.5-29.2-22.8zm71.1-16.5 33.9 16.5-4.7-39.3z" class="st1"/>
+  <path fill="#d7c1b3" stroke="#d7c1b3" stroke-linecap="round" stroke-linejoin="round" d="m211.8 247.4-33.9-16.5 2.7 22.1-.3 9.3zm-105 0 31.5 14.9-.2-9.3 2.5-22.1z"/>
+  <path fill="#233447" stroke="#233447" stroke-linecap="round" stroke-linejoin="round" d="m138.8 193.5-28.2-8.3 19.9-9.1zm40.9 0 8.3-17.4 20 9.1z"/>
+  <path fill="#cd6116" stroke="#cd6116" stroke-linecap="round" stroke-linejoin="round" d="m106.8 247.4 4.8-40.6-31.3.9zM207 206.8l4.8 40.6 26.5-39.7zm23.8-44.7-56.2 2.5 5.2 28.9 8.3-17.4 20 9.1zm-120.2 23.1 20-9.1 8.2 17.4 5.3-28.9-56.3-2.5z"/>
+  <path fill="#e4751f" stroke="#e4751f" stroke-linecap="round" stroke-linejoin="round" d="m87.8 162.1 23.6 46-.8-22.9zm120.3 23.1-1 22.9 23.7-46zm-64-20.6-5.3 28.9 6.6 34.1 1.5-44.9zm30.5 0-2.7 18 1.2 45 6.7-34.1z"/>
+  <path d="m179.8 193.5-6.7 34.1 4.8 3.3 29.2-22.8 1-22.9zm-69.2-8.3.8 22.9 29.2 22.8 4.8-3.3-6.6-34.1z" class="st6"/>
+  <path fill="#c0ad9e" stroke="#c0ad9e" stroke-linecap="round" stroke-linejoin="round" d="m180.3 262.3.3-9.3-2.5-2.2h-37.7l-2.3 2.2.2 9.3-31.5-14.9 11 9 22.3 15.5h38.3l22.4-15.5 11-9z"/>
+  <path fill="#161616" stroke="#161616" stroke-linecap="round" stroke-linejoin="round" d="m177.9 230.9-4.8-3.3h-27.7l-4.8 3.3-2.5 22.1 2.3-2.2h37.7l2.5 2.2z"/>
+  <path fill="#763d16" stroke="#763d16" stroke-linecap="round" stroke-linejoin="round" d="m278.3 114.2 8.5-40.8-12.7-37.9-96.2 71.4 37 31.3 52.3 15.3 11.6-13.5-5-3.6 8-7.3-6.2-4.8 8-6.1zM31.8 73.4l8.5 40.8-5.4 4 8 6.1-6.1 4.8 8 7.3-5 3.6 11.5 13.5 52.3-15.3 37-31.3-96.2-71.4z"/>
+  <path d="m267.2 153.5-52.3-15.3 15.9 23.9-23.7 46 31.2-.4h46.5zm-163.6-15.3-52.3 15.3-17.4 54.2h46.4l31.1.4-23.6-46zm71 26.4 3.3-57.7 15.2-41.1h-67.5l15 41.1 3.5 57.7 1.2 18.2.1 44.8h27.7l.2-44.8z" class="st6"/>
+</svg>
diff --git a/apps/godwoken-bridge/src/assets/wallets/safepal.svg b/apps/godwoken-bridge/src/assets/wallets/safepal.svg
new file mode 100644
index 00000000..9840ad15
--- /dev/null
+++ b/apps/godwoken-bridge/src/assets/wallets/safepal.svg
@@ -0,0 +1,4 @@
+<svg width="400" height="400" viewBox="0 0 400 400" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M175.358 0C163.184 -1.12679e-06 151.509 4.83616 142.901 13.4445L7.68217 148.666C2.56067 153.787 -4.19303e-05 160.5 5.14944e-10 167.213C4.19313e-05 173.925 2.56083 180.638 7.68232 185.76L96.2953 274.373V117.495C96.2953 105.788 105.712 96.2969 117.419 96.2969C166.881 96.2969 287.278 96.2969 303.701 96.2969L399.996 0.00136472L175.358 0Z" fill="#4A21EF"/>
+<path d="M96.2995 303.703H282.507C294.214 303.703 303.705 294.212 303.705 282.504V125.626L392.318 214.24C397.439 219.362 400 226.074 400 232.787C400 239.5 397.439 246.212 392.318 251.334L257.099 386.555C248.491 395.163 236.816 400 224.642 400L0.00420026 399.998L96.2995 303.703Z" fill="#4A21EF"/>
+</svg>
diff --git a/apps/godwoken-bridge/src/assets/wallets/wallet-connect.svg b/apps/godwoken-bridge/src/assets/wallets/wallet-connect.svg
new file mode 100644
index 00000000..2c5d4949
--- /dev/null
+++ b/apps/godwoken-bridge/src/assets/wallets/wallet-connect.svg
@@ -0,0 +1 @@
+<svg fill="none" height="332" viewBox="0 0 480 332" width="480" xmlns="http://www.w3.org/2000/svg"><path d="m126.613 93.9842c62.622-61.3123 164.152-61.3123 226.775 0l7.536 7.3788c3.131 3.066 3.131 8.036 0 11.102l-25.781 25.242c-1.566 1.533-4.104 1.533-5.67 0l-10.371-10.154c-43.687-42.7734-114.517-42.7734-158.204 0l-11.107 10.874c-1.565 1.533-4.103 1.533-5.669 0l-25.781-25.242c-3.132-3.066-3.132-8.036 0-11.102zm280.093 52.2038 22.946 22.465c3.131 3.066 3.131 8.036 0 11.102l-103.463 101.301c-3.131 3.065-8.208 3.065-11.339 0l-73.432-71.896c-.783-.767-2.052-.767-2.835 0l-73.43 71.896c-3.131 3.065-8.208 3.065-11.339 0l-103.4657-101.302c-3.1311-3.066-3.1311-8.036 0-11.102l22.9456-22.466c3.1311-3.065 8.2077-3.065 11.3388 0l73.4333 71.897c.782.767 2.051.767 2.834 0l73.429-71.897c3.131-3.065 8.208-3.065 11.339 0l73.433 71.897c.783.767 2.052.767 2.835 0l73.431-71.895c3.132-3.066 8.208-3.066 11.339 0z" fill="#3396ff"/></svg>
diff --git a/apps/godwoken-bridge/src/components/WalletConnect/connector.tsx b/apps/godwoken-bridge/src/components/WalletConnect/connector.tsx
index 479e8940..b6ce8cee 100644
--- a/apps/godwoken-bridge/src/components/WalletConnect/connector.tsx
+++ b/apps/godwoken-bridge/src/components/WalletConnect/connector.tsx
@@ -1,31 +1,45 @@
 import React, { useEffect } from "react";
 import styled from "styled-components";
 import { COLOR } from "../../style/variables";
-import { SecondeButton } from "../../style/common";
-import { URI_AVAILABLE } from "@web3-react/walletconnect";
-import { Popover } from "antd";
+import { ConfirmModal } from "../../style/common";
 import { connectors } from "./connectors";
+import { ReactComponent as MetaMaskIcon } from "../../assets/wallets/metamask.svg";
+import { ReactComponent as WalletConnectIcon } from "../../assets/wallets/wallet-connect.svg";
+import { ReactComponent as ImTokenIcon } from "../../assets/wallets/imtoken.svg";
+import { ReactComponent as SafePalIcon } from "../../assets/wallets/safepal.svg";
 
 const StyleWrapper = styled.div`
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: center;
+`;
+
+const WalletBoxWrapper = styled.div`
   display: flex;
   flex-direction: column;
-  > a,
-  > button {
+  width: 150px;
+  height: 100px;
+  color: ${COLOR.primary};
+  text-decoration: none;
+  cursor: pointer;
+  padding: 0 10px;
+  border-radius: 8px;
+  margin: 10px 10px;
+  text-align: center;
+  line-height: 33px;
+  font-size: 14px;
+  font-weight: bold;
+  &:hover {
+    background: rgba(0, 0, 0, 0.1);
+    color: ${COLOR.primary};
+  }
+  > svg {
+    width: 120px;
+    height: 80px;
+  }
+  .title {
     color: ${COLOR.primary};
-    text-decoration: none;
-    cursor: pointer;
-    height: 33px;
-    padding: 0 10px;
-    border-radius: 8px;
-    margin: 4px 0px;
-    text-align: center;
-    line-height: 33px;
-    font-size: 14px;
-    font-weight: bold;
-    &:hover {
-      background: rgba(0, 0, 0, 0.1);
-      color: ${COLOR.primary};
-    }
   }
 `;
 
@@ -59,20 +73,35 @@ export const SelectMenu: React.FC<SelectMenuProps> = ({ handleClick }) => {
 
   return (
     <StyleWrapper>
-      <SecondeButton onClick={connectMetamask}>Metamask</SecondeButton>
-      <SecondeButton onClick={connectImToken}>ImToken</SecondeButton>
-      <SecondeButton onClick={connectSafePal}>SafePal</SecondeButton>
-      <SecondeButton onClick={connectWalletConnect}>WalletConnect</SecondeButton>
+      <WalletBoxWrapper onClick={connectMetamask}>
+        <MetaMaskIcon />
+        <div className="title">Metamask</div>
+      </WalletBoxWrapper>
+
+      <WalletBoxWrapper onClick={connectImToken}>
+        <ImTokenIcon />
+        <div className="title">ImToken</div>
+      </WalletBoxWrapper>
+
+      <WalletBoxWrapper onClick={connectSafePal}>
+        <SafePalIcon />
+        <div className="title">SafePal</div>
+      </WalletBoxWrapper>
+
+      <WalletBoxWrapper onClick={connectWalletConnect}>
+        <WalletConnectIcon />
+        <div className="title">WalletConnect</div>
+      </WalletBoxWrapper>
     </StyleWrapper>
   );
 };
 
-type ConnectorPopoverProps = {
+type ConnectorModalProps = {
   connectBtnQuerySelector: string;
   popoverVisible: boolean;
   setPopoverVisible: (v: boolean) => void;
 };
-export const ConnectorPopover: React.FC<ConnectorPopoverProps> = ({
+export const ConnectorModal: React.FC<ConnectorModalProps> = ({
   connectBtnQuerySelector,
   popoverVisible,
   setPopoverVisible,
@@ -91,12 +120,15 @@ export const ConnectorPopover: React.FC<ConnectorPopoverProps> = ({
   });
 
   return (
-    <Popover
-      content={() => <SelectMenu handleClick={closeSelectMenu}></SelectMenu>}
-      trigger="click"
-      overlayClassName="popover-menu"
+    <ConfirmModal
+      title={"Choose Wallet"}
       visible={popoverVisible}
-      placement="top"
-    ></Popover>
+      onOk={closeSelectMenu}
+      onCancel={closeSelectMenu}
+      footer={null}
+      width={400}
+    >
+      <SelectMenu handleClick={closeSelectMenu}></SelectMenu>
+    </ConfirmModal>
   );
 };
diff --git a/apps/godwoken-bridge/src/components/WalletConnect/index.tsx b/apps/godwoken-bridge/src/components/WalletConnect/index.tsx
index 41bda2b1..9e300cbc 100644
--- a/apps/godwoken-bridge/src/components/WalletConnect/index.tsx
+++ b/apps/godwoken-bridge/src/components/WalletConnect/index.tsx
@@ -5,7 +5,7 @@ import { useLightGodwoken } from "../../hooks/useLightGodwoken";
 import React, { useEffect, useState } from "react";
 import { useNavigate, useParams } from "react-router-dom";
 import { availableVersions } from "../../utils/environment";
-import { ConnectorPopover } from "./connector";
+import { ConnectorModal } from "./connector";
 import { connectors } from "./connectors";
 import { URI_AVAILABLE } from "@web3-react/walletconnect";
 
@@ -79,11 +79,11 @@ export const WalletConnect: React.FC = () => {
       <SecondeButton className="connect-wallet" onClick={connect}>
         Connect
       </SecondeButton>
-      <ConnectorPopover
+      <ConnectorModal
         connectBtnQuerySelector=".connect-wallet"
         popoverVisible={openWalletSelector}
         setPopoverVisible={setOpenWalletSelector}
-      ></ConnectorPopover>
+      ></ConnectorModal>
     </StyleWrapper>
   );
 };