From 163e02cbf00c6b1591d16c9a108f1112f3d8f28f Mon Sep 17 00:00:00 2001
From: Archit <arch1995@gmail.com>
Date: Tue, 13 Jun 2023 16:46:43 +0530
Subject: [PATCH 1/3] fix switch chain in plugins

---
 demo/react-app/package-lock.json              | 117 ++++++++++++------
 demo/react-app/package.json                   |   1 +
 demo/react-app/src/components/Main.tsx        |   8 +-
 demo/react-app/src/services/web3auth.tsx      |  51 +++++++-
 .../src/plugin.ts                             |   2 +-
 .../src/plugin.ts                             |   2 +-
 6 files changed, 137 insertions(+), 44 deletions(-)

diff --git a/demo/react-app/package-lock.json b/demo/react-app/package-lock.json
index 4193db07a..3496eee8b 100644
--- a/demo/react-app/package-lock.json
+++ b/demo/react-app/package-lock.json
@@ -17,6 +17,7 @@
         "@web3auth/modal": "file:../../packages/modal",
         "@web3auth/openlogin-adapter": "file:../../packages/adapters/openlogin-adapter",
         "@web3auth/solana-provider": "file:../../packages/providers/solana-provider",
+        "@web3auth/torus-wallet-connector-plugin": "file:../../packages/plugins/torus-wallet-connector-plugin",
         "path-browserify": "^1.0.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
@@ -43,13 +44,13 @@
     },
     "../../packages/adapters/openlogin-adapter": {
       "name": "@web3auth/openlogin-adapter",
-      "version": "5.2.1",
+      "version": "6.0.0",
       "license": "ISC",
       "dependencies": {
-        "@toruslabs/openlogin": "^4.5.2",
+        "@toruslabs/openlogin": "^4.5.4",
         "@toruslabs/openlogin-utils": "^4.5.1",
-        "@web3auth/base": "^5.2.0",
-        "@web3auth/base-provider": "^5.2.0",
+        "@web3auth/base": "^6.0.0",
+        "@web3auth/base-provider": "^6.0.0",
         "lodash.merge": "^4.6.2"
       },
       "devDependencies": {
@@ -66,11 +67,11 @@
     },
     "../../packages/base": {
       "name": "@web3auth/base",
-      "version": "5.2.0",
+      "version": "6.0.0",
       "license": "ISC",
       "dependencies": {
         "@toruslabs/http-helpers": "^4.0.0",
-        "@toruslabs/openlogin": "^4.5.2",
+        "@toruslabs/openlogin": "^4.5.4",
         "@toruslabs/openlogin-jrpc": "^4.5.1",
         "@toruslabs/openlogin-utils": "^4.5.1",
         "jwt-decode": "^3.1.2",
@@ -87,21 +88,21 @@
     },
     "../../packages/modal": {
       "name": "@web3auth/modal",
-      "version": "5.2.1",
+      "version": "6.0.0",
       "license": "ISC",
       "dependencies": {
-        "@web3auth/base": "^5.2.0",
-        "@web3auth/base-provider": "^5.2.0",
-        "@web3auth/ethereum-provider": "^5.2.0",
-        "@web3auth/metamask-adapter": "^5.2.0",
-        "@web3auth/no-modal": "^5.2.0",
-        "@web3auth/openlogin-adapter": "^5.2.1",
-        "@web3auth/phantom-adapter": "^5.2.0",
-        "@web3auth/solana-provider": "^5.2.0",
-        "@web3auth/torus-evm-adapter": "^5.2.0",
-        "@web3auth/torus-solana-adapter": "^5.2.0",
-        "@web3auth/ui": "^5.2.0",
-        "@web3auth/wallet-connect-v2-adapter": "^5.2.0"
+        "@web3auth/base": "^6.0.0",
+        "@web3auth/base-provider": "^6.0.0",
+        "@web3auth/ethereum-provider": "^6.0.0",
+        "@web3auth/metamask-adapter": "^6.0.0",
+        "@web3auth/no-modal": "^6.0.0",
+        "@web3auth/openlogin-adapter": "^6.0.0",
+        "@web3auth/phantom-adapter": "^6.0.0",
+        "@web3auth/solana-provider": "^6.0.0",
+        "@web3auth/torus-evm-adapter": "^6.0.0",
+        "@web3auth/torus-solana-adapter": "^6.0.0",
+        "@web3auth/ui": "^6.0.0",
+        "@web3auth/wallet-connect-v2-adapter": "^6.0.0"
       },
       "devDependencies": {
         "@svgr/webpack": "^8.0.1",
@@ -122,17 +123,38 @@
         "@solana/web3.js": "^1.x"
       }
     },
+    "../../packages/plugins/torus-wallet-connector-plugin": {
+      "version": "6.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@toruslabs/torus-embed": "^2.1.1",
+        "@web3auth/base": "^6.0.0",
+        "@web3auth/base-plugin": "^6.0.0",
+        "@web3auth/no-modal": "^6.0.0",
+        "loglevel": "^1.8.1"
+      },
+      "devDependencies": {
+        "eth-rpc-errors": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=16.18.1",
+        "npm": ">=8.x"
+      },
+      "peerDependencies": {
+        "@babel/runtime": "^7.x"
+      }
+    },
     "../../packages/providers/solana-provider": {
       "name": "@web3auth/solana-provider",
-      "version": "5.2.0",
+      "version": "6.0.0",
       "license": "ISC",
       "dependencies": {
         "@toruslabs/base-controllers": "^3.0.3",
         "@toruslabs/openlogin-ed25519": "^4.2.0",
         "@toruslabs/openlogin-jrpc": "^4.5.1",
         "@toruslabs/tweetnacl-js": "^1.0.4",
-        "@web3auth/base": "^5.2.0",
-        "@web3auth/base-provider": "^5.2.0",
+        "@web3auth/base": "^6.0.0",
+        "@web3auth/base-provider": "^6.0.0",
         "bn.js": "^5.2.1",
         "bs58": "^5.0.0",
         "eth-rpc-errors": "^4.0.3",
@@ -5127,6 +5149,10 @@
       "resolved": "../../packages/providers/solana-provider",
       "link": true
     },
+    "node_modules/@web3auth/torus-wallet-connector-plugin": {
+      "resolved": "../../packages/plugins/torus-wallet-connector-plugin",
+      "link": true
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -24980,7 +25006,7 @@
       "version": "file:../../packages/base",
       "requires": {
         "@toruslabs/http-helpers": "^4.0.0",
-        "@toruslabs/openlogin": "^4.5.2",
+        "@toruslabs/openlogin": "^4.5.4",
         "@toruslabs/openlogin-jrpc": "^4.5.1",
         "@toruslabs/openlogin-utils": "^4.5.1",
         "jwt-decode": "^3.1.2",
@@ -24994,18 +25020,18 @@
         "@svgr/webpack": "^8.0.1",
         "@toruslabs/isomorphic-style-loader": "^5.3.3",
         "@toruslabs/openlogin-utils": "^4.5.1",
-        "@web3auth/base": "^5.2.0",
-        "@web3auth/base-provider": "^5.2.0",
-        "@web3auth/ethereum-provider": "^5.2.0",
-        "@web3auth/metamask-adapter": "^5.2.0",
-        "@web3auth/no-modal": "^5.2.0",
-        "@web3auth/openlogin-adapter": "^5.2.1",
-        "@web3auth/phantom-adapter": "^5.2.0",
-        "@web3auth/solana-provider": "^5.2.0",
-        "@web3auth/torus-evm-adapter": "^5.2.0",
-        "@web3auth/torus-solana-adapter": "^5.2.0",
-        "@web3auth/ui": "^5.2.0",
-        "@web3auth/wallet-connect-v2-adapter": "^5.2.0",
+        "@web3auth/base": "^6.0.0",
+        "@web3auth/base-provider": "^6.0.0",
+        "@web3auth/ethereum-provider": "^6.0.0",
+        "@web3auth/metamask-adapter": "^6.0.0",
+        "@web3auth/no-modal": "^6.0.0",
+        "@web3auth/openlogin-adapter": "^6.0.0",
+        "@web3auth/phantom-adapter": "^6.0.0",
+        "@web3auth/solana-provider": "^6.0.0",
+        "@web3auth/torus-evm-adapter": "^6.0.0",
+        "@web3auth/torus-solana-adapter": "^6.0.0",
+        "@web3auth/ui": "^6.0.0",
+        "@web3auth/wallet-connect-v2-adapter": "^6.0.0",
         "css-loader": "^6.8.1",
         "postcss-prefix-selector": "^1.16.0",
         "style-loader": "^3.3.3",
@@ -25016,11 +25042,11 @@
     "@web3auth/openlogin-adapter": {
       "version": "file:../../packages/adapters/openlogin-adapter",
       "requires": {
-        "@toruslabs/openlogin": "^4.5.2",
+        "@toruslabs/openlogin": "^4.5.4",
         "@toruslabs/openlogin-utils": "^4.5.1",
         "@types/lodash.merge": "^4.6.7",
-        "@web3auth/base": "^5.2.0",
-        "@web3auth/base-provider": "^5.2.0",
+        "@web3auth/base": "^6.0.0",
+        "@web3auth/base-provider": "^6.0.0",
         "lodash.merge": "^4.6.2"
       }
     },
@@ -25036,14 +25062,25 @@
         "@types/bn.js": "^5.1.1",
         "@types/bs58": "^4.0.1",
         "@types/json-rpc-random-id": "^1.0.1",
-        "@web3auth/base": "^5.2.0",
-        "@web3auth/base-provider": "^5.2.0",
+        "@web3auth/base": "^6.0.0",
+        "@web3auth/base-provider": "^6.0.0",
         "bn.js": "^5.2.1",
         "bs58": "^5.0.0",
         "eth-rpc-errors": "^4.0.3",
         "json-rpc-random-id": "^1.0.1"
       }
     },
+    "@web3auth/torus-wallet-connector-plugin": {
+      "version": "file:../../packages/plugins/torus-wallet-connector-plugin",
+      "requires": {
+        "@toruslabs/torus-embed": "^2.1.1",
+        "@web3auth/base": "^6.0.0",
+        "@web3auth/base-plugin": "^6.0.0",
+        "@web3auth/no-modal": "^6.0.0",
+        "eth-rpc-errors": "^4.0.3",
+        "loglevel": "^1.8.1"
+      }
+    },
     "@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
diff --git a/demo/react-app/package.json b/demo/react-app/package.json
index 4f5183301..04c5d6475 100644
--- a/demo/react-app/package.json
+++ b/demo/react-app/package.json
@@ -12,6 +12,7 @@
     "@web3auth/openlogin-adapter": "file:../../packages/adapters/openlogin-adapter",
     "@web3auth/solana-provider": "file:../../packages/providers/solana-provider",
     "@web3auth/modal": "file:../../packages/modal",
+    "@web3auth/torus-wallet-connector-plugin": "file:../../packages/plugins/torus-wallet-connector-plugin",
     "path-browserify": "^1.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/demo/react-app/src/components/Main.tsx b/demo/react-app/src/components/Main.tsx
index 3800d7d3c..dd81fdbf1 100644
--- a/demo/react-app/src/components/Main.tsx
+++ b/demo/react-app/src/components/Main.tsx
@@ -3,7 +3,7 @@ import { useWeb3Auth } from "../services/web3auth";
 import styles from "../styles/Home.module.css";
 
 const Main = () => {
-  const { provider, login, logout, getUserInfo, getAccounts, getBalance, signMessage, signTransaction, signAndSendTransaction, web3Auth, chain } = useWeb3Auth();
+  const { provider, login, logout, getUserInfo, getAccounts, getBalance, signMessage, signTransaction, signAndSendTransaction, web3Auth, chain, addChain, switchChain } = useWeb3Auth();
 
   const loggedInView = (
     <>
@@ -19,6 +19,12 @@ const Main = () => {
       <button onClick={signMessage} className={styles.card}>
         Sign Message
       </button>
+      <button onClick={addChain} className={styles.card}>
+        Add Chain
+      </button>
+      <button onClick={switchChain} className={styles.card}>
+        Switch Chain
+      </button>
       {
         (web3Auth?.connectedAdapterName === WALLET_ADAPTERS.OPENLOGIN || chain === "solana") &&
         (<button onClick={signTransaction} className={styles.card}>
diff --git a/demo/react-app/src/services/web3auth.tsx b/demo/react-app/src/services/web3auth.tsx
index b4b37e60e..ca01f68c1 100644
--- a/demo/react-app/src/services/web3auth.tsx
+++ b/demo/react-app/src/services/web3auth.tsx
@@ -1,6 +1,7 @@
-import { ADAPTER_EVENTS, SafeEventEmitterProvider } from "@web3auth/base";
+import { ADAPTER_EVENTS, CHAIN_NAMESPACES, SafeEventEmitterProvider } from "@web3auth/base";
 import { Web3Auth } from "@web3auth/modal";
 import { OpenloginAdapter } from "@web3auth/openlogin-adapter";
+import { TorusWalletConnectorPlugin } from "@web3auth/torus-wallet-connector-plugin";
 import { createContext, FunctionComponent, ReactNode, useCallback, useContext, useEffect, useState } from "react";
 import { CHAIN_CONFIG, CHAIN_CONFIG_TYPE } from "../config/chainConfig";
 import { WEB3AUTH_NETWORK_TYPE } from "../config/web3AuthNetwork";
@@ -20,6 +21,8 @@ export interface IWeb3AuthContext {
   getBalance: () => Promise<any>;
   signTransaction: () => Promise<void>;
   signAndSendTransaction: () => Promise<void>;
+  addChain: () => Promise<void>;
+  switchChain: () => Promise<void>;
 }
 
 export const Web3AuthContext = createContext<IWeb3AuthContext>({
@@ -36,6 +39,8 @@ export const Web3AuthContext = createContext<IWeb3AuthContext>({
   getBalance: async () => {},
   signTransaction: async () => {},
   signAndSendTransaction: async () => {},
+  addChain: async () => {},
+  switchChain: async () => {},
 });
 
 export function useWeb3Auth(): IWeb3AuthContext {
@@ -123,6 +128,21 @@ export const Web3AuthProvider: FunctionComponent<IWeb3AuthState> = ({ children,
           },
         });
         web3AuthInstance.configureAdapter(adapter);
+        const plugin = new TorusWalletConnectorPlugin({
+          walletInitOptions: {
+            whiteLabel: {
+              logoDark: "https://avatars.githubusercontent.com/u/37784849?s=200&v=4",
+              logoLight: "https://avatars.githubusercontent.com/u/37784849?s=200&v=4",
+              theme: {
+                isDark: true,
+                colors: {},
+              },
+            },
+            buildEnv: "development",
+            useWalletConnect: true,
+          },
+        });
+        web3AuthInstance.addPlugin(plugin);
         subscribeAuthEvents(web3AuthInstance);
         setWeb3Auth(web3AuthInstance);
         await web3AuthInstance.initModal({
@@ -183,6 +203,33 @@ export const Web3AuthProvider: FunctionComponent<IWeb3AuthState> = ({ children,
     uiConsole(user);
   };
 
+  const addChain = async () => {
+    if (!provider) {
+      uiConsole("provider not initialized yet");
+      return;
+    }
+    const newChain = {
+      chainId: "0x19",
+      displayName: "Cronos Mainnet Beta",
+      chainNamespace: CHAIN_NAMESPACES.EIP155,
+      tickerName: "Cronos",
+      ticker: "CRO",
+      decimals: 18,
+      rpcTarget: "https://cronos-evm.publicnode.com",
+      blockExplorer: "https://goerli.etherscan.io",
+    };
+    await web3Auth?.addChain(newChain);
+    uiConsole("New Chain Added");
+  };
+  const switchChain = async () => {
+    if (!provider) {
+      uiConsole("provider not initialized yet");
+      return;
+    }
+    await web3Auth?.switchChain({ chainId: "0x19" });
+    uiConsole("Chain Switched");
+  };
+
   const getAccounts = async () => {
     if (!provider) {
       console.log("provider not initialized yet");
@@ -249,6 +296,8 @@ export const Web3AuthProvider: FunctionComponent<IWeb3AuthState> = ({ children,
     signMessage,
     signTransaction,
     signAndSendTransaction,
+    addChain,
+    switchChain,
   };
   return <Web3AuthContext.Provider value={contextProvider}>{children}</Web3AuthContext.Provider>;
 };
diff --git a/packages/plugins/solana-wallet-connector-plugin/src/plugin.ts b/packages/plugins/solana-wallet-connector-plugin/src/plugin.ts
index 56325aa18..6d8980dee 100644
--- a/packages/plugins/solana-wallet-connector-plugin/src/plugin.ts
+++ b/packages/plugins/solana-wallet-connector-plugin/src/plugin.ts
@@ -219,7 +219,7 @@ export class SolanaWalletConnectorPlugin implements IPlugin {
   private async setChainID(chainId: number): Promise<void> {
     const sessionConfig = await this.sessionConfig();
     const { chainConfig } = sessionConfig || {};
-    if (chainId !== sessionConfig.chainId && chainConfig) {
+    if (chainId === sessionConfig.chainId && chainConfig) {
       await this.torusWalletInstance.setProvider({
         ...chainConfig,
         blockExplorerUrl: chainConfig.blockExplorer,
diff --git a/packages/plugins/torus-wallet-connector-plugin/src/plugin.ts b/packages/plugins/torus-wallet-connector-plugin/src/plugin.ts
index fc9f36e91..7fb857a9e 100644
--- a/packages/plugins/torus-wallet-connector-plugin/src/plugin.ts
+++ b/packages/plugins/torus-wallet-connector-plugin/src/plugin.ts
@@ -232,7 +232,7 @@ export class TorusWalletConnectorPlugin implements IPlugin {
   private async setChainID(chainId: number): Promise<void> {
     const sessionConfig = await this.sessionConfig();
     const { chainConfig } = sessionConfig || {};
-    if (chainId !== sessionConfig.chainId && chainConfig) {
+    if (chainId === sessionConfig.chainId && chainConfig) {
       await this.torusWalletInstance.setProvider({
         ...chainConfig,
         chainId,

From 5113d07e6b0139dfadf3a76ac96510add90825a3 Mon Sep 17 00:00:00 2001
From: chaitanyapotti <chaitanya.potti@gmail.com>
Date: Wed, 14 Jun 2023 14:24:33 +0800
Subject: [PATCH 2/3] - fix double render - fix chain switch

---
 demo/react-app/package-lock.json              |  1 +
 demo/react-app/src/index.tsx                  |  1 -
 demo/react-app/src/services/web3auth.tsx      |  5 ++---
 .../src/plugin.ts                             | 20 +++++++++++++++----
 packages/ui/src/loginModal.tsx                |  1 +
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/demo/react-app/package-lock.json b/demo/react-app/package-lock.json
index 3496eee8b..d0a653e0e 100644
--- a/demo/react-app/package-lock.json
+++ b/demo/react-app/package-lock.json
@@ -124,6 +124,7 @@
       }
     },
     "../../packages/plugins/torus-wallet-connector-plugin": {
+      "name": "@web3auth/torus-wallet-connector-plugin",
       "version": "6.0.0",
       "license": "ISC",
       "dependencies": {
diff --git a/demo/react-app/src/index.tsx b/demo/react-app/src/index.tsx
index ae810d910..3d636b534 100644
--- a/demo/react-app/src/index.tsx
+++ b/demo/react-app/src/index.tsx
@@ -6,7 +6,6 @@ import App from "./App";
 const container = document.getElementById("root") as HTMLElement;
 const root = createRoot(container);
 
-
 root.render(
   <StrictMode>
     <App />
diff --git a/demo/react-app/src/services/web3auth.tsx b/demo/react-app/src/services/web3auth.tsx
index ca01f68c1..ad7edcc55 100644
--- a/demo/react-app/src/services/web3auth.tsx
+++ b/demo/react-app/src/services/web3auth.tsx
@@ -95,10 +95,9 @@ export const Web3AuthProvider: FunctionComponent<IWeb3AuthState> = ({ children,
       });
     };
 
-    const currentChainConfig = CHAIN_CONFIG[chain];
-
     async function init() {
       try {
+        const currentChainConfig = CHAIN_CONFIG[chain];
         setIsLoading(true);
         const clientId = "BKPxkCtfC9gZ5dj-eg-W6yb5Xfr3XkxHuGZl2o2Bn8gKQ7UYike9Dh6c-_LaXlUN77x0cBoPwcSx-IVm0llVsLA";
         const web3AuthInstance = new Web3Auth({
@@ -138,7 +137,7 @@ export const Web3AuthProvider: FunctionComponent<IWeb3AuthState> = ({ children,
                 colors: {},
               },
             },
-            buildEnv: "development",
+            buildEnv: "production",
             useWalletConnect: true,
           },
         });
diff --git a/packages/plugins/torus-wallet-connector-plugin/src/plugin.ts b/packages/plugins/torus-wallet-connector-plugin/src/plugin.ts
index 7fb857a9e..fe14f6646 100644
--- a/packages/plugins/torus-wallet-connector-plugin/src/plugin.ts
+++ b/packages/plugins/torus-wallet-connector-plugin/src/plugin.ts
@@ -212,10 +212,22 @@ export class TorusWalletConnectorPlugin implements IPlugin {
     };
   }
 
+  private async torusWalletSessionConfig(): Promise<{ chainId: number; accounts: string[] }> {
+    if (!this.torusWalletInstance.provider) throw TorusWalletPluginError.web3AuthNotConnected();
+    const [accounts, chainId] = await Promise.all([
+      this.torusWalletInstance.provider.request<string[]>({ method: "eth_accounts" }),
+      this.torusWalletInstance.provider.request<string>({ method: "eth_chainId" }),
+    ]);
+    return {
+      chainId: parseInt(chainId as string, 16), // TODO: Need to check if it's hex or int
+      accounts: accounts as string[],
+    };
+  }
+
   private async setSelectedAddress(address: string): Promise<void> {
     if (!this.torusWalletInstance.isLoggedIn || !this.userInfo) throw TorusWalletPluginError.web3AuthNotConnected();
-    const sessionConfig = await this.sessionConfig();
-    if (address !== sessionConfig.accounts?.[0]) {
+    const [sessionConfig, torusWalletSessionConfig] = await Promise.all([this.sessionConfig(), this.torusWalletSessionConfig()]);
+    if (address !== torusWalletSessionConfig.accounts?.[0]) {
       await this.torusWalletInstance.loginWithPrivateKey({
         privateKey: sessionConfig.privateKey,
         userInfo: {
@@ -230,9 +242,9 @@ export class TorusWalletConnectorPlugin implements IPlugin {
   }
 
   private async setChainID(chainId: number): Promise<void> {
-    const sessionConfig = await this.sessionConfig();
+    const [sessionConfig, torusWalletSessionConfig] = await Promise.all([this.sessionConfig(), this.torusWalletSessionConfig()]);
     const { chainConfig } = sessionConfig || {};
-    if (chainId === sessionConfig.chainId && chainConfig) {
+    if (chainId !== torusWalletSessionConfig.chainId && chainConfig) {
       await this.torusWalletInstance.setProvider({
         ...chainConfig,
         chainId,
diff --git a/packages/ui/src/loginModal.tsx b/packages/ui/src/loginModal.tsx
index f13b3ab00..c7cd751d5 100644
--- a/packages/ui/src/loginModal.tsx
+++ b/packages/ui/src/loginModal.tsx
@@ -39,6 +39,7 @@ function createWrapper(parentZIndex: string): HTMLElement {
 
   const parent = document.createElement("section");
   parent.classList.add("w3a-parent-container");
+  parent.setAttribute("id", "w3a-parent-container");
   parent.style.zIndex = parentZIndex;
   parent.style.position = "relative";
   const wrapper = document.createElement("section");

From a6cdc8e3a1cc134071077f9bc9c5e09dfd0e2581 Mon Sep 17 00:00:00 2001
From: chaitanyapotti <chaitanya.potti@gmail.com>
Date: Wed, 14 Jun 2023 14:48:28 +0800
Subject: [PATCH 3/3] don't allow changing chainnamespace after init

---
 .../coinbase-adapter/src/coinbaseAdapter.ts   |  2 +-
 .../metamask-adapter/src/metamaskAdapter.ts   |  2 +-
 .../openlogin-adapter/src/openloginAdapter.ts |  2 +-
 .../phantom-adapter/src/phantomAdapter.ts     |  2 +-
 .../slope-adapter/src/slopeAdapter.ts         |  2 +-
 .../solflare-adapter/src/solflareAdapter.ts   |  2 +-
 .../src/torusWalletAdapter.ts                 |  2 +-
 .../src/solanaWalletAdapter.ts                |  2 +-
 .../src/walletConnectV1adapter.ts             |  2 +-
 .../src/walletConnectV2adapter.ts             |  2 +-
 packages/base/src/adapter/IAdapter.ts         |  7 +++++--
 packages/base/src/errors/index.ts             |  4 ++++
 packages/no-modal/src/noModal.ts              |  2 +-
 .../src/errors.ts                             |  4 ++++
 .../src/plugin.ts                             | 21 +++++++++++++++----
 .../src/errors.ts                             |  4 ++++
 .../src/plugin.ts                             |  3 ++-
 17 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/packages/adapters/coinbase-adapter/src/coinbaseAdapter.ts b/packages/adapters/coinbase-adapter/src/coinbaseAdapter.ts
index 826c1f681..f51442089 100644
--- a/packages/adapters/coinbase-adapter/src/coinbaseAdapter.ts
+++ b/packages/adapters/coinbase-adapter/src/coinbaseAdapter.ts
@@ -132,7 +132,7 @@ class CoinbaseAdapter extends BaseEvmAdapter<void> {
   }
 
   public async addChain(chainConfig: CustomChainConfig, init = false): Promise<void> {
-    super.checkAddChainRequirements(init);
+    super.checkAddChainRequirements(chainConfig, init);
     await this.coinbaseProvider.request({
       method: "wallet_addEthereumChain",
       params: [
diff --git a/packages/adapters/metamask-adapter/src/metamaskAdapter.ts b/packages/adapters/metamask-adapter/src/metamaskAdapter.ts
index f298f7a03..92495b8ea 100644
--- a/packages/adapters/metamask-adapter/src/metamaskAdapter.ts
+++ b/packages/adapters/metamask-adapter/src/metamaskAdapter.ts
@@ -143,7 +143,7 @@ class MetamaskAdapter extends BaseEvmAdapter<void> {
   }
 
   public async addChain(chainConfig: CustomChainConfig, init = false): Promise<void> {
-    super.checkAddChainRequirements(init);
+    super.checkAddChainRequirements(chainConfig, init);
     await this.metamaskProvider?.request({
       method: "wallet_addEthereumChain",
       params: [
diff --git a/packages/adapters/openlogin-adapter/src/openloginAdapter.ts b/packages/adapters/openlogin-adapter/src/openloginAdapter.ts
index 35faeb6be..545ddfc1a 100644
--- a/packages/adapters/openlogin-adapter/src/openloginAdapter.ts
+++ b/packages/adapters/openlogin-adapter/src/openloginAdapter.ts
@@ -196,7 +196,7 @@ export class OpenloginAdapter extends BaseAdapter<OpenloginLoginParams> {
   }
 
   public async addChain(chainConfig: CustomChainConfig, init = false): Promise<void> {
-    super.checkAddChainRequirements(init);
+    super.checkAddChainRequirements(chainConfig, init);
     this.privateKeyProvider?.addChain(chainConfig);
     this.addChainConfig(chainConfig);
   }
diff --git a/packages/adapters/phantom-adapter/src/phantomAdapter.ts b/packages/adapters/phantom-adapter/src/phantomAdapter.ts
index 3b112dba3..aebaef945 100644
--- a/packages/adapters/phantom-adapter/src/phantomAdapter.ts
+++ b/packages/adapters/phantom-adapter/src/phantomAdapter.ts
@@ -151,7 +151,7 @@ export class PhantomAdapter extends BaseSolanaAdapter<void> {
   }
 
   public async addChain(chainConfig: CustomChainConfig, init = false): Promise<void> {
-    super.checkAddChainRequirements(init);
+    super.checkAddChainRequirements(chainConfig, init);
     this.phantomProvider?.addChain(chainConfig);
     this.addChainConfig(chainConfig);
   }
diff --git a/packages/adapters/slope-adapter/src/slopeAdapter.ts b/packages/adapters/slope-adapter/src/slopeAdapter.ts
index 7278b103a..3cd8fbcbc 100644
--- a/packages/adapters/slope-adapter/src/slopeAdapter.ts
+++ b/packages/adapters/slope-adapter/src/slopeAdapter.ts
@@ -125,7 +125,7 @@ export class SlopeAdapter extends BaseSolanaAdapter<void> {
   }
 
   public async addChain(chainConfig: CustomChainConfig, init = false): Promise<void> {
-    super.checkAddChainRequirements(init);
+    super.checkAddChainRequirements(chainConfig, init);
     this.slopeProxyProvider?.addChain(chainConfig);
     this.addChainConfig(chainConfig);
   }
diff --git a/packages/adapters/solflare-adapter/src/solflareAdapter.ts b/packages/adapters/solflare-adapter/src/solflareAdapter.ts
index eb2bc75b4..3607e5687 100644
--- a/packages/adapters/solflare-adapter/src/solflareAdapter.ts
+++ b/packages/adapters/solflare-adapter/src/solflareAdapter.ts
@@ -139,7 +139,7 @@ export class SolflareAdapter extends BaseSolanaAdapter<void> {
   }
 
   public async addChain(chainConfig: CustomChainConfig, init = false): Promise<void> {
-    super.checkAddChainRequirements(init);
+    super.checkAddChainRequirements(chainConfig, init);
     this.solflareProvider?.addChain(chainConfig);
     this.addChainConfig(chainConfig);
   }
diff --git a/packages/adapters/torus-evm-adapter/src/torusWalletAdapter.ts b/packages/adapters/torus-evm-adapter/src/torusWalletAdapter.ts
index b85bcbe63..064b47896 100644
--- a/packages/adapters/torus-evm-adapter/src/torusWalletAdapter.ts
+++ b/packages/adapters/torus-evm-adapter/src/torusWalletAdapter.ts
@@ -171,7 +171,7 @@ export class TorusWalletAdapter extends BaseEvmAdapter<never> {
   }
 
   public async addChain(chainConfig: CustomChainConfig, init = false): Promise<void> {
-    super.checkAddChainRequirements(init);
+    super.checkAddChainRequirements(chainConfig, init);
     // TODO: add these in torus wallet.
     // await this.torusInstance?.provider.request({
     //   method: "wallet_addEthereumChain",
diff --git a/packages/adapters/torus-solana-adapter/src/solanaWalletAdapter.ts b/packages/adapters/torus-solana-adapter/src/solanaWalletAdapter.ts
index 9b33cb35c..7adce48ef 100644
--- a/packages/adapters/torus-solana-adapter/src/solanaWalletAdapter.ts
+++ b/packages/adapters/torus-solana-adapter/src/solanaWalletAdapter.ts
@@ -163,7 +163,7 @@ export class SolanaWalletAdapter extends BaseSolanaAdapter<void> {
   }
 
   public async addChain(chainConfig: CustomChainConfig, init = false): Promise<void> {
-    super.checkAddChainRequirements(init);
+    super.checkAddChainRequirements(chainConfig, init);
     // await this.solanaProvider?.addChain(chainConfig);
     this.addChainConfig(chainConfig);
   }
diff --git a/packages/adapters/wallet-connect-v1-adapter/src/walletConnectV1adapter.ts b/packages/adapters/wallet-connect-v1-adapter/src/walletConnectV1adapter.ts
index 4d9c2c169..cb69da27e 100644
--- a/packages/adapters/wallet-connect-v1-adapter/src/walletConnectV1adapter.ts
+++ b/packages/adapters/wallet-connect-v1-adapter/src/walletConnectV1adapter.ts
@@ -182,7 +182,7 @@ class WalletConnectV1Adapter extends BaseEvmAdapter<void> {
   }
 
   public async addChain(chainConfig: CustomChainConfig, init = false): Promise<void> {
-    super.checkAddChainRequirements(init);
+    super.checkAddChainRequirements(chainConfig, init);
     const networkSwitch = this.adapterOptions.adapterSettings?.networkSwitchModal;
     if (networkSwitch) {
       await networkSwitch.addNetwork({ chainConfig, appOrigin: window.location.hostname });
diff --git a/packages/adapters/wallet-connect-v2-adapter/src/walletConnectV2adapter.ts b/packages/adapters/wallet-connect-v2-adapter/src/walletConnectV2adapter.ts
index 1fdbf94a5..c3278bde3 100644
--- a/packages/adapters/wallet-connect-v2-adapter/src/walletConnectV2adapter.ts
+++ b/packages/adapters/wallet-connect-v2-adapter/src/walletConnectV2adapter.ts
@@ -151,7 +151,7 @@ class WalletConnectV2Adapter extends BaseEvmAdapter<void> {
   }
 
   public async addChain(chainConfig: CustomChainConfig, init = false): Promise<void> {
-    super.checkAddChainRequirements(init);
+    super.checkAddChainRequirements(chainConfig, init);
     if (!isChainIdSupported(this.currentChainNamespace, parseInt(chainConfig.chainId, 16), this.adapterOptions.loginSettings)) {
       throw WalletOperationsError.chainIDNotAllowed(`Unsupported chainID: ${chainConfig.chainId}`);
     }
diff --git a/packages/base/src/adapter/IAdapter.ts b/packages/base/src/adapter/IAdapter.ts
index b32d0a25c..1edf8edf6 100644
--- a/packages/base/src/adapter/IAdapter.ts
+++ b/packages/base/src/adapter/IAdapter.ts
@@ -3,7 +3,7 @@ import { OPENLOGIN_NETWORK, OPENLOGIN_NETWORK_TYPE, OpenloginUserInfo } from "@t
 
 import { getChainConfig } from "../chain/config";
 import { AdapterNamespaceType, CHAIN_NAMESPACES, ChainNamespaceType, CustomChainConfig } from "../chain/IChainInterface";
-import { WalletInitializationError, WalletLoginError } from "../errors";
+import { WalletInitializationError, WalletLoginError, WalletOperationsError } from "../errors";
 import { SafeEventEmitterProvider } from "../provider/IProvider";
 import { WALLET_ADAPTERS } from "../wallet";
 
@@ -180,8 +180,11 @@ export abstract class BaseAdapter<T> extends SafeEventEmitter implements IAdapte
     if (this.status !== ADAPTER_STATUS.CONNECTED) throw WalletLoginError.disconnectionError("Not connected with wallet");
   }
 
-  checkAddChainRequirements(init = false): void {
+  checkAddChainRequirements(chainConfig: CustomChainConfig, init = false): void {
     if (!init && !this.provider) throw WalletLoginError.notConnectedError("Not connected with wallet.");
+    if (this.currentChainNamespace !== chainConfig.chainNamespace) {
+      throw WalletOperationsError.chainNamespaceNotAllowed("This adapter doesn't support this chainNamespace");
+    }
   }
 
   checkSwitchChainRequirements({ chainId }: { chainId: string }, init = false): void {
diff --git a/packages/base/src/errors/index.ts b/packages/base/src/errors/index.ts
index c8d22c8ee..13f891f78 100644
--- a/packages/base/src/errors/index.ts
+++ b/packages/base/src/errors/index.ts
@@ -212,4 +212,8 @@ export class WalletOperationsError extends Web3AuthError {
   public static operationNotAllowed(extraMessage = ""): IWeb3AuthError {
     return WalletOperationsError.fromCode(5202, extraMessage);
   }
+
+  public static chainNamespaceNotAllowed(extraMessage = ""): IWeb3AuthError {
+    return WalletOperationsError.fromCode(5203, extraMessage);
+  }
 }
diff --git a/packages/no-modal/src/noModal.ts b/packages/no-modal/src/noModal.ts
index cf327af76..e5996aa82 100644
--- a/packages/no-modal/src/noModal.ts
+++ b/packages/no-modal/src/noModal.ts
@@ -216,7 +216,7 @@ export class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Auth {
     if (this.commonJRPCProvider) {
       return this.commonJRPCProvider.switchChain(params);
     }
-    throw WalletInitializationError.notReady(`No wallet is connected`);
+    throw WalletInitializationError.notReady(`No wallet is ready`);
   }
 
   /**
diff --git a/packages/plugins/solana-wallet-connector-plugin/src/errors.ts b/packages/plugins/solana-wallet-connector-plugin/src/errors.ts
index db10d998e..9cb17f4d1 100644
--- a/packages/plugins/solana-wallet-connector-plugin/src/errors.ts
+++ b/packages/plugins/solana-wallet-connector-plugin/src/errors.ts
@@ -55,4 +55,8 @@ export class SolanaWalletPluginError extends Web3AuthError {
   public static torusWalletNotSet(extraMessage = ""): IWeb3AuthError {
     return SolanaWalletPluginError.fromCode(5217, extraMessage);
   }
+
+  public static unsupportedChainNamespace(extraMessage = ""): IWeb3AuthError {
+    return SolanaWalletPluginError.fromCode(5218, extraMessage);
+  }
 }
diff --git a/packages/plugins/solana-wallet-connector-plugin/src/plugin.ts b/packages/plugins/solana-wallet-connector-plugin/src/plugin.ts
index 6d8980dee..9f02fade7 100644
--- a/packages/plugins/solana-wallet-connector-plugin/src/plugin.ts
+++ b/packages/plugins/solana-wallet-connector-plugin/src/plugin.ts
@@ -51,6 +51,7 @@ export class SolanaWalletConnectorPlugin implements IPlugin {
     if (this.isInitialized) return;
     if (!web3auth) throw SolanaWalletPluginError.web3authRequired();
     if (web3auth.provider && web3auth.connectedAdapterName !== WALLET_ADAPTERS.OPENLOGIN) throw SolanaWalletPluginError.unsupportedAdapter();
+    if (web3auth.coreOptions.chainConfig.chainNamespace !== this.pluginNamespace) throw SolanaWalletPluginError.unsupportedChainNamespace();
     // Not connected yet to openlogin
     if (web3auth.provider) {
       this.provider = web3auth.provider;
@@ -200,10 +201,22 @@ export class SolanaWalletConnectorPlugin implements IPlugin {
     };
   }
 
+  private async torusWalletSessionConfig(): Promise<{ chainId: number; accounts: string[] }> {
+    if (!this.torusWalletInstance.provider) throw SolanaWalletPluginError.web3AuthNotConnected();
+    const [accounts, chainId] = await Promise.all([
+      this.torusWalletInstance.provider.request<never, string[]>({ method: "solana_accounts" }),
+      this.torusWalletInstance.provider.request<never, string>({ method: "solana_chainId" }),
+    ]);
+    return {
+      chainId: parseInt(chainId as string, 16),
+      accounts: accounts as string[],
+    };
+  }
+
   private async setSelectedAddress(address: string): Promise<void> {
     if (!this.torusWalletInstance.isLoggedIn || !this.userInfo) throw SolanaWalletPluginError.web3AuthNotConnected();
-    const sessionConfig = await this.sessionConfig();
-    if (address !== sessionConfig.accounts?.[0]) {
+    const [sessionConfig, torusWalletSessionConfig] = await Promise.all([this.sessionConfig(), this.torusWalletSessionConfig()]);
+    if (address !== torusWalletSessionConfig.accounts?.[0]) {
       await this.torusWalletInstance.loginWithPrivateKey({
         privateKey: sessionConfig.privateKey,
         userInfo: {
@@ -217,9 +230,9 @@ export class SolanaWalletConnectorPlugin implements IPlugin {
   }
 
   private async setChainID(chainId: number): Promise<void> {
-    const sessionConfig = await this.sessionConfig();
+    const [sessionConfig, torusWalletSessionConfig] = await Promise.all([this.sessionConfig(), this.torusWalletSessionConfig()]);
     const { chainConfig } = sessionConfig || {};
-    if (chainId === sessionConfig.chainId && chainConfig) {
+    if (chainId !== torusWalletSessionConfig.chainId && chainConfig) {
       await this.torusWalletInstance.setProvider({
         ...chainConfig,
         blockExplorerUrl: chainConfig.blockExplorer,
diff --git a/packages/plugins/torus-wallet-connector-plugin/src/errors.ts b/packages/plugins/torus-wallet-connector-plugin/src/errors.ts
index 82cdc80c8..5f0097b78 100644
--- a/packages/plugins/torus-wallet-connector-plugin/src/errors.ts
+++ b/packages/plugins/torus-wallet-connector-plugin/src/errors.ts
@@ -55,4 +55,8 @@ export class TorusWalletPluginError extends Web3AuthError {
   public static torusWalletNotSet(extraMessage = ""): IWeb3AuthError {
     return TorusWalletPluginError.fromCode(5217, extraMessage);
   }
+
+  public static unsupportedChainNamespace(extraMessage = ""): IWeb3AuthError {
+    return TorusWalletPluginError.fromCode(5218, extraMessage);
+  }
 }
diff --git a/packages/plugins/torus-wallet-connector-plugin/src/plugin.ts b/packages/plugins/torus-wallet-connector-plugin/src/plugin.ts
index fe14f6646..fef4cb0b2 100644
--- a/packages/plugins/torus-wallet-connector-plugin/src/plugin.ts
+++ b/packages/plugins/torus-wallet-connector-plugin/src/plugin.ts
@@ -51,6 +51,7 @@ export class TorusWalletConnectorPlugin implements IPlugin {
     if (this.isInitialized) return;
     if (!web3auth) throw TorusWalletPluginError.web3authRequired();
     if (web3auth.provider && web3auth.connectedAdapterName !== WALLET_ADAPTERS.OPENLOGIN) throw TorusWalletPluginError.unsupportedAdapter();
+    if (web3auth.coreOptions.chainConfig.chainNamespace !== this.pluginNamespace) throw TorusWalletPluginError.unsupportedChainNamespace();
     // Not connected yet to openlogin
     if (web3auth.provider) {
       this.provider = web3auth.provider;
@@ -219,7 +220,7 @@ export class TorusWalletConnectorPlugin implements IPlugin {
       this.torusWalletInstance.provider.request<string>({ method: "eth_chainId" }),
     ]);
     return {
-      chainId: parseInt(chainId as string, 16), // TODO: Need to check if it's hex or int
+      chainId: parseInt(chainId as string, 16),
       accounts: accounts as string[],
     };
   }